Merge branch 'schema'

Author: xqlcn

client/src/colors.ts

@@ -154,6 +154,35 @@ export const Presets: ColorPreset[] = [
                 TEAM_TWO: '#c91c7e'
             }
         }
+    },
+    {
+        displayName: 'Battlecode 2025',
+        data: {
+            version: 0,
+            colors: {
+                GAMEAREA_BACKGROUND: '#2e2323',
+                SIDEBAR_BACKGROUND: '#3f3131',
+                RED: '#ff9194',
+                PINK: '#ffb4c1',
+                GREEN: '#00a28e',
+                CYAN: '#02a7b9',
+                CYAN_DARK: '#1899a7',
+                BLUE: '#04a2d9',
+                BLUE_LIGHT: '#26abd9',
+                BLUE_DARK: '#00679e',
+                DARK: '#1f2937',
+                DARK_HIGHLIGHT: '#140f0f',
+                BLACK: '#140f0f',
+                WHITE: '#fcdede',
+                LIGHT: '#aaaaaa22',
+                LIGHT_HIGHLIGHT: '#ffffff33',
+                LIGHT_CARD: '#f7f7f722',
+                WALLS_COLOR: '#547f31',
+                TILES_COLOR: '#4c301e',
+                TEAM_ONE: '#cdcdcc',
+                TEAM_TWO: '#fee493'
+            }
+        }
     }
 ]
 

client/src/components/sidebar/game/game.tsx

@@ -143,10 +143,16 @@ export const GamePage: React.FC<Props> = React.memo((props) => {
                     <div /*className="flex items-center gap-2"*/>
                         {/* Note: to keep animation smooth, we should still keep the elements rendered, but we pass showStats into
                             them so that they don't render any data (since we're likely hiding stats to prevent lag) */}
+                        <ResourceGraph
+                            active={showStats}
+                            property="globalCheeseAmount"
+                            propertyDisplayName="Global Cheese "
+                        />
+                        <br />
                         <ResourceGraph
                             active={showStats}
                             property="cheeseAmount"
-                            propertyDisplayName="Cheese Amount "
+                            propertyDisplayName="Cheese Transferred "
                         />
                         <br />
                         <ResourceGraph

client/src/components/sidebar/game/team-table.tsx

@@ -62,6 +62,7 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
     let catDamagePercent = 0
     let ratKingCount = 0
     let ratKingPercent = 0
+    let globalCheese = 0
 
     if (map && teamStat) {
         cheeseAmount = teamStat.cheeseAmount
@@ -70,6 +71,7 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
         catDamagePercent = teamStat.catDamagePercent
         ratKingCount = teamStat.ratKingCount
         ratKingPercent = teamStat.ratKingPercent
+        globalCheese = teamStat.globalCheeseAmount
     }
 
     const formatPercent = (val: number) => (val * 100).toFixed(1).toString() + '%'
@@ -131,6 +133,7 @@ export const ResourceTable: React.FC<ResourceTableProps> = ({ map, teamStat, tea
                     </div>
                 </div>
             </div>
+            <div className="flex items-center w-full mt-2 mb-1 text-xs font-bold justify-around">Global Cheese Amount: {globalCheese}</div>
         </div>
     )
 }
@@ -148,9 +151,9 @@ export const UnitsTable: React.FC<UnitsTableProps> = ({ teamStat, teamIdx }) =>
         ['Baby Rats', <UnitsIcon teamIdx={teamIdx} img="rat" key="3" />]
     ]
 
-    let data: [string, number[]][] = [['Count', [0, 0, 0, 0]]]
+    let data: [string, number[]][] = [['Count:', [0, 0, 0, 0]]]
     if (teamStat) {
-        data = [['Count', [teamStat.dirtAmount, teamStat.ratTrapAmount, teamStat.catTrapAmount, teamStat.babyRatCount]]]
+        data = [['Count:', [teamStat.dirtAmount, teamStat.ratTrapAmount, teamStat.catTrapAmount, teamStat.babyRatCount]]]
     }
 
     return (

client/src/playback/Map.ts

@@ -317,9 +317,11 @@ export class CurrentMap {
         }
         if (ratTrap) {
             info.push('Rat Trap')
+            info.push(`Placed by ${TEAM_COLOR_NAMES[ratTrap - 2]}`)
         }
         if (catTrap) {
             info.push('Cat Trap')
+            info.push(`Placed by ${TEAM_COLOR_NAMES[catTrap - 2]}`)
         }
         if (cheese) {
             info.push(`Cheese: ${cheese}`)

client/src/playback/RoundStat.ts

@@ -19,6 +19,7 @@ export class TeamRoundStat {
     ratKingCount: number = 0
     ratKingPercent: number = 0
     dirtAmount: number = 0
+    globalCheeseAmount: number = 0
     babyRatCount: number = 0
     ratTrapAmount: number = 0
     catTrapAmount: number = 0
@@ -75,10 +76,13 @@ export default class RoundStat {
             let totalCheese = 0
             let totalCatDamage = 0
             let totalRatKings = 0
+
+
             for (let i = 0; i < delta.teamIdsLength(); i++) {
+                const combinedStat = delta.teamAliveRatKings(i)!
                 totalCheese += delta.teamCheeseTransferred(i)!
                 totalCatDamage += delta.teamCatDamage(i)!
-                totalRatKings += delta.teamAliveRatKings(i)!
+                totalRatKings += (combinedStat%10) //lmao
             }
 
             for (let i = 0; i < delta.teamIdsLength(); i++) {
@@ -87,10 +91,14 @@ export default class RoundStat {
                 const teamStat = this.teams.get(team) ?? assert.fail(`team ${i} not found in team stats in round`)
 
                 teamStat.cheeseAmount = delta.teamCheeseTransferred(i) ?? assert.fail('missing cheese amount')
+                teamStat.globalCheeseAmount = Math.floor(delta.teamAliveRatKings(i)! / 10)
                 teamStat.cheesePercent = totalCheese ? teamStat.cheeseAmount / totalCheese : 0
                 teamStat.catDamageAmount = delta.teamCatDamage(i) ?? assert.fail('missing cat damage amount')
                 teamStat.catDamagePercent = totalCatDamage ? teamStat.catDamageAmount / totalCatDamage : 0
+
                 teamStat.ratKingCount = delta.teamAliveRatKings(i) ?? assert.fail('missing rat king count')
+                teamStat.ratKingCount %= 10
+                
                 teamStat.ratKingPercent = totalRatKings ? teamStat.ratKingCount / totalRatKings : 0
                 teamStat.dirtAmount = delta.teamDirtAmounts(i) ?? assert.fail('missing dirt amount')
                 teamStat.ratTrapAmount = delta.teamRatTrapCount(i) ?? assert.fail('missing rat trap amount')