diff --git a/mods/ra/maps/allies-05a/allies05a.lua b/mods/ra/maps/allies-05a/allies05a.lua index 7f11a63d1e..0baaf1f4b3 100644 --- a/mods/ra/maps/allies-05a/allies05a.lua +++ b/mods/ra/maps/allies-05a/allies05a.lua @@ -171,13 +171,12 @@ MissInfiltrated = function() Media.PlaySoundNotification(greece, sound) end) end - TanyasColt = Actor.Create("Colt", true, { Owner = greece, Location = Prison.Location + CVec.New(1, 6) }) + Prison.Attack(Prison) Trigger.AfterDelay(DateTime.Seconds(6), FreeTanya) end FreeTanya = function() - TanyasColt.Destroy() Tanya = Actor.Create(TanyaType, true, { Owner = greece, Location = Prison.Location + CVec.New(1, 1) }) Tanya.Demolish(Prison) Tanya.Move(Tanya.Location + CVec.New(Utils.RandomInteger(-1, 2), 1)) diff --git a/mods/ra/maps/allies-05a/rules.yaml b/mods/ra/maps/allies-05a/rules.yaml index b262b6e6aa..3dc6d4e67e 100644 --- a/mods/ra/maps/allies-05a/rules.yaml +++ b/mods/ra/maps/allies-05a/rules.yaml @@ -96,34 +96,9 @@ MISS: Name: Prison Targetable: TargetTypes: Ground, C4, DetonateAttack, Structure, Mission Objectives - -Colt: - Inherits: ^Defense - AutoTargetIgnore: - Valued: - Cost: 800 - Building: - Footprint: _ x - Dimensions: 1,2 - Health: - HP: 400 - Armor: - Type: Heavy - RevealsShroud: - Range: 0c0 - Turreted: - TurnSpeed: 15 - InitialFacing: 224 - RenderSprites: - Image: AGUN + AttackOmni: Armament: Weapon: MissionColt - LocalOffset: 432,150,-30, 432,-150,-30 - AttackTurreted: - AutoTarget: - -Selectable: - -SelectionDecorations: - -Huntable: E1.Autotarget: Inherits: E1 diff --git a/mods/ra/maps/allies-05a/weapons.yaml b/mods/ra/maps/allies-05a/weapons.yaml index 9bbbfec9d0..b304f6e582 100644 --- a/mods/ra/maps/allies-05a/weapons.yaml +++ b/mods/ra/maps/allies-05a/weapons.yaml @@ -15,6 +15,7 @@ MissionColt: Heavy: 0 Concrete: 0 DamageTypes: Prone50Percent, TriggerProne, BulletDeath + AffectsParent: true Warhead@2Eff: CreateEffect Explosions: piffs InvalidImpactTypes: Water