From f8e1779f24c4df95672ebcb853011e1c0880da6e Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Sat, 5 Apr 2014 13:58:02 +1300 Subject: [PATCH 1/4] Add an option to cancel activities when captured to Capturable --- OpenRA.Mods.RA/Capturable.cs | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Capturable.cs b/OpenRA.Mods.RA/Capturable.cs index 70f9478d65..3d8844ad43 100644 --- a/OpenRA.Mods.RA/Capturable.cs +++ b/OpenRA.Mods.RA/Capturable.cs @@ -9,8 +9,9 @@ #endregion using System.Linq; -using OpenRA.Traits; using OpenRA.FileFormats; +using OpenRA.Mods.RA.Activities; +using OpenRA.Traits; namespace OpenRA.Mods.RA { @@ -24,6 +25,7 @@ namespace OpenRA.Mods.RA public readonly bool AllowEnemies = true; [Desc("Health percentage the target must be at (or below) before it can be captured.")] public readonly float CaptureThreshold = 0.5f; + public readonly bool CancelActivity = false; public bool CanBeTargetedBy(Actor captor, Player owner) { @@ -48,5 +50,17 @@ namespace OpenRA.Mods.RA } } - class Capturable { } + class Capturable : INotifyCapture + { + public void OnCapture(Actor self, Actor captor, Player oldOwner, Player newOwner) + { + var info = self.Info.Traits.Get(); + if (info.CancelActivity) + { + var stop = new Order("Stop", self, false); + foreach (var t in self.TraitsImplementing()) + t.ResolveOrder(self, stop); + } + } + } } From d4bc4ac82732619d1842e2290fa15f523c59a4eb Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Sat, 5 Apr 2014 13:58:19 +1300 Subject: [PATCH 2/4] Rename BuildingCaptureNotification.cs to CaptureNotification.cs --- .../{BuildingCaptureNotification.cs => CaptureNotification.cs} | 0 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename OpenRA.Mods.RA/{BuildingCaptureNotification.cs => CaptureNotification.cs} (100%) diff --git a/OpenRA.Mods.RA/BuildingCaptureNotification.cs b/OpenRA.Mods.RA/CaptureNotification.cs similarity index 100% rename from OpenRA.Mods.RA/BuildingCaptureNotification.cs rename to OpenRA.Mods.RA/CaptureNotification.cs diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index dbf02920b1..91ed4ab7b0 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -166,7 +166,7 @@ - + From 5eb91d2811ffd2abf31cc8233b622486e22754bb Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Sat, 5 Apr 2014 13:58:40 +1300 Subject: [PATCH 3/4] Add hijacker --- CHANGELOG | 1 + mods/ra/bits/hijackericon.shp | Bin 0 -> 3160 bytes mods/ra/bits/unitsto.aud | Bin 0 -> 14550 bytes mods/ra/notifications.yaml | 1 + mods/ra/rules/defaults.yaml | 12 +++++++++++ mods/ra/rules/infantry.yaml | 28 ++++++++++++++++++++++++ mods/ra/sequences/infantry.yaml | 37 ++++++++++++++++++++++++++++++++ 7 files changed, 79 insertions(+) create mode 100644 mods/ra/bits/hijackericon.shp create mode 100644 mods/ra/bits/unitsto.aud diff --git a/CHANGELOG b/CHANGELOG index 53ebf4b0d3..d87628a72e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -81,6 +81,7 @@ NEW: Both Allied and Soviet factions now build general-purpose mines instead of AT and AP mines respectively. Added new attack-move cursor artwork. Added Phase Transport, an Allied high-tech infantry transport which can cloak. + Added Hijacker, a Soviet infantry unit with a vehicle hijacking ability. Attack Dogs, Snipers, Mobile Radar Jammers, Camo Pillboxes, Phase Transports, Radar Domes, and Spy Planes can now detect cloaked units. Removed the submarine detection ability from Cruiser and Transport. Added the submarine detection ability to Submarines and Missile Subs. diff --git a/mods/ra/bits/hijackericon.shp b/mods/ra/bits/hijackericon.shp new file mode 100644 index 0000000000000000000000000000000000000000..9eac767028913235c0897809222cf17e284a6ec0 GIT binary patch literal 3160 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 literal 0 HcmV?d00001 diff --git a/mods/ra/notifications.yaml b/mods/ra/notifications.yaml index 7c8a43af9e..5c9fec9f8c 100644 --- a/mods/ra/notifications.yaml +++ b/mods/ra/notifications.yaml @@ -23,6 +23,7 @@ Speech: NavalUnitLost: navylst1 AirUnitLost: aunitl1 BuildingCaptured: strucap1 + UnitStolen: unitsto ReinforcementsArrived: reinfor1 SignalFlareNorth: flaren1 AlliedReinforcementsArrived: aarrive1 diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index 63f90a4af1..faa1583d3b 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -46,6 +46,12 @@ Huntable: LuaScriptEvents: Demolishable: + Capturable: + Type: vehicle + CaptureThreshold: 1 + CancelActivity: True + CaptureNotification: + Notification: UnitStolen ^Tank: AppearsOnRadar: @@ -95,6 +101,12 @@ Huntable: LuaScriptEvents: Demolishable: + Capturable: + Type: vehicle + CaptureThreshold: 1 + CancelActivity: True + CaptureNotification: + Notification: UnitStolen ^Infantry: AppearsOnRadar: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index e990a631e2..c9bd232b5f 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -425,6 +425,34 @@ THF: TakeCover: -AutoTarget: +HIJACKER: + Inherits: ^Infantry + Buildable: + Queue: Infantry + BuildPaletteOrder: 90 + Owner: soviet + Prerequisites: fix + Hotkey: j + Valued: + Cost: 500 + Tooltip: + Name: Hijacker + Description: Hijacks enemy vehicles. Unarmed\n Strong vs Tanks\n Weak vs Infantry, Aircraft + Selectable: + Voice: ThiefVoice + Bounds: 12,17,0,-9 + Health: + HP: 80 + Mobile: + Speed: 56 + RevealsShroud: + Range: 5c0 + Passenger: + PipType: Yellow + Captures: + CaptureTypes: vehicle + -AutoTarget: + SHOK: Inherits: ^Infantry Buildable: diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index 37fe1b68b0..68eb09c3fa 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -594,6 +594,43 @@ thf: icon: thficon Start: 0 +hijacker: + stand: thf + Start: 0 + Facings: 8 + stand2: thf + Start: 0 + Facings: 8 + run: thf + Start: 8 + Length: 6 + Facings: 8 + Tick: 100 + die1: thf + Start: 139 + Length: 8 + die2: thf + Start: 147 + Length: 8 + die3: thf + Start: 155 + Length: 8 + die4: thf + Start: 163 + Length: 12 + die5: thf + Start: 175 + Length: 18 + die6: electro + Start: 0 + Length: * + crawl: thf + Start: 72 + Length: 4 + Facings: 8 + icon: hijackericon + Start: 0 + e7: stand: Start: 0 From a29111a9a8c40367c1cc7a71e1968a640006b435 Mon Sep 17 00:00:00 2001 From: ScottNZ Date: Sat, 5 Apr 2014 15:42:18 +1300 Subject: [PATCH 4/4] Add a missing sequence to thf --- mods/ra/sequences/infantry.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index 68eb09c3fa..0abc867a31 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -587,6 +587,10 @@ thf: die6: electro Start: 0 Length: * + die-crushed: corpse1 + Start: 0 + Length: 6 + Tick: 1600 crawl: Start: 72 Length: 4 @@ -624,6 +628,10 @@ hijacker: die6: electro Start: 0 Length: * + die-crushed: corpse1 + Start: 0 + Length: 6 + Tick: 1600 crawl: thf Start: 72 Length: 4