Merge branch 'main' into prod

aukus-devs · Oct 2, 2024 · 6bbbb31 · 6bbbb31
2 parents e79aab2 + ef7f416
commit 6bbbb31
Show file tree

Hide file tree

Showing 23 changed files with 33 additions and 30 deletions.
diff --git a/src/assets/map/Figure_Blue.png b/src/assets/map/Figure_Blue.png
diff --git a/src/assets/map/Figure_Copper.png b/src/assets/map/Figure_Copper.png
diff --git a/src/assets/map/Figure_Green.png b/src/assets/map/Figure_Green.png
diff --git a/src/assets/map/Figure_LightGreen.png b/src/assets/map/Figure_LightGreen.png
diff --git a/src/assets/map/Figure_LightSalad.png b/src/assets/map/Figure_LightSalad.png
diff --git a/src/assets/map/Figure_Pink.png b/src/assets/map/Figure_Pink.png
diff --git a/src/assets/map/Figure_Purple.png b/src/assets/map/Figure_Purple.png
diff --git a/src/assets/map/Figure_Red.png b/src/assets/map/Figure_Red.png
diff --git a/src/assets/map/Figure_Salad.png b/src/assets/map/Figure_Salad.png
diff --git a/src/assets/map/Figure_Yellow.png b/src/assets/map/Figure_Yellow.png
diff --git a/src/assets/map/PlayerBlue.webp b/src/assets/map/PlayerBlue.webp
diff --git a/src/assets/map/PlayerBlueDark.webp b/src/assets/map/PlayerBlueDark.webp
diff --git a/src/assets/map/PlayerBlueLight.webp b/src/assets/map/PlayerBlueLight.webp
diff --git a/src/assets/map/PlayerBrown.webp b/src/assets/map/PlayerBrown.webp
diff --git a/src/assets/map/PlayerGreen.webp b/src/assets/map/PlayerGreen.webp
diff --git a/src/assets/map/PlayerGreenLight.webp b/src/assets/map/PlayerGreenLight.webp
diff --git a/src/assets/map/PlayerOrange.webp b/src/assets/map/PlayerOrange.webp
diff --git a/src/assets/map/PlayerPink.webp b/src/assets/map/PlayerPink.webp
diff --git a/src/assets/map/PlayerPinkLight.webp b/src/assets/map/PlayerPinkLight.webp
diff --git a/src/assets/map/PlayerPurple.webp b/src/assets/map/PlayerPurple.webp
diff --git a/src/assets/map/PlayerRed.webp b/src/assets/map/PlayerRed.webp
diff --git a/src/pages/map/components/PlayerIcon.tsx b/src/pages/map/components/PlayerIcon.tsx
@@ -2,30 +2,33 @@ import { Box } from '@mui/material'
 import { animated, useSpring } from '@react-spring/web'
 import { useEffect, useRef, useState } from 'react'
 import { getPlayerColor, Player } from 'utils/types'
-import FigureCopper from 'assets/map/Figure_Copper.png'
-import FigureBlue from 'assets/map/Figure_Blue.png'
-import FigureGreen from 'assets/map/Figure_Green.png'
-import FigureRed from 'assets/map/Figure_Red.png'
-import FigurePink from 'assets/map/Figure_Pink.png'
-import FigurePurple from 'assets/map/Figure_Purple.png'
-import FigureLightGreen from 'assets/map/Figure_LightGreen.png'
-import FigureSalad from 'assets/map/Figure_Salad.png'
-import FigureLightSalad from 'assets/map/Figure_LightSalad.png'
+import PlayerGreen from 'assets/map/PlayerGreen.webp'
+import PlayerGreenLight from 'assets/map/PlayerGreenLight.webp'
+import PlayerRed from 'assets/map/PlayerRed.webp'
+import PlayerBlue from 'assets/map/PlayerBlue.webp'
+import PlayerBlueLight from 'assets/map/PlayerBlueLight.webp'
+import PlayerBlueDark from 'assets/map/PlayerBlueDark.webp'
+import PlayerBrown from 'assets/map/PlayerBrown.webp'
+import PlayerPink from 'assets/map/PlayerPink.webp'
+import PlayerPinkLight from 'assets/map/PlayerPinkLight.webp'
+import PlayerOrange from 'assets/map/PlayerOrange.webp'
+import PlayerPurple from 'assets/map/PlayerPurple.webp'
 
 import { cellSize } from '../types'
 import PlayerPopup from './PlayerPopup'
 import { getMapCellById, laddersByCell, snakesByCell } from './utils'
 
 const playerIcons: { [key: string]: string } = {
-  lasqa: FigurePurple,
-  roadhouse: FigureCopper,
-  segall: FigureBlue,
-  artur: FigureRed,
-  uselessmouth: FigurePink,
-  unclobjorn: FigureSalad,
-  melharucos: FigureLightSalad,
-  browjey: FigureLightGreen,
-  f1ashko: FigureGreen,
+  lasqa: PlayerBlue,
+  praden: PlayerBrown,
+  roadhouse: PlayerPurple,
+  segall: PlayerOrange,
+  artur: PlayerRed,
+  uselessmouth: PlayerPink,
+  unclobjorn: PlayerBlueDark,
+  melharucos: PlayerBlueLight,
+  browjey: PlayerGreen,
+  f1ashko: PlayerPinkLight,
 }
 
 type Props = {
@@ -209,7 +212,7 @@ export default function PlayerIcon({
 
   const onlineColor = player.is_online ? 'green' : 'red'
   const playerColor = getPlayerColor(player)
-  const playerIcon = playerIcons[player.url_handle] || FigureCopper
+  const playerIcon = playerIcons[player.url_handle] || PlayerBlueLight
 
   const hideAvatar =
     playersOnSamePosition.length > 1 &&

diff --git a/src/utils/types.ts b/src/utils/types.ts
@@ -103,31 +103,31 @@ export type CustomColorOverrides = {
 }
 
 export const ColorByUrlHandle: { [key: string]: string } = {
-  lasqa: Color.purple,
-  segall: Color.blue,
+  lasqa: Color.blue,
+  segall: Color.orange,
   praden: Color.brown,
   artur: Color.red,
   uselessmouth: Color.pink,
-  roadhouse: Color.orange,
+  roadhouse: Color.purple,
   unclobjorn: Color.blueDark,
   melharucos: Color.blueLight,
-  browjey: Color.greenLight,
-  f1ashko: Color.green,
+  browjey: Color.green,
+  f1ashko: Color.pinkLight,
 }
 
 export const ColorNameByUrlHandle: {
   [key: string]: CustomColorNames
 } = {
-  lasqa: 'customPurple',
-  segall: 'customBlue',
+  lasqa: 'customBlue',
   praden: 'customBrown',
+  roadhouse: 'customPurple',
+  segall: 'customOrange',
   artur: 'customRed',
-  uselessmouth: 'customBlueDark',
-  roadhouse: 'customOrange',
+  uselessmouth: 'customPink',
   unclobjorn: 'customBlueDark',
   melharucos: 'customBlueLight',
-  browjey: 'customGreenLight',
-  f1ashko: 'customGreen',
+  browjey: 'customGreen',
+  f1ashko: 'customPinkLight',
 }
 
 export function getPlayerColor(player: Player): string {