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

Merge pull request #12759 from forcecore/cloak_unhardcoding

Browse Source 
Unhardcode disableCloak on critical HP (#12741)
This commit is contained in:
Paul Chote
2017-03-03 22:31:37 +00:00
committed by GitHub
parent 6aa2f962b1 0483708487
commit 2e605bb6cb
11 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Cloak.cs
View File

@@ -64,7 +64,6 @@ namespace OpenRA.Mods.Common.Traits
INotifyAttack, ITick, IVisibilityModifier, IRadarColorModifier, INotifyCreated, INotifyHarvesterAction
{
[Sync] int remainingTime;
[Sync] bool damageDisabled;
bool isDocking;
ConditionManager conditionManager;
@@ -102,8 +101,7 @@ namespace OpenRA.Mods.Common.Traits
void INotifyDamage.Damaged(Actor self, AttackInfo e)
{
damageDisabled = e.DamageState >= DamageState.Critical;
if (damageDisabled || Info.UncloakOn.HasFlag(UncloakType.Damage))
if (Info.UncloakOn.HasFlag(UncloakType.Damage))
Uncloak();
}
@@ -128,7 +126,7 @@ namespace OpenRA.Mods.Common.Traits
{
if (!IsTraitDisabled)
{
if (remainingTime > 0 && !damageDisabled && !isDocking)
if (remainingTime > 0 && !isDocking)
remainingTime--;
if (self.IsDisabled())

7
mods/cnc/rules/defaults.yaml
View File

@@ -125,9 +125,12 @@
CloakDelay: 90
CloakSound: trans1.aud
UncloakSound: trans1.aud
RequiresCondition: cloak
RequiresCondition: cloak-crate-collected && !cloak-force-disabled
ExternalCondition@CLOAK:
Condition: cloak
Condition: cloak-crate-collected
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
^Vehicle:
Inherits@1: ^ExistsInWorld

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

@@ -19,7 +19,7 @@ CRATE:
GrantExternalConditionCrateAction@cloak:
SelectionShares: 5
Effect: cloak
Condition: cloak
Condition: cloak-crate-collected
GiveMcvCrateAction:
SelectionShares: 0
NoBaseSelectionShares: 120

4
mods/cnc/rules/vehicles.yaml
View File

@@ -547,6 +547,10 @@ STNK:
CloakDelay: 90
CloakSound: trans1.aud
UncloakSound: trans1.aud
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Armament:
Weapon: 227mm.stnk
LocalOffset: 213,43,128, 213,-43,128

8
mods/d2k/rules/infantry.yaml
View File

@@ -154,6 +154,10 @@ fremen:
CloakSound: STEALTH1.WAV
UncloakSound: STEALTH2.WAV
IsPlayerPalette: true
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
-MustBeDestroyed:
Voiced:
VoiceSet: FremenVoice
@@ -249,6 +253,10 @@ saboteur:
UncloakSound: STEALTH2.WAV
UncloakOn: Attack, Unload, Infiltrate, Demolish, Move, Damage
IsPlayerPalette: true
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Voiced:
VoiceSet: SaboteurVoice

4
mods/d2k/rules/vehicles.yaml
View File

@@ -396,6 +396,10 @@ stealth_raider:
CloakSound: STEALTH1.WAV
UncloakSound: STEALTH2.WAV
IsPlayerPalette: true
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
AutoTarget:
InitialStance: HoldFire
InitialStanceAI: ReturnFire

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

@@ -508,6 +508,10 @@ HIJACKER:
UncloakOn: Attack, Unload, Infiltrate, Demolish, Move
CloakTypes: Cloak, Hijacker
IsPlayerPalette: true
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Mobile:
Speed: 85
@@ -589,6 +593,10 @@ SNIPER:
UncloakSound:
UncloakOn: Attack, Unload, Infiltrate, Demolish, Move
IsPlayerPalette: true
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
DetectCloaked:
CloakTypes: Cloak, Hijacker
Range: 6c0

8
mods/ra/rules/ships.yaml
View File

@@ -36,6 +36,10 @@ SS:
UncloakSound: subshow1.aud
CloakedCondition: underwater
Palette: submerged
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Armament:
Weapon: TorpTube
LocalOffset: 0,-171,0, 0,171,0
@@ -93,6 +97,10 @@ MSUB:
UncloakSound: subshow1.aud
CloakedCondition: underwater
Palette: submerged
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Armament@PRIMARY:
Weapon: SubMissile
LocalOffset: 0,-171,0, 0,171,0

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

@@ -626,6 +626,10 @@ HBOX:
InitialDelay: 125
CloakDelay: 60
IsPlayerPalette: true
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Turreted:
TurnSpeed: 255
-QuantizeFacingsFromSequence:

4
mods/ra/rules/vehicles.yaml
View File

@@ -779,6 +779,10 @@ STNK:
CloakSound: appear1.aud
UncloakSound: appear1.aud
IsPlayerPalette: true
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
DetectCloaked:
Range: 7c0
-MustBeDestroyed:

4
mods/ts/rules/nod-vehicles.yaml
View File

@@ -396,6 +396,10 @@ STNK:
UncloakSound: cloak5.aud
IsPlayerPalette: true
UncloakOn: Attack, Unload, Infiltrate, Demolish, Damage
RequiresCondition: !cloak-force-disabled
GrantConditionOnDamageState@UNCLOAK:
Condition: cloak-force-disabled
ValidDamageStates: Critical
Armament:
Weapon: Dragon
LocalOffset: 213,43,298, 213,-43,298