Some shellmap change

ABrandau · Feb 3, 2024 · d00cd14 · d00cd14
1 parent edb74fb
commit d00cd14
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/mods/sp/maps/shellmap/luascript.lua b/mods/sp/maps/shellmap/luascript.lua
@@ -3,7 +3,7 @@ GDIAirForce = { "orca", "orca", "orca" }
 NodTemplarRush = { "templar", "templar", "templar", "templar", "templar" }
 NodStealthTeam = { "bike", "stnk", "stnk"}
 NodAirForce = { "scrin", "scrin" }
-MutantBusGuys = { "marauder", "marauder", "marauder", "marauder", "mutfiend" }
+MutantBusGuys = { "marauder", "marauder", "marauder", "mutfiend" }
 MutantDemoTruck = { "hvrtruk3" }
 MutantFalcon = { "wetp" }
 ScrinAttackForce = { "shark", "shark", "shark", "shark", "legio", "legio", "float", "corruptor", "corruptor", "corruptor" }
@@ -175,9 +175,10 @@ Patrol4D = function(unit, waypoints, delay)
 end
 
 MutantBusService = function()
-	Trigger.AfterDelay(DateTime.Seconds(10), function()
+	Trigger.AfterDelay(DateTime.Seconds(1), function()
 		mut.Build(MutantBusGuys, function(actors)
 			local bus = Actor.Create("struck", true, { Owner = mut, Location = MutantBusEntry.Location })
+			bus.GrantCondition("produced")
 			bus.Move(MutantBusStop.Location)
 
 			Trigger.AfterDelay(DateTime.Seconds(7), function()
@@ -186,7 +187,7 @@ MutantBusService = function()
 				end)
 
 				Trigger.AfterDelay(DateTime.Seconds(4), function()
-					bus.Move(MutantBusEntry.Location)
+					bus.Move(MutantBusExit.Location)
 					bus.Destroy()
 
 					MutantBusService()
@@ -338,7 +339,7 @@ CABALInfantryAttack = function()
 	Trigger.AfterDelay(DateTime.Seconds(1), function()
 		cab.Build(CABALInfantry, function(actors)
 			Utils.Do(actors, function(actor)
-				actor.Attack(MutantBunker1)
+				actor.AttackMove(MutantRaxRally.Location)
 			end)
 
 			Trigger.OnAllRemovedFromWorld(actors, function()

diff --git a/mods/sp/maps/shellmap/map.yaml b/mods/sp/maps/shellmap/map.yaml
@@ -3669,12 +3669,6 @@ Actors:
 	NodPatrolD2: waypoint
 		Owner: Neutral
 		Location: 148,30
-	MutantBusEntry: waypoint
-		Owner: Neutral
-		Location: 162,-32
-	MutantBusStop: waypoint
-		Owner: Neutral
-		Location: 146,-32
 	MutantRaxRally: waypoint
 		Owner: Neutral
 		Location: 146,-34
@@ -4276,8 +4270,8 @@ Actors:
 	Actor1612: limped
 		Owner: Cabal
 		Location: 117,-67
-		Facing: 384
 		DeployState: Deployed
+		Facing: 384
 	Actor1614: tuntop04
 		Owner: Neutral
 		Location: 42,-34
@@ -4566,6 +4560,15 @@ Actors:
 		Owner: Neutral
 		Location: 130,6
 		Facing: 880
+	MutantBusEntry: waypoint
+		Owner: Neutral
+		Location: 161,-31
+	MutantBusStop: waypoint
+		Owner: Neutral
+		Location: 146,-31
+	MutantBusExit: waypoint
+		Owner: Neutral
+		Location: 114,-69
 
 Rules: rules.yaml