X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_electro.qc;h=a98c5a9153a0214842e84a67edc3bbb1bdf8529c;hb=fe28e269a3152beb36a54315cc0cbb9b8892ac2e;hp=c2e57d20255922a9b53e260fff4f7b428afebf65;hpb=a8d6f27086f7874bf542ee44264a265d7ab60a23;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index c2e57d202..a98c5a915 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -184,10 +184,38 @@ void W_Electro_Attack2() CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO, FALSE); // no culling, it has sound } -.entity lgbeam, exteriorlgbeam; -.float nextdamagethink; +.vector hook_start, hook_end; +float lgbeam_send(entity to, float sf) +{ + WriteByte(MSG_ENTITY, ENT_CLIENT_LGBEAM); + sf = sf & 0x7F; + if(sound_allowed(MSG_BROADCAST, self.owner)) + sf |= 0x80; + WriteByte(MSG_ENTITY, sf); + if(sf & 1) + { + WriteByte(MSG_ENTITY, num_for_edict(self.owner)); + WriteCoord(MSG_ENTITY, cvar("g_balance_electro_primary_range")); + } + if(sf & 2) + { + WriteCoord(MSG_ENTITY, self.hook_start_x); + WriteCoord(MSG_ENTITY, self.hook_start_y); + WriteCoord(MSG_ENTITY, self.hook_start_z); + } + if(sf & 4) + { + WriteCoord(MSG_ENTITY, self.hook_end_x); + WriteCoord(MSG_ENTITY, self.hook_end_y); + WriteCoord(MSG_ENTITY, self.hook_end_z); + } + return TRUE; +} +.entity lgbeam; +.float prevlgfire; void lgbeam_think() { + self.owner.prevlgfire = time; if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam || self.owner.deadflag != DEAD_NO || !self.owner.BUTTON_ATCK) { remove(self); @@ -197,50 +225,51 @@ void lgbeam_think() self.nextthink = time; makevectors(self.owner.v_angle); - vector angle; - angle = v_forward; - - traceline_antilag(self.owner, self.owner.origin + self.owner.view_ofs, self.owner.origin + self.owner.view_ofs + angle * cvar("g_balance_electro_primary_range"), FALSE, self.owner, ANTILAG_LATENCY(self.owner)); + float dt; + dt = frametime; if not(self.owner.items & IT_UNLIMITED_WEAPON_AMMO) + { + if(cvar("g_balance_electro_primary_ammo")) + dt = min(frametime, self.owner.ammo_cells / cvar("g_balance_electro_primary_ammo")); self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime); + } + + W_SetupShot_Range(self.owner, TRUE, 0, "", cvar("g_balance_electro_primary_damage") * dt, cvar("g_balance_electro_primary_range")); + WarpZone_traceline_antilag(self.owner, w_shotorg, w_shotend, MOVE_NORMAL, self.owner, ANTILAG_LATENCY(self.owner)); // apply the damage - if(trace_fraction < 1) + if(trace_ent) { vector force; - force = angle * cvar("g_balance_electro_primary_force") + '0 0 1' * cvar("g_balance_electro_primary_force_up"); - Damage (trace_ent, self.owner, self.owner, cvar("g_balance_electro_primary_damage") * frametime, WEP_ELECTRO, trace_endpos, force * frametime); - W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner); + force = w_shotdir * cvar("g_balance_electro_primary_force") + '0 0 1' * cvar("g_balance_electro_primary_force_up"); + Damage (trace_ent, self.owner, self.owner, cvar("g_balance_electro_primary_damage") * dt, WEP_ELECTRO, trace_endpos, force * dt); + Damage_RecordDamage(self.owner, WEP_ELECTRO, cvar("g_balance_electro_primary_damage") * dt); } + W_Plasma_TriggerCombo(trace_endpos, cvar("g_balance_electro_primary_comboradius"), self.owner); // draw effect - vector vecs, org; - if(self.owner.weaponentity.movedir_x > 0) + if(w_shotorg != self.hook_start) { - vecs = self.owner.weaponentity.movedir; - vecs_y = -vecs_y; + self.SendFlags |= 2; + self.hook_start = w_shotorg; + } + if(w_shotend != self.hook_end) + { + self.SendFlags |= 4; + self.hook_end = w_shotend; } - else - vecs = '0 0 0'; - org = self.owner.origin + self.owner.view_ofs + v_forward * vecs_x + v_right * vecs_y + v_up * vecs_z; - - // TODO turn into a csqc entity - WriteByte(MSG_BROADCAST, SVC_TEMPENTITY); - WriteByte(MSG_BROADCAST, TE_CSQC_BEAM); - WriteByte(MSG_BROADCAST, num_for_edict(self.owner)); - WriteByte(MSG_BROADCAST, sound_allowed(MSG_BROADCAST, self.owner) ? 1 : 2); - WriteCoord(MSG_BROADCAST, trace_endpos_x); - WriteCoord(MSG_BROADCAST, trace_endpos_y); - WriteCoord(MSG_BROADCAST, trace_endpos_z); - WriteCoord(MSG_BROADCAST, org_x); - WriteCoord(MSG_BROADCAST, org_y); - WriteCoord(MSG_BROADCAST, org_z); } // experimental lightning gun void W_Electro_Attack3 (void) { + // only play fire sound if 0.5 sec has passed since player let go the fire button + if(time - self.prevlgfire > 0.5) + { + sound (self, CHAN_WEAPON, "weapons/lgbeam_fire.wav", VOL_BASE, ATTN_NORM); + } + entity beam, oldself; self.lgbeam = beam = spawn(); @@ -251,6 +280,7 @@ void W_Electro_Attack3 (void) beam.shot_spread = 0; beam.bot_dodge = TRUE; beam.bot_dodgerating = cvar("g_balance_electro_primary_damage"); + Net_LinkEntity(beam, FALSE, 0, lgbeam_send); oldself = self; self = beam; @@ -318,7 +348,7 @@ float w_electro(float req) { if (self.BUTTON_ATCK) { - if (weapon_prepareattack(0, cvar("g_balance_electro_primary_refire"))) + if (weapon_prepareattack(0, (cvar("g_balance_electro_lightning") ? 0 : cvar("g_balance_electro_primary_refire")))) { if(cvar("g_balance_electro_lightning")) { @@ -359,7 +389,9 @@ float w_electro(float req) precache_sound ("weapons/electro_impact.wav"); precache_sound ("weapons/electro_impact_combo.wav"); if(cvar("g_balance_electro_lightning")) - precache_sound ("weapons/crylink_fire2.wav"); + { + precache_sound ("weapons/lgbeam_fire.wav"); + } } else if (req == WR_SETUP) weapon_setup(WEP_ELECTRO); @@ -417,27 +449,27 @@ float w_electro(float req) else if (req == WR_SUICIDEMESSAGE) { if(w_deathtype & HITTYPE_SECONDARY) - w_deathtypestring = "could not remember where they put plasma"; + w_deathtypestring = "%s could not remember where they put plasma"; else - w_deathtypestring = "played with plasma"; + w_deathtypestring = "%s played with plasma"; } else if (req == WR_KILLMESSAGE) { if(w_deathtype & HITTYPE_SECONDARY) { if(w_deathtype & HITTYPE_SPLASH) // unchecked: BOUNCE - w_deathtypestring = "just noticed #'s blue ball"; + w_deathtypestring = "%s just noticed %s's blue ball"; else // unchecked: BOUNCE - w_deathtypestring = "got in touch with #'s blue ball"; + w_deathtypestring = "%s got in touch with %s's blue ball"; } else { if(w_deathtype & HITTYPE_BOUNCE) // combo - w_deathtypestring = "felt the electrifying air of #'s combo"; + w_deathtypestring = "%s felt the electrifying air of %s's combo"; else if(w_deathtype & HITTYPE_SPLASH) - w_deathtypestring = "got too close to #'s blue beam"; + w_deathtypestring = "%s got too close to %s's blue beam"; else - w_deathtypestring = "was blasted by #'s blue beam"; + w_deathtypestring = "%s was blasted by %s's blue beam"; } } return TRUE;