diff --git a/client/visualizer/src/constants.ts b/client/visualizer/src/constants.ts index adb603e4..ba01a6ee 100644 --- a/client/visualizer/src/constants.ts +++ b/client/visualizer/src/constants.ts @@ -119,7 +119,8 @@ export enum MapType { DEFAULT, SPRINT_1, SPRINT_2, - QUALIFYING, + INTL_QUALIFYING, + US_QUALIFYING, HS_NEWBIE, FINAL, CUSTOM @@ -129,7 +130,8 @@ export enum MapType { export const mapTypes: MapType[] = [MapType.DEFAULT, MapType.SPRINT_1, MapType.SPRINT_2, -MapType.QUALIFYING, +MapType.INTL_QUALIFYING, +MapType.US_QUALIFYING, MapType.HS_NEWBIE, MapType.FINAL, MapType.CUSTOM] @@ -160,7 +162,31 @@ export const SERVER_MAPS: Map = new Map([ ["snowflake", MapType.SPRINT_2], ["spine", MapType.SPRINT_2], ["stronghold", MapType.SPRINT_2], - ["tower", MapType.SPRINT_2] + ["tower", MapType.SPRINT_2], + ["charge", MapType.INTL_QUALIFYING], + ["definitely_not_league", MapType.INTL_QUALIFYING], + ["fire", MapType.INTL_QUALIFYING], + ["highway_redux", MapType.INTL_QUALIFYING], + ["lotus", MapType.INTL_QUALIFYING], + ["maze", MapType.INTL_QUALIFYING], + ["olympics", MapType.INTL_QUALIFYING], + ["one_river", MapType.INTL_QUALIFYING], + ["planets", MapType.INTL_QUALIFYING], + ["snowflake_redux", MapType.INTL_QUALIFYING], + ["treasure", MapType.INTL_QUALIFYING], + ["walls", MapType.INTL_QUALIFYING], + ["chalice", MapType.US_QUALIFYING], + ["cobra", MapType.US_QUALIFYING], + ["deer", MapType.US_QUALIFYING], + ["desert", MapType.US_QUALIFYING], + ["despair", MapType.US_QUALIFYING], + ["flowers", MapType.US_QUALIFYING], + ["island_hopping", MapType.US_QUALIFYING], + ["octopus_game", MapType.US_QUALIFYING], + ["rugged", MapType.US_QUALIFYING], + ["snowman", MapType.US_QUALIFYING], + ["tunnels", MapType.US_QUALIFYING], + ["vault", MapType.US_QUALIFYING] ]) export function bodyTypeToString(bodyType: schema.BodyType) { diff --git a/client/visualizer/src/sidebar/mapfilter.ts b/client/visualizer/src/sidebar/mapfilter.ts index 1d31feb8..d4fb7ed6 100644 --- a/client/visualizer/src/sidebar/mapfilter.ts +++ b/client/visualizer/src/sidebar/mapfilter.ts @@ -145,7 +145,8 @@ export default class MapFilter { case MapType.DEFAULT: return "Default"; case MapType.SPRINT_1: return "Sprint 1"; case MapType.SPRINT_2: return "Sprint 2"; - case MapType.QUALIFYING: return "Quals"; + case MapType.INTL_QUALIFYING: return "Intl Quals"; + case MapType.US_QUALIFYING: return "US Quals"; case MapType.HS_NEWBIE: return "HS and Newbie"; case MapType.FINAL: return "Final"; default: return "Custom"; diff --git a/engine/src/main/battlecode/world/GameWorld.java b/engine/src/main/battlecode/world/GameWorld.java index f7e47de9..e7e0926b 100644 --- a/engine/src/main/battlecode/world/GameWorld.java +++ b/engine/src/main/battlecode/world/GameWorld.java @@ -710,11 +710,11 @@ private void flipRubbleVertically() { public void causeVortexGlobal() { int changeIdx = 0; switch (this.gameMap.getSymmetry()) { - case HORIZONTAL: + case VERTICAL: flipRubbleVertically(); changeIdx = 2; break; - case VERTICAL: + case HORIZONTAL: flipRubbleHorizontally(); changeIdx = 1; break; diff --git a/engine/src/main/battlecode/world/resources/chalice.map22 b/engine/src/main/battlecode/world/resources/chalice.map22 new file mode 100644 index 00000000..1268be7c Binary files /dev/null and b/engine/src/main/battlecode/world/resources/chalice.map22 differ diff --git a/engine/src/main/battlecode/world/resources/charge.map22 b/engine/src/main/battlecode/world/resources/charge.map22 new file mode 100644 index 00000000..e4cc9cb3 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/charge.map22 differ diff --git a/engine/src/main/battlecode/world/resources/cobra.map22 b/engine/src/main/battlecode/world/resources/cobra.map22 new file mode 100644 index 00000000..cad98524 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/cobra.map22 differ diff --git a/engine/src/main/battlecode/world/resources/deer.map22 b/engine/src/main/battlecode/world/resources/deer.map22 new file mode 100644 index 00000000..4a5cdc0e Binary files /dev/null and b/engine/src/main/battlecode/world/resources/deer.map22 differ diff --git a/engine/src/main/battlecode/world/resources/definitely_not_league.map22 b/engine/src/main/battlecode/world/resources/definitely_not_league.map22 new file mode 100644 index 00000000..d3eef637 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/definitely_not_league.map22 differ diff --git a/engine/src/main/battlecode/world/resources/desert.map22 b/engine/src/main/battlecode/world/resources/desert.map22 new file mode 100644 index 00000000..9b7369f6 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/desert.map22 differ diff --git a/engine/src/main/battlecode/world/resources/despair.map22 b/engine/src/main/battlecode/world/resources/despair.map22 new file mode 100644 index 00000000..fb44f96d Binary files /dev/null and b/engine/src/main/battlecode/world/resources/despair.map22 differ diff --git a/engine/src/main/battlecode/world/resources/fire.map22 b/engine/src/main/battlecode/world/resources/fire.map22 new file mode 100644 index 00000000..f232af1c Binary files /dev/null and b/engine/src/main/battlecode/world/resources/fire.map22 differ diff --git a/engine/src/main/battlecode/world/resources/flowers.map22 b/engine/src/main/battlecode/world/resources/flowers.map22 new file mode 100644 index 00000000..88d17760 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/flowers.map22 differ diff --git a/engine/src/main/battlecode/world/resources/highway_redux.map22 b/engine/src/main/battlecode/world/resources/highway_redux.map22 new file mode 100644 index 00000000..884307f5 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/highway_redux.map22 differ diff --git a/engine/src/main/battlecode/world/resources/island_hopping.map22 b/engine/src/main/battlecode/world/resources/island_hopping.map22 new file mode 100644 index 00000000..a2237c41 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/island_hopping.map22 differ diff --git a/engine/src/main/battlecode/world/resources/lotus.map22 b/engine/src/main/battlecode/world/resources/lotus.map22 new file mode 100644 index 00000000..76c771ac Binary files /dev/null and b/engine/src/main/battlecode/world/resources/lotus.map22 differ diff --git a/engine/src/main/battlecode/world/resources/maze.map22 b/engine/src/main/battlecode/world/resources/maze.map22 new file mode 100644 index 00000000..b756e043 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/maze.map22 differ diff --git a/engine/src/main/battlecode/world/resources/octopus_game.map22 b/engine/src/main/battlecode/world/resources/octopus_game.map22 new file mode 100644 index 00000000..7df78012 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/octopus_game.map22 differ diff --git a/engine/src/main/battlecode/world/resources/olympics.map22 b/engine/src/main/battlecode/world/resources/olympics.map22 new file mode 100644 index 00000000..7891856f Binary files /dev/null and b/engine/src/main/battlecode/world/resources/olympics.map22 differ diff --git a/engine/src/main/battlecode/world/resources/one_river.map22 b/engine/src/main/battlecode/world/resources/one_river.map22 new file mode 100644 index 00000000..7d57441b Binary files /dev/null and b/engine/src/main/battlecode/world/resources/one_river.map22 differ diff --git a/engine/src/main/battlecode/world/resources/planets.map22 b/engine/src/main/battlecode/world/resources/planets.map22 new file mode 100644 index 00000000..bc2acdfb Binary files /dev/null and b/engine/src/main/battlecode/world/resources/planets.map22 differ diff --git a/engine/src/main/battlecode/world/resources/rugged.map22 b/engine/src/main/battlecode/world/resources/rugged.map22 new file mode 100644 index 00000000..04cc9a29 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/rugged.map22 differ diff --git a/engine/src/main/battlecode/world/resources/snowflake_redux.map22 b/engine/src/main/battlecode/world/resources/snowflake_redux.map22 new file mode 100644 index 00000000..f15ca982 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/snowflake_redux.map22 differ diff --git a/engine/src/main/battlecode/world/resources/snowman.map22 b/engine/src/main/battlecode/world/resources/snowman.map22 new file mode 100644 index 00000000..87bbabe2 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/snowman.map22 differ diff --git a/engine/src/main/battlecode/world/resources/treasure.map22 b/engine/src/main/battlecode/world/resources/treasure.map22 new file mode 100644 index 00000000..35aa5f3b Binary files /dev/null and b/engine/src/main/battlecode/world/resources/treasure.map22 differ diff --git a/engine/src/main/battlecode/world/resources/tunnels.map22 b/engine/src/main/battlecode/world/resources/tunnels.map22 new file mode 100644 index 00000000..0d6425e8 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/tunnels.map22 differ diff --git a/engine/src/main/battlecode/world/resources/vault.map22 b/engine/src/main/battlecode/world/resources/vault.map22 new file mode 100644 index 00000000..4a83884c Binary files /dev/null and b/engine/src/main/battlecode/world/resources/vault.map22 differ diff --git a/engine/src/main/battlecode/world/resources/walls.map22 b/engine/src/main/battlecode/world/resources/walls.map22 new file mode 100644 index 00000000..83a338e9 Binary files /dev/null and b/engine/src/main/battlecode/world/resources/walls.map22 differ