From cf4837d5d49940af6457059310a497627db35bd2 Mon Sep 17 00:00:00 2001 From: Scott Benton Date: Sun, 26 May 2024 21:16:29 -0400 Subject: [PATCH 1/2] fix(adds): Fixed adds being removed from the move dialog --- CHANGELOG.MD | 2 ++ .../MoveDialogContent/MoveRollers.tsx | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 1f1bc98b..0a5645b3 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -7,6 +7,7 @@ - Added a match reminder to the roll display for oracle rolls that care about dice matching (ask the oracle moves) - Added asset clock and counter controls working for assets that use them (ex: Snub Fighter Ability #3, or Marked Ability #2). - Added scene challenges to Crew Link +- Added a new Hinterlands theme ### Changes @@ -18,6 +19,7 @@ - Fixed "replaced" oracle tables not showing children - Fixed "replaced" move tables showing up twice +- Fixed adds being removed from the move dialogs ## 3.0.0 diff --git a/src/components/features/charactersAndCampaigns/LinkedDialog/LinkedDialogContent/MoveDialogContent/MoveRollers.tsx b/src/components/features/charactersAndCampaigns/LinkedDialog/LinkedDialogContent/MoveDialogContent/MoveRollers.tsx index 1295e128..697be6dc 100644 --- a/src/components/features/charactersAndCampaigns/LinkedDialog/LinkedDialogContent/MoveDialogContent/MoveRollers.tsx +++ b/src/components/features/charactersAndCampaigns/LinkedDialog/LinkedDialogContent/MoveDialogContent/MoveRollers.tsx @@ -28,6 +28,16 @@ export function MoveRollers(props: MoveRollersProps) { (store) => store.campaigns.currentCampaign.currentCampaign?.conditionMeters ); + const hasCharacter = useStore( + (store) => !!store.characters.currentCharacter.currentCharacter + ); + const adds = useStore( + (store) => store.characters.currentCharacter.currentCharacter?.adds ?? 0 + ); + const updateAdds = useStore( + (store) => store.characters.currentCharacter.updateCurrentCharacter + ); + const getConditionMeterValue = (conditionMeterKey: string): number => { const conditionMeter = conditionMeterRules[conditionMeterKey]; @@ -112,6 +122,15 @@ export function MoveRollers(props: MoveRollersProps) { move={move} /> ))} + + {hasCharacter && ( + updateAdds({ adds: newValue })} + value={adds} + sx={{ my: 0.5 }} + /> + )} ); } else if (move.roll_type === "progress_roll") { From ac68a0be3624633a31b222f1454bc34e4b0b6fed Mon Sep 17 00:00:00 2001 From: Scott Benton Date: Sun, 26 May 2024 21:23:51 -0400 Subject: [PATCH 2/2] fix(stats): Fixed stats disappearing on small screens --- .../Character/CharacterSheetPage/components/CharacterHeader.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Character/CharacterSheetPage/components/CharacterHeader.tsx b/src/pages/Character/CharacterSheetPage/components/CharacterHeader.tsx index 422f2960..b34642f8 100644 --- a/src/pages/Character/CharacterSheetPage/components/CharacterHeader.tsx +++ b/src/pages/Character/CharacterSheetPage/components/CharacterHeader.tsx @@ -128,7 +128,7 @@ export function CharacterHeader() { /> - {isMedium && ( + {(isSmall || isMedium) && (