add submarine, destroyers to upgrade tab

RAunplugged · Dec 13, 2018 · f539a7b · f539a7b
1 parent e8a9faa
commit f539a7b
Show file tree

Hide file tree

Showing 12 changed files with 120 additions and 7 deletions.
diff --git a/mods/ura/bits/dd.rank1icon.shp b/mods/ura/bits/dd.rank1icon.shp
diff --git a/mods/ura/bits/dd.rank2.shp b/mods/ura/bits/dd.rank2.shp
diff --git a/mods/ura/bits/dd.rank2icon.shp b/mods/ura/bits/dd.rank2icon.shp
diff --git a/mods/ura/bits/ss.rank1icon.shp b/mods/ura/bits/ss.rank1icon.shp
diff --git a/mods/ura/bits/ss.rank2.shp b/mods/ura/bits/ss.rank2.shp
diff --git a/mods/ura/bits/ss.rank2icon.shp b/mods/ura/bits/ss.rank2icon.shp
diff --git a/mods/ura/rules/units/ships.yaml b/mods/ura/rules/units/ships.yaml
@@ -109,7 +109,7 @@ DD:
 		Queue: Ship
 		BuildAtProductionType: Boat
 		BuildPaletteOrder: 40
-		Prerequisites: ~syrd, dome, ~techlevel.medium
+		Prerequisites: ~syrd, dome, ~techlevel.medium, ~!dd.upgraded2
 		Description: Fast multi-role ship.\nCan detect submarines.\n  Strong vs Naval units, Vehicles, Aircraft\n  Weak vs Infantry
 	RevealsShroud:
 		Range: 10c0
@@ -149,6 +149,8 @@ DD:
 	WithSpriteTurret:
 	Selectable:
 		DecorationBounds: 38,38
+	ProducibleWithLevel:
+		Prerequisites: ss.upgraded
 
 CA:
 	Inherits: ^Ship
@@ -250,7 +252,7 @@ SS:
 		Queue: Ship
 		BuildAtProductionType: Submarine
 		BuildPaletteOrder: 30
-		Prerequisites: ~spen, ~techlevel.low
+		Prerequisites: ~spen, ~techlevel.low, ~!ss.upgraded2
 		Description: Submerged anti-ship unit\narmed with torpedoes.\nCan detect other submarines.\n  Strong vs Naval units\n  Weak vs Ground units, Aircraft\n  Special Ability: Submerge
 	RevealsShroud:
 		Range: 10c0
@@ -298,6 +300,8 @@ SS:
 		Weapon: UnitExplodeSubmarine
 		EmptyWeapon: UnitExplodeSubmarine
 	SelectionDecorations:
+	ProducibleWithLevel:
+		Prerequisites: ss.upgraded
 
 MSUB:
 	Inherits: ^Ship

diff --git a/mods/ura/rules/units/vehicles.yaml b/mods/ura/rules/units/vehicles.yaml
@@ -520,7 +520,7 @@ TNKD:
 		Actor: TNKD.Husk
 	SelectionDecorations:
 	ProducibleWithLevel:
-		Prerequisites: tank.upgraded
+		Prerequisites: techcenter.upgraded
 
 JEEP:
 	Inherits: ^Vehicle
@@ -1153,7 +1153,7 @@ CTNK:
 		DecorationBounds: 30,30
 	SelectionDecorations:
 	ProducibleWithLevel:
-		Prerequisites: warfactory.upgraded, radardome.upgraded
+		Prerequisites: techcenter.upgraded
 
 STNK:
 	Inherits: ^Vehicle
@@ -1229,7 +1229,7 @@ STNK:
 		InitialStanceAI: ReturnFire
 	WithSpriteTurret:
 	ProducibleWithLevel:
-		Prerequisites: warfactory.upgraded, radardome.upgraded
+		Prerequisites: techcenter.upgraded
 
 TTNK:
 	Inherits: ^TrackedVehicle
@@ -1323,8 +1323,6 @@ QTNK:
 	Targetable:
 		TargetTypes: Ground, MADTank, Repair, Vehicle, Heavy
 	SelectionDecorations:
-	ProducibleWithLevel:
-		Prerequisites: warfactory.upgraded, radardome.upgraded
 
 DTRK:
 	Inherits: ^Vehicle

diff --git a/mods/ura/rules/units/veterancy.yaml b/mods/ura/rules/units/veterancy.yaml
@@ -361,3 +361,25 @@ MIG.rank3:
 	ProducibleWithLevel:
 		Prerequisites: ~techlevel.high
 		InitialLevels: 3
+
+# Ships
+
+DD.rank2:
+	Inherits: DD
+	Buildable:
+		Prerequisites: ~syrd, dome, ~techlevel.high, ~dd.upgraded2
+	RenderSprites:
+		Image: dd.rank2
+	ProducibleWithLevel:
+		Prerequisites: ~techlevel.high
+		InitialLevels: 2
+
+SS.rank2:
+	Inherits: SS
+	Buildable:
+		Prerequisites: ~spen, dome, ~techlevel.high, ~ss.upgraded2
+	RenderSprites:
+		Image: ss.rank2
+	ProducibleWithLevel:
+		Prerequisites: ~techlevel.high
+		InitialLevels: 2
diff --git a/mods/ura/rules/upgrades.yaml b/mods/ura/rules/upgrades.yaml
@@ -597,6 +597,74 @@ upgrade.mig.rank3:
 
 # Unit Upgrades - ships
 
+upgrade.dd.rank1:
+	Inherits: ^UpgradeActor
+	Tooltip:
+		Name: Destroyer Veterancy I
+	Valued:
+		Cost: 1000
+	Buildable:
+		BuildPaletteOrder: 110
+		Prerequisites: syrd, ~radar, ~techlevel.medium, ~!dd.upgraded
+		Queue: Upgrade
+		Description: Enables Veterancy I\nDestroyer production.
+		BuildLimit: 1
+	RenderSprites:
+		Image: dd.rank1
+	ProvidesPrerequisite@default:
+		Prerequisite: dd.upgraded
+
+upgrade.dd.rank2:
+	Inherits: ^UpgradeActor
+	Tooltip:
+		Name: Destroyer Veterancy II
+	Valued:
+		Cost: 1500
+	Buildable:
+		BuildPaletteOrder: 110
+		Prerequisites: syrd, ~techcenter, ~techlevel.high, ~dd.upgraded, ~!dd.upgraded2
+		Queue: Upgrade
+		Description: Enables Veterancy II\nDestroyer production.
+		BuildLimit: 1
+	RenderSprites:
+		Image: dd.rank2
+	ProvidesPrerequisite@default:
+		Prerequisite: dd.upgraded2
+
+upgrade.ss.rank1:
+	Inherits: ^UpgradeActor
+	Tooltip:
+		Name: Destroyer Veterancy I
+	Valued:
+		Cost: 1000
+	Buildable:
+		BuildPaletteOrder: 110
+		Prerequisites: spen, ~radar, ~techlevel.medium, ~!ss.upgraded
+		Queue: Upgrade
+		Description: Enables Veterancy I\nSubmarine production.
+		BuildLimit: 1
+	RenderSprites:
+		Image: ss.rank1
+	ProvidesPrerequisite@default:
+		Prerequisite: ss.upgraded
+
+upgrade.ss.rank2:
+	Inherits: ^UpgradeActor
+	Tooltip:
+		Name: Destroyer Veterancy II
+	Valued:
+		Cost: 1500
+	Buildable:
+		BuildPaletteOrder: 110
+		Prerequisites: spen, ~techcenter, ~techlevel.high, ~ss.upgraded, ~!ss.upgraded2
+		Queue: Upgrade
+		Description: Enables Veterancy II\nSubmarine production.
+		BuildLimit: 1
+	RenderSprites:
+		Image: ss.rank2
+	ProvidesPrerequisite@default:
+		Prerequisite: ss.upgraded2
+
 # Unit Specific Upgrades
 
 upgrade.tnkd.accuracy:

diff --git a/mods/ura/sequences/upgrades.yaml b/mods/ura/sequences/upgrades.yaml
@@ -65,3 +65,10 @@ mig.rank1:
 	icon: mig.rank1icon
 parabomb.speed:
 	icon: pbmb.speedicon
+
+# Ships
+
+dd.rank1:
+	icon: dd.rank1icon
+ss.rank1:
+	icon: ss.rank1icon
diff --git a/mods/ura/sequences/veterancy.yaml b/mods/ura/sequences/veterancy.yaml
@@ -1124,3 +1124,17 @@ mig.rank3:
 	idle:
 		Facings: 16
 	icon: mig.rank3icon
+
+# Ships
+
+dd.rank2:
+	idle:
+		Facings: 16
+	turret: ssam
+		Facings: 32
+	icon: dd.rank2icon
+
+ss.rank2:
+	idle:
+		Facings: 16
+	icon: ss.rank2icon