X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_overkill.qc;h=b707fbee0cac7b78cb94ff84b6115430c4973b69;hb=e72ae8623dbd67dc7d85ed16fa4a18dd75663629;hp=ecef7ceac1c2001d23890c545e527a5eceef5ade;hpb=df110eb632e3d04119c2d0771e0d54c1a1ea27b8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_overkill.qc b/qcsrc/server/mutators/mutator_overkill.qc
index ecef7ceac..b707fbee0 100644
--- a/qcsrc/server/mutators/mutator_overkill.qc
+++ b/qcsrc/server/mutators/mutator_overkill.qc
@@ -1,4 +1,4 @@
-void ok_DecreaseCharge(entity ent, float wep)
+void ok_DecreaseCharge(entity ent, int wep)
 {
 	if(!ent.ok_use_ammocharge) return;
 
@@ -10,7 +10,7 @@ void ok_DecreaseCharge(entity ent, float wep)
 	ent.ammo_charge[wep] -= max(0, cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname)));
 }
 
-void ok_IncreaseCharge(entity ent, float wep)
+void ok_IncreaseCharge(entity ent, int wep)
 {
 	entity wepent = get_weaponinfo(wep);
 
@@ -22,9 +22,9 @@ void ok_IncreaseCharge(entity ent, float wep)
 		ent.ammo_charge[wep] = min(autocvar_g_overkill_ammo_charge_limit, ent.ammo_charge[wep] + cvar(sprintf("g_overkill_ammo_charge_rate_%s", wepent.netname)) * frametime / W_TICSPERFRAME);
 }
 
-float ok_CheckWeaponCharge(entity ent, float wep)
+float ok_CheckWeaponCharge(entity ent, int wep)
 {
-	if(!ent.ok_use_ammocharge) return TRUE;
+	if(!ent.ok_use_ammocharge) return true;
 
 	entity wepent = get_weaponinfo(wep);
 
@@ -34,26 +34,6 @@ float ok_CheckWeaponCharge(entity ent, float wep)
 	return (ent.ammo_charge[wep] >= cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname)));
 }
 
-void start_hmg()
-{
-	self.classname = "weapon_hmg";
-	self.respawntime = autocvar_g_overkill_superguns_respawn_time;
-	self.ok_item = TRUE;
-	setmodel(self, "models/weapons/g_ok_hmg.md3");
-	self.pickup_anyway = TRUE;
-	spawnfunc_weapon_hmg();
-}
-
-void start_rpc()
-{
-	self.classname = "weapon_rpc";
-	self.respawntime = autocvar_g_overkill_superguns_respawn_time;
-	self.ok_item = TRUE;
-	self.pickup_anyway = TRUE;
-	setmodel(self, "models/weapons/g_ok_rl.md3");
-	spawnfunc_weapon_rpc();
-}
-
 MUTATOR_HOOKFUNCTION(ok_PlayerDamage_Calculate)
 {
 	if(IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target))
@@ -71,19 +51,20 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDamage_Calculate)
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerDamage_SplitHealthArmor)
 {
 	if(damage_take)
 		self.ok_pauseregen_finished = max(self.ok_pauseregen_finished, time + 2);
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerDies)
 {
 	entity oldself = self;
+	entity targ = ((frag_attacker) ? frag_attacker : frag_target);
 
 	if(self.flags & FL_MONSTER)
 	{
@@ -91,23 +72,23 @@ MUTATOR_HOOKFUNCTION(ok_PlayerDies)
 		other = world;
 	}
 
-	self.ok_lastwep = self.weapon;
-	self.ok_deathloc = self.origin;
 	self = spawn();
-	self.ok_item = TRUE;
-	self.noalign = TRUE;
-	self.pickup_anyway = TRUE;
+	self.ok_item = true;
+	self.noalign = true;
+	self.pickup_anyway = true;
 	spawnfunc_item_armor_small();
 	self.movetype = MOVETYPE_TOSS;
 	self.gravity = 1;
 	self.reset = SUB_Remove;
 	setorigin(self, frag_target.origin + '0 0 32');
-	self.velocity = '0 0 200' + normalize(frag_attacker.origin - self.origin) * 500;
+	self.velocity = '0 0 200' + normalize(targ.origin - self.origin) * 500;
 	self.classname = "droppedweapon"; // hax
 	SUB_SetFade(self, time + 5, 1);
 	self = oldself;
 
-	return FALSE;
+	self.ok_lastwep = self.switchweapon;
+
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerRegen)
@@ -117,7 +98,7 @@ MUTATOR_HOOKFUNCTION(ok_PlayerRegen)
 	{
 		self.armorvalue = CalcRotRegen(self.armorvalue, autocvar_g_balance_armor_regenstable, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, 1 * frametime * (time > self.ok_pauseregen_finished), 0, 0, 1, 1 * frametime * (time > self.pauserotarmor_finished), autocvar_g_balance_armor_limit);
 		self.health = CalcRotRegen(self.health, autocvar_g_balance_health_regenstable, 0, 100, 1 * frametime * (time > self.ok_pauseregen_finished), 200, 0, autocvar_g_balance_health_rotlinear, 1 * frametime * (time > self.pauserothealth_finished), autocvar_g_balance_health_limit);
-		
+
 		float minf, maxf, limitf;
 
 		maxf = autocvar_g_balance_fuel_rotstable;
@@ -126,21 +107,27 @@ MUTATOR_HOOKFUNCTION(ok_PlayerRegen)
 
 		self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, frametime * (time > self.pauseregen_finished) * ((self.items & IT_FUEL_REGEN) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > self.pauserotfuel_finished), limitf);
 	}
-	return TRUE; // return TRUE anyway, as frozen uses no regen
+	return true; // return true anyway, as frozen uses no regen
 }
 
 MUTATOR_HOOKFUNCTION(ok_ForbidThrowCurrentWeapon)
 {
-	return TRUE;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
 {
 	if(intermission_running || gameover)
-		return FALSE;
+		return false;
 
 	if(self.deadflag != DEAD_NO || !IS_PLAYER(self) || self.frozen)
-		return FALSE;
+		return false;
+
+	if(self.ok_lastwep)
+	{
+		self.switchweapon = self.ok_lastwep;
+		self.ok_lastwep = 0;
+	}
 
 	ok_IncreaseCharge(self, self.weapon);
 
@@ -150,7 +137,9 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
 	{
 		self.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor();
 		makevectors(self.v_angle);
-		
+
+		int oldwep = self.weapon;
+		self.weapon = WEP_BLASTER;
 		W_Blaster_Attack(
 			WEP_BLASTER | HITTYPE_SECONDARY,
 			WEP_CVAR_SEC(vaporizer, shotangle),
@@ -163,9 +152,10 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
 			WEP_CVAR_SEC(vaporizer, delay),
 			WEP_CVAR_SEC(vaporizer, lifetime)
 		);
+		self.weapon = oldwep;
 	}
 
-	self.weapon_blocked = FALSE;
+	self.weapon_blocked = false;
 
 	self.ok_ammo_charge = self.ammo_charge[self.weapon];
 
@@ -181,21 +171,19 @@ MUTATOR_HOOKFUNCTION(ok_PlayerPreThink)
 		if(self.weaponentity.state != WS_CLEAR)
 			w_ready();
 
-		self.weapon_blocked = TRUE;
+		self.weapon_blocked = true;
 	}
 
 	self.BUTTON_ATCK2 = 0;
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_PlayerSpawn)
 {
 	if(autocvar_g_overkill_ammo_charge)
 	{
-		float i;
-
-		for(i = WEP_FIRST; i <= WEP_LAST; ++i)
+		for(int i = WEP_FIRST; i <= WEP_LAST; ++i)
 			self.ammo_charge[i] = autocvar_g_overkill_ammo_charge_limit;
 
 		self.ok_use_ammocharge = 1;
@@ -203,10 +191,10 @@ MUTATOR_HOOKFUNCTION(ok_PlayerSpawn)
 	}
 	else
 		self.ok_use_ammocharge = 0;
-		
+
 	self.ok_pauseregen_finished = time + 2;
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
@@ -220,15 +208,15 @@ MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
 			setorigin(wep, self.origin);
 			setmodel(wep, "models/weapons/g_ok_hmg.md3");
 			wep.classname = "weapon_hmg";
-			wep.ok_item = TRUE;
+			wep.ok_item = true;
 			wep.noalign = self.noalign;
 			wep.cnt = self.cnt;
 			wep.team = self.team;
 			wep.respawntime = autocvar_g_overkill_superguns_respawn_time;
-			wep.pickup_anyway = TRUE;
+			wep.pickup_anyway = true;
 			wep.think = spawnfunc_weapon_hmg;
 			wep.nextthink = time + 0.1;
-			return TRUE;
+			return true;
 		}
 
 		if(self.classname == "item_invincible")
@@ -237,25 +225,25 @@ MUTATOR_HOOKFUNCTION(ok_OnEntityPreSpawn)
 			setorigin(wep, self.origin);
 			setmodel(wep, "models/weapons/g_ok_rl.md3");
 			wep.classname = "weapon_rpc";
-			wep.ok_item = TRUE;
+			wep.ok_item = true;
 			wep.noalign = self.noalign;
 			wep.cnt = self.cnt;
 			wep.team = self.team;
 			wep.respawntime = autocvar_g_overkill_superguns_respawn_time;
-			wep.pickup_anyway = TRUE;
+			wep.pickup_anyway = true;
 			wep.think = spawnfunc_weapon_rpc;
 			wep.nextthink = time + 0.1;
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_ItemRemove)
 {
 	if(self.ok_item)
-		return FALSE;
+		return false;
 
 	switch(self.items)
 	{
@@ -263,7 +251,7 @@ MUTATOR_HOOKFUNCTION(ok_ItemRemove)
 		case IT_ARMOR: return !(autocvar_g_overkill_100a_anyway);
 	}
 
-	return TRUE;
+	return true;
 }
 
 MUTATOR_HOOKFUNCTION(ok_SpectateCopy)
@@ -271,7 +259,7 @@ MUTATOR_HOOKFUNCTION(ok_SpectateCopy)
 	self.ammo_charge[self.weapon] = other.ammo_charge[other.weapon];
 	self.ok_use_ammocharge = other.ok_use_ammocharge;
 
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_StartItems)
@@ -284,28 +272,25 @@ MUTATOR_HOOKFUNCTION(ok_StartItems)
 	start_items |= IT_UNLIMITED_WEAPON_AMMO;
 	start_weapons = warmup_start_weapons = ok_start_items;
 
-	start_ammo_nails = start_ammo_cells = start_ammo_shells = start_ammo_rockets =
-	warmup_start_ammo_nails = warmup_start_ammo_cells = warmup_start_ammo_shells = warmup_start_ammo_rockets = autocvar_g_overkill_ammo_start;
-
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_BuildMutatorsString)
 {
 	ret_string = strcat(ret_string, ":OK");
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_BuildMutatorsPrettyString)
 {
 	ret_string = strcat(ret_string, ", Overkill");
-	return FALSE;
+	return false;
 }
 
 MUTATOR_HOOKFUNCTION(ok_SetModname)
 {
 	modname = "Overkill";
-	return TRUE;
+	return true;
 }
 
 void ok_SetCvars()
@@ -338,15 +323,7 @@ void ok_Initialize()
 	precache_sound("weapons/dryfire.wav");
 
 	addstat(STAT_OK_AMMO_CHARGE, AS_FLOAT, ok_use_ammocharge);
-	addstat(STAT_OK_AMMO_CHARGEPOOl, AS_FLOAT, ok_ammo_charge);
-
-	WEP_ACTION(WEP_MACHINEGUN, WR_INIT);
-	WEP_ACTION(WEP_VORTEX, WR_INIT);
-	WEP_ACTION(WEP_SHOTGUN, WR_INIT);
-	WEP_ACTION(WEP_BLASTER, WR_INIT);
-	
-	WEP_ACTION(WEP_RPC, WR_INIT);
-	WEP_ACTION(WEP_HMG, WR_INIT);
+	addstat(STAT_OK_AMMO_CHARGEPOOL, AS_FLOAT, ok_ammo_charge);
 
 	(get_weaponinfo(WEP_RPC)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
 	(get_weaponinfo(WEP_HMG)).spawnflags &= ~WEP_FLAG_MUTATORBLOCKED;
@@ -385,5 +362,5 @@ MUTATOR_DEFINITION(mutator_overkill)
 		(get_weaponinfo(WEP_HMG)).spawnflags |= WEP_FLAG_MUTATORBLOCKED;
 	}
 
-	return FALSE;
+	return false;
 }