X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fsv_overkill.qc;h=510b9213a1a3f6a1adf4b890bc19ec14d0ee4d1f;hb=821767330613f134fe04791532f44e63741ee6c6;hp=ce015b12c3aca738cc72c549320a3987b5cdc58b;hpb=e320d7a0e5cb096ca5c22cfee133d3f94d5f24f4;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 ce015b12c..510b9213a 100644
--- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
+++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc
@@ -1,7 +1,8 @@
 #include "sv_overkill.qh"
 
-#include "hmg.qh"
-#include "rpc.qh"
+#include "okshotgun.qh"
+#include "okhmg.qh"
+#include "okrpc.qh"
 
 string autocvar_g_overkill;
 
@@ -11,25 +12,50 @@ bool autocvar_g_overkill_itemwaypoints = true;
 
 .Weapon ok_lastwep[MAX_WEAPONSLOTS];
 
-void ok_Initialize();
-
-REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !cvar("g_instagib") && !g_nexball && cvar_string("g_mod_balance") == "Overkill")
+REGISTER_MUTATOR(ok, expr_evaluate(autocvar_g_overkill) && !autocvar_g_instagib && !g_nexball && cvar_string("g_mod_balance") == "Overkill")
 {
 	MUTATOR_ONADD
 	{
-		ok_Initialize();
+		precache_all_playermodels("models/ok_player/*.dpm");
+
+		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)
+		{
+			ITEM_ArmorMega.spawnflags |= ITEM_FLAG_MUTATORBLOCKED;
+		}
+
+		WEP_OVERKILL_RPC.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
+		WEP_OVERKILL_HMG.spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
+
+		//WEP_SHOTGUN.mdl = "ok_shotgun";
+		//WEP_MACHINEGUN.mdl = "ok_mg";
+		//WEP_VORTEX.mdl = "ok_sniper";
 	}
 
 	MUTATOR_ONREMOVE
 	{
-		WEP_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
-		WEP_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+		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_OVERKILL_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
+		WEP_OVERKILL_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED;
 	}
 }
 
 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, Damage_Calculate, CBC_ORDER_LAST)
 {
@@ -97,51 +123,39 @@ MUTATOR_HOOKFUNCTION(ok, ForbidThrowCurrentWeapon)
 
 MUTATOR_HOOKFUNCTION(ok, PlayerPreThink)
 {
-	if(game_stopped)
+	if (game_stopped)
+	{
 		return;
-
+	}
 	entity player = M_ARGV(0, entity);
-
-	if(IS_DEAD(player) || !IS_PLAYER(player) || STAT(FROZEN, player))
+	if (!IS_PLAYER(player) || IS_DEAD(player) || STAT(FROZEN, player))
+	{
 		return;
-
-	if(PHYS_INPUT_BUTTON_ATCK2(player) && time >= player.jump_interval)
-	if( !forbidWeaponUse(player)
-		|| (round_handler_IsActive() && !round_handler_IsRoundStarted()) )
+	}
+	if (!PHYS_INPUT_BUTTON_ATCK2(player) || forbidWeaponUse(player) ||
+		!(round_handler_IsActive() && !round_handler_IsRoundStarted()))
 	{
-		player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player);
-		makevectors(player.v_angle);
-
-		for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+		return;
+	}
+	// Allow secondary blaster during countdown.
+	for (int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
+	{
+		.entity weaponentity = weaponentities[slot];
+		Weapon weapon = player.(weaponentity).m_weapon;
+		if (weapon == WEP_Null && slot != 0)
 		{
-			.entity weaponentity = weaponentities[slot];
-
-			if(player.(weaponentity).m_weapon == WEP_Null && slot != 0)
-				continue;
-
-			Weapon oldwep = player.(weaponentity).m_weapon;
-			player.(weaponentity).m_weapon = WEP_BLASTER;
-			W_Blaster_Attack(
-				player,
-				weaponentity,
-				WEP_BLASTER.m_id | HITTYPE_SECONDARY,
-				WEP_CVAR_SEC(vaporizer, shotangle),
-				WEP_CVAR_SEC(vaporizer, damage),
-				WEP_CVAR_SEC(vaporizer, edgedamage),
-				WEP_CVAR_SEC(vaporizer, radius),
-				WEP_CVAR_SEC(vaporizer, force),
-				WEP_CVAR_SEC(vaporizer, speed),
-				WEP_CVAR_SEC(vaporizer, spread),
-				WEP_CVAR_SEC(vaporizer, delay),
-				WEP_CVAR_SEC(vaporizer, lifetime)
-			);
-			player.(weaponentity).m_weapon = oldwep;
+			continue;
 		}
+		weapon.wr_think(weapon, player, weaponentity, 2);
 	}
-
 	PHYS_INPUT_BUTTON_ATCK2(player) = false;
 }
 
+MUTATOR_HOOKFUNCTION(ok, ForbidRandomStartWeapons)
+{
+	return true;
+}
+
 MUTATOR_HOOKFUNCTION(ok, PlayerWeaponSelect)
 {
 	entity player = M_ARGV(0, entity);
@@ -154,61 +168,16 @@ 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;
 		}
 	}
 }
 
-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, OnEntityPreSpawn)
-{
-	entity ent = M_ARGV(0, entity);
-
-	if(autocvar_g_powerups)
-	if(autocvar_g_overkill_powerups_replace)
-	{
-		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 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;
-		}
-	}
-}
-
 bool ok_HandleItemWaypoints(entity e)
 {
 	if(!autocvar_g_overkill_itemwaypoints)
@@ -241,9 +210,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;
@@ -251,16 +221,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");
+		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");
+		return true;
+	}
 	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST)
 {
-	WepSet ok_start_items = (WEPSET(MACHINEGUN) | WEPSET(VORTEX) | WEPSET(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;
@@ -288,14 +289,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";
-}