Merge pull request #10813 from Mailaender/vein-damage

Added damaging through Veins.

OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs

@@ -91,6 +91,9 @@ namespace OpenRA.Mods.Common.Warheads
 
 		public override void DoImpact(Target target, Actor firedBy, IEnumerable<int> damageModifiers)
 		{
+			if (!target.IsValidFor(firedBy))
+				return;
+
 			var pos = target.CenterPosition;
 			var world = firedBy.World;
 			var targetTile = world.Map.CellContaining(pos);

mods/ts/rules/defaults.yaml

@@ -257,7 +257,9 @@
 			DirtRoad: 100
 			Rough: 80
 			Tiberium: 90
+				PathingCost: 90
 			BlueTiberium: 90
+				PathingCost: 90
 			Veins: 50
 	SelectionDecorations:
 		Palette: pips
@@ -396,6 +398,7 @@
 			Tiberium: 50
 			BlueTiberium: 50
 			Veins: 50
+				PathingCost: 90
 		TurnSpeed: 5
 		Voice: Move
 	Selectable:
@@ -434,6 +437,9 @@
 		Weapons: SmallDebris
 		Pieces: 3, 7
 		Range: 2c0, 5c0
+	PoisonedByTiberium:
+		Weapon: Veins
+		Resources: Veins
 
 ^Tank:
 	Inherits: ^Vehicle

mods/ts/rules/gdi-vehicles.yaml

@@ -85,6 +85,7 @@ HVR:
 		TrailWhileStationary: True
 		StationaryInterval: 18
 		MovingInterval: 6
+	-PoisonedByTiberium:
 
 SMECH:
 	Inherits: ^Vehicle
@@ -123,6 +124,7 @@ SMECH:
 		MoveSequence: run
 	Selectable:
 		Bounds: 20, 32, 0, -8
+	-PoisonedByTiberium:
 
 MMCH:
 	Inherits: ^Tank

mods/ts/rules/nod-vehicles.yaml

@@ -27,6 +27,7 @@ BGGY:
 		Voice: Attack
 	AutoTarget:
 	WithMuzzleOverlay:
+	-PoisonedByTiberium:
 
 BIKE:
 	Inherits: ^VoxelVehicle
@@ -255,6 +256,7 @@ WEED:
 	-WithVoxelBody:
 	WithVoxelUnloadBody:
 	-GainsExperience:
+	-PoisonedByTiberium:
 
 SAPC:
 	Inherits: ^VoxelTank

mods/ts/rules/shared-vehicles.yaml

@@ -97,6 +97,7 @@ HARV:
 		FactionImages:
 			gdi: harv.gdi
 			nod: harv.nod
+	-PoisonedByTiberium:
 
 LPST:
 	Inherits: ^VoxelTank

mods/ts/sequences/misc.yaml

@@ -171,6 +171,10 @@ explosion:
 	small_grey_explosion: xgrysml2
 	medium_grey_explosion: xgrymed1
 	large_grey_explosion: xgrymed2
+	veins: veinatac
+		Length: 12
+		UseTilesetExtension: true
+		ZOffset: 1023
 
 discus:
 	idle:
@@ -295,6 +299,7 @@ resources:
 		Length: 1
 		Start: 52
 		ShadowStart: -1
+		Tick: 180
 
 shroud:
 	Defaults:

mods/ts/weapons/otherweapons.yaml

@@ -66,3 +66,13 @@ Tiberium:
 		Spread: 42
 		Damage: 2
 		DamageTypes: EnergyDeath # TODO: FIX ME!
+
+Veins:
+	ReloadDelay: 16
+	Warhead@Damage: SpreadDamage
+		Spread: 42
+		Damage: 5
+		DamageTypes: EnergyDeath # TODO: FIX ME!
+	Warhead@Effect: CreateEffect
+		Explosions: veins
+		ExplosionPalette: player