WeaponDef fixes, some WIP

zpak001.pk3dir/decls/def/weapons.def

@@ -6,6 +6,7 @@
 #include "weapons/crossbow.def"
 #include "weapons/crowbar.def"
 #include "weapons/flamethrower.def"
+#include "weapons/handgrenade.def"
 #include "weapons/medkit.def"
 #include "weapons/rpg.def"
 #include "weapons/satchel.def"

zpak001.pk3dir/decls/def/weapons/ap9.def

@@ -20,12 +20,12 @@ entityDef weapon_th_ap9
 	"ammoType" 			"ammo_ap9"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"3,4,5"
+	"act_fire"			"3,4,5"
 	"actAltFire"		"3,4,5"
-//	"actHolster"		""
+//	"act_holster"		""
-	"actReload"			"1"
+	"act_reload"			"1"
-	"actDraw"			"2"
+	"act_draw"			"2"
-	"actIdle"			"0"
+	"act_idle"			"0"
 
 	"snd_fire"			"weapon_ap9.fire"
 	"snd_altfire"		"weapon_ap9.fire"

zpak001.pk3dir/decls/def/weapons/chaingun.def

@@ -17,17 +17,17 @@ entityDef weapon_th_chaingun
 	"inv_name"			"Chain Gun"
 	"clipSize"			"100"
 	"ammoType" 			"ammo_9mm"
-	"ammoRequired" 		"1"
+	"ammoRequired" 		"2"
 	"ammoPerShot"		"2"
-	"punchAngle"		"-2 0 0"
 
 	"actLoop"			"4"
-	"actHolster"		"6"
+	"act_holster"		"6"
-	"actDraw"			"5"
+	"act_draw"			"5"
-	"actFireStart"		"2"
+	"act_fireStart"		"2"
-	"actFireStop"		"3"
+	"act_fireStop"		"3"
-	"actIdle"			"0,1"
+	"act_idle"			"0,1"
-	"actReload"			"6+5"
+	"act_reload			"6"
+	"act_reload2"		"5"
 
 	"snd_fireStart"	"weapon_chaingun.start"
 	"snd_fireLoop"	"weapon_chaingun.loop"
@@ -45,8 +45,8 @@ entityDef projectile_chaingun
 {
 	"inherit"		"projectile_bullet_base"
 	"damage"		"skill:plr_chaingun"
-	"hitscans"		"12"
+	"hitscans"		"4"
-	"spread"		"0.08716 0.08716"
+	"spread"		"0.095 0.085"
 }
 
 entityDef fireInfo_chaingun

zpak001.pk3dir/decls/def/weapons/chainsaw.def

@@ -15,23 +15,20 @@ entityDef weapon_th_chainsaw
 	"snd_draw"			"weapon_chainsaw.draw"
 
 	// weapon specific
-	"def_melee"			"damage_chainsaw"
+	"def_fireInfo"		"fireInfo_chainsaw"
-	"def_meleeAlt"		"damage_chainsawAlt"
+	"def_altFireInfo"	"fireInfo_altChainsaw"
-	"melee_distance"	"48"
+	"testDistance"		"48"
 	"inv_name"			"Chainsaw"
 	"ammoType"			""
 	"ammoRequired"		"0"
 
-	"actIdle"			"0"
+	"act_idle"			"0"
-	"actDraw"			"5+1"
+	"act_draw"			"5"
-	"actHolster"		"6"
+	"act_draw1"			"1"
+	"act_holster"		"6"
 
-	// TODO Remove when acts and
+	"snd_hit"			"weapon_chainsaw.hit"
-	// melee keys in fireInfo work
+	"snd_failed"		"weapon_chainsaw.miss"
-	"meleeRateMiss"		"0.5"
-	"meleeRateHit"		"0.25"
-	"actMeleeMiss"		"3,4"
-	"actMeleeHit"		"3,4"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
@@ -43,39 +40,40 @@ entityDef weapon_th_chainsaw
 
 // TODO fx_spark.main
 
-entityDef damage_chainsaw
+entityDef projectile_chainsaw
 {
+	"spawnclass"			"NSProjectile"
 	"damage"				"skill:plr_chainsaw"
-//	"kickDir"			"-1 0 0"
+	"is_bullet"				"1"
-//	"knockback"			"20"
+	"decal_impact"			"Impact.Shot"
-//	"push"				"20000"
+	"detonate_on_world" 	"1"
-	"gib"				"1"
-
-	"meleeRateMiss"		"0.5"
-	"meleeRateHit"		"0.25"
-
-	"actMeleeMiss"		"3,4"
-	"actMeleeHit"		"3,4"
-
-	"snd_hit"			"weapon_chainsaw.hit"
-	"snd_miss"			"weapon_chainsaw.miss"
 }
 
-
+entityDef projectile_chainsawSwing
-entityDef damage_chainsawSwing
 {
+	"spawnclass"			"NSProjectile"
 	"damage"				"skill:plr_chainsaw_swing"
-//	"kickDir"			"-1 0 0"
+	"is_bullet"				"1"
-//	"knockback"			"20"
+	"decal_impact"			"Impact.Shot"
-//	"push"				"20000"
+	"detonate_on_world" 	"1"
-	"gib"				"1"
+}
-
+
-	"meleeRateMiss"		"1.2"
+entityDef fireInfo_chainsaw
-	"meleeRateHit"		"0.75"
+{
-
+	"def_onFire"		"projectile_chainsaw"
-	"actMeleeMiss"		"2"
+
-	"actMeleeHit"		"2"
+	"failRate"			"0.8"
-
+	"fireRate"			"0.1"
-	"snd_hit"			"weapon_chainsaw.hit"
+
-	"snd_miss"			"weapon_chainsaw.miss"
+	"act_fire"			"3,4"
+}
+
+entityDef fireInfo_altChainsaw
+{
+	"def_onFire"		"projectile_chainsawSwing"
+
+	"failRate"			"1.2"
+	"fireRate"			"0.1"
+
+	"act_fire"			"2"
 }

zpak001.pk3dir/decls/def/weapons/flamethrower.def

@@ -19,10 +19,10 @@ entityDef weapon_egon
 	"ammoType"			"ammo_gas"
 	"ammoRequired"		"1"
 
-	"actFire"			"5,6,7,8"
+	"act_fire"			"5,6,7,8"
-	"actHolster"		"10"
+	"act_holster"		"10"
-	"actDraw"			"9"
+	"act_draw"			"9"
-	"actIdle"			"0,1"
+	"act_idle"			"0,1"
 
 	"snd_fire"		"weapon_egon.fire"
 	"snd_empty"		"weapon.empty"
@@ -33,29 +33,25 @@ entityDef weapon_egon
 	"weight"		"30"
 }
 
-entityDef fireInfo_flamethrower
-{
-	"def_onFire"		"projectile_fire"
-	"ammoPerShot" 		"1"
-	"fireRate" 			"0.2"
-	"punchAngle"		"-2 0 0"
-	"actFire"			"5,6"
-	"model_flash"		"sprites/muzzleflash2.spr"
-}
-
 // TODO sprite animation and ignite
 
 entityDef projectile_fire
 {
 	"spawnclass"			"NSProjectile"
 	"model"					"sprites/fthrow.spr"
+	"rendermode"			"$RM_ADDITIVE"
+	"renderamt"				"255"
+	"rendercolor"			"255 255 255"
+	"animStartFrame"		"0"
+	"animEndFrame"			"15"
+	"animEndRemoves"		"1"
+	"animFrameRate"			"10"
 	"offset"				"30 8 0"
 	"def_damage"			"fireDirect"
 
-	"velocity"				"300"
+	"velocity"				"200"
 	"angular_velocity"		"0 0 0"
-	"fuse"					"1"
+	"detonate_on_fuse"		"1"
-	"detonate_on_fuse"		"0"
 	"detonate_on_death"		"1"
 	"detonate_on_world"		"1"
 	"detonate_on_actor"		"1"
@@ -85,5 +81,8 @@ entityDef damage_fireAfterburn
 entityDef fireInfo_flamethrower
 {
 	"def_onFire"		"projectile_fire"
-	"punchAngle"	"-10 0 0"
+	"ammoPerShot" 		"1"
+	"fireRate" 			"0.2"
+	"act_fire"			"5,6"
+	"model_flash"		"sprites/muzzleflash2.spr"
 }

zpak001.pk3dir/decls/def/weapons/medkit.def

@@ -23,11 +23,11 @@ entityDef weapon_th_medkit
 	"meleeRateMiss"		"0.35"
 	"meleeRateHit"		"0.35"
 
-	"actIdle"			"0,1"
+	"act_idle"			"0,1"
-	"actDraw"			"5"
+	"act_draw"			"5"
-	"actHolster"		"4"
+	"act_holster"		"4"
-	"actMeleeMiss"		"3"
+	"act_fireFailed"		"3"
-	"actMeleeHit"		"2"
+	"act_fire"		"2"
 
 	// HLWeapon specific
 	"hudSlot"		"4"

zpak001.pk3dir/decls/def/weapons/rpg.def

@@ -21,14 +21,14 @@ entityDef weapon_rpg
 	"inv_ammo_rocket"	"1"
 	"fireRate"			"2.5"
 
-	"actIdle"			"0,1"
+	"act_idle"			"0,1"
-	"actIdleEmpty"		"8,9"
+	"act_idleEmpty"		"8,9"
-	"actHolster"		"4"
+	"act_holster"		"4"
-	"actHolsterEmpty"	"6"
+	"act_holsterEmpty"	"6"
-	"actDraw"		"5"
+	"act_draw"		"5"
-	"actDrawEmpty"	"7"
+	"act_drawEmpty"	"7"
-	"actFire"		"3"
+	"act_fire"		"3"
-	"actReload"		"2"
+	"act_reload"		"2"
 
 	// HLWeapon specific
 	"hudSlot"		"3"

zpak001.pk3dir/decls/def/weapons/shovel.def

@@ -13,22 +13,24 @@ entityDef weapon_th_shovel
 	"snd_respawn"		"item.respawn"
 
 	// weapon specific
-	"def_melee"			"damage_shovel"
+	"def_onFire"		"projectile_shovel"
-	"melee_distance"	"48"
+	"testDistance"		"-48"
 	"inv_name"			"Shovel"
-	"ammoType"			""
 	"ammoRequired"		"0"
 	"silent_fire"		"1"
-	"punchAngle"		"5 0 0"
+	"punchAngle"		"-3 0 0"
 
-	"meleeRateMiss"		"0.85"
+	"failRate"			"0.85"
-	"meleeRateHit"		"0.85"
+	"fireRate"			"0.85"
+	"snd_hit"			"weapon_shovel.hit"
+	"snd_hitFlesh"		"weapon_shovel.hitbody"
+	"snd_failed"		"weapon_shovel.miss"
 
-	"actIdle"			"0"
+	"act_idle"			"0"
-	"actDraw"			"1"
+	"act_draw"			"1"
-	"actHolster"		"2"
+	"act_holster"		"2"
-	"actMeleeMiss"		"4,5,7"
+	"act_fireFailed"	"4,5,7"
-	"actMeleeHit"		"3,6,8"
+	"act_fire"			"3,6,8"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
@@ -38,15 +40,11 @@ entityDef weapon_th_shovel
 	"ammoIcon"		"none"
 }
 
-entityDef damage_crowbar
+entityDef projectile_shovel
 {
+	"spawnclass"			"NSProjectile"
 	"damage"				"skill:plr_shovel"
-//	"kickDir"			"-1 0 0"
+	"is_bullet"				"1"
-//	"knockback"			"20"
+	"decal_impact"			"Impact.Shot"
-//	"push"				"20000"
+	"detonate_on_world" 	"1"
-	"gib"				"1"
-
-	"snd_hit"			"weapon_shovel.hit"
-	"snd_hitFlesh"		"weapon_shovel.hitbody"
-	"snd_miss"			"weapon_shovel.miss"
 }

zpak001.pk3dir/decls/def/weapons/silencer.def

@@ -22,18 +22,16 @@ entityDef weapon_9mmhandgun
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"3"
+	"act_fire"			"3"
-	"actAltFire"		"3"
+	"act_fireLast"		"4"
-	"actFireLast"		"4"
+	"act_holster"		"8"
-	"actAltFireLast"	"4"
+	"act_reload"		"6"
-	"actHolster"		"8"
+	"act_reloadEmpty"	"5"
-	"actReload"			"6"
+	"act_draw"			"7"
-	"actReloadEmpty"	"5"
+	"act_idle"			"0,1,2"
-	"actDraw"			"7"
-	"actIdle"			"0,1,2"
 	"altMode"			"1"
-	"actModeOn"			"8+7"
+	"act_modeOn"		"8"
-	"actModeOff"		"9"
+	"act_modeOff"		"9"
 
 	"snd_empty"			"weapon_glock.empty"
 

zpak001.pk3dir/decls/def/weapons/sniper.def

@@ -14,17 +14,20 @@ entityDef weapon_einar1
 
 	// weapon specific
 	"def_fireInfo"		"fireInfo_sniper"
+	"def_altFireInfo"	"fireInfo_altSniper"
 	"inv_name"			"Sniper Rifle"
 	"clipSize"			"5"
 	"ammoType" 			"ammo_sniper"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
 
-	"actFire"			"2"
+	"altMode"			"1"
-	"actHolster"		"4"
+	"act_fire"			"2"
-	"actDraw"			"3"
+	"act_holster"		"4"
-	"actIdle"			"0,5"
+	"act_draw"			"3"
-	"actReload"			"4+3"
+	"act_idle"			"0,5"
+	"act_reload"			"4"
+	"act_reload2"		"3"
 
 	"snd_fire"		"weapon_sniper.fire"
 	"snd_reload"	"weapon_sniper.reload"
@@ -34,13 +37,6 @@ entityDef weapon_einar1
 	"hudSlot"				"2"
 	"hudSlotPos"			"3"
 	"weight"				"20"
-
-	"zoomDuration"			"0"
-	"zoomFov"				"20"
-	"zoomFovStep"			"5"
-	"zoomFovMin"			"5"
-	"zoomFovMax"			"40"
-//	"zoomColor"				"0 0.2 0" TODO
 }
 
 entityDef projectile_sniperBullet
@@ -55,8 +51,20 @@ entityDef fireInfo_sniper
 	"def_onFire"		"projectile_sniperBullet"
 	"ammoType"			"ammo_sniper"
 	"fireRate"			"0.1"
-//		"fireRate"			"0.5" TODO when zoomed in
 	"punchAngle"		"-20 0 0"
 	"model_flash"		"sprites/muzzleflash1.spr"
 }
 
+entityDef fireInfo_altSniper
+{
+	"def_onFire"		"projectile_sniperBullet"
+	"ammoType"			"ammo_sniper"
+	"fireRate"			"0.8"
+	"punchAngle"		"-5 0 0"
+	"model_flash"		"sprites/muzzleflash1.spr"
+
+	"zoomFov"			"20"
+//	"zoomColor"			"0 0.2 0" TODO
+//	"zoomCrosshair"		"weapon_th_sniper.zoom" TODO
+}
+

zpak001.pk3dir/decls/def/weapons/sniper2.def

@@ -14,17 +14,18 @@ entityDef weapon_th_sniper
 
 	// weapon specific
 	"def_fireInfo"		"fireInfo_sniper"
+	"def_altFireInfo"	"fireInfo_altSniper"
 	"inv_name"			"Heckler & Koch G36"
 	"clipSize"			"5"
 	"ammoType" 			"ammo_sniper"
 	"ammoRequired"		"1"
 	"ammoPerShot"		"1"
 
-	"actFire"			"3"
+	"altMode"			"1"
-//	"actHolster"		""
+	"act_fire"			"3"
-	"actDraw"			"2"
+	"act_draw"			"2"
-	"actIdle"			"0"
+	"act_idle"			"0"
-	"actReload"			"1"
+	"act_reload"			"1"
 
 	"snd_fire"		"weapon_sniper.fire"
 	"snd_empty"		"weapon.empty"
@@ -33,11 +34,4 @@ entityDef weapon_th_sniper
 	"hudSlot"				"2"
 	"hudSlotPos"			"3"
 	"weight"				"20"
-
-	"zoomDuration"			"0"
-	"zoomFov"				"20"
-	"zoomFovStep"			"5"
-	"zoomFovMin"			"5"
-	"zoomFovMax"			"40"
-//	"zoomColor"				"0.2 0 0" TODO
 }

zpak001.pk3dir/decls/def/weapons/spanner.def

@@ -13,22 +13,23 @@ entityDef weapon_th_spanner
 	"snd_respawn"		"item.respawn"
 
 	// weapon specific
-	"def_melee"			"damage_spanner"
+	"def_onFire"		"projectile_spanner"
-	"melee_distance"	"32"
+	"testDistance"		"-32"
 	"inv_name"			"Wrench"
 	"ammoRequired"		"0"
-	"ammoPerShot"		"0"
-	"punchAngle"		"0 0 0"
 	"silent_fire"		"1"
 
-	"meleeRateMiss"		"0.375"
+	"failRate"			"0.375"
-	"meleeRateHit"		"0.2"
+	"fireRate"			"0.2"
+	"snd_hit"			"weapon_spanner.hit"
+	"snd_hitFlesh"		"weapon_spanner.hitbody"
+	"snd_failed"		"weapon_spanner.miss"
 
-	"actIdle"			"0"
+	"act_idle"			"0"
-	"actDraw"			"4"
+	"act_draw"			"4"
-	"actHolster"		"5"
+	"act_holster"		"5"
-	"actMeleeMiss"		"1,2"
+	"act_fireFailed"	"1,2"
-	"actMeleeHit"		"1,2"
+	"act_fire"			"1,2"
 
 	// HLWeapon specific
 	"hudSlot"		"0"
@@ -38,11 +39,11 @@ entityDef weapon_th_spanner
 	"ammoIcon"		"none"
 }
 
-entityDef damage_spanner
+entityDef projectile_spanner
 {
+	"spawnclass"			"NSProjectile"
 	"damage"				"skill:plr_spanner"
-
+	"is_bullet"				"1"
-	"snd_hit"			"weapon_spanner.hit"
+	"decal_impact"			"Impact.Shot"
-	"snd_hitFlesh"		"weapon_spanner.hitbody"
+	"detonate_on_world" 	"1"
-	"snd_miss"			"weapon_spanner.miss"
 }

zpak001.pk3dir/decls/def/weapons/taurus.def

@@ -21,12 +21,12 @@ entityDef weapon_th_taurus
 	"ammoPerShot"		"1"
 	"punchAngle"		"-2 0 0"
 
-	"actFire"			"3,4,5"
+	"act_fire"			"3,4,5"
-	"actFireLast"		"6"
+	"act_fireLast"		"6"
-	"actHolster"		"10"
+	"act_holster"		"10"
-	"actReload"			"7,8"
+	"act_reload"			"7,8"
-	"actDraw"			"9"
+	"act_draw"			"9"
-	"actIdle"			"0,1,2"
+	"act_idle"			"0,1,2"
 
 	"snd_fire"			"weapon_taurus.fire"
 	"snd_empty"			"weapon.empty"

zpak001.pk3dir/decls/def/weapons/tnt.def

@@ -1,81 +1,29 @@
-
+entityDef weapon_tnt
-entityDef weapon_handgrenade
 {
-	"editor_color"		".3 .3 1"
+	"inherit"			"weapon_handgrenade"
-	"editor_mins"		"-16 -16 -16"
-	"editor_maxs"		"16 16 16"
-	"editor_usage"		"TNT"
-	"editor_rotatable"	"1"
-
-	"spawnclass"		"HLWeapon"
 	"model"				"models/w_tnt.mdl"
 	"model_view"		"models/v_tnt.mdl"
 	"snd_acquire"		"weapon.pickup"
 	"snd_respawn"		"item.respawn"
 
 	"inv_name"			"TNT"
-	"inv_weapon"			"weapon_handgrenade"
+	"inv_weapon"		"weapon_tnt"
-	"inv_ammo_handgrenade"	"5"
+	"def_onRelease"		"projectile_tnt"
-	"def_onRelease"			"projectile_handgrenade"
-	"def_explode_inhand"	"env_handgrenade_explodeinhand"
-	"def_damage_inhand"		"damage_handgrenadeSplash"
-	"ammoType"				"ammo_handgrenade"
-	"ammoRequired"			"1"
-	"silent_fire"			"1"
-	"primed_fuse"			"4"
-	"removeOnEmpty"			"1"
-
-	"actIdle"		"0,1"
-	"actDraw"		"7"
-	"actHolster"	"6"
-	"actFire"		"2"
-	"actRelease"	"3,4,5"
 
 	// HLWeapon specific
 	"hudSlot"			"4"
 	"hudSlotPos"		"0"
 	"weight"			"5"
 	"crosshair"			"none"
+	"ammoIcon"			"weapon_handgrenade.ammo"
+	"icon"				"weapon_handgrenade.weapon"
+	"iconSelected"		"weapon_handgrenade.weapon_s"
 }
 
-entityDef projectile_handgrenade
+entityDef projectile_tnt
 {
-	"spawnclass"		"NSProjectile"
+	"inherit"			"projectile_handgrenade"
 	"model"				"models/w_tnt.mdl"
-	"frame"				"1"
-	"fuse"				"4"
-	"detonate_on_fuse"	"1"
-	"bounce"			"1"
-	"angular_velocity"	"-350 0 0"
-	"velocity"			"300 0 40"
-	"model_detonate"	"fx_explosion.main"
-	"snd_explode"		"fx.explosion"
-	"snd_bounce"		"weapon_handgrenade.bounce"
-	"decal_detonate"	"ExplosionScorch"
-
-	"def_damage"		"damage_handgrenadeDirect"
-	"def_splash_damage"	"damage_handgrenadeSplash"
-}
-
-entityDef damage_handgrenadeDirect
-{
-	"damage"	"1"
-}
-
-entityDef damage_handgrenadeSplash
-{
-	"damage"	"skill:plr_hand_grenade"
-	"radius"	"250"
-}
-
-entityDef env_handgrenade_explodeinhand
-{
-	"spawnclass"				"idAnimatedEntity"
-	"model"						"grenadeExplosion.prt"
 }
 
 
-entityDef weapon_tnt
-{
-	"inherit"		"weapon_handgrenade"
-}

zpak001.pk3dir/decls/sound/weapons_hunger.sndshd

@@ -51,7 +51,7 @@ weapon_chainsaw.idle
 
 weapon_chainsaw.miss
 {
-	sample sh/chainsaw_idle2.wav
+	sample weapons/chainsaw_attack.wav
 }
 
 weapon_chainsaw.start
@@ -81,16 +81,15 @@ weapon_shovel.hit
 {
 	alerts
 	shakes 0.2
-	pitch 0.5
+	pitch 0.7
-	sample weapons/cbar_hit1.wav
+	sample debris/metal6.wav
-	sample weapons/cbar_hit2.wav
 }
 
 weapon_shovel.hitbody
 {
 	alerts
 	shakes 0.2
-	pitch 0.5
+	pitch 0.8
 	sample weapons/cbar_hitbod1.wav
 	sample weapons/cbar_hitbod2.wav
 	sample weapons/cbar_hitbod3.wav