X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_items.qc;h=d64ba6c837dc24b8ed81a3aed55160d3bbe8d606;hb=0f4a81dd2f666fa1f2f92a03f3b48f71941454b7;hp=f817957c8213d62df0ea1dd856bb446760708728;hpb=2f239100c8b77275d69972f91ac4e7ff913f3d7c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index f817957c8..d64ba6c83 100644
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -5,7 +5,6 @@
 #if defined(SVQC)
     #include "_all.qh"
 
-    #include "g_subs.qh"
     #include "waypointsprites.qh"
 
     #include "bot/bot.qh"
@@ -20,6 +19,7 @@
     #include "../common/constants.qh"
     #include "../common/deathtypes.qh"
     #include "../common/notifications.qh"
+	#include "../common/triggers/subs.qh"
     #include "../common/util.qh"
 
     #include "../common/monsters/all.qh"
@@ -412,6 +412,158 @@ void Item_Think()
 	}
 }
 
+float it_armor_large_time;
+float it_health_mega_time;
+float it_invisible_time;
+float it_speed_time;
+float it_extralife_time;
+float it_strength_time;
+float it_shield_time;
+float it_fuelregen_time;
+float it_jetpack_time;
+float it_superweapons_time;
+
+void Item_ItemsTime_Init()
+{
+	it_armor_large_time = -1;
+	it_health_mega_time = -1;
+	it_invisible_time = -1;
+	it_speed_time = -1;
+	it_extralife_time = -1;
+	it_strength_time = -1;
+	it_shield_time = -1;
+	it_fuelregen_time = -1;
+	it_jetpack_time = -1;
+	it_superweapons_time = -1;
+}
+void Item_ItemsTime_ResetTimes()
+{
+	it_armor_large_time = (it_armor_large_time == -1) ? -1 : 0;
+	it_health_mega_time = (it_health_mega_time == -1) ? -1 : 0;
+	it_invisible_time   = (it_invisible_time   == -1) ? -1 : 0;
+	it_speed_time       = (it_speed_time       == -1) ? -1 : 0;
+	it_extralife_time   = (it_extralife_time   == -1) ? -1 : 0;
+	it_strength_time    = (it_strength_time    == -1) ? -1 : 0;
+	it_shield_time      = (it_shield_time      == -1) ? -1 : 0;
+	it_fuelregen_time   = (it_fuelregen_time   == -1) ? -1 : 0;
+	it_jetpack_time     = (it_jetpack_time     == -1) ? -1 : 0;
+	it_superweapons_time= (it_superweapons_time== -1) ? -1 : 0;
+}
+void Item_ItemsTime_ResetTimesForPlayer(entity e)
+{
+	e.item_armor_large_time = (it_armor_large_time == -1) ? -1 : 0;
+	e.item_health_mega_time = (it_health_mega_time == -1) ? -1 : 0;
+	e.item_invisible_time   = (it_invisible_time   == -1) ? -1 : 0;
+	e.item_speed_time       = (it_speed_time       == -1) ? -1 : 0;
+	e.item_extralife_time   = (it_extralife_time   == -1) ? -1 : 0;
+	e.item_strength_time    = (it_strength_time    == -1) ? -1 : 0;
+	e.item_shield_time      = (it_shield_time      == -1) ? -1 : 0;
+	e.item_fuelregen_time   = (it_fuelregen_time   == -1) ? -1 : 0;
+	e.item_jetpack_time     = (it_jetpack_time     == -1) ? -1 : 0;
+	e.item_superweapons_time= (it_superweapons_time== -1) ? -1 : 0;
+}
+void Item_ItemsTime_SetTimesForPlayer(entity e)
+{
+	e.item_armor_large_time = it_armor_large_time;
+	e.item_health_mega_time = it_health_mega_time;
+	e.item_invisible_time = it_invisible_time;
+	e.item_speed_time = it_speed_time;
+	e.item_extralife_time = it_extralife_time;
+	e.item_strength_time = it_strength_time;
+	e.item_shield_time = it_shield_time;
+	e.item_fuelregen_time = it_fuelregen_time;
+	e.item_jetpack_time = it_jetpack_time;
+	e.item_superweapons_time = it_superweapons_time;
+}
+bool Item_ItemsTime_UpdateTime_Check(float item_time, float t)
+{
+	if(t == 0 && item_time == -1)
+		return true;
+	if(time < t && (item_time <= time || t < item_time))
+		return true;
+	return false;
+}
+void Item_ItemsTime_UpdateTime(entity e, float t)
+{
+	if(!autocvar_sv_itemstime)
+		return;
+
+	if(g_instagib)
+	{
+		switch(e.items)
+		{
+			case IT_STRENGTH://"item-invis"
+				if(Item_ItemsTime_UpdateTime_Check(it_invisible_time, t))
+					it_invisible_time = t;
+				break;
+			case IT_NAILS://"item-extralife"
+				if(Item_ItemsTime_UpdateTime_Check(it_extralife_time, t))
+					it_extralife_time = t;
+				break;
+			case IT_INVINCIBLE://"item-speed"
+				if(Item_ItemsTime_UpdateTime_Check(it_speed_time, t))
+					it_speed_time = t;
+				break;
+		}
+	}
+	else
+	{
+		switch(e.items)
+		{
+			case IT_HEALTH:
+				//if (e.classname == "item_health_mega")
+					if(Item_ItemsTime_UpdateTime_Check(it_health_mega_time, t))
+						it_health_mega_time = t;
+				break;
+			case IT_ARMOR:
+				if (e.classname == "item_armor_large")
+					if(Item_ItemsTime_UpdateTime_Check(it_armor_large_time, t))
+						it_armor_large_time = t;
+				break;
+			case IT_STRENGTH://"item-strength"
+				if(Item_ItemsTime_UpdateTime_Check(it_strength_time, t))
+					it_strength_time = t;
+				break;
+			case IT_INVINCIBLE://"item-shield"
+				if(Item_ItemsTime_UpdateTime_Check(it_shield_time, t))
+					it_shield_time = t;
+				break;
+			default:
+				if(e.weapons & WEPSET_SUPERWEAPONS)
+					if(Item_ItemsTime_UpdateTime_Check(it_superweapons_time, t))
+						it_superweapons_time = t;
+		}
+	}
+	switch(e.items)
+	{
+		case IT_FUEL_REGEN://"item-fuelregen"
+			if(Item_ItemsTime_UpdateTime_Check(it_fuelregen_time, t))
+				it_fuelregen_time = t;
+			break;
+		case IT_JETPACK://"item-jetpack"
+			if(Item_ItemsTime_UpdateTime_Check(it_jetpack_time, t))
+				it_jetpack_time = t;
+			break;
+	}
+}
+void Item_ItemsTime_SetTimesForAllPlayers()
+{
+	entity e;
+	if(warmup_stage)
+	{
+		FOR_EACH_REALCLIENT(e)
+			Item_ItemsTime_SetTimesForPlayer(e);
+	}
+	else
+	{
+		FOR_EACH_REALCLIENT(e)
+		{
+			if(!IS_PLAYER(e))
+				Item_ItemsTime_SetTimesForPlayer(e);
+		}
+	}
+}
+
 void Item_Respawn (void)
 {
 	Item_Show(self, 1);
@@ -424,6 +576,12 @@ void Item_Respawn (void)
 		sound (self, CH_TRIGGER, "misc/itemrespawn.wav", VOL_BASE, ATTEN_NORM);	// play respawn sound
 	setorigin (self, self.origin);
 
+	if(self.flags & FL_POWERUP || self.classname == "item_armor_large" || self.items == IT_HEALTH || (self.weapons & WEPSET_SUPERWEAPONS))
+	{
+		Item_ItemsTime_UpdateTime(self, 0);
+		Item_ItemsTime_SetTimesForAllPlayers();
+	}
+
 	self.think = Item_Think;
 	self.nextthink = time;
 
@@ -454,6 +612,14 @@ void Item_RespawnCountdown (void)
 				case IT_JETPACK:    name = "item-jetpack"; rgb = '0.5 0.5 0.5'; break;
 				case IT_STRENGTH:   name = "item-strength"; rgb = '0 0 1'; break;
 				case IT_INVINCIBLE: name = "item-shield"; rgb = '1 0 1'; break;
+				case IT_HEALTH:
+					//if (self.classname == "item_health_mega")
+						{name = "item_health_mega"; rgb = '1 0 0';}
+					break;
+				case IT_ARMOR:
+					if (self.classname == "item_armor_large")
+						{name = "item_armor_large"; rgb = '0 1 0';}
+					break;
 			}
 			item_name = name;
 			item_color = rgb;
@@ -473,7 +639,11 @@ void Item_RespawnCountdown (void)
 			{
 				WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, true, RADARICON_POWERUP, rgb);
 				if(self.waypointsprite_attached)
+				{
+					if (self.items == IT_HEALTH || self.items == IT_ARMOR)
+						WaypointSprite_UpdateRule(self.waypointsprite_attached, 0, SPRITERULE_SPECTATOR);
 					WaypointSprite_UpdateBuildFinished(self.waypointsprite_attached, time + ITEM_RESPAWN_TICKS);
+				}
 			}
 			else
 			{
@@ -481,12 +651,25 @@ void Item_RespawnCountdown (void)
 				localcmd(sprintf("prvm_edict server %d\n", num_for_edict(self)));
 			}
 		}
-		sound (self, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM);	// play respawn sound
+
 		if(self.waypointsprite_attached)
 		{
+			entity e;
+			entity it = self;
+			self = self.waypointsprite_attached;
+			FOR_EACH_REALCLIENT(e)
+				if(self.waypointsprite_visible_for_player(e))
+				{
+					msg_entity = e;
+					soundto(MSG_ONE, it, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM);	// play respawn sound
+				}
+			self = it;
+
 			WaypointSprite_Ping(self.waypointsprite_attached);
 			//WaypointSprite_UpdateHealth(self.waypointsprite_attached, self.count);
 		}
+		else
+			sound(self, CH_TRIGGER, "misc/itemrespawncountdown.wav", VOL_BASE, ATTEN_NORM);	// play respawn sound
 	}
 }
 
@@ -505,16 +688,57 @@ void Item_RespawnThink()
 
 void Item_ScheduleRespawnIn(entity e, float t)
 {
-	if((e.flags & FL_POWERUP) || (e.weapons & WEPSET_SUPERWEAPONS))
+	if((e.flags & FL_POWERUP) || (e.weapons & WEPSET_SUPERWEAPONS) || e.classname == "item_armor_large" || e.items == IT_HEALTH)
 	{
+		entity head;
 		e.think = Item_RespawnCountdown;
 		e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS);
+		e.scheduledrespawntime = e.nextthink + ITEM_RESPAWN_TICKS;
 		e.count = 0;
+		if(e.weapons & WEPSET_SUPERWEAPONS)
+		{
+			for(t = e.scheduledrespawntime, head = world; (head = nextent(head)); )
+			{
+				if(e == head)
+					continue;
+				if(clienttype(head) == CLIENTTYPE_NOTACLIENT)
+				if(head.weapons & WEPSET_SUPERWEAPONS)
+				if(head.classname != "weapon_info")
+				{
+					if(head.scheduledrespawntime <= time)
+					{
+						t = 0;
+						break;
+					}
+					if(head.scheduledrespawntime < t)
+						t = head.scheduledrespawntime;
+				}
+			}
+		}
+		else
+		{
+			for(t = e.scheduledrespawntime, head = world; (head = find(head, classname, e.classname)); )
+			{
+				// in instagib .classname is "instagib" for every item
+				if(e == head || (g_instagib && e.items != head.items))
+					continue;
+				if(head.scheduledrespawntime <= time)
+				{
+					t = 0;
+					break;
+				}
+				if(head.scheduledrespawntime < t)
+					t = head.scheduledrespawntime;
+			}
+		}
+		Item_ItemsTime_UpdateTime(e, t);
+		Item_ItemsTime_SetTimesForAllPlayers();
 	}
 	else
 	{
 		e.think = Item_RespawnThink;
 		e.nextthink = time;
+		e.scheduledrespawntime = time + t;
 		e.wait = time + t;
 	}
 }
@@ -1088,6 +1312,8 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 
 		if((itemflags & (FL_POWERUP | FL_WEAPON)) || (itemid & (IT_HEALTH | IT_ARMOR | IT_KEY1 | IT_KEY2)))
 			self.target = "###item###"; // for finding the nearest item using find()
+
+		Item_ItemsTime_UpdateTime(self, 0);
 	}
 
 	self.bot_pickup = true;