Added multiplier modifier traits, removing GainsStatUpgrades, InvulnerabilityUpgrade, & Invulnerable.

mods/cnc/maps/gdi04c/map.yaml

@@ -831,7 +831,8 @@ Rules:
 		Health:
 			HP: 125
 	^Bridge:
-		Invulnerable:
+		DamageMultiplier@INVULNERABLE:
+			Modifier: 0
 
 Sequences:
 

mods/cnc/maps/nod01/map.yaml

@@ -295,7 +295,8 @@ Rules:
 		Tooltip:
 			Name: Nikoomba
 	^Bridge:
-		Invulnerable:
+		DamageMultiplier@INVULNERABLE:
+			Modifier: 0
 	^CivBuilding:
 		MustBeDestroyed:
 	^CivInfantry:

mods/cnc/maps/nod06c/map.yaml

@@ -530,7 +530,8 @@ Rules:
 			GenericVisibility: Enemy
 			ShowOwnerRow: false
 	^Bridge:
-		Invulnerable:
+		DamageMultiplier@INVULNERABLE:
+			Modifier: 0
 	E2:
 		Buildable:
 			Prerequisites: ~pyle

mods/cnc/rules/aircraft.yaml

@@ -162,7 +162,8 @@ C17:
 	Cargo:
 		MaxWeight: 10
 		PipCount: 10
-	Invulnerable:
+	DamageMultiplier@INVULNERABLE:
+		Modifier: 0
 	Contrail@1:
 		Offset: -261,-650,0
 		TrailLength: 15

mods/cnc/rules/defaults.yaml

@@ -15,7 +15,21 @@
 			400: firepower, damage, speed, reload, inaccuracy, rank
 			800: firepower, damage, speed, reload, inaccuracy, rank
 			1600: firepower, damage, speed, reload, inaccuracy, rank, eliteweapon, selfheal
-	GainsStatUpgrades:
+	FirepowerMultiplier@EXPERIENCE:
+		UpgradeTypes: firepower
+		Modifier: 110, 115, 120, 130
+	DamageMultiplier@EXPERIENCE:
+		UpgradeTypes: damage
+		Modifier: 91, 87, 83, 65
+	SpeedMultiplier@EXPERIENCE:
+		UpgradeTypes: speed
+		Modifier: 110, 115, 120, 150
+	ReloadDelayMultiplier@EXPERIENCE:
+		UpgradeTypes: reload
+		Modifier: 95, 90, 85, 75
+	InaccuracyMultiplier@EXPERIENCE:
+		UpgradeTypes: inaccuracy
+		Modifier: 90, 80, 70, 50
 	SelfHealing@ELITE:
 		Step: 2
 		Ticks: 100

mods/d2k/rules/aircraft.yaml

@@ -85,7 +85,8 @@ frigate:
 	Cargo:
 		MaxWeight: 20
 		PipCount: 10
-	Invulnerable:
+	DamageMultiplier@INVULNERABLE:
+		Modifier: 0
 	FlyAwayOnIdle:
 	RejectsOrders:
 

mods/d2k/rules/defaults.yaml

@@ -15,7 +15,21 @@
 			400: firepower, damage, speed, reload, inaccuracy, rank
 			800: firepower, damage, speed, reload, inaccuracy, rank
 			1600: firepower, damage, speed, reload, inaccuracy, rank, eliteweapon, selfheal
-	GainsStatUpgrades:
+	FirepowerMultiplier@EXPERIENCE:
+		UpgradeTypes: firepower
+		Modifier: 110, 115, 120, 130
+	DamageMultiplier@EXPERIENCE:
+		UpgradeTypes: damage
+		Modifier: 91, 87, 83, 65
+	SpeedMultiplier@EXPERIENCE:
+		UpgradeTypes: speed
+		Modifier: 110, 115, 120, 150
+	ReloadDelayMultiplier@EXPERIENCE:
+		UpgradeTypes: reload
+		Modifier: 95, 90, 85, 75
+	InaccuracyMultiplier@EXPERIENCE:
+		UpgradeTypes: inaccuracy
+		Modifier: 90, 80, 70, 50
 	SelfHealing@ELITE:
 		Step: 2
 		Ticks: 100

mods/ra/maps/desert-shellmap/map.yaml

@@ -1267,17 +1267,17 @@ Rules:
 			Percentage: 0
 		GainsExperience:
 			Upgrades:
-		InvulnerabilityUpgrade@UNKILLABLE:
+		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
-			UpgradeMinEnabledLevel: 1
+			Modifier: 0, 0
 	^Tank:
 		GivesBounty:
 			Percentage: 0
 		GainsExperience:
 			Upgrades:
-		InvulnerabilityUpgrade@UNKILLABLE:
+		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
-			UpgradeMinEnabledLevel: 1
+			Modifier: 0, 0
 	^Infantry:
 		GivesBounty:
 			Percentage: 0
@@ -1289,29 +1289,29 @@ Rules:
 			VolumeMultiplier: 0.1
 		DeathSounds@ZAPPED:
 			VolumeMultiplier: 0.1
-		InvulnerabilityUpgrade@UNKILLABLE:
+		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
-			UpgradeMinEnabledLevel: 1
+			Modifier: 0, 0
 	^Ship:
 		GivesBounty:
 			Percentage: 0
 		GainsExperience:
 			Upgrades:
-		InvulnerabilityUpgrade@UNKILLABLE:
+		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
-			UpgradeMinEnabledLevel: 1
+			Modifier: 0, 0
 	^Plane:
 		GivesBounty:
 			Percentage: 0
-		InvulnerabilityUpgrade@UNKILLABLE:
+		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
-			UpgradeMinEnabledLevel: 1
+			Modifier: 0, 0
 	^Building:
 		GivesBounty:
 			Percentage: 0
-		InvulnerabilityUpgrade@UNKILLABLE:
+		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
-			UpgradeMinEnabledLevel: 1
+			Modifier: 0, 0
 	OILB:
 		CashTrickler:
 			ShowTicks: false
@@ -1319,7 +1319,8 @@ Rules:
 		Burns:
 			Damage: 0
 	MISS:
-		Invulnerable:
+		DamageMultiplier@INVULNERABLE:
+			Modifier: 0
 	APC:
 		Cargo:
 			InitialUnits: e1, e1, e2, e3, e4

mods/ra/maps/fort-lonestar/map.yaml

@@ -645,9 +645,9 @@ Rules:
 		Buildable:
 			Prerequisites: ~disabled
 		MustBeDestroyed:
-		InvulnerabilityUpgrade@UNKILLABLE:
+		DamageMultiplier@UNKILLABLE:
 			UpgradeTypes: unkillable
-			UpgradeMinEnabledLevel: 1
+			Modifier: 0, 0
 		RenderSprites:
 			Image: SNIPER
 	SPY:

mods/ra/maps/koth-hopes-anchor/map.yaml

@@ -641,7 +641,8 @@ Rules:
 			Name: Strategic Point
 		RevealsShroud:
 			Range: 20c0
-		Invulnerable:
+		DamageMultiplier@INVULNERABLE:
+			Modifier: 0
 		-Selectable:
 		-TargetableBuilding:
 	Player:

mods/ra/rules/defaults.yaml

@@ -16,7 +16,21 @@
 			400: firepower, damage, speed, reload, inaccuracy, rank
 			800: firepower, damage, speed, reload, inaccuracy, rank
 			1600: firepower, damage, speed, reload, inaccuracy, rank, eliteweapon, selfheal
-	GainsStatUpgrades:
+	DamageMultiplier@EXPERIENCE:
+		UpgradeTypes: damage
+		Modifier: 91, 87, 83, 65
+	FirepowerMultiplier@EXPERIENCE:
+		UpgradeTypes: firepower
+		Modifier: 110, 115, 120, 130
+	SpeedMultiplier@EXPERIENCE:
+		UpgradeTypes: speed
+		Modifier: 110, 115, 120, 150
+	ReloadDelayMultiplier@EXPERIENCE:
+		UpgradeTypes: reload
+		Modifier: 95, 90, 85, 75
+	InaccuracyMultiplier@EXPERIENCE:
+		UpgradeTypes: inaccuracy
+		Modifier: 90, 80, 70, 50
 	SelfHealing@ELITE:
 		Step: 2
 		Ticks: 100
@@ -39,10 +53,9 @@
 	UpgradeOverlay@IRONCURTAIN:
 		UpgradeTypes: invulnerability
 		UpgradeMinEnabledLevel: 1
-	InvulnerabilityUpgrade@IRONCURTAIN:
+	DamageMultiplier@IRONCURTAIN:
 		UpgradeTypes: invulnerability
-		UpgradeMinEnabledLevel: 1
-		UpgradeMaxAcceptedLevel: 2
+		Modifier: 0, 0
 	TimedUpgradeBar:
 		Upgrade: invulnerability
 

mods/ra/rules/misc.yaml

@@ -403,7 +403,8 @@ CTFLAG:
 		Name: Flag
 	Bib:
 		HasMinibib: Yes
-	Invulnerable:
+	DamageMultiplier@INVULNERABLE:
+		Modifier: 0
 	-Selectable:
 	-TargetableBuilding:
 

mods/ra/rules/vehicles.yaml

@@ -648,7 +648,7 @@ DTRK:
 		Weapon: MiniNuke
 		EmptyWeapon: MiniNuke
 	DemoTruck:
-	-InvulnerabilityUpgrade@IRONCURTAIN:
+	-DamageMultiplier@IRONCURTAIN:
 	KillsSelf:
 		UpgradeTypes: invulnerability
 		UpgradeMinEnabledLevel: 1

mods/ts/rules/defaults.yaml

@@ -13,11 +13,18 @@
 		Upgrades:
 			500: rank, firepower, damage, speed, reload
 			1000: rank, firepower, damage, speed, reload, selfheal, eliteweapon
-	GainsStatUpgrades:
-		FirepowerModifier: 110, 130
-		DamageModifier: 83, 66
-		SpeedModifier: 120, 150
-		ReloadModifier: 90, 75
+	FirepowerMultiplier@EXPERIENCE:
+		UpgradeTypes: firepower
+		Modifier: 110, 130
+	DamageMultiplier@EXPERIENCE:
+		UpgradeTypes: damage
+		Modifier: 83, 66
+	SpeedMultiplier@EXPERIENCE:
+		UpgradeTypes: speed
+		Modifier: 120, 150
+	ReloadDelayMultiplier@EXPERIENCE:
+		UpgradeTypes: reload
+		Modifier: 90, 75
 	SelfHealing@ELITE:
 		Step: 2
 		Ticks: 100