Skip to content

Get item stats through decoding bytes #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ECWireless merged 2 commits into from
Aug 5, 2024
Merged

Get item stats through decoding bytes #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
034509a
Get item stats through decoding bytes
ECWireless Aug 5, 2024
6b9acac
Tweak starter item modifiers
ECWireless Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 29 additions & 32 deletions packages/client/src/contexts/CharacterContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ import {
import { formatEther, hexToString, zeroHash } from 'viem';

import { useToast } from '../hooks/useToast';
import { fetchMetadataFromUri, uriToHttp } from '../utils/helpers';
import {
decodeArmorStats,
decodeWeaponStats,
fetchMetadataFromUri,
uriToHttp,
} from '../utils/helpers';
import type {
Armor,
Character,
CharacterData,
EntityStats,
StatsClasses,
Weapon,
} from '../utils/types';
import { useMUD } from './MUDContext';
Expand Down Expand Up @@ -55,6 +59,7 @@ export const CharacterProvider = ({
CharacterEquipment,
Characters,
CharactersTokenURI,
Items,
ItemsBaseURI,
ItemsOwners,
ItemsTokenURI,
Expand Down Expand Up @@ -238,16 +243,14 @@ export const CharacterProvider = ({

const fullArmor = await Promise.all(
_armor.map(async item => {
const itemTemplateStats =
await worldContract.read.UD__getArmorStats([
BigInt(item.tokenId),
]);

const tokenIdEntity = encodeEntity(
{ tokenId: 'uint256' },
{ tokenId: BigInt(item.tokenId) },
);

const itemTemplate = getComponentValueStrict(Items, tokenIdEntity);
const decodedArmorStats = decodeArmorStats(itemTemplate.stats);

const baseURI = getComponentValueStrict(
ItemsBaseURI,
singletonEntity,
Expand All @@ -264,35 +267,31 @@ export const CharacterProvider = ({

return {
...metadata,
agiModifier: itemTemplateStats.agiModifier.toString(),
armorModifier: itemTemplateStats.armorModifier.toString(),
agiModifier: decodedArmorStats.agiModifier,
armorModifier: decodedArmorStats.armorModifier,
balance: item.balance,
classRestrictions: itemTemplateStats.classRestrictions.map(
(classRestriction: number) => classRestriction as StatsClasses,
),
hitPointModifier: itemTemplateStats.hitPointModifier.toString(),
intModifier: itemTemplateStats.intModifier.toString(),
classRestrictions: decodedArmorStats.classRestrictions,
hitPointModifier: decodedArmorStats.hitPointModifier,
intModifier: decodedArmorStats.intModifier,
itemId: item.itemId,
minLevel: itemTemplateStats.minLevel.toString(),
minLevel: decodedArmorStats.minLevel,
owner: item.owner,
strModifier: itemTemplateStats.strModifier.toString(),
strModifier: decodedArmorStats.strModifier,
tokenId: item.tokenId,
} as Armor;
}),
);

const fullWeapons = await Promise.all(
_weapons.map(async item => {
const itemTemplateStats =
await worldContract.read.UD__getWeaponStats([
BigInt(item.tokenId),
]);

const tokenIdEntity = encodeEntity(
{ tokenId: 'uint256' },
{ tokenId: BigInt(item.tokenId) },
);

const itemTemplate = getComponentValueStrict(Items, tokenIdEntity);
const decodedWeaponStats = decodeWeaponStats(itemTemplate.stats);

const baseURI = getComponentValueStrict(
ItemsBaseURI,
singletonEntity,
Expand All @@ -309,19 +308,17 @@ export const CharacterProvider = ({

return {
...metadata,
agiModifier: itemTemplateStats.agiModifier.toString(),
agiModifier: decodedWeaponStats.agiModifier,
balance: item.balance,
classRestrictions: itemTemplateStats.classRestrictions.map(
(classRestriction: number) => classRestriction as StatsClasses,
),
hitPointModifier: itemTemplateStats.hitPointModifier.toString(),
intModifier: itemTemplateStats.intModifier.toString(),
classRestrictions: decodedWeaponStats.classRestrictions,
hitPointModifier: decodedWeaponStats.hitPointModifier,
intModifier: decodedWeaponStats.intModifier,
itemId: item.itemId,
maxDamage: itemTemplateStats.maxDamage.toString(),
minDamage: itemTemplateStats.minDamage.toString(),
minLevel: itemTemplateStats.minLevel.toString(),
maxDamage: decodedWeaponStats.maxDamage,
minDamage: decodedWeaponStats.minDamage,
minLevel: decodedWeaponStats.minLevel,
owner: item.owner,
strModifier: itemTemplateStats.strModifier.toString(),
strModifier: decodedWeaponStats.strModifier,
tokenId: item.tokenId,
} as Weapon;
}),
Expand All @@ -336,7 +333,7 @@ export const CharacterProvider = ({
);
}
},
[ItemsBaseURI, ItemsOwners, ItemsTokenURI, renderError, worldContract],
[Items, ItemsBaseURI, ItemsOwners, ItemsTokenURI, renderError],
);

useEffect(() => {
Expand Down
55 changes: 20 additions & 35 deletions packages/client/src/pages/Character.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ import { useToast } from '../hooks/useToast';
import { HOME_PATH, LEADERBOARD_PATH } from '../Routes';
import { MAX_EQUIPPED_ARMOR, MAX_EQUIPPED_WEAPONS } from '../utils/constants';
import {
decodeArmorStats,
decodeCharacterId,
decodeWeaponStats,
fetchMetadataFromUri,
uriToHttp,
} from '../utils/helpers';
Expand Down Expand Up @@ -445,7 +447,6 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => {
ItemsOwners,
ItemsTokenURI,
},
network: { worldContract },
} = useMUD();

const {
Expand Down Expand Up @@ -499,6 +500,7 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => {
itemId: entity,
itemType: itemTemplate.itemType,
owner,
stats: itemTemplate.stats,
tokenId: tokenId.toString(),
tokenIdEntity,
};
Expand All @@ -515,10 +517,7 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => {

const fullArmor = await Promise.all(
_armor.map(async item => {
const itemTemplateStats =
await worldContract.read.UD__getArmorStats([
BigInt(item.tokenId),
]);
const decodedArmorStats = decodeArmorStats(item.stats);

const baseURI = getComponentValueStrict(
ItemsBaseURI,
Expand All @@ -536,27 +535,22 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => {

return {
...metadata,
agiModifier: itemTemplateStats.agiModifier.toString(),
armorModifier: itemTemplateStats.armorModifier.toString(),
classRestrictions: itemTemplateStats.classRestrictions.map(
(classRestriction: number) => classRestriction as StatsClasses,
),
hitPointModifier: itemTemplateStats.hitPointModifier.toString(),
intModifier: itemTemplateStats.intModifier.toString(),
agiModifier: decodedArmorStats.agiModifier,
armorModifier: decodedArmorStats.armorModifier,
classRestrictions: decodedArmorStats.classRestrictions,
hitPointModifier: decodedArmorStats.hitPointModifier,
intModifier: decodedArmorStats.intModifier,
itemId: item.itemId,
owner: item.owner,
strModifier: itemTemplateStats.strModifier.toString(),
strModifier: decodedArmorStats.strModifier,
tokenId: item.tokenId,
} as Armor;
}),
);

const fullWeapons = await Promise.all(
_weapons.map(async item => {
const itemTemplateStats =
await worldContract.read.UD__getWeaponStats([
BigInt(item.tokenId),
]);
const decodedWeaponStats = decodeWeaponStats(item.stats);

const baseURI = getComponentValueStrict(
ItemsBaseURI,
Expand All @@ -574,19 +568,17 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => {

return {
...metadata,
agiModifier: itemTemplateStats.agiModifier.toString(),
agiModifier: decodedWeaponStats.agiModifier,
balance: item.balance,
classRestrictions: itemTemplateStats.classRestrictions.map(
(classRestriction: number) => classRestriction as StatsClasses,
),
hitPointModifier: itemTemplateStats.hitPointModifier.toString(),
intModifier: itemTemplateStats.intModifier.toString(),
classRestrictions: decodedWeaponStats.classRestrictions,
hitPointModifier: decodedWeaponStats.hitPointModifier,
intModifier: decodedWeaponStats.intModifier,
itemId: item.itemId,
maxDamage: itemTemplateStats.maxDamage.toString(),
minDamage: itemTemplateStats.minDamage.toString(),
minLevel: itemTemplateStats.minLevel.toString(),
maxDamage: decodedWeaponStats.maxDamage,
minDamage: decodedWeaponStats.minDamage,
minLevel: decodedWeaponStats.minLevel,
owner: item.owner,
strModifier: itemTemplateStats.strModifier.toString(),
strModifier: decodedWeaponStats.strModifier,
tokenId: item.tokenId,
} as Weapon;
}),
Expand All @@ -603,14 +595,7 @@ const ItemsPanel = ({ character }: { character: Character }): JSX.Element => {
setIsLoadingItems(false);
}
},
[
Items,
ItemsBaseURI,
ItemsOwners,
ItemsTokenURI,
renderError,
worldContract,
],
[Items, ItemsBaseURI, ItemsOwners, ItemsTokenURI, renderError],
);

useEffect(() => {
Expand Down
36 changes: 15 additions & 21 deletions packages/client/src/pages/CharacterCreation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { useUploadFile } from '../hooks/useUploadFile';
import { GAME_BOARD_PATH, HOME_PATH } from '../Routes';
import { API_URL } from '../utils/constants';
import {
decodeWeaponStats,
fetchMetadataFromUri,
shortenAddress,
uriToHttp,
Expand All @@ -44,14 +45,14 @@ export const CharacterCreation = (): JSX.Element => {
const { isConnected } = useAccount();
const {
components: {
Items,
ItemsBaseURI,
ItemsTokenURI,
StarterItems,
UltimateDominionConfig,
},
delegatorAddress,
isSynced,
network: { worldContract },
systemCalls: { enterGame, mintCharacter, rollStats },
} = useMUD();
const { character, isRefreshing, refreshCharacter } = useCharacter();
Expand Down Expand Up @@ -96,15 +97,14 @@ export const CharacterCreation = (): JSX.Element => {
try {
const _items: Weapon[] = await Promise.all(
starterWeaponTokenIds.map(async tokenId => {
const itemTemplateStats = await worldContract.read.UD__getWeaponStats(
[tokenId],
);

const tokenIdEntity = encodeEntity(
{ tokenId: 'uint256' },
{ tokenId: tokenId },
{ tokenId },
);

const itemTemplate = getComponentValueStrict(Items, tokenIdEntity);
const decodedWeaponStats = decodeWeaponStats(itemTemplate.stats);

const baseURI = getComponentValueStrict(
ItemsBaseURI,
singletonEntity,
Expand All @@ -120,14 +120,14 @@ export const CharacterCreation = (): JSX.Element => {
);

return {
agiModifier: itemTemplateStats.agiModifier.toString(),
classRestrictions: itemTemplateStats.classRestrictions,
hitPointModifier: itemTemplateStats.hitPointModifier.toString(),
intModifier: itemTemplateStats.intModifier.toString(),
maxDamage: itemTemplateStats.maxDamage.toString(),
minDamage: itemTemplateStats.minDamage.toString(),
minLevel: itemTemplateStats.minLevel.toString(),
strModifier: itemTemplateStats.strModifier.toString(),
agiModifier: decodedWeaponStats.agiModifier,
classRestrictions: decodedWeaponStats.classRestrictions,
hitPointModifier: decodedWeaponStats.hitPointModifier,
intModifier: decodedWeaponStats.intModifier,
maxDamage: decodedWeaponStats.maxDamage,
minDamage: decodedWeaponStats.minDamage,
minLevel: decodedWeaponStats.minLevel,
strModifier: decodedWeaponStats.strModifier,
...fetachedMetadata,
} as Weapon;
}),
Expand All @@ -137,13 +137,7 @@ export const CharacterCreation = (): JSX.Element => {
} catch (e) {
renderError((e as Error)?.message ?? 'Error fetching starter item.', e);
}
}, [
ItemsBaseURI,
ItemsTokenURI,
renderError,
starterWeaponTokenIds,
worldContract,
]);
}, [Items, ItemsBaseURI, ItemsTokenURI, renderError, starterWeaponTokenIds]);

useEffect(() => {
fetchStarterWeapons();
Expand Down
Loading