X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Ft_items.qc;h=d936ddb7b3267986014254febe3568db8fd2fc21;hb=dddb63ef85a3e81c80424318f1863bd22ec3e541;hp=402a25c1856b46693026614f0cf81f05599dfb7b;hpb=e676224c75c5204e8a46ee913237d623c077e780;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 402a25c1..d936ddb7 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -174,7 +174,7 @@ void Item_RespawnCountdown (void)
 				WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, TRUE);
 				if(self.waypointsprite_attached)
 				{
-					WaypointSprite_UpdateTeamRadar(self.waypointsprite_attached, RADARICON_POWERUP, rgb);
+					WaypointSprite_UpdateRadar(self.waypointsprite_attached, RADARICON_POWERUP, rgb);
 					//WaypointSprite_UpdateMaxHealth(self.waypointsprite_attached, ITEM_RESPAWN_TICKS + 1);
 					WaypointSprite_UpdateBuildFinished(self.waypointsprite_attached, time + ITEM_RESPAWN_TICKS);
 				}
@@ -292,13 +292,17 @@ void Item_Consumable_Remove(entity e, float regurgitate)
 {
 	if(regurgitate)
 	{
+		float scalediff, sz;
+		sz = e.scale ? e.scale : 1; // the line below does not work if I define this directly (fteqcc bug?)
+		scalediff = cvar("g_healthsize") ? sz / e.predator.scale : sz; // the tighter the gut, the greater the velocity
+
 		// predator effects, some common to those in Vore_Regurgitate
 		PlayerSound(e.predator, playersound_regurgitate, CHAN_VOICE, VOICETYPE_PLAYERSOUND);
 		setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
-		pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', 1);
-		e.predator.punchangle_x = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item");
-		e.predator.punchangle_y = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item");
-		e.predator.punchangle_z = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item");
+		pointparticles(particleeffectnum("vore_regurgitate"), e.predator.origin, '0 0 0', floor(scalediff * PARTICLE_MULTIPLIER));
+		e.predator.punchangle_x = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;
+		e.predator.punchangle_y = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;
+		e.predator.punchangle_z = crandom() * cvar("g_balance_vore_regurgitate_predator_punchangle_item") * scalediff;
 		e.predator.regurgitate_prepare = 0;
 		e.predator.action_delay = time + cvar("g_balance_vore_action_delay");
 
@@ -313,6 +317,7 @@ void Item_Consumable_Remove(entity e, float regurgitate)
 void Item_Consumable_Spawn(entity e, entity pl)
 {
 	entity item;
+
 	item = spawn();
 	item.owner = e;
 	item.classname = "consumable";
@@ -346,12 +351,16 @@ void Item_Consumable_Spawn(entity e, entity pl)
 	if(stov(cvar_string("g_vore_regurgitatecolor_color_normal")))
 		item.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_normal"));
 
+	float scalediff, sz;
+	sz = e.scale ? e.scale : 1; // the line below does not work if I define this directly (fteqcc bug?)
+	scalediff = cvar("g_healthsize") ? sz / pl.scale : sz; // the tighter the gut, the greater the velocity
+
 	// predator effects, some common to those in Vore_Swallow
 	PlayerSound(pl, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);
 	setanim(pl, pl.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
-	pl.punchangle_x = crandom() * cvar("g_balance_vore_swallow_predator_punchangle_item");
-	pl.punchangle_y = crandom() * cvar("g_balance_vore_swallow_predator_punchangle_item");
-	pl.punchangle_z = crandom() * cvar("g_balance_vore_swallow_predator_punchangle_item");
+	pl.punchangle_x = crandom() * cvar("g_balance_vore_swallow_predator_punchangle_item") * scalediff;
+	pl.punchangle_y = crandom() * cvar("g_balance_vore_swallow_predator_punchangle_item") * scalediff;
+	pl.punchangle_z = crandom() * cvar("g_balance_vore_swallow_predator_punchangle_item") * scalediff;
 	pl.regurgitate_prepare = 0;
 	pl.action_delay = time + cvar("g_balance_vore_action_delay");
 }
@@ -387,12 +396,18 @@ void Item_DroppedConsumable_Spawn(entity e)
 	item.scale = e.scale;
 	item.colormod = e.colormod;
 
+	if(cvar("g_nodepthtestitems"))
+		item.effects |= EF_NODEPTHTEST;
+
+	float scalediff, sz;
+	sz = e.scale ? e.scale : 1; // the line below does not work if I define this directly (fteqcc bug?)
+	scalediff = cvar("g_healthsize") ? sz / e.predator.scale : sz; // the tighter the gut, the greater the velocity
+
 	setorigin(item, e.predator.origin);
 	item.angles_y = e.predator.angles_y;
 	makevectors(e.predator.v_angle);
-	item.velocity = v_forward * cvar("g_balance_vore_regurgitate_force");
-	e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce");
-
+	item.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff;
+	e.predator.velocity = e.predator.velocity + (-v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff); // don't use += here to avoid a fteqcc bug
 	item.touch = Item_DroppedConsumable_Touch;
 	item.cnt = time + 1; // 1 second delay
 	SUB_SetFade(item, time + 20, 1);
@@ -1080,12 +1095,6 @@ void spawnfunc_item_health_large (void) {
 }
 
 void spawnfunc_item_health_mega (void) {
-	if(!cvar("g_powerup_superhealth"))
-		return;
-
-	if((g_arena || g_ca) && !cvar("g_arena_powerups"))
-		return;
-
 	if(!self.max_health)
 		self.max_health = g_pickup_healthmega_max;
 	if(!self.health)