X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_nex.qc;h=7b1239b898859f206b22bfe7881b49d8b72a8fb6;hp=d152a6e083949b56586aa4179f46556090841b84;hb=70edab3a313f9b0576987d49a47be0a0a16f9e2c;hpb=d4a496548f33a19bae54c700639079dcf453dde1 diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index d152a6e08..7b1239b89 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -21,40 +21,45 @@ void W_Nex_Attack (float issecondary) float mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, myammo, charge; if(issecondary) { - mydmg = cvar("g_balance_nex_secondary_damage"); - myforce = cvar("g_balance_nex_secondary_force"); - mymindist = cvar("g_balance_nex_secondary_damagefalloff_mindist"); - mymaxdist = cvar("g_balance_nex_secondary_damagefalloff_maxdist"); - myhalflife = cvar("g_balance_nex_secondary_damagefalloff_halflife"); - myforcehalflife = cvar("g_balance_nex_secondary_damagefalloff_forcehalflife"); - myammo = cvar("g_balance_nex_secondary_ammo"); + mydmg = autocvar_g_balance_nex_secondary_damage; + myforce = autocvar_g_balance_nex_secondary_force; + mymindist = autocvar_g_balance_nex_secondary_damagefalloff_mindist; + mymaxdist = autocvar_g_balance_nex_secondary_damagefalloff_maxdist; + myhalflife = autocvar_g_balance_nex_secondary_damagefalloff_halflife; + myforcehalflife = autocvar_g_balance_nex_secondary_damagefalloff_forcehalflife; + myammo = autocvar_g_balance_nex_secondary_ammo; } else { - mydmg = cvar("g_balance_nex_primary_damage"); - myforce = cvar("g_balance_nex_primary_force"); - mymindist = cvar("g_balance_nex_primary_damagefalloff_mindist"); - mymaxdist = cvar("g_balance_nex_primary_damagefalloff_maxdist"); - myhalflife = cvar("g_balance_nex_primary_damagefalloff_halflife"); - myforcehalflife = cvar("g_balance_nex_primary_damagefalloff_forcehalflife"); - myammo = cvar("g_balance_nex_primary_ammo"); + mydmg = autocvar_g_balance_nex_primary_damage; + myforce = autocvar_g_balance_nex_primary_force; + mymindist = autocvar_g_balance_nex_primary_damagefalloff_mindist; + mymaxdist = autocvar_g_balance_nex_primary_damagefalloff_maxdist; + myhalflife = autocvar_g_balance_nex_primary_damagefalloff_halflife; + myforcehalflife = autocvar_g_balance_nex_primary_damagefalloff_forcehalflife; + myammo = autocvar_g_balance_nex_primary_ammo; } float flying; flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last - if(cvar("g_balance_nex_charge")) + if(autocvar_g_balance_nex_charge) { - charge = cvar("g_balance_nex_charge_mindmg") / mydmg + (1 - cvar("g_balance_nex_charge_mindmg") / mydmg) * self.nex_charge; - self.nex_charge *= cvar("g_balance_nex_charge_shot_multiplier"); // do this AFTER setting mydmg/myforce + charge = autocvar_g_balance_nex_charge_mindmg / mydmg + (1 - autocvar_g_balance_nex_charge_mindmg / mydmg) * self.nex_charge; + self.nex_charge *= autocvar_g_balance_nex_charge_shot_multiplier; // do this AFTER setting mydmg/myforce // O RLY? -- divVerent + // YA RLY -- FruitieX } else charge = 1; mydmg *= charge; myforce *= charge; - W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", mydmg); + W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", CHAN_WEAPON, mydmg); + if(charge > autocvar_g_balance_nex_charge_limit && autocvar_g_balance_nex_charge_limit) // if the Nex is overcharged, we play an extra sound + { + sound (self, CHAN_WEAPON2, "weapons/nexcharge.wav", VOL_BASE * (charge - 0.5 * autocvar_g_balance_nex_charge_limit) / (1 - 0.5 * autocvar_g_balance_nex_charge_limit), ATTN_NORM); + } yoda = 0; FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, WEP_NEX); @@ -75,6 +80,7 @@ void W_Nex_Attack (float issecondary) void spawnfunc_weapon_nex (void); // defined in t_items.qc +.float nex_chargepool_pauseregen_finished; float w_nex(float req) { float dt; @@ -85,47 +91,86 @@ float w_nex(float req) } else if (req == WR_THINK) { - if(cvar("g_balance_nex_charge") && self.nex_charge < cvar("g_balance_nex_charge_limit")) - self.nex_charge = min(1, self.nex_charge + cvar("g_balance_nex_charge_rate") * frametime / W_TICSPERFRAME); + if(autocvar_g_balance_nex_charge && self.nex_charge < autocvar_g_balance_nex_charge_limit) + self.nex_charge = min(1, self.nex_charge + autocvar_g_balance_nex_charge_rate * frametime / W_TICSPERFRAME); + + if(autocvar_g_balance_nex_charge) + { + self.weaponentity_glowmod_x = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_half * min(1, self.nex_charge / autocvar_g_balance_nex_charge_limit); + self.weaponentity_glowmod_y = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_half * min(1, self.nex_charge / autocvar_g_balance_nex_charge_limit); + self.weaponentity_glowmod_z = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_half * min(1, self.nex_charge / autocvar_g_balance_nex_charge_limit); + + if(self.nex_charge > autocvar_g_balance_nex_charge_limit) + { + self.weaponentity_glowmod_x = self.weaponentity_glowmod_x + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_full * (self.nex_charge - autocvar_g_balance_nex_charge_limit) / (1 - autocvar_g_balance_nex_charge_limit); + self.weaponentity_glowmod_y = self.weaponentity_glowmod_y + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_green_full * (self.nex_charge - autocvar_g_balance_nex_charge_limit) / (1 - autocvar_g_balance_nex_charge_limit); + self.weaponentity_glowmod_z = self.weaponentity_glowmod_z + autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_blue_full * (self.nex_charge - autocvar_g_balance_nex_charge_limit) / (1 - autocvar_g_balance_nex_charge_limit); + } + } + + if(autocvar_g_balance_nex_secondary_chargepool) + if(self.nex_chargepool_ammo < 1) + { + if(self.nex_chargepool_pauseregen_finished < time) + self.nex_chargepool_ammo = min(1, self.nex_chargepool_ammo + autocvar_g_balance_nex_secondary_chargepool_regen * frametime / W_TICSPERFRAME); + self.pauseregen_finished = max(self.pauseregen_finished, time + autocvar_g_balance_nex_secondary_chargepool_pause_health_regen); + } if (self.BUTTON_ATCK) { - if (weapon_prepareattack(0, cvar("g_balance_nex_primary_refire"))) + if (weapon_prepareattack(0, autocvar_g_balance_nex_primary_refire)) { W_Nex_Attack(0); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_primary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nex_primary_animtime, w_ready); } } if (self.BUTTON_ATCK2) { - if(cvar("g_balance_nex_secondary_charge")) + if(autocvar_g_balance_nex_secondary_charge) { - self.nex_charge_rottime = time + cvar("g_balance_nex_charge_rot_pause"); + self.nex_charge_rottime = time + autocvar_g_balance_nex_charge_rot_pause; dt = frametime / W_TICSPERFRAME; - if(self.nex_charge < 1) + + if(autocvar_g_balance_nex_secondary_chargepool) { - dt = min(dt, (1 - self.nex_charge) / cvar("g_balance_nex_secondary_charge_rate")); - if not(self.items & IT_UNLIMITED_WEAPON_AMMO) + if(autocvar_g_balance_nex_secondary_ammo) { - if(cvar("g_balance_nex_secondary_ammo")) + // always deplete if secondary is held + self.nex_chargepool_ammo = max(0, self.nex_chargepool_ammo - autocvar_g_balance_nex_secondary_ammo * dt); + + dt = min(dt, (1 - self.nex_charge) / autocvar_g_balance_nex_secondary_charge_rate); + self.nex_chargepool_pauseregen_finished = time + autocvar_g_balance_nex_secondary_chargepool_pause_regen; + dt = min(dt, self.nex_chargepool_ammo); + dt = max(0, dt); + + self.nex_charge += dt * autocvar_g_balance_nex_secondary_charge_rate; + } + } + + else if(autocvar_g_balance_nex_secondary_ammo) + { + if(self.nex_charge < 1) + { + dt = min(dt, (1 - self.nex_charge) / autocvar_g_balance_nex_secondary_charge_rate); + if not(self.items & IT_UNLIMITED_WEAPON_AMMO) { - dt = min(dt, (self.ammo_cells - cvar("g_balance_nex_primary_ammo")) / cvar("g_balance_nex_secondary_ammo")); + dt = min(dt, (self.ammo_cells - autocvar_g_balance_nex_primary_ammo) / autocvar_g_balance_nex_secondary_ammo); dt = max(0, dt); if(dt > 0) { - self.ammo_cells = max(cvar("g_balance_nex_secondary_ammo"), self.ammo_cells - cvar("g_balance_nex_secondary_ammo") * dt); + self.ammo_cells = max(autocvar_g_balance_nex_secondary_ammo, self.ammo_cells - autocvar_g_balance_nex_secondary_ammo * dt); } } + self.nex_charge += dt * autocvar_g_balance_nex_secondary_charge_rate; } - self.nex_charge += dt * cvar("g_balance_nex_secondary_charge_rate"); } } - else if(cvar("g_balance_nex_secondary")) + else if(autocvar_g_balance_nex_secondary) { - if (weapon_prepareattack(0, cvar("g_balance_nex_secondary_refire"))) + if (weapon_prepareattack(0, autocvar_g_balance_nex_secondary_refire)) { W_Nex_Attack(1); - weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_nex_secondary_animtime"), w_ready); + weapon_thinkf(WFRAME_FIRE1, autocvar_g_balance_nex_secondary_animtime, w_ready); } } } @@ -137,6 +182,7 @@ float w_nex(float req) precache_model ("models/weapons/v_nex.md3"); precache_model ("models/weapons/h_nex.iqm"); precache_sound ("weapons/nexfire.wav"); + precache_sound ("weapons/nexcharge.wav"); precache_sound ("weapons/nexwhoosh1.wav"); precache_sound ("weapons/nexwhoosh2.wav"); precache_sound ("weapons/nexwhoosh3.wav"); @@ -144,13 +190,9 @@ float w_nex(float req) else if (req == WR_SETUP) weapon_setup(WEP_NEX); else if (req == WR_CHECKAMMO1) - return self.ammo_cells >= cvar("g_balance_nex_primary_ammo"); + return self.ammo_cells >= autocvar_g_balance_nex_primary_ammo; else if (req == WR_CHECKAMMO2) - { - if(cvar("g_balance_nex_secondary_charge")) - return self.ammo_cells >= cvar("g_balance_nex_primary_ammo"); - return self.ammo_cells >= cvar("g_balance_nex_secondary_ammo"); - } + return self.ammo_cells >= autocvar_g_balance_nex_primary_ammo; // don't allow charging if we don't have enough ammo return TRUE; }; #endif