feat: added clash mode and associated maps (#193)

TeKrop · Sep 12, 2024 · 95e23fc · 95e23fc
1 parent 04eca3e
commit 95e23fc
Show file tree

Hide file tree

Showing 9 changed files with 420 additions and 4 deletions.
diff --git a/app/data/gamemodes.csv b/app/data/gamemodes.csv
@@ -1,6 +1,7 @@
 key,name,description
 assault,Assault,"Teams fight to capture or defend two successive points against the enemy team. It's an inactive Overwatch 1 gamemode, also called 2CP."
 capture-the-flag,Capture the Flag,Teams compete to capture the enemy team’s flag while defending their own.
+clash,Clash,"Vie for dominance across a series of capture points with dynamic spawns and linear map routes, so you spend less time running back to the battle and more time in the heart of it."
 control,Control,Teams fight to hold a single objective. The first team to win two rounds wins the map.
 deathmatch,Deathmatch,Race to reach 20 points first by racking up kills in a free-for-all format.
 elimination,Elimination,"Dispatch all enemies to win the round. Win three rounds to claim victory. Available with teams of one, three, or six."

diff --git a/app/data/maps.csv b/app/data/maps.csv
@@ -40,4 +40,6 @@ antarctic_peninsula,Antarctic Peninsula,control,Antarctica,AQ
 new_junk_city,New Junk City,flashpoint,Central Australia,AU
 suravasa,Suravasa,flashpoint,India,IN
 samoa,Samoa,control,Samoa,WS
-runasapi,Runasapi,push,Peru,PE
+runasapi,Runasapi,push,Peru,PE
+hanaoka,Hanaoka,clash,"Tokyo, Japan",JP
+throne_of_anubis,Throne of Anubis,clash,"Giza Plateau, Egypt",EG
diff --git a/static/gamemodes/clash-icon.svg b/static/gamemodes/clash-icon.svg
diff --git a/static/gamemodes/clash.avif b/static/gamemodes/clash.avif
diff --git a/static/maps/hanaoka.jpg b/static/maps/hanaoka.jpg
diff --git a/static/maps/throne_of_anubis.jpg b/static/maps/throne_of_anubis.jpg
diff --git a/tests/fixtures/json/gamemodes.json b/tests/fixtures/json/gamemodes.json
@@ -13,6 +13,13 @@
         "description": "Teams compete to capture the enemy team’s flag while defending their own.",
         "screenshot": "https://overfast-api.tekrop.fr/static/gamemodes/capture-the-flag.avif"
     },
+    {
+        "key": "clash",
+        "name": "Clash",
+        "icon": "https://overfast-api.tekrop.fr/static/gamemodes/clash-icon.svg",
+        "description": "Vie for dominance across a series of capture points with dynamic spawns and linear map routes, so you spend less time running back to the battle and more time in the heart of it.",
+        "screenshot": "https://overfast-api.tekrop.fr/static/gamemodes/clash.avif"
+    },
     {
         "key": "control",
         "name": "Control",

diff --git a/tests/fixtures/json/maps.json b/tests/fixtures/json/maps.json
diff --git a/tests/views/test_maps_route.py b/tests/views/test_maps_route.py
@@ -39,10 +39,10 @@ def test_get_maps_invalid_gamemode(client: TestClient):
             {
                 "type": "enum",
                 "loc": ["query", "gamemode"],
-                "msg": "Input should be 'assault', 'capture-the-flag', 'control', 'deathmatch', 'elimination', 'escort', 'flashpoint', 'hybrid', 'push' or 'team-deathmatch'",
+                "msg": "Input should be 'assault', 'capture-the-flag', 'clash', 'control', 'deathmatch', 'elimination', 'escort', 'flashpoint', 'hybrid', 'push' or 'team-deathmatch'",
                 "input": "invalid",
                 "ctx": {
-                    "expected": "'assault', 'capture-the-flag', 'control', 'deathmatch', 'elimination', 'escort', 'flashpoint', 'hybrid', 'push' or 'team-deathmatch'",
+                    "expected": "'assault', 'capture-the-flag', 'clash', 'control', 'deathmatch', 'elimination', 'escort', 'flashpoint', 'hybrid', 'push' or 'team-deathmatch'",
                 },
             },
         ],