Fix instagib waypoints

diff --git a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
index 8673b96b35717946d6ce952dc62afe25a564035b..c9858830b670f94c58ac002516713f6f477ae6e2 100644 (file)
--- a/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
+++ b/qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
@@ -239,13 +239,7 @@ float spritelookupblinkvalue(string s)
     }
     if (s == WP_Item.netname) return ITEMS[self.wp_extra].m_waypointblink;
 
-    switch (s)
-    {
-        case "item-invis":       return 2;
-        case "item-extralife":   return 2;
-        case "item-speed":       return 2;
-        default:                 return 1;
-    }
+    return 1;
 }
 
 vector spritelookupcolor(string s, vector def)
@@ -269,13 +263,7 @@ string spritelookuptext(string s)
         return it.m_name;
     ));
 
-    switch (s)
-    {
-        case "item-invis": return _("Invisibility");
-        case "item-extralife": return _("Extra life");
-        case "item-speed": return _("Speed");
-        default: return s;
-    }
+    return s;
 }
 #endif
 

diff --git a/qcsrc/server/mutators/mutator_instagib.qc b/qcsrc/server/mutators/mutator_instagib.qc
index 2b69551e7152c98fc85921b16b99c405d6ed22bb..3055dbf539b931e6137fdbc0c4cad513d26118c2 100644 (file)
--- a/qcsrc/server/mutators/mutator_instagib.qc
+++ b/qcsrc/server/mutators/mutator_instagib.qc
@@ -7,19 +7,29 @@
 
 #include "../../common/items/all.qc"
 
-void spawnfunc_item_minst_cells (void)
+void spawnfunc_item_minst_cells()
 {
        if (!g_instagib) { remove(self); return; }
-       if (!self.ammo_cells)
-               self.ammo_cells = autocvar_g_instagib_ammo_drop;
+       if (!self.ammo_cells) self.ammo_cells = autocvar_g_instagib_ammo_drop;
+       StartItemA(ITEM_VaporizerCells);
+}
 
-       StartItemA (ITEM_VaporizerCells);
+void instagib_invisibility()
+{
+       self.strength_finished = autocvar_g_balance_powerup_strength_time;
+       StartItemA(ITEM_Invisibility);
 }
 
-void instagib_health_mega()
+void instagib_extralife()
 {
        self.max_health = 1;
-       StartItemA (ITEM_ExtraLife);
+       StartItemA(ITEM_ExtraLife);
+}
+
+void instagib_speed()
+{
+       self.invincible_finished = autocvar_g_balance_powerup_invincible_time;
+       StartItemA(ITEM_Speed);
 }
 
 .float instagib_nextthink;
@@ -140,7 +150,7 @@ MUTATOR_HOOKFUNCTION(instagib_MonsterSpawn)
 
 MUTATOR_HOOKFUNCTION(instagib_BotShouldAttack)
 {
-       if(checkentity.items & ITEM_Strength.m_itemid)
+       if (checkentity.items & ITEM_Invisibility.m_itemid)
                return true;
 
        return false;
@@ -175,14 +185,14 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups)
        if (!(self.effects & EF_FULLBRIGHT))
                self.effects |= EF_FULLBRIGHT;
 
-       if (self.items & ITEM_Strength.m_itemid)
+       if (self.items & ITEM_Invisibility.m_itemid)
        {
                play_countdown(self.strength_finished, "misc/poweroff.wav");
                if (time > self.strength_finished)
                {
                        self.alpha = default_player_alpha;
                        self.exteriorweaponentity.alpha = default_weapon_alpha;
-                       self.items &= ~ITEM_Strength.m_itemid;
+                       self.items &= ~ITEM_Invisibility.m_itemid;
                        Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERDOWN_INVISIBILITY);
                }
        }
@@ -192,18 +202,18 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups)
                {
                        self.alpha = autocvar_g_instagib_invis_alpha;
                        self.exteriorweaponentity.alpha = autocvar_g_instagib_invis_alpha;
-                       self.items |= ITEM_Strength.m_itemid;
+                       self.items |= ITEM_Invisibility.m_itemid;
                        Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERUP_INVISIBILITY, self.netname);
                        Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERUP_INVISIBILITY);
                }
        }
 
-       if (self.items & ITEM_Shield.m_itemid)
+       if (self.items & ITEM_Speed.m_itemid)
        {
                play_countdown(self.invincible_finished, "misc/poweroff.wav");
                if (time > self.invincible_finished)
                {
-                       self.items &= ~ITEM_Shield.m_itemid;
+                       self.items &= ~ITEM_Speed.m_itemid;
                        Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERDOWN_SPEED);
                }
        }
@@ -211,7 +221,7 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups)
        {
                if (time < self.invincible_finished)
                {
-                       self.items |= ITEM_Shield.m_itemid;
+                       self.items |= ITEM_Speed.m_itemid;
                        Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_POWERUP_SPEED, self.netname);
                        Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_POWERUP_SPEED);
                }
@@ -221,7 +231,7 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerPowerups)
 
 MUTATOR_HOOKFUNCTION(instagib_PlayerPhysics)
 {
-       if(self.items & ITEM_Shield.m_itemid)
+       if(self.items & ITEM_Speed.m_itemid)
                self.stat_sv_maxspeed = self.stat_sv_maxspeed * autocvar_g_instagib_speed_highspeed;
 
        return false;
@@ -305,7 +315,7 @@ MUTATOR_HOOKFUNCTION(instagib_PlayerDamage)
                frag_mirrordamage = 0;
        }
 
-       if((frag_target.buffs & BUFF_INVISIBLE.m_itemid) || (frag_target.items & ITEM_Strength.m_itemid))
+       if((frag_target.buffs & BUFF_INVISIBLE.m_itemid) || (frag_target.items & ITEM_Invisibility.m_itemid))
                yoda = 1;
 
        return false;
@@ -372,24 +382,13 @@ MUTATOR_HOOKFUNCTION(instagib_CustomizeWaypoint)
 
        // if you have the invisibility powerup, sprites ALWAYS are restricted to your team
        // but only apply this to real players, not to spectators
-       if((self.owner.flags & FL_CLIENT) && (self.owner.items & ITEM_Strength.m_itemid) && (e == other))
+       if((self.owner.flags & FL_CLIENT) && (self.owner.items & ITEM_Invisibility.m_itemid) && (e == other))
        if(DIFF_TEAM(self.owner, e))
                return true;
 
        return false;
 }
 
-MUTATOR_HOOKFUNCTION(instagib_ItemCountdown)
-{
-       switch (self.items)
-       {
-               case ITEM_Strength.m_itemid:  item_name = "item-invis";     item_color = '0 0 1'; break;
-               case ITEM_ExtraLife.m_itemid: item_name = "item-extralife"; item_color = '1 0 0'; break;
-               case ITEM_Shield.m_itemid:    item_name = "item-speed";     item_color = '1 0 1'; break;
-       }
-       return false;
-}
-
 MUTATOR_HOOKFUNCTION(instagib_PlayerDies)
 {      
        if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER.m_id))
@@ -430,17 +429,19 @@ MUTATOR_HOOKFUNCTION(instagib_ItemTouch)
 MUTATOR_HOOKFUNCTION(instagib_OnEntityPreSpawn)
 {
        if (!autocvar_g_powerups) { return false; }
-       if (!(self.classname == "item_strength" || self.classname == "item_invincible" || self.itemdef == ITEM_HealthMega))
+       // Can't use .itemdef here
+       if (!(self.classname == "item_strength" || self.classname == "item_invincible" || self.classname == "item_health_mega"))
                return false;
 
        entity e = spawn();
 
-       if(random() < 0.3)
-               e.think = spawnfunc_item_strength;
-       else if(random() < 0.6)
-               e.think = instagib_health_mega;
+       float r = random();
+       if (r < 0.3)
+               e.think = instagib_invisibility;
+       else if (r < 0.6)
+               e.think = instagib_extralife;
        else
-               e.think = spawnfunc_item_invincible;
+               e.think = instagib_speed;
 
        e.nextthink = time + 0.1;
        e.spawnflags = self.spawnflags;
@@ -482,7 +483,6 @@ MUTATOR_DEFINITION(mutator_instagib)
        MUTATOR_HOOK(ItemTouch, instagib_ItemTouch, CBC_ORDER_ANY);
        MUTATOR_HOOK(FilterItem, instagib_FilterItem, CBC_ORDER_ANY);
        MUTATOR_HOOK(CustomizeWaypoint, instagib_CustomizeWaypoint, CBC_ORDER_ANY);
-       MUTATOR_HOOK(Item_RespawnCountdown, instagib_ItemCountdown, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDies, instagib_PlayerDies, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerDamage_SplitHealthArmor, instagib_SplitHealthArmor, CBC_ORDER_ANY);
        MUTATOR_HOOK(PlayerPowerups, instagib_PlayerPowerups, CBC_ORDER_ANY);

diff --git a/qcsrc/server/mutators/mutator_instagib_items.qc b/qcsrc/server/mutators/mutator_instagib_items.qc
index 339dc49aa5365f0e5f672fa520d1458acafffc79..8beec7db2de94177af6921f1592058842cc9d704 100644 (file)
--- a/qcsrc/server/mutators/mutator_instagib_items.qc
+++ b/qcsrc/server/mutators/mutator_instagib_items.qc
@@ -1,8 +1,5 @@
 #include "../../common/items/item.qh"
 
-#define WITH(it) this.m_##it;
-#define CONFIGURE(...) MAP(WITH, __VA_ARGS__)
-
 float instagib_respawntime_ammo = 45;
 float instagib_respawntimejitter_ammo = 0;
 GETTER(float, instagib_respawntime_ammo)
@@ -24,13 +21,32 @@ REGISTER_ITEM(VaporizerCells, Ammo) {
 REGISTER_ITEM(ExtraLife, Powerup) {
     this.m_model                =   "g_h100.md3";
     this.m_sound                =   "misc/megahealth.wav";
-    this.m_name                 =   "Extralife";
+    this.m_name                 =   "Extra life";
     this.m_icon                 =   "item_mega_health";
-#ifdef SVQC
+    this.m_color                =   '1 0 0';
+    this.m_waypoint             =   _("Extra life");
+    this.m_waypointblink        =   2;
     this.m_itemid               =   IT_NAILS;
-    this.m_botvalue             =   BOT_PICKUP_RATING_HIGH;
-#endif
 }
 
-#undef WITH
-#undef CONFIGURE
+REGISTER_ITEM(Invisibility, Powerup) {
+    this.m_model            =   "g_strength.md3";
+    this.m_sound            =   "misc/powerup.wav";
+    this.m_name             =   "Invisibility";
+    this.m_icon             =   "strength";
+    this.m_color            =   '0 0 1';
+    this.m_waypoint         =   _("Invisibility");
+    this.m_waypointblink    =   2;
+    this.m_itemid           =   IT_STRENGTH;
+}
+
+REGISTER_ITEM(Speed, Powerup) {
+    this.m_model            =   "g_invincible.md3";
+    this.m_sound            =   "misc/powerup_shield.wav";
+    this.m_name             =   "Speed";
+    this.m_icon             =   "shield";
+    this.m_color            =   '1 0 1';
+    this.m_waypoint         =   _("Speed");
+    this.m_waypointblink    =   2;
+    this.m_itemid           =   IT_INVINCIBLE;
+}