X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fsv_overkill.qc;h=c4a3ef928218c7d422786df245f550ee7608ab1e;hp=a12d6794fdac8b881d085382b2315d18549c1147;hb=275db1b1d382ef40155eeb44fae62ae5f1087029;hpb=836465e9876488043b07df9585b25f45c368eaa5

diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
index a12d6794fd..c4a3ef9282 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -1,9 +1,8 @@
 #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;
 
@@ -11,50 +10,63 @@ bool autocvar_g_overkill_itemwaypoints = true;
 
 .Weapon ok_lastwep[MAX_WEAPONSLOTS];
 
-REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !cvar("g_instagib") && !g_nexball && cvar_string("g_mod_balance") == "Overkill")
+IntrusiveList g_overkill_items;
+STATIC_INIT(overkill)
 {
-	MUTATOR_ONADD
-	{
-		precache_all_playermodels("models/ok_player/*.dpm");
+	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);
+}
 
-		if (autocvar_g_overkill_filter_healthmega)
-		{
-			ITEM_HealthMega.spawnflags |= ITEM_FLAG_MUTATORBLOCKED;
-		}
-		if (autocvar_g_overkill_filter_armormedium)
-		{
-			ITEM_ArmorMedium.spawnflags |= ITEM_FLAG_MUTATORBLOCKED;
-		}
-		if (autocvar_g_overkill_filter_armorbig)
-		{
-			ITEM_ArmorBig.spawnflags |= ITEM_FLAG_MUTATORBLOCKED;
-		}
-		if (autocvar_g_overkill_filter_armormega)
+/// \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)
+{
+	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))
 		{
-			ITEM_ArmorMega.spawnflags |= ITEM_FLAG_MUTATORBLOCKED;
+			LOG_WARNF("Random items: cvar %s doesn't exist.", cvar_name);
+			continue;
 		}
-
-		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";
+		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))
+	{
+		LOG_WARNF("Random items: cvar %s doesn't exist.", cvar_name);
 	}
-
-	MUTATOR_ONREMOVE
+	else
 	{
-		ITEM_HealthMega.spawnflags &= ~ITEM_FLAG_MUTATORBLOCKED;
-		ITEM_ArmorMedium.spawnflags &= ~ITEM_FLAG_MUTATORBLOCKED;
-		ITEM_ArmorBig.spawnflags &= ~ITEM_FLAG_MUTATORBLOCKED;
-		ITEM_ArmorMega.spawnflags &= ~ITEM_FLAG_MUTATORBLOCKED;
-
-		WEP_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
-		WEP_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+		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
+	{
+		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);
+
+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)
 {
@@ -90,7 +102,7 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDies)
 	entity frag_attacker = M_ARGV(1, entity);
 	entity frag_target = M_ARGV(2, entity);
 
-	entity targ = ((frag_attacker) ? frag_attacker : frag_target);
+	entity targ = ((IS_PLAYER(frag_attacker)) ? frag_attacker : frag_target);
 
 	ok_DropItem(frag_target, targ);
 
@@ -131,7 +143,7 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
 	{
 		return;
 	}
-	if (!PHYS_INPUT_BUTTON_ATCK2(player) || forbidWeaponUse(player) ||
+	if (!PHYS_INPUT_BUTTON_ATCK2(player) || weaponLocked(player) ||
 		!(round_handler_IsActive() && !round_handler_IsRoundStarted()))
 	{
 		return;
@@ -167,10 +179,10 @@ MUTATOR_HOOKFUNCTION(ok, PlayerWeaponSelect)
 		if(player.ok_lastwep[slot] && player.ok_lastwep[slot] != WEP_Null)
 		{
 			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;
+			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;
 		}
@@ -226,7 +238,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 	}
 	if (item.classname == "item_strength")
 	{
-		entity wep = new(weapon_hmg);
+		entity wep = new(weapon_okhmg);
 		setorigin(wep, item.origin);
 		wep.ok_item = true;
 		wep.noalign = Item_ShouldKeepPosition(item);
@@ -235,12 +247,12 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 		wep.respawntime = g_pickup_respawntime_superweapon;
 		wep.pickup_anyway = true;
 		wep.spawnfunc_checked = true;
-		Item_Initialize(wep, "weapon_hmg");
+		Item_Initialize(wep, "weapon_okhmg"); // doesn't actually use spawnfunc
 		return true;
 	}
 	else if (item.classname == "item_shield")
 	{
-		entity wep = new(weapon_rpc);
+		entity wep = new(weapon_okrpc);
 		setorigin(wep, item.origin);
 		wep.ok_item = true;
 		wep.noalign = Item_ShouldKeepPosition(item);
@@ -249,7 +261,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 		wep.respawntime = g_pickup_respawntime_superweapon;
 		wep.pickup_anyway = true;
 		wep.spawnfunc_checked = true;
-		Item_Initialize(wep, "weapon_rpc");
+		Item_Initialize(wep, "weapon_okrpc"); // doesn't actually use spawnfunc
 		return true;
 	}
 	return true;
@@ -257,10 +269,11 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem)
 
 MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
 {
+	LOG_INFOF("OK SetStartItems\n");
 	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;
@@ -268,6 +281,7 @@ MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
 
 MUTATOR_HOOKFUNCTION(ok, SetWeaponArena)
 {
+	LOG_INFOF("OK SetWeaponArena\n");
 	// turn weapon arena off
 	M_ARGV(0, string) = "off";
 }