Merge branch 'main' into prod

mafia-rust · Dec 29, 2024 · 0c454c7 · 0c454c7
2 parents 8dedcea + 1606aa7
commit 0c454c7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 20 deletions.
diff --git a/client/src/game/messageListener.tsx b/client/src/game/messageListener.tsx
@@ -437,7 +437,7 @@ export default function messageListener(packet: ToClientPacket){
         case "yourCrossedOutOutlines":
             if(GAME_MANAGER.state.stateType === "game" && GAME_MANAGER.state.clientState.type === "player")
                 GAME_MANAGER.state.clientState.crossedOutOutlines = packet.crossedOutOutlines;
-            break;
+        break;
         case "yourDeathNote":
             if(GAME_MANAGER.state.stateType === "game" && GAME_MANAGER.state.clientState.type === "player")
                 GAME_MANAGER.state.clientState.deathNote = packet.deathNote ?? "";

diff --git a/client/src/menu/game/gameScreenContent/GraveyardMenu.tsx b/client/src/menu/game/gameScreenContent/GraveyardMenu.tsx
@@ -33,37 +33,30 @@ function RoleListDisplay(): ReactElement {
     )!
     const crossedOutOutlines = usePlayerState(
         clientState => clientState.crossedOutOutlines,
-        ["yourCrossedOutOutlines"]
-    )
+        ["yourCrossedOutOutlines"],
+        []
+    )!
 
     return <>
-        { roleList.map((entry, index)=>{
-            const roleOutlineName = translateRoleOutline(entry);
-
-            return <Button 
+        {roleList.map((entry, index)=>{
+            return <Button
                 className="role-list-button placard"
-                style={{ gridRow: index + 1 }} 
-                key={roleOutlineName + crossedOutOutlines?.includes(index) + index}
+                style={{ gridRow: index + 1 }}
+                key={index}
                 onClick={()=>{
                     if (GAME_MANAGER.getMySpectator()) return;
 
-                    let newCrossedOutOutlines = crossedOutOutlines!;
-                    if(newCrossedOutOutlines.includes(index))
-                        newCrossedOutOutlines = newCrossedOutOutlines.filter(x=>x!==index);
+                    let newCrossedOutOutlines;
+                    if(crossedOutOutlines.includes(index))
+                        newCrossedOutOutlines = crossedOutOutlines.filter(x=>x!==index);
                     else
-                        newCrossedOutOutlines.push(index);
+                        newCrossedOutOutlines = crossedOutOutlines.concat(index);
 
                     GAME_MANAGER.sendSaveCrossedOutOutlinesPacket(newCrossedOutOutlines);
                 }}
-                onMouseDown={(e)=>{
-                    // on right click, show a list of all roles that can be in this bucket
-                    // if(e.button === 2){
-                    //     e.preventDefault();
-                    // }
-                }}
             >
                 {
-                    crossedOutOutlines?.includes(index) ? 
+                    crossedOutOutlines.includes(index) ? 
                     <s><StyledText>
                         {translateRoleOutline(entry)}
                     </StyledText></s> :