X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Ft_items.qc;h=f785c3bca16080bcb40eaf984c128d387ea320e3;hb=dec59284d2680f03706822b2b94067cbb10d9813;hp=71b380560b6e97dfab8df3524a4b58a5c0f36597;hpb=e8d42583b59129ed67a3b784b6349a2327027b20;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 71b38056..f785c3bc 100644
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -46,7 +46,7 @@ float Item_Customize()
 	}
 	else
 	{
-		if(g_ghost_items && self.respawntime > 0)
+		if(g_ghost_items)
 		{
 			self.colormod = stov(cvar_string("g_ghost_items_color"));
 			self.glowmod = self.colormod;
@@ -97,7 +97,7 @@ void Item_Show (entity e, float mode)
 
 		e.spawnshieldtime = 0; // field indicates whether picking it up may give you anything other than the weapon
 	}
-	else if(g_ghost_items && self.respawntime > 0)
+	else if(g_ghost_items)
 	{
 		// make the item translucent green and not touchable
 		e.model = e.mdl;
@@ -144,7 +144,6 @@ void Item_Respawn (void)
 		sound (self, CHAN_TRIGGER, "misc/itemrespawn.wav", VOL_BASE, ATTN_NORM);	// play respawn sound
 	setorigin (self, self.origin);
 
-	//pointparticles(particleeffectnum("item_respawn"), self.origin + self.mins_z * '0 0 1' + '0 0 48', '0 0 0', 1);
 	pointparticles(particleeffectnum("item_respawn"), self.origin + 0.5 * (self.mins + self.maxs), '0 0 0', 1);
 }
 
@@ -208,8 +207,10 @@ void Item_ScheduleRespawnIn(entity e, float t)
 void Item_ScheduleRespawn(entity e)
 {
 	Item_Show(e, 0);
-	if(e.respawntime > 0)
+	if(e.respawntime > 0) // if respawntime is -1, this item does not respawn
 		Item_ScheduleRespawnIn(e, ITEM_RESPAWNTIME(e));
+	else
+		remove(e);
 }
 
 void Item_ScheduleInitialRespawn(entity e)
@@ -218,6 +219,185 @@ void Item_ScheduleInitialRespawn(entity e)
 	Item_ScheduleRespawnIn(e, game_starttime - time + ITEM_RESPAWNTIME_INITIAL(e));
 }
 
+.float inithealth, initdmg;
+.float item_digestion_step;
+void Item_Consumable_Think()
+{
+	if(self.predator.regurgitate_prepare && time > self.predator.regurgitate_prepare)
+	{
+		self.predator.regurgitate_prepare = 0;
+		self.predator.complain_vore = time + complain_delay_time; // prevent complaining the next frame if this empties our stomach
+		Item_Consumable_Remove(self, TRUE);
+		return;
+	}
+	if(self.predator.stat_eaten)
+	{
+		// prey can't hold consumable items
+		Item_Consumable_Remove(self, TRUE);
+		return;
+	}
+
+	self.scale = self.health / self.inithealth; // scale matches the item's digestion progress
+	self.dmg = self.initdmg * self.scale;
+	if(self.health <= 0)
+	{
+		// this item is done
+		Item_Consumable_Remove(self, FALSE);
+		return;
+	}
+
+	if(self.predator.digesting)
+	{
+		if(time > self.item_digestion_step)
+		{
+			// if distributed digestion is enabled, reduce digestion strength by the amount of prey in our stomach
+			float damage, damage_offset;
+
+			damage_offset = 1;
+			if(cvar("g_balance_vore_digestion_distribute")) // apply distributed digestion damage
+				damage_offset /= (1 - (self.predator.stomach_load / self.predator.stomach_maxload) * bound(0, cvar("g_balance_vore_digestion_distribute"), 1));
+			damage = ceil(cvar("g_balance_vore_digestion_damage_item") / damage_offset);
+
+			self.health -= damage;
+			if(self.predator.health + damage <= self.max_health)
+				self.predator.health += damage;
+			else if(self.predator.health < self.max_health)
+				self.predator.health = self.max_health;
+			self.predator.pauserothealth_finished = max(self.predator.pauserothealth_finished, time + cvar("g_balance_pause_health_rot"));
+
+			self.item_digestion_step = time + vore_steptime;
+		}
+
+		if(stov(cvar_string("g_vore_regurgitatecolor_color_digest")))
+			self.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_digest"));
+	}
+
+	self.nextthink = time;
+}
+
+float Item_Consumable_Customizeentityforclient()
+{
+	if(cvar("g_vore_neighborprey_distance_item") && self.predator == other.predator && !(other.cvar_chase_active || other.classname == "observer"))
+	{
+		self.alpha = default_player_alpha; // allow seeing neighboring items
+		self.effects |= EF_NODEPTHTEST; // don't hide behind the stomach's own EF_NODEPTHTEST
+	}
+	else
+		self.alpha = -1; // hide item
+	return TRUE;
+}
+
+void Item_DroppedConsumable_Spawn(entity e);
+void Item_Consumable_Remove(entity e, float regurgitate)
+{
+	if(regurgitate)
+	{
+		// 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");
+		e.predator.regurgitate_prepare = 0;
+		e.predator.action_delay = time + cvar("g_balance_vore_action_delay");
+
+		Item_DroppedConsumable_Spawn(e);
+	}
+
+	e.nextthink = 0;
+	remove(e);
+	e = world;
+}
+
+void Item_Consumable_Spawn(entity e, entity pl)
+{
+	entity item;
+	item = spawn();
+	item.owner = e;
+	item.classname = "consumable";
+	item.movetype = MOVETYPE_FOLLOW;
+	item.solid = SOLID_NOT;
+	setmodel(item, e.model);
+	item.health = e.health;
+	if(e.inithealth)
+	{
+		item.inithealth = e.inithealth;
+		item.initdmg = e.initdmg;
+	}
+	else
+	{
+		item.inithealth = e.health;
+		item.initdmg = e.dmg;
+	}
+	item.max_health = e.max_health;
+
+	item.predator = pl;
+	item.aiment = pl;
+	item.view_ofs_x = CONSUMABLE_VIEW_OFS_x + crandom() * cvar("g_vore_neighborprey_distance_item");
+	item.view_ofs_y = CONSUMABLE_VIEW_OFS_y + crandom() * cvar("g_vore_neighborprey_distance_item");
+	item.view_ofs_z = CONSUMABLE_VIEW_OFS_z + crandom() * cvar("g_vore_neighborprey_distance_item");
+	item.angles = randomvec() * 360;
+
+	item.customizeentityforclient = Item_Consumable_Customizeentityforclient;
+	item.think = Item_Consumable_Think;
+	item.nextthink = time;
+
+	if(stov(cvar_string("g_vore_regurgitatecolor_color_normal")))
+		item.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_normal"));
+
+	// 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.regurgitate_prepare = 0;
+	pl.action_delay = time + cvar("g_balance_vore_action_delay");
+}
+
+void Item_DroppedConsumable_Touch()
+{
+	if(time < self.cnt)
+		return;
+
+	// give the consumable item to the player touching it
+	if not(other.stomach_load + self.dmg > other.stomach_maxload || other.stomach_load + self.initdmg > other.stomach_maxload)
+	if not(!cvar("g_balance_health_consumable_alwayspickup") && other.health >= self.max_health)
+	{
+		Item_Consumable_Spawn(self, other);
+		remove(self);
+		self = world;
+	}
+}
+
+void Item_DroppedConsumable_Spawn(entity e)
+{
+	entity item;
+	item = spawn();
+	item.owner = world;
+	item.classname = "droppedconsumable";
+	item.movetype = MOVETYPE_TOSS;
+	item.solid = SOLID_TRIGGER;
+	setmodel(item, e.model);
+	item.health = e.health;
+	item.inithealth = e.inithealth;
+	item.initdmg = e.initdmg;
+	item.max_health = e.max_health;
+	item.scale = e.scale;
+	item.colormod = e.colormod;
+
+	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.touch = Item_DroppedConsumable_Touch;
+	item.cnt = time + 1; // 1 second delay
+	SUB_SetFade(item, time + 20, 1);
+}
+
 float Item_GiveTo(entity item, entity player)
 {
 	float _switchweapon;
@@ -300,11 +480,22 @@ float Item_GiveTo(entity item, entity player)
 		}
 
 		if (item.health)
-		if (player.health < item.max_health)
 		{
-			pickedup = TRUE;
-			player.health = min(player.health + item.health, item.max_health);
-			player.pauserothealth_finished = max(player.pauserothealth_finished, time + cvar("g_balance_pause_health_rot"));
+			if(item.dmg) // consumable item
+			{
+				if(player.stomach_load + item.dmg <= player.stomach_maxload)
+				if not(!cvar("g_balance_health_consumable_alwayspickup") && player.health >= item.max_health)
+				{
+					pickedup = TRUE;
+					Item_Consumable_Spawn(self, player);
+				}
+			}
+			else if (player.health < item.max_health)
+			{
+				pickedup = TRUE;
+				player.health = min(player.health + item.health, item.max_health);
+				player.pauserothealth_finished = max(player.pauserothealth_finished, time + cvar("g_balance_pause_health_rot"));
+			}
 		}
 		if (item.armorvalue)
 		if (player.armorvalue < item.max_armorvalue)
@@ -353,6 +544,8 @@ void Item_Touch (void)
 	if(!Item_GiveTo(self, other))
 		return;
 
+	other.last_pickup = time;
+
 	pointparticles(particleeffectnum("item_pickup"), self.origin, '0 0 0', 1);
 
 	if (self.classname == "droppedweapon")
@@ -623,7 +816,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 
 		weaponsInMap |= weaponid;
 
-		if(g_lms || g_ca)
+		if(g_lms)
 		{
 			startitem_failed = TRUE;
 			remove(self);
@@ -864,6 +1057,7 @@ void spawnfunc_item_health_small (void) {
 		self.max_health = g_pickup_healthsmall_max;
 	if(!self.health)
 		self.health = g_pickup_healthsmall;
+	self.dmg = g_pickup_healthsmall_consumable;
 	StartItem ("models/items/g_h1.md3", "misc/minihealth.wav", g_pickup_respawntime_short, g_pickup_respawntimejitter_short, "5 Health", IT_5HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
 }
 
@@ -872,6 +1066,7 @@ void spawnfunc_item_health_medium (void) {
 		self.max_health = g_pickup_healthmedium_max;
 	if(!self.health)
 		self.health = g_pickup_healthmedium;
+	self.dmg = g_pickup_healthmedium_consumable;
 	StartItem ("models/items/g_h25.md3", "misc/mediumhealth.wav", g_pickup_respawntime_short, g_pickup_respawntimejitter_short, "25 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);
 }
 
@@ -880,7 +1075,8 @@ void spawnfunc_item_health_large (void) {
 		self.max_health = g_pickup_healthlarge_max;
 	if(!self.health)
 		self.health = g_pickup_healthlarge;
-	StartItem ("models/items/g_h50.md3", "misc/mediumhealth.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "50 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);
+	self.dmg = g_pickup_healthlarge_consumable;
+	StartItem ("models/items/g_h50.md3", "misc/largehealth.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "50 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);
 }
 
 void spawnfunc_item_health_mega (void) {
@@ -894,6 +1090,7 @@ void spawnfunc_item_health_mega (void) {
 		self.max_health = g_pickup_healthmega_max;
 	if(!self.health)
 		self.health = g_pickup_healthmega;
+	self.dmg = g_pickup_healthmega_consumable;
 	StartItem ("models/items/g_h100.md3", "misc/megahealth.wav", g_pickup_respawntime_long, g_pickup_respawntimejitter_long, "100 Health", IT_HEALTH, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_HIGH);
 }
 
@@ -1326,9 +1523,9 @@ float GiveItems(entity e, float beginarg, float endarg)
 	}
 	POSTGIVE_VALUE(e, strength_finished, 1, "misc/powerup.wav", "misc/poweroff.wav");
 	POSTGIVE_VALUE(e, invincible_finished, 1, "misc/powerup_shield.wav", "misc/poweroff.wav");
-	POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, cvar("g_balance_pause_fuel_rot"), pauseregen_finished, cvar("g_balance_pause_fuel_regen"), "misc/itempickup.wav", string_null);
-	POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, cvar("g_balance_pause_armor_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/armor25.wav", string_null);
-	POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, cvar("g_balance_pause_health_rot"), pauseregen_finished, cvar("g_balance_pause_health_regen"), "misc/megahealth.wav", string_null);
+	POSTGIVE_VALUE_ROT(e, ammo_fuel, 1, pauserotfuel_finished, cvar("g_balance_pause_fuel_rot"), pauseregenhealth_finished, cvar("g_balance_pause_fuel_regen"), "misc/itempickup.wav", string_null);
+	POSTGIVE_VALUE_ROT(e, armorvalue, 1, pauserotarmor_finished, cvar("g_balance_pause_armor_rot"), pauseregenarmor_finished, cvar("g_balance_pause_armor_regen"), "misc/armor25.wav", string_null);
+	POSTGIVE_VALUE_ROT(e, health, 1, pauserothealth_finished, cvar("g_balance_pause_health_rot"), pauseregenhealth_finished, cvar("g_balance_pause_health_regen"), "misc/megahealth.wav", string_null);
 
 	if(e.strength_finished <= 0)
 		e.strength_finished = 0;