From 72923b9572021ae885691327be492479491cc12e Mon Sep 17 00:00:00 2001 From: Smittytron Date: Sun, 2 Dec 2018 08:50:09 -0600 Subject: [PATCH] Merge Hijacker into Thief --- mods/ra/bits/hijackericon.shp | Bin 2309 -> 0 bytes mods/ra/maps/allies-03a/rules.yaml | 2 +- mods/ra/maps/allies-03b/rules.yaml | 2 +- mods/ra/maps/allies-04/rules.yaml | 2 +- mods/ra/maps/allies-05a/rules.yaml | 2 +- mods/ra/maps/allies-06a/rules.yaml | 2 +- mods/ra/maps/allies-06b/rules.yaml | 2 +- mods/ra/maps/allies-07/rules.yaml | 2 +- mods/ra/maps/allies-08a/rules.yaml | 2 +- mods/ra/maps/evacuation/rules.yaml | 2 +- mods/ra/maps/fort-lonestar/rules.yaml | 2 +- mods/ra/maps/intervention/rules.yaml | 4 -- mods/ra/maps/monster-tank-madness/rules.yaml | 2 +- mods/ra/maps/soviet-02a/rules.yaml | 2 +- mods/ra/maps/soviet-02b/rules.yaml | 2 +- mods/ra/maps/soviet-04a/rules.yaml | 2 +- mods/ra/maps/soviet-04b/rules.yaml | 2 +- mods/ra/maps/soviet-05/rules.yaml | 2 +- mods/ra/maps/soviet-06a/rules.yaml | 2 +- mods/ra/maps/soviet-06b/rules.yaml | 2 +- mods/ra/maps/soviet-08a/rules.yaml | 2 +- .../rules.yaml | 2 +- mods/ra/rules/defaults.yaml | 2 +- mods/ra/rules/disable-player-experience.yaml | 6 +- mods/ra/rules/infantry.yaml | 39 ++++--------- mods/ra/rules/misc.yaml | 2 +- mods/ra/rules/structures.yaml | 10 +++- mods/ra/sequences/infantry.yaml | 52 ------------------ 28 files changed, 43 insertions(+), 112 deletions(-) delete mode 100644 mods/ra/bits/hijackericon.shp diff --git a/mods/ra/bits/hijackericon.shp b/mods/ra/bits/hijackericon.shp deleted file mode 100644 index 5772b257ff7071cfba992f1bd41dc01b186e4e8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2309 zcmX|D&2JmW6@N>K@<(R1Z%B&{Q#d>F#%wGo2q`z)={p+D&Gehz>pv!&YMkj-K*CwWIp0 zFb)@(k5zaHM@<4Tna~W0w>mqaj>D|SzOu5WmQkxlkroXtXj-IcsKN0M z8jX>Lrg>V!j)*jA*RO1DvLklAK8fS@W_^=&Y(fxKOUuLeT#PiQjv8AuM{wO70TNy% zl08{>EPKX$EY{5qZ1C^#$#Z*4eeT^0jgWK z?fNE6@G16^Q&;+sEVo*e_EW;??KGoAzjaR&eqegA0e5j2@7RsTHBikuT)4DpZ8~+k zzArf0nRM(`BD@gNy|w1P!F|oz-pCbxS^4>p7DbI0xpYx>7`n}C_&JtMCmXXJTZE%l ztDSrHS2RJE2VR?^OVpcmdhK3x+!d$Su_5L(+{RU=Sz{WMZQuVGVwExfO*zoIzLYnowmpl(E-Z&@Y1v%eyy+9PXYr^Km!JUKNp~1x)%{BULX9p1Q z-lwlW_uQewZxV`2rBF%Zi4dNxh(Y#5AZFmyVn*~TuIKUC9+)#%*>8pDVc^Njsn>t{ z&deRGh$PPy=GI#9>+CsZ;(u&P5?lo8 zwsV!Bg(<&}wt^rN{z$@5`KwsCovcVyj&CfWYb^;-m^nRfeAeBgo^wWXIUt$ow<1G z&N#n2oObs70B*Ph+e!wGSeY!kF|8VgN=fmFbnw9H+yBjW&h~KLlo#FkWWs4+O~H4; zFnzr11&W+X%YteZ*!rL2@LKkH+Rb)b&D??AzCwds&d=q9bGDxu1=|hfR0-jh%~IYSMub9L%mx=MD8O@t#7t~R& z-Imiy&SE^_QaQ|E_mJ@W54c)#HNBiXzzU2NiDa-FsJ?ogeN}1c%&5ufnMuD@OUfAf z;NlEW0HV9K4HXKWU3IrI7!$(m~0 zqwSkUVRk#jntCu63X_-Q5|&bZN^)-)Vy!U8px-I#h7kjY8HBv5v46on*C-Z^EkWM@ ziPO4XOG3fi!{MadbW$cMcpOYFszFtY&2u*av+K(z;=D(_({rq7%!6XRWjxVUX)~rM z=>*7?QaX(_UB_VY92mZtP4{&9E5j!I&R>C^gY7`LX1J9>ndU1sQvbmE{mvMg>< z-PMiad;y*m0NOUe)t+}J-d$`b*z|nSU^+Yl?jogZev1vTgzy`yILmPu^gH$}n}TDO zF$HCFVEg8xc?*N&w|-)6i?PANEN(tj`Xg_a>2pOLc6&v=STG8(W)4A$4x18QJoh_u zwdarUg~^0bt5||RS*!$4+RQjDL>8MCen^kn!%Sblzw_>=J9vf0CccIb?fdL4j-kk3 z#uh8OK3$xiEufd<={nu7nx(rvI~|FvNf2kdJtj$H%7D1ZSQiH*VcaC_TdFz_W~b%_ zb$wSH#51Zbk^6k4h;dgU0}>Hbh+7h&syXnsx_@Y!U-l=enkCzt!cObZX|}-U>wM2y zUATg`*6;MFWxh%R+llc>O(*nmHnJSlJ- aC)8ya6GrXn>8aRzF8j+garmDNDgO`b7Vqr< diff --git a/mods/ra/maps/allies-03a/rules.yaml b/mods/ra/maps/allies-03a/rules.yaml index 2a01583cfc..050c9f8421 100644 --- a/mods/ra/maps/allies-03a/rules.yaml +++ b/mods/ra/maps/allies-03a/rules.yaml @@ -188,7 +188,7 @@ E6: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-03b/rules.yaml b/mods/ra/maps/allies-03b/rules.yaml index 0b465563b2..c8b65244ab 100644 --- a/mods/ra/maps/allies-03b/rules.yaml +++ b/mods/ra/maps/allies-03b/rules.yaml @@ -140,7 +140,7 @@ E6: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-04/rules.yaml b/mods/ra/maps/allies-04/rules.yaml index 2d0f7c2bc7..4e0dd490ca 100644 --- a/mods/ra/maps/allies-04/rules.yaml +++ b/mods/ra/maps/allies-04/rules.yaml @@ -104,6 +104,6 @@ MECH: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-05a/rules.yaml b/mods/ra/maps/allies-05a/rules.yaml index 8705277ab8..3689c2e5ee 100644 --- a/mods/ra/maps/allies-05a/rules.yaml +++ b/mods/ra/maps/allies-05a/rules.yaml @@ -181,7 +181,7 @@ E6: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-06a/rules.yaml b/mods/ra/maps/allies-06a/rules.yaml index 9c7ebb3c8e..0339ab7022 100644 --- a/mods/ra/maps/allies-06a/rules.yaml +++ b/mods/ra/maps/allies-06a/rules.yaml @@ -76,7 +76,7 @@ MECH: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-06b/rules.yaml b/mods/ra/maps/allies-06b/rules.yaml index 80a6d56f5d..e6d67721c6 100644 --- a/mods/ra/maps/allies-06b/rules.yaml +++ b/mods/ra/maps/allies-06b/rules.yaml @@ -72,7 +72,7 @@ MECH: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-07/rules.yaml b/mods/ra/maps/allies-07/rules.yaml index b70268e5dc..644afec341 100644 --- a/mods/ra/maps/allies-07/rules.yaml +++ b/mods/ra/maps/allies-07/rules.yaml @@ -104,7 +104,7 @@ MECH: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/allies-08a/rules.yaml b/mods/ra/maps/allies-08a/rules.yaml index 23bc22f63d..a97818b2de 100644 --- a/mods/ra/maps/allies-08a/rules.yaml +++ b/mods/ra/maps/allies-08a/rules.yaml @@ -106,7 +106,7 @@ MECH: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/evacuation/rules.yaml b/mods/ra/maps/evacuation/rules.yaml index a6e3930419..20d4a951fb 100644 --- a/mods/ra/maps/evacuation/rules.yaml +++ b/mods/ra/maps/evacuation/rules.yaml @@ -75,7 +75,7 @@ MECH: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/fort-lonestar/rules.yaml b/mods/ra/maps/fort-lonestar/rules.yaml index 66c1e3df60..32a92f810b 100644 --- a/mods/ra/maps/fort-lonestar/rules.yaml +++ b/mods/ra/maps/fort-lonestar/rules.yaml @@ -421,6 +421,6 @@ TSLA: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/intervention/rules.yaml b/mods/ra/maps/intervention/rules.yaml index 747d34a50b..ba108ceae9 100644 --- a/mods/ra/maps/intervention/rules.yaml +++ b/mods/ra/maps/intervention/rules.yaml @@ -125,10 +125,6 @@ THF: Buildable: Prerequisites: ~disabled -HIJACKER: - Buildable: - Prerequisites: ~disabled - SHOK: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/monster-tank-madness/rules.yaml b/mods/ra/maps/monster-tank-madness/rules.yaml index 297e4e7e50..9b4cde4b1d 100644 --- a/mods/ra/maps/monster-tank-madness/rules.yaml +++ b/mods/ra/maps/monster-tank-madness/rules.yaml @@ -334,7 +334,7 @@ SHOK: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-02a/rules.yaml b/mods/ra/maps/soviet-02a/rules.yaml index ee79ea3e7c..d75abc17d2 100644 --- a/mods/ra/maps/soviet-02a/rules.yaml +++ b/mods/ra/maps/soviet-02a/rules.yaml @@ -72,7 +72,7 @@ SHOK: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-02b/rules.yaml b/mods/ra/maps/soviet-02b/rules.yaml index 1a4e52519e..4267d9e4c7 100644 --- a/mods/ra/maps/soviet-02b/rules.yaml +++ b/mods/ra/maps/soviet-02b/rules.yaml @@ -72,7 +72,7 @@ SHOK: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-04a/rules.yaml b/mods/ra/maps/soviet-04a/rules.yaml index e465bfec83..25ddab19db 100644 --- a/mods/ra/maps/soviet-04a/rules.yaml +++ b/mods/ra/maps/soviet-04a/rules.yaml @@ -54,7 +54,7 @@ E4: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-04b/rules.yaml b/mods/ra/maps/soviet-04b/rules.yaml index da697fad2c..11bee8a1c1 100644 --- a/mods/ra/maps/soviet-04b/rules.yaml +++ b/mods/ra/maps/soviet-04b/rules.yaml @@ -54,7 +54,7 @@ E4: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-05/rules.yaml b/mods/ra/maps/soviet-05/rules.yaml index b504f1e876..1e281ccbfd 100644 --- a/mods/ra/maps/soviet-05/rules.yaml +++ b/mods/ra/maps/soviet-05/rules.yaml @@ -60,7 +60,7 @@ E4: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-06a/rules.yaml b/mods/ra/maps/soviet-06a/rules.yaml index fb9d81a1f4..0a2b97fd09 100644 --- a/mods/ra/maps/soviet-06a/rules.yaml +++ b/mods/ra/maps/soviet-06a/rules.yaml @@ -72,7 +72,7 @@ SPY: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-06b/rules.yaml b/mods/ra/maps/soviet-06b/rules.yaml index cfed2c8ce8..a433eafac1 100644 --- a/mods/ra/maps/soviet-06b/rules.yaml +++ b/mods/ra/maps/soviet-06b/rules.yaml @@ -72,7 +72,7 @@ SPY: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-08a/rules.yaml b/mods/ra/maps/soviet-08a/rules.yaml index f5e5347c5d..521354735e 100644 --- a/mods/ra/maps/soviet-08a/rules.yaml +++ b/mods/ra/maps/soviet-08a/rules.yaml @@ -109,7 +109,7 @@ CA: Buildable: Prerequisites: ~disabled -HIJACKER: +THF: Buildable: Prerequisites: ~disabled diff --git a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml index 876a4d5635..b94f789dc5 100644 --- a/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml +++ b/mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml @@ -192,7 +192,7 @@ VOLK: Armament: Weapon: VolkovWeapon DetectCloaked: - CloakTypes: Cloak, Hijacker + CloakTypes: Cloak, Thief RenderSprites: Image: GNRL diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml index bbe573544b..4ce51bd7c0 100644 --- a/mods/ra/rules/defaults.yaml +++ b/mods/ra/rules/defaults.yaml @@ -440,7 +440,7 @@ IdleSequences: idle1,idle2 StandSequences: stand,stand2 DetectCloaked: - CloakTypes: Hijacker + CloakTypes: Thief ^CivInfantry: Inherits: ^Infantry diff --git a/mods/ra/rules/disable-player-experience.yaml b/mods/ra/rules/disable-player-experience.yaml index c4b16ceb4c..74b9bd07e9 100644 --- a/mods/ra/rules/disable-player-experience.yaml +++ b/mods/ra/rules/disable-player-experience.yaml @@ -19,12 +19,10 @@ MECH: PlayerExperience: 0 THF: - Infiltrates: - PlayerExperience: 0 - -HIJACKER: Captures: PlayerExperience: 0 + Infiltrates: + PlayerExperience: 0 SPEN: RepairsUnits: diff --git a/mods/ra/rules/infantry.yaml b/mods/ra/rules/infantry.yaml index 7a04017a9f..39a47b0fe8 100644 --- a/mods/ra/rules/infantry.yaml +++ b/mods/ra/rules/infantry.yaml @@ -43,7 +43,7 @@ DOG: StandSequences: stand IgnoresDisguise: DetectCloaked: - CloakTypes: Cloak, Hijacker + CloakTypes: Cloak, Thief Voiced: VoiceSet: DogVoice -TakeCover: @@ -309,7 +309,7 @@ SPY: RequiresCondition: disguise IgnoresDisguise: DetectCloaked: - CloakTypes: Cloak, Hijacker + CloakTypes: Cloak, Thief Armament: Weapon: SilencedPPK AttackFrontal: @@ -376,7 +376,7 @@ E7: Voice: Build AnnounceOnKill: DetectCloaked: - CloakTypes: Cloak, Hijacker + CloakTypes: Cloak, Thief Voiced: VoiceSet: TanyaVoice ProducibleWithLevel: @@ -521,38 +521,17 @@ GNRL: IdleSequences: idle1 THF: - Inherits: ^Soldier - Valued: - Cost: 400 - Tooltip: - Name: Thief - RevealsShroud: - Range: 5c0 - Passenger: - PipType: Blue - Infiltrates: - Notification: BuildingInfiltrated - PlayerExperience: 50 - Voiced: - VoiceSet: ThiefVoice - WithInfantryBody: - IdleSequences: idle - StandSequences: stand - Buildable: - Description: Steals enemy credits.\n Unarmed - -HIJACKER: Inherits: ^Soldier Buildable: Queue: Infantry BuildAtProductionType: Soldier BuildPaletteOrder: 110 Prerequisites: ~barr, fix, ~techlevel.medium - Description: Hijacks enemy vehicles.\n Unarmed + Description: Steals enemy credits.\nHijacks enemy vehicles.\n Unarmed Valued: Cost: 500 Tooltip: - Name: Hijacker + Name: Thief Health: HP: 5000 RevealsShroud: @@ -563,6 +542,10 @@ HIJACKER: Captures: CaptureTypes: vehicle PlayerExperience: 50 + Infiltrates: + Types: ThiefInfiltrate + Notification: BuildingInfiltrated + PlayerExperience: 50 Voiced: VoiceSet: ThiefVoice -TakeCover: @@ -575,7 +558,7 @@ HIJACKER: InitialDelay: 250 CloakDelay: 120 UncloakOn: Attack, Unload, Infiltrate, Demolish, Move - CloakTypes: Cloak, Hijacker + CloakTypes: Cloak, Thief IsPlayerPalette: true PauseOnCondition: cloak-force-disabled GrantConditionOnDamageState@UNCLOAK: @@ -674,7 +657,7 @@ SNIPER: Condition: cloak-force-disabled ValidDamageStates: Critical DetectCloaked: - CloakTypes: Cloak, Hijacker + CloakTypes: Cloak, Thief Range: 6c0 -MustBeDestroyed: ProducibleWithLevel: diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml index 073fdfa741..411715e4f1 100644 --- a/mods/ra/rules/misc.yaml +++ b/mods/ra/rules/misc.yaml @@ -172,7 +172,7 @@ camera.spyplane: Name: (support power proxy camera) DetectCloaked: Range: 10c0 - CloakTypes: Cloak, Hijacker + CloakTypes: Cloak, Thief SONAR: Inherits: camera.spyplane diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml index 8951298a64..3853a5bda9 100644 --- a/mods/ra/rules/structures.yaml +++ b/mods/ra/rules/structures.yaml @@ -1192,7 +1192,7 @@ PROC: DecorationBounds: 72,70,0,-2 SelectionDecorations: Targetable: - TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate + TargetTypes: Ground, Structure, C4, DetonateAttack, ThiefInfiltrate Health: HP: 90000 Armor: @@ -1217,7 +1217,7 @@ PROC: Facing: 64 InfiltrateForCash: Percentage: 50 - Types: SpyInfiltrate + Types: ThiefInfiltrate Notification: CreditsStolen WithBuildingBib: WithIdleOverlay@TOP: @@ -1255,6 +1255,8 @@ SILO: Description: Stores excess refined\nOre and Gems. Valued: Cost: 150 + Targetable: + TargetTypes: Ground, Structure, C4, DetonateAttack, ThiefInfiltrate Tooltip: Name: Silo -GivesBuildableArea: @@ -1265,6 +1267,10 @@ SILO: Type: Wood RevealsShroud: Range: 4c0 + InfiltrateForCash: + Percentage: 50 + Types: ThiefInfiltrate + Notification: CreditsStolen WithBuildingBib: HasMinibib: Yes WithSiloAnimation: diff --git a/mods/ra/sequences/infantry.yaml b/mods/ra/sequences/infantry.yaml index df41fccc90..910e5e13b1 100644 --- a/mods/ra/sequences/infantry.yaml +++ b/mods/ra/sequences/infantry.yaml @@ -665,58 +665,6 @@ thf: Tick: 80 icon: thficon -hijacker: - stand: thf - Facings: 8 - run: thf - Start: 8 - Length: 6 - Facings: 8 - Tick: 100 - idle: thf - Start: 120 - Length: 19 - Tick: 120 - 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 - Length: * - UseTilesetExtension: true - TilesetOverrides: - DESERT: TEMPERAT - INTERIOR: TEMPERAT - die-crushed: corpse1 - Length: 6 - Tick: 1600 - ZOffset: -511 - UseTilesetExtension: true - TilesetOverrides: - DESERT: TEMPERAT - INTERIOR: TEMPERAT - prone-stand: thf - Start: 72 - Stride: 4 - Facings: 8 - prone-run: thf - Start: 72 - Length: 4 - Facings: 8 - Tick: 80 - icon: hijackericon - e7: stand: Facings: 8