Weapons: cache WepSet

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / instagib / instagib.qc

diff --git a/qcsrc/common/mutators/mutator/instagib/instagib.qc b/qcsrc/common/mutators/mutator/instagib/instagib.qc
index cc6f405e66faadc8702dfd6eb72736a609ab1c54..6f35817149af1fc753a52b9691d95c5c93721d14 100644 (file)
--- a/qcsrc/common/mutators/mutator/instagib/instagib.qc
+++ b/qcsrc/common/mutators/mutator/instagib/instagib.qc
@@ -3,13 +3,20 @@
 
 #include "items.qc"
 
+#ifdef SVQC
+float autocvar_g_instagib_invis_alpha;
+#endif
+
 #endif
 
 #ifdef IMPLEMENTATION
 #ifdef SVQC
 
+int autocvar_g_instagib_ammo_drop;
+int autocvar_g_instagib_extralives;
+float autocvar_g_instagib_speed_highspeed;
+
 #include "../../../../server/cl_client.qh"
-#include "../../../buffs/all.qh"
 
 #include "../../../items/all.qc"
 
@@ -19,25 +26,24 @@ spawnfunc(item_minst_cells)
 {
        if (!g_instagib) { remove(self); return; }
        if (!self.ammo_cells) self.ammo_cells = autocvar_g_instagib_ammo_drop;
-       StartItemA(ITEM_VaporizerCells);
+       StartItem(this, ITEM_VaporizerCells);
 }
 
 void instagib_invisibility()
 {SELFPARAM();
        self.strength_finished = autocvar_g_balance_powerup_strength_time;
-       StartItemA(ITEM_Invisibility);
+       StartItem(this, ITEM_Invisibility);
 }
 
 void instagib_extralife()
 {SELFPARAM();
-       self.max_health = 1;
-       StartItemA(ITEM_ExtraLife);
+       StartItem(this, ITEM_ExtraLife);
 }
 
 void instagib_speed()
 {SELFPARAM();
        self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
-       StartItemA(ITEM_Speed);
+       StartItem(this, ITEM_Speed);
 }
 
 .float instagib_nextthink;
@@ -73,59 +79,59 @@ void instagib_ammocheck()
                self.instagib_needammo = true;
                if (self.health <= 5)
                {
-                       Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 5, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_INSTAGIB_TERMINATED);
                }
                else if (self.health <= 10)
                {
-                       Damage(self, self, self, 5, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 5, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_1);
                }
                else if (self.health <= 20)
                {
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_2);
                }
                else if (self.health <= 30)
                {
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_3);
                }
                else if (self.health <= 40)
                {
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_4);
                }
                else if (self.health <= 50)
                {
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_5);
                }
                else if (self.health <= 60)
                {
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_6);
                }
                else if (self.health <= 70)
                {
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_7);
                }
                else if (self.health <= 80)
                {
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_8);
                }
                else if (self.health <= 90)
                {
                        Send_Notification(NOTIF_ONE_ONLY, self, MSG_CENTER, CENTER_INSTAGIB_FINDAMMO);
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                        Send_Notification(NOTIF_ONE, self, MSG_ANNCE, ANNCE_NUM_9);
                }
                else
                {
                        Send_Notification(NOTIF_ONE_ONLY, self, MSG_MULTI, MULTI_INSTAGIB_FINDAMMO);
-                       Damage(self, self, self, 10, DEATH_NOAMMO, self.origin, '0 0 0');
+                       Damage(self, self, self, 10, DEATH_NOAMMO.m_id, self.origin, '0 0 0');
                }
        }
        self.instagib_nextthink = time + 1;
@@ -269,11 +275,11 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDamage_Calculate)
 
        if(IS_PLAYER(frag_target))
        {
-               if(frag_deathtype == DEATH_FALL)
+               if(frag_deathtype == DEATH_FALL.m_id)
                        frag_damage = 0; // never count fall damage
 
                if(!autocvar_g_instagib_damagedbycontents)
-               switch(frag_deathtype)
+               switch(DEATH_ENT(frag_deathtype))
                {
                        case DEATH_DROWN:
                        case DEATH_SLIME:
@@ -283,7 +289,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDamage_Calculate)
                }
 
                if(IS_PLAYER(frag_attacker))
-               if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER.m_id))
+               if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
                {
                        if(frag_target.armorvalue)
                        {
@@ -295,7 +301,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDamage_Calculate)
                        }
                }
 
-               if(IS_PLAYER(frag_attacker) && DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER.m_id))
+               if(IS_PLAYER(frag_attacker) && DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
                {
                        if(frag_deathtype & HITTYPE_SECONDARY)
                        {
@@ -325,7 +331,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDamage_Calculate)
                frag_mirrordamage = 0;
        }
 
-       if((frag_target.buffs & BUFF_INVISIBLE.m_itemid) || (frag_target.items & ITEM_Invisibility.m_itemid))
+       if(frag_target.alpha && frag_target.alpha < 1)
                yoda = 1;
 
        return false;
@@ -367,6 +373,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, FilterItem)
                e.noalign = self.noalign;
         e.cnt = self.cnt;
         e.team = self.team;
+        e.spawnfunc_checked = true;
                WITH(entity, self, e, spawnfunc_item_minst_cells(e));
                return true;
        }
@@ -398,7 +405,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, CustomizeWaypoint)
 
 MUTATOR_HOOKFUNCTION(mutator_instagib, PlayerDies)
 {
-       if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER.m_id))
+       if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
                frag_damage = 1000; // always gib if it was a vaporizer death
 
        return FALSE;
@@ -423,7 +430,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, ItemTouch)
                return MUT_ITEMTOUCH_CONTINUE;
        }
 
-       if(self.max_health)
+       if(self.itemdef == ITEM_ExtraLife)
        {
                other.armorvalue = bound(other.armorvalue, 999, other.armorvalue + autocvar_g_instagib_extralives);
                Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_EXTRALIVES);
@@ -472,7 +479,7 @@ MUTATOR_HOOKFUNCTION(mutator_instagib, BuildMutatorsPrettyString)
 
 MUTATOR_HOOKFUNCTION(mutator_instagib, SetModname)
 {
-       modname = "instagib";
+       modname = "InstaGib";
        return true;
 }