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

Merge pull request #12406 from pchote/external-conditions

Browse Source 
Upgrades overhaul part 3: Timed, external, and stacked conditions.
This commit is contained in:
Paul Chote
2016-12-09 23:45:14 +00:00
committed by GitHub
parent 4b61a52b3a 35780cadd0
commit e2322c9c53
24 changed files with 379 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,6 +159,8 @@
CloakSound: trans1.aud
UncloakSound: trans1.aud
RequiresCondition: cloak
ExternalConditions@CLOAK:
Conditions: cloak
MustBeDestroyed:
Voiced:
VoiceSet: VehicleVoice

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

@@ -16,10 +16,10 @@ CRATE:
ExplodeCrateAction@fire:
Weapon: Napalm.Crate
SelectionShares: 5
GrantUpgradeCrateAction@cloak:
GrantExternalConditionCrateAction@cloak:
SelectionShares: 5
Effect: cloak
Upgrades: cloak
Condition: cloak
GiveMcvCrateAction:
SelectionShares: 0
NoBaseSelectionShares: 120

14
mods/ra/maps/bomber-john/rules.yaml
View File

@@ -119,7 +119,7 @@ FTUR:
BeginChargeSound: chrochr1.aud
EndChargeSound: chrordy1.aud
Range: 3
GrantUpgradePower@IRONCURTAIN:
GrantExternalConditionPower@IRONCURTAIN:
Icon: invuln
ChargeTime: 30
Description: Invulnerability
@@ -129,8 +129,9 @@ FTUR:
BeginChargeSound: ironchg1.aud
EndChargeSound: ironrdy1.aud
Range: 1
Upgrades: invulnerability
GrantUpgradeSequence: idle
Condition: invulnerability
Sequence: idle
OnFireSound: ironcur9.aud
Power:
Amount: 0
@@ -186,7 +187,7 @@ T17:
Duration: 999999
KillCargo: yes
Range: 3
GrantUpgradePower@IRONCURTAIN:
GrantExternalConditionPower@IRONCURTAIN:
Icon: invuln
ChargeTime: 30
Description: Invulnerability
@@ -196,5 +197,6 @@ T17:
BeginChargeSound: ironchg1.aud
EndChargeSound: ironrdy1.aud
Range: 1
Upgrades: invulnerability
GrantUpgradeSequence: idle
Condition: invulnerability
Sequence: idle
OnFireSound: ironcur9.aud

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

@@ -69,11 +69,11 @@ FORTCRATE:
GiveUnitCrateAction@e7:
Units: e7
SelectionShares: 10
GrantUpgradeCrateAction@ironcurtain:
GrantExternalConditionCrateAction@ironcurtain:
SelectionShares: 10
Effect: invuln
Notification: ironcur9.aud
Upgrades: invulnerability
Condition: invulnerability
Duration: 1200
ExplodeCrateAction@bigboom:
Weapon: SCUD

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

@@ -15,7 +15,7 @@
^GainsExperience:
GainsExperience:
Upgrades:
Upgrades:
200: rank-veteran-1
400: rank-veteran-2
800: rank-veteran-3
@@ -121,8 +121,10 @@
DamageMultiplier@IRONCURTAIN:
RequiresCondition: invulnerability
Modifier: 0
TimedUpgradeBar:
Upgrade: invulnerability
TimedConditionBar:
Condition: invulnerability
ExternalConditions@INVULNERABILITY:
Conditions: invulnerability
^Vehicle:
Inherits@1: ^ExistsInWorld

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

@@ -90,11 +90,11 @@ CRATE:
Units: e1,e1,e4,e4,e3,e3,e3
ValidFactions: soviet, russia, ukraine
TimeDelay: 4500
GrantUpgradeCrateAction@invuln:
GrantExternalConditionCrateAction@invuln:
SelectionShares: 5
Effect: invuln
Notification: ironcur9.aud
Upgrades: invulnerability
Condition: invulnerability
Duration: 600
MONEYCRATE:

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

@@ -303,7 +303,7 @@ IRON:
Range: 10c0
Bib:
HasMinibib: Yes
GrantUpgradePower@IRONCURTAIN:
GrantExternalConditionPower@IRONCURTAIN:
Icon: invuln
ChargeTime: 120
Description: Invulnerability
@@ -314,7 +314,8 @@ IRON:
BeginChargeSpeechNotification: IronCurtainCharging
EndChargeSpeechNotification: IronCurtainReady
DisplayRadarPing: True
Upgrades: invulnerability
Condition: invulnerability
OnFireSound: ironcur9.aud
SupportPowerChargeBar:
Power:
Amount: -200

8
mods/ts/rules/civilian-vehicles.yaml
View File

@@ -102,7 +102,7 @@ BUS:
MaxWeight: 20
PipCount: 5
UnloadVoice: Unload
LoadingUpgrades: notmobile
LoadingUpgrades: loading
EjectOnDeath: true
PICK:
@@ -126,7 +126,7 @@ PICK:
MaxWeight: 2
PipCount: 5
UnloadVoice: Unload
LoadingUpgrades: notmobile
LoadingUpgrades: loading
EjectOnDeath: true
CAR:
@@ -150,7 +150,7 @@ CAR:
MaxWeight: 4
PipCount: 5
UnloadVoice: Unload
LoadingUpgrades: notmobile
LoadingUpgrades: loading
EjectOnDeath: true
WINI:
@@ -174,7 +174,7 @@ WINI:
MaxWeight: 5
PipCount: 5
UnloadVoice: Unload
LoadingUpgrades: notmobile
LoadingUpgrades: loading
EjectOnDeath: true
LOCOMOTIVE:

13
mods/ts/rules/defaults.yaml
View File

@@ -64,6 +64,8 @@
ReferencePoint: Bottom, Right
RequiresCondition: rank-elite
ZOffset: 256
ExternalConditions@CRATES:
Conditions: crate-firepower, crate-damage, crate-speed, crate-cloak
^EmpDisable:
UpgradeOverlay@EMPDISABLE:
@@ -71,8 +73,8 @@
Palette: disabled
DisableOnUpgrade@EMPDISABLE:
RequiresCondition: empdisable
TimedUpgradeBar@EMPDISABLE:
Upgrade: empdisable
TimedConditionBar@EMPDISABLE:
Condition: empdisable
Color: FFFFFF
WithIdleOverlay@EMPDISABLE:
Sequence: emp-overlay
@@ -83,11 +85,13 @@
PowerMultiplier@EMPDISABLE:
RequiresCondition: empdisable
Modifier: 0
ExternalConditions@EMPDISABLE:
Conditions: empdisable
^EmpDisableMobile:
Inherits: ^EmpDisable
Mobile:
RequiresCondition: !notmobile
RequiresCondition: !empdisable && !deployed && !loading
^Cloakable:
Cloak@CLOAKGENERATOR:
@@ -639,7 +643,6 @@
Mobile:
Speed: 113
TurnSpeed: 16
Crushes: crate
SharesCell: no
TerrainSpeeds:
Clear: 90
@@ -795,7 +798,7 @@
Cargo:
Types: Infantry
UnloadVoice: Unload
LoadingUpgrades: notmobile
LoadingUpgrades: loading
Health:
HP: 100
Armor:

2
mods/ts/rules/gdi-vehicles.yaml
View File

@@ -28,7 +28,7 @@ APC:
MaxWeight: 5
PipCount: 5
UnloadVoice: Unload
LoadingUpgrades: notmobile
LoadingUpgrades: loading
EjectOnDeath: true
UpgradeOnTerrain:
Upgrades: inwater

16
mods/ts/rules/misc.yaml
View File

@@ -74,24 +74,24 @@ CRATE:
SelectionShares: 0
NoBaseSelectionShares: 100
Units: mcv
GrantUpgradeCrateAction@cloak:
GrantExternalConditionCrateAction@cloak:
SelectionShares: 5
Effect: stealth
Upgrades: crate-cloak
Condition: crate-cloak
Notification: cloak5.aud
GrantUpgradeCrateAction@firepower:
GrantExternalConditionCrateAction@firepower:
SelectionShares: 5
Effect: firepower
Upgrades: crate-firepower
Condition: crate-firepower
Notification: 00-i070.aud
GrantUpgradeCrateAction@armor:
GrantExternalConditionCrateAction@armor:
SelectionShares: 5
Effect: armor
Upgrades: crate-damage
Condition: crate-damage
Notification: 00-i068.aud
GrantUpgradeCrateAction@speed:
GrantExternalConditionCrateAction@speed:
SelectionShares: 5
Upgrades: crate-speed
Condition: crate-speed
Notification: 00-i080.aud
SROCK01:

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

@@ -106,7 +106,7 @@ TTNK:
RenderSprites:
Image: ttnk
DeployToUpgrade:
DeployedUpgrades: deployed, notmobile
DeployedUpgrades: deployed
UndeployedUpgrades: undeployed
DeployAnimation: make
Facing: 160
@@ -285,7 +285,7 @@ SAPC:
MaxWeight: 5
PipCount: 5
UnloadVoice: Unload
LoadingUpgrades: notmobile
LoadingUpgrades: loading
EjectOnDeath: true
SUBTANK:

2
mods/ts/rules/shared-vehicles.yaml
View File

@@ -138,7 +138,7 @@ LPST:
gdi: lpst.gdi
nod: lpst.nod
DeployToUpgrade:
DeployedUpgrades: deployed, notmobile
DeployedUpgrades: deployed
UndeployedUpgrades: undeployed
DeployAnimation: make
Facing: 160

4
mods/ts/weapons/superweapons.yaml
View File

@@ -107,10 +107,10 @@ EMPulseCannon:
Image: pulsball
Warhead@1Eff: CreateEffect
Explosions: pulse_explosion
Warhead@emp: GrantUpgrade
Warhead@emp: GrantExternalCondition
Range: 4c0
Duration: 250
Upgrades: empdisable, notmobile
Condition: empdisable
ClusterMissile:
ValidTargets: Ground, Water, Air