Fix instagib waypoints

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_instagib_items.qc

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;
+}