Merge branch 'main' into add_tutorial

cartridge-gg · Sep 15, 2023 · 266724e · 266724e
2 parents fee34f9 + c4db28c
commit 266724e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/scripts/default_auth.sh b/scripts/default_auth.sh
@@ -2,8 +2,9 @@
 set -euo pipefail
 pushd $(dirname "$0")/..
 
-export RPC_URL="http://localhost:5050";
-#export RPC_URL="https://api.cartridge.gg/x/rollyourown/katana";
+#export RPC_URL="http://localhost:5050";
+export RPC_URL="https://api.cartridge.gg/x/rollyourown/katana";
+
 export WORLD_ADDRESS="0x3c3dfeb374720dfd73554dc2b9e0583cb9668efb3055d07d1533afa5d219fd5";
 
 # enable system -> component authorizations

diff --git a/src/constants.cairo b/src/constants.cairo
@@ -3,10 +3,11 @@ const SCALING_FACTOR: u128 = 10_000;
 const TRAVEL_RISK: u8 = 30; // 30% chance of mugged
 const RUN_CHANCE: u8 = 50; // 50% chance of successfully getting away
 
+
 const BASE_PAYMENT: u128 = 400_0000; // base payment is $400
 
 // starting stats
-const STARTING_CASH: u128 = 2000_0000; // $2000
+const STARTING_CASH: u128 = 4000_0000; // $4000
 const STARTING_BAG_LIMIT: usize = 100; // inventory size
 const STARTING_HEALTH: u8 = 100;
 

diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsx
@@ -122,7 +122,7 @@ const Header = ({ back }: HeaderProps) => {
                           gameEntity.maxTurns - playerEntity.turnsRemaining + 1
                         }/${gameEntity.maxTurns + 1}`}
                   </Text>
-                </HStack>  */}
+                </HStack> */}
               </HStack>
             </Flex>
           </HStack>
@@ -151,7 +151,6 @@ const Header = ({ back }: HeaderProps) => {
               : "Create Burner"}
           </Button>
         )}
-
         {isMobile && <MobileMenu />}
       </HStack>
     </HStack>

diff --git a/web/src/pages/[gameId]/event/decision.tsx b/web/src/pages/[gameId]/event/decision.tsx
@@ -14,6 +14,7 @@ import { Footer } from "@/components/Footer";
 import Button from "@/components/Button";
 import { playSound, Sounds } from "@/hooks/sound";
 
+
 const BASE_PAYMENT = 400;
 
 export default function Decision() {

diff --git a/web/src/pages/index.tsx b/web/src/pages/index.tsx
@@ -29,6 +29,7 @@ import { useState } from "react";
 import HomeLeftPanel from "@/components/HomeLeftPanel";
 import Tutorial from "@/components/Tutorial";
 
+
 // hardcode game params for now
 const START_TIME = 0;
 const MAX_PLAYERS = 1;
@@ -42,10 +43,11 @@ export default function Home() {
   const { resetAll } = usePlayerStore();
   const { toast } = useToast();
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [isTutorialOpen, setIsTutorialOpen] = useState(false);
 
+  const [isTutorialOpen, setIsTutorialOpen] = useState(false);
   const isLocal =  true;
 
+
   return (
     <Layout CustomLeftPanel={HomeLeftPanel}>
       <VStack boxSize="full" gap="10px" justify="center">
@@ -97,6 +99,7 @@ export default function Home() {
                 </Button>
               </>
             )}
+
           </HStack>
         </Card>
 
@@ -171,3 +174,4 @@ const Game = ({
     </HStack>
   </HStack>
 );
+