]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/mutators/mutator_nades.qc
Merge branch 'master' into TimePath/unified_weapons
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_nades.qc
index 9f2b2d3021e38beaef9a2844314559a452511124..f31bff4dc4df86e33044f62ac497f18639b04018 100644 (file)
@@ -9,12 +9,12 @@
 #include "../../common/monsters/spawn.qh"
 #include "../../common/monsters/sv_monsters.qh"
 
-.float lifetime;
+.float nade_time_primed;
 
 .entity nade_spawnloc;
 
 void nade_timer_think()
-{
+{SELFPARAM();
        self.skin = 8 - (self.owner.wait - time) / (autocvar_g_nades_nade_lifetime / 10);
        self.nextthink = time;
        if(!self.owner || wasfreed(self.owner))
@@ -29,7 +29,7 @@ void nade_burn_spawn(entity _nade)
 void nade_spawn(entity _nade)
 {
        entity timer = spawn();
-       setmodel(timer, "models/ok_nade_counter/ok_nade_counter.md3");
+       setmodel(timer, MDL_NADE_TIMER);
        setattachment(timer, _nade, "");
        timer.classname = "nade_timer";
        timer.colormap = _nade.colormap;
@@ -46,7 +46,7 @@ void nade_spawn(entity _nade)
 }
 
 void napalm_damage(float dist, float damage, float edgedamage, float burntime)
-{
+{SELFPARAM();
        entity e;
        float d;
        vector p;
@@ -77,14 +77,14 @@ void napalm_damage(float dist, float damage, float edgedamage, float burntime)
                d = vlen(WarpZone_UnTransformOrigin(RandomSelection_chosen_ent, self.origin) - RandomSelection_chosen_ent.fireball_impactvec);
                d = damage + (edgedamage - damage) * (d / dist);
                Fire_AddDamage(RandomSelection_chosen_ent, self.realowner, d * burntime, burntime, self.projectiledeathtype | HITTYPE_BOUNCE);
-               //trailparticles(self, particleeffectnum("fireball_laser"), self.origin, RandomSelection_chosen_ent.fireball_impactvec);
-               Send_Effect("fireball_laser", self.origin, RandomSelection_chosen_ent.fireball_impactvec - self.origin, 1);
+               //trailparticles(self, particleeffectnum(EFFECT_FIREBALL_LASER), self.origin, RandomSelection_chosen_ent.fireball_impactvec);
+               Send_Effect(EFFECT_FIREBALL_LASER, self.origin, RandomSelection_chosen_ent.fireball_impactvec - self.origin, 1);
        }
 }
 
 
 void napalm_ball_think()
-{
+{SELFPARAM();
        if(round_handler_IsActive())
        if(!round_handler_IsRoundStarted())
        {
@@ -117,11 +117,11 @@ void napalm_ball_think()
 
 
 void nade_napalm_ball()
-{
+{SELFPARAM();
        entity proj;
        vector kick;
 
-       spamsound(self, CH_SHOTS, "weapons/fireball_fire.wav", VOL_BASE, ATTEN_NORM);
+       spamsound(self, CH_SHOTS, SND(FIREBALL_FIRE), VOL_BASE, ATTEN_NORM);
 
        proj = spawn ();
        proj.owner = self.owner;
@@ -133,7 +133,7 @@ void nade_napalm_ball()
        proj.movetype = MOVETYPE_BOUNCE;
        proj.projectiledeathtype = DEATH_NADE_NAPALM;
        PROJECTILE_MAKETRIGGER(proj);
-       setmodel(proj, "null");
+       setmodel(proj, MDL_Null);
        proj.scale = 1;//0.5;
        setsize(proj, '-4 -4 -4', '4 4 4');
        setorigin(proj, self.origin);
@@ -158,7 +158,7 @@ void nade_napalm_ball()
 
 
 void napalm_fountain_think()
-{
+{SELFPARAM();
 
        if(round_handler_IsActive())
        if(!round_handler_IsRoundStarted())
@@ -196,7 +196,7 @@ void napalm_fountain_think()
 }
 
 void nade_napalm_boom()
-{
+{SELFPARAM();
        entity fountain;
        int c;
        for (c = 0; c < autocvar_g_nades_napalm_ball_count; c++)
@@ -225,7 +225,7 @@ void nade_napalm_boom()
 void nade_ice_freeze(entity freezefield, entity frost_target, float freeze_time)
 {
        frost_target.frozen_by = freezefield.realowner;
-       Send_Effect("electro_impact", frost_target.origin, '0 0 0', 1);
+       Send_Effect(EFFECT_ELECTRO_IMPACT, frost_target.origin, '0 0 0', 1);
        Freeze(frost_target, 1/freeze_time, 3, false);
        if(frost_target.ballcarried)
        if(g_keepaway) { ka_DropEvent(frost_target); }
@@ -237,7 +237,7 @@ void nade_ice_freeze(entity freezefield, entity frost_target, float freeze_time)
 }
 
 void nade_ice_think()
-{
+{SELFPARAM();
 
        if(round_handler_IsActive())
        if(!round_handler_IsRoundStarted())
@@ -250,17 +250,9 @@ void nade_ice_think()
        {
                if ( autocvar_g_nades_ice_explode )
                {
-                       string expef;
-                       switch(self.realowner.team)
-                       {
-                               case NUM_TEAM_1: expef = "nade_red_explode"; break;
-                               case NUM_TEAM_2: expef = "nade_blue_explode"; break;
-                               case NUM_TEAM_3: expef = "nade_yellow_explode"; break;
-                               case NUM_TEAM_4: expef = "nade_pink_explode"; break;
-                               default:                 expef = "nade_neutral_explode"; break;
-                       }
+                       entity expef = EFFECT_NADE_EXPLODE(self.realowner.team);
                        Send_Effect(expef, self.origin + '0 0 1', '0 0 0', 1);
-                       sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
+                       sound(self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
 
                        RadiusDamage(self, self.realowner, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage,
                                autocvar_g_nades_nade_radius, self, world, autocvar_g_nades_nade_force, self.projectiledeathtype, self.enemy);
@@ -284,15 +276,14 @@ void nade_ice_think()
        randomp.x = randomr*cos(randomw);
        randomp.y = randomr*sin(randomw);
        randomp.z = 1;
-       Send_Effect("electro_muzzleflash", self.origin + randomp, '0 0 0', 1);
+       Send_Effect(EFFECT_ELECTRO_MUZZLEFLASH, self.origin + randomp, '0 0 0', 1);
 
        if(time >= self.nade_special_time)
        {
                self.nade_special_time = time+0.7;
 
-
-               Send_Effect("electro_impact", self.origin, '0 0 0', 1);
-               Send_Effect("icefield", self.origin, '0 0 0', 1);
+               Send_Effect(EFFECT_ELECTRO_IMPACT, self.origin, '0 0 0', 1);
+               Send_Effect(EFFECT_ICEFIELD, self.origin, '0 0 0', 1);
        }
 
 
@@ -311,7 +302,7 @@ void nade_ice_think()
 }
 
 void nade_ice_boom()
-{
+{SELFPARAM();
        entity fountain;
        fountain = spawn();
        fountain.owner = self.owner;
@@ -332,9 +323,9 @@ void nade_ice_boom()
 
        if ( autocvar_g_nades_ice_explode )
        {
-               setmodel(fountain, "models/grenademodel.md3");
+               setmodel(fountain, MDL_PROJECTILE_GRENADE);
                entity timer = spawn();
-               setmodel(timer, "models/ok_nade_counter/ok_nade_counter.md3");
+               setmodel(timer, MDL_NADE_TIMER);
                setattachment(timer, fountain, "");
                timer.classname = "nade_timer";
                timer.colormap = self.colormap;
@@ -346,11 +337,11 @@ void nade_ice_boom()
                timer.skin = 10;
        }
        else
-               setmodel(fountain, "null");
+               setmodel(fountain, MDL_Null);
 }
 
 void nade_translocate_boom()
-{
+{SELFPARAM();
        if(self.realowner.vehicle)
                return;
 
@@ -366,7 +357,7 @@ void nade_translocate_boom()
 }
 
 void nade_spawn_boom()
-{
+{SELFPARAM();
        entity spawnloc = spawn();
        setorigin(spawnloc, self.origin);
        setsize(spawnloc, self.realowner.mins, self.realowner.maxs);
@@ -386,7 +377,7 @@ void nade_spawn_boom()
 }
 
 void nade_heal_think()
-{
+{SELFPARAM();
        if(time >= self.ltime)
        {
                remove(self);
@@ -405,7 +396,7 @@ void nade_heal_think()
 }
 
 void nade_heal_touch()
-{
+{SELFPARAM();
        float maxhealth;
        float health_factor;
        if(IS_PLAYER(other) || IS_MONSTER(other))
@@ -426,7 +417,7 @@ void nade_heal_touch()
                        if ( other.health < maxhealth )
                        {
                                if ( self.nade_show_particles )
-                                       Send_Effect("healing_fx", other.origin, '0 0 0', 1);
+                                       Send_Effect(EFFECT_HEALING, other.origin, '0 0 0', 1);
                                other.health = min(other.health+health_factor, maxhealth);
                        }
                        other.pauserothealth_finished = max(other.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot);
@@ -447,7 +438,7 @@ void nade_heal_touch()
 }
 
 void nade_heal_boom()
-{
+{SELFPARAM();
        entity healer;
        healer = spawn();
        healer.owner = self.owner;
@@ -460,7 +451,7 @@ void nade_heal_boom()
        healer.solid = SOLID_TRIGGER;
        healer.touch = nade_heal_touch;
 
-       setmodel(healer, "models/ctf/shield.md3");
+       setmodel(healer, MDL_NADE_HEAL);
        healer.healer_radius = autocvar_g_nades_nade_radius;
        vector size = '1 1 1' * healer.healer_radius / 2;
        setsize(healer,-size,size);
@@ -473,7 +464,7 @@ void nade_heal_boom()
 }
 
 void nade_monster_boom()
-{
+{SELFPARAM();
        entity e = spawnmonster(self.pokenade_type, 0, self.realowner, self.realowner, self.origin, false, false, 1);
 
        if(autocvar_g_nades_pokenade_monster_lifetime > 0)
@@ -482,58 +473,51 @@ void nade_monster_boom()
 }
 
 void nade_boom()
-{
-       string expef;
+{SELFPARAM();
+       entity expef = NULL;
        bool nade_blast = true;
 
        switch ( NADES[self.nade_type] )
        {
                case NADE_TYPE_NAPALM:
                        nade_blast = autocvar_g_nades_napalm_blast;
-                       expef = "explosion_medium";
+                       expef = EFFECT_EXPLOSION_MEDIUM;
                        break;
                case NADE_TYPE_ICE:
                        nade_blast = false;
-                       expef = "electro_combo"; // hookbomb_explode electro_combo bigplasma_impact
+                       expef = EFFECT_ELECTRO_COMBO; // hookbomb_explode electro_combo bigplasma_impact
                        break;
                case NADE_TYPE_TRANSLOCATE:
                        nade_blast = false;
-                       expef = "";
                        break;
                case NADE_TYPE_MONSTER:
                case NADE_TYPE_SPAWN:
                        nade_blast = false;
                        switch(self.realowner.team)
                        {
-                               case NUM_TEAM_1: expef = "spawn_event_red"; break;
-                               case NUM_TEAM_2: expef = "spawn_event_blue"; break;
-                               case NUM_TEAM_3: expef = "spawn_event_yellow"; break;
-                               case NUM_TEAM_4: expef = "spawn_event_pink"; break;
-                               default: expef = "spawn_event_neutral"; break;
+                               case NUM_TEAM_1: expef = EFFECT_SPAWN_RED; break;
+                               case NUM_TEAM_2: expef = EFFECT_SPAWN_BLUE; break;
+                               case NUM_TEAM_3: expef = EFFECT_SPAWN_YELLOW; break;
+                               case NUM_TEAM_4: expef = EFFECT_SPAWN_PINK; break;
+                               default: expef = EFFECT_SPAWN_NEUTRAL; break;
                        }
                        break;
                case NADE_TYPE_HEAL:
                        nade_blast = false;
-                       expef = "spawn_event_red";
+                       expef = EFFECT_SPAWN_RED;
                        break;
 
                default:
                case NADE_TYPE_NORMAL:
-                       switch(self.realowner.team)
-                       {
-                               case NUM_TEAM_1: expef = "nade_red_explode"; break;
-                               case NUM_TEAM_2: expef = "nade_blue_explode"; break;
-                               case NUM_TEAM_3: expef = "nade_yellow_explode"; break;
-                               case NUM_TEAM_4: expef = "nade_pink_explode"; break;
-                               default:                 expef = "nade_neutral_explode"; break;
-                       }
+                       expef = EFFECT_NADE_EXPLODE(self.realowner.team);
+                       break;
        }
 
-       if(expef != "")
+       if(expef)
                Send_Effect(expef, findbetterlocation(self.origin, 8), '0 0 0', 1);
 
-       sound(self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, ATTEN_NORM);
-       sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTEN_NORM);
+       sound(self, CH_SHOTS_SINGLE, SND_Null, VOL_BASE, ATTEN_NORM);
+       sound(self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
 
        self.event_damage = func_null; // prevent somehow calling damage in the next call
 
@@ -555,11 +539,16 @@ void nade_boom()
                case NADE_TYPE_MONSTER: nade_monster_boom(); break;
        }
 
+       entity head;
+       for(head = world; (head = find(head, classname, "grapplinghook")); )
+       if(head.aiment == self)
+               RemoveGrapplingHook(head.realowner);
+
        remove(self);
 }
 
 void nade_touch()
-{
+{SELFPARAM();
        /*float is_weapclip = 0;
        if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NODRAW)
        if (!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NONSOLID))
@@ -567,6 +556,10 @@ void nade_touch()
                is_weapclip = 1;*/
        if(ITEM_TOUCH_NEEDKILL()) // || is_weapclip)
        {
+               entity head;
+               for(head = world; (head = find(head, classname, "grapplinghook")); )
+               if(head.aiment == self)
+                       RemoveGrapplingHook(head.realowner);
                remove(self);
                return;
        }
@@ -577,7 +570,7 @@ void nade_touch()
        //UpdateCSQCProjectile(self);
        if(self.health == self.max_health)
        {
-               spamsound(self, CH_SHOTS, strcat("weapons/grenade_bounce", ftos(1 + rint(random() * 5)), ".wav"), VOL_BASE, ATTEN_NORM);
+               spamsound(self, CH_SHOTS, SND(GRENADE_BOUNCE_RANDOM()), VOL_BASE, ATTEN_NORM);
                return;
        }
 
@@ -586,14 +579,14 @@ void nade_touch()
 }
 
 void nade_beep()
-{
-       sound(self, CH_SHOTS_SINGLE, "overkill/grenadebip.ogg", VOL_BASE, 0.5 *(ATTEN_LARGE + ATTEN_MAX));
+{SELFPARAM();
+       sound(self, CH_SHOTS_SINGLE, SND_NADE_BEEP, VOL_BASE, 0.5 *(ATTEN_LARGE + ATTEN_MAX));
        self.think = nade_boom;
        self.nextthink = max(self.wait, time);
 }
 
 void nade_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{
+{SELFPARAM();
        if(ITEM_DAMAGE_NEEDKILL(deathtype))
        {
                self.takedamage = DAMAGE_NO;
@@ -642,7 +635,7 @@ void nade_damage(entity inflictor, entity attacker, float damage, int deathtype,
 
        if(self.health == self.max_health)
        {
-               sound(self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, 0.5 *(ATTEN_LARGE + ATTEN_MAX));
+               sound(self, CH_SHOTS_SINGLE, SND_Null, VOL_BASE, 0.5 *(ATTEN_LARGE + ATTEN_MAX));
                self.nextthink = max(time + autocvar_g_nades_nade_lifetime, time);
                self.think = nade_beep;
        }
@@ -659,7 +652,7 @@ void nade_damage(entity inflictor, entity attacker, float damage, int deathtype,
 }
 
 void toss_nade(entity e, vector _velocity, float _time)
-{
+{SELFPARAM();
        if(e.nade == world)
                return;
 
@@ -682,7 +675,7 @@ void toss_nade(entity e, vector _velocity, float _time)
                offset = '0 0 0';
 
        setorigin(_nade, w_shotorg + offset + (v_right * 25) * -1);
-       //setmodel(_nade, "models/weapons/v_ok_grenade.md3");
+       //setmodel(_nade, MDL_PROJECTILE_NADE);
        //setattachment(_nade, world, "");
        PROJECTILE_MAKETRIGGER(_nade);
        setsize(_nade, '-16 -16 -16', '16 16 16');
@@ -752,7 +745,7 @@ void nades_GiveBonus(entity player, float score)
                if ( player.bonus_nade_score >= 1 )
                {
                        Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_NADE_BONUS);
-                       play2(player,"kh/alarm.wav");
+                       play2(player, SND(KH_ALARM));
                        player.bonus_nades++;
                        player.bonus_nade_score -= 1;
                }
@@ -765,7 +758,7 @@ void nades_RemoveBonus(entity player)
 }
 
 float nade_customize()
-{
+{SELFPARAM();
        //if(IS_SPEC(other)) { return false; }
        if(other == self.realowner || (IS_SPEC(other) && other.enemy == self.realowner))
        {
@@ -779,7 +772,7 @@ float nade_customize()
        {
                //self.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION;
                if(!self.traileffectnum)
-                       self.traileffectnum = particleeffectnum(Nade_TrailEffect(NADES[self.nade_type].m_projectile[false], self.team));
+                       self.traileffectnum = _particleeffectnum(Nade_TrailEffect(NADES[self.nade_type].m_projectile[false], self.team).eent_eff_name);
                self.alpha = 1;
        }
 
@@ -787,7 +780,11 @@ float nade_customize()
 }
 
 void nade_prime()
-{
+{SELFPARAM();
+       if(autocvar_g_nades_bonus_only)
+       if(!self.bonus_nades)
+               return; // only allow bonus nades
+
        if(self.nade)
                remove(self.nade);
 
@@ -815,22 +812,22 @@ void nade_prime()
 
        n.nade_type = bound(1, n.nade_type, NADES_COUNT);
 
-       setmodel(n, "models/weapons/v_ok_grenade.md3");
+       setmodel(n, MDL_PROJECTILE_NADE);
        //setattachment(n, self, "bip01 l hand");
        n.exteriormodeltoclient = self;
        n.customizeentityforclient = nade_customize;
-       n.traileffectnum = particleeffectnum(Nade_TrailEffect(NADES[n.nade_type].m_projectile[false], self.team));
+       n.traileffectnum = _particleeffectnum(Nade_TrailEffect(NADES[n.nade_type].m_projectile[false], self.team).eent_eff_name);
        n.colormod = NADES[n.nade_type].m_color;
        n.realowner = self;
        n.colormap = self.colormap;
        n.glowmod = self.glowmod;
        n.wait = time + autocvar_g_nades_nade_lifetime;
-       n.lifetime = time;
+       n.nade_time_primed = time;
        n.think = nade_beep;
        n.nextthink = max(n.wait - 3, time);
        n.projectiledeathtype = DEATH_NADE;
 
-       setmodel(fn, "models/weapons/h_ok_grenade.iqm");
+       setmodel(fn, MDL_NADE_VIEW);
        setattachment(fn, self.weaponentity, "");
        fn.realowner = fn.owner = self;
        fn.colormod = NADES[n.nade_type].m_color;
@@ -844,7 +841,7 @@ void nade_prime()
 }
 
 float CanThrowNade()
-{
+{SELFPARAM();
        if(self.vehicle)
                return false;
 
@@ -866,14 +863,18 @@ float CanThrowNade()
        return true;
 }
 
+.bool nade_altbutton;
+
 void nades_CheckThrow()
-{
+{SELFPARAM();
        if(!CanThrowNade())
                return;
 
-       if(!self.nade)
+       entity held_nade = self.nade;
+       if (!held_nade)
        {
-               if(self.nade_refire < time)
+               self.nade_altbutton = true;
+               if(time > self.nade_refire)
                {
                        Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_NADE_THROW);
                        nade_prime();
@@ -882,10 +883,10 @@ void nades_CheckThrow()
        }
        else
        {
-               if(time - self.nade.lifetime >= 1)
-               {
+               self.nade_altbutton = false;
+               if (time >= held_nade.nade_time_primed + 1) {
                        makevectors(self.v_angle);
-                       float _force = time - self.nade.lifetime;
+                       float _force = time - held_nade.nade_time_primed;
                        _force /= autocvar_g_nades_nade_lifetime;
                        _force = autocvar_g_nades_nade_minforce + (_force * (autocvar_g_nades_nade_maxforce - autocvar_g_nades_nade_minforce));
                        toss_nade(self, (v_forward * 0.75 + v_up * 0.2 + v_right * 0.05) * _force, 0);
@@ -904,12 +905,6 @@ void nades_Clear(entity player)
        player.nade_timer = 0;
 }
 
-MUTATOR_HOOKFUNCTION(nades_CheckThrow)
-{
-       if(MUTATOR_RETURNVALUE) { nades_CheckThrow(); }
-       return false;
-}
-
 MUTATOR_HOOKFUNCTION(nades_VehicleEnter)
 {
        if(vh_player.nade)
@@ -918,51 +913,57 @@ MUTATOR_HOOKFUNCTION(nades_VehicleEnter)
        return false;
 }
 
-MUTATOR_HOOKFUNCTION(nades_PlayerPreThink)
-{
-       if(!IS_PLAYER(self)) { return false; }
-
-       float key_pressed = self.BUTTON_HOOK;
-       float time_score;
-
-       if(g_grappling_hook || client_hasweapon(self, WEP_HOOK.m_id, false, false) || (weaponsInMap & WEPSET_HOOK))
-               key_pressed = self.button16; // if hook is enabled, use an alternate key
-
-       if(self.nade)
-       {
-               self.nade_timer = bound(0, (time - self.nade.lifetime) / autocvar_g_nades_nade_lifetime, 1);
-               //print(sprintf("%d %d\n", self.nade_timer, time - self.nade.lifetime));
-               makevectors(self.angles);
-               self.nade.velocity = self.velocity;
-
-               setorigin(self.nade, self.origin + self.view_ofs + v_forward * 8 + v_right * -8 + v_up * 0);
-               self.nade.angles_y = self.angles.y;
-       }
-
-       if(self.nade)
-       if(self.nade.wait - 0.1 <= time)
-               toss_nade(self, '0 0 0', time + 0.05);
-
-       if(CanThrowNade())
-       if(self.nade_refire < time)
-       {
-               if(key_pressed)
+CLASS(NadeOffhand, OffhandWeapon)
+    METHOD(NadeOffhand, offhand_think, void(NadeOffhand this, entity player, bool key_pressed))
+    {
+       entity held_nade = player.nade;
+               if (held_nade)
                {
-                       if(!self.nade)
-                               nade_prime();
+                       player.nade_timer = bound(0, (time - held_nade.nade_time_primed) / autocvar_g_nades_nade_lifetime, 1);
+                       // LOG_TRACEF("%d %d\n", player.nade_timer, time - held_nade.nade_time_primed);
+                       makevectors(player.angles);
+                       held_nade.velocity = player.velocity;
+                       setorigin(held_nade, player.origin + player.view_ofs + v_forward * 8 + v_right * -8 + v_up * 0);
+                       held_nade.angles_y = player.angles.y;
+
+                       if (time + 0.1 >= held_nade.wait)
+                               toss_nade(player, '0 0 0', time + 0.05);
                }
-               else if(time - self.nade.lifetime >= 1)
-               {
-                       if(self.nade)
-                       {
-                               makevectors(self.v_angle);
-                               float _force = time - self.nade.lifetime;
+
+        if (!CanThrowNade()) return;
+        if (!(time > player.nade_refire)) return;
+               if (key_pressed) {
+                       if (!held_nade) {
+                               nade_prime();
+                               held_nade = player.nade;
+                       }
+               } else if (time >= held_nade.nade_time_primed + 1) {
+                       if (held_nade) {
+                               makevectors(player.v_angle);
+                               float _force = time - held_nade.nade_time_primed;
                                _force /= autocvar_g_nades_nade_lifetime;
                                _force = autocvar_g_nades_nade_minforce + (_force * (autocvar_g_nades_nade_maxforce - autocvar_g_nades_nade_minforce));
-                               toss_nade(self, (v_forward * 0.7 + v_up * 0.2 + v_right * 0.1) * _force, 0);
+                               toss_nade(player, (v_forward * 0.7 + v_up * 0.2 + v_right * 0.1) * _force, 0);
                        }
                }
+    }
+ENDCLASS(NadeOffhand)
+NadeOffhand OFFHAND_NADE; STATIC_INIT(OFFHAND_NADE) { OFFHAND_NADE = NEW(NadeOffhand); }
+
+MUTATOR_HOOKFUNCTION(nades_CheckThrow)
+{
+       if (self.offhand != OFFHAND_NADE || (self.weapons & WEPSET(HOOK))) {
+               nades_CheckThrow();
+               return true;
        }
+       return false;
+}
+
+MUTATOR_HOOKFUNCTION(nades_PlayerPreThink)
+{SELFPARAM();
+       if (!IS_PLAYER(self)) { return false; }
+
+       if (self.nade && self.offhand != OFFHAND_NADE) OFFHAND_NADE.offhand_think(OFFHAND_NADE, self, self.nade_altbutton);
 
        if(IS_PLAYER(self))
        {
@@ -972,6 +973,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerPreThink)
                        float key_count = 0;
                        FOR_EACH_KH_KEY(key) if(key.owner == self) { ++key_count; }
 
+                       float time_score;
                        if(self.flagcarried || self.ballcarried) // this player is important
                                time_score = autocvar_g_nades_bonus_score_time_flagcarrier;
                        else
@@ -1050,7 +1052,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerPreThink)
 }
 
 MUTATOR_HOOKFUNCTION(nades_PlayerSpawn)
-{
+{SELFPARAM();
        if(autocvar_g_nades_spawn)
                self.nade_refire = time + autocvar_g_spawnshieldtime;
        else
@@ -1061,6 +1063,8 @@ MUTATOR_HOOKFUNCTION(nades_PlayerSpawn)
 
        self.nade_timer = 0;
 
+       if (!self.offhand) self.offhand = OFFHAND_NADE;
+
        if(self.nade_spawnloc)
        {
                setorigin(self, self.nade_spawnloc.origin);
@@ -1120,7 +1124,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerDamage)
        {
                Unfreeze(frag_target);
                frag_target.health = autocvar_g_freezetag_revive_nade_health;
-               Send_Effect("iceorglass", frag_target.origin, '0 0 0', 3);
+               Send_Effect(EFFECT_ICEORGLASS, frag_target.origin, '0 0 0', 3);
                frag_damage = 0;
                frag_force = '0 0 0';
                Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_FREEZETAG_REVIVED_NADE, frag_target.netname);
@@ -1131,7 +1135,7 @@ MUTATOR_HOOKFUNCTION(nades_PlayerDamage)
 }
 
 MUTATOR_HOOKFUNCTION(nades_MonsterDies)
-{
+{SELFPARAM();
        if(IS_PLAYER(frag_attacker))
        if(DIFF_TEAM(frag_attacker, self))
        if(!(self.spawnflags & MONSTERFLAG_SPAWNED))
@@ -1141,14 +1145,14 @@ MUTATOR_HOOKFUNCTION(nades_MonsterDies)
 }
 
 MUTATOR_HOOKFUNCTION(nades_RemovePlayer)
-{
+{SELFPARAM();
        nades_Clear(self);
        nades_RemoveBonus(self);
        return false;
 }
 
 MUTATOR_HOOKFUNCTION(nades_SpectateCopy)
-{
+{SELFPARAM();
        self.nade_timer = other.nade_timer;
        self.nade_type = other.nade_type;
        self.pokenade_type = other.pokenade_type;
@@ -1187,20 +1191,6 @@ void nades_Initialize()
        addstat(STAT_NADE_BONUS_SCORE, AS_FLOAT, bonus_nade_score);
        addstat(STAT_HEALING_ORB, AS_FLOAT, stat_healing_orb);
        addstat(STAT_HEALING_ORB_ALPHA, AS_FLOAT, stat_healing_orb_alpha);
-
-       precache_model("models/ok_nade_counter/ok_nade_counter.md3");
-       precache_model("models/weapons/h_ok_grenade.iqm");
-       precache_model("models/weapons/v_ok_grenade.md3");
-       precache_model("models/ctf/shield.md3");
-
-       precache_sound("weapons/rocket_impact.wav");
-       precache_sound("weapons/grenade_bounce1.wav");
-       precache_sound("weapons/grenade_bounce2.wav");
-       precache_sound("weapons/grenade_bounce3.wav");
-       precache_sound("weapons/grenade_bounce4.wav");
-       precache_sound("weapons/grenade_bounce5.wav");
-       precache_sound("weapons/grenade_bounce6.wav");
-       precache_sound("overkill/grenadebip.ogg");
 }
 
 MUTATOR_DEFINITION(mutator_nades)