Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Hijacker into Thief #15875

Merged
merged 1 commit into from
Dec 7, 2018
Merged

Merge Hijacker into Thief #15875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file removed mods/ra/bits/hijackericon.shp
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion mods/ra/maps/allies-03a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ E6:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/allies-03b/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ E6:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/allies-04/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ MECH:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled
2 changes: 1 addition & 1 deletion mods/ra/maps/allies-05a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ E6:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/allies-06a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ MECH:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/allies-06b/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ MECH:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/allies-07/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ MECH:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/allies-08a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ MECH:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/evacuation/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ MECH:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/fort-lonestar/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,6 @@ TSLA:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled
4 changes: 0 additions & 4 deletions mods/ra/maps/intervention/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,6 @@ THF:
Buildable:
Prerequisites: ~disabled

HIJACKER:
Buildable:
Prerequisites: ~disabled

SHOK:
Buildable:
Prerequisites: ~disabled
Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/monster-tank-madness/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ SHOK:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-02a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ SHOK:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-02b/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ SHOK:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-04a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ E4:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-04b/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ E4:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-05/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ E4:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-06a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ SPY:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-06b/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ SPY:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-08a/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ CA:
Buildable:
Prerequisites: ~disabled

HIJACKER:
THF:
Buildable:
Prerequisites: ~disabled

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ VOLK:
Armament:
Weapon: VolkovWeapon
DetectCloaked:
CloakTypes: Cloak, Hijacker
CloakTypes: Cloak, Thief
RenderSprites:
Image: GNRL

Expand Down
2 changes: 1 addition & 1 deletion mods/ra/rules/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@
IdleSequences: idle1,idle2
StandSequences: stand,stand2
DetectCloaked:
CloakTypes: Hijacker
CloakTypes: Thief

^CivInfantry:
Inherits: ^Infantry
Expand Down
6 changes: 2 additions & 4 deletions mods/ra/rules/disable-player-experience.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,10 @@ MECH:
PlayerExperience: 0

THF:
Infiltrates:
PlayerExperience: 0

HIJACKER:
Captures:
PlayerExperience: 0
Infiltrates:
PlayerExperience: 0

SPEN:
RepairsUnits:
Expand Down
39 changes: 11 additions & 28 deletions mods/ra/rules/infantry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ DOG:
StandSequences: stand
IgnoresDisguise:
DetectCloaked:
CloakTypes: Cloak, Hijacker
CloakTypes: Cloak, Thief
Voiced:
VoiceSet: DogVoice
-TakeCover:
Expand Down Expand Up @@ -309,7 +309,7 @@ SPY:
RequiresCondition: disguise
IgnoresDisguise:
DetectCloaked:
CloakTypes: Cloak, Hijacker
CloakTypes: Cloak, Thief
Armament:
Weapon: SilencedPPK
AttackFrontal:
Expand Down Expand Up @@ -376,7 +376,7 @@ E7:
Voice: Build
AnnounceOnKill:
DetectCloaked:
CloakTypes: Cloak, Hijacker
CloakTypes: Cloak, Thief
Voiced:
VoiceSet: TanyaVoice
ProducibleWithLevel:
Expand Down Expand Up @@ -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:
Expand All @@ -563,6 +542,10 @@ HIJACKER:
Captures:
CaptureTypes: vehicle
PlayerExperience: 50
Infiltrates:
Types: ThiefInfiltrate
Notification: BuildingInfiltrated
PlayerExperience: 50
Voiced:
VoiceSet: ThiefVoice
-TakeCover:
Expand All @@ -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:
Expand Down Expand Up @@ -674,7 +657,7 @@ SNIPER:
Condition: cloak-force-disabled
ValidDamageStates: Critical
DetectCloaked:
CloakTypes: Cloak, Hijacker
CloakTypes: Cloak, Thief
Range: 6c0
-MustBeDestroyed:
ProducibleWithLevel:
Expand Down
2 changes: 1 addition & 1 deletion mods/ra/rules/misc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ camera.spyplane:
Name: (support power proxy camera)
DetectCloaked:
Range: 10c0
CloakTypes: Cloak, Hijacker
CloakTypes: Cloak, Thief

SONAR:
Inherits: camera.spyplane
Expand Down
10 changes: 8 additions & 2 deletions mods/ra/rules/structures.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -1217,7 +1217,7 @@ PROC:
Facing: 64
InfiltrateForCash:
Percentage: 50
Types: SpyInfiltrate
Types: ThiefInfiltrate
Notification: CreditsStolen
WithBuildingBib:
WithIdleOverlay@TOP:
Expand Down Expand Up @@ -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:
Expand All @@ -1265,6 +1267,10 @@ SILO:
Type: Wood
RevealsShroud:
Range: 4c0
InfiltrateForCash:
Percentage: 50
Types: ThiefInfiltrate
Notification: CreditsStolen
WithBuildingBib:
HasMinibib: Yes
WithSiloAnimation:
Expand Down
Loading