Merge branch 'client' into main

battlecode · Jan 3, 2022 · e07b299 · e07b299
2 parents 4bb8c3e + d9c5d2f
commit e07b299
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 77 deletions.
diff --git a/client/visualizer/src/constants.ts b/client/visualizer/src/constants.ts
@@ -136,81 +136,8 @@ MapType.CUSTOM]
 
 export const SERVER_MAPS: Map<string, MapType> = new Map<string, MapType>([
   ["maptestsmall", MapType.DEFAULT],
-  ["circle", MapType.DEFAULT],
-  ["quadrants", MapType.DEFAULT],
-  ["Andromeda", MapType.SPRINT_1],
-  ["Arena", MapType.SPRINT_1],
-  ["Bog", MapType.SPRINT_1],
-  ["Branches", MapType.SPRINT_1],
-  ["Chevron", MapType.SPRINT_1],
-  ["Corridor", MapType.SPRINT_1],
-  ["Cow", MapType.SPRINT_1],
-  ["CrossStitch", MapType.SPRINT_1],
-  ["CrownJewels", MapType.SPRINT_1],
-  ["ExesAndOhs", MapType.SPRINT_1],
-  ["FiveOfHearts", MapType.SPRINT_1],
-  ["Gridlock", MapType.SPRINT_1],
-  ["Illusion", MapType.SPRINT_1],
-  ["NotAPuzzle", MapType.SPRINT_1],
-  ["Rainbow", MapType.SPRINT_1],
-  ["SlowMusic", MapType.SPRINT_1],
-  ["Snowflake", MapType.SPRINT_1],
-  ["BadSnowflake", MapType.SPRINT_2],
-  ["CringyAsF", MapType.SPRINT_2],
-  ["FindYourWay", MapType.SPRINT_2],
-  ["GetShrekt", MapType.SPRINT_2],
-  ["Goldfish", MapType.SPRINT_2],
-  ["HexesAndOhms", MapType.SPRINT_2],
-  ["Licc", MapType.SPRINT_2],
-  ["MainCampus", MapType.SPRINT_2],
-  ["Punctuation", MapType.SPRINT_2],
-  ["Radial", MapType.SPRINT_2],
-  ["SeaFloor", MapType.SPRINT_2],
-  ["Sediment", MapType.SPRINT_2],
-  ["Smile", MapType.SPRINT_2],
-  ["SpaceInvaders", MapType.SPRINT_2],
-  ["Surprised", MapType.SPRINT_2],
-  ["VideoGames", MapType.SPRINT_2],
-  ["AmidstWe", MapType.QUALIFYING],
-  ["BattleCode", MapType.QUALIFYING],
-  ["BattleCodeToo", MapType.QUALIFYING],
-  ["BlobWithLegs", MapType.QUALIFYING],
-  ["ButtonsAndBows", MapType.QUALIFYING],
-  ["CowTwister", MapType.QUALIFYING],
-  ["Extensions", MapType.QUALIFYING],
-  ["Hourglass", MapType.QUALIFYING],
-  ["Maze", MapType.QUALIFYING],
-  ["NextHouse", MapType.QUALIFYING],
-  ["Superposition", MapType.QUALIFYING],
-  ["TicTacTie", MapType.QUALIFYING],
-  ["UnbrandedWordGame", MapType.QUALIFYING],
-  ["Z", MapType.QUALIFYING],
-  ["Zodiac", MapType.QUALIFYING],
-  ["Flawars", MapType.HS_NEWBIE],
-  ["FrogOrBath", MapType.HS_NEWBIE],
-  ["HappyBoba", MapType.HS_NEWBIE],
-  ["Networking", MapType.HS_NEWBIE],
-  ["NoInternet", MapType.HS_NEWBIE],
-  ["PaperWindmill", MapType.HS_NEWBIE],
-  ["Randomized", MapType.HS_NEWBIE],
-  ["Star", MapType.HS_NEWBIE],
-  ["Tiger", MapType.HS_NEWBIE],
-  ["WhatISeeInMyDreams", MapType.HS_NEWBIE],
-  ["Yoda", MapType.HS_NEWBIE],
-  ["Blotches", MapType.FINAL],
-  ["CToE", MapType.FINAL],
-  ["Circles", MapType.FINAL],
-  ["EggCarton", MapType.FINAL],
-  ["InaccurateBritishFlag", MapType.FINAL],
-  ["JerryIsEvil", MapType.FINAL],
-  ["Legends", MapType.FINAL],
-  ["Mario", MapType.FINAL],
-  ["Misdirection", MapType.FINAL],
-  ["OneCallAway", MapType.FINAL],
-  ["Saturn", MapType.FINAL],
-  ["Stonks", MapType.FINAL],
-  ["TheClientMapEditorIsSuperiorToGoogleSheetsEom", MapType.FINAL],
-  ["TheSnackThatSmilesBack", MapType.FINAL]
+  ["eckleburg", MapType.DEFAULT],
+  ["intersection", MapType.DEFAULT]
 ])
 
 export function bodyTypeToString(bodyType: schema.BodyType) {

diff --git a/client/visualizer/src/main/scaffold.ts b/client/visualizer/src/main/scaffold.ts
@@ -55,7 +55,7 @@ export default class ScaffoldCommunicator {
     console.log('app path: ' + appPath);
 
     // npm run electron in client, if battlecode21-scaffold is located in same level as battlecode21
-    const fromDev = path.join(path.dirname(path.dirname(path.dirname(appPath))), 'battlecode21-scaffold');
+    const fromDev = path.join(path.dirname(path.dirname(path.dirname(appPath))), 'battlecode22-scaffold');
     // scaffold/client/Battlecode Client[.exe]
     // (May never happen?)
     const fromWin = path.dirname(path.dirname(appPath));

diff --git a/client/visualizer/src/sidebar/matchrunner.ts b/client/visualizer/src/sidebar/matchrunner.ts
@@ -125,7 +125,7 @@ export default class MatchRunner {
 
     const profilerLabel = document.createElement('label');
     profilerLabel.setAttribute('for', 'profiler-enabled');
-    profilerLabel.innerText = 'Profiler enabled (will be more memory-intensive)';
+    profilerLabel.innerText = 'Profiler enabled (competitor tool, more memory-intensive)';
 
     div.appendChild(document.createElement("br"));
     // Team A selector