X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_nex.qc;h=5b1943b5da68fceecf92850e0a614ccd04ea70de;hp=a6ec07d6a819791392f8716325d6556900668445;hb=96913ae9dc8fb84b7be13b47040896cc68b027f5;hpb=a93f3917dce3a007d9b15822c1c462d15290e2c3 diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc index a6ec07d6a8..5b1943b5da 100644 --- a/qcsrc/server/w_nex.qc +++ b/qcsrc/server/w_nex.qc @@ -2,23 +2,23 @@ REGISTER_WEAPON(NEX, w_nex, IT_CELLS, 7, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "nex", "nex", "Nex"); #else #ifdef SVQC -void SendCSQCNexBeamParticle() { +void SendCSQCNexBeamParticle(float charge) { vector v; v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos); WriteByte(MSG_BROADCAST, SVC_TEMPENTITY); WriteByte(MSG_BROADCAST, TE_CSQC_NEXGUNBEAMPARTICLE); - WriteCoord(MSG_BROADCAST, w_shotorg_x); WriteCoord(MSG_BROADCAST, w_shotorg_y); WriteCoord(MSG_BROADCAST, w_shotorg_z); WriteCoord(MSG_BROADCAST, v_x); WriteCoord(MSG_BROADCAST, v_y); WriteCoord(MSG_BROADCAST, v_z); + WriteByte(MSG_BROADCAST, bound(0, 255 * charge, 255)); } void W_Nex_Attack (float issecondary) { - float mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, myammo; + float mydmg, myforce, mymindist, mymaxdist, myhalflife, myforcehalflife, myammo, charge; if(issecondary) { mydmg = cvar("g_balance_nex_secondary_damage"); @@ -43,7 +43,23 @@ void W_Nex_Attack (float issecondary) float flying; flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last - W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", mydmg); + if(cvar("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 + // O RLY? -- divVerent + // YA RLY -- FruitieX + } + else + charge = 1; + mydmg *= charge; + myforce *= charge; + + W_SetupShot (self, TRUE, 5, "weapons/nexfire.wav", CHAN_WEAPON, mydmg); + if(charge > cvar("g_balance_nex_charge_limit") && cvar("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 * cvar("g_balance_nex_charge_limit")) / (1 - 0.5 * cvar("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); @@ -52,7 +68,7 @@ void W_Nex_Attack (float issecondary) AnnounceTo(self, "yoda"); //beam and muzzle flash done on client - SendCSQCNexBeamParticle(); + SendCSQCNexBeamParticle(charge); // flash and burn the wall if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)) @@ -64,8 +80,10 @@ void W_Nex_Attack (float issecondary) void spawnfunc_weapon_nex (void); // defined in t_items.qc +.float nex_charge_pool_pauseregen_finished; float w_nex(float req) { + float dt; if (req == WR_AIM) { self.BUTTON_ATCK = bot_aim(1000000, 0, 1, FALSE); @@ -73,6 +91,28 @@ 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(cvar("g_balance_nex_charge")) + { + self.weaponentity.weaponentity.glowmod = '1 1 1' * self.nex_charge; + self.exteriorweaponentity.glowmod = '1 1 1' * self.nex_charge; + if(self.nex_charge > cvar("g_balance_nex_charge_limit")) + { + self.weaponentity.weaponentity.glowmod_y -= 0.5 * (self.nex_charge - cvar("g_balance_nex_charge_limit")) / (1 - cvar("g_balance_nex_charge_limit")); + self.weaponentity.weaponentity.glowmod_z -= 0.5 * (self.nex_charge - cvar("g_balance_nex_charge_limit")) / (1 - cvar("g_balance_nex_charge_limit")); + } + } + + if(cvar("g_balance_nex_secondary_charge_pool")) + if(self.nex_charge_pool_ammo < 1) + { + if(self.nex_charge_pool_pauseregen_finished < time) + self.nex_charge_pool_ammo = min(1, self.nex_charge_pool_ammo + cvar("g_balance_nex_secondary_charge_pool_regen") * frametime / W_TICSPERFRAME); + self.pauseregen_finished = max(self.pauseregen_finished, time + cvar("g_balance_nex_secondary_charge_pool_pause_health_regen")); + } + if (self.BUTTON_ATCK) { if (weapon_prepareattack(0, cvar("g_balance_nex_primary_refire"))) @@ -83,7 +123,46 @@ float w_nex(float req) } if (self.BUTTON_ATCK2) { - if(cvar("g_balance_nex_secondary")) + if(cvar("g_balance_nex_secondary_charge")) + { + self.nex_charge_rottime = time + cvar("g_balance_nex_charge_rot_pause"); + dt = frametime / W_TICSPERFRAME; + + if(cvar("g_balance_nex_secondary_charge_pool")) + { + if(cvar("g_balance_nex_secondary_ammo")) + { + // always deplete if secondary is held + self.nex_charge_pool_ammo = max(0, self.nex_charge_pool_ammo - cvar("g_balance_nex_secondary_ammo") * dt); + + dt = min(dt, (1 - self.nex_charge) / cvar("g_balance_nex_secondary_charge_rate")); + self.nex_charge_pool_pauseregen_finished = time + cvar("g_balance_nex_secondary_charge_pool_pause_regen"); + dt = min(dt, self.nex_charge_pool_ammo); + dt = max(0, dt); + + self.nex_charge += dt * cvar("g_balance_nex_secondary_charge_rate"); + } + } + + else if(cvar("g_balance_nex_secondary_ammo")) + { + if(self.nex_charge < 1) + { + dt = min(dt, (1 - self.nex_charge) / cvar("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 = 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.nex_charge += dt * cvar("g_balance_nex_secondary_charge_rate"); + } + } + } + else if(cvar("g_balance_nex_secondary")) { if (weapon_prepareattack(0, cvar("g_balance_nex_secondary_refire"))) { @@ -109,7 +188,7 @@ float w_nex(float req) else if (req == WR_CHECKAMMO1) return self.ammo_cells >= cvar("g_balance_nex_primary_ammo"); else if (req == WR_CHECKAMMO2) - return self.ammo_cells >= cvar("g_balance_nex_secondary_ammo"); + return self.ammo_cells >= cvar("g_balance_nex_primary_ammo"); // don't allow charging if we don't have enough ammo return TRUE; }; #endif