Merge pull request #24 from valbrimi/1.19

Restioson · web-flow · commit b7b97379ab11 · 2024-06-09T17:00:19.000+02:00
Add the Canal map
diff --git a/src/main/resources/data/siege/games/canal.json b/src/main/resources/data/siege/games/canal.json
@@ -0,0 +1,16 @@
+{
+  "type": "siege:siege",
+  "icon": "minecraft:iron_sword",
+  "short_name": "gameType.siege.siege",
+  "description": ["game.siege.desc"],
+  "map": {
+    "id": "siege:canal",
+    "attacker_spawn_angle": 180
+  },
+  "players": {
+    "min": 1,
+    "max": 100,
+    "threshold": 4
+  },
+  "time_limit_mins": 20
+}
diff --git a/src/main/resources/data/siege/games/canal_recapture.json b/src/main/resources/data/siege/games/canal_recapture.json
@@ -0,0 +1,17 @@
+{
+  "type": "siege:siege",
+  "icon": "minecraft:iron_sword",
+  "short_name": "gameType.siege.siege",
+  "description": ["game.siege.desc", "game.siege.recapture.desc"],
+  "map": {
+    "id": "siege:canal",
+    "attacker_spawn_angle": 180
+  },
+  "players": {
+    "min": 1,
+    "max": 100,
+    "threshold": 4
+  },
+  "recapture": true,
+  "time_limit_mins": 20
+}
diff --git a/src/main/resources/data/siege/lang/en_us.json b/src/main/resources/data/siege/lang/en_us.json
@@ -1,5 +1,7 @@
 {
   "gameType.siege.siege": "Siege",
+  "game.siege.canal": "Siege: Canal",
+  "game.siege.canal_recapture": "Siege: Canal (with Recapture)",
   "game.siege.jungle": "Siege: Jungle",
   "game.siege.jungle_recapture": "Siege: Jungle (with Recapture)",
   "game.siege.villagers_vs_pillagers": "Siege: Villagers vs Pillagers",
diff --git a/src/main/resources/data/siege/map_templates/canal.nbt b/src/main/resources/data/siege/map_templates/canal.nbt

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"gameType.siege.siege": "Siege",`
	`3`	`+ "game.siege.canal": "Siege: Canal",`
	`4`	`+ "game.siege.canal_recapture": "Siege: Canal (with Recapture)",`
`3`	`5`	`"game.siege.jungle": "Siege: Jungle",`
`4`	`6`	`"game.siege.jungle_recapture": "Siege: Jungle (with Recapture)",`
`5`	`7`	`"game.siege.villagers_vs_pillagers": "Siege: Villagers vs Pillagers",`