Merge Hijacker into Thief

2018-12-02 08:50:09 -06:00
parent e6668bbb59
commit 72923b9572
28 changed files with 43 additions and 112 deletions
--- a/mods/ra/bits/hijackericon.shp
+++ b/mods/ra/bits/hijackericon.shp
--- 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

--- 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

--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
--- 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
--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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

--- 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
        
--- 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
--- 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:
--- 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:
--- 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
--- 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:
--- 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