Merge pull request #12381 from pchote/upgrade-conditions

Upgrades overhaul part 1: EnabledCondition
This commit is contained in:
reaperrr
2016-11-30 19:42:34 +01:00
committed by GitHub
79 changed files with 947 additions and 971 deletions

View File

@@ -26,23 +26,19 @@ TRAN:
WithIdleOverlay@ROTOR1AIR:
Offset: 597,0,85
Sequence: rotor
UpgradeTypes: airborne
UpgradeMinEnabledLevel: 1
RequiresCondition: airborne
WithIdleOverlay@ROTOR1GROUND:
Offset: 597,0,85
Sequence: slow-rotor
UpgradeTypes: airborne
UpgradeMaxEnabledLevel: 0
RequiresCondition: !airborne
WithIdleOverlay@ROTOR2AIR:
Offset: -597,0,171
Sequence: rotor2
UpgradeTypes: airborne
UpgradeMinEnabledLevel: 1
RequiresCondition: airborne
WithIdleOverlay@ROTOR2GROUND:
Offset: -597,0,171
Sequence: slow-rotor2
UpgradeTypes: airborne
UpgradeMaxEnabledLevel: 0
RequiresCondition: !airborne
Cargo:
Types: Infantry
MaxWeight: 10
@@ -98,13 +94,11 @@ HELI:
WithIdleOverlay@ROTORAIR:
Offset: 0,0,85
Sequence: rotor
UpgradeTypes: airborne
UpgradeMinEnabledLevel: 1
RequiresCondition: airborne
WithIdleOverlay@ROTORGROUND:
Offset: 0,0,85
Sequence: slow-rotor
UpgradeTypes: airborne
UpgradeMaxEnabledLevel: 0
RequiresCondition: !airborne
WithMuzzleOverlay:
SpawnActorOnDeath:
Actor: HELI.Husk

View File

@@ -17,41 +17,104 @@
^GainsExperience:
GainsExperience:
Upgrades:
200: firepower, damage, speed, reload, inaccuracy, rank
400: firepower, damage, speed, reload, inaccuracy, rank
800: firepower, damage, speed, reload, inaccuracy, rank
1600: firepower, damage, speed, reload, inaccuracy, rank, eliteweapon, selfheal
FirepowerMultiplier@EXPERIENCE:
UpgradeTypes: firepower
Modifier: 105, 110, 120, 130
DamageMultiplier@EXPERIENCE:
UpgradeTypes: damage
Modifier: 95, 90, 85, 75
SpeedMultiplier@EXPERIENCE:
UpgradeTypes: speed
Modifier: 105, 110, 120, 140
ReloadDelayMultiplier@EXPERIENCE:
UpgradeTypes: reload
Modifier: 95, 90, 85, 75
InaccuracyMultiplier@EXPERIENCE:
UpgradeTypes: inaccuracy
Modifier: 90, 80, 70, 50
200: rank-veteran-1
400: rank-veteran-2
800: rank-veteran-3
1600: rank-elite
DamageMultiplier@RANK-1:
RequiresCondition: rank-veteran-1 && !rank-veteran-2
Modifier: 95
DamageMultiplier@RANK-2:
RequiresCondition: rank-veteran-2 && !rank-veteran-3
Modifier: 90
DamageMultiplier@RANK-3:
RequiresCondition: rank-veteran-3 && !rank-elite
Modifier: 85
DamageMultiplier@RANK-ELITE:
RequiresCondition: rank-elite
Modifier: 75
FirepowerMultiplier@RANK-1:
RequiresCondition: rank-veteran-1 && !rank-veteran-2
Modifier: 105
FirepowerMultiplier@RANK-2:
RequiresCondition: rank-veteran-2 && !rank-veteran-3
Modifier: 110
FirepowerMultiplier@RANK-3:
RequiresCondition: rank-veteran-3 && !rank-elite
Modifier: 120
FirepowerMultiplier@RANK-ELITE:
RequiresCondition: rank-elite
Modifier: 130
SpeedMultiplier@RANK-1:
RequiresCondition: rank-veteran-1 && !rank-veteran-2
Modifier: 105
SpeedMultiplier@RANK-2:
RequiresCondition: rank-veteran-2 && !rank-veteran-3
Modifier: 110
SpeedMultiplier@RANK-3:
RequiresCondition: rank-veteran-3 && !rank-elite
Modifier: 120
SpeedMultiplier@RANK-ELITE:
RequiresCondition: rank-elite
Modifier: 140
ReloadDelayMultiplier@RANK-1:
RequiresCondition: rank-veteran-1 && !rank-veteran-2
Modifier: 95
ReloadDelayMultiplier@RANK-2:
RequiresCondition: rank-veteran-2 && !rank-veteran-3
Modifier: 90
ReloadDelayMultiplier@RANK-3:
RequiresCondition: rank-veteran-3 && !rank-elite
Modifier: 85
ReloadDelayMultiplier@RANK-ELITE:
RequiresCondition: rank-elite
Modifier: 75
InaccuracyMultiplier@RANK-1:
RequiresCondition: rank-veteran-1 && !rank-veteran-2
Modifier: 90
InaccuracyMultiplier@RANK-2:
RequiresCondition: rank-veteran-2 && !rank-veteran-3
Modifier: 80
InaccuracyMultiplier@RANK-3:
RequiresCondition: rank-veteran-3 && !rank-elite
Modifier: 70
InaccuracyMultiplier@RANK-ELITE:
RequiresCondition: rank-elite
Modifier: 50
SelfHealing@ELITE:
Step: 2
Delay: 100
HealIfBelow: 100
DamageCooldown: 125
UpgradeTypes: selfheal
UpgradeMinEnabledLevel: 1
WithRankDecoration:
RequiresCondition: rank-elite
WithDecoration@RANK-1:
Image: rank
Sequence: rank
Sequence: rank-veteran-1
Palette: effect
ReferencePoint: Bottom, Right
UpgradeTypes: rank
RequiresCondition: rank-veteran-1 && !rank-veteran-2
ZOffset: 256
WithDecoration@RANK-2:
Image: rank
Sequence: rank-veteran-2
Palette: effect
ReferencePoint: Bottom, Right
RequiresCondition: rank-veteran-2 && !rank-veteran-3
ZOffset: 256
WithDecoration@RANK-3:
Image: rank
Sequence: rank-veteran-3
Palette: effect
ReferencePoint: Bottom, Right
RequiresCondition: rank-veteran-3 && !rank-elite
ZOffset: 256
WithDecoration@RANK-ELITE:
Image: rank
Sequence: rank-elite
Palette: effect
ReferencePoint: Bottom, Right
RequiresCondition: rank-elite
ZOffset: 256
UpgradeMinEnabledLevel: 1
UpgradeMaxAcceptedLevel: 4
^Vehicle:
Inherits@1: ^ExistsInWorld
@@ -91,12 +154,11 @@
Tooltip:
GenericName: Vehicle
Cloak:
UpgradeTypes: cloak
UpgradeMinEnabledLevel: 1
InitialDelay: 15
CloakDelay: 90
CloakSound: trans1.aud
UncloakSound: trans1.aud
RequiresCondition: cloak
MustBeDestroyed:
Voiced:
VoiceSet: VehicleVoice
@@ -127,12 +189,10 @@
UseLocation: yes
Targetable@GROUND:
TargetTypes: Ground, Vehicle
UpgradeTypes: airborne
UpgradeMaxEnabledLevel: 0
RequiresCondition: !airborne
Targetable@AIRBORNE:
TargetTypes: Air
UpgradeTypes: airborne
UpgradeMinEnabledLevel: 1
RequiresCondition: airborne
SelectionDecorations:
WithSpriteControlGroupDecoration:
Selectable:
@@ -160,8 +220,7 @@
Offset: 43, 128, 0
ZOffset: -129
Hovers@CRUISING:
UpgradeTypes: cruising
UpgradeMinEnabledLevel: 1
RequiresCondition: cruising
MustBeDestroyed:
Voiced:
VoiceSet: VehicleVoice
@@ -217,12 +276,11 @@
CargoType: Infantry
HiddenUnderFog:
DamagedByTerrain:
UpgradeTypes: hazmatsuits
UpgradeMaxEnabledLevel: 0
Terrain: Tiberium, BlueTiberium
Damage: 2
DamageInterval: 16
DamageTypes: TiberiumDeath
RequiresCondition: !hazmatsuits
GlobalUpgradable@BIO:
Upgrades: hazmatsuits
Prerequisites: bio
@@ -230,8 +288,7 @@
Image: pips
Sequence: pip-hazmat
ReferencePoint: Bottom, Right
UpgradeTypes: hazmatsuits
UpgradeMinEnabledLevel: 1
RequiresCondition: hazmatsuits
ActorLostNotification:
SpawnActorOnDeath:
Probability: 10
@@ -249,8 +306,7 @@
Delay: 100
HealIfBelow: 100
DamageCooldown: 125
UpgradeTypes: hospitalheal
UpgradeMinEnabledLevel: 1
RequiresCondition: hospitalheal
GlobalUpgradable@HOSPITAL:
Upgrades: hospitalheal
Prerequisites: hosp
@@ -258,8 +314,7 @@
Image: pips
Sequence: pip-heal
ReferencePoint: Bottom, Right
UpgradeTypes: hospitalheal
UpgradeMinEnabledLevel: 1
RequiresCondition: hospitalheal
DetectCloaked:
Range: 2c0
DeathSounds@NORMAL:

View File

@@ -46,8 +46,6 @@ LST:
BuildPaletteOrder: 1000
Prerequisites: ~disabled
Mobile:
UpgradeTypes: notmobile
UpgradeMaxEnabledLevel: 0
Crushes: crate
TerrainSpeeds:
Clear: 100
@@ -61,6 +59,7 @@ LST:
InitialFacing: 0
TurnSpeed: 4
Speed: 142
RequiresCondition: !notmobile
Health:
HP: 400
Armor:

View File

@@ -88,10 +88,9 @@ APC:
Queue: Vehicle.GDI
Description: Armed infantry transport.\nCan attack Aircraft.\n Strong vs Vehicles\n Weak vs Infantry
Mobile:
UpgradeTypes: notmobile
UpgradeMaxEnabledLevel: 0
TurnSpeed: 8
Speed: 128
RequiresCondition: !notmobile
Health:
HP: 210
Armor:
@@ -517,7 +516,7 @@ STNK:
RevealsShroud:
Range: 7c0
Cloak:
-UpgradeTypes:
-RequiresCondition:
InitialDelay: 90
CloakDelay: 90
CloakSound: trans1.aud

View File

@@ -124,8 +124,13 @@ explosion:
FlipX: true
rank:
rank:
Length: *
rank-veteran-1:
rank-veteran-2:
Start: 1
rank-veteran-3:
Start: 2
rank-elite:
Start: 3
rallypoint:
flag: flagfly