Merge branch 'master' into public-release

TheApplePieGod · TheApplePieGod · commit 33d8623e6a31 · 2025-01-07T12:42:08.000-05:00
diff --git a/client/src/components/sidebar/map-editor/MapGenerator.ts b/client/src/components/sidebar/map-editor/MapGenerator.ts
@@ -162,12 +162,12 @@ function verifyMap(map: CurrentMap, bodies: Bodies): string {
     }
 
     for (const teamIdx of [0, 1]) {
-        if (numPaintTowers[teamIdx] !== 2) {
-            return `Expected exactly 2 ${TEAM_COLOR_NAMES[teamIdx]} paint towers, found ${numPaintTowers[teamIdx]}`
+        if (numPaintTowers[teamIdx] !== 1) {
+            return `Expected exactly 1 ${TEAM_COLOR_NAMES[teamIdx]} paint tower, found ${numPaintTowers[teamIdx]}`
         }
 
-        if (numMoneyTowers[teamIdx] !== 2) {
-            return `Expected exactly 2 ${TEAM_COLOR_NAMES[teamIdx]} money towers, found ${numMoneyTowers[teamIdx]}`
+        if (numMoneyTowers[teamIdx] !== 1) {
+            return `Expected exactly 1 ${TEAM_COLOR_NAMES[teamIdx]} money tower, found ${numMoneyTowers[teamIdx]}`
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -162,12 +162,12 @@ function verifyMap(map: CurrentMap, bodies: Bodies): string {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`for (const teamIdx of [0, 1]) {`
`165`		`- if (numPaintTowers[teamIdx] !== 2) {`
`166`		- return `Expected exactly 2 ${TEAM_COLOR_NAMES[teamIdx]} paint towers, found ${numPaintTowers[teamIdx]}`
	`165`	`+ if (numPaintTowers[teamIdx] !== 1) {`
	`166`	+ return `Expected exactly 1 ${TEAM_COLOR_NAMES[teamIdx]} paint tower, found ${numPaintTowers[teamIdx]}`
`167`	`167`	`}`
`168`	`168`
`169`		`- if (numMoneyTowers[teamIdx] !== 2) {`
`170`		- return `Expected exactly 2 ${TEAM_COLOR_NAMES[teamIdx]} money towers, found ${numMoneyTowers[teamIdx]}`
	`169`	`+ if (numMoneyTowers[teamIdx] !== 1) {`
	`170`	+ return `Expected exactly 1 ${TEAM_COLOR_NAMES[teamIdx]} money tower, found ${numMoneyTowers[teamIdx]}`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`