Merge pull request #12666 from Phrohdoh/damagedbyterrain-respect-tunnels

TS DamagedByTerrain and ^DamagedByVeins: Don't damage actors in tunnels

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]

mods/ts/rules/defaults.yaml

@@ -326,6 +326,7 @@
 		Damage: 2
 		DamageInterval: 16
 		DamageTypes: ExplosionDeath, TriggerVisceroid
+		RequiresCondition: !inside-tunnel
 	Guard:
 		Voice: Move
 	Guardable:
@@ -660,6 +661,7 @@
 			Tiberium: 100
 			BlueTiberium: 100
 			Veins: 100
+		TunnelCondition: inside-tunnel
 	WithTextControlGroupDecoration:
 	SelectionDecorations:
 		Palette: pips
@@ -888,6 +890,7 @@
 		Damage: -2
 		DamageInterval: 16
 		Terrain: Tiberium, BlueTiberium
+		RequiresCondition: !inside-tunnel
 
 ^DamagedByVeins:
 	DamagedByTerrain@VEINS:
@@ -895,6 +898,7 @@
 		DamageInterval: 16
 		DamageTypes: BulletDeath
 		Terrain: Veins
+		RequiresCondition: !inside-tunnel
 	LeavesTrails@VEINS:
 		Image: veins
 		Palette: player
@@ -904,3 +908,4 @@
 		MovingInterval: 16
 		StartDelay: -1
 		SpawnAtLastPosition: false
+		RequiresCondition: !inside-tunnel

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: