diff --git a/web/src/components/Leaderboard.tsx b/web/src/components/Leaderboard.tsx index cf25391b4..ed606c7db 100644 --- a/web/src/components/Leaderboard.tsx +++ b/web/src/components/Leaderboard.tsx @@ -120,7 +120,7 @@ const Leaderboard = ({ > {score.dead ? ( - + ) : ( {"."} - {formatCash(score.cash)} + + {formatCash(score.cash)} + ); diff --git a/web/src/components/avatar/avatars/Catridge.tsx b/web/src/components/avatar/avatars/Catridge.tsx deleted file mode 100644 index edb104786..000000000 --- a/web/src/components/avatar/avatars/Catridge.tsx +++ /dev/null @@ -1,136 +0,0 @@ -import { AvatarPathProps } from "../Avatar"; - -export const Catridge = ({ color, hasCrown }: AvatarPathProps) => { - let path; - switch (color) { - // Green color - case "green": - path = hasCrown ? ( - - - - - - - - - - - - - - - - - - - - - - - - - - - ) : ( - - - - - - - - - - - - - - - - - - - - - - - - - ); - break; - // Yellow color - case "yellow": - path = hasCrown ? ( - - - - - - - - - - - - - - - - - - - - - - - - - - - ) : ( - - - - - - - - - - - - - - - - - - - - - - - - - ); - break; - } - return path; -}; diff --git a/web/src/components/avatar/avatars/index.tsx b/web/src/components/avatar/avatars/index.tsx index 8a768bc0e..aef861c34 100644 --- a/web/src/components/avatar/avatars/index.tsx +++ b/web/src/components/avatar/avatars/index.tsx @@ -1,4 +1,3 @@ -import { Catridge } from "./Catridge"; import { PersonA } from "./PersonA"; import { PersonB } from "./PersonB"; import { PersonC } from "./PersonC"; @@ -13,7 +12,6 @@ import { PersonK } from "./PersonK"; import { PersonL } from "./PersonL"; export const avatars = { - Catridge: Catridge, PersonA: PersonA, PersonB: PersonB, PersonC: PersonC, diff --git a/web/src/components/icons/Skull.tsx b/web/src/components/icons/Skull.tsx index 78b869654..944080dc4 100644 --- a/web/src/components/icons/Skull.tsx +++ b/web/src/components/icons/Skull.tsx @@ -1,9 +1,33 @@ import { Icon, IconProps } from "."; +import { AvatarPathProps } from "@/components/avatar/Avatar"; -export const Skull = (props: IconProps) => { +export const Skull = ({ + hasCrown, + color, + ...props +}: IconProps & AvatarPathProps) => { return ( - - + + <> + + {hasCrown && ( + <> + + + + )} + ); }; diff --git a/web/src/pages/[gameId]/end.tsx b/web/src/pages/[gameId]/end.tsx index 7a2396f57..f7b241b86 100644 --- a/web/src/pages/[gameId]/end.tsx +++ b/web/src/pages/[gameId]/end.tsx @@ -117,7 +117,7 @@ export default function End() { : } + icon={isDead ? : } /> {/*