X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmutators%2Fmutator%2Foverkill%2Fsv_overkill.qc;h=67512a0a82a4c221a0b5bba2ea2e9750c5011c95;hp=d47da6c3c38ed43c3949eed8042f94941d8beef9;hb=3bbcff2475d1b2efc1314a358bf60c6fba6e4be6;hpb=7a6a774eae9edb72477fd83a1145f381e2982243 diff --git a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc index d47da6c3c3..67512a0a82 100644 --- a/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc +++ b/qcsrc/common/mutators/mutator/overkill/sv_overkill.qc @@ -13,15 +13,9 @@ bool autocvar_g_overkill_filter_armormedium; bool autocvar_g_overkill_filter_armorbig; bool autocvar_g_overkill_filter_armorlarge; -.float ok_lastwep; .float ok_item; -.float ok_notice_time; -.float ammo_charge[Weapons_MAX]; -.float ok_use_ammocharge = _STAT(OK_AMMO_CHARGE); -.float ok_ammo_charge = _STAT(OK_AMMO_CHARGEPOOL); - -void(entity ent, float wep) ok_DecreaseCharge; +.Weapon ok_lastwep[MAX_WEAPONSLOTS]; void ok_Initialize(); @@ -39,59 +33,10 @@ REGISTER_MUTATOR(ok, cvar("g_overkill") && !cvar("g_instagib") && !g_nexball && } } -MUTATOR_HOOKFUNCTION(ok, W_DecreaseAmmo) -{ - entity actor = M_ARGV(0, entity); - if (actor.ok_use_ammocharge) - { - ok_DecreaseCharge(actor, PS(actor).m_weapon.m_id); - return true; - } -} - -MUTATOR_HOOKFUNCTION(ok, W_Reload) -{ - entity actor = M_ARGV(0, entity); - return actor.ok_use_ammocharge; -} - void W_Blaster_Attack(entity, .entity, float, float, float, float, float, float, float, float, float, float); spawnfunc(weapon_hmg); spawnfunc(weapon_rpc); -void ok_DecreaseCharge(entity ent, int wep) -{ - if(!ent.ok_use_ammocharge) return; - - entity wepent = Weapons_from(wep); - - if (wepent == WEP_Null) return; // dummy - - ent.ammo_charge[wep] -= max(0, cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname))); -} - -void ok_IncreaseCharge(entity ent, int wep) -{ - entity wepent = Weapons_from(wep); - - if (wepent == WEP_Null) return; // dummy - - if(ent.ok_use_ammocharge) - if(!PHYS_INPUT_BUTTON_ATCK(ent)) // not while attacking? - 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, int wep) -{ - if(!ent.ok_use_ammocharge) return true; - - entity wepent = Weapons_from(wep); - - if(wepent == WEP_Null) return false; // dummy - - return (ent.ammo_charge[wep] >= cvar(sprintf("g_overkill_ammo_decharge_%s", wepent.netname))); -} - MUTATOR_HOOKFUNCTION(ok, PlayerDamage_Calculate, CBC_ORDER_LAST) { entity frag_attacker = M_ARGV(1, entity); @@ -141,7 +86,12 @@ MUTATOR_HOOKFUNCTION(ok, PlayerDies) ok_DropItem(frag_target, targ); - frag_target.ok_lastwep = PS(frag_target).m_switchweapon.m_id; + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + + frag_target.ok_lastwep[slot] = frag_target.(weaponentity).m_switchweapon; + } } MUTATOR_HOOKFUNCTION(ok, MonsterDropItem) @@ -172,18 +122,22 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink) if(IS_DEAD(player) || !IS_PLAYER(player) || STAT(FROZEN, player)) return; - if(player.ok_lastwep) + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { - Weapon newwep = Weapons_from(player.ok_lastwep); - if(player.ok_lastwep == WEP_HMG.m_id) - newwep = WEP_MACHINEGUN; - if(player.ok_lastwep == WEP_RPC.m_id) - newwep = WEP_VORTEX; - PS(player).m_switchweapon = newwep; - player.ok_lastwep = 0; - } + .entity weaponentity = weaponentities[slot]; + entity thiswep = player.(weaponentity); - ok_IncreaseCharge(player, PS(player).m_weapon.m_id); + 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; + thiswep.m_switchweapon = newwep; + player.ok_lastwep[slot] = WEP_Null; + } + } if(PHYS_INPUT_BUTTON_ATCK2(player)) if( !forbidWeaponUse(player) || player.weapon_blocked // allow if weapon is blocked @@ -193,44 +147,31 @@ MUTATOR_HOOKFUNCTION(ok, PlayerPreThink) player.jump_interval = time + WEP_CVAR_PRI(blaster, refire) * W_WeaponRateFactor(player); makevectors(player.v_angle); - Weapon oldwep = PS(player).m_weapon; - PS(player).m_weapon = WEP_BLASTER; - W_Blaster_Attack( - player, - weaponentities[0], // TODO: unhardcode - 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) - ); - PS(player).m_weapon = oldwep; - } - - player.weapon_blocked = false; - - player.ok_ammo_charge = player.ammo_charge[PS(player).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 > player.ok_notice_time && PHYS_INPUT_BUTTON_ATCK(player) && IS_REAL_CLIENT(player) && PS(player).m_weapon == PS(player).m_switchweapon) + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) { - //Send_Notification(NOTIF_ONE, player, MSG_CENTER, CENTER_OVERKILL_CHARGE); - player.ok_notice_time = time + 2; - play2(player, SND(DRYFIRE)); + .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; } - Weapon wpn = PS(player).m_weapon; - .entity weaponentity = weaponentities[0]; // TODO: unhardcode - if(player.(weaponentity).state != WS_CLEAR) - w_ready(wpn, player, weaponentity, PHYS_INPUT_BUTTON_ATCK(player) | (PHYS_INPUT_BUTTON_ATCK2(player) << 1)); - - player.weapon_blocked = true; } PHYS_INPUT_BUTTON_ATCK2(player) = false; @@ -240,19 +181,14 @@ MUTATOR_HOOKFUNCTION(ok, PlayerSpawn) { entity player = M_ARGV(0, entity); - if(autocvar_g_overkill_ammo_charge) - { - FOREACH(Weapons, it != WEP_Null, LAMBDA(player.ammo_charge[it.m_id] = autocvar_g_overkill_ammo_charge_limit)); - - player.ok_use_ammocharge = 1; - player.ok_notice_time = time; - } - else - player.ok_use_ammocharge = 0; - // if player changed their weapon while dead, don't switch to their death weapon if(player.impulse) - player.ok_lastwep = 0; + { + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + player.ok_lastwep[slot] = WEP_Null; + } + } } void self_spawnfunc_weapon_hmg(entity this) { spawnfunc_weapon_hmg(this); } @@ -321,15 +257,6 @@ MUTATOR_HOOKFUNCTION(ok, FilterItem) return true; } -MUTATOR_HOOKFUNCTION(ok, SpectateCopy) -{ - entity spectatee = M_ARGV(0, entity); - entity client = M_ARGV(1, entity); - - client.ammo_charge[PS(client).m_weapon.m_id] = spectatee.ammo_charge[PS(spectatee).m_weapon.m_id]; - client.ok_use_ammocharge = spectatee.ok_use_ammocharge; -} - MUTATOR_HOOKFUNCTION(ok, SetStartItems, CBC_ORDER_LAST) { WepSet ok_start_items = (WEPSET(MACHINEGUN) | WEPSET(VORTEX) | WEPSET(SHOTGUN));