Merge pull request #9340 from reaperrr/d2k-bal-weapons

Changed D2k health, armor types and weapon stats to match original

OpenRA.Mods.Common/Effects/Missile.cs

@@ -59,7 +59,8 @@ namespace OpenRA.Mods.Common.Effects
 		[Desc("Interval in ticks between each spawned Trail animation.")]
 		public readonly int TrailInterval = 2;
 
-		[PaletteReference] public readonly string TrailPalette = "effect";
+		// TODO: Re-add PaletteReference as soon as it handles player palettes
+		public readonly string TrailPalette = "effect";
 
 		public readonly bool TrailUsePlayerPalette = false;
 		public readonly int ContrailLength = 0;

mods/d2k/rules/infantry.yaml

@@ -9,7 +9,7 @@ light_inf:
 		Name: Light Infantry
 		Description: General-purpose infantry\n  Strong vs Infantry\n  Weak vs Vehicles, Artillery
 	Health:
-		HP: 50
+		HP: 600
 	Mobile:
 		Speed: 53
 	Armament:
@@ -32,7 +32,7 @@ engineer:
 		Name: Engineer
 		Description: Infiltrates and captures enemy structures\n  Strong vs Buildings\n  Weak vs Everything
 	Health:
-		HP: 25
+		HP: 500
 	Mobile:
 		Speed: 53
 	Passenger:
@@ -60,7 +60,7 @@ trooper:
 		Name: Trooper
 		Description: Anti-tank/Anti-aircraft infantry\n  Strong vs Tanks, Aircraft\n  Weak vs Infantry, Artillery
 	Health:
-		HP: 45
+		HP: 700
 	Mobile:
 		Speed: 42
 	Armament:
@@ -84,7 +84,7 @@ medic:
 		Name: Medic
 		Description: Heals nearby infantry\n  Strong vs Nothing\n  Weak vs Everything
 	Health:
-		HP: 60
+		HP: 375
 	Mobile:
 		Speed: 42
 	AutoHeal:
@@ -117,10 +117,10 @@ fremen:
 	Mobile:
 		Speed: 53
 	Health:
-		HP: 70
+		HP: 700
-	Passenger:
 	RevealsShroud:
 		Range: 7c0
+	Passenger:
 	AutoTarget:
 		ScanRadius: 7
 	Armament@PRIMARY:
@@ -152,7 +152,7 @@ grenadier:
 		Name: Grenadier
 		Description: Infantry armed with grenades. \n  Strong vs Buildings, Infantry\n  Weak vs Vehicles
 	Health:
-		HP: 50
+		HP: 600
 	Mobile:
 		Speed: 53
 	Armament:
@@ -164,8 +164,8 @@ grenadier:
 		AttackSequence: throw
 		IdleSequences: idle
 	Explodes:
-		Weapon: UnitExplodeSmall
+		Weapon: GrenDeath
-		EmptyWeapon: UnitExplodeSmall
+		EmptyWeapon: GrenDeath
 	AttractsWorms:
 		Intensity: 180
 
@@ -181,7 +181,7 @@ sardaukar:
 		Name: Sardaukar
 		Description: Elite assault infantry\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery
 	Health:
-		HP: 100
+		HP: 1000
 	Mobile:
 		Speed: 42
 	RevealsShroud:
@@ -197,6 +197,10 @@ sardaukar:
 		Intensity: 180
 	Voiced:
 		VoiceSet: GenericVoice
+	Explodes:
+		Weapon: SardDeath
+		EmptyWeapon: SardDeath
+		Chance: 100
 
 saboteur:
 	Inherits: ^Infantry
@@ -210,7 +214,7 @@ saboteur:
 		Name: Saboteur
 		Description: Sneaky infantry, armed with explosives\n  Strong vs Buildings\n  Weak vs Everything\n  Special Ability: destroy buildings
 	Health:
-		HP: 100
+		HP: 400
 	Mobile:
 		Speed: 64
 	RevealsShroud:

mods/d2k/rules/structures.yaml

@@ -49,9 +49,9 @@ construction_yard:
 	Selectable:
 		Bounds: 96,64
 	Health:
-		HP: 1000
+		HP: 3000
 	Armor:
-		Type: Concrete
+		Type: cy
 	RevealsShroud:
 		Range: 10c0
 	Production:
@@ -94,9 +94,9 @@ wind_trap:
 		Dimensions: 2,2
 	Bib:
 	Health:
-		HP: 400
+		HP: 3000
 	Armor:
-		Type: Wood
+		Type: building
 	RevealsShroud:
 		Range: 4c0
 	RenderSprites:
@@ -129,9 +129,9 @@ barracks:
 		Dimensions: 2,2
 	Bib:
 	Health:
-		HP: 800
+		HP: 3200
 	Armor:
-		Type: Wood
+		Type: wood
 	RevealsShroud:
 		Range: 5c0
 	RallyPoint:
@@ -185,9 +185,9 @@ refinery:
 		Dimensions: 3,2
 	Bib:
 	Health:
-		HP: 900
+		HP: 3000
 	Armor:
-		Type: Wood
+		Type: building
 	RevealsShroud:
 		Range: 6c0
 	Refinery:
@@ -236,9 +236,9 @@ silo:
 		Adjacent: 4
 	-GivesBuildableArea:
 	Health:
-		HP: 300
+		HP: 1500
 	Armor:
-		Type: Wood
+		Type: wall
 	RevealsShroud:
 		Range: 4c0
 	RenderSprites:
@@ -276,9 +276,9 @@ light_factory:
 		Dimensions: 3,2
 	Bib:
 	Health:
-		HP: 750
+		HP: 3300
 	Armor:
-		Type: Wood
+		Type: light
 	RevealsShroud:
 		Range: 4c0
 	RenderSprites:
@@ -333,9 +333,9 @@ heavy_factory:
 		Dimensions: 3,3
 	Bib:
 	Health:
-		HP: 1500
+		HP: 3500
 	Armor:
-		Type: Wood
+		Type: wood
 	RevealsShroud:
 		Range: 4c0
 	RallyPoint:
@@ -396,9 +396,9 @@ outpost:
 		Dimensions: 3,2
 	Bib:
 	Health:
-		HP: 1000
+		HP: 3500
 	Armor:
-		Type: Wood
+		Type: light
 	RevealsShroud:
 		Range: 10c0
 	ProvidesRadar:
@@ -434,9 +434,9 @@ starport:
 	Selectable:
 		Bounds: 96,64
 	Health:
-		HP: 1000
+		HP: 3500
 	Armor:
-		Type: Wood
+		Type: building
 	RevealsShroud:
 		Range: 7c0
 	RallyPoint:
@@ -499,9 +499,9 @@ wall:
 		Adjacent: 7
 		TerrainTypes: Rock, Concrete
 	Health:
-		HP: 300
+		HP: 2000
 	Armor:
-		Type: Concrete
+		Type: none
 	Crushable:
 		CrushClasses: Concretewall
 	BlocksProjectiles:
@@ -542,9 +542,9 @@ medium_gun_turret:
 		Bounds: 32,32
 		Priority: 3
 	Health:
-		HP: 400
+		HP: 2700
 	Armor:
-		Type: Concrete
+		Type: heavy
 	RevealsShroud:
 		Range: 8c0
 	BodyOrientation:
@@ -584,9 +584,9 @@ large_gun_turret:
 		Bounds: 32,32
 		Priority: 3
 	Health:
-		HP: 400
+		HP: 3000
 	Armor:
-		Type: Concrete
+		Type: concrete
 	RevealsShroud:
 		Range: 10c0
 	BodyOrientation:
@@ -622,9 +622,9 @@ repair_pad:
 		Footprint: =x= =x= ===
 		Dimensions: 3,3
 	Health:
-		HP: 500
+		HP: 3000
 	Armor:
-		Type: Concrete
+		Type: building
 	RevealsShroud:
 		Range: 5c0
 	Selectable:
@@ -672,9 +672,9 @@ high_tech_factory:
 		Dimensions: 3,3
 	Bib:
 	Health:
-		HP: 1500
+		HP: 3500
 	Armor:
-		Type: Wood
+		Type: wood
 	RevealsShroud:
 		Range: 4c0
 	RenderSprites:
@@ -722,9 +722,9 @@ research_centre:
 		Dimensions: 3,3
 	Bib:
 	Health:
-		HP: 1000
+		HP: 2500
 	Armor:
-		Type: Wood
+		Type: wood
 	RevealsShroud:
 		Range: 4c0
 	RenderSprites:
@@ -759,9 +759,9 @@ palace:
 	Bib:
 		HasMinibib: True
 	Health:
-		HP: 2000
+		HP: 4000
 	Armor:
-		Type: Wood
+		Type: wood
 	RevealsShroud:
 		Range: 8c0
 	RenderSprites:

mods/d2k/rules/vehicles.yaml

@@ -13,9 +13,9 @@ mcv:
 		Class: mcv
 		Priority: 3
 	Health:
-		HP: 800
+		HP: 4500
 	Armor:
-		Type: Light
+		Type: light
 	Mobile:
 		Speed: 64
 		Crushes: crate, infantry
@@ -64,9 +64,9 @@ harvester:
 		SearchFromProcRadius: 24
 		SearchFromOrderRadius: 12
 	Health:
-		HP: 1000
+		HP: 4500
 	Armor:
-		Type: Heavy
+		Type: harvester
 	Mobile:
 		Speed: 64
 		Crushes: crate, infantry
@@ -99,18 +99,21 @@ trike:
 	Selectable:
 		Class: trike
 	Health:
-		HP: 100
+		HP: 900
 	Armor:
-		Type: Light
+		Type: wood
 	Mobile:
 		ROT: 10
 		Speed: 128
 	RevealsShroud:
 		Range: 7c0
 	WithMuzzleFlash:
-	Armament:
+	Armament@damage:
 		Weapon: HMG
 		LocalOffset: -416,0,0
+	Armament@muzzle:
+		Weapon: HMG_muzzle
+		LocalOffset: -416,0,0
 		MuzzleSequence: muzzle
 	AttackFrontal:
 	AutoTarget:
@@ -132,9 +135,9 @@ quad:
 		Name: Missile Quad
 		Description: Missile Scout\n Strong vs Vehicles\n  Weak vs Infantry
 	Health:
-		HP: 125
+		HP: 1100
 	Armor:
-		Type: Light
+		Type: light
 	Mobile:
 		ROT: 8
 		Speed: 96
@@ -165,9 +168,9 @@ siege_tank:
 		Name: Siege Tank
 		Description: Siege Artillery\n  Strong vs Infantry, Buildings\n  Weak vs Tanks, Aircraft
 	Health:
-		HP: 120
+		HP: 1200
 	Armor:
-		Type: Heavy
+		Type: light
 	Mobile:
 		Speed: 53
 		ROT: 3
@@ -213,13 +216,13 @@ missile_tank:
 		Speed: 64
 		ROT: 5
 	Health:
-		HP: 90
+		HP: 1300
 	Armor:
-		Type: Light
+		Type: wood
 	RevealsShroud:
 		Range: 9c0
 	Armament:
-		Weapon: 227mm
+		Weapon: mtank_pri
 		LocalOffset: -213,128,171, -213,-256,171
 		FireDelay: 15
 	AttackFrontal:
@@ -247,9 +250,9 @@ sonic_tank:
 		Name: Sonic Tank
 		Description: Fires sonic shocks\n  Strong vs Infantry, Vehicles\n  Weak vs Artillery, Aircraft
 	Health:
-		HP: 130
+		HP: 3000
 	Armor:
-		Type: Light
+		Type: light
 	Mobile:
 		ROT: 3
 		Speed: 74
@@ -280,9 +283,9 @@ devastator:
 		Name: Devastator
 		Description: Super Heavy Tank\n  Strong vs Tanks\n  Weak vs Artillery, Aircraft
 	Health:
-		HP: 650
+		HP: 5000
 	Armor:
-		Type: Heavy
+		Type: heavy
 	Mobile:
 		ROT: 3
 		Speed: 42
@@ -319,18 +322,21 @@ raider:
 		Name: Raider Trike
 		Description: Improved Scout\n Strong vs Infantry, Light Vehicles
 	Health:
-		HP: 110
+		HP: 1000
 	Armor:
-		Type: Light
+		Type: wood
 	Mobile:
 		ROT: 10
 		Speed: 149
 	RevealsShroud:
 		Range: 7c0
 	WithMuzzleFlash:
-	Armament:
+	Armament@damage:
 		Weapon: HMGo
 		LocalOffset: 170,0,0
+	Armament@muzzle:
+		Weapon: HMGo_muzzle
+		LocalOffset: 170,0,0
 		MuzzleSequence: muzzle
 	AttackFrontal:
 	AutoTarget:
@@ -375,9 +381,9 @@ deviator:
 		ROT: 3
 		Speed: 64
 	Health:
-		HP: 125
+		HP: 1100
 	Armor:
-		Type: Light
+		Type: wood
 	RevealsShroud:
 		Range: 5c0
 	Armament:
@@ -405,9 +411,9 @@ deviator:
 		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
 	Health:
-		HP: 350
+		HP: 2100
 	Armor:
-		Type: Heavy
+		Type: heavy
 	Mobile:
 		Speed: 64
 		ROT: 6
@@ -458,7 +464,7 @@ combat_tank_h:
 	RevealsShroud:
 		Range: 7c0
 	Health:
-		HP: 440
+		HP: 2700
 	SpawnActorOnDeath:
 		Actor: combat_tank_h.husk
 
@@ -474,6 +480,8 @@ combat_tank_o:
 		Speed: 96
 		ROT: 8
 		Crushes: crate, infantry
+	Health:
+		HP: 1800
 	SpawnActorOnDeath:
 		Actor: combat_tank_o.husk
 

mods/d2k/sequences/misc.yaml

@@ -45,6 +45,11 @@ explosion:
 	small_napalm: DATA.R8
 		Start: 3421
 		Length: 8
+	rocket_explosion: DATA.R8
+		Start: 3381
+		Length: 5
+		Tick: 80
+		BlendMode: Alpha
 	shockwave: DATA.R8
 		Start: 3687
 		Length: 6
@@ -261,6 +266,11 @@ bombs:
 		Start: 3280
 		Length: 4
 
+grenade:
+	idle: grenade.shp	# frames 3618-3621 from patch 1.06 DATA.R8
+		Length: 4
+		Tick: 80
+
 shrapnel:
 	idle: DATA.R8
 		Start: 3290