Merge pull request #9453 from reaperrr/d2k-cost

Change D2k Cost and CustomBuildValues to match original
2015-10-10 20:44:33 +01:00
parent ad3714e9ec 74bcbcc9a8
commit 6c0a4e0722
7 changed files with 133 additions and 39 deletions
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -1,7 +1,9 @@
 carryall.reinforce:
 	Inherits: ^Plane
 	Valued:
-		Cost: 1200
+		Cost: 1100
+	CustomBuildTimeValue:
+		Value: 648
 	Tooltip:
 		Name: Carryall
 		Description: Large winged, planet-bound ship\n  Automatically lifts harvesters.
--- a/mods/d2k/rules/infantry.yaml
+++ b/mods/d2k/rules/infantry.yaml
@@ -4,7 +4,9 @@ light_inf:
 		Queue: Infantry
 		BuildPaletteOrder: 10
 	Valued:
-		Cost: 100
+		Cost: 50
+	CustomBuildTimeValue:
+		Value: 54
 	Tooltip:
 		Name: Light Infantry
 		Description: General-purpose infantry\n  Strong vs Infantry\n  Weak vs Vehicles, Artillery
@@ -27,7 +29,9 @@ engineer:
 		BuildPaletteOrder: 50
 		Prerequisites: upgrade.barracks, ~techlevel.medium
 	Valued:
-		Cost: 500
+		Cost: 400
+	CustomBuildTimeValue:
+		Value: 108
 	Tooltip:
 		Name: Engineer
 		Description: Infiltrates and captures enemy structures\n  Strong vs Buildings\n  Weak vs Everything
@@ -55,7 +59,9 @@ trooper:
 		BuildPaletteOrder: 20
 		Prerequisites: upgrade.barracks, ~techlevel.medium
 	Valued:
-		Cost: 250
+		Cost: 90
+	CustomBuildTimeValue:
+		Value: 73
 	Tooltip:
 		Name: Trooper
 		Description: Anti-tank/Anti-aircraft infantry\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry, Artillery
@@ -79,7 +85,9 @@ medic:
 		BuildPaletteOrder: 60
 		Prerequisites: ~barracks.medics, upgrade.barracks, ~techlevel.high
 	Valued:
-		Cost: 500
+		Cost: 200
+	CustomBuildTimeValue:
+		Value: 108
 	Tooltip:
 		Name: Medic
 		Description: Heals nearby infantry\n  Strong vs Nothing\n  Weak vs Everything
@@ -105,8 +113,6 @@ medic:

 fremen:
 	Inherits: ^Infantry
-	Valued:
-		Cost: 800
 	Tooltip:
 		Name: Fremen
 		Description: Elite sniper infantry unit\n  Strong vs Infantry\n  Weak vs Vehicles\n  Special Ability: Invisibility
@@ -116,6 +122,8 @@ fremen:
 		Prerequisites: ~disabled
 	Mobile:
 		Speed: 43
+	Valued:
+		Cost: 200	## actually 0, but spawns from support power at Palace
 	Health:
 		HP: 700
 	RevealsShroud:
@@ -147,7 +155,9 @@ grenadier:
 		BuildPaletteOrder: 80
 		Prerequisites: ~barracks.atreides, upgrade.barracks, high_tech_factory, ~techlevel.medium
 	Valued:
-		Cost: 160
+		Cost: 80
+	CustomBuildTimeValue:
+		Value: 81	## Wasn't converted, copied from Sardauker who has same value in TibEd.
 	Tooltip:
 		Name: Grenadier
 		Description: Infantry armed with grenades. \n  Strong vs Buildings, Infantry\n  Weak vs Vehicles
@@ -176,7 +186,9 @@ sardaukar:
 		BuildPaletteOrder: 80
 		Prerequisites: ~barracks.harkonnen, palace, ~techlevel.high
 	Valued:
-		Cost: 400
+		Cost: 200
+	CustomBuildTimeValue:
+		Value: 81
 	Tooltip:
 		Name: Sardaukar
 		Description: Elite assault infantry\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery
@@ -209,7 +221,7 @@ saboteur:
 		BuildPaletteOrder: 100
 		Prerequisites: ~disabled
 	Valued:
-		Cost: 800
+		Cost: 300	## actually 0, but spawns from support power at Palace
 	Tooltip:
 		Name: Saboteur
 		Description: Sneaky infantry, armed with explosives\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: destroy buildings
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -168,6 +168,8 @@ upgrade.conyard:
 		BuildLimit: 1
 	Valued:
 		Cost: 1000
+	CustomBuildTimeValue:
+		Value: 590
 	RenderSprites:
 		Image: conyard.harkonnen
 		FactionImages:
@@ -188,6 +190,8 @@ upgrade.barracks:
 		BuildLimit: 1
 	Valued:
 		Cost: 500
+	CustomBuildTimeValue:
+		Value: 290
 	RenderSprites:
 		Image: barracks.harkonnen
 		FactionImages:
@@ -207,6 +211,8 @@ upgrade.light:
 		BuildLimit: 1
 	Valued:
 		Cost: 400
+	CustomBuildTimeValue:
+		Value: 215
 	RenderSprites:
 		Image: light.harkonnen
 		FactionImages:
@@ -226,6 +232,8 @@ upgrade.heavy:
 		BuildLimit: 1
 	Valued:
 		Cost: 800
+	CustomBuildTimeValue:
+		Value: 380
 	RenderSprites:
 		Image: heavy.harkonnen
 		FactionImages:
@@ -246,6 +254,8 @@ upgrade.hightech:
 		BuildLimit: 1
 	Valued:
 		Cost: 1500
+	CustomBuildTimeValue:
+		Value: 720
 	RenderSprites:
 		Image: hightech.atreides
 	ProvidesPrerequisite@upgradename:
--- a/mods/d2k/rules/player.yaml
+++ b/mods/d2k/rules/player.yaml
@@ -3,39 +3,45 @@ Player:
 	TechTree:
 	ClassicProductionQueue@Building:
 		Type: Building
+		BuildSpeed: 1.0
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		ReadyAudio: BuildingReady
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Upgrade:
 		Type: Upgrade
-		LowPowerSlowdown: 3
+		BuildSpeed: 1.0
+		LowPowerSlowdown: 0
 		QueuedAudio: Upgrading
 		ReadyAudio: NewOptions
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Infantry:
 		Type: Infantry
-		LowPowerSlowdown: 2
+		BuildSpeed: 1.0
+		LowPowerSlowdown: 3
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Vehicle:
 		Type: Vehicle
+		BuildSpeed: 1.0
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Armor:
 		Type: Armor
+		BuildSpeed: 1.0
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		BlockedAudio: NoRoom
 	ClassicProductionQueue@Starport:
 		Type: Starport
-		BuildSpeed: .2
-		LowPowerSlowdown: 1
+		BuildSpeed: 0.85
+		LowPowerSlowdown: 0
 		BlockedAudio: NoRoom
 		QueuedAudio: OrderPlaced
 		ReadyAudio:
 	ClassicProductionQueue@Aircraft:
 		Type: Aircraft
+		BuildSpeed: 1.25
 		LowPowerSlowdown: 3
 		QueuedAudio: Building
 		BlockedAudio: NoRoom
--- a/mods/d2k/rules/starport.yaml
+++ b/mods/d2k/rules/starport.yaml
@@ -1,7 +1,7 @@
 mcv.starport:
 	Inherits: mcv
 	Buildable:
-		Prerequisites: repair_pad
+		Prerequisites: starport
 		Queue: Starport
 	Valued:
 		Cost: 2500
@@ -11,6 +11,7 @@ mcv.starport:
 harvester.starport:
 	Inherits: harvester
 	Buildable:
+		Prerequisites: starport
 		Queue: Starport
 	Valued:
 		Cost: 1500
@@ -20,6 +21,7 @@ harvester.starport:
 trike.starport:
 	Inherits: trike
 	Buildable:
+		Prerequisites: starport
 		Queue: Starport
 	Valued:
 		Cost: 315
@@ -29,6 +31,7 @@ trike.starport:
 quad.starport:
 	Inherits: quad
 	Buildable:
+		Prerequisites: starport
 		Queue: Starport
 	Valued:
 		Cost: 500
@@ -38,6 +41,7 @@ quad.starport:
 siege_tank.starport:
 	Inherits: siege_tank
 	Buildable:
+		Prerequisites: starport
 		Queue: Starport
 	Valued:
 		Cost: 1075
@@ -47,6 +51,7 @@ siege_tank.starport:
 missile_tank.starport:
 	Inherits: missile_tank
 	Buildable:
+		Prerequisites: starport
 		Queue: Starport
 	Valued:
 		Cost: 1250
@@ -85,8 +90,9 @@ combat_tank_o.starport:

 carryall.starport:
 	Inherits: carryall
+	Buildable:
+		Prerequisites: starport
+		Queue: Starport
 	Valued:
 		Cost: 1500
-	Buildable:
-		Queue: Starport

--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -25,6 +25,8 @@ concretea:
 		Dimensions: 2,2
 	Valued:
 		Cost: 20
+	CustomBuildTimeValue:
+		Value: 54

 concreteb:
 	Inherits: ^concrete
@@ -33,6 +35,8 @@ concreteb:
 		Dimensions: 3,3
 	Valued:
 		Cost: 50
+	CustomBuildTimeValue:
+		Value: 81
 	Buildable:
 		Prerequisites: upgrade.conyard

@@ -85,7 +89,9 @@ wind_trap:
 	Selectable:
 		Bounds: 64,64
 	Valued:
-		Cost: 300
+		Cost: 225
+	CustomBuildTimeValue:
+		Value: 180
 	Tooltip:
 		Name: Wind Trap
 		Description: Provides power for other structures
@@ -120,7 +126,9 @@ barracks:
 	Selectable:
 		Bounds: 64,64
 	Valued:
-		Cost: 300
+		Cost: 225
+	CustomBuildTimeValue:
+		Value: 231
 	Tooltip:
 		Name: Barracks
 		Description: Trains infantry
@@ -177,6 +185,8 @@ refinery:
 		Bounds: 96,64
 	Valued:
 		Cost: 1500
+	CustomBuildTimeValue:
+		Value: 540
 	Tooltip:
 		Name: Spice Refinery
 		Description: Harvesters unload Spice here for processing
@@ -228,7 +238,9 @@ silo:
 	Selectable:
 		Bounds: 32,32
 	Valued:
-		Cost: 150
+		Cost: 120
+	CustomBuildTimeValue:
+		Value: 135
 	Tooltip:
 		Name: Silo
 		Description: Stores excess harvested Spice
@@ -272,6 +284,8 @@ light_factory:
 		Bounds: 96,64
 	Valued:
 		Cost: 500
+	CustomBuildTimeValue:
+		Value: 277
 	Tooltip:
 		Name: Light Factory
 		Description: Produces light vehicles
@@ -328,7 +342,9 @@ heavy_factory:
 	Selectable:
 		Bounds: 96,68,0,12
 	Valued:
-		Cost: 2000
+		Cost: 1000
+	CustomBuildTimeValue:
+		Value: 648
 	Tooltip:
 		Name: Heavy Factory
 		Description: Produces heavy vehicles
@@ -391,7 +407,9 @@ outpost:
 	Selectable:
 		Bounds: 96,64
 	Valued:
-		Cost: 700
+		Cost: 750
+	CustomBuildTimeValue:
+		Value: 270
 	Tooltip:
 		Name: Outpost
 		Description: Provides a radar map of the battlefield\n  Requires power to operate
@@ -423,8 +441,6 @@ outpost:

 starport:
 	Inherits: ^Building
-	Valued:
-		Cost: 2000
 	Tooltip:
 		Name: Starport
 		Description: Dropzone for quick reinforcements, at a price.\n  Requires power to operate
@@ -432,6 +448,10 @@ starport:
 		Prerequisites: heavy_factory, outpost, ~techlevel.high
 		Queue: Building
 		BuildPaletteOrder: 80
+	Valued:
+		Cost: 1500
+	CustomBuildTimeValue:
+		Value: 540
 	Building:
 		Footprint: xxx x=x =x=
 		Dimensions: 3,3
@@ -491,7 +511,9 @@ wall:
 		DamagedSounds:
 		DestroyedSounds: EXPLSML4.WAV
 	Valued:
-		Cost: 100
+		Cost: 20
+	CustomBuildTimeValue:
+		Value: 54
 	CustomSellValue:
 		Value: 0
 	Tooltip:
@@ -533,7 +555,9 @@ medium_gun_turret:
 		Prerequisites: barracks
 		BuildPaletteOrder: 90
 	Valued:
-		Cost: 650
+		Cost: 550
+	CustomBuildTimeValue:
+		Value: 231
 	Tooltip:
 		Name: Gun Turret
 		Description: Defensive structure\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft
@@ -575,7 +599,9 @@ large_gun_turret:
 		Prerequisites: outpost, upgrade.conyard, ~techlevel.medium
 		BuildPaletteOrder: 120
 	Valued:
-		Cost: 850
+		Cost: 750
+	CustomBuildTimeValue:
+		Value: 270
 	Tooltip:
 		Name: Rocket Turret
 		Description: Defensive structure\n  Strong vs Infantry, Aircraft\n  Weak vs Tanks\n\n  Requires power to operate
@@ -618,7 +644,9 @@ repair_pad:
 		Prerequisites: heavy_factory, upgrade.heavy, ~techlevel.medium
 		BuildPaletteOrder: 130
 	Valued:
-		Cost: 500
+		Cost: 800
+	CustomBuildTimeValue:
+		Value: 324
 	Tooltip:
 		Name: Repair Pad
 		Description: Repairs vehicles\n Allows construction of MCVs
@@ -662,7 +690,9 @@ high_tech_factory:
 	Selectable:
 		Bounds: 96,68,0,12
 	Valued:
-		Cost: 750
+		Cost: 1150
+	CustomBuildTimeValue:
+		Value: 405
 	Tooltip:
 		Name: High Tech Factory
 		Description: Unlocks advanced technology
@@ -717,7 +747,9 @@ research_centre:
 	Selectable:
 		Bounds: 96,64,0,16
 	Valued:
-		Cost: 1500
+		Cost: 1000
+	CustomBuildTimeValue:
+		Value: 270
 	Tooltip:
 		Name: Ix Lab
 		Description: Unlocks experimental tanks
@@ -753,7 +785,9 @@ palace:
 	Selectable:
 		Bounds: 96,96
 	Valued:
-		Cost: 2000
+		Cost: 1600
+	CustomBuildTimeValue:
+		Value: 810
 	Tooltip:
 		Name: Palace
 		Description: Unlocks elite infantry
--- a/mods/d2k/rules/vehicles.yaml
+++ b/mods/d2k/rules/vehicles.yaml
@@ -6,6 +6,8 @@ mcv:
 		BuildPaletteOrder: 110
 	Valued:
 		Cost: 2000
+	CustomBuildTimeValue:
+		Value: 648
 	Tooltip:
 		Name: Mobile Construction Vehicle
 		Description: Deploys into another Construction Yard\n  Unarmed
@@ -48,7 +50,9 @@ harvester:
 		BuildPaletteOrder: 10
 		InitialActivity: FindResources
 	Valued:
-		Cost: 1000
+		Cost: 1200
+	CustomBuildTimeValue:
+		Value: 540
 	Tooltip:
 		Name: Spice Harvester
 		Description: Collects Spice for processing\n  Unarmed
@@ -92,7 +96,9 @@ trike:
 		BuildPaletteOrder: 10
 		Prerequisites: ~light.regulartrikes
 	Valued:
-		Cost: 250
+		Cost: 300
+	CustomBuildTimeValue:
+		Value: 194
 	Tooltip:
 		Name: Trike
 		Description: Fast scout\n Strong vs Infantry\n Weak vs Tanks, Aircraft
@@ -131,6 +137,8 @@ quad:
 		BuildPaletteOrder: 20
 	Valued:
 		Cost: 400
+	CustomBuildTimeValue:
+		Value: 277
 	Tooltip:
 		Name: Missile Quad
 		Description: Missile Scout\n Strong vs Vehicles\n  Weak vs Infantry
@@ -163,7 +171,9 @@ siege_tank:
 		Prerequisites: upgrade.heavy, ~techlevel.medium
 		BuildPaletteOrder: 50
 	Valued:
-		Cost: 850
+		Cost: 700
+	CustomBuildTimeValue:
+		Value: 324
 	Tooltip:
 		Name: Siege Tank
 		Description: Siege Artillery\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
@@ -203,8 +213,6 @@ siege_tank:

 missile_tank:
 	Inherits: ^Tank
-	Valued:
-		Cost: 1000
 	Tooltip:
 		Name: Missile Tank
 		Description: Rocket Artillery\n  Strong vs Vehicles, Buildings, Aircraft\n  Weak vs Infantry
@@ -212,6 +220,10 @@ missile_tank:
 		Queue: Armor
 		Prerequisites: ~heavy.missiletank, upgrade.heavy, research_centre, ~techlevel.high
 		BuildPaletteOrder: 60
+	Valued:
+		Cost: 900
+	CustomBuildTimeValue:
+		Value: 441
 	Mobile:
 		Speed: 64
 		ROT: 5
@@ -244,7 +256,9 @@ sonic_tank:
 		BuildPaletteOrder: 100
 		Prerequisites: ~heavy.atreides, research_centre, ~techlevel.high
 	Valued:
-		Cost: 1250
+		Cost: 1000
+	CustomBuildTimeValue:
+		Value: 486
 	Tooltip:
 		Name: Sonic Tank
 		Description: Fires sonic shocks\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery, Aircraft
@@ -277,7 +291,9 @@ devastator:
 		BuildPaletteOrder: 100
 		Prerequisites: ~heavy.harkonnen, research_centre, ~techlevel.high
 	Valued:
-		Cost: 1200
+		Cost: 1050
+	CustomBuildTimeValue:
+		Value: 540
 	Tooltip:
 		Name: Devastator
 		Description: Super Heavy Tank\n  Strong vs Tanks\n  Weak vs Artillery, Aircraft
@@ -316,7 +332,9 @@ raider:
 		BuildPaletteOrder: 10
 		Prerequisites: ~light.ordos
 	Valued:
-		Cost: 300
+		Cost: 350
+	CustomBuildTimeValue:
+		Value: 194
 	Tooltip:
 		Name: Raider Trike
 		Description: Improved Scout\n Strong vs Infantry, Light Vehicles
@@ -352,6 +370,8 @@ stealth_raider:
 		BuildPaletteOrder: 30
 	Valued:
 		Cost: 400
+	CustomBuildTimeValue:
+		Value: 194	## Copied from Raider, not included in conversion. Both have same "BuildSpeed" in TibEd
 	Tooltip:
 		Name: Stealth Raider Trike
 		Description: Invisible Raider Trike\n Strong vs Infantry, Light Vehicles
@@ -369,6 +389,8 @@ deviator:
 	Inherits: ^Tank
 	Valued:
 		Cost: 1000
+	CustomBuildTimeValue:
+		Value: 486
 	Tooltip:
 		Name: Deviator
 		Description: Fires a warhead which changes\nthe allegiance of enemy vehicles
@@ -406,6 +428,8 @@ deviator:
 		BuildPaletteOrder: 40
 	Valued:
 		Cost: 700
+	CustomBuildTimeValue:
+		Value: 373
 	Tooltip:
 		Name: Combat Tank
 		Description: Main Battle Tank\n  Strong vs Tanks\n  Weak vs Infantry, Aircraft\n \n  Atreides:      +Range\n  Harkonnen: +Health\n  Ordos:         +Speed