sprites: colorize weapons by ammo type

Melee weapons get a red rectangle, projectile weapons get a blue one. Fixes fragglet#9
fabiangreffrath · Nov 16, 2023 · 37e5fa1 · 37e5fa1
1 parent 676d0dc
commit 37e5fa1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/sprites/templates/copy_sprites.py b/sprites/templates/copy_sprites.py
@@ -91,12 +91,21 @@ def handle_obstacle(mobj):
 
 handle_player(deh9000.mobjinfo[deh9000.MT_PLAYER])
 
+GUN_FRAME_BY_AMMO = (
+	"gun",
+	"gun",
+	"gun-projectile",
+	"gun-projectile",
+	"gun",
+	"gun-melee",
+)
+
 for weapon_id, weapon in enumerate(deh9000.weaponinfo):
 	for state_id in deh9000.states.walk(weapon.flashstate):
 		frames[state_id] = "gunflash"
 	for field in ("upstate", "downstate", "readystate", "atkstate"):
 		for state_id in deh9000.states.walk(getattr(weapon, field)):
-			frames[state_id] = "gun"
+			frames[state_id] = GUN_FRAME_BY_AMMO[weapon.ammo]
 
 wadinfo_names = set()
 

diff --git a/sprites/templates/gun-melee.png b/sprites/templates/gun-melee.png
diff --git a/sprites/templates/gun-projectile.png b/sprites/templates/gun-projectile.png