From 1fe317dd579d9422b096a92bce11c0c197184c0e Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Mon, 30 Jan 2017 23:24:43 -0600 Subject: [PATCH 1/6] Fix a typo in MobileInfo --- OpenRA.Mods.Common/Traits/Mobile.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Mobile.cs b/OpenRA.Mods.Common/Traits/Mobile.cs index c9b0022e6c..fba438ae69 100644 --- a/OpenRA.Mods.Common/Traits/Mobile.cs +++ b/OpenRA.Mods.Common/Traits/Mobile.cs @@ -117,7 +117,7 @@ namespace OpenRA.Mods.Common.Traits public readonly string SubterraneanTransitionSound = null; - [Desc("Can this unit fly over obsticals?")] + [Desc("Can this unit fly over obstacles?")] public readonly bool Jumpjet = false; [GrantedConditionReference] From 7eab7dfad9057dc828b28b657517fcc7379947e1 Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Tue, 31 Jan 2017 08:43:34 -0600 Subject: [PATCH 2/6] TS: Do not do terrain/vein damage to actors inside of tunnels --- mods/ts/rules/defaults.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 4fa94512f7..e720daa09b 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -326,6 +326,7 @@ Damage: 2 DamageInterval: 16 DamageTypes: ExplosionDeath, TriggerVisceroid + RequiresCondition: !inside-tunnel Guard: Voice: Move Guardable: @@ -895,6 +896,7 @@ DamageInterval: 16 DamageTypes: BulletDeath Terrain: Veins + RequiresCondition: !inside-tunnel LeavesTrails@VEINS: Image: veins Palette: player From 4bd6bb0b2186db87c3cbe0e7fc30454b93adba52 Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Tue, 31 Jan 2017 09:36:01 -0600 Subject: [PATCH 3/6] TS: Don't heal actors on tiberium if they are in a tunnel --- mods/ts/rules/defaults.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index e720daa09b..2b982b2b04 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -889,6 +889,7 @@ Damage: -2 DamageInterval: 16 Terrain: Tiberium, BlueTiberium + RequiresCondition: !inside-tunnel ^DamagedByVeins: DamagedByTerrain@VEINS: From 5a13ea3366e0cf1f3d10fc42644ab225154e0d88 Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Tue, 31 Jan 2017 09:36:18 -0600 Subject: [PATCH 4/6] TS' ^DamagedByVeins: Disable LeavesTrails if inside of a tunnel --- mods/ts/rules/defaults.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index 2b982b2b04..a59a9b7372 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -907,3 +907,4 @@ MovingInterval: 16 StartDelay: -1 SpawnAtLastPosition: false + RequiresCondition: !inside-tunnel From 82f44b00d247a1ad591ed2473aaebb286d1ed65c Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Tue, 31 Jan 2017 10:31:12 -0600 Subject: [PATCH 5/6] Add TunnelCondition to ^Visceroid's Mobile trait --- mods/ts/rules/defaults.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index a59a9b7372..1e71a9e6f4 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -661,6 +661,7 @@ Tiberium: 100 BlueTiberium: 100 Veins: 100 + TunnelCondition: inside-tunnel WithTextControlGroupDecoration: SelectionDecorations: Palette: pips From 225619efe8933fb2e704b0a0e28a774420b7acf8 Mon Sep 17 00:00:00 2001 From: Taryn Hill Date: Tue, 31 Jan 2017 10:35:50 -0600 Subject: [PATCH 6/6] TS: Don't harm flying jumpjets via DamagedByTerrain --- mods/ts/rules/gdi-infantry.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mods/ts/rules/gdi-infantry.yaml b/mods/ts/rules/gdi-infantry.yaml index 3dd0867c7c..fda836f149 100644 --- a/mods/ts/rules/gdi-infantry.yaml +++ b/mods/ts/rules/gdi-infantry.yaml @@ -106,6 +106,8 @@ JUMPJET: -TakeCover: Hovers: RequiresCondition: airborne + DamagedByTerrain: + RequiresCondition: !inside-tunnel && !airborne ProducibleWithLevel: Prerequisites: barracks.upgraded Targetable: