Reinforce d2k carryalls on shellmap instead of spawning them on the g…

…round
OpenRA · Nov 14, 2023 · ae84ec5 · ae84ec5
1 parent 83ce895
commit ae84ec5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/mods/d2k/maps/shellmap/d2k-shellmap.lua b/mods/d2k/maps/shellmap/d2k-shellmap.lua
@@ -158,6 +158,10 @@ WorldLoaded = function()
 	Corrino = Player.GetPlayer("Corrino")
 	Smugglers = Player.GetPlayer("Smugglers")
 
+	Reinforcements.Reinforce(Atreides, { "carryall" }, { atr_carry_1.Location })
+	Reinforcements.Reinforce(Atreides, { "carryall" }, { atr_carry_2.Location })
+	Reinforcements.Reinforce(Atreides, { "carryall" }, { atr_carry_3.Location })
+
 	ViewportOrigin = Camera.Position
 
 	Utils.Do(Utils.Take(4, Upgrades), function(upgrade)

diff --git a/mods/d2k/maps/shellmap/map.yaml b/mods/d2k/maps/shellmap/map.yaml
@@ -676,18 +676,6 @@ Actors:
 		Owner: Atreides
 		Location: 71,86
 		Facing: 384
-	atr_carry1: carryall
-		Owner: Atreides
-		Location: 94,86
-		Facing: 0
-	atr_carry2: carryall
-		Owner: Atreides
-		Location: 94,88
-		Facing: 0
-	atr_carry3: carryall
-		Owner: Atreides
-		Location: 94,90
-		Facing: 0
 	atr_trike: trike
 		Owner: Atreides
 		Location: 92,82
@@ -976,5 +964,14 @@ Actors:
 	Actor267: spicebloom.spawnpoint
 		Owner: Neutral
 		Location: 50,65
+	atr_carry_3: waypoint
+		Owner: Atreides
+		Location: 96,90
+	atr_carry_2: waypoint
+		Owner: Atreides
+		Location: 88,98
+	atr_carry_1: waypoint
+		Owner: Atreides
+		Location: 80,98
 
 Rules: d2k|rules/campaign-palettes.yaml, rules.yaml