From 34d7d48967a007638daaa3c3a191640879cc4c1b Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Sun, 11 Aug 2024 13:36:25 -0700 Subject: [PATCH] More and more changes against `Develop` Nuclide. --- src/client/hud.qc | 3 +- src/shared/HLWeapon.qc | 98 ++++++++---------- zpak001.pk3dir/cvar_defaults.cfg | 72 +++++++------ zpak001.pk3dir/{ => decls}/def/ammo.def | 0 zpak001.pk3dir/{ => decls}/def/ammo/357.def | 0 zpak001.pk3dir/{ => decls}/def/ammo/9mmAR.def | 0 .../{ => decls}/def/ammo/9mmbox.def | 0 .../{ => decls}/def/ammo/9mmclip.def | 0 .../{ => decls}/def/ammo/ARgrenades.def | 0 zpak001.pk3dir/{ => decls}/def/ammo/base.def | 0 .../{ => decls}/def/ammo/buckshot.def | 0 .../{ => decls}/def/ammo/crossbow.def | 0 .../{ => decls}/def/ammo/gaussclip.def | 0 .../{ => decls}/def/ammo/rpgclip.def | 0 zpak001.pk3dir/{ => decls}/def/items.def | 0 zpak001.pk3dir/{ => decls}/def/monsters.def | 0 .../def/monsters/alien_controller.def | 0 .../{ => decls}/def/monsters/alien_grunt.def | 0 .../{ => decls}/def/monsters/alien_slave.def | 0 .../{ => decls}/def/monsters/apache.def | 0 .../{ => decls}/def/monsters/babycrab.def | 0 .../{ => decls}/def/monsters/barnacle.def | 0 .../{ => decls}/def/monsters/barney.def | 0 .../{ => decls}/def/monsters/barney_dead.def | 0 .../{ => decls}/def/monsters/bigmomma.def | 0 .../{ => decls}/def/monsters/bloater.def | 0 .../{ => decls}/def/monsters/bullchicken.def | 0 .../{ => decls}/def/monsters/cockroach.def | 0 .../{ => decls}/def/monsters/flyer.def | 0 .../{ => decls}/def/monsters/flyer_flock.def | 0 .../{ => decls}/def/monsters/gargantua.def | 0 .../{ => decls}/def/monsters/gman.def | 0 .../{ => decls}/def/monsters/headcrab.def | 0 .../{ => decls}/def/monsters/hevsuit_dead.def | 0 .../{ => decls}/def/monsters/hgrunt_dead.def | 0 .../{ => decls}/def/monsters/houndeye.def | 0 .../def/monsters/human_assassin.def | 0 .../{ => decls}/def/monsters/human_grunt.def | 0 .../{ => decls}/def/monsters/ichthyosaur.def | 0 .../{ => decls}/def/monsters/leech.def | 0 .../{ => decls}/def/monsters/miniturret.def | 0 .../{ => decls}/def/monsters/nihilanth.def | 0 .../{ => decls}/def/monsters/osprey.def | 0 .../{ => decls}/def/monsters/rat.def | 0 .../{ => decls}/def/monsters/scientist.def | 0 .../def/monsters/scientist_dead.def | 0 .../{ => decls}/def/monsters/sentry.def | 0 .../def/monsters/sitting_scientist.def | 0 .../def/monsters/skeleton_dead.def | 0 .../{ => decls}/def/monsters/snark.def | 0 .../{ => decls}/def/monsters/tentacle.def | 0 .../{ => decls}/def/monsters/tripmine.def | 0 .../{ => decls}/def/monsters/turret.def | 0 .../{ => decls}/def/monsters/zombie.def | 0 zpak001.pk3dir/{ => decls}/def/player.def | 0 .../{ => decls}/def/projectiles.def | 0 zpak001.pk3dir/{ => decls}/def/spawns.def | 0 zpak001.pk3dir/{ => decls}/def/weapons.def | 0 .../{ => decls}/def/weapons/357.def | 0 .../{ => decls}/def/weapons/9mmAR.def | 2 +- .../{ => decls}/def/weapons/9mmhandgun.def | 0 .../{ => decls}/def/weapons/crossbow.def | 0 .../{ => decls}/def/weapons/crowbar.def | 0 .../{ => decls}/def/weapons/egon.def | 9 +- .../{ => decls}/def/weapons/gauss.def | 13 ++- .../{ => decls}/def/weapons/handgrenade.def | 0 .../{ => decls}/def/weapons/hornetgun.def | 0 .../{ => decls}/def/weapons/rpg.def | 0 .../{ => decls}/def/weapons/satchel.def | 0 .../{ => decls}/def/weapons/shotgun.def | 0 .../{ => decls}/def/weapons/snark.def | 0 .../{ => decls}/def/weapons/tripmine.def | 0 zpak001.pk3dir/decls/efx/default.efx | 23 ++++ zpak001.pk3dir/{ => decls}/efx/gs_big1.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_big2.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_big3.efx | 0 .../{ => decls}/efx/gs_bright_l.efx | 0 .../{ => decls}/efx/gs_bright_m.efx | 0 .../{ => decls}/efx/gs_bright_s.efx | 0 .../{ => decls}/efx/gs_cavern_l.efx | 0 .../{ => decls}/efx/gs_cavern_m.efx | 0 .../{ => decls}/efx/gs_cavern_s.efx | 0 .../{ => decls}/efx/gs_chamber_l.efx | 0 .../{ => decls}/efx/gs_chamber_m.efx | 0 .../{ => decls}/efx/gs_chamber_s.efx | 0 .../{ => decls}/efx/gs_concrete_l.efx | 0 .../{ => decls}/efx/gs_concrete_m.efx | 0 .../{ => decls}/efx/gs_concrete_s.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_generic.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_metal_l.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_metal_m.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_metal_s.efx | 0 .../{ => decls}/efx/gs_tunnel_l.efx | 0 .../{ => decls}/efx/gs_tunnel_m.efx | 0 .../{ => decls}/efx/gs_tunnel_s.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_water1.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_water2.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_water3.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_weirdo1.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_weirdo2.efx | 0 zpak001.pk3dir/{ => decls}/efx/gs_weirdo3.efx | 0 .../{ => decls}/sound/damage_bullet.sndshd | 0 .../{ => decls}/sound/footsteps.sndshd | 0 .../{ => decls}/sound/func_breakable.sndshd | 0 .../{ => decls}/sound/func_button.sndshd | 0 .../{ => decls}/sound/func_door.sndshd | 0 .../sound/func_door_rotating.sndshd | 0 .../{ => decls}/sound/func_plat.sndshd | 0 .../{ => decls}/sound/func_pushable.sndshd | 0 .../{ => decls}/sound/func_tracktrain.sndshd | 0 .../{ => decls}/sound/func_train.sndshd | 0 .../{ => decls}/sound/fx_valve.sndshd | 0 .../{ => decls}/sound/impacts.sndshd | 0 .../{ => decls}/sound/items_valve.sndshd | 0 .../{ => decls}/sound/modelevent_shell.sndshd | 0 .../{ => decls}/sound/monsters_valve.sndshd | 0 .../{ => decls}/sound/player.sndshd | 0 .../{ => decls}/sound/weapons_valve.sndshd | 21 +++- zpak001.pk3dir/default.cfg | 2 +- zpak001.pk3dir/gfx/blue_default.png | Bin 347 -> 0 bytes 120 files changed, 142 insertions(+), 101 deletions(-) rename zpak001.pk3dir/{ => decls}/def/ammo.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/357.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/9mmAR.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/9mmbox.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/9mmclip.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/ARgrenades.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/base.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/buckshot.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/crossbow.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/gaussclip.def (100%) rename zpak001.pk3dir/{ => decls}/def/ammo/rpgclip.def (100%) rename zpak001.pk3dir/{ => decls}/def/items.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/alien_controller.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/alien_grunt.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/alien_slave.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/apache.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/babycrab.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/barnacle.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/barney.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/barney_dead.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/bigmomma.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/bloater.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/bullchicken.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/cockroach.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/flyer.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/flyer_flock.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/gargantua.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/gman.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/headcrab.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/hevsuit_dead.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/hgrunt_dead.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/houndeye.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/human_assassin.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/human_grunt.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/ichthyosaur.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/leech.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/miniturret.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/nihilanth.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/osprey.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/rat.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/scientist.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/scientist_dead.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/sentry.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/sitting_scientist.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/skeleton_dead.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/snark.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/tentacle.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/tripmine.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/turret.def (100%) rename zpak001.pk3dir/{ => decls}/def/monsters/zombie.def (100%) rename zpak001.pk3dir/{ => decls}/def/player.def (100%) rename zpak001.pk3dir/{ => decls}/def/projectiles.def (100%) rename zpak001.pk3dir/{ => decls}/def/spawns.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/357.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/9mmAR.def (98%) rename zpak001.pk3dir/{ => decls}/def/weapons/9mmhandgun.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/crossbow.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/crowbar.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/egon.def (82%) rename zpak001.pk3dir/{ => decls}/def/weapons/gauss.def (82%) rename zpak001.pk3dir/{ => decls}/def/weapons/handgrenade.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/hornetgun.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/rpg.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/satchel.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/shotgun.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/snark.def (100%) rename zpak001.pk3dir/{ => decls}/def/weapons/tripmine.def (100%) create mode 100644 zpak001.pk3dir/decls/efx/default.efx rename zpak001.pk3dir/{ => decls}/efx/gs_big1.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_big2.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_big3.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_bright_l.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_bright_m.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_bright_s.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_cavern_l.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_cavern_m.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_cavern_s.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_chamber_l.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_chamber_m.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_chamber_s.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_concrete_l.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_concrete_m.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_concrete_s.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_generic.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_metal_l.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_metal_m.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_metal_s.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_tunnel_l.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_tunnel_m.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_tunnel_s.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_water1.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_water2.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_water3.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_weirdo1.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_weirdo2.efx (100%) rename zpak001.pk3dir/{ => decls}/efx/gs_weirdo3.efx (100%) rename zpak001.pk3dir/{ => decls}/sound/damage_bullet.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/footsteps.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/func_breakable.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/func_button.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/func_door.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/func_door_rotating.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/func_plat.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/func_pushable.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/func_tracktrain.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/func_train.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/fx_valve.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/impacts.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/items_valve.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/modelevent_shell.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/monsters_valve.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/player.sndshd (100%) rename zpak001.pk3dir/{ => decls}/sound/weapons_valve.sndshd (96%) delete mode 100755 zpak001.pk3dir/gfx/blue_default.png diff --git a/src/client/hud.qc b/src/client/hud.qc index b1205a4..cb4f9dc 100644 --- a/src/client/hud.qc +++ b/src/client/hud.qc @@ -488,8 +488,9 @@ HUD_Draw(void) #endif /* little point in not drawing these, even if you don't have a suit */ - if (pl.m_activeWeapon) + if (pl.m_activeWeapon) { pl.m_activeWeapon.UpdateGUI(); + } HUD_DrawDamageIndicator(); HUD_DrawWeaponSelect(); diff --git a/src/shared/HLWeapon.qc b/src/shared/HLWeapon.qc index bef775f..f5db9ee 100644 --- a/src/shared/HLWeapon.qc +++ b/src/shared/HLWeapon.qc @@ -34,34 +34,44 @@ For example, `ammoIcon` being set to `weapon_foobar.ammo` will look up `ammo` in class HLWeapon:NSWeapon { +public: void HLWeapon(void); - bool m_bAltModeSwitch; virtual void AddedToInventory(void); - virtual void PrimaryAttack(void); - virtual void SecondaryAttack(void); #ifdef SERVER virtual void SpawnKey(string, string); #endif +#ifdef CLIENT + virtual void UpdateGUI(void); + nonvirtual void DrawLaser(void); +#endif + +private: #ifdef CLIENT int m_iHudSlot; int m_iHudSlotPos; - string m_ammoIcon; string m_ammo2Icon; string m_crossHair; NSWeapon m_nextWeapon; - virtual void UpdateGUI(void); - nonvirtual void DrawLaser(void); #endif + bool m_bAltModeLaser; }; void HLWeapon::HLWeapon(void) { - +#ifdef CLIENT + m_iHudSlot = 0i; + m_iHudSlotPos = 0i; + m_ammoIcon = __NULL__; + m_ammo2Icon = __NULL__; + m_crossHair = __NULL__; + m_nextWeapon = __NULL__; +#endif + m_bAltModeLaser = false; } #ifdef SERVER @@ -69,55 +79,12 @@ void HLWeapon::SpawnKey(string keyName, string setValue) { switch (keyName) { - case "altLaser": - case "ammoIcon": - case "crosshair": - case "hudSlot": - case "hudSlotPos": - break; default: super::SpawnKey(keyName, setValue); } } #endif -void -HLWeapon::PrimaryAttack(void) -{ - if (m_bAltModeSwitch == true) { - if (CanFire() == false) { - return; - } - - //m_iMode = 1 - m_iMode; - } - - if (m_iMode) { - super::SecondaryAttack(); - return; - } - - super::PrimaryAttack(); -} - -void -HLWeapon::SecondaryAttack(void) -{ - if (m_bAltModeSwitch == true) { - if (CanFire() == false) { - return; - } - - m_iMode = 1 - m_iMode; - SetAttackNext(1.0); - SetIdleNext(1.0f); - return; - } - - super::SecondaryAttack(); -} - - void HLWeapon::AddedToInventory(void) { @@ -158,7 +125,7 @@ HLWeapon::AddedToInventory(void) m_iHudSlotPos = GetDefInt("hudSlotPos"); #endif - m_bAltModeSwitch = GetDefBool("altLaser"); + m_bAltModeLaser = GetDefBool("altLaser"); } #ifdef CLIENT @@ -176,10 +143,37 @@ HLWeapon::UpdateGUI(void) HLSprite_Draw_RGBA(m_ammoIcon, ammoPos, g_hud_color, pSeatLocal->m_flAmmo2Alpha, true); } - if (m_iMode) { + if (m_iMode && m_bAltModeLaser) { DrawLaser(); } +#if 1 + vector vSize = [540,16]; + vector vMainPos; + float progress; + + progress = (m_flOverheating / m_fiOverheatLength); + + if (progress > 1.0) { + progress = 1.0f; + } + + if (m_fiOverheatLength && progress > 0) { + vMainPos = g_hudmins; + vMainPos[0] += (g_hudres[0] / 2) - (vSize[0] / 2); + vMainPos[1] += (g_hudres[1] / 2) - (vSize[1] / 2); + + vector vBar = vSize; + vBar[0] = 538 * progress; + vBar[1] = 14; + drawfill(vMainPos + [1,1], vBar, g_hud_color, 1.0, DRAWFLAG_ADDITIVE); + drawfill(vMainPos, [vSize[0], 1], g_hud_color, 1.0f); // Top + drawfill([vMainPos[0], vMainPos[1] + vSize[1]], [vSize[0], 1], g_hud_color, 1.0f); // Bottom + drawfill(vMainPos, [1, vSize[1]], g_hud_color, 1.0f); // Left + drawfill([vMainPos[0] + vSize[0], vMainPos[1]], [1, vSize[1] + 1], g_hud_color, 1.0f); // Right + } +#endif + if (m_bAmmoRequired == false) return; diff --git a/zpak001.pk3dir/cvar_defaults.cfg b/zpak001.pk3dir/cvar_defaults.cfg index 33b0b9b..1357e9e 100644 --- a/zpak001.pk3dir/cvar_defaults.cfg +++ b/zpak001.pk3dir/cvar_defaults.cfg @@ -4,41 +4,40 @@ set ai_debugNav "0" // Show prints when AI makes decisions regarding navigation. set ai_debugScripts "0" // Show prints when AI interacts with scripted sequences. set ai_runSpeed "320" // Default run speed chosen by AI characters, in units per second. set ai_walkSpeed "150" // Default walk speed chosen by AI characters, in units per second. +set ai_enable "1" // Disable AI behaviour when set. -set bot_aimless -set bot_backspeed -set bot_crouch -set bot_debug -set bot_developer -set bot_dont_shoot -set bot_enable -set bot_fastChat -set bot_forwardspeed -set bot_minClients -set bot_noChat -set bot_pause -set bot_prefix -set bot_prone -set bot_sidespeed -set bot_skill -set bot_walk +set bot_aimless "0" // Bots will not set goals for themselves when set. +set bot_backspeed "133" // Bots desired maximum backwards speed. +set bot_crouch "0" // Bots are all forced to move crouched. +set bot_debug "0" // TODO: needs to be logLevel? +set bot_developer "0" // TODO: remove? +set bot_dont_shoot "0" // Bots never actually shoot. +set bot_enable "1" // Bot support enabled when set. +set bot_fastChat "0" // Bots will chat instantly instead of 'typing'. +set bot_forwardspeed "190" // Bots desired maximum forward speed. +set bot_minClients "-1" // How many player slots are to be filled, -1 is 'untouched'. +set bot_noChat "0" // Bots will no longer communicate when set. +set bot_pause "0" // Bots logic will be paused. +set bot_prefix "" // Bot nickname prefix for newly added bots. +set bot_prone "0" // Bots are all forced to move prone. +set bot_sidespeed "152" // Bots desired maximum strafe speed. +set bot_skill "2" // Bot version of cvar "skill". +set bot_walk "0" // Bots are forced to walk slowly. -set cg_chatEnabled -set cg_damageShake -set cg_hudAspect -set cg_muzzleDLight -set cg_muzzleDLightColor -set cg_viewZSmoothingMax -set cg_viewZSmoothingMin -set cg_viewZSmoothingTime -set cg_viewmodelFlip -set cg_viewmodelFov -set cg_viewmodelLag -set cg_viewmodelOffset -set cg_viewmodelPass -set cg_viewmodelScale - -set chatplug_filter +set cg_chatEnabled "1" // Enable the display of chat messages. +set cg_damageShake "0" // Shake the display upon taking damage. +set cg_hudAspect "0" // Aspect ratio override for the HUD. 1.0 is 1:1 square, 0 is auto. +set cg_muzzleDLight "1" // Enable dlights being spawned from muzzleflashes. +set cg_muzzleDLightColor "1.0 0.45 0.0" // Color of muzzleflash dlights. +set cg_viewZSmoothingMax "16" // Camera vertical-axis smoothing max delta threshold. +set cg_viewZSmoothingMin "1" // Camera vertical-axis smoothing delta threshold. +set cg_viewZSmoothingTime "0.1" // Camera vertical-axis smoothing steps. +set cg_viewmodelFlip "0" // Flip the viewmodel. +set cg_viewmodelFov "90" // Viewmodel field of view. +set cg_viewmodelLag "0" // Viewmodel lag when camera looks around. +set cg_viewmodelOffset "0 0 0" // Viewmodel offset in relative units (forward, right, up) +set cg_viewmodelPass "1" // Renders viewmodel in separate drawpass (no lighting) +set cg_viewmodelScale "1.0" // Viewmodel scale multiplier, affects bob as well. set cl_backspeed "400" // Client's desired backwards speed. set cl_decals "128" @@ -48,10 +47,9 @@ set cl_sidespeed "400" // Client's desired side-step speed. set con_color "255 150 0" // HUD color value, R G B, 0-255 for each channel. -set dev_cornerspeed -set dev_loddistance -set dev_rotspeed -set dev_skyscale +set dev_cornerspeed "0" // Override speed set by path_corner entities. +set dev_loddistance "0" // Override distance at which func_lod entities disappear. +set dev_skyscale "" // Override for the sky_camera room scale. set dsp_soundscapes "1" // Enable the use of sound scapes. diff --git a/zpak001.pk3dir/def/ammo.def b/zpak001.pk3dir/decls/def/ammo.def similarity index 100% rename from zpak001.pk3dir/def/ammo.def rename to zpak001.pk3dir/decls/def/ammo.def diff --git a/zpak001.pk3dir/def/ammo/357.def b/zpak001.pk3dir/decls/def/ammo/357.def similarity index 100% rename from zpak001.pk3dir/def/ammo/357.def rename to zpak001.pk3dir/decls/def/ammo/357.def diff --git a/zpak001.pk3dir/def/ammo/9mmAR.def b/zpak001.pk3dir/decls/def/ammo/9mmAR.def similarity index 100% rename from zpak001.pk3dir/def/ammo/9mmAR.def rename to zpak001.pk3dir/decls/def/ammo/9mmAR.def diff --git a/zpak001.pk3dir/def/ammo/9mmbox.def b/zpak001.pk3dir/decls/def/ammo/9mmbox.def similarity index 100% rename from zpak001.pk3dir/def/ammo/9mmbox.def rename to zpak001.pk3dir/decls/def/ammo/9mmbox.def diff --git a/zpak001.pk3dir/def/ammo/9mmclip.def b/zpak001.pk3dir/decls/def/ammo/9mmclip.def similarity index 100% rename from zpak001.pk3dir/def/ammo/9mmclip.def rename to zpak001.pk3dir/decls/def/ammo/9mmclip.def diff --git a/zpak001.pk3dir/def/ammo/ARgrenades.def b/zpak001.pk3dir/decls/def/ammo/ARgrenades.def similarity index 100% rename from zpak001.pk3dir/def/ammo/ARgrenades.def rename to zpak001.pk3dir/decls/def/ammo/ARgrenades.def diff --git a/zpak001.pk3dir/def/ammo/base.def b/zpak001.pk3dir/decls/def/ammo/base.def similarity index 100% rename from zpak001.pk3dir/def/ammo/base.def rename to zpak001.pk3dir/decls/def/ammo/base.def diff --git a/zpak001.pk3dir/def/ammo/buckshot.def b/zpak001.pk3dir/decls/def/ammo/buckshot.def similarity index 100% rename from zpak001.pk3dir/def/ammo/buckshot.def rename to zpak001.pk3dir/decls/def/ammo/buckshot.def diff --git a/zpak001.pk3dir/def/ammo/crossbow.def b/zpak001.pk3dir/decls/def/ammo/crossbow.def similarity index 100% rename from zpak001.pk3dir/def/ammo/crossbow.def rename to zpak001.pk3dir/decls/def/ammo/crossbow.def diff --git a/zpak001.pk3dir/def/ammo/gaussclip.def b/zpak001.pk3dir/decls/def/ammo/gaussclip.def similarity index 100% rename from zpak001.pk3dir/def/ammo/gaussclip.def rename to zpak001.pk3dir/decls/def/ammo/gaussclip.def diff --git a/zpak001.pk3dir/def/ammo/rpgclip.def b/zpak001.pk3dir/decls/def/ammo/rpgclip.def similarity index 100% rename from zpak001.pk3dir/def/ammo/rpgclip.def rename to zpak001.pk3dir/decls/def/ammo/rpgclip.def diff --git a/zpak001.pk3dir/def/items.def b/zpak001.pk3dir/decls/def/items.def similarity index 100% rename from zpak001.pk3dir/def/items.def rename to zpak001.pk3dir/decls/def/items.def diff --git a/zpak001.pk3dir/def/monsters.def b/zpak001.pk3dir/decls/def/monsters.def similarity index 100% rename from zpak001.pk3dir/def/monsters.def rename to zpak001.pk3dir/decls/def/monsters.def diff --git a/zpak001.pk3dir/def/monsters/alien_controller.def b/zpak001.pk3dir/decls/def/monsters/alien_controller.def similarity index 100% rename from zpak001.pk3dir/def/monsters/alien_controller.def rename to zpak001.pk3dir/decls/def/monsters/alien_controller.def diff --git a/zpak001.pk3dir/def/monsters/alien_grunt.def b/zpak001.pk3dir/decls/def/monsters/alien_grunt.def similarity index 100% rename from zpak001.pk3dir/def/monsters/alien_grunt.def rename to zpak001.pk3dir/decls/def/monsters/alien_grunt.def diff --git a/zpak001.pk3dir/def/monsters/alien_slave.def b/zpak001.pk3dir/decls/def/monsters/alien_slave.def similarity index 100% rename from zpak001.pk3dir/def/monsters/alien_slave.def rename to zpak001.pk3dir/decls/def/monsters/alien_slave.def diff --git a/zpak001.pk3dir/def/monsters/apache.def b/zpak001.pk3dir/decls/def/monsters/apache.def similarity index 100% rename from zpak001.pk3dir/def/monsters/apache.def rename to zpak001.pk3dir/decls/def/monsters/apache.def diff --git a/zpak001.pk3dir/def/monsters/babycrab.def b/zpak001.pk3dir/decls/def/monsters/babycrab.def similarity index 100% rename from zpak001.pk3dir/def/monsters/babycrab.def rename to zpak001.pk3dir/decls/def/monsters/babycrab.def diff --git a/zpak001.pk3dir/def/monsters/barnacle.def b/zpak001.pk3dir/decls/def/monsters/barnacle.def similarity index 100% rename from zpak001.pk3dir/def/monsters/barnacle.def rename to zpak001.pk3dir/decls/def/monsters/barnacle.def diff --git a/zpak001.pk3dir/def/monsters/barney.def b/zpak001.pk3dir/decls/def/monsters/barney.def similarity index 100% rename from zpak001.pk3dir/def/monsters/barney.def rename to zpak001.pk3dir/decls/def/monsters/barney.def diff --git a/zpak001.pk3dir/def/monsters/barney_dead.def b/zpak001.pk3dir/decls/def/monsters/barney_dead.def similarity index 100% rename from zpak001.pk3dir/def/monsters/barney_dead.def rename to zpak001.pk3dir/decls/def/monsters/barney_dead.def diff --git a/zpak001.pk3dir/def/monsters/bigmomma.def b/zpak001.pk3dir/decls/def/monsters/bigmomma.def similarity index 100% rename from zpak001.pk3dir/def/monsters/bigmomma.def rename to zpak001.pk3dir/decls/def/monsters/bigmomma.def diff --git a/zpak001.pk3dir/def/monsters/bloater.def b/zpak001.pk3dir/decls/def/monsters/bloater.def similarity index 100% rename from zpak001.pk3dir/def/monsters/bloater.def rename to zpak001.pk3dir/decls/def/monsters/bloater.def diff --git a/zpak001.pk3dir/def/monsters/bullchicken.def b/zpak001.pk3dir/decls/def/monsters/bullchicken.def similarity index 100% rename from zpak001.pk3dir/def/monsters/bullchicken.def rename to zpak001.pk3dir/decls/def/monsters/bullchicken.def diff --git a/zpak001.pk3dir/def/monsters/cockroach.def b/zpak001.pk3dir/decls/def/monsters/cockroach.def similarity index 100% rename from zpak001.pk3dir/def/monsters/cockroach.def rename to zpak001.pk3dir/decls/def/monsters/cockroach.def diff --git a/zpak001.pk3dir/def/monsters/flyer.def b/zpak001.pk3dir/decls/def/monsters/flyer.def similarity index 100% rename from zpak001.pk3dir/def/monsters/flyer.def rename to zpak001.pk3dir/decls/def/monsters/flyer.def diff --git a/zpak001.pk3dir/def/monsters/flyer_flock.def b/zpak001.pk3dir/decls/def/monsters/flyer_flock.def similarity index 100% rename from zpak001.pk3dir/def/monsters/flyer_flock.def rename to zpak001.pk3dir/decls/def/monsters/flyer_flock.def diff --git a/zpak001.pk3dir/def/monsters/gargantua.def b/zpak001.pk3dir/decls/def/monsters/gargantua.def similarity index 100% rename from zpak001.pk3dir/def/monsters/gargantua.def rename to zpak001.pk3dir/decls/def/monsters/gargantua.def diff --git a/zpak001.pk3dir/def/monsters/gman.def b/zpak001.pk3dir/decls/def/monsters/gman.def similarity index 100% rename from zpak001.pk3dir/def/monsters/gman.def rename to zpak001.pk3dir/decls/def/monsters/gman.def diff --git a/zpak001.pk3dir/def/monsters/headcrab.def b/zpak001.pk3dir/decls/def/monsters/headcrab.def similarity index 100% rename from zpak001.pk3dir/def/monsters/headcrab.def rename to zpak001.pk3dir/decls/def/monsters/headcrab.def diff --git a/zpak001.pk3dir/def/monsters/hevsuit_dead.def b/zpak001.pk3dir/decls/def/monsters/hevsuit_dead.def similarity index 100% rename from zpak001.pk3dir/def/monsters/hevsuit_dead.def rename to zpak001.pk3dir/decls/def/monsters/hevsuit_dead.def diff --git a/zpak001.pk3dir/def/monsters/hgrunt_dead.def b/zpak001.pk3dir/decls/def/monsters/hgrunt_dead.def similarity index 100% rename from zpak001.pk3dir/def/monsters/hgrunt_dead.def rename to zpak001.pk3dir/decls/def/monsters/hgrunt_dead.def diff --git a/zpak001.pk3dir/def/monsters/houndeye.def b/zpak001.pk3dir/decls/def/monsters/houndeye.def similarity index 100% rename from zpak001.pk3dir/def/monsters/houndeye.def rename to zpak001.pk3dir/decls/def/monsters/houndeye.def diff --git a/zpak001.pk3dir/def/monsters/human_assassin.def b/zpak001.pk3dir/decls/def/monsters/human_assassin.def similarity index 100% rename from zpak001.pk3dir/def/monsters/human_assassin.def rename to zpak001.pk3dir/decls/def/monsters/human_assassin.def diff --git a/zpak001.pk3dir/def/monsters/human_grunt.def b/zpak001.pk3dir/decls/def/monsters/human_grunt.def similarity index 100% rename from zpak001.pk3dir/def/monsters/human_grunt.def rename to zpak001.pk3dir/decls/def/monsters/human_grunt.def diff --git a/zpak001.pk3dir/def/monsters/ichthyosaur.def b/zpak001.pk3dir/decls/def/monsters/ichthyosaur.def similarity index 100% rename from zpak001.pk3dir/def/monsters/ichthyosaur.def rename to zpak001.pk3dir/decls/def/monsters/ichthyosaur.def diff --git a/zpak001.pk3dir/def/monsters/leech.def b/zpak001.pk3dir/decls/def/monsters/leech.def similarity index 100% rename from zpak001.pk3dir/def/monsters/leech.def rename to zpak001.pk3dir/decls/def/monsters/leech.def diff --git a/zpak001.pk3dir/def/monsters/miniturret.def b/zpak001.pk3dir/decls/def/monsters/miniturret.def similarity index 100% rename from zpak001.pk3dir/def/monsters/miniturret.def rename to zpak001.pk3dir/decls/def/monsters/miniturret.def diff --git a/zpak001.pk3dir/def/monsters/nihilanth.def b/zpak001.pk3dir/decls/def/monsters/nihilanth.def similarity index 100% rename from zpak001.pk3dir/def/monsters/nihilanth.def rename to zpak001.pk3dir/decls/def/monsters/nihilanth.def diff --git a/zpak001.pk3dir/def/monsters/osprey.def b/zpak001.pk3dir/decls/def/monsters/osprey.def similarity index 100% rename from zpak001.pk3dir/def/monsters/osprey.def rename to zpak001.pk3dir/decls/def/monsters/osprey.def diff --git a/zpak001.pk3dir/def/monsters/rat.def b/zpak001.pk3dir/decls/def/monsters/rat.def similarity index 100% rename from zpak001.pk3dir/def/monsters/rat.def rename to zpak001.pk3dir/decls/def/monsters/rat.def diff --git a/zpak001.pk3dir/def/monsters/scientist.def b/zpak001.pk3dir/decls/def/monsters/scientist.def similarity index 100% rename from zpak001.pk3dir/def/monsters/scientist.def rename to zpak001.pk3dir/decls/def/monsters/scientist.def diff --git a/zpak001.pk3dir/def/monsters/scientist_dead.def b/zpak001.pk3dir/decls/def/monsters/scientist_dead.def similarity index 100% rename from zpak001.pk3dir/def/monsters/scientist_dead.def rename to zpak001.pk3dir/decls/def/monsters/scientist_dead.def diff --git a/zpak001.pk3dir/def/monsters/sentry.def b/zpak001.pk3dir/decls/def/monsters/sentry.def similarity index 100% rename from zpak001.pk3dir/def/monsters/sentry.def rename to zpak001.pk3dir/decls/def/monsters/sentry.def diff --git a/zpak001.pk3dir/def/monsters/sitting_scientist.def b/zpak001.pk3dir/decls/def/monsters/sitting_scientist.def similarity index 100% rename from zpak001.pk3dir/def/monsters/sitting_scientist.def rename to zpak001.pk3dir/decls/def/monsters/sitting_scientist.def diff --git a/zpak001.pk3dir/def/monsters/skeleton_dead.def b/zpak001.pk3dir/decls/def/monsters/skeleton_dead.def similarity index 100% rename from zpak001.pk3dir/def/monsters/skeleton_dead.def rename to zpak001.pk3dir/decls/def/monsters/skeleton_dead.def diff --git a/zpak001.pk3dir/def/monsters/snark.def b/zpak001.pk3dir/decls/def/monsters/snark.def similarity index 100% rename from zpak001.pk3dir/def/monsters/snark.def rename to zpak001.pk3dir/decls/def/monsters/snark.def diff --git a/zpak001.pk3dir/def/monsters/tentacle.def b/zpak001.pk3dir/decls/def/monsters/tentacle.def similarity index 100% rename from zpak001.pk3dir/def/monsters/tentacle.def rename to zpak001.pk3dir/decls/def/monsters/tentacle.def diff --git a/zpak001.pk3dir/def/monsters/tripmine.def b/zpak001.pk3dir/decls/def/monsters/tripmine.def similarity index 100% rename from zpak001.pk3dir/def/monsters/tripmine.def rename to zpak001.pk3dir/decls/def/monsters/tripmine.def diff --git a/zpak001.pk3dir/def/monsters/turret.def b/zpak001.pk3dir/decls/def/monsters/turret.def similarity index 100% rename from zpak001.pk3dir/def/monsters/turret.def rename to zpak001.pk3dir/decls/def/monsters/turret.def diff --git a/zpak001.pk3dir/def/monsters/zombie.def b/zpak001.pk3dir/decls/def/monsters/zombie.def similarity index 100% rename from zpak001.pk3dir/def/monsters/zombie.def rename to zpak001.pk3dir/decls/def/monsters/zombie.def diff --git a/zpak001.pk3dir/def/player.def b/zpak001.pk3dir/decls/def/player.def similarity index 100% rename from zpak001.pk3dir/def/player.def rename to zpak001.pk3dir/decls/def/player.def diff --git a/zpak001.pk3dir/def/projectiles.def b/zpak001.pk3dir/decls/def/projectiles.def similarity index 100% rename from zpak001.pk3dir/def/projectiles.def rename to zpak001.pk3dir/decls/def/projectiles.def diff --git a/zpak001.pk3dir/def/spawns.def b/zpak001.pk3dir/decls/def/spawns.def similarity index 100% rename from zpak001.pk3dir/def/spawns.def rename to zpak001.pk3dir/decls/def/spawns.def diff --git a/zpak001.pk3dir/def/weapons.def b/zpak001.pk3dir/decls/def/weapons.def similarity index 100% rename from zpak001.pk3dir/def/weapons.def rename to zpak001.pk3dir/decls/def/weapons.def diff --git a/zpak001.pk3dir/def/weapons/357.def b/zpak001.pk3dir/decls/def/weapons/357.def similarity index 100% rename from zpak001.pk3dir/def/weapons/357.def rename to zpak001.pk3dir/decls/def/weapons/357.def diff --git a/zpak001.pk3dir/def/weapons/9mmAR.def b/zpak001.pk3dir/decls/def/weapons/9mmAR.def similarity index 98% rename from zpak001.pk3dir/def/weapons/9mmAR.def rename to zpak001.pk3dir/decls/def/weapons/9mmAR.def index a89977a..54d1b05 100644 --- a/zpak001.pk3dir/def/weapons/9mmAR.def +++ b/zpak001.pk3dir/decls/def/weapons/9mmAR.def @@ -43,7 +43,7 @@ entityDef projectile_9mmAR entityDef fireInfo_9mmAR { - "def_onFire" "projectile_9mmAR" + "def_onFire" "projectile_9mmAR" "ammoType" "ammo_9mm" "ammoRequired" "1" "ammoPerShot" "1" diff --git a/zpak001.pk3dir/def/weapons/9mmhandgun.def b/zpak001.pk3dir/decls/def/weapons/9mmhandgun.def similarity index 100% rename from zpak001.pk3dir/def/weapons/9mmhandgun.def rename to zpak001.pk3dir/decls/def/weapons/9mmhandgun.def diff --git a/zpak001.pk3dir/def/weapons/crossbow.def b/zpak001.pk3dir/decls/def/weapons/crossbow.def similarity index 100% rename from zpak001.pk3dir/def/weapons/crossbow.def rename to zpak001.pk3dir/decls/def/weapons/crossbow.def diff --git a/zpak001.pk3dir/def/weapons/crowbar.def b/zpak001.pk3dir/decls/def/weapons/crowbar.def similarity index 100% rename from zpak001.pk3dir/def/weapons/crowbar.def rename to zpak001.pk3dir/decls/def/weapons/crowbar.def diff --git a/zpak001.pk3dir/def/weapons/egon.def b/zpak001.pk3dir/decls/def/weapons/egon.def similarity index 82% rename from zpak001.pk3dir/def/weapons/egon.def rename to zpak001.pk3dir/decls/def/weapons/egon.def index 2b3e567..f523f51 100644 --- a/zpak001.pk3dir/def/weapons/egon.def +++ b/zpak001.pk3dir/decls/def/weapons/egon.def @@ -19,13 +19,14 @@ entityDef weapon_egon "ammoRequired" "1" "actIdle" "0,1" "actDraw" "9" - "actFire" "7,8" - "actFireLoop" "7,8" + "actLoop" "7,8" + "actFireEnd" "1" "actHolster" "10" "fireRate" "0.2" - "snd_fire" "weapon_egon.fire" - "snd_fire_loop" "weapon_egon.fire_loop" + "snd_fireStart" "weapon_egon.fire" + "snd_fireLoop" "weapon_egon.fire_loop" + "snd_fireEnd" "weapon_egon.fire_stop" "fx_trail" "weapon_egon.trail" "fx_trail_world" "weapon_egon.trail_world" diff --git a/zpak001.pk3dir/def/weapons/gauss.def b/zpak001.pk3dir/decls/def/weapons/gauss.def similarity index 82% rename from zpak001.pk3dir/def/weapons/gauss.def rename to zpak001.pk3dir/decls/def/weapons/gauss.def index d21a89c..0b9bae8 100644 --- a/zpak001.pk3dir/def/weapons/gauss.def +++ b/zpak001.pk3dir/decls/def/weapons/gauss.def @@ -21,7 +21,6 @@ entityDef weapon_gauss "actIdle" "0,1,2" "actDraw" "8" "actHolster" "7" - "actLoop" "4" "powerAmmo" "1" "snd_fire" "weapon_gauss.fire" @@ -45,7 +44,7 @@ entityDef projectile_gausscharge entityDef fireInfo_gauss { - "def_onFire" "projectile_gauss" + "def_onFire" "projectile_gauss" "ammoPerShot" "2" "fireRate" ".2" "punchAngle" "-2 0 0" @@ -55,12 +54,18 @@ entityDef fireInfo_gauss entityDef fireInfo_gausscharge { + "def_onFire" "projectile_gausscharge" "def_onRelease" "projectile_gausscharge" "ammoPerShot" "5" "fireRate" "2" "punchAngle" "-2 0 0" "model_flash" "sprites/muzzleflash2.spr" - "primed_fuse" "5" + "snd_fireStart" "weapon_gauss.revving" + "snd_fire" "weapon_gauss.overcharge" + "snd_release" "weapon_gauss.fire" + "chargeTime" "5" "actRelease" "5,6" - "actFire" "3" + "actDelay" "3" + "actLoop" "4" + "knockbackRelease" "1024" } diff --git a/zpak001.pk3dir/def/weapons/handgrenade.def b/zpak001.pk3dir/decls/def/weapons/handgrenade.def similarity index 100% rename from zpak001.pk3dir/def/weapons/handgrenade.def rename to zpak001.pk3dir/decls/def/weapons/handgrenade.def diff --git a/zpak001.pk3dir/def/weapons/hornetgun.def b/zpak001.pk3dir/decls/def/weapons/hornetgun.def similarity index 100% rename from zpak001.pk3dir/def/weapons/hornetgun.def rename to zpak001.pk3dir/decls/def/weapons/hornetgun.def diff --git a/zpak001.pk3dir/def/weapons/rpg.def b/zpak001.pk3dir/decls/def/weapons/rpg.def similarity index 100% rename from zpak001.pk3dir/def/weapons/rpg.def rename to zpak001.pk3dir/decls/def/weapons/rpg.def diff --git a/zpak001.pk3dir/def/weapons/satchel.def b/zpak001.pk3dir/decls/def/weapons/satchel.def similarity index 100% rename from zpak001.pk3dir/def/weapons/satchel.def rename to zpak001.pk3dir/decls/def/weapons/satchel.def diff --git a/zpak001.pk3dir/def/weapons/shotgun.def b/zpak001.pk3dir/decls/def/weapons/shotgun.def similarity index 100% rename from zpak001.pk3dir/def/weapons/shotgun.def rename to zpak001.pk3dir/decls/def/weapons/shotgun.def diff --git a/zpak001.pk3dir/def/weapons/snark.def b/zpak001.pk3dir/decls/def/weapons/snark.def similarity index 100% rename from zpak001.pk3dir/def/weapons/snark.def rename to zpak001.pk3dir/decls/def/weapons/snark.def diff --git a/zpak001.pk3dir/def/weapons/tripmine.def b/zpak001.pk3dir/decls/def/weapons/tripmine.def similarity index 100% rename from zpak001.pk3dir/def/weapons/tripmine.def rename to zpak001.pk3dir/decls/def/weapons/tripmine.def diff --git a/zpak001.pk3dir/decls/efx/default.efx b/zpak001.pk3dir/decls/efx/default.efx new file mode 100644 index 0000000..bb15833 --- /dev/null +++ b/zpak001.pk3dir/decls/efx/default.efx @@ -0,0 +1,23 @@ +density "1.000000" +diffusion "1.000000" +gain "0.000000" +gain_hf "1.000000" +gain_lf "1.000000" +decay_time "1.000000" +decay_hf_ratio "1.000000" +decay_lf_ratio "1.000000" +reflections_gain "0.000000" +reflections_delay "0.000000" +reflections_pan "0 0 0" +late_reverb_gain "1.000000" +late_reverb_delay "0.000000" +late_reverb_pan "0 0 0" +echo_time "0.250000" +echo_depth "0.000000" +modulation_time "0.250000" +modulation_depth "0.000000" +air_absorbtion_hf "1.000000" +hf_reference "5000.000000" +lf_reference "250.000000" +room_rolloff_factor "0.000000" +decay_limit "1" diff --git a/zpak001.pk3dir/efx/gs_big1.efx b/zpak001.pk3dir/decls/efx/gs_big1.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_big1.efx rename to zpak001.pk3dir/decls/efx/gs_big1.efx diff --git a/zpak001.pk3dir/efx/gs_big2.efx b/zpak001.pk3dir/decls/efx/gs_big2.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_big2.efx rename to zpak001.pk3dir/decls/efx/gs_big2.efx diff --git a/zpak001.pk3dir/efx/gs_big3.efx b/zpak001.pk3dir/decls/efx/gs_big3.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_big3.efx rename to zpak001.pk3dir/decls/efx/gs_big3.efx diff --git a/zpak001.pk3dir/efx/gs_bright_l.efx b/zpak001.pk3dir/decls/efx/gs_bright_l.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_bright_l.efx rename to zpak001.pk3dir/decls/efx/gs_bright_l.efx diff --git a/zpak001.pk3dir/efx/gs_bright_m.efx b/zpak001.pk3dir/decls/efx/gs_bright_m.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_bright_m.efx rename to zpak001.pk3dir/decls/efx/gs_bright_m.efx diff --git a/zpak001.pk3dir/efx/gs_bright_s.efx b/zpak001.pk3dir/decls/efx/gs_bright_s.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_bright_s.efx rename to zpak001.pk3dir/decls/efx/gs_bright_s.efx diff --git a/zpak001.pk3dir/efx/gs_cavern_l.efx b/zpak001.pk3dir/decls/efx/gs_cavern_l.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_cavern_l.efx rename to zpak001.pk3dir/decls/efx/gs_cavern_l.efx diff --git a/zpak001.pk3dir/efx/gs_cavern_m.efx b/zpak001.pk3dir/decls/efx/gs_cavern_m.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_cavern_m.efx rename to zpak001.pk3dir/decls/efx/gs_cavern_m.efx diff --git a/zpak001.pk3dir/efx/gs_cavern_s.efx b/zpak001.pk3dir/decls/efx/gs_cavern_s.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_cavern_s.efx rename to zpak001.pk3dir/decls/efx/gs_cavern_s.efx diff --git a/zpak001.pk3dir/efx/gs_chamber_l.efx b/zpak001.pk3dir/decls/efx/gs_chamber_l.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_chamber_l.efx rename to zpak001.pk3dir/decls/efx/gs_chamber_l.efx diff --git a/zpak001.pk3dir/efx/gs_chamber_m.efx b/zpak001.pk3dir/decls/efx/gs_chamber_m.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_chamber_m.efx rename to zpak001.pk3dir/decls/efx/gs_chamber_m.efx diff --git a/zpak001.pk3dir/efx/gs_chamber_s.efx b/zpak001.pk3dir/decls/efx/gs_chamber_s.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_chamber_s.efx rename to zpak001.pk3dir/decls/efx/gs_chamber_s.efx diff --git a/zpak001.pk3dir/efx/gs_concrete_l.efx b/zpak001.pk3dir/decls/efx/gs_concrete_l.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_concrete_l.efx rename to zpak001.pk3dir/decls/efx/gs_concrete_l.efx diff --git a/zpak001.pk3dir/efx/gs_concrete_m.efx b/zpak001.pk3dir/decls/efx/gs_concrete_m.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_concrete_m.efx rename to zpak001.pk3dir/decls/efx/gs_concrete_m.efx diff --git a/zpak001.pk3dir/efx/gs_concrete_s.efx b/zpak001.pk3dir/decls/efx/gs_concrete_s.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_concrete_s.efx rename to zpak001.pk3dir/decls/efx/gs_concrete_s.efx diff --git a/zpak001.pk3dir/efx/gs_generic.efx b/zpak001.pk3dir/decls/efx/gs_generic.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_generic.efx rename to zpak001.pk3dir/decls/efx/gs_generic.efx diff --git a/zpak001.pk3dir/efx/gs_metal_l.efx b/zpak001.pk3dir/decls/efx/gs_metal_l.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_metal_l.efx rename to zpak001.pk3dir/decls/efx/gs_metal_l.efx diff --git a/zpak001.pk3dir/efx/gs_metal_m.efx b/zpak001.pk3dir/decls/efx/gs_metal_m.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_metal_m.efx rename to zpak001.pk3dir/decls/efx/gs_metal_m.efx diff --git a/zpak001.pk3dir/efx/gs_metal_s.efx b/zpak001.pk3dir/decls/efx/gs_metal_s.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_metal_s.efx rename to zpak001.pk3dir/decls/efx/gs_metal_s.efx diff --git a/zpak001.pk3dir/efx/gs_tunnel_l.efx b/zpak001.pk3dir/decls/efx/gs_tunnel_l.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_tunnel_l.efx rename to zpak001.pk3dir/decls/efx/gs_tunnel_l.efx diff --git a/zpak001.pk3dir/efx/gs_tunnel_m.efx b/zpak001.pk3dir/decls/efx/gs_tunnel_m.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_tunnel_m.efx rename to zpak001.pk3dir/decls/efx/gs_tunnel_m.efx diff --git a/zpak001.pk3dir/efx/gs_tunnel_s.efx b/zpak001.pk3dir/decls/efx/gs_tunnel_s.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_tunnel_s.efx rename to zpak001.pk3dir/decls/efx/gs_tunnel_s.efx diff --git a/zpak001.pk3dir/efx/gs_water1.efx b/zpak001.pk3dir/decls/efx/gs_water1.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_water1.efx rename to zpak001.pk3dir/decls/efx/gs_water1.efx diff --git a/zpak001.pk3dir/efx/gs_water2.efx b/zpak001.pk3dir/decls/efx/gs_water2.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_water2.efx rename to zpak001.pk3dir/decls/efx/gs_water2.efx diff --git a/zpak001.pk3dir/efx/gs_water3.efx b/zpak001.pk3dir/decls/efx/gs_water3.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_water3.efx rename to zpak001.pk3dir/decls/efx/gs_water3.efx diff --git a/zpak001.pk3dir/efx/gs_weirdo1.efx b/zpak001.pk3dir/decls/efx/gs_weirdo1.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_weirdo1.efx rename to zpak001.pk3dir/decls/efx/gs_weirdo1.efx diff --git a/zpak001.pk3dir/efx/gs_weirdo2.efx b/zpak001.pk3dir/decls/efx/gs_weirdo2.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_weirdo2.efx rename to zpak001.pk3dir/decls/efx/gs_weirdo2.efx diff --git a/zpak001.pk3dir/efx/gs_weirdo3.efx b/zpak001.pk3dir/decls/efx/gs_weirdo3.efx similarity index 100% rename from zpak001.pk3dir/efx/gs_weirdo3.efx rename to zpak001.pk3dir/decls/efx/gs_weirdo3.efx diff --git a/zpak001.pk3dir/sound/damage_bullet.sndshd b/zpak001.pk3dir/decls/sound/damage_bullet.sndshd similarity index 100% rename from zpak001.pk3dir/sound/damage_bullet.sndshd rename to zpak001.pk3dir/decls/sound/damage_bullet.sndshd diff --git a/zpak001.pk3dir/sound/footsteps.sndshd b/zpak001.pk3dir/decls/sound/footsteps.sndshd similarity index 100% rename from zpak001.pk3dir/sound/footsteps.sndshd rename to zpak001.pk3dir/decls/sound/footsteps.sndshd diff --git a/zpak001.pk3dir/sound/func_breakable.sndshd b/zpak001.pk3dir/decls/sound/func_breakable.sndshd similarity index 100% rename from zpak001.pk3dir/sound/func_breakable.sndshd rename to zpak001.pk3dir/decls/sound/func_breakable.sndshd diff --git a/zpak001.pk3dir/sound/func_button.sndshd b/zpak001.pk3dir/decls/sound/func_button.sndshd similarity index 100% rename from zpak001.pk3dir/sound/func_button.sndshd rename to zpak001.pk3dir/decls/sound/func_button.sndshd diff --git a/zpak001.pk3dir/sound/func_door.sndshd b/zpak001.pk3dir/decls/sound/func_door.sndshd similarity index 100% rename from zpak001.pk3dir/sound/func_door.sndshd rename to zpak001.pk3dir/decls/sound/func_door.sndshd diff --git a/zpak001.pk3dir/sound/func_door_rotating.sndshd b/zpak001.pk3dir/decls/sound/func_door_rotating.sndshd similarity index 100% rename from zpak001.pk3dir/sound/func_door_rotating.sndshd rename to zpak001.pk3dir/decls/sound/func_door_rotating.sndshd diff --git a/zpak001.pk3dir/sound/func_plat.sndshd b/zpak001.pk3dir/decls/sound/func_plat.sndshd similarity index 100% rename from zpak001.pk3dir/sound/func_plat.sndshd rename to zpak001.pk3dir/decls/sound/func_plat.sndshd diff --git a/zpak001.pk3dir/sound/func_pushable.sndshd b/zpak001.pk3dir/decls/sound/func_pushable.sndshd similarity index 100% rename from zpak001.pk3dir/sound/func_pushable.sndshd rename to zpak001.pk3dir/decls/sound/func_pushable.sndshd diff --git a/zpak001.pk3dir/sound/func_tracktrain.sndshd b/zpak001.pk3dir/decls/sound/func_tracktrain.sndshd similarity index 100% rename from zpak001.pk3dir/sound/func_tracktrain.sndshd rename to zpak001.pk3dir/decls/sound/func_tracktrain.sndshd diff --git a/zpak001.pk3dir/sound/func_train.sndshd b/zpak001.pk3dir/decls/sound/func_train.sndshd similarity index 100% rename from zpak001.pk3dir/sound/func_train.sndshd rename to zpak001.pk3dir/decls/sound/func_train.sndshd diff --git a/zpak001.pk3dir/sound/fx_valve.sndshd b/zpak001.pk3dir/decls/sound/fx_valve.sndshd similarity index 100% rename from zpak001.pk3dir/sound/fx_valve.sndshd rename to zpak001.pk3dir/decls/sound/fx_valve.sndshd diff --git a/zpak001.pk3dir/sound/impacts.sndshd b/zpak001.pk3dir/decls/sound/impacts.sndshd similarity index 100% rename from zpak001.pk3dir/sound/impacts.sndshd rename to zpak001.pk3dir/decls/sound/impacts.sndshd diff --git a/zpak001.pk3dir/sound/items_valve.sndshd b/zpak001.pk3dir/decls/sound/items_valve.sndshd similarity index 100% rename from zpak001.pk3dir/sound/items_valve.sndshd rename to zpak001.pk3dir/decls/sound/items_valve.sndshd diff --git a/zpak001.pk3dir/sound/modelevent_shell.sndshd b/zpak001.pk3dir/decls/sound/modelevent_shell.sndshd similarity index 100% rename from zpak001.pk3dir/sound/modelevent_shell.sndshd rename to zpak001.pk3dir/decls/sound/modelevent_shell.sndshd diff --git a/zpak001.pk3dir/sound/monsters_valve.sndshd b/zpak001.pk3dir/decls/sound/monsters_valve.sndshd similarity index 100% rename from zpak001.pk3dir/sound/monsters_valve.sndshd rename to zpak001.pk3dir/decls/sound/monsters_valve.sndshd diff --git a/zpak001.pk3dir/sound/player.sndshd b/zpak001.pk3dir/decls/sound/player.sndshd similarity index 100% rename from zpak001.pk3dir/sound/player.sndshd rename to zpak001.pk3dir/decls/sound/player.sndshd diff --git a/zpak001.pk3dir/sound/weapons_valve.sndshd b/zpak001.pk3dir/decls/sound/weapons_valve.sndshd similarity index 96% rename from zpak001.pk3dir/sound/weapons_valve.sndshd rename to zpak001.pk3dir/decls/sound/weapons_valve.sndshd index 6e76980..f8fbebd 100644 --- a/zpak001.pk3dir/sound/weapons_valve.sndshd +++ b/zpak001.pk3dir/decls/sound/weapons_valve.sndshd @@ -5,10 +5,12 @@ weapon_357.shoot sample weapons/357_shot2.wav distshader weapon_357.shoot_dist } + weapon_357.empty { sample weapons/357_cock1.wav } + weapon_357.shoot_dist { volume 0.1 @@ -72,6 +74,7 @@ weapon_glock.fire alerts sample weapons/pl_gun3.wav } + weapon_glock.empty { sample weapons/357_cock1.wav @@ -133,6 +136,7 @@ weapon_mp5.gl alerts sample weapons/glauncher.wav } + weapon_mp5.empty { sample weapons/357_cock1.wav @@ -167,6 +171,7 @@ weapon_rpg.shoot alerts sample weapons/rocketfire1.wav } + weapon_rpg.empty { sample weapons/357_cock1.wav @@ -185,10 +190,12 @@ weapon_shotgun.double sample weapons/dbarrel1.wav distshader weapon_shotgun.distance } + weapon_shotgun.empty { sample weapons/357_cock1.wav } + weapon_shotgun.distance { volume 0.15 @@ -228,18 +235,27 @@ weapon_snark.hunt sample squeek/sqk_hunt2.wav sample squeek/sqk_hunt3.wav } + weapon_gauss.empty { sample weapons/357_cock1.wav } + weapon_gauss.fire { sample weapons/gauss2.wav } + weapon_gauss.overcharge { sample weapons/electro4.wav } + +weapon_gauss.revving +{ + sample ambience/pulsemachine.wav +} + weapon_egon.empty { sample weapons/357_cock1.wav @@ -255,4 +271,7 @@ weapon_egon.fire_loop sample weapons/egon_run3.wav } - +weapon_egon.fire_stop +{ + sample weapons/egon_off1.wav +} diff --git a/zpak001.pk3dir/default.cfg b/zpak001.pk3dir/default.cfg index 86fd5e6..acb9f36 100644 --- a/zpak001.pk3dir/default.cfg +++ b/zpak001.pk3dir/default.cfg @@ -38,4 +38,4 @@ bind y "messagemode" bind q "weaplast" bind ~ "toggleconsole" -exec cvar_defaults.cfg \ No newline at end of file +exec cvar_defaults.cfg diff --git a/zpak001.pk3dir/gfx/blue_default.png b/zpak001.pk3dir/gfx/blue_default.png deleted file mode 100755 index 0812e5339d345bbcad9d0e3738bb3940f32e0572..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!2~2t9{;cfQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#9wV!ufVxak0#JnEg{O;SNX4zUw+;CY8SpSTh;NufWYk(=3&471r0xpZ|2@ zJM)>J-oC5by-umP