From 8fe765aa0ad6099f9c43db2ba859c9bc0d415756 Mon Sep 17 00:00:00 2001
From: Xylemon <xylemon@posteo.net>
Date: Wed, 16 Oct 2024 23:25:55 -0700
Subject: [PATCH] Fnished weapon defs I should've forwarded earlier

---
 zpak001.pk3dir/decls/def/player.def           | 28 +++++++++++++++++++
 zpak001.pk3dir/decls/def/weapons/ac.def       | 10 +++----
 .../decls/def/weapons/autorifle.def           |  8 +++---
 zpak001.pk3dir/decls/def/weapons/axe.def      | 10 +++----
 .../decls/def/weapons/flamethrower.def        | 10 +++----
 zpak001.pk3dir/decls/def/weapons/gl.def       | 14 +++++-----
 zpak001.pk3dir/decls/def/weapons/ic.def       | 20 ++++++-------
 zpak001.pk3dir/decls/def/weapons/knife.def    | 10 +++----
 zpak001.pk3dir/decls/def/weapons/medikit.def  | 10 +++----
 zpak001.pk3dir/decls/def/weapons/ng.def       |  6 ++--
 zpak001.pk3dir/decls/def/weapons/pl.def       | 14 +++++-----
 zpak001.pk3dir/decls/def/weapons/railgun.def  |  8 +++---
 zpak001.pk3dir/decls/def/weapons/rpg.def      | 20 ++++++-------
 zpak001.pk3dir/decls/def/weapons/shotgun.def  | 14 +++++-----
 .../decls/def/weapons/sniperrifle.def         |  8 +++---
 zpak001.pk3dir/decls/def/weapons/spanner.def  | 10 +++----
 zpak001.pk3dir/decls/def/weapons/superng.def  |  6 ++--
 .../decls/def/weapons/supershotgun.def        | 14 +++++-----
 zpak001.pk3dir/decls/def/weapons/tranq.def    | 14 +++++-----
 zpak001.pk3dir/decls/def/weapons/umbrella.def | 10 +++----
 20 files changed, 136 insertions(+), 108 deletions(-)

diff --git a/zpak001.pk3dir/decls/def/player.def b/zpak001.pk3dir/decls/def/player.def
index a879d5e..9fb43ed 100644
--- a/zpak001.pk3dir/decls/def/player.def
+++ b/zpak001.pk3dir/decls/def/player.def
@@ -10,6 +10,7 @@ entityDef player_scout
 	"health"			"75"
 	"armor"				"25"
 	"maxarmor"			"50"
+	"pm_walkspeed"		"400" // 450 in QWTF
 	"ammo_shells"		"17"
 	"ammo_nails"		"100"
 	"max_ammo_shells"	"50"
@@ -27,6 +28,7 @@ entityDef player_sniper
 	"health"			"90"
 	"armor"				"0"
 	"maxarmor"			"50"
+	"pm_walkspeed"		"300"
 	"ammo_shells"		"60"
 	"ammo_nails"		"50"
 	"max_ammo_shells"	"75"
@@ -44,6 +46,7 @@ entityDef player_soldier
 	"health"			"100"
 	"armor"				"100"
 	"maxarmor"			"200"
+	"pm_walkspeed"		"240"
 	"ammo_shells"		"26"
 	"ammo_rockets"		"6"
 	"max_ammo_shells"	"100"
@@ -61,6 +64,7 @@ entityDef player_demo
 	"health"			"90"
 	"armor"				"50"
 	"maxarmor"			"100"
+	"pm_walkspeed"		"280"
 	"ammo_shells"		"22"
 	"ammo_rockets"		"14"
 	"max_ammo_shells"	"75"
@@ -78,6 +82,7 @@ entityDef player_medic
 	"health"			"90"
 	"armor"				"50"
 	"maxarmor"			"100"
+	"pm_walkspeed"		"320"
 	"ammo_shells"		"26"
 	"ammo_nails"		"50"
 	"max_ammo_shells"	"75"
@@ -95,6 +100,7 @@ entityDef player_heavy
 	"health"			"100"
 	"armor"				"150"
 	"maxarmor"			"300"
+	"pm_walkspeed"		"228"
 	"ammo_shells"		"176"
 	"max_ammo_shells"	"200"
 	"max_ammo_nails"	"200"
@@ -111,6 +117,7 @@ entityDef player_pyro
 	"health"			"100"
 	"armor"				"50"
 	"maxarmor"			"150"
+	"pm_walkspeed"		"300"
 	"ammo_shells"		"12"
 	"ammo_cells"		"120"
 	"ammo_rockets"		"5"
@@ -129,6 +136,7 @@ entityDef player_spy
 	"health"			"90"
 	"armor"				"25"
 	"maxarmor"			"100"
+	"pm_walkspeed"		"300"
 	"ammo_shells"		"24"
 	"ammo_nails"		"50"
 	"max_ammo_shells"	"40"
@@ -146,6 +154,7 @@ entityDef player_engineer
 	"health"			"80"
 	"armor"				"25"
 	"maxarmor"			"50"
+	"pm_walkspeed"		"300"
 	"ammo_shells"		"4"
 	"ammo_nails"		"25"
 	"ammo_cells"		"100"
@@ -156,3 +165,22 @@ entityDef player_engineer
 	"weapon"			"tf_weapon_spanner,tf_weapon_railgun,tf_weapon_supershotgun"
 	"current_weapon"	"1"
 }
+
+entityDef player_civilian
+{
+	"inherit"			"player"
+	"model"				"models/player/civilian/civilian.mdl"
+	"health"			"50"
+	"armor"				"0"
+	"maxarmor"			"0"
+	"pm_walkspeed"		"300"
+	"ammo_shells"		"0"
+	"ammo_nails"		"0"
+	"ammo_cells"		"0"
+	"max_ammo_shells"	"0"
+	"max_ammo_nails"	"0"
+	"max_ammo_cells"	"0"
+	"max_ammo_rockets"	"0"
+	"weapon"			"tf_weapon_umbrella"
+	"current_weapon"	"1"
+}
diff --git a/zpak001.pk3dir/decls/def/weapons/ac.def b/zpak001.pk3dir/decls/def/weapons/ac.def
index e5f814e..a7ea3ec 100644
--- a/zpak001.pk3dir/decls/def/weapons/ac.def
+++ b/zpak001.pk3dir/decls/def/weapons/ac.def
@@ -21,11 +21,11 @@ entityDef tf_weapon_ac
 	"punchAngle"		"-2 0 0"
 
 	"actLoop"			"4"
-	"actHolster"		"6"
-	"actDraw"			"5"
-	"actFireStart"		"2"
-	"actFireStop"		"3"
-	"actIdle"			"0,1"
+	"act_holster"		"6"
+	"act_draw"			"5"
+	"act_fireStart"		"2"
+	"act_fireStop"		"3"
+	"act_idle"			"0,1"
 
 	"snd_fireStart"	"Weapon_Minigun.WindUp"
 	"snd_fireLoop"	"Weapon_Minigun.Fire"
diff --git a/zpak001.pk3dir/decls/def/weapons/autorifle.def b/zpak001.pk3dir/decls/def/weapons/autorifle.def
index 84df891..7880621 100644
--- a/zpak001.pk3dir/decls/def/weapons/autorifle.def
+++ b/zpak001.pk3dir/decls/def/weapons/autorifle.def
@@ -21,10 +21,10 @@ entityDef tf_weapon_autorifle
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"6"
-	"actHolster"		"8"
-	"actDraw"			"7"
-	"actIdle"			"5"
+	"act_fire"			"6"
+	"act_holster"		"8"
+	"act_draw"			"7"
+	"act_idle"			"5"
 
 	"snd_fire"		"Weapon_SMG.Single"
 	"snd_empty"		"Weapon_SMG.ClipEmpty"
diff --git a/zpak001.pk3dir/decls/def/weapons/axe.def b/zpak001.pk3dir/decls/def/weapons/axe.def
index 21b7d41..8949007 100644
--- a/zpak001.pk3dir/decls/def/weapons/axe.def
+++ b/zpak001.pk3dir/decls/def/weapons/axe.def
@@ -24,11 +24,11 @@ entityDef tf_weapon_axe
 	"meleeRateMiss"		"0.5"
 	"meleeRateHit"		"0.5"
 
-	"actIdle"			"0"
-	"actDraw"			"1"
-	"actHolster"		"2"
-	"actMeleeMiss"		"4,5,7"
-	"actMeleeHit"		"3,6,8"
+	"act_idle"			"0"
+	"act_draw"			"1"
+	"act_holster"		"2"
+	"act_fireFailed"		"4,5,7"
+	"act_fire"		"3,6,8"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
diff --git a/zpak001.pk3dir/decls/def/weapons/flamethrower.def b/zpak001.pk3dir/decls/def/weapons/flamethrower.def
index 3b94cfa..9bf1bbb 100644
--- a/zpak001.pk3dir/decls/def/weapons/flamethrower.def
+++ b/zpak001.pk3dir/decls/def/weapons/flamethrower.def
@@ -18,10 +18,10 @@ entityDef tf_weapon_flamethrower
 	"ammoType"			"ammo_cells"
 	"ammoRequired"		"1"
 
-	"actFire"			"5,6,7,8"
-	"actHolster"		"10"
-	"actDraw"			"9"
-	"actIdle"			"0,1"
+	"act_fire"			"5,6,7,8"
+	"act_holster"		"10"
+	"act_draw"			"9"
+	"act_idle"			"0,1"
 
 	"snd_fire"		"Weapon_FlameThrower.Fire"
 	"snd_empty"		"Weapon_Pistol.ClipEmpty"
@@ -38,7 +38,7 @@ entityDef fireInfo_tfFlameThrower
 	"ammoPerShot" 		"2"
 	"fireRate" 			".2"
 	"punchAngle"		"-2 0 0"
-	"actFire"			"5,6"
+	"act_fire"			"5,6"
 	"model_flash"		"sprites/muzzleflash2.spr"
 }
 
diff --git a/zpak001.pk3dir/decls/def/weapons/gl.def b/zpak001.pk3dir/decls/def/weapons/gl.def
index fc02385..f17a1b8 100644
--- a/zpak001.pk3dir/decls/def/weapons/gl.def
+++ b/zpak001.pk3dir/decls/def/weapons/gl.def
@@ -21,13 +21,13 @@ entityDef tf_weapon_gl
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"2"
-	"actHolster"		"10"
-	"actReloadStart"	"4"
-	"actReload"			"4"
-	"actReloadEnd"		"5"
-	"actDraw"			"8"
-	"actIdle"			"0"
+	"act_fire"			"2"
+	"act_holster"		"10"
+	"act_reloadStart"	"4"
+	"act_reload"			"4"
+	"act_reloadEnd"		"5"
+	"act_draw"			"8"
+	"act_idle"			"0"
 
 	"snd_fire"		"Weapon_GrenadeLauncher.Single"
 	"snd_empty"		"Weapon_Pistol.ClipEmpty"
diff --git a/zpak001.pk3dir/decls/def/weapons/ic.def b/zpak001.pk3dir/decls/def/weapons/ic.def
index db416b1..bd679e4 100644
--- a/zpak001.pk3dir/decls/def/weapons/ic.def
+++ b/zpak001.pk3dir/decls/def/weapons/ic.def
@@ -20,16 +20,16 @@ entityDef tf_weapon_ic
 	"ammoPerShot"		"1"
 	"punchAngle"		"-4 0 0"
 
-	"actIdle"			"0,1"
-	"actIdleEmpty"		"10,11"
-	"actDraw"			"4"
-	"actDrawEmpty"		"6"
-	"actHolster"		"3"
-	"actHolsterEmpty"	"5"
-	"actReloadStart"	"7"
-	"actReload"			"8"
-	"actReloadEnd"		"9"
-	"actFire"			"2"
+	"act_idle"			"0,1"
+	"act_idleEmpty"		"10,11"
+	"act_draw"			"4"
+	"act_drawEmpty"		"6"
+	"act_holster"		"3"
+	"act_holsterEmpty"	"5"
+	"act_reloadStart"	"7"
+	"act_reload"			"8"
+	"act_reloadEnd"		"9"
+	"act_fire"			"2"
 
 	"snd_fire"		"Weapon_FlameThrower.FireRocket"
 	"snd_empty"		"Weapon_Pistol.ClipEmpty"
diff --git a/zpak001.pk3dir/decls/def/weapons/knife.def b/zpak001.pk3dir/decls/def/weapons/knife.def
index fdee64e..0e0b5af 100644
--- a/zpak001.pk3dir/decls/def/weapons/knife.def
+++ b/zpak001.pk3dir/decls/def/weapons/knife.def
@@ -24,11 +24,11 @@ entityDef tf_weapon_knife
 	"meleeRateMiss"		"0.35"
 	"meleeRateHit"		"0.35"
 
-	"actIdle"			"0,1"
-	"actDraw"			"4"
-	"actHolster"		"5"
-	"actMeleeMiss"		"2"
-	"actMeleeHit"		"3"
+	"act_idle"			"0,1"
+	"act_draw"			"4"
+	"act_holster"		"5"
+	"act_fireFailed"		"2"
+	"act_fire"		"3"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
diff --git a/zpak001.pk3dir/decls/def/weapons/medikit.def b/zpak001.pk3dir/decls/def/weapons/medikit.def
index 2482133..fa02a96 100644
--- a/zpak001.pk3dir/decls/def/weapons/medikit.def
+++ b/zpak001.pk3dir/decls/def/weapons/medikit.def
@@ -24,11 +24,11 @@ entityDef tf_weapon_medikit
 	"meleeRateMiss"		"0.35"
 	"meleeRateHit"		"0.35"
 
-	"actIdle"			"0,1"
-	"actDraw"			"5"
-	"actHolster"		"4"
-	"actMeleeMiss"		"3"
-	"actMeleeHit"		"2"
+	"act_idle"			"0,1"
+	"act_draw"			"5"
+	"act_holster"		"4"
+	"act_fireFailed"		"3"
+	"act_fire"		"2"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
diff --git a/zpak001.pk3dir/decls/def/weapons/ng.def b/zpak001.pk3dir/decls/def/weapons/ng.def
index 2da287e..4346bb0 100644
--- a/zpak001.pk3dir/decls/def/weapons/ng.def
+++ b/zpak001.pk3dir/decls/def/weapons/ng.def
@@ -19,9 +19,9 @@ entityDef tf_weapon_ng
 	"ammoType"			"ammo_nails"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
-	"actIdle"			"0,1"
-	"actDraw"			"4"
-	"actFire"			"5,6,7"
+	"act_idle"			"0,1"
+	"act_draw"			"4"
+	"act_fire"			"5,6,7"
 	"snd_fire"			"Weapon_NailGun.Single"
 	"snd_empty"			"Weapon_NailGun.ClipEmpty"
 
diff --git a/zpak001.pk3dir/decls/def/weapons/pl.def b/zpak001.pk3dir/decls/def/weapons/pl.def
index 1b7a25e..52ba078 100644
--- a/zpak001.pk3dir/decls/def/weapons/pl.def
+++ b/zpak001.pk3dir/decls/def/weapons/pl.def
@@ -22,13 +22,13 @@ entityDef tf_weapon_pl
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"3"
-	"actHolster"		"11"
-	"actReloadStart"	"6"
-	"actReload"			"6"
-	"actReloadEnd"		"7"
-	"actDraw"			"9"
-	"actIdle"			"1"
+	"act_fire"			"3"
+	"act_holster"		"11"
+	"act_reloadStart"	"6"
+	"act_reload"			"6"
+	"act_reloadEnd"		"7"
+	"act_draw"			"9"
+	"act_idle"			"1"
 
 	"snd_fire"		"Weapon_StickyBombLauncher.Single"
 	"snd_empty"		"Weapon_Pistol.ClipEmpty"
diff --git a/zpak001.pk3dir/decls/def/weapons/railgun.def b/zpak001.pk3dir/decls/def/weapons/railgun.def
index a8ae886..3988367 100644
--- a/zpak001.pk3dir/decls/def/weapons/railgun.def
+++ b/zpak001.pk3dir/decls/def/weapons/railgun.def
@@ -21,11 +21,11 @@ entityDef tf_weapon_railgun
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"1"
+	"act_fire"			"1"
 //	"actAltFire"		"1"
-	"actHolster"		"3"
-	"actDraw"			"2"
-	"actIdle"			"0"
+	"act_holster"		"3"
+	"act_draw"			"2"
+	"act_idle"			"0"
 
 	"snd_fire"		"Weapon_Railgun.Single"
 	"snd_altfire"	"Weapon_Railgun.WindUp"
diff --git a/zpak001.pk3dir/decls/def/weapons/rpg.def b/zpak001.pk3dir/decls/def/weapons/rpg.def
index 9bd5c85..55656a3 100644
--- a/zpak001.pk3dir/decls/def/weapons/rpg.def
+++ b/zpak001.pk3dir/decls/def/weapons/rpg.def
@@ -20,16 +20,16 @@ entityDef tf_weapon_rpg
 	"inv_ammo_rockets"	"1"
 	"fireRate"			"2.5"
 
-	"actIdle"			"0,1"
-	"actIdleEmpty"		"10,11"
-	"actDraw"			"4"
-	"actDrawEmpty"		"6"
-	"actHolster"		"3"
-	"actHolsterEmpty"	"5"
-	"actReloadStart"	"7"
-	"actReload"			"8"
-	"actReloadEnd"		"9"
-	"actFire"			"2"
+	"act_idle"			"0,1"
+	"act_idleEmpty"		"10,11"
+	"act_draw"			"4"
+	"act_drawEmpty"		"6"
+	"act_holster"		"3"
+	"act_holsterEmpty"	"5"
+	"act_reloadStart"	"7"
+	"act_reload"			"8"
+	"act_reloadEnd"		"9"
+	"act_fire"			"2"
 	"snd_fire"			"Weapon_RPG.Single"
 	"snd_empty"			"Weapon_Pistol.ClipEmpty"
 
diff --git a/zpak001.pk3dir/decls/def/weapons/shotgun.def b/zpak001.pk3dir/decls/def/weapons/shotgun.def
index c73c670..bfbd3b0 100644
--- a/zpak001.pk3dir/decls/def/weapons/shotgun.def
+++ b/zpak001.pk3dir/decls/def/weapons/shotgun.def
@@ -20,13 +20,13 @@ entityDef tf_weapon_shotgun
 	"ammoRequired"		"1"
 	"clipSize"			"8"
 
-	"actFire"			"1"
-	"actHolster"		"7"
-	"actReloadStart"	"5"
-	"actReload"			"3"
-	"actReloadEnd"		"4"
-	"actDraw"			"6"
-	"actIdle"			"0,8,9"
+	"act_fire"			"1"
+	"act_holster"		"7"
+	"act_reloadStart"	"5"
+	"act_reload"			"3"
+	"act_reloadEnd"		"4"
+	"act_draw"			"6"
+	"act_idle"			"0,8,9"
 
 	//TODO Fast Reload
 
diff --git a/zpak001.pk3dir/decls/def/weapons/sniperrifle.def b/zpak001.pk3dir/decls/def/weapons/sniperrifle.def
index 012f25f..08e7521 100644
--- a/zpak001.pk3dir/decls/def/weapons/sniperrifle.def
+++ b/zpak001.pk3dir/decls/def/weapons/sniperrifle.def
@@ -21,10 +21,10 @@ entityDef tf_weapon_sniperrifle
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"6"
-	"actHolster"		"8"
-	"actDraw"			"7"
-	"actIdle"			"5"
+	"act_fire"			"6"
+	"act_holster"		"8"
+	"act_draw"			"7"
+	"act_idle"			"5"
 
 	"snd_fire"		"Weapon_SniperRifle.Single"
 	"snd_empty"		"Weapon_SniperRifle.ClipEmpty"
diff --git a/zpak001.pk3dir/decls/def/weapons/spanner.def b/zpak001.pk3dir/decls/def/weapons/spanner.def
index 404acc1..3347134 100644
--- a/zpak001.pk3dir/decls/def/weapons/spanner.def
+++ b/zpak001.pk3dir/decls/def/weapons/spanner.def
@@ -22,11 +22,11 @@ entityDef tf_weapon_spanner
 	"punchAngle"		"0 0 0"
 	"silent_fire"		"1"
 
-	"actIdle"			"0"
-	"actDraw"			"4"
-	"actHolster"		"5"
-	"actMeleeMiss"		"1,2"
-	"actMeleeHit"		"3"
+	"act_idle"			"0"
+	"act_draw"			"4"
+	"act_holster"		"5"
+	"act_fireFailed"		"1,2"
+	"act_fire"		"3"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
diff --git a/zpak001.pk3dir/decls/def/weapons/superng.def b/zpak001.pk3dir/decls/def/weapons/superng.def
index f9746f6..c68eed2 100644
--- a/zpak001.pk3dir/decls/def/weapons/superng.def
+++ b/zpak001.pk3dir/decls/def/weapons/superng.def
@@ -18,9 +18,9 @@ entityDef tf_weapon_superng
 	"inv_ammo_nails"	"50"
 	"ammoType"			"ammo_nails"
 	"ammoRequired"		"1"
-	"actIdle"			"0,1"
-	"actDraw"			"4"
-	"actFire"			"5,6,7"
+	"act_idle"			"0,1"
+	"act_draw"			"4"
+	"act_fire"			"5,6,7"
 
 	"snd_fire"			"Weapon_SyringeGun.Single"
 	"snd_empty"			"Weapon_SyringeGun.ClipEmpty"
diff --git a/zpak001.pk3dir/decls/def/weapons/supershotgun.def b/zpak001.pk3dir/decls/def/weapons/supershotgun.def
index dca149f..9c46f70 100644
--- a/zpak001.pk3dir/decls/def/weapons/supershotgun.def
+++ b/zpak001.pk3dir/decls/def/weapons/supershotgun.def
@@ -20,13 +20,13 @@ entityDef tf_weapon_supershotgun
 	"ammoRequired"		"2"
 	"clipSize"			"16"
 
-	"actFire"			"1"
-	"actHolster"		"7"
-	"actReloadStart"	"5"
-	"actReload"			"3"
-	"actReloadEnd"		"4"
-	"actDraw"			"6"
-	"actIdle"			"0,8,9"
+	"act_fire"			"1"
+	"act_holster"		"7"
+	"act_reloadStart"	"5"
+	"act_reload"			"3"
+	"act_reloadEnd"		"4"
+	"act_draw"			"6"
+	"act_idle"			"0,8,9"
 
 	"snd_fire"			"Weapon_SuperShotgun.Single"
 	"snd_empty"			"Weapon_Shotgun.Empty"
diff --git a/zpak001.pk3dir/decls/def/weapons/tranq.def b/zpak001.pk3dir/decls/def/weapons/tranq.def
index 8341062..f27b051 100644
--- a/zpak001.pk3dir/decls/def/weapons/tranq.def
+++ b/zpak001.pk3dir/decls/def/weapons/tranq.def
@@ -20,15 +20,15 @@ entityDef tf_weapon_tranq
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"3"
+	"act_fire"			"3"
 	"actAltFire"		"3"
-	"actFireLast"		"4"
+	"act_fireLast"		"4"
 	"actAltFireLast"	"4"
-	"actHolster"		"8"
-	"actReload"			"6"
-	"actReloadEmpty"	"5"
-	"actDraw"			"7"
-	"actIdle"			"0,1,2"
+	"act_holster"		"8"
+	"act_reload"			"6"
+	"act_reloadEmpty"	"5"
+	"act_draw"			"7"
+	"act_idle"			"0,1,2"
 	"view_geomset"		"geomset 2 2\n"
 
 	"snd_fire"		"Weapon_Tranq.Single"
diff --git a/zpak001.pk3dir/decls/def/weapons/umbrella.def b/zpak001.pk3dir/decls/def/weapons/umbrella.def
index 60c5168..9dca7b7 100644
--- a/zpak001.pk3dir/decls/def/weapons/umbrella.def
+++ b/zpak001.pk3dir/decls/def/weapons/umbrella.def
@@ -24,11 +24,11 @@ entityDef tf_weapon_umbrella
 	"meleeRateMiss"		"0.5"
 	"meleeRateHit"		"0.5"
 
-	"actIdle"			"0"
-	"actDraw"			"1"
-	"actHolster"		"2"
-	"actMeleeMiss"		"4,5,7"
-	"actMeleeHit"		"3,6,8"
+	"act_idle"			"0"
+	"act_draw"			"1"
+	"act_holster"		"2"
+	"act_fireFailed"		"4,5,7"
+	"act_fire"		"3,6,8"
 
 	// HLWeapon specific
 	"hudSlot"		"0"