From 02184b2765375bbee8b50695b4feb5e5a255e6c1 Mon Sep 17 00:00:00 2001
From: Starknet Dev <starknetdev@gmail.com>
Date: Tue, 28 May 2024 08:59:56 +0100
Subject: [PATCH] - increase max bag amount - remove interlude on beast screen
 - fetch entropy on initial load and after 10 secs - update contracts

---
 indexer/env-sepolia                           |   2 +-
 .../components/marketplace/MarketplaceRow.tsx |   2 +-
 .../marketplace/MarketplaceTable.tsx          |   2 +-
 ui/src/app/containers/BeastScreen.tsx         | 105 +++++-------------
 ui/src/app/containers/InventoryScreen.tsx     |   2 +-
 ui/src/app/containers/UpgradeScreen.tsx       |  10 +-
 6 files changed, 42 insertions(+), 81 deletions(-)

diff --git a/indexer/env-sepolia b/indexer/env-sepolia
index b08e55389..04bcd44ef 100644
--- a/indexer/env-sepolia
+++ b/indexer/env-sepolia
@@ -1,4 +1,4 @@
-GAME="0x06c63851635f1e0ee0695a157292892cabaa030a8eca20a32b6a86c968c47c33"
+GAME="0xa2516792efec852999cfd1d69a3caab70a168f7bb59c257065f64281df93a5"
 START=68300
 MONGO_CONNECTION_STRING="mongodb://mongo:mongo@mongo:27017"
 MONGO_DB="mongo"
diff --git a/ui/src/app/components/marketplace/MarketplaceRow.tsx b/ui/src/app/components/marketplace/MarketplaceRow.tsx
index a901644e6..3d22fae05 100644
--- a/ui/src/app/components/marketplace/MarketplaceRow.tsx
+++ b/ui/src/app/components/marketplace/MarketplaceRow.tsx
@@ -108,7 +108,7 @@ const MarketplaceRow = ({
   ).length;
 
   const equipFull = equippedItems + purchaseEquipItems === 8;
-  const bagFull = baggedItems + purchaseNoEquipItems === 11;
+  const bagFull = baggedItems + purchaseNoEquipItems === 15;
 
   useEffect(() => {
     if (isActive) {
diff --git a/ui/src/app/components/marketplace/MarketplaceTable.tsx b/ui/src/app/components/marketplace/MarketplaceTable.tsx
index 9eeb20463..4c482f66e 100644
--- a/ui/src/app/components/marketplace/MarketplaceTable.tsx
+++ b/ui/src/app/components/marketplace/MarketplaceTable.tsx
@@ -152,7 +152,7 @@ const MarketplaceTable = ({
           {(() => {
             const item = sortedMarketLatestItems[showEquipQ ?? 0];
             const bagFull =
-              adventurerItems.filter((obj) => !obj.equipped).length == 11;
+              adventurerItems.filter((obj) => !obj.equipped).length == 15;
 
             return (
               <div
diff --git a/ui/src/app/containers/BeastScreen.tsx b/ui/src/app/containers/BeastScreen.tsx
index 8fda4fec8..9bbf1e364 100644
--- a/ui/src/app/containers/BeastScreen.tsx
+++ b/ui/src/app/containers/BeastScreen.tsx
@@ -9,7 +9,6 @@ import { processBeastName } from "@/app/lib/utils";
 import { Battle, NullBeast, ButtonData, Beast } from "@/app/types";
 import { Button } from "@/app/components/buttons/Button";
 import useUIStore from "@/app/hooks/useUIStore";
-import InterludeScreen from "@/app/containers/InterludeScreen";
 import ActionMenu from "@/app/components/menu/ActionMenu";
 import { getBlock } from "@/app/api/api";
 
@@ -37,8 +36,6 @@ export default function BeastScreen({
   const adventurer = useAdventurerStore((state) => state.adventurer);
   const loading = useLoadingStore((state) => state.loading);
   const estimatingFee = useUIStore((state) => state.estimatingFee);
-  const entropyReady = useUIStore((state) => state.entropyReady);
-  const setEntropyReady = useUIStore((state) => state.setEntropyReady);
   const resetNotification = useLoadingStore((state) => state.resetNotification);
   const [showBattleLog, setShowBattleLog] = useState(false);
   const hasBeast = useAdventurerStore((state) => state.computed.hasBeast);
@@ -172,32 +169,12 @@ export default function BeastScreen({
     </div>
   );
 
-  useEffect(() => {
-    if (adventurer?.level == 1) {
-      const interval = setInterval(async () => {
-        const entropy = await gameContract!.call("get_adventurer_entropy", [
-          adventurer?.id!,
-        ]);
-        console.log(entropy);
-        if (entropy !== BigInt(0)) {
-          setEntropyReady(true);
-          clearInterval(interval);
-        }
-      }, 10000); // We call the getAdventurerEntropy function every 30 seconds
-
-      return () => clearInterval(interval); // Cleanup on component unmount
-    }
-  }, []);
-
-  console.log(entropyReady);
-
   if (showBattleLog) {
     return <BattleLog />;
   }
 
   return (
     <div className="sm:w-2/3 flex flex-col sm:flex-row h-full">
-      {adventurer?.level == 1 && !entropyReady && <InterludeScreen />}
       <div className="sm:w-1/2 order-1 sm:order-2 h-3/4 sm:h-full">
         {hasBeast ? (
           <BeastDisplay beastData={beastData} beastsContract={beastsContract} />
@@ -213,62 +190,40 @@ export default function BeastScreen({
       <div className="flex flex-col gap-1 sm:gap-5 items-center sm:w-1/2 order-1 text-lg h-1/4 sm:h-full">
         {isAlive && (
           <>
-            {entropyReady ? (
-              <>
-                <div className="sm:hidden flex flex-row sm:flex-col gap-5 items-center justify-center sm:justify-start w-full h-3/4 sm:h-1/4">
-                  <div className="flex flex-col items-center w-1/2 sm:w-full h-1/2 sm:h-full">
-                    <ActionMenu
-                      buttonsData={attackButtonsData}
-                      size={"fill"}
-                      title="Attack"
-                    />
-                  </div>
-                  <div className="flex flex-col items-center w-1/2 sm:w-full h-1/2 sm:h-full">
-                    <ActionMenu
-                      buttonsData={fleeButtonsData}
-                      size={"fill"}
-                      title={buttonText}
-                    />
-                  </div>
+            <>
+              <div className="sm:hidden flex flex-row sm:flex-col gap-5 items-center justify-center sm:justify-start w-full h-3/4 sm:h-1/4">
+                <div className="flex flex-col items-center w-1/2 sm:w-full h-1/2 sm:h-full">
+                  <ActionMenu
+                    buttonsData={attackButtonsData}
+                    size={"fill"}
+                    title="Attack"
+                  />
+                </div>
+                <div className="flex flex-col items-center w-1/2 sm:w-full h-1/2 sm:h-full">
+                  <ActionMenu
+                    buttonsData={fleeButtonsData}
+                    size={"fill"}
+                    title={buttonText}
+                  />
                 </div>
-                <div className="hidden sm:flex flex-row gap-2 sm:flex-col items-center justify-center h-1/3 w-3/4">
-                  <div className="flex flex-col items-center justify-center h-1/2 w-full">
-                    <ActionMenu
-                      buttonsData={attackButtonsData}
-                      size={"fill"}
-                      title="Attack"
-                    />
-                  </div>
-                  <div className="flex flex-col items-center justify-center h-1/2 w-full">
-                    <ActionMenu
-                      buttonsData={fleeButtonsData}
-                      size={"fill"}
-                      title="Flee"
-                    />
-                  </div>
+              </div>
+              <div className="hidden sm:flex flex-row gap-2 sm:flex-col items-center justify-center h-1/3 w-3/4">
+                <div className="flex flex-col items-center justify-center h-1/2 w-full">
+                  <ActionMenu
+                    buttonsData={attackButtonsData}
+                    size={"fill"}
+                    title="Attack"
+                  />
                 </div>
-              </>
-            ) : (
-              <div className="flex flex-col gap-5 items-center">
-                {/* <div className="flex flex-row gap-5">
-                  <div className="flex flex-row items-center gap-2">
-                    Current:
-                    <div className="border border-terminal-green p-2">
-                      <p className="animate-pulse">{currentBlockNumber}</p>
-                    </div>
-                  </div>
-                  <div className="flex flex-row items-center gap-2">
-                    Reveal:
-                    <div className="border border-terminal-green p-2">
-                      {adventurer?.revealBlock}
-                    </div>
-                  </div>
+                <div className="flex flex-col items-center justify-center h-1/2 w-full">
+                  <ActionMenu
+                    buttonsData={fleeButtonsData}
+                    size={"fill"}
+                    title="Flee"
+                  />
                 </div>
-                <p className="text-2xl loading-ellipsis">
-                  Waiting for Block Reveal
-                </p> */}
               </div>
-            )}
+            </>
           </>
         )}
 
diff --git a/ui/src/app/containers/InventoryScreen.tsx b/ui/src/app/containers/InventoryScreen.tsx
index df24398a1..1b64cd23f 100644
--- a/ui/src/app/containers/InventoryScreen.tsx
+++ b/ui/src/app/containers/InventoryScreen.tsx
@@ -296,7 +296,7 @@ export default function InventoryScreen({
                 </span>
                 <span className="flex flex-row gap-1 text-lg items-center sm:text-3xl">
                   <LootIcon type="bag" size="w-5" />
-                  {`${bagItems.length}/${11}`}
+                  {`${bagItems.length}/${15}`}
                 </span>
               </span>
             </span>
diff --git a/ui/src/app/containers/UpgradeScreen.tsx b/ui/src/app/containers/UpgradeScreen.tsx
index 113cf190c..9e1311ec5 100644
--- a/ui/src/app/containers/UpgradeScreen.tsx
+++ b/ui/src/app/containers/UpgradeScreen.tsx
@@ -90,7 +90,7 @@ export default function UpgradeScreen({
   });
 
   useEffect(() => {
-    const interval = setInterval(async () => {
+    const fetchEntropy = async () => {
       const entropy = await gameContract!.call("get_adventurer_entropy", [
         adventurer?.id!,
       ]);
@@ -99,7 +99,13 @@ export default function UpgradeScreen({
         setEntropyReady(true);
         clearInterval(interval);
       }
-    }, 10000); // We call the getAdventurerEntropy function every 30 seconds
+    };
+
+    // Call the function immediately
+    fetchEntropy();
+
+    // Set up the interval to call the function every 10 seconds
+    const interval = setInterval(fetchEntropy, 10000);
 
     return () => clearInterval(interval); // Cleanup on component unmount
   }, []);