From 49c3dfe2fcefb24ed3d89e2a4198169dc2f78335 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 5 Apr 2017 21:50:24 +0200 Subject: [PATCH 1/7] Fix the extraction helicopter not showing up in Monster Tank Madness --- mods/ra/maps/monster-tank-madness/monster-tank-madness.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua b/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua index 24cbec8d89..5f12ea5947 100644 --- a/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua +++ b/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) } From e4d3712205b528766c2f0b1d689cb02a4d921a1c Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 5 Apr 2017 21:50:24 +0200 Subject: [PATCH 2/7] Set the initial cash to 0 --- mods/ra/maps/monster-tank-madness/monster-tank-madness.lua | 1 - mods/ra/maps/monster-tank-madness/rules.yaml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua b/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua index 5f12ea5947..4d483b089c 100644 --- a/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua +++ b/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua @@ -278,7 +278,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 diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index 6345be53b9..45bc3b68e0 100644 --- a/mods/ra/maps/monster-tank-madness/rules.yaml +++ b/mods/ra/maps/monster-tank-madness/rules.yaml @@ -1,6 +1,6 @@ Player: PlayerResources: - DefaultCash: 5000 + DefaultCash: 0 World: LuaScript: From d6cf3b35b603dc94f70f83e25670aecb824005dd Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 5 Apr 2017 21:50:24 +0200 Subject: [PATCH 3/7] Fix the explosions of the civilian buildings - it looked weird when they spawned civilians - other buildings on the map exploded with the wrong explosion --- mods/ra/maps/monster-tank-madness/map.yaml | 20 +++---- mods/ra/maps/monster-tank-madness/rules.yaml | 61 +++++++++++++++++++- 2 files changed, 70 insertions(+), 11 deletions(-) diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 741d6bb015..43ecd827ab 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/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 @@ -1966,7 +1966,7 @@ Actors: Owner: BadGuy Facing: 224 SubCell: 2 - Actor507: v11 + Actor507: v11.exploding Location: 97,56 Owner: Ukraine Actor513: brl3 @@ -1981,7 +1981,7 @@ Actors: UkraineBarrel: brl3 Location: 81,52 Owner: Ukraine - UkraineBuilding: v05 + UkraineBuilding: v05.exploding Location: 82,51 Owner: Ukraine SuperTankDome: dome.NoInfiltrate diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index 45bc3b68e0..b349658bdb 100644 --- a/mods/ra/maps/monster-tank-madness/rules.yaml +++ b/mods/ra/maps/monster-tank-madness/rules.yaml @@ -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 From 009cbb74f5ef6ab93aa269a47c98a51ef8342b0f Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 5 Apr 2017 21:50:24 +0200 Subject: [PATCH 4/7] Fix Oil Pumps spawning infantry on death --- mods/ra/rules/civilian.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ra/rules/civilian.yaml b/mods/ra/rules/civilian.yaml index 22c3ae0d59..d6e7773d4c 100644 --- a/mods/ra/rules/civilian.yaml +++ b/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: From 8f50052a1c7f1328fce5be84acc3f4005ecf54c5 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 5 Apr 2017 21:50:24 +0200 Subject: [PATCH 5/7] Remove a misplaced barrel --- mods/ra/maps/monster-tank-madness/map.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 43ecd827ab..39cc0e7b93 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -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 From b9f0504380e96f342b799e784d0a957f45526906 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sat, 8 Apr 2017 20:39:59 +0200 Subject: [PATCH 6/7] Fix friendly monster tanks not revealing shroud in Monster Tank Madness --- mods/ra/maps/monster-tank-madness/monster-tank-madness.lua | 1 + mods/ra/maps/monster-tank-madness/rules.yaml | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua b/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua index 4d483b089c..df06380fa1 100644 --- a/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua +++ b/mods/ra/maps/monster-tank-madness/monster-tank-madness.lua @@ -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 diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index b349658bdb..8c270f36fb 100644 --- a/mods/ra/maps/monster-tank-madness/rules.yaml +++ b/mods/ra/maps/monster-tank-madness/rules.yaml @@ -123,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: From a82e835f87ec9eb28b02a89eb6ed29ff1d5321a0 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 8 Apr 2017 21:30:38 +0100 Subject: [PATCH 7/7] Set sensible initial turret facings. --- mods/ra/maps/monster-tank-madness/map.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mods/ra/maps/monster-tank-madness/map.yaml b/mods/ra/maps/monster-tank-madness/map.yaml index 39cc0e7b93..cc907a5a4f 100644 --- a/mods/ra/maps/monster-tank-madness/map.yaml +++ b/mods/ra/maps/monster-tank-madness/map.yaml @@ -2020,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