Merge pull request #13069 from abcdefg30/mtmTran

Fix the extraction helicopter not showing up in Monster Tank Madness

mods/ra/maps/monster-tank-madness/map.yaml

@@ -1654,28 +1654,28 @@ Actors:
 	Actor530: v09
 		Location: 46,49
 		Owner: Neutral
-	Actor531: v01
+	Actor531: v01.exploding
 		Location: 76,52
 		Owner: Ukraine
-	Actor532: v02
+	Actor532: v02.exploding
 		Location: 76,58
 		Owner: Ukraine
-	Actor533: v03
+	Actor533: v03.exploding
 		Location: 89,53
 		Owner: Ukraine
-	Actor534: v04
+	Actor534: v04.exploding
 		Location: 91,59
 		Owner: Ukraine
-	Actor536: v06
+	Actor536: v06.exploding
 		Location: 82,54
 		Owner: Ukraine
-	Actor537: v07
+	Actor537: v07.exploding
 		Location: 78,60
 		Owner: Ukraine
-	Actor538: v08
+	Actor538: v08.exploding
 		Location: 96,53
 		Owner: Ukraine
-	Actor539: v09
+	Actor539: v09.exploding
 		Location: 97,52
 		Owner: Ukraine
 	Actor540: v19
@@ -1807,9 +1807,6 @@ Actors:
 	Actor583: barl
 		Location: 88,54
 		Owner: Ukraine
-	Actor584: brl3
-		Location: 89,53
-		Owner: Ukraine
 	Actor588: v2rl
 		Location: 91,75
 		Owner: USSR
@@ -1966,7 +1963,7 @@ Actors:
 		Owner: BadGuy
 		Facing: 224
 		SubCell: 2
-	Actor507: v11
+	Actor507: v11.exploding
 		Location: 97,56
 		Owner: Ukraine
 	Actor513: brl3
@@ -1981,7 +1978,7 @@ Actors:
 	UkraineBarrel: brl3
 		Location: 81,52
 		Owner: Ukraine
-	UkraineBuilding: v05
+	UkraineBuilding: v05.exploding
 		Location: 82,51
 		Owner: Ukraine
 	SuperTankDome: dome.NoInfiltrate
@@ -2023,12 +2020,15 @@ Actors:
 	stnk1: 5tnk
 		Location: 89,59
 		Owner: Turkey
+		TurretFacing: 192
 	stnk2: 5tnk
 		Location: 77,57
 		Owner: Turkey
+		TurretFacing: 92
 	stnk3: 5tnk
 		Location: 94,53
 		Owner: Turkey
+		TurretFacing: 192
 	DemitriLZ: waypoint
 		Location: 30,21
 		Owner: Neutral

mods/ra/maps/monster-tank-madness/monster-tank-madness.lua

@@ -15,7 +15,7 @@ SuperTankHuntWaypoints = { SuperTankHuntWaypoint1, SuperTankHuntWaypoint2, Super
 SuperTankHunt = 1
 SuperTankHuntCounter = 1
 ExtractionHeli = "tran"
-ExtractionWaypoint = CPos.New(DemitriLZ.Location.X, 0)
+ExtractionWaypoint = CPos.New(DemitriLZ.Location.X, 19)
 ExtractionLZ = DemitriLZ.Location
 BeachTrigger = { CPos.New(19, 44), CPos.New(20, 44), CPos.New(21, 44), CPos.New(22, 44), CPos.New(22, 45), CPos.New(23, 45), CPos.New(22, 44), CPos.New(24, 45), CPos.New(24, 46), CPos.New(24, 47), CPos.New(25, 47), CPos.New(25, 48) }
 DemitriAreaTrigger = { CPos.New(32, 98), CPos.New(32, 99), CPos.New(33, 99), CPos.New(33, 100), CPos.New(33, 101), CPos.New(33, 102), CPos.New(32, 102), CPos.New(32, 103) }
@@ -132,6 +132,7 @@ SuperTankDomeInfiltrated = function()
 	Utils.Do(SuperTanks, function(tnk)
 		tnk.Owner = friendlyMadTanks
 		if not tnk.IsDead then
+			tnk.GrantCondition("friendly")
 			Trigger.ClearAll(tnk)
 			tnk.Stop()
 			if tnk.Location.Y > 61 then
@@ -278,7 +279,6 @@ InitPlayers = function()
 	turkey = Player.GetPlayer("Turkey")
 	friendlyMadTanks = Player.GetPlayer("FriendlyMadTanks")
 
-	player.Cash = 0
 	ussr.Cash = 2000
 	Trigger.AfterDelay(0, function() badguy.Resources = badguy.ResourceCapacity * 0.75 end)
 	Trigger.OnCapture(USSROutpostSilo, function() -- getting money through capturing doesn't work

mods/ra/maps/monster-tank-madness/rules.yaml

@@ -1,6 +1,6 @@
 Player:
 	PlayerResources:
-		DefaultCash: 5000
+		DefaultCash: 0
 
 World:
 	LuaScript:
@@ -12,7 +12,66 @@ World:
 ^Building:
 	AnnounceOnSeen:
 
-^CivBuilding:
+^ExplodingCivBuilding:
+	Inherits: ^CivBuilding
+	Explodes:
+		Weapon: BarrelExplode
+		EmptyWeapon: BarrelExplode
+	-SpawnActorOnDeath@1:
+	-SpawnActorOnDeath@2:
+	-SpawnActorOnDeath@3:
+
+V01.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V01
+
+V02.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V02
+
+V03.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V03
+
+V04.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V04
+
+V05.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V05
+
+V06.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V06
+
+V07.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V07
+
+V08.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V08
+
+V09.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V09
+
+V11.exploding:
+	Inherits: ^ExplodingCivBuilding
+	RenderSprites:
+		Image: V11
+
+V19:
 	Explodes:
 		Weapon: BarrelExplode
 		EmptyWeapon: BarrelExplode
@@ -64,6 +123,13 @@ PBOX:
 		Crushes: wall, mine, crate, infantry
 	RevealsShroud:
 		Range: 6c0
+		RequiresCondition: !friendly
+	RevealsShroud@friendly:
+		Range: 6c0
+		RequiresCondition: friendly
+		ValidStances: Ally, Enemy
+	ExternalCondition@friendly:
+		Condition: friendly
 	Turreted:
 		TurnSpeed: 1
 	Armament@PRIMARY:

mods/ra/rules/civilian.yaml

@@ -231,6 +231,9 @@ V19:
 		ExcludeTilesets: DESERT
 	Tooltip:
 		Name: Oil Pump
+	-SpawnActorOnDeath@1:
+	-SpawnActorOnDeath@2:
+	-SpawnActorOnDeath@3:
 	SpawnActorOnDeath:
 		Actor: V19.Husk
 	AutoTargetIgnore: