X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Foverkill.qc;h=2fb75b3f8d9696b8ce644748f5f837d0e19a89f5;hb=8cbf0e84432e075e617f43c037c645ea9846eba0;hp=04817f4934e702d23201c626b032ac46b9f2c437;hpb=3b732a3e163b5cbeaaf470c2ddac41cafb609be6;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/mutators/mutator/overkill/overkill.qc b/qcsrc/common/mutators/mutator/overkill/overkill.qc index 04817f493..2fb75b3f8 100644 --- a/qcsrc/common/mutators/mutator/overkill/overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/overkill.qc @@ -35,8 +35,6 @@ REGISTER_MUTATOR(ok, cvar("g_overkill") && !cvar("g_instagib") && !g_nexball && WEP_RPC.spawnflags |= WEP_FLAG_MUTATORBLOCKED; WEP_HMG.spawnflags |= WEP_FLAG_MUTATORBLOCKED; } - - return false; } MUTATOR_HOOKFUNCTION(ok, W_DecreaseAmmo) @@ -87,7 +85,7 @@ float ok_CheckWeaponCharge(entity ent, int wep) entity wepent = Weapons_from(wep); - if(wepent == WEP_Null) return 0; // dummy + if(wepent == WEP_Null) return false; // dummy return (ent.ammo_charge[wep] >= cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname))); } @@ -97,28 +95,21 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDamage_Calculate, CBC_ORDER_LAST) entity frag_attacker = M_ARGV(1, entity); entity frag_target = M_ARGV(2, entity); float frag_deathtype = M_ARGV(3, float); - float frag_damage = M_ARGV(4, float); - vector frag_force = M_ARGV(6, vector); if(IS_PLAYER(frag_attacker) && IS_PLAYER(frag_target)) if(DEATH_ISWEAPON(frag_deathtype, WEP_BLASTER)) { - frag_damage = 0; - if(frag_attacker != frag_target) if(frag_target.health > 0) if(STAT(FROZEN, frag_target) == 0) if(!IS_DEAD(frag_target)) { Send_Notification(NOTIF_ONE, frag_attacker, MSG_CENTER, CENTER_SECONDARY_NODAMAGE); - frag_force = '0 0 0'; + M_ARGV(6, vector) = '0 0 0'; } - M_ARGV(4, float) = frag_damage; - M_ARGV(6, vector) = frag_force; + M_ARGV(4, float) = 0; } - - return false; } MUTATOR_HOOKFUNCTION(ok, PlayerDamage_SplitHealthArmor) @@ -137,7 +128,7 @@ void ok_DropItem(entity this, entity targ) e.noalign = true; e.pickup_anyway = true; e.spawnfunc_checked = true; - WITHSELF(e, spawnfunc_item_armor_small(e)); + spawnfunc_item_armor_small(e); if (!wasfreed(e)) { // might have been blocked by a mutator e.movetype = MOVETYPE_TOSS; e.gravity = 1; @@ -174,12 +165,16 @@ MUTATOR_HOOKFUNCTION(ok, MonsterDropItem) } MUTATOR_HOOKFUNCTION(ok, PlayerRegen) -{SELFPARAM(); +{ + entity player = M_ARGV(0, entity); + // overkill's values are different, so use custom regen - if(!STAT(FROZEN, self)) + if(!STAT(FROZEN, player)) { - 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); + player.armorvalue = CalcRotRegen(player.armorvalue, autocvar_g_balance_armor_regenstable, autocvar_g_balance_armor_regen, autocvar_g_balance_armor_regenlinear, + 1 * frametime * (time > player.ok_pauseregen_finished), 0, 0, 1, 1 * frametime * (time > player.pauserotarmor_finished), autocvar_g_balance_armor_limit); + player.health = CalcRotRegen(player.health, autocvar_g_balance_health_regenstable, 0, 100, 1 * frametime * (time > player.ok_pauseregen_finished), 200, 0, + autocvar_g_balance_health_rotlinear, 1 * frametime * (time > player.pauserothealth_finished), autocvar_g_balance_health_limit); float minf, maxf, limitf; @@ -187,7 +182,8 @@ MUTATOR_HOOKFUNCTION(ok, PlayerRegen) minf = autocvar_g_balance_fuel_regenstable; limitf = autocvar_g_balance_fuel_limit; - 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 & ITEM_JetpackRegen.m_itemid) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > self.pauserotfuel_finished), limitf); + player.ammo_fuel = CalcRotRegen(player.ammo_fuel, minf, autocvar_g_balance_fuel_regen, autocvar_g_balance_fuel_regenlinear, + frametime * (time > player.pauseregen_finished) * ((player.items & ITEM_JetpackRegen.m_itemid) != 0), maxf, autocvar_g_balance_fuel_rot, autocvar_g_balance_fuel_rotlinear, frametime * (time > player.pauserotfuel_finished), limitf); } return true; // return true anyway, as frozen uses no regen } @@ -198,37 +194,39 @@ MUTATOR_HOOKFUNCTION(ok, ForbidThrowCurrentWeapon) } MUTATOR_HOOKFUNCTION(ok, PlayerPreThink) -{SELFPARAM(); +{ if(intermission_running || gameover) - return false; + return; - if(IS_DEAD(self) || !IS_PLAYER(self) || STAT(FROZEN, self)) - return false; + entity player = M_ARGV(0, entity); + + if(IS_DEAD(player) || !IS_PLAYER(player) || STAT(FROZEN, player)) + return; - if(self.ok_lastwep) + if(player.ok_lastwep) { - Weapon newwep = Weapons_from(self.ok_lastwep); - if(self.ok_lastwep == WEP_HMG.m_id) + Weapon newwep = Weapons_from(player.ok_lastwep); + if(player.ok_lastwep == WEP_HMG.m_id) newwep = WEP_MACHINEGUN; - if(self.ok_lastwep == WEP_RPC.m_id) + if(player.ok_lastwep == WEP_RPC.m_id) newwep = WEP_VORTEX; - PS(self).m_switchweapon = newwep; - self.ok_lastwep = 0; + PS(player).m_switchweapon = newwep; + player.ok_lastwep = 0; } - ok_IncreaseCharge(self, PS(self).m_weapon.m_id); + ok_IncreaseCharge(player, PS(player).m_weapon.m_id); - if(PHYS_INPUT_BUTTON_ATCK2(self)) - if(!forbidWeaponUse(self) || self.weapon_blocked) // allow if weapon is blocked - if(time >= self.jump_interval) + if(PHYS_INPUT_BUTTON_ATCK2(player)) + if(!forbidWeaponUse(player) || player.weapon_blocked) // allow if weapon is blocked + if(time >= player.jump_interval) { - self.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(this); - makevectors(self.v_angle); + player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player); + makevectors(player.v_angle); - Weapon oldwep = PS(self).m_weapon; - PS(self).m_weapon = WEP_BLASTER; + Weapon oldwep = PS(player).m_weapon; + PS(player).m_weapon = WEP_BLASTER; W_Blaster_Attack( - self, + player, WEP_BLASTER.m_id | HITTYPE_SECONDARY, WEP_CVAR_SEC(vaporizer, shotangle), WEP_CVAR_SEC(vaporizer, damage), @@ -240,33 +238,31 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink) WEP_CVAR_SEC(vaporizer, delay), WEP_CVAR_SEC(vaporizer, lifetime) ); - PS(self).m_weapon = oldwep; + PS(player).m_weapon = oldwep; } - self.weapon_blocked = false; + player.weapon_blocked = false; - self.ok_ammo_charge = self.ammo_charge[PS(self).m_weapon.m_id]; + player.ok_ammo_charge = player.ammo_charge[PS(player).m_weapon.m_id]; - if(self.ok_use_ammocharge) - if(!ok_CheckWeaponCharge(self, PS(self).m_weapon.m_id)) + if(player.ok_use_ammocharge) + if(!ok_CheckWeaponCharge(player, PS(player).m_weapon.m_id)) { - if(autocvar_g_overkill_ammo_charge_notice && time > self.ok_notice_time && PHYS_INPUT_BUTTON_ATCK(self) && IS_REAL_CLIENT(self) && PS(self).m_weapon == PS(self).m_switchweapon) + if(autocvar_g_overkill_ammo_charge_notice && time > player.ok_notice_time && PHYS_INPUT_BUTTON_ATCK(player) && IS_REAL_CLIENT(player) && PS(player).m_weapon == PS(player).m_switchweapon) { - //Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_OVERKILL_CHARGE); - self.ok_notice_time = time + 2; - play2(self, SND(DRYFIRE)); + //Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_OVERKILL_CHARGE); + player.ok_notice_time = time + 2; + play2(player, SND(DRYFIRE)); } - Weapon wpn = PS(self).m_weapon; + Weapon wpn = PS(player).m_weapon; .entity weaponentity = weaponentities[0]; // TODO: unhardcode - if(self.(weaponentity).state != WS_CLEAR) - w_ready(wpn, self, weaponentity, PHYS_INPUT_BUTTON_ATCK(self) | (PHYS_INPUT_BUTTON_ATCK2(self) << 1)); + if(player.(weaponentity).state != WS_CLEAR) + w_ready(wpn, player, weaponentity, PHYS_INPUT_BUTTON_ATCK(player) | (PHYS_INPUT_BUTTON_ATCK2(player) << 1)); - self.weapon_blocked = true; + player.weapon_blocked = true; } - PHYS_INPUT_BUTTON_ATCK2(self) = false; - - return false; + PHYS_INPUT_BUTTON_ATCK2(player) = false; } MUTATOR_HOOKFUNCTION(ok, PlayerSpawn) @@ -288,8 +284,6 @@ MUTATOR_HOOKFUNCTION(ok, PlayerSpawn) player.ok_lastwep = 0; player.ok_pauseregen_finished = time + 2; - - return false; } void self_spawnfunc_weapon_hmg(entity this) { spawnfunc_weapon_hmg(this); } @@ -336,8 +330,6 @@ MUTATOR_HOOKFUNCTION(ok, OnEntityPreSpawn) return true; } } - - return false; } MUTATOR_HOOKFUNCTION(ok, FilterItem) @@ -345,7 +337,7 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem) entity item = M_ARGV(0, entity); if(item.ok_item) - return false; + return; switch(item.items) { @@ -374,8 +366,6 @@ MUTATOR_HOOKFUNCTION(ok, SetStartItems) start_items |= IT_UNLIMITED_WEAPON_AMMO; start_weapons = warmup_start_weapons = ok_start_items; - - return false; } MUTATOR_HOOKFUNCTION(ok, BuildMutatorsString)