From 6daa02a0b8fda4c548912c71a1b32055c4afa382 Mon Sep 17 00:00:00 2001
From: Xylemon <xylemon@posteo.net>
Date: Sat, 1 Feb 2025 03:23:08 -0800
Subject: [PATCH] Chainsaw updates, more decl stuff for latest Nuclide

---
 zpak001.pk3dir/decls/def/weapons.def          |  1 +
 zpak001.pk3dir/decls/def/weapons/base.def     |  8 ++++
 zpak001.pk3dir/decls/def/weapons/chainsaw.def | 43 ++++++++++---------
 3 files changed, 31 insertions(+), 21 deletions(-)
 create mode 100644 zpak001.pk3dir/decls/def/weapons/base.def

diff --git a/zpak001.pk3dir/decls/def/weapons.def b/zpak001.pk3dir/decls/def/weapons.def
index 9d25a2e..cc331a5 100644
--- a/zpak001.pk3dir/decls/def/weapons.def
+++ b/zpak001.pk3dir/decls/def/weapons.def
@@ -1,3 +1,4 @@
+#include "weapons/base.def"
 #include "weapons/357.def"
 #include "weapons/9mmAR.def"
 #include "weapons/9mmhandgun.def"
diff --git a/zpak001.pk3dir/decls/def/weapons/base.def b/zpak001.pk3dir/decls/def/weapons/base.def
new file mode 100644
index 0000000..3063edd
--- /dev/null
+++ b/zpak001.pk3dir/decls/def/weapons/base.def
@@ -0,0 +1,8 @@
+entityDef weapon_base
+{
+	"spawnclass"		"ncWeapon"
+	"mins"				"-16 -16 0"
+	"maxs"				"16 16 16"
+	"snd_acquire"		"weapon.pickup"
+	"snd_respawn"		"item.respawn"
+}
diff --git a/zpak001.pk3dir/decls/def/weapons/chainsaw.def b/zpak001.pk3dir/decls/def/weapons/chainsaw.def
index 44c7dad..966ff5b 100644
--- a/zpak001.pk3dir/decls/def/weapons/chainsaw.def
+++ b/zpak001.pk3dir/decls/def/weapons/chainsaw.def
@@ -1,3 +1,6 @@
+#define CHAINSAW_IDLE_OFF 0
+#define CHAINSAW_IDLE_ON 1
+
 entityDef weapon_chainsaw
 {
 	"editor_color"		".3 .3 1"
@@ -6,11 +9,9 @@ entityDef weapon_chainsaw
 	"editor_usage"		"Chainsaw"
 	"editor_rotatable"	"1"
 
-	"spawnclass"		"HLWeapon"
+	"inherit"			"weapon_base"
 	"model"				"models/p_saw.mdl"
 	"model_view"		"models/v_chainsaw.mdl"
-	"snd_acquire"		"weapon.pickup"
-	"snd_respawn"		"item.respawn"
 	"snd_idle"			"weapon_chainsaw.idle"
 	"snd_start"			"weapon_chainsaw.start"
 	"snd_stop"			"weapon_chainsaw.stop"
@@ -18,21 +19,16 @@ entityDef weapon_chainsaw
 	// weapon specific
 	"def_melee"			"damage_chainsaw"
 	"melee_distance"	"32"
-// TODO need velocity push on player (32 units each hit)
 	"inv_name"			"Chainsaw"
 	"ammoType"			""
-	"ammoRequired"		"0"
-	"clipSize"			"0"
-
-	"meleeRateMiss"		"0.5"
-	"meleeRateHit"		"0.25"
+	"silent_fire"		"0"
 
 	"act_idle"			"5,6"
 	"act_draw"			"3"
 	"act_holster"		"4"
-	"actMeleeStart"		"0"
-	"act_fireFailed"		"1"
-	"act_fire"		"1"
+	"act_fireStart"		"0"
+	"act_fireFailed"	"1"
+	"act_fire"			"1"
 	"actMeleeStop"		"2"
 
 	// HLWeapon specific
@@ -45,14 +41,19 @@ entityDef weapon_chainsaw
 
 // TODO sh_chainspark and fx_spark.main
 
-entityDef damage_chainsaw
+entityDef projectile_chainsaw
 {
-	"damage"			"skill:plr_chainsaw"
-//	"kickDir"			"-1 0 0"
-//	"knockback"			"20"
-//	"push"				"20000"
-	"gib"				"1"
-
-	"snd_hit"			"weapon_chainsaw.hit"
-	"snd_miss"			"weapon_chainsaw.miss"
+	"spawnclass"			"ncProjectile"
+	"damage"				"skill:plr_chainsaw"
+	"is_bullet"				"1"
+	"range"					"32"
+	"decal_impact"			"Impact.Spark"
+	"detonate_on_world" 	"1"
+	"gib"					"1"
+	"failRate"				"0.5"
+	"fireRate"				"0.25"
+	"knockback"				"-32"
+	"snd_fireFailed"		"Weapon_Machete.miss"
+	"snd_hitBody"			"weapon_chainsaw.hit"
+	"snd_hitWorld"			"weapon_chainsaw.hit"
 }