add gameConfig

cartridge-gg · May 22, 2024 · d0f899a · d0f899a
1 parent ee438c1
commit d0f899a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 9 deletions.
diff --git a/web/src/components/map/WantedMarkers.tsx b/web/src/components/map/WantedMarkers.tsx
@@ -7,12 +7,12 @@ import { Alert } from "../icons";
 import { coordinatePercent } from "./Map";
 
 export const WantedMarkers = ({ targetId, current }: { targetId?: Locations; current?: Locations }) => {
-  const { game } = useGameStore();
+  const { game , gameConfig} = useGameStore();
   const configStore = useConfigStore();
   const { config } = configStore;
 
   const [wanted, setWanted] = useState<Map<number, number>>();
-  const minWanted = (config?.config.game_config.max_wanted_shopping * 100n) / 8n;
+  const minWanted = (gameConfig?.max_wanted_shopping * 100) / 8;
 
   const isMobile = IsMobile();
 

diff --git a/web/src/dojo/class/Game.ts b/web/src/dojo/class/Game.ts
@@ -1,4 +1,4 @@
-import { Season, SeasonSettings } from "./../../generated/graphql";
+import { GameConfig, Season, SeasonSettings } from "./../../generated/graphql";
 import { Game, GameStorePacked } from "@/generated/graphql";
 import { computed, makeObservable, observable } from "mobx";
 import { CairoCustomEnum } from "starknet";
@@ -47,6 +47,7 @@ export const pendingCallToCairoEnum = (i: PendingCall) => {
 export class GameClass {
   configStore: ConfigStoreClass;
   gameInfos: Game;
+  gameConfig: GameConfig;
   seasonSettings: SeasonSettings;
   packed: bigint;
 
@@ -62,11 +63,13 @@ export class GameClass {
     configStore: ConfigStoreClass,
     gameInfos: Game,
     seasonSettings: SeasonSettings,
+    gameConfig: GameConfig,
     gameStorePacked: GameStorePacked,
   ) {
     this.configStore = configStore;
     this.gameInfos = gameInfos;
     this.seasonSettings = seasonSettings;
+    this.gameConfig = gameConfig;
 
     this.packed = gameStorePacked.packed;
     //
@@ -128,7 +131,7 @@ export class GameClass {
 
   get isShopOpen() {
     const wanted = this.player.wanted;
-    const maxWantedShopping = this.gameInfos.max_wanted_shopping;
+    const maxWantedShopping = this.gameConfig.max_wanted_shopping;
 
     return wanted < maxWantedShopping && this.shopCount < 1;
   }

diff --git a/web/src/dojo/stores/game.tsx b/web/src/dojo/stores/game.tsx
@@ -214,7 +214,13 @@ export class GameStoreClass {
     const eventsEdges = gameEventsData.events?.edges as World__EventEdge[];
     const eventsNodes = eventsEdges.map((i) => i.node as World__Event);
 
-    const game = new GameClass(this.configStore, this.gameInfos!, this.seasonSettings!, gameStorePacked);
+    const game = new GameClass(
+      this.configStore,
+      this.gameInfos!,
+      this.seasonSettings!,
+      this.gameConfig!,
+      gameStorePacked,
+    );
     const gameEvents = new EventClass(this.configStore, this.gameInfos!, eventsNodes);
 
     this.game = game;
@@ -229,7 +235,13 @@ export class GameStoreClass {
     ) as GameStorePacked;
 
     if (gameStorePacked) {
-      this.game = new GameClass(this.configStore, this.gameInfos!, this.seasonSettings!, gameStorePacked);
+      this.game = new GameClass(
+        this.configStore,
+        this.gameInfos!,
+        this.seasonSettings!,
+        this.gameConfig!,
+        gameStorePacked,
+      );
     }
   };
 

diff --git a/web/src/pages/[gameId]/travel.tsx b/web/src/pages/[gameId]/travel.tsx
@@ -26,7 +26,7 @@ interface MarketPriceInfo {
 const Travel = observer(() => {
   const { router, gameId } = useRouterContext();
   const { account } = useAccount();
-  const { game, gameEvents } = useGameStore();
+  const { game, gameConfig } = useGameStore();
   const { travel, isPending } = useSystems();
   const configStore = useConfigStore();
   const { config } = configStore;
@@ -194,7 +194,7 @@ const Travel = observer(() => {
             {targetLocation && (
               <WantedIndicator
                 wantedTick={game.wanted.getWantedTick(configStore.getLocation(targetLocation).location_id)}
-                highLimit={config?.config.game_config.max_wanted_shopping}
+                highLimit={gameConfig?.max_wanted_shopping}
               />
             )}
           </HStack>
@@ -222,7 +222,7 @@ const Travel = observer(() => {
           <Box position="absolute" top="20px" left="16px">
             <WantedIndicator
               wantedTick={game.wanted.getWantedTick(configStore.getLocation(targetLocation).location_id)}
-              highLimit={config?.config.game_config.max_wanted_shopping}
+              highLimit={gameConfig?.max_wanted_shopping}
             />
           </Box>
         )}