epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Hijacker into Thief

Browse Source
This commit is contained in:
Smittytron
2018-12-02 08:50:09 -06:00
committed by Mustafa Alperen Seki
parent e6668bbb59
commit 72923b9572
28 changed files with 43 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mods/ra/bits/hijackericon.shp
View File

Binary file not shown.

2
mods/ra/maps/allies-03a/rules.yaml
View File

@@ -188,7 +188,7 @@ E6:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/allies-03b/rules.yaml
View File

@@ -140,7 +140,7 @@ E6:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/allies-04/rules.yaml
View File

@@ -104,6 +104,6 @@ MECH:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/allies-05a/rules.yaml
View File

@@ -181,7 +181,7 @@ E6:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/allies-06a/rules.yaml
View File

@@ -76,7 +76,7 @@ MECH:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/allies-06b/rules.yaml
View File

@@ -72,7 +72,7 @@ MECH:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/allies-07/rules.yaml
View File

@@ -104,7 +104,7 @@ MECH:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/allies-08a/rules.yaml
View File

@@ -106,7 +106,7 @@ MECH:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/evacuation/rules.yaml
View File

@@ -75,7 +75,7 @@ MECH:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/fort-lonestar/rules.yaml
View File

@@ -421,6 +421,6 @@ TSLA:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

4
mods/ra/maps/intervention/rules.yaml
View File

@@ -125,10 +125,6 @@ THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER:
Buildable:
Prerequisites: ~disabled
SHOK: SHOK:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/monster-tank-madness/rules.yaml
View File

@@ -334,7 +334,7 @@ SHOK:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-02a/rules.yaml
View File

@@ -72,7 +72,7 @@ SHOK:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-02b/rules.yaml
View File

@@ -72,7 +72,7 @@ SHOK:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-04a/rules.yaml
View File

@@ -54,7 +54,7 @@ E4:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-04b/rules.yaml
View File

@@ -54,7 +54,7 @@ E4:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-05/rules.yaml
View File

@@ -60,7 +60,7 @@ E4:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-06a/rules.yaml
View File

@@ -72,7 +72,7 @@ SPY:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-06b/rules.yaml
View File

@@ -72,7 +72,7 @@ SPY:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-08a/rules.yaml
View File

@@ -109,7 +109,7 @@ CA:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled
HIJACKER: THF:
Buildable: Buildable:
Prerequisites: ~disabled Prerequisites: ~disabled

2
mods/ra/maps/soviet-soldier-volkov-n-chitzkoi/rules.yaml
View File

@@ -192,7 +192,7 @@ VOLK:
Armament: Armament:
Weapon: VolkovWeapon Weapon: VolkovWeapon
DetectCloaked: DetectCloaked:
CloakTypes: Cloak, Hijacker CloakTypes: Cloak, Thief
RenderSprites: RenderSprites:
Image: GNRL Image: GNRL

2
mods/ra/rules/defaults.yaml
View File

@@ -440,7 +440,7 @@
IdleSequences: idle1,idle2 IdleSequences: idle1,idle2
StandSequences: stand,stand2 StandSequences: stand,stand2
DetectCloaked: DetectCloaked:
CloakTypes: Hijacker CloakTypes: Thief
^CivInfantry: ^CivInfantry:
Inherits: ^Infantry Inherits: ^Infantry

6
mods/ra/rules/disable-player-experience.yaml
View File

@@ -19,12 +19,10 @@ MECH:
PlayerExperience: 0 PlayerExperience: 0
THF: THF:
Infiltrates:
PlayerExperience: 0
HIJACKER:
Captures: Captures:
PlayerExperience: 0 PlayerExperience: 0
Infiltrates:
PlayerExperience: 0
SPEN: SPEN:
RepairsUnits: RepairsUnits:

39
mods/ra/rules/infantry.yaml
View File

@@ -43,7 +43,7 @@ DOG:
StandSequences: stand StandSequences: stand
IgnoresDisguise: IgnoresDisguise:
DetectCloaked: DetectCloaked:
CloakTypes: Cloak, Hijacker CloakTypes: Cloak, Thief
Voiced: Voiced:
VoiceSet: DogVoice VoiceSet: DogVoice
-TakeCover: -TakeCover:
@@ -309,7 +309,7 @@ SPY:
RequiresCondition: disguise RequiresCondition: disguise
IgnoresDisguise: IgnoresDisguise:
DetectCloaked: DetectCloaked:
CloakTypes: Cloak, Hijacker CloakTypes: Cloak, Thief
Armament: Armament:
Weapon: SilencedPPK Weapon: SilencedPPK
AttackFrontal: AttackFrontal:
@@ -376,7 +376,7 @@ E7:
Voice: Build Voice: Build
AnnounceOnKill: AnnounceOnKill:
DetectCloaked: DetectCloaked:
CloakTypes: Cloak, Hijacker CloakTypes: Cloak, Thief
Voiced: Voiced:
VoiceSet: TanyaVoice VoiceSet: TanyaVoice
ProducibleWithLevel: ProducibleWithLevel:
@@ -521,38 +521,17 @@ GNRL:
IdleSequences: idle1 IdleSequences: idle1
THF: 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 Inherits: ^Soldier
Buildable: Buildable:
Queue: Infantry Queue: Infantry
BuildAtProductionType: Soldier BuildAtProductionType: Soldier
BuildPaletteOrder: 110 BuildPaletteOrder: 110
Prerequisites: ~barr, fix, ~techlevel.medium Prerequisites: ~barr, fix, ~techlevel.medium
Description: Hijacks enemy vehicles.\n Unarmed Description: Steals enemy credits.\nHijacks enemy vehicles.\n Unarmed
Valued: Valued:
Cost: 500 Cost: 500
Tooltip: Tooltip:
Name: Hijacker Name: Thief
Health: Health:
HP: 5000 HP: 5000
RevealsShroud: RevealsShroud:
@@ -563,6 +542,10 @@ HIJACKER:
Captures: Captures:
CaptureTypes: vehicle CaptureTypes: vehicle
PlayerExperience: 50 PlayerExperience: 50
Infiltrates:
Types: ThiefInfiltrate
Notification: BuildingInfiltrated
PlayerExperience: 50
Voiced: Voiced:
VoiceSet: ThiefVoice VoiceSet: ThiefVoice
-TakeCover: -TakeCover:
@@ -575,7 +558,7 @@ HIJACKER:
InitialDelay: 250 InitialDelay: 250
CloakDelay: 120 CloakDelay: 120
UncloakOn: Attack, Unload, Infiltrate, Demolish, Move UncloakOn: Attack, Unload, Infiltrate, Demolish, Move
CloakTypes: Cloak, Hijacker CloakTypes: Cloak, Thief
IsPlayerPalette: true IsPlayerPalette: true
PauseOnCondition: cloak-force-disabled PauseOnCondition: cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK: GrantConditionOnDamageState@UNCLOAK:
@@ -674,7 +657,7 @@ SNIPER:
Condition: cloak-force-disabled Condition: cloak-force-disabled
ValidDamageStates: Critical ValidDamageStates: Critical
DetectCloaked: DetectCloaked:
CloakTypes: Cloak, Hijacker CloakTypes: Cloak, Thief
Range: 6c0 Range: 6c0
-MustBeDestroyed: -MustBeDestroyed:
ProducibleWithLevel: ProducibleWithLevel:

2
mods/ra/rules/misc.yaml
View File

@@ -172,7 +172,7 @@ camera.spyplane:
Name: (support power proxy camera) Name: (support power proxy camera)
DetectCloaked: DetectCloaked:
Range: 10c0 Range: 10c0
CloakTypes: Cloak, Hijacker CloakTypes: Cloak, Thief
SONAR: SONAR:
Inherits: camera.spyplane Inherits: camera.spyplane

10
mods/ra/rules/structures.yaml
View File

@@ -1192,7 +1192,7 @@ PROC:
DecorationBounds: 72,70,0,-2 DecorationBounds: 72,70,0,-2
SelectionDecorations: SelectionDecorations:
Targetable: Targetable:
TargetTypes: Ground, Structure, C4, DetonateAttack, SpyInfiltrate TargetTypes: Ground, Structure, C4, DetonateAttack, ThiefInfiltrate
Health: Health:
HP: 90000 HP: 90000
Armor: Armor:
@@ -1217,7 +1217,7 @@ PROC:
Facing: 64 Facing: 64
InfiltrateForCash: InfiltrateForCash:
Percentage: 50 Percentage: 50
Types: SpyInfiltrate Types: ThiefInfiltrate
Notification: CreditsStolen Notification: CreditsStolen
WithBuildingBib: WithBuildingBib:
WithIdleOverlay@TOP: WithIdleOverlay@TOP:
@@ -1255,6 +1255,8 @@ SILO:
Description: Stores excess refined\nOre and Gems. Description: Stores excess refined\nOre and Gems.
Valued: Valued:
Cost: 150 Cost: 150
Targetable:
TargetTypes: Ground, Structure, C4, DetonateAttack, ThiefInfiltrate
Tooltip: Tooltip:
Name: Silo Name: Silo
-GivesBuildableArea: -GivesBuildableArea:
@@ -1265,6 +1267,10 @@ SILO:
Type: Wood Type: Wood
RevealsShroud: RevealsShroud:
Range: 4c0 Range: 4c0
InfiltrateForCash:
Percentage: 50
Types: ThiefInfiltrate
Notification: CreditsStolen
WithBuildingBib: WithBuildingBib:
HasMinibib: Yes HasMinibib: Yes
WithSiloAnimation: WithSiloAnimation:

52
mods/ra/sequences/infantry.yaml
View File

@@ -665,58 +665,6 @@ thf:
Tick: 80 Tick: 80
icon: thficon 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: e7:
stand: stand:
Facings: 8 Facings: 8