X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fsv_overkill.qc;h=9fa66e8b2a18c12523da72e4c45820d0c711fe7e;hb=0076d3f631e54b908b7506883c75c6d28f6b9505;hp=4b7c7f22f1636261693aed7302d185026abc5a83;hpb=1e27443b22e03bb559a2deee17cb0da19a47564d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index 4b7c7f22f..9fa66e8b2 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -1,42 +1,72 @@
 #include "sv_overkill.qh"
 
-#include "hmg.qh"
-#include "rpc.qh"
-
-string autocvar_g_overkill;
+#include "okshotgun.qh"
+#include "okhmg.qh"
+#include "okrpc.qh"
 
 bool autocvar_g_overkill_powerups_replace;
 
 bool autocvar_g_overkill_itemwaypoints = true;
 
-bool autocvar_g_overkill_filter_healthmega;
-bool autocvar_g_overkill_filter_armormedium;
-bool autocvar_g_overkill_filter_armorbig;
-bool autocvar_g_overkill_filter_armormega;
-
-.float ok_item;
-
 .Weapon ok_lastwep[MAX_WEAPONSLOTS];
 
-void ok_Initialize();
+IntrusiveList g_overkill_items;
+STATIC_INIT()
+{
+	g_overkill_items = IL_NEW();
+	IL_PUSH(g_overkill_items, ITEM_HealthMega);
+	IL_PUSH(g_overkill_items, ITEM_ArmorSmall);
+	IL_PUSH(g_overkill_items, ITEM_ArmorMedium);
+	IL_PUSH(g_overkill_items, ITEM_ArmorBig);
+	IL_PUSH(g_overkill_items, ITEM_ArmorMega);
+}
 
-REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !cvar("g_instagib") && !g_nexball && cvar_string("g_mod_balance") == "Overkill")
+/// \brief Returns a random classname of the overkill item.
+/// \param[in] prefix Prefix of the cvars that hold probabilities.
+/// \return Random classname of the overkill item.
+string RandomItems_GetRandomOverkillItemClassName(string prefix)
 {
-	MUTATOR_ONADD
+	RandomSelection_Init();
+	IL_EACH(g_overkill_items, !(it.spawnflags & ITEM_FLAG_MUTATORBLOCKED) &&
+		Item_IsDefinitionAllowed(it),
+	{
+		string cvar_name = sprintf("g_%s_%s_probability", prefix,
+			it.m_canonical_spawnfunc);
+		if (!(cvar_type(cvar_name) & CVAR_TYPEFLAG_EXISTS))
+		{
+			LOG_WARNF("Random items: cvar %s doesn't exist.", cvar_name);
+			continue;
+		}
+		RandomSelection_AddString(it.m_canonical_spawnfunc, cvar(cvar_name), 1);
+	});
+	string cvar_name = sprintf("g_%s_weapon_okhmg_probability", prefix);
+	if (!(cvar_type(cvar_name) & CVAR_TYPEFLAG_EXISTS))
 	{
-		ok_Initialize();
+		LOG_WARNF("Random items: cvar %s doesn't exist.", cvar_name);
 	}
-
-	MUTATOR_ONREMOVE
+	else
+	{
+		RandomSelection_AddString("weapon_okhmg", cvar(cvar_name), 1);
+	}
+	cvar_name = sprintf("g_%s_weapon_okrpc_probability", prefix);
+	if (!(cvar_type(cvar_name) & CVAR_TYPEFLAG_EXISTS))
+	{
+		LOG_WARNF("Random items: cvar %s doesn't exist.", cvar_name);
+	}
+	else
 	{
-		WEP_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
-		WEP_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+		RandomSelection_AddString("weapon_okrpc", cvar(cvar_name), 1);
 	}
+	return RandomSelection_chosen_string;
 }
 
-void W_Blaster_Attack(entity, .entity, float, float, float, float, float, float, float, float, float, float);
-spawnfunc(weapon_hmg);
-spawnfunc(weapon_rpc);
+
+MUTATOR_HOOKFUNCTION(ok, RandomItems_GetRandomItemClassName)
+{
+	M_ARGV(1, string) = RandomItems_GetRandomOverkillItemClassName(
+		M_ARGV(0, string));
+	return true;
+}
 
 MUTATOR_HOOKFUNCTION(ok, Damage_Calculate, CBC_ORDER_LAST)
 {
@@ -61,20 +91,10 @@ MUTATOR_HOOKFUNCTION(ok, Damage_Calculate, CBC_ORDER_LAST)
 
 void ok_DropItem(entity this, entity targ)
 {
-	entity e = new(droppedweapon); // hax
+	entity e = spawn();
 	e.ok_item = true;
-	e.noalign = true;
-	e.pickup_anyway = true;
-	e.spawnfunc_checked = true;
-	spawnfunc_item_armor_small(e);
-	if (!wasfreed(e)) { // might have been blocked by a mutator
-        set_movetype(e, MOVETYPE_TOSS);
-        e.gravity = 1;
-        e.reset = SUB_Remove;
-        setorigin(e, this.origin + '0 0 32');
-        e.velocity = '0 0 200' + normalize(targ.origin - this.origin) * 500;
-        SUB_SetFade(e, time + 5, 1);
-	}
+	Item_InitializeLoot(e, "item_armor_small", this.origin + '0 0 32',
+		'0 0 200' + normalize(targ.origin - this.origin) * 500, 5);
 }
 
 MUTATOR_HOOKFUNCTION(ok, PlayerDies)
@@ -112,69 +132,59 @@ MUTATOR_HOOKFUNCTION(ok, ForbidThrowCurrentWeapon)
 	return true;
 }
 
-MUTATOR_HOOKFUNCTION(ok, PlayerWeaponSelect)
+MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
 {
+	if (game_stopped)
+	{
+		return;
+	}
 	entity player = M_ARGV(0, entity);
-
-	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	if (!IS_PLAYER(player) || IS_DEAD(player) || STAT(FROZEN, player))
+	{
+		return;
+	}
+	if (!PHYS_INPUT_BUTTON_ATCK2(player) || forbidWeaponUse(player) ||
+		!(round_handler_IsActive() && !round_handler_IsRoundStarted()))
+	{
+		return;
+	}
+	// Allow secondary blaster during countdown.
+	for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 	{
 		.entity weaponentity = weaponentities[slot];
-		entity thiswep = player.(weaponentity);
-
-		if(player.ok_lastwep[slot] && player.ok_lastwep[slot] != WEP_Null)
+		Weapon weapon = player.(weaponentity).m_weapon;
+		if (weapon == WEP_Null && slot != 0)
 		{
-			Weapon newwep = player.ok_lastwep[slot];
-			if(player.ok_lastwep[slot] == WEP_HMG)
-				newwep = WEP_MACHINEGUN;
-			if(player.ok_lastwep[slot] == WEP_RPC)
-				newwep = WEP_VORTEX;
-			thiswep.m_switchweapon = newwep;
-			player.ok_lastwep[slot] = WEP_Null;
+			continue;
 		}
+		weapon.wr_think(weapon, player, weaponentity, 2);
 	}
+	PHYS_INPUT_BUTTON_ATCK2(player) = false;
 }
 
-void self_spawnfunc_weapon_hmg(entity this) { spawnfunc_weapon_hmg(this); }
-void self_spawnfunc_weapon_rpc(entity this) { spawnfunc_weapon_rpc(this); }
+MUTATOR_HOOKFUNCTION(ok, ForbidRandomStartWeapons)
+{
+	return true;
+}
 
-MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn)
+MUTATOR_HOOKFUNCTION(ok, PlayerWeaponSelect)
 {
-	entity ent = M_ARGV(0, entity);
+	entity player = M_ARGV(0, entity);
 
-	if(autocvar_g_powerups)
-	if(autocvar_g_overkill_powerups_replace)
+	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 	{
-		if(ent.classname == "item_strength")
-		{
-			entity wep = new(weapon_hmg);
-			setorigin(wep, ent.origin);
-			setmodel(wep, MDL_OK_HMG);
-			wep.ok_item = true;
-			wep.noalign = ent.noalign;
-			wep.cnt = ent.cnt;
-			wep.team = ent.team;
-			wep.respawntime = g_pickup_respawntime_superweapon;
-			wep.pickup_anyway = true;
-			wep.spawnfunc_checked = true;
-			setthink(wep, self_spawnfunc_weapon_hmg);
-			wep.nextthink = time + 0.1;
-			return true;
-		}
-		else if(ent.classname == "item_invincible")
+		.entity weaponentity = weaponentities[slot];
+		entity thiswep = player.(weaponentity);
+
+		if(player.ok_lastwep[slot] && player.ok_lastwep[slot] != WEP_Null)
 		{
-			entity wep = new(weapon_rpc);
-			setorigin(wep, ent.origin);
-			setmodel(wep, MDL_OK_RPC);
-			wep.ok_item = true;
-			wep.noalign = ent.noalign;
-			wep.cnt = ent.cnt;
-			wep.team = ent.team;
-			wep.respawntime = g_pickup_respawntime_superweapon;
-			wep.pickup_anyway = true;
-			wep.spawnfunc_checked = true;
-			setthink(wep, self_spawnfunc_weapon_rpc);
-			wep.nextthink = time + 0.1;
-			return true;
+			Weapon newwep = player.ok_lastwep[slot];
+			if(player.ok_lastwep[slot] == WEP_OVERKILL_HMG)
+				newwep = WEP_OVERKILL_MACHINEGUN;
+			if(player.ok_lastwep[slot] == WEP_OVERKILL_RPC)
+				newwep = WEP_OVERKILL_NEX;
+			thiswep.m_switchweapon = newwep;
+			player.ok_lastwep[slot] = WEP_Null;
 		}
 	}
 }
@@ -211,9 +221,10 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 {
 	entity item = M_ARGV(0, entity);
 
-	if(item.ok_item)
+	if (item.ok_item)
+	{
 		return false;
-
+	}
 	switch(item.itemdef)
 	{
 		case ITEM_HealthMega: return autocvar_g_overkill_filter_healthmega;
@@ -221,16 +232,47 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 		case ITEM_ArmorBig: return autocvar_g_overkill_filter_armorbig;
 		case ITEM_ArmorMega: return autocvar_g_overkill_filter_armormega;
 	}
-
+	if (!autocvar_g_powerups || !autocvar_g_overkill_powerups_replace)
+	{
+		return true;
+	}
+	if (item.classname == "item_strength")
+	{
+		entity wep = new(weapon_okhmg);
+		setorigin(wep, item.origin);
+		wep.ok_item = true;
+		wep.noalign = Item_ShouldKeepPosition(item);
+		wep.cnt = item.cnt;
+		wep.team = item.team;
+		wep.respawntime = g_pickup_respawntime_superweapon;
+		wep.pickup_anyway = true;
+		wep.spawnfunc_checked = true;
+		Item_Initialize(wep, "weapon_okhmg"); // doesn't actually use spawnfunc
+		return true;
+	}
+	else if (item.classname == "item_shield")
+	{
+		entity wep = new(weapon_okrpc);
+		setorigin(wep, item.origin);
+		wep.ok_item = true;
+		wep.noalign = Item_ShouldKeepPosition(item);
+		wep.cnt = item.cnt;
+		wep.team = item.team;
+		wep.respawntime = g_pickup_respawntime_superweapon;
+		wep.pickup_anyway = true;
+		wep.spawnfunc_checked = true;
+		Item_Initialize(wep, "weapon_okrpc"); // doesn't actually use spawnfunc
+		return true;
+	}
 	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
 {
-	WepSet ok_start_items = (WEPSET(OVERKILL_MACHINEGUN) | WEPSET(OVERKILL_VORTEX) | WEPSET(OVERKILL_SHOTGUN));
+	WepSet ok_start_items = (WEPSET(OVERKILL_MACHINEGUN) | WEPSET(OVERKILL_NEX) | WEPSET(OVERKILL_SHOTGUN));
 
-	if(WEP_RPC.weaponstart > 0) { ok_start_items |= WEPSET(RPC); }
-	if(WEP_HMG.weaponstart > 0) { ok_start_items |= WEPSET(HMG); }
+	if(WEP_OVERKILL_RPC.weaponstart > 0) { ok_start_items |= WEPSET(OVERKILL_RPC); }
+	if(WEP_OVERKILL_HMG.weaponstart > 0) { ok_start_items |= WEPSET(OVERKILL_HMG); }
 
 	start_items |= IT_UNLIMITED_WEAPON_AMMO;
 	start_weapons = warmup_start_weapons = ok_start_items;
@@ -258,14 +300,3 @@ MUTATOR_HOOKFUNCTION(ok, SetModname)
 	return true;
 }
 
-void ok_Initialize()
-{
-	precache_all_playermodels("models/ok_player/*.dpm");
-
-	WEP_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
-	WEP_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
-
-	//WEP_SHOTGUN.mdl = "ok_shotgun";
-	//WEP_MACHINEGUN.mdl = "ok_mg";
-	//WEP_VORTEX.mdl = "ok_sniper";
-}