Merge branch 'master' into Mario/weapons

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

diff --git a/qcsrc/server/mutators/mutator_minstagib.qc b/qcsrc/server/mutators/mutator_minstagib.qc
index 20811ad50815a4906ef0a37eb5c9a95de5f6111b..d05e7e9c4261c48c76f08325b440fb06f0bd640c 100644 (file)
--- a/qcsrc/server/mutators/mutator_minstagib.qc
+++ b/qcsrc/server/mutators/mutator_minstagib.qc
@@ -6,7 +6,7 @@ void spawnfunc_item_minst_cells (void)
 
        StartItem ("models/items/a_cells.md3",
                           "misc/itempickup.wav", 45, 0,
-                          "MinstaNex Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100);
+                          "Vaporizer Ammo", IT_CELLS, 0, 0, generic_pickupevalfunc, 100);
 }
 
 void minstagib_health_mega()
@@ -245,7 +245,7 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage)
                }
 
                if(IS_PLAYER(frag_attacker))
-               if(DEATH_ISWEAPON(frag_deathtype, WEP_MINSTANEX))
+               if(DEATH_ISWEAPON(frag_deathtype, WEP_VAPORIZER))
                if(frag_target.armorvalue)
                {
                        frag_target.armorvalue -= 1;
@@ -256,7 +256,7 @@ MUTATOR_HOOKFUNCTION(minstagib_PlayerDamage)
                }
 
                if(IS_PLAYER(frag_attacker))
-               if (DEATH_ISWEAPON(frag_deathtype, WEP_LASER))
+               if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER))
                {
                        frag_damage = 0;
                        frag_mirrordamage = 0;
@@ -296,8 +296,8 @@ MUTATOR_HOOKFUNCTION(minstagib_SetStartItems)
 
        start_health = 100;
        start_armorvalue = 0;
-       start_weapons = WEPSET_MINSTANEX;
-       warmup_start_weapons = WEPSET_MINSTANEX;
+       start_weapons = WEPSET_VAPORIZER;
+       warmup_start_weapons = WEPSET_VAPORIZER;
        start_items |= IT_UNLIMITED_SUPERWEAPONS;
 
        return FALSE;
@@ -308,13 +308,13 @@ MUTATOR_HOOKFUNCTION(minstagib_FilterItem)
        if(self.classname == "item_cells")
                return TRUE; // no normal cells?
 
-       if(self.weapon == WEP_MINSTANEX && self.classname == "droppedweapon")
+       if(self.weapon == WEP_VAPORIZER && self.classname == "droppedweapon")
        {
                self.ammo_cells = autocvar_g_minstagib_ammo_drop;
                return FALSE;
        }
 
-       if(self.weapon == WEP_ROCKET_LAUNCHER || self.weapon == WEP_NEX)
+       if(self.weapon == WEP_DEVASTATOR || self.weapon == WEP_VORTEX)
        {
                entity e = spawn();
                setorigin(e, self.origin);