Merge pull request #12381 from pchote/upgrade-conditions

Upgrades overhaul part 1: EnabledCondition
2016-11-30 19:42:34 +01:00
parent 6150d25105 0ba0470390
commit 848cf19ba8
79 changed files with 947 additions and 971 deletions
--- a/mods/ra/maps/allies-03a/rules.yaml
+++ b/mods/ra/maps/allies-03a/rules.yaml
@@ -33,8 +33,7 @@ HACKE6:
 	Captures:
 		CaptureTypes: building
 	Targetable:
-		UpgradeTypes: jail
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner
 	RenderSprites:
@@ -42,8 +41,7 @@ HACKE6:

 MEDI:
 	Targetable:
-		UpgradeTypes: jail
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner

--- a/mods/ra/maps/allies-03b/rules.yaml
+++ b/mods/ra/maps/allies-03b/rules.yaml
@@ -34,8 +34,7 @@ HACKE6:
 		CaptureTypes: building
 	WithInfantryBody:
 	Targetable:
-		UpgradeTypes: jail
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner
 	RenderSprites:
@@ -43,8 +42,7 @@ HACKE6:

 MEDI:
 	Targetable:
-		UpgradeTypes: jail
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !jail
 	Targetable@PRISONER:
 		TargetTypes: Prisoner

--- a/mods/ra/maps/desert-shellmap/rules.yaml
+++ b/mods/ra/maps/desert-shellmap/rules.yaml
@@ -21,8 +21,8 @@ World:
 	GainsExperience:
 		Upgrades:
 	DamageMultiplier@UNKILLABLE:
-		UpgradeTypes: unkillable
-		Modifier: 0, 0
+		RequiresCondition: unkillable
+		Modifier: 0

 ^Tank:
 	GivesBounty:
@@ -30,8 +30,8 @@ World:
 	GainsExperience:
 		Upgrades:
 	DamageMultiplier@UNKILLABLE:
-		UpgradeTypes: unkillable
-		Modifier: 0, 0
+		RequiresCondition: unkillable
+		Modifier: 0

 ^Infantry:
 	GivesBounty:
@@ -45,8 +45,8 @@ World:
 	DeathSounds@ZAPPED:
 		VolumeMultiplier: 0.1
 	DamageMultiplier@UNKILLABLE:
-		UpgradeTypes: unkillable
-		Modifier: 0, 0
+		RequiresCondition: unkillable
+		Modifier: 0

 ^Ship:
 	GivesBounty:
@@ -54,22 +54,22 @@ World:
 	GainsExperience:
 		Upgrades:
 	DamageMultiplier@UNKILLABLE:
-		UpgradeTypes: unkillable
-		Modifier: 0, 0
+		RequiresCondition: unkillable
+		Modifier: 0

 ^Plane:
 	GivesBounty:
 		Percentage: 0
 	DamageMultiplier@UNKILLABLE:
-		UpgradeTypes: unkillable
-		Modifier: 0, 0
+		RequiresCondition: unkillable
+		Modifier: 0

 ^Building:
 	GivesBounty:
 		Percentage: 0
 	DamageMultiplier@UNKILLABLE:
-		UpgradeTypes: unkillable
-		Modifier: 0, 0
+		RequiresCondition: unkillable
+		Modifier: 0

 OILB:
 	CashTrickler:
--- a/mods/ra/maps/infiltration/rules.yaml
+++ b/mods/ra/maps/infiltration/rules.yaml
@@ -71,8 +71,7 @@ TRUK.Hijackable:
 	Buildable:
 		Prerequisites: ~disabled
 	Mobile:
-		UpgradeTypes: mobile
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: mobile
 	Cargo:
 		Types: Infantry
 		MaxWeight: 5
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -223,23 +223,19 @@ TRAN:
 	WithIdleOverlay@ROTOR1AIR:
 		Offset: 597,0,213
 		Sequence: rotor
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	WithIdleOverlay@ROTOR1GROUND:
 		Offset: 597,0,213
 		Sequence: slow-rotor
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	WithIdleOverlay@ROTOR2AIR:
 		Offset: -597,0,341
 		Sequence: rotor2
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	WithIdleOverlay@ROTOR2GROUND:
 		Offset: -597,0,341
 		Sequence: slow-rotor2
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	Cargo:
 		Types: Infantry
 		MaxWeight: 8
@@ -287,13 +283,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
 	AmmoPool:
 		Ammo: 8
 	SelectionDecorations:
@@ -345,12 +339,10 @@ HIND:
 		InitialStanceAI: HoldFire
 	WithIdleOverlay@ROTORAIR:
 		Sequence: rotor
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	WithIdleOverlay@ROTORGROUND:
 		Sequence: slow-rotor
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	AmmoPool:
 		Ammo: 24
 		PipCount: 6
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -15,49 +15,111 @@

 ^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
-	DamageMultiplier@EXPERIENCE:
-		UpgradeTypes: damage
-		Modifier: 95, 90, 85, 75
-	FirepowerMultiplier@EXPERIENCE:
-		UpgradeTypes: firepower
-		Modifier: 105, 110, 120, 130
-	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
+		Upgrades:		
+			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

 ^IronCurtainable:
 	UpgradeOverlay@IRONCURTAIN:
-		UpgradeTypes: invulnerability
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: invulnerability
 	DamageMultiplier@IRONCURTAIN:
-		UpgradeTypes: invulnerability
+		RequiresCondition: invulnerability
 		Modifier: 0
 	TimedUpgradeBar:
 		Upgrade: invulnerability
@@ -87,8 +149,7 @@
 		Bounds: 24, 24
 	Targetable:
 		TargetTypes: Ground, Repair, Vehicle
-		UpgradeTypes: parachute
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !parachute
 	Repairable:
 	Chronoshiftable:
 	Passenger:
@@ -133,14 +194,13 @@
 		EmptyWeapon: UnitExplodeSmall
 	WithFacingSpriteBody:
 	WithParachute:
-		UpgradeTypes: parachute
-		UpgradeMinEnabledLevel: 1
 		ShadowImage: parach-shadow
 		ShadowSequence: idle
 		Image: parach
 		Sequence: idle
 		OpeningSequence: open
 		Offset: 0,0,200
+		RequiresCondition: parachute
 	BodyOrientation:
 		UseClassicFacingFudge: True

@@ -195,8 +255,7 @@
 		Bounds: 12,18,0,-8
 	Targetable:
 		TargetTypes: Ground, Infantry, Disguise
-		UpgradeTypes: parachute
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !parachute
 	QuantizeFacingsFromSequence:
 		Sequence: stand
 	WithInfantryBody:
@@ -228,8 +287,7 @@
 		Delay: 100
 		HealIfBelow: 100
 		DamageCooldown: 125
-		UpgradeTypes: hospitalheal
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: hospitalheal
 	GlobalUpgradable:
 		Upgrades: hospitalheal
 		Prerequisites: hosp
@@ -252,14 +310,13 @@
 	Voiced:
 		VoiceSet: GenericVoice
 	WithParachute:
-		UpgradeTypes: parachute
-		UpgradeMinEnabledLevel: 1
 		ShadowImage: parach-shadow
 		ShadowSequence: idle
 		Image: parach
 		Sequence: idle
 		OpeningSequence: open
 		Offset: 0,0,427
+		RequiresCondition: parachute

 ^Soldier:
 	Inherits: ^Infantry
@@ -370,12 +427,10 @@
 		CruisingUpgrades: cruising
 	Targetable@GROUND:
 		TargetTypes: Ground, Repair, Vehicle
-		UpgradeTypes: airborne
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !airborne
 	Targetable@AIRBORNE:
 		TargetTypes: Air
-		UpgradeTypes: airborne
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: airborne
 	HiddenUnderFog:
 		Type: CenterPosition
 	AttackMove:
@@ -414,8 +469,7 @@
 	GpsDot:
 		String: Helicopter
 	Hovers@CRUISING:
-		UpgradeTypes: cruising
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: cruising
 	BodyOrientation:
 		UseClassicFacingFudge: True

@@ -825,13 +879,12 @@
 		KilledOnImpassableTerrain: false
 	Passenger:
 	WithParachute:
-		UpgradeTypes: parachute
-		UpgradeMinEnabledLevel: 1
 		Image: parach
 		Sequence: idle
 		OpeningSequence: open
 		ShadowImage: parach-shadow
 		ShadowSequence: idle
+		RequiresCondition: parachute
 	UpgradeManager:

 ^Mine:
--- a/mods/ra/rules/infantry.yaml
+++ b/mods/ra/rules/infantry.yaml
@@ -226,8 +226,7 @@ SPY:
 		Palette: effect
 		ReferencePoint: Top, Right
 		ZOffset: 256
-		UpgradeTypes: disguise
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: disguise
 	IgnoresDisguise:
 	DetectCloaked:
 		CloakTypes: Cloak, Hijacker
--- a/mods/ra/rules/ships.yaml
+++ b/mods/ra/rules/ships.yaml
@@ -21,12 +21,10 @@ SS:
 		Range: 6c0
 	Targetable:
 		TargetTypes: Ground, Water, Repair
-		UpgradeTypes: underwater
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !underwater
 	Targetable@UNDERWATER:
 		TargetTypes: Underwater, Repair
-		UpgradeTypes: underwater
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: underwater
 	Cloak:
 		CloakTypes: Underwater
 		InitialDelay: 0
@@ -77,12 +75,10 @@ MSUB:
 		Range: 6c0
 	Targetable:
 		TargetTypes: Ground, Water, Repair
-		UpgradeTypes: underwater
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !underwater
 	Targetable@UNDERWATER:
 		TargetTypes: Underwater, Repair
-		UpgradeTypes: underwater
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: underwater
 	Cloak:
 		CloakTypes: Underwater
 		InitialDelay: 0
@@ -230,12 +226,11 @@ LST:
 	Armor:
 		Type: Heavy
 	Mobile:
-		UpgradeTypes: notmobile
-		UpgradeMaxEnabledLevel: 0
 		TurnSpeed: 10
 		Speed: 113
 		TerrainSpeeds:
 			Beach: 70
+		RequiresCondition: !notmobile
 	RevealsShroud:
 		Range: 6c0
 	SelectionDecorations:
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -174,8 +174,7 @@ SPEN:
 		Sequence: tag-primary
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary

 SYRD:
 	Inherits: ^Building
@@ -270,8 +269,7 @@ SYRD:
 		Sequence: tag-primary
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary

 IRON:
 	Inherits: ^ScienceBuilding
@@ -877,8 +875,7 @@ WEAP:
 		Sequence: tag-primary
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary

 FACT:
 	Inherits: ^Building
@@ -1116,8 +1113,7 @@ HPAD:
 		Sequence: tag-primary
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary
 	WithRearmAnimation:

 AFLD:
@@ -1233,8 +1229,7 @@ AFLD:
 		Sequence: tag-primary
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary
 	WithRearmAnimation:

 POWR:
@@ -1413,8 +1408,7 @@ BARR:
 		Sequence: tag-primary
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary

 KENN:
 	Inherits: ^Building
@@ -1461,8 +1455,7 @@ KENN:
 		Sequence: tag-primary
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary

 TENT:
 	Inherits: ^Building
@@ -1541,8 +1534,7 @@ TENT:
 		Sequence: tag-primary
 		ReferencePoint: Top
 		ZOffset: 256
-		UpgradeTypes: primary
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: primary

 FIX:
 	Inherits: ^Building
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -338,8 +338,7 @@ JEEP:
 	Mobile:
 		TurnSpeed: 10
 		Speed: 170
-		UpgradeTypes: notmobile
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !notmobile
 	RevealsShroud:
 		Range: 8c0
 	Turreted:
@@ -378,8 +377,7 @@ APC:
 	Mobile:
 		Speed: 142
 		Crushes: wall, mine, crate, infantry
-		UpgradeTypes: notmobile
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !notmobile
 	RevealsShroud:
 		Range: 5c0
 	Armament:
@@ -651,8 +649,7 @@ DTRK:
 	AttackSuicides:
 	-DamageMultiplier@IRONCURTAIN:
 	KillsSelf:
-		UpgradeTypes: invulnerability
-		UpgradeMinEnabledLevel: 1
+		RequiresCondition: invulnerability
 	Chronoshiftable:
 		ExplodeInstead: yes

@@ -738,8 +735,7 @@ STNK:
 	Mobile:
 		Speed: 142
 		Crushes: wall, mine, crate, infantry
-		UpgradeTypes: notmobile
-		UpgradeMaxEnabledLevel: 0
+		RequiresCondition: !notmobile
 	RevealsShroud:
 		Range: 7c0
 	AutoTarget:
--- a/mods/ra/sequences/misc.yaml
+++ b/mods/ra/sequences/misc.yaml
@@ -424,8 +424,13 @@ fire:
 		ZOffset: 1023

 rank:
-	rank:
-		Length: *
+	rank-veteran-1:
+	rank-veteran-2:
+		Start: 1
+	rank-veteran-3:
+		Start: 2
+	rank-elite:
+		Start: 3

 iconchevrons:
 	veteran: