From 99b072ddcec65ea70f78856fdfa1c25b113d1bc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 17 Apr 2016 10:55:06 +0200 Subject: [PATCH 1/4] Have infantry avoid Tiberium. --- 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 eafcacf11c..69504b29fd 100644 --- a/mods/ts/rules/defaults.yaml +++ b/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 From 27888715de2992d6fa58f08947e972160a5b747f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 17 Apr 2016 10:55:17 +0200 Subject: [PATCH 2/4] Have vehicles avoid veins. --- 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 69504b29fd..ac494541c3 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -398,6 +398,7 @@ Tiberium: 50 BlueTiberium: 50 Veins: 50 + PathingCost: 90 TurnSpeed: 5 Voice: Move Selectable: From 133a0f54a3673a84ebfff671fc967421d81af3f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Mon, 28 Mar 2016 10:20:30 +0200 Subject: [PATCH 3/4] Check for invalid targets to avoid crashing. --- OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs index 6863f92587..4d0304ca2d 100644 --- a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs +++ b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs @@ -91,6 +91,9 @@ namespace OpenRA.Mods.Common.Warheads public override void DoImpact(Target target, Actor firedBy, IEnumerable damageModifiers) { + if (!target.IsValidFor(firedBy)) + return; + var pos = target.CenterPosition; var world = firedBy.World; var targetTile = world.Map.CellContaining(pos); From 7795e4f524aba8cdfa9a321fe863209cd5cd8e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 23 Feb 2016 21:56:13 +0100 Subject: [PATCH 4/4] Add damaging through Veins. --- mods/ts/rules/defaults.yaml | 3 +++ mods/ts/rules/gdi-vehicles.yaml | 2 ++ mods/ts/rules/nod-vehicles.yaml | 2 ++ mods/ts/rules/shared-vehicles.yaml | 1 + mods/ts/sequences/misc.yaml | 5 +++++ mods/ts/weapons/otherweapons.yaml | 10 ++++++++++ 6 files changed, 23 insertions(+) diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml index ac494541c3..341d57559a 100644 --- a/mods/ts/rules/defaults.yaml +++ b/mods/ts/rules/defaults.yaml @@ -437,6 +437,9 @@ Weapons: SmallDebris Pieces: 3, 7 Range: 2c0, 5c0 + PoisonedByTiberium: + Weapon: Veins + Resources: Veins ^Tank: Inherits: ^Vehicle diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index 2a8e221def..eebeea85ef 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/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 diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 90cf5ca203..3141529ed8 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/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 diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index d1e192c882..102506cccc 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -97,6 +97,7 @@ HARV: FactionImages: gdi: harv.gdi nod: harv.nod + -PoisonedByTiberium: LPST: Inherits: ^VoxelTank diff --git a/mods/ts/sequences/misc.yaml b/mods/ts/sequences/misc.yaml index 263d8b4150..cd3376ab6a 100644 --- a/mods/ts/sequences/misc.yaml +++ b/mods/ts/sequences/misc.yaml @@ -175,6 +175,10 @@ explosion: small_grey_explosion: xgrysml2 medium_grey_explosion: xgrymed1 large_grey_explosion: xgrymed2 + veins: veinatac + Length: 12 + UseTilesetExtension: true + ZOffset: 1023 discus: idle: @@ -299,6 +303,7 @@ resources: Length: 1 Start: 52 ShadowStart: -1 + Tick: 180 shroud: Defaults: diff --git a/mods/ts/weapons/otherweapons.yaml b/mods/ts/weapons/otherweapons.yaml index 7aab314efc..1703431112 100644 --- a/mods/ts/weapons/otherweapons.yaml +++ b/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