X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fvortex.qc;h=b3ba65c5056eba74be4d85dcde6874eff9e2a885;hp=0ca635b3ee32f1e21b8d996117c19bac39858ab8;hb=3bbcff2475d1b2efc1314a358bf60c6fba6e4be6;hpb=cf7d70cea2066703aad74fce5931e635471904f3 diff --git a/qcsrc/common/weapons/weapon/vortex.qc b/qcsrc/common/weapons/weapon/vortex.qc index 0ca635b3e..b3ba65c50 100644 --- a/qcsrc/common/weapons/weapon/vortex.qc +++ b/qcsrc/common/weapons/weapon/vortex.qc @@ -1,3 +1,4 @@ +#include "vortex.qh" #ifndef IMPLEMENTATION CLASS(Vortex, Weapon) /* ammotype */ ATTRIB(Vortex, ammo_field, .int, ammo_cells); @@ -6,11 +7,12 @@ CLASS(Vortex, Weapon) /* rating */ ATTRIB(Vortex, bot_pickupbasevalue, float, BOT_PICKUP_RATING_HIGH); /* color */ ATTRIB(Vortex, wpcolor, vector, '0.5 1 1'); /* modelname */ ATTRIB(Vortex, mdl, string, "nex"); -#ifndef MENUQC +#ifdef GAMEQC /* model */ ATTRIB(Vortex, m_model, Model, MDL_VORTEX_ITEM); #endif /* crosshair */ ATTRIB(Vortex, w_crosshair, string, "gfx/crosshairnex"); /* crosshair */ ATTRIB(Vortex, w_crosshair_size, float, 0.65); +/* reticle */ ATTRIB(Vortex, w_reticle, string, "gfx/reticle_nex"); /* wepimg */ ATTRIB(Vortex, model2, string, "weaponnex"); /* refname */ ATTRIB(Vortex, netname, string, "vortex"); /* wepname */ ATTRIB(Vortex, m_name, string, _("Vortex")); @@ -68,7 +70,7 @@ REGISTER_WEAPON(VORTEX, vortex, NEW(Vortex)); REGISTER_STAT(WEP_CVAR_vortex_charge, bool, WEP_CVAR(vortex, charge)) REGISTER_STAT(WEP_CVAR_vortex_charge_animlimit, float, WEP_CVAR(vortex, charge_animlimit)) -#if defined(CSQC) +#if defined(GAMEQC) float autocvar_g_weapon_charge_colormod_red_full; float autocvar_g_weapon_charge_colormod_red_half; float autocvar_g_weapon_charge_colormod_green_full; @@ -77,11 +79,11 @@ float autocvar_g_weapon_charge_colormod_blue_half; float autocvar_g_weapon_charge_colormod_green_half; float autocvar_g_weapon_charge_colormod_hdrmultiplier; -METHOD(Vortex, wr_glow, vector(Vortex this)) +METHOD(Vortex, wr_glow, vector(Vortex this, entity actor, entity wepent)) { - if (!STAT(WEP_CVAR_vortex_charge)) return '0 0 0'; - float charge = STAT(VORTEX_CHARGE); - float animlimit = STAT(WEP_CVAR_vortex_charge_animlimit); + if (!STAT(WEP_CVAR_vortex_charge, actor)) return '0 0 0'; + float charge = wepent.vortex_charge; + float animlimit = STAT(WEP_CVAR_vortex_charge_animlimit, actor); vector g; g.x = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_half * min(1, charge / animlimit); g.y = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_half * min(1, charge / animlimit); @@ -146,15 +148,23 @@ MUTATOR_HOOKFUNCTION(vortex_charge, GetPressedKeys) entity player = M_ARGV(0, entity); // WEAPONTODO - float xyspeed = vlen(vec2(player.velocity)); - if (PS(player).m_weapon == WEP_VORTEX && WEP_CVAR(vortex, charge) && WEP_CVAR(vortex, charge_velocity_rate) && xyspeed > WEP_CVAR(vortex, charge_minspeed)) - { - // add a maximum of charge_velocity_rate when going fast (f = 1), gradually increasing from minspeed (f = 0) to maxspeed - xyspeed = min(xyspeed, WEP_CVAR(vortex, charge_maxspeed)); - float f = (xyspeed - WEP_CVAR(vortex, charge_minspeed)) / (WEP_CVAR(vortex, charge_maxspeed) - WEP_CVAR(vortex, charge_minspeed)); - // add the extra charge - player.vortex_charge = min(1, player.vortex_charge + WEP_CVAR(vortex, charge_velocity_rate) * f * PHYS_INPUT_TIMELENGTH); - } + if(!WEP_CVAR(vortex, charge) || !WEP_CVAR(vortex, charge_velocity_rate)) + return; + + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + + if (player.(weaponentity).m_weapon == WEP_VORTEX && WEP_CVAR(vortex, charge) && WEP_CVAR(vortex, charge_velocity_rate) && vdist(vec2(player.velocity), >, WEP_CVAR(vortex, charge_minspeed))) + { + float xyspeed = vlen(vec2(player.velocity)); + // add a maximum of charge_velocity_rate when going fast (f = 1), gradually increasing from minspeed (f = 0) to maxspeed + xyspeed = min(xyspeed, WEP_CVAR(vortex, charge_maxspeed)); + float f = (xyspeed - WEP_CVAR(vortex, charge_minspeed)) / (WEP_CVAR(vortex, charge_maxspeed) - WEP_CVAR(vortex, charge_minspeed)); + // add the extra charge + player.(weaponentity).vortex_charge = min(1, player.(weaponentity).vortex_charge + WEP_CVAR(vortex, charge_velocity_rate) * f * PHYS_INPUT_TIMELENGTH); + } + } } void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float issecondary) @@ -174,8 +184,8 @@ void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float i if(WEP_CVAR(vortex, charge)) { - charge = WEP_CVAR(vortex, charge_mindmg) / mydmg + (1 - WEP_CVAR(vortex, charge_mindmg) / mydmg) * actor.vortex_charge; - actor.vortex_charge *= WEP_CVAR(vortex, charge_shot_multiplier); // do this AFTER setting mydmg/myforce + charge = WEP_CVAR(vortex, charge_mindmg) / mydmg + (1 - WEP_CVAR(vortex, charge_mindmg) / mydmg) * actor.(weaponentity).vortex_charge; + actor.(weaponentity).vortex_charge *= WEP_CVAR(vortex, charge_shot_multiplier); // do this AFTER setting mydmg/myforce // O RLY? -- divVerent // YA RLY -- FruitieX } @@ -192,7 +202,7 @@ void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float i yoda = 0; damage_goodhits = 0; - FireRailgunBullet(actor, w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, WEP_VORTEX.m_id); + FireRailgunBullet(actor, weaponentity, w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, WEP_VORTEX.m_id); if(yoda && flying) Send_Notification(NOTIF_ONE, actor, MSG_ANNCE, ANNCE_ACHIEVEMENT_YODA); @@ -207,14 +217,14 @@ void W_Vortex_Attack(Weapon thiswep, entity actor, .entity weaponentity, float i //beam and muzzle flash done on client SendCSQCVortexBeamParticle(charge); - W_DecreaseAmmo(thiswep, actor, myammo); + W_DecreaseAmmo(thiswep, actor, myammo, weaponentity); } .float vortex_chargepool_pauseregen_finished; -METHOD(Vortex, wr_aim, void(entity thiswep, entity actor)) +METHOD(Vortex, wr_aim, void(entity thiswep, entity actor, .entity weaponentity)) { - if(bot_aim(actor, 1000000, 0, 1, false)) + if(bot_aim(actor, weaponentity, 1000000, 0, 1, false)) PHYS_INPUT_BUTTON_ATCK(actor) = true; else { @@ -224,18 +234,24 @@ METHOD(Vortex, wr_aim, void(entity thiswep, entity actor)) } METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire)) { - if(WEP_CVAR(vortex, charge) && actor.vortex_charge < WEP_CVAR(vortex, charge_limit)) - actor.vortex_charge = min(1, actor.vortex_charge + WEP_CVAR(vortex, charge_rate) * frametime / W_TICSPERFRAME); + if(WEP_CVAR(vortex, charge) && actor.(weaponentity).vortex_charge < WEP_CVAR(vortex, charge_limit)) + actor.(weaponentity).vortex_charge = min(1, actor.(weaponentity).vortex_charge + WEP_CVAR(vortex, charge_rate) * frametime / W_TICSPERFRAME); + + if(weaponslot(weaponentity) == 0) + actor.vortex_charge = actor.(weaponentity).vortex_charge; if(WEP_CVAR_SEC(vortex, chargepool)) - if(actor.vortex_chargepool_ammo < 1) + if(actor.(weaponentity).vortex_chargepool_ammo < 1) { if(actor.vortex_chargepool_pauseregen_finished < time) - actor.vortex_chargepool_ammo = min(1, actor.vortex_chargepool_ammo + WEP_CVAR_SEC(vortex, chargepool_regen) * frametime / W_TICSPERFRAME); + actor.(weaponentity).vortex_chargepool_ammo = min(1, actor.(weaponentity).vortex_chargepool_ammo + WEP_CVAR_SEC(vortex, chargepool_regen) * frametime / W_TICSPERFRAME); actor.pauseregen_finished = max(actor.pauseregen_finished, time + WEP_CVAR_SEC(vortex, chargepool_pause_regen)); } - if(autocvar_g_balance_vortex_reload_ammo && actor.clip_load < min(WEP_CVAR_PRI(vortex, ammo), WEP_CVAR_SEC(vortex, ammo))) { // forced reload + if(weaponslot(weaponentity) == 0) + actor.vortex_chargepool_ammo = actor.(weaponentity).vortex_chargepool_ammo; + + if(autocvar_g_balance_vortex_reload_ammo && actor.(weaponentity).clip_load < min(WEP_CVAR_PRI(vortex, ammo), WEP_CVAR_SEC(vortex, ammo))) { // forced reload thiswep.wr_reload(thiswep, actor, weaponentity); } else { @@ -251,10 +267,10 @@ METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity { if(WEP_CVAR(vortex, charge)) { - actor.vortex_charge_rottime = time + WEP_CVAR(vortex, charge_rot_pause); + actor.(weaponentity).vortex_charge_rottime = time + WEP_CVAR(vortex, charge_rot_pause); float dt = frametime / W_TICSPERFRAME; - if(actor.vortex_charge < 1) + if(actor.(weaponentity).vortex_charge < 1) { if(WEP_CVAR_SEC(vortex, chargepool)) { @@ -263,12 +279,12 @@ METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity // always deplete if secondary is held actor.vortex_chargepool_ammo = max(0, actor.vortex_chargepool_ammo - WEP_CVAR_SEC(vortex, ammo) * dt); - dt = min(dt, (1 - actor.vortex_charge) / WEP_CVAR(vortex, charge_rate)); + dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate)); actor.vortex_chargepool_pauseregen_finished = time + WEP_CVAR_SEC(vortex, chargepool_pause_regen); dt = min(dt, actor.vortex_chargepool_ammo); dt = max(0, dt); - actor.vortex_charge += dt * WEP_CVAR(vortex, charge_rate); + actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate); } } @@ -276,19 +292,19 @@ METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity { if(fire & 2) // only eat ammo when the button is pressed { - dt = min(dt, (1 - actor.vortex_charge) / WEP_CVAR(vortex, charge_rate)); + dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate)); if(!(actor.items & IT_UNLIMITED_WEAPON_AMMO)) { // if this weapon is reloadable, decrease its load. Else decrease the player's ammo if(autocvar_g_balance_vortex_reload_ammo) { - dt = min(dt, (actor.clip_load - WEP_CVAR_PRI(vortex, ammo)) / WEP_CVAR_SEC(vortex, ammo)); + dt = min(dt, (actor.(weaponentity).clip_load - WEP_CVAR_PRI(vortex, ammo)) / WEP_CVAR_SEC(vortex, ammo)); dt = max(0, dt); if(dt > 0) { - actor.clip_load = max(WEP_CVAR_SEC(vortex, ammo), actor.clip_load - WEP_CVAR_SEC(vortex, ammo) * dt); + actor.(weaponentity).clip_load = max(WEP_CVAR_SEC(vortex, ammo), actor.(weaponentity).clip_load - WEP_CVAR_SEC(vortex, ammo) * dt); } - actor.(weapon_load[WEP_VORTEX.m_id]) = actor.clip_load; + actor.(weaponentity).(weapon_load[WEP_VORTEX.m_id]) = actor.(weaponentity).clip_load; } else { @@ -300,14 +316,14 @@ METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity } } } - actor.vortex_charge += dt * WEP_CVAR(vortex, charge_rate); + actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate); } } else { - dt = min(dt, (1 - actor.vortex_charge) / WEP_CVAR(vortex, charge_rate)); - actor.vortex_charge += dt * WEP_CVAR(vortex, charge_rate); + dt = min(dt, (1 - actor.(weaponentity).vortex_charge) / WEP_CVAR(vortex, charge_rate)); + actor.(weaponentity).vortex_charge += dt * WEP_CVAR(vortex, charge_rate); } } } @@ -322,23 +338,23 @@ METHOD(Vortex, wr_think, void(entity thiswep, entity actor, .entity weaponentity } } } -METHOD(Vortex, wr_setup, void(entity thiswep, entity actor)) +METHOD(Vortex, wr_setup, void(entity thiswep, entity actor, .entity weaponentity)) { actor.vortex_lasthit = 0; } -METHOD(Vortex, wr_checkammo1, bool(entity thiswep, entity actor)) +METHOD(Vortex, wr_checkammo1, bool(entity thiswep, entity actor, .entity weaponentity)) { float ammo_amount = actor.(thiswep.ammo_field) >= WEP_CVAR_PRI(vortex, ammo); - ammo_amount += (autocvar_g_balance_vortex_reload_ammo && actor.(weapon_load[WEP_VORTEX.m_id]) >= WEP_CVAR_PRI(vortex, ammo)); + ammo_amount += (autocvar_g_balance_vortex_reload_ammo && actor.(weaponentity).(weapon_load[WEP_VORTEX.m_id]) >= WEP_CVAR_PRI(vortex, ammo)); return ammo_amount; } -METHOD(Vortex, wr_checkammo2, bool(entity thiswep, entity actor)) +METHOD(Vortex, wr_checkammo2, bool(entity thiswep, entity actor, .entity weaponentity)) { if(WEP_CVAR(vortex, secondary)) { // don't allow charging if we don't have enough ammo float ammo_amount = actor.(thiswep.ammo_field) >= WEP_CVAR_SEC(vortex, ammo); - ammo_amount += actor.(weapon_load[WEP_VORTEX.m_id]) >= WEP_CVAR_SEC(vortex, ammo); + ammo_amount += actor.(weaponentity).(weapon_load[WEP_VORTEX.m_id]) >= WEP_CVAR_SEC(vortex, ammo); return ammo_amount; } else @@ -353,6 +369,14 @@ METHOD(Vortex, wr_resetplayer, void(entity thiswep, entity actor)) actor.vortex_chargepool_ammo = 1; } actor.vortex_charge = WEP_CVAR(vortex, charge_start); + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + actor.(weaponentity).vortex_charge = WEP_CVAR(vortex, charge_start); + + if (WEP_CVAR_SEC(vortex, chargepool)) + actor.(weaponentity).vortex_chargepool_ammo = 1; + } } actor.vortex_lasthit = 0; } @@ -368,6 +392,10 @@ METHOD(Vortex, wr_killmessage, Notification(entity thiswep)) { return WEAPON_VORTEX_MURDER; } +METHOD(Vortex, wr_zoom, bool(entity thiswep, entity actor)) +{ + return PHYS_INPUT_BUTTON_ATCK2(actor) && !WEP_CVAR(vortex, secondary); +} #endif #ifdef CSQC @@ -387,11 +415,10 @@ METHOD(Vortex, wr_init, void(entity thiswep)) precache_pic("gfx/reticle_nex"); } } -METHOD(Vortex, wr_zoomreticle, bool(entity thiswep)) +METHOD(Vortex, wr_zoom, bool(entity thiswep, entity actor)) { if(button_zoom || zoomscript_caught || (!WEP_CVAR(vortex, secondary) && button_attack2)) { - reticle_image = "gfx/reticle_nex"; return true; } else