From 5d0172f45d86b664d76df64e62ae8944331bd4b9 Mon Sep 17 00:00:00 2001 From: Xylemon Date: Sat, 1 Feb 2025 02:59:59 -0800 Subject: [PATCH] Updates for latest Nuclide. --- zpak001.pk3dir/decls/def/items.def | 6 +++--- zpak001.pk3dir/decls/def/monsters/babykelly.def | 2 +- zpak001.pk3dir/decls/def/monsters/barney.def | 2 +- zpak001.pk3dir/decls/def/monsters/boss.def | 2 +- zpak001.pk3dir/decls/def/monsters/bull.def | 2 +- .../decls/def/monsters/bullchicken_th.def | 2 +- zpak001.pk3dir/decls/def/monsters/chicken.def | 2 +- .../decls/def/monsters/cyberfranklin.def | 2 +- zpak001.pk3dir/decls/def/monsters/dog.def | 2 +- zpak001.pk3dir/decls/def/monsters/einar_civ.def | 2 +- .../decls/def/monsters/einar_civ_dead.def | 2 +- .../decls/def/monsters/einar_civ_sitting.def | 2 +- .../decls/def/monsters/einar_hand.def | 2 +- .../decls/def/monsters/frankenstein.def | 2 +- .../decls/def/monsters/headcrab_th.def | 2 +- zpak001.pk3dir/decls/def/monsters/megasquid.def | 2 +- zpak001.pk3dir/decls/def/monsters/sheriff.def | 2 +- zpak001.pk3dir/decls/def/monsters/skeleton.def | 2 +- zpak001.pk3dir/decls/def/monsters/zombie.def | 2 +- zpak001.pk3dir/decls/def/weapons/chaingun.def | 17 ++++++++++++----- zpak001.pk3dir/decls/def/weapons/chainsaw.def | 4 ++-- .../decls/def/weapons/flamethrower.def | 2 +- zpak001.pk3dir/decls/def/weapons/rpg.def | 2 +- zpak001.pk3dir/decls/def/weapons/shovel.def | 2 +- zpak001.pk3dir/decls/def/weapons/silencer.def | 2 +- zpak001.pk3dir/decls/def/weapons/spanner.def | 14 +++++++------- zpak001.pk3dir/decls/def/weapons/tnt.def | 2 -- zpak001.pk3dir/scripts/maptweaks.txt | 1 + 28 files changed, 47 insertions(+), 41 deletions(-) diff --git a/zpak001.pk3dir/decls/def/items.def b/zpak001.pk3dir/decls/def/items.def index 1e1c95e..52a190d 100644 --- a/zpak001.pk3dir/decls/def/items.def +++ b/zpak001.pk3dir/decls/def/items.def @@ -1,6 +1,6 @@ entityDef item_battery { - "spawnclass" "NSItem" + "spawnclass" "ncItem" "model" "models/w_battery.mdl" "mins" "-16 -16 0" "maxs" "16 16 16" @@ -12,7 +12,7 @@ entityDef item_battery entityDef item_healthkit { - "spawnclass" "NSItem" + "spawnclass" "ncItem" "model" "models/w_medkit.mdl" "mins" "-16 -16 0" "maxs" "16 16 16" @@ -23,7 +23,7 @@ entityDef item_healthkit entityDef item_suit { - "spawnclass" "NSItem" + "spawnclass" "ncItem" "model" "models/w_suit.mdl" "mins" "-16 -16 0" "maxs" "16 16 16" diff --git a/zpak001.pk3dir/decls/def/monsters/babykelly.def b/zpak001.pk3dir/decls/def/monsters/babykelly.def index b88fa14..73d373b 100644 --- a/zpak001.pk3dir/decls/def/monsters/babykelly.def +++ b/zpak001.pk3dir/decls/def/monsters/babykelly.def @@ -1,6 +1,6 @@ entityDef monster_th_babykelly { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_alien_slave" "netname" "Small Skeleton" "model" "models/babykelly.mdl" diff --git a/zpak001.pk3dir/decls/def/monsters/barney.def b/zpak001.pk3dir/decls/def/monsters/barney.def index 5af9a2a..eae9727 100644 --- a/zpak001.pk3dir/decls/def/monsters/barney.def +++ b/zpak001.pk3dir/decls/def/monsters/barney.def @@ -1,6 +1,6 @@ entityDef monster_barney { - "spawnclass" "NSTalkMonster" + "spawnclass" "ncTalkMonster" "model" "models/barney.mdl" "netname" "Barney" "health" "skill:barney_health" diff --git a/zpak001.pk3dir/decls/def/monsters/boss.def b/zpak001.pk3dir/decls/def/monsters/boss.def index 8a59f80..1473d32 100644 --- a/zpak001.pk3dir/decls/def/monsters/boss.def +++ b/zpak001.pk3dir/decls/def/monsters/boss.def @@ -1,6 +1,6 @@ entityDef monster_th_boss { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "model" "models/boss.mdl" "netname" "Boss (Rockwood)" "health" "skill:boss_health" diff --git a/zpak001.pk3dir/decls/def/monsters/bull.def b/zpak001.pk3dir/decls/def/monsters/bull.def index 38008e1..bfcd0e4 100644 --- a/zpak001.pk3dir/decls/def/monsters/bull.def +++ b/zpak001.pk3dir/decls/def/monsters/bull.def @@ -1,6 +1,6 @@ entityDef monster_th_zombiebull { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_houndeye" "netname" "Zombie Bull" "health" "skill:zombiebull_health" diff --git a/zpak001.pk3dir/decls/def/monsters/bullchicken_th.def b/zpak001.pk3dir/decls/def/monsters/bullchicken_th.def index 908de68..fbdccae 100644 --- a/zpak001.pk3dir/decls/def/monsters/bullchicken_th.def +++ b/zpak001.pk3dir/decls/def/monsters/bullchicken_th.def @@ -1,6 +1,6 @@ entityDef monster_th_bullchicken { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_bullchicken" "netname" "Zombie Bullchicken" "propdata" "actor_human" diff --git a/zpak001.pk3dir/decls/def/monsters/chicken.def b/zpak001.pk3dir/decls/def/monsters/chicken.def index 5d5b5ce..9a1b224 100644 --- a/zpak001.pk3dir/decls/def/monsters/chicken.def +++ b/zpak001.pk3dir/decls/def/monsters/chicken.def @@ -1,6 +1,6 @@ entityDef monster_th_chicken { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_headcrab" "netname" "Zombie Chicken" "model" "models/chicken.mdl" diff --git a/zpak001.pk3dir/decls/def/monsters/cyberfranklin.def b/zpak001.pk3dir/decls/def/monsters/cyberfranklin.def index 1c0cf93..7a136f0 100644 --- a/zpak001.pk3dir/decls/def/monsters/cyberfranklin.def +++ b/zpak001.pk3dir/decls/def/monsters/cyberfranklin.def @@ -1,6 +1,6 @@ entityDef monster_th_cyberfranklin { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_alien_grunt" "model" "models/franklin2.mdl" "netname" "Cyber Dr. Franklin" diff --git a/zpak001.pk3dir/decls/def/monsters/dog.def b/zpak001.pk3dir/decls/def/monsters/dog.def index e6202d5..0d7aa99 100644 --- a/zpak001.pk3dir/decls/def/monsters/dog.def +++ b/zpak001.pk3dir/decls/def/monsters/dog.def @@ -1,6 +1,6 @@ entityDef monster_th_dog { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_houndeye" "netname" "Zombie Dog" "propdata" "actor_human" diff --git a/zpak001.pk3dir/decls/def/monsters/einar_civ.def b/zpak001.pk3dir/decls/def/monsters/einar_civ.def index 6529e8b..410c371 100644 --- a/zpak001.pk3dir/decls/def/monsters/einar_civ.def +++ b/zpak001.pk3dir/decls/def/monsters/einar_civ.def @@ -1,6 +1,6 @@ entityDef einar_civ { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_scientist" "netname" "Civilian" "model" "models/civ.mdl" diff --git a/zpak001.pk3dir/decls/def/monsters/einar_civ_dead.def b/zpak001.pk3dir/decls/def/monsters/einar_civ_dead.def index c4fc1a1..0667fc8 100644 --- a/zpak001.pk3dir/decls/def/monsters/einar_civ_dead.def +++ b/zpak001.pk3dir/decls/def/monsters/einar_civ_dead.def @@ -1,6 +1,6 @@ entityDef einar_civ_dead { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_scientist_dead" "netname" "Civilian (Dead)" "model" "models/civ.mdl" diff --git a/zpak001.pk3dir/decls/def/monsters/einar_civ_sitting.def b/zpak001.pk3dir/decls/def/monsters/einar_civ_sitting.def index e6422ed..be6da02 100644 --- a/zpak001.pk3dir/decls/def/monsters/einar_civ_sitting.def +++ b/zpak001.pk3dir/decls/def/monsters/einar_civ_sitting.def @@ -1,6 +1,6 @@ entityDef einar_civ_sit { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_sitting_scientist" "netname" "Civilian (Sitting)" "model" "models/civ.mdl" diff --git a/zpak001.pk3dir/decls/def/monsters/einar_hand.def b/zpak001.pk3dir/decls/def/monsters/einar_hand.def index 500ba9c..a3d93a5 100644 --- a/zpak001.pk3dir/decls/def/monsters/einar_hand.def +++ b/zpak001.pk3dir/decls/def/monsters/einar_hand.def @@ -1,6 +1,6 @@ entityDef einar_hand { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_headcrab" "netname" "Zombie Hand" "model" "models/thehand.mdl" diff --git a/zpak001.pk3dir/decls/def/monsters/frankenstein.def b/zpak001.pk3dir/decls/def/monsters/frankenstein.def index eeca881..41385cf 100644 --- a/zpak001.pk3dir/decls/def/monsters/frankenstein.def +++ b/zpak001.pk3dir/decls/def/monsters/frankenstein.def @@ -1,6 +1,6 @@ entityDef monster_th_frankenstein { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_alien_grunt" "netname" "Frankenstein's Monster" "propdata" "actor_human" diff --git a/zpak001.pk3dir/decls/def/monsters/headcrab_th.def b/zpak001.pk3dir/decls/def/monsters/headcrab_th.def index c7d631d..5fbc325 100644 --- a/zpak001.pk3dir/decls/def/monsters/headcrab_th.def +++ b/zpak001.pk3dir/decls/def/monsters/headcrab_th.def @@ -1,6 +1,6 @@ entityDef monster_th_headcrab { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_headcrab" "netname" "Zombie Heacrab" "propdata" "actor_human" diff --git a/zpak001.pk3dir/decls/def/monsters/megasquid.def b/zpak001.pk3dir/decls/def/monsters/megasquid.def index 126571a..cf59ade 100644 --- a/zpak001.pk3dir/decls/def/monsters/megasquid.def +++ b/zpak001.pk3dir/decls/def/monsters/megasquid.def @@ -1,6 +1,6 @@ entityDef monster_th_megasquid { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_bullsquid" "netname" "Mega Bullsquid" "model" "models/megasquid.mdl" diff --git a/zpak001.pk3dir/decls/def/monsters/sheriff.def b/zpak001.pk3dir/decls/def/monsters/sheriff.def index 22a5d0c..a65319f 100644 --- a/zpak001.pk3dir/decls/def/monsters/sheriff.def +++ b/zpak001.pk3dir/decls/def/monsters/sheriff.def @@ -1,6 +1,6 @@ entityDef monster_th_sheriff { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_gman" "netname" "Sheriff Chester Rockwood" "team" "2" diff --git a/zpak001.pk3dir/decls/def/monsters/skeleton.def b/zpak001.pk3dir/decls/def/monsters/skeleton.def index ad06348..25347ab 100644 --- a/zpak001.pk3dir/decls/def/monsters/skeleton.def +++ b/zpak001.pk3dir/decls/def/monsters/skeleton.def @@ -1,6 +1,6 @@ entityDef monster_th_skeleton { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "inherit" "monster_alien_slave" "netname" "Skeleton" } \ No newline at end of file diff --git a/zpak001.pk3dir/decls/def/monsters/zombie.def b/zpak001.pk3dir/decls/def/monsters/zombie.def index 4dcb4fd..58bb802 100644 --- a/zpak001.pk3dir/decls/def/monsters/zombie.def +++ b/zpak001.pk3dir/decls/def/monsters/zombie.def @@ -1,6 +1,6 @@ entityDef monster_zombie { - "spawnclass" "NSMonster" + "spawnclass" "ncMonster" "model" "models/zombie.mdl" "netname" "Zombie" "health" "skill:zombie_health" diff --git a/zpak001.pk3dir/decls/def/weapons/chaingun.def b/zpak001.pk3dir/decls/def/weapons/chaingun.def index 8e31e2b..8547103 100644 --- a/zpak001.pk3dir/decls/def/weapons/chaingun.def +++ b/zpak001.pk3dir/decls/def/weapons/chaingun.def @@ -1,3 +1,11 @@ +#define THAC_IDLE 0 +#define THAC_IDLE2 1 +#define THAC_SPIN_START 2 +#define THAC_SPIN_STOP 3 +#define THAC_SPIN_FIRE 4 +#define THAC_DRAW 5 +#define THAC_HOLSTER 6 + entityDef weapon_th_chaingun { "editor_color" ".3 .3 1" @@ -20,14 +28,13 @@ entityDef weapon_th_chaingun "ammoRequired" "2" "ammoPerShot" "2" - "actLoop" "4" - "act_holster" "6" - "act_draw" "5" "act_fireStart" "2" + "act_loop" "4" "act_fireStop" "3" - "act_idle" "0,1" "act_reload "6" - "act_reload2" "5" + "act_reloadEnd" "5" + "act_idle" "0,1" + "act_draw" "5" "snd_fireStart" "weapon_chaingun.start" "snd_fireLoop" "weapon_chaingun.loop" diff --git a/zpak001.pk3dir/decls/def/weapons/chainsaw.def b/zpak001.pk3dir/decls/def/weapons/chainsaw.def index fa54b4d..5dab041 100644 --- a/zpak001.pk3dir/decls/def/weapons/chainsaw.def +++ b/zpak001.pk3dir/decls/def/weapons/chainsaw.def @@ -42,7 +42,7 @@ entityDef weapon_th_chainsaw entityDef projectile_chainsaw { - "spawnclass" "NSProjectile" + "spawnclass" "ncProjectile" "damage" "skill:plr_chainsaw" "is_bullet" "1" "decal_impact" "Impact.Shot" @@ -51,7 +51,7 @@ entityDef projectile_chainsaw entityDef projectile_chainsawSwing { - "spawnclass" "NSProjectile" + "spawnclass" "ncProjectile" "damage" "skill:plr_chainsaw_swing" "is_bullet" "1" "decal_impact" "Impact.Shot" diff --git a/zpak001.pk3dir/decls/def/weapons/flamethrower.def b/zpak001.pk3dir/decls/def/weapons/flamethrower.def index ec0d997..42459cf 100644 --- a/zpak001.pk3dir/decls/def/weapons/flamethrower.def +++ b/zpak001.pk3dir/decls/def/weapons/flamethrower.def @@ -37,7 +37,7 @@ entityDef weapon_egon entityDef projectile_fire { - "spawnclass" "NSProjectile" + "spawnclass" "ncProjectile" "model" "sprites/fthrow.spr" "rendermode" "$RM_ADDITIVE" "renderamt" "255" diff --git a/zpak001.pk3dir/decls/def/weapons/rpg.def b/zpak001.pk3dir/decls/def/weapons/rpg.def index 209281f..5bd97e3 100644 --- a/zpak001.pk3dir/decls/def/weapons/rpg.def +++ b/zpak001.pk3dir/decls/def/weapons/rpg.def @@ -39,7 +39,7 @@ entityDef weapon_rpg entityDef projectile_rocket { - "spawnclass" "NSProjectile" + "spawnclass" "ncProjectile" "model" "models/rpgrocket.mdl" "def_damage" "damage_rocketDirect" diff --git a/zpak001.pk3dir/decls/def/weapons/shovel.def b/zpak001.pk3dir/decls/def/weapons/shovel.def index 13baeb4..eca1b5d 100644 --- a/zpak001.pk3dir/decls/def/weapons/shovel.def +++ b/zpak001.pk3dir/decls/def/weapons/shovel.def @@ -42,7 +42,7 @@ entityDef weapon_th_shovel entityDef projectile_shovel { - "spawnclass" "NSProjectile" + "spawnclass" "ncProjectile" "damage" "skill:plr_shovel" "is_bullet" "1" "decal_impact" "Impact.Shot" diff --git a/zpak001.pk3dir/decls/def/weapons/silencer.def b/zpak001.pk3dir/decls/def/weapons/silencer.def index 27524c7..0391a02 100644 --- a/zpak001.pk3dir/decls/def/weapons/silencer.def +++ b/zpak001.pk3dir/decls/def/weapons/silencer.def @@ -66,7 +66,7 @@ entityDef fireInfo_glock entityDef fireInfo_altGlock { - "snd_fire" "weapon_glock.fire" + "snd_fire" "Weapon_Glock.Single" "def_onFire" "projectile_glock_fast" "fireRate" "0.2" "model_flash" "sprites/muzzleflash2.spr" diff --git a/zpak001.pk3dir/decls/def/weapons/spanner.def b/zpak001.pk3dir/decls/def/weapons/spanner.def index 92fd5e2..de67f22 100644 --- a/zpak001.pk3dir/decls/def/weapons/spanner.def +++ b/zpak001.pk3dir/decls/def/weapons/spanner.def @@ -19,12 +19,6 @@ entityDef weapon_th_spanner "ammoRequired" "0" "silent_fire" "1" - "failRate" "0.375" - "fireRate" "0.2" - "snd_hit" "weapon_spanner.hit" - "snd_hitFlesh" "weapon_spanner.hitbody" - "snd_failed" "weapon_spanner.miss" - "act_idle" "0" "act_draw" "4" "act_holster" "5" @@ -41,9 +35,15 @@ entityDef weapon_th_spanner entityDef projectile_spanner { - "spawnclass" "NSProjectile" + "spawnclass" "ncProjectile" "damage" "skill:plr_spanner" "is_bullet" "1" + "range" "32" "decal_impact" "Impact.Shot" "detonate_on_world" "1" + "failRate" "0.375" + "fireRate" "0.2" + "snd_hitWorld" "weapon_spanner.hit" + "snd_hitBody" "weapon_spanner.hitbody" + "snd_fireFailed" "weapon_spanner.miss" } \ No newline at end of file diff --git a/zpak001.pk3dir/decls/def/weapons/tnt.def b/zpak001.pk3dir/decls/def/weapons/tnt.def index 295e220..5937900 100644 --- a/zpak001.pk3dir/decls/def/weapons/tnt.def +++ b/zpak001.pk3dir/decls/def/weapons/tnt.def @@ -3,8 +3,6 @@ entityDef weapon_tnt "inherit" "weapon_handgrenade" "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_tnt" diff --git a/zpak001.pk3dir/scripts/maptweaks.txt b/zpak001.pk3dir/scripts/maptweaks.txt index bc40f09..823666b 100644 --- a/zpak001.pk3dir/scripts/maptweaks.txt +++ b/zpak001.pk3dir/scripts/maptweaks.txt @@ -2,6 +2,7 @@ enhanced_overrides { when-serverinfo *bspversion equals 30 replace item_healthkit ammo_medkit + replace weapon_handgrenade weapon_tnt } npc_overrides