Megahealth is not a powerup. Always enable it

[voretournament/voretournament.git] / data / qcsrc / server / t_items.qc

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index cb11ff0ff7d049d309611f2e87ba47cac67b90ec..d936ddb7b3267986014254febe3568db8fd2fc21 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -293,13 +293,13 @@ void Item_Consumable_Remove(entity e, float regurgitate)
        if(regurgitate)\r
        {\r
                float scalediff, sz;\r
-               sz = e.scale; // the line below does not work if I define this directly (fteqcc bug?)\r
+               sz = e.scale ? e.scale : 1; // the line below does not work if I define this directly (fteqcc bug?)\r
                scalediff = cvar("g_healthsize") ? sz / e.predator.scale : sz; // the tighter the gut, the greater the velocity\r
 \r
                // predator effects, some common to those in Vore_Regurgitate\r
                PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
                setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
-               pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);\r
+               pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', floor(scalediff * PARTICLE_MULTIPLIER));\r
                e.predator.punchangle_x = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;\r
                e.predator.punchangle_y = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;\r
                e.predator.punchangle_z = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;\r
@@ -318,10 +318,6 @@ void Item_Consumable_Spawn(entity e, entity pl)
 {\r
        entity item;\r
 \r
-       float scalediff, sz;\r
-       sz = e.scale; // the line below does not work if I define this directly (fteqcc bug?)\r
-       scalediff = cvar("g_healthsize") ? sz / e.predator.scale : sz; // the tighter the gut, the greater the velocity\r
-\r
        item = spawn();\r
        item.owner = e;\r
        item.classname = "consumable";\r
@@ -355,6 +351,10 @@ void Item_Consumable_Spawn(entity e, entity pl)
        if(stov(cvar_string("g_vore_regurgitatecolor_color_normal")))\r
                item.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_normal"));\r
 \r
+       float scalediff, sz;\r
+       sz = e.scale ? e.scale : 1; // the line below does not work if I define this directly (fteqcc bug?)\r
+       scalediff = cvar("g_healthsize") ? sz / pl.scale : sz; // the tighter the gut, the greater the velocity\r
+\r
        // predator effects, some common to those in Vore_Swallow\r
        PlayerSound(pl, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(pl, pl.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
@@ -400,14 +400,14 @@ void Item_DroppedConsumable_Spawn(entity e)
                item.effects |= EF_NODEPTHTEST;\r
 \r
        float scalediff, sz;\r
-       sz = e.scale; // the line below does not work if I define this directly (fteqcc bug?)\r
+       sz = e.scale ? e.scale : 1; // the line below does not work if I define this directly (fteqcc bug?)\r
        scalediff = cvar("g_healthsize") ? sz / e.predator.scale : sz; // the tighter the gut, the greater the velocity\r
 \r
        setorigin(item, e.predator.origin);\r
        item.angles_y = e.predator.angles_y;\r
        makevectors(e.predator.v_angle);\r
        item.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff;\r
-       e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff;\r
+       e.predator.velocity = e.predator.velocity + (-v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff); // don't use += here to avoid a fteqcc bug\r
        item.touch = Item_DroppedConsumable_Touch;\r
        item.cnt = time + 1; // 1 second delay\r
        SUB_SetFade(item, time + 20, 1);\r
@@ -1095,12 +1095,6 @@ void spawnfunc_item_health_large (void) {
 }\r
 \r
 void spawnfunc_item_health_mega (void) {\r
-       if(!cvar("g_powerup_superhealth"))\r
-               return;\r
-\r
-       if((g_arena || g_ca) && !cvar("g_arena_powerups"))\r
-               return;\r
-\r
        if(!self.max_health)\r
                self.max_health = g_pickup_healthmega_max;\r
        if(!self.health)\r