Merge pull request #4317 from Mailaender/d2k-grenadier

Added the Atreides grenadier

OpenRA.Utility/Command.cs

@@ -75,7 +75,7 @@ namespace OpenRA.Utility
 
 		[Desc("SPRITEFILE PALETTE [--noshadow] [--nopadding]",
 		      "Convert a shp/tmp/R8 to a series of PNGs, optionally removing shadow")]
-		public static void ConvertShpToPng(string[] args)
+		public static void ConvertSpriteToPng(string[] args)
 		{
 			var src = args[1];
 			var shadowIndex = new int[] { };

OpenRA.Utility/Program.cs

@@ -22,7 +22,7 @@ namespace OpenRA.Utility
 		{
 			{ "--settings-value", Command.Settings },
 			{ "--shp", Command.ConvertPngToShp },
-			{ "--png", Command.ConvertShpToPng },
+			{ "--png", Command.ConvertSpriteToPng },
 			{ "--extract", Command.ExtractFiles },
 			{ "--remap", Command.RemapShp },
 			{ "--transpose", Command.TransposeShp },

mods/d2k/rules/atreides.yaml

@@ -235,3 +235,34 @@ FREMEN:
 		CloakDelay: 250
 		CloakSound: STEALTH1.WAV
 		UncloakSound: STEALTH2.WAV
+
+GRENADIER:
+	Inherits: ^Infantry
+	Buildable:
+		Queue: Infantry
+		BuildPaletteOrder: 10
+		Owner: atreides
+		Hotkey: g
+	Valued:
+		Cost: 160
+	Tooltip:
+		Name: Grenadier
+		Description: Infantry armed with grenades. \n  Strong vs Buildings, Infantry\n  Weak vs Vehicles
+	Selectable:
+		Bounds: 12,17,0,0
+	Health:
+		HP: 50
+	Mobile:
+		Speed: 5
+	Armament:
+		Weapon: Grenade
+		LocalOffset: 0,0,555
+		FireDelay: 15
+	AttackFrontal:
+	TakeCover:
+	-RenderInfantry:
+	RenderInfantryProne:
+		IdleAnimations: stand,stand2
+	Explodes:
+		Weapon: UnitExplodeSmall
+		Chance: 100

mods/d2k/sequences/infantry.yaml

@@ -439,3 +439,59 @@ sardaukar:
 	icon: DATA
 		Start: 4015
 		Offset: -30,-24
+
+grenadier: # 2502 - 2749 in 1.06 DATA.R8
+	stand:
+		Start: 0
+		Facings: 8
+	stand2:
+		Start: 8
+		Facings: 8
+	idle:
+		Start: 203
+		Length: 16
+	run:
+		Start: 8
+		Length: 6
+		Facings: 8
+		Tick: 120
+	shoot:
+		Start: 56
+		Length: 6
+		Facings: 8
+		Tick: 120
+	die1:
+		Start: 176
+		Length: 20
+	die2:
+		Start: 176
+		Length: 20
+	die3:
+		Start: 176
+		Length: 20
+	die4:
+		Start: 176
+		Length: 20
+	die5:
+		Start: 176
+		Length: 20
+	die-crushed:
+		Start: 195
+		Length: 8
+		Tick: 1600
+	prone-stand:
+		Start: 104
+		Length: 4
+		Facings: 8
+	prone-run:
+		Start: 104
+		Length: 4
+		Facings: 8
+		Tick: 120
+	prone-shoot:
+		Start: 136
+		Length: 5
+		Facings: 8
+		Tick: 120
+	icon: grenadiericon
+		Start: 0 # 4281 in 1.06 DATA.R8

mods/d2k/sequences/vehicles.yaml

@@ -174,7 +174,7 @@ stealthraider:
 		Length: 2
 		BlendMode: Additive
 	icon: raidersicon
-		Start: 0
+		Start: 0 # 4282 in 1.06 DATA.R8
 
 deviatortank:
 	idle: DATA

mods/d2k/weapons.yaml

@@ -596,4 +596,27 @@ UnitExplodeScale:
 			Heavy: 25%
 		Explosion: building
 		InfDeath: 4
-		ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV
+		ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV
+
+Grenade:
+	ROF: 60
+	Range: 4
+	Report: # TODO
+	Projectile: Bullet
+		Speed: 16
+		High: true
+		Angle: .1
+		Inaccuracy: 13
+		Image: BOMBS # TODO
+	Warhead:
+		Spread: 6
+		Versus:
+			None: 50%
+			Wood: 100%
+			Light: 25%
+			Heavy: 5%
+		Explosion: med_explosion
+		InfDeath: 3
+		SmudgeType: SandCrater
+		Damage: 60
+		ImpactSound: EXPLLG5.WAV