ultimate-dominion · ECWireless · Aug 22, 2024 · Aug 22, 2024 · Aug 22, 2024 · Aug 22, 2024
diff --git a/packages/client/src/components/BattleOutcomeModal.tsx b/packages/client/src/components/BattleOutcomeModal.tsx
@@ -53,7 +53,7 @@ export const BattleOutcomeModal: React.FC<BattleOutcomeModalProps> = ({
   const {
     components: { Items, ItemsBaseURI, ItemsTokenURI, Levels },
   } = useMUD();
-  const { character, refreshCharacter } = useCharacter();
+  const { character } = useCharacter();
   const { onContinueToBattleOutcome, opponent } = useBattle();
 
   const [armor, setArmor] = useState<Armor[]>([]);
@@ -63,14 +63,8 @@ export const BattleOutcomeModal: React.FC<BattleOutcomeModalProps> = ({
   const onAcknowledge = useCallback(() => {
     localStorage.setItem(BATTLE_OUTCOME_SEEN_KEY, battleOutcome.encounterId);
     onContinueToBattleOutcome(false);
-    refreshCharacter();
     onClose();
-  }, [
-    battleOutcome.encounterId,
-    onContinueToBattleOutcome,
-    onClose,
-    refreshCharacter,
-  ]);
+  }, [battleOutcome.encounterId, onContinueToBattleOutcome, onClose]);
 
   const nextLevelXpRequirement =
     useComponentValue(

diff --git a/packages/client/src/components/ItemCard.tsx b/packages/client/src/components/ItemCard.tsx
@@ -14,6 +14,8 @@ import { GiAxeSword, GiRogue } from 'react-icons/gi';
 
 import { type Armor, StatsClasses, type Weapon } from '../utils/types';
 
+const getStatSymbol = (stat: string): string => (Number(stat) >= 0 ? '+' : '');
+
 type ItemCardProps = (Armor | Weapon) & {
   isEquipped?: boolean;
   onClick?: () => void;
@@ -65,10 +67,12 @@ export const ItemCard: React.FC<ItemCardProps> = ({
         </Text>
 
         <Text size={{ base: '2xs', sm: 'sm' }}>
-          STR+{strModifier} AGI+{agiModifier} INT+
+          STR{getStatSymbol(strModifier)}
+          {strModifier} AGI{getStatSymbol(agiModifier)}
+          {agiModifier} INT{getStatSymbol(intModifier)}
           {intModifier}{' '}
           {(item as Armor).armorModifier
-            ? `ARM+${(item as Armor).armorModifier}`
+            ? `ARM${getStatSymbol((item as Armor).armorModifier)}${(item as Armor).armorModifier}`
             : ''}
         </Text>
       </CardBody>
@@ -109,12 +113,12 @@ export const ItemCardSmall: React.FC<ItemCardProps> = ({
       <Box>
         <Text size="xs">{item.name.slice(0, -3)}</Text>
         <Text size="xs">
-          STR+
-          {item.strModifier} AGI+
-          {item.agiModifier} INT+
-          {item.intModifier}
+          STR{getStatSymbol(item.strModifier)}
+          {item.strModifier} AGI{getStatSymbol(item.agiModifier)}
+          {item.agiModifier} INT{getStatSymbol(item.intModifier)}
+          {item.intModifier}{' '}
           {(item as Armor).armorModifier
-            ? ` ARM+${(item as Armor).armorModifier}`
+            ? `ARM${getStatSymbol((item as Armor).armorModifier)}${(item as Armor).armorModifier}`
             : ''}
         </Text>
       </Box>

diff --git a/packages/client/src/contexts/BattleContext.tsx b/packages/client/src/contexts/BattleContext.tsx
@@ -73,7 +73,7 @@ export const BattleProvider = ({
     delegatorAddress,
     systemCalls: { endTurn },
   } = useMUD();
-  const { character } = useCharacter();
+  const { character, refreshCharacter } = useCharacter();
   const { allMonsters, allCharacters } = useMap();
 
   const [attackingItemId, setAttackingItemId] = useState<null | string>(null);
@@ -272,6 +272,8 @@ export const BattleProvider = ({
 
         localStorage.removeItem(CURRENT_BATTLE_OPPONENT_TURN_KEY);
         localStorage.removeItem(CURRENT_BATTLE_USER_TURN_KEY);
+
+        refreshCharacter();
       } catch (e) {
         renderError((e as Error)?.message ?? 'Failed to attack.', e);
       } finally {
@@ -285,6 +287,7 @@ export const BattleProvider = ({
       delegatorAddress,
       endTurn,
       opponent,
+      refreshCharacter,
       renderError,
     ],
   );

diff --git a/packages/client/src/lib/mud/createSystemCalls.ts b/packages/client/src/lib/mud/createSystemCalls.ts
@@ -180,11 +180,16 @@ export function createSystemCalls(
         functionName: 'UD__endTurn',
       });
 
-      const tx = await worldContract.write.UD__endTurn([
-        encounterId.toString() as `0x${string}`,
-        playerId.toString() as `0x${string}`,
-        actions,
-      ]);
+      const tx = await worldContract.write.UD__endTurn(
+        [
+          encounterId.toString() as `0x${string}`,
+          playerId.toString() as `0x${string}`,
+          actions,
+        ],
+        {
+          gas: BigInt('10000000'),
+        },
+      );
 
       await waitForTransaction(tx);
 
@@ -407,11 +412,12 @@ export function createSystemCalls(
     });
 
     try {
-      const tx = await worldContract.write.UD__move([
-        characterEntity.toString() as `0x${string}`,
-        x,
-        y,
-      ]);
+      const tx = await worldContract.write.UD__move(
+        [characterEntity.toString() as `0x${string}`, x, y],
+        {
+          gas: BigInt('10000000'),
+        },
+      );
       await waitForTransaction(tx);
 
       const { x: newX, y: newY } = getComponentValueStrict(

diff --git a/packages/client/src/pages/CharacterCreation.tsx b/packages/client/src/pages/CharacterCreation.tsx
@@ -38,12 +38,7 @@ import {
   shortenAddress,
   uriToHttp,
 } from '../utils/helpers';
-import {
-  type Armor,
-  ItemType,
-  StatsClasses,
-  type Weapon,
-} from '../utils/types';
+import { type Armor, StatsClasses, type Weapon } from '../utils/types';
 
 export const CharacterCreation = (): JSX.Element => {
   const navigate = useNavigate();
@@ -181,31 +176,20 @@ export const CharacterCreation = (): JSX.Element => {
   );
 
   useEffect(() => {
-    const starterItemTokenIds = Array.from(runQuery([Has(StarterItems)]))
-      .map(entity => {
+    const starterItemTokenIds = Array.from(runQuery([Has(StarterItems)])).map(
+      entity => {
         const tokenIds = getComponentValueStrict(StarterItems, entity).itemIds;
         return tokenIds;
-      })
-      .flat()
-      .filter((value, index, self) => self.indexOf(value) === index);
-
-    const starterItemType = starterItemTokenIds.map(tokenId => {
-      const tokenIdEntity = encodeEntity({ tokenId: 'uint256' }, { tokenId });
-      const itemTemplate = getComponentValueStrict(Items, tokenIdEntity);
-
-      return {
-        itemType: itemTemplate.itemType,
-        tokenId,
-      };
-    });
+      },
+    );
 
-    const starterArmorTokenIds = starterItemType
-      .filter(item => item.itemType === ItemType.Armor)
-      .map(item => item.tokenId);
+    const starterArmorTokenIds = starterItemTokenIds
+      .map(item => item[0] as bigint)
+      .filter((value, index, self) => self.indexOf(value) === index);
 
-    const starterWeaponTokenIds = starterItemType
-      .filter(item => item.itemType === ItemType.Weapon)
-      .map(item => item.tokenId);
+    const starterWeaponTokenIds = starterItemTokenIds.map(
+      item => item[1] as bigint,
+    );
 
     fetchStarterItems(starterArmorTokenIds, starterWeaponTokenIds);
   }, [fetchStarterItems, Items, StarterItems]);

diff --git a/packages/contracts/items.json b/packages/contracts/items.json
@@ -11,59 +11,151 @@
         "classRestrictions": [],
         "hitPointModifier": 0,
         "intModifier": 0,
-        "minLevel": 0,
+        "minLevel": 1,
+        "strModifier": 0
+      }
+    },
+    {
+      "dropChance": 10000000,
+      "initialSupply": 10000000000000000000,
+      "metadataUri": "2_steel_breastplate.json",
+      "name": "Steel Breastplate",
+      "stats": {
+        "agiModifier": -3,
+        "armorModifier": 3,
+        "classRestrictions": [0],
+        "hitPointModifier": 0,
+        "intModifier": 0,
+        "minLevel": 3,
         "strModifier": 0
       }
+    },
+    {
+      "dropChance": 10000000,
+      "initialSupply": 10000000000000000000,
+      "metadataUri": "3_light_chainmail.json",
+      "name": "Light Chainmail",
+      "stats": {
+        "agiModifier": -1,
+        "armorModifier": 2,
+        "classRestrictions": [1],
+        "hitPointModifier": 0,
+        "intModifier": 0,
+        "minLevel": 3,
+        "strModifier": 0
+      }
+    },
+    {
+      "dropChance": 10000000,
+      "initialSupply": 10000000000000000000,
+      "metadataUri": "4_apprentice_robe.json",
+      "name": "Apprentice Robe",
+      "stats": {
+        "agiModifier": 0,
+        "armorModifier": 1,
+        "classRestrictions": [2],
+        "hitPointModifier": 0,
+        "intModifier": 3,
+        "minLevel": 3,
+        "strModifier": 0
+      }
+    },
+    {
+      "dropChance": 5000000,
+      "initialSupply": 10000000000000000000,
+      "metadataUri": "5_enchanted_armor.json",
+      "name": "Enchanted Armor",
+      "stats": {
+        "agiModifier": -2,
+        "armorModifier": 4,
+        "classRestrictions": [0, 2],
+        "hitPointModifier": 0,
+        "intModifier": 3,
+        "minLevel": 5,
+        "strModifier": 3
+      }
     }
   ],
-  "metadataUriPrefix": "ipfs://QmPooDEwqeGh3Qszig7veD1yEoa6EoVyDUmLqWUZ1riiDS/",
+  "metadataUriPrefix": "ipfs://QmcEgdrkuCYj9xjoo8ofuDfdr9kyAk8CCYpzqeMA4f9hp3/",
   "weapons": [
     {
       "dropChance": 20000000,
       "initialSupply": 10000000000000000000,
-      "metadataUri": "2_rusty_sword.json",
-      "name": "Rusty Sword",
+      "metadataUri": "6_rusty_axe.json",
+      "name": "Rusty Axe",
       "stats": {
-        "agiModifier": 2,
+        "agiModifier": 0,
         "classRestrictions": [],
         "hitPointModifier": 0,
-        "intModifier": 1,
+        "intModifier": 0,
         "maxDamage": 5,
         "minDamage": 1,
         "minLevel": 1,
-        "strModifier": 5
+        "strModifier": 2
       }
     },
     {
-      "dropChance": 20000000,
+      "dropChance": 10000000,
       "initialSupply": 10000000000000000000,
-      "metadataUri": "3_cracked_dagger.json",
-      "name": "Cracked Dagger",
+      "metadataUri": "7_iron_sword.json",
+      "name": "Iron Sword",
       "stats": {
-        "agiModifier": 4,
-        "classRestrictions": [],
+        "agiModifier": 0,
+        "classRestrictions": [0],
         "hitPointModifier": 0,
-        "intModifier": 2,
-        "maxDamage": 3,
-        "minDamage": 1,
-        "minLevel": 1,
-        "strModifier": 2
+        "intModifier": 0,
+        "maxDamage": 8,
+        "minDamage": 4,
+        "minLevel": 3,
+        "strModifier": 5
       }
     },
     {
-      "dropChance": 20000000,
+      "dropChance": 10000000,
       "initialSupply": 10000000000000000000,
-      "metadataUri": "4_cobbled_wand.json",
-      "name": "Cobbled Wand",
+      "metadataUri": "8_novice_staff.json",
+      "name": "Novice Staff",
       "stats": {
-        "agiModifier": 2,
-        "classRestrictions": [],
+        "agiModifier": 0,
+        "classRestrictions": [2],
         "hitPointModifier": 0,
         "intModifier": 5,
-        "maxDamage": 2,
-        "minDamage": 1,
-        "minLevel": 1,
-        "strModifier": 1
+        "maxDamage": 8,
+        "minDamage": 4,
+        "minLevel": 3,
+        "strModifier": 0
+      }
+    },
+    {
+      "dropChance": 10000000,
+      "initialSupply": 10000000000000000000,
+      "metadataUri": "9_throwing_dagger.json",
+      "name": "Throwing Dagger",
+      "stats": {
+        "agiModifier": 5,
+        "classRestrictions": [1],
+        "hitPointModifier": 0,
+        "intModifier": 0,
+        "maxDamage": 8,
+        "minDamage": 4,
+        "minLevel": 3,
+        "strModifier": 0
+      }
+    },
+    {
+      "dropChance": 5000000,
+      "initialSupply": 10000000000000000000,
+      "metadataUri": "10_steel_sword.json",
+      "name": "Steel Sword",
+      "stats": {
+        "agiModifier": 0,
+        "classRestrictions": [0],
+        "hitPointModifier": 0,
+        "intModifier": 0,
+        "maxDamage": 15,
+        "minDamage": 10,
+        "minLevel": 5,
+        "strModifier": 9
       }
     }
   ]