Skip to content

Add first draft of all monsters #58

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
Jul 8, 2024
Merged

Add first draft of all monsters #58

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
85689bb
Render monster color based on class
ECWireless Jul 8, 2024
2723b75
Add remaining first draft of monsters
ECWireless Jul 8, 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
22 changes: 18 additions & 4 deletions packages/client/src/components/TileDetailsPanel/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import {
import { useCharacter } from '../../contexts/CharacterContext';
import { useMUD } from '../../contexts/MUDContext';
import { fetchMetadataFromUri, uriToHttp } from '../../utils/helpers';
import type { Character, Monster } from '../../utils/types';
import { type Character, type Monster } from '../../utils/types';

const ROW_HEIGHT = { base: 5, md: 8, lg: 10 };

Expand Down Expand Up @@ -191,11 +191,17 @@ export const TileDetailsPanel = (): JSX.Element => {

const { mobMetadata: metadataURI } = mobData;

const monsterTemplateStats =
(await worldContract.read.UD__getMonsterStats([
monsterId as `0x${string}`,
])) as { class: number };

const fetachedMetadata = await fetchMetadataFromUri(
uriToHttp(metadataURI)[0],
);

return {
class: monsterTemplateStats.class,
level: monsterStats.level.toString(),
mobId,
monsterId,
Expand All @@ -206,7 +212,7 @@ export const TileDetailsPanel = (): JSX.Element => {

setMonsters(_monsters);
},
[Mobs, Stats],
[Mobs, Stats, worldContract],
);

useEffect(() => {
Expand Down Expand Up @@ -303,10 +309,15 @@ export const TileDetailsPanel = (): JSX.Element => {
);
};

const MONSTER_COLORS = {
[0]: 'red',
[1]: 'yellow',
[2]: 'green',
};

const MonsterRow = ({ monster }: { monster: Monster }) => {
const { level, name } = monster;

const color = 'red';
const isFighting = false;

return (
Expand All @@ -329,7 +340,10 @@ const MonsterRow = ({ monster }: { monster: Monster }) => {
cursor: 'pointer',
}}
>
<Text color={color} size={{ base: '3xs', sm: '2xs', md: 'sm', lg: 'md' }}>
<Text
color={MONSTER_COLORS[monster.class]}
size={{ base: '3xs', sm: '2xs', md: 'sm', lg: 'md' }}
>
{name}
</Text>
<Text
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/lib/mud/createSystemCalls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
toBytes,
} from 'viem';

import { CharacterClasses } from '../../utils/types';
import { StatsClasses } from '../../utils/types';
import { ClientComponents } from './createClientComponents';
import { SetupNetworkResult } from './setupNetwork';

Expand Down Expand Up @@ -121,7 +121,7 @@ export function createSystemCalls(

const rollStats = async (
characterEntity: Entity,
characterClass: CharacterClasses,
characterClass: StatsClasses,
) => {
try {
const entropyAddress = await worldContract.read.UD__getEntropy();
Expand Down
16 changes: 8 additions & 8 deletions packages/client/src/pages/CharacterCreation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import { useToast } from '../hooks/useToast';
import { useUploadFile } from '../hooks/useUploadFile';
import { API_URL } from '../utils/constants';
import { shortenAddress } from '../utils/helpers';
import { CharacterClasses } from '../utils/types';
import { StatsClasses } from '../utils/types';

export const CharacterCreation = (): JSX.Element => {
const navigate = useNavigate();
Expand All @@ -56,8 +56,8 @@ export const CharacterCreation = (): JSX.Element => {

const [name, setName] = useState('');
const [description, setDescription] = useState('');
const [characterClass, setCharacterClass] = useState<CharacterClasses>(
CharacterClasses.Warrior,
const [characterClass, setCharacterClass] = useState<StatsClasses>(
StatsClasses.Warrior,
);

const [isCreating, setIsCreating] = useState(false);
Expand Down Expand Up @@ -322,7 +322,7 @@ export const CharacterCreation = (): JSX.Element => {
</VStack>
<Text>
Class:{' '}
{rolledOnce ? CharacterClasses[character.characterClass] : 'None'}
{rolledOnce ? StatsClasses[character.characterClass] : 'None'}
</Text>
</VStack>
</Box>
Expand Down Expand Up @@ -444,23 +444,23 @@ export const CharacterCreation = (): JSX.Element => {
</Heading>
<ButtonGroup justifyContent="space-between">
<Button
onClick={() => setCharacterClass(CharacterClasses.Warrior)}
onClick={() => setCharacterClass(StatsClasses.Warrior)}
size="sm"
variant={characterClass === 0 ? 'solid' : 'outline'}
w="150px"
>
Warrior
</Button>
<Button
onClick={() => setCharacterClass(CharacterClasses.Rogue)}
onClick={() => setCharacterClass(StatsClasses.Rogue)}
size="sm"
variant={characterClass === 1 ? 'solid' : 'outline'}
w="150px"
>
Rogue
</Button>
<Button
onClick={() => setCharacterClass(CharacterClasses.Mage)}
onClick={() => setCharacterClass(StatsClasses.Mage)}
size="sm"
variant={characterClass === 2 ? 'solid' : 'outline'}
w="150px"
Expand All @@ -475,7 +475,7 @@ export const CharacterCreation = (): JSX.Element => {
<Text color="red" fontSize="sm" mt={2}>
Your current class is{' '}
<Text as="span" fontWeight={700}>
{CharacterClasses[character.characterClass]}
{StatsClasses[character.characterClass]}
</Text>
. Re-roll stats to change class.
</Text>
Expand Down
5 changes: 3 additions & 2 deletions packages/client/src/utils/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Entity } from '@latticexyz/recs';
export type Character = CharacterData & CharacterStats;

export type CharacterData = Metadata & {
characterClass: CharacterClasses;
characterClass: StatsClasses;
characterId: Entity;
goldBalance: string;
locked: boolean;
Expand All @@ -20,7 +20,7 @@ export type CharacterStats = {
strength: string;
};

export enum CharacterClasses {
export enum StatsClasses {
Warrior,
Rogue,
Mage,
Expand All @@ -33,6 +33,7 @@ export type Metadata = {
};

export type Monster = Metadata & {
class: StatsClasses;
level: string;
mobId: string;
monsterId: Entity;
Expand Down
Loading