X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_electro.qc;h=ea0daa7b5c41fcad373767539c8024eaac03cf07;hp=cbd2b6f07326cc93e5c8b329b49802a6b9a09406;hb=d5276c31c0843c85c0e517e786194930ec369cd7;hpb=8208b4200d5e6a68258f4ea99b5a062165cee9ce diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc index cbd2b6f073..ea0daa7b5c 100644 --- a/qcsrc/server/w_electro.qc +++ b/qcsrc/server/w_electro.qc @@ -142,7 +142,7 @@ void W_Electro_Attack2() { local entity proj; - W_SetupShot_ProjectileSize (self, '0 0 -3', '0 0 -3', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage")); + W_SetupShot_ProjectileSize (self, '0 0 -4', '0 0 -4', FALSE, 2, "weapons/electro_fire2.wav", cvar("g_balance_electro_secondary_damage")); w_shotdir = v_forward; // no TrueAim for grenades please pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); @@ -166,7 +166,7 @@ void W_Electro_Attack2() proj.movetype = MOVETYPE_BOUNCE; W_SETUPPROJECTILEVELOCITY_UP(proj, g_balance_electro_secondary); proj.touch = W_Plasma_Touch; - setsize(proj, '0 0 -3', '0 0 -3'); + setsize(proj, '0 0 -4', '0 0 -4'); proj.takedamage = DAMAGE_YES; proj.damageforcescale = cvar("g_balance_electro_secondary_damageforcescale"); proj.health = cvar("g_balance_electro_secondary_health"); @@ -185,9 +185,10 @@ void W_Electro_Attack2() } .entity lgbeam, exteriorlgbeam; +.float nextdamagethink; void lgbeam_think() { - if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.lgbeam) + 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); return; @@ -199,54 +200,42 @@ void lgbeam_think() vector angle; angle = v_forward; - vector force; - force = angle * cvar("g_balance_electro_primary_force"); - 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)); - self.scale = vlen(self.owner.origin - trace_endpos) / 256 * (0.75 + 0.75 * random()); -} - -void exteriorlgbeam_think() -{ - if (self.owner.weaponentity.state != WS_INUSE || (self.owner.ammo_cells <= 0 && !(self.owner.items & IT_UNLIMITED_WEAPON_AMMO)) || self != self.owner.exteriorlgbeam) - { - sound (self, CHAN_PROJECTILE, "sound/misc/null.wav", VOL_BASE, ATTN_NORM); - remove(self); - return; - } - - if (time - self.shot_spread + random() * 0.2 > 0) - { - self.shot_spread = time + 2; - sound (self, CHAN_PROJECTILE, "turrets/phaser.wav", VOL_BASE, ATTN_NORM); - } - - if not(self.items & IT_UNLIMITED_WEAPON_AMMO) - self.ammo_cells = max(0, self.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime); - - 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)); + if not(self.owner.items & IT_UNLIMITED_WEAPON_AMMO) + self.owner.ammo_cells = max(0, self.owner.ammo_cells - cvar("g_balance_electro_primary_ammo") * frametime); // apply the damage if(trace_fraction < 1) { vector force; - force = angle * cvar("g_balance_electro_primary_force") + trace_ent.velocity * cvar("g_balance_electro_primary_velocityfactor") + '0 0 1' * cvar("g_balance_electro_primary_force_up"); + 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); } - self.angles = '0 0 0'; - self.scale = vlen(gettaginfo(self, 0) - trace_endpos) / 256 * (0.75 + 0.75 * random()); - - // v_forward, v_right, v_up now are the ACTUAL directions - // express self.angles in terms of them to aim at target! - self.angles = vectoangles('1 0 0' * (angle * v_forward) + '0 -1 0' * (angle * v_right) + '0 0 1' * (angle * v_up)); + // draw effect + vector vecs, org; + if(self.owner.weaponentity.movedir_x > 0) + { + vecs = self.owner.weaponentity.movedir; + vecs_y = -vecs_y; + } + 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, org_x); + WriteCoord(MSG_BROADCAST, org_y); + WriteCoord(MSG_BROADCAST, org_z); + WriteCoord(MSG_BROADCAST, trace_endpos_x); + WriteCoord(MSG_BROADCAST, trace_endpos_y); + WriteCoord(MSG_BROADCAST, trace_endpos_z); } // experimental lightning gun @@ -261,37 +250,6 @@ void W_Electro_Attack3 (void) beam.think = lgbeam_think; beam.owner = self; beam.movetype = MOVETYPE_NONE; - if(gettagindex(self.weaponentity, "shot")) - setattachment(beam, self.weaponentity, "shot"); - else - setattachment(beam, self.weaponentity, "tag_shot"); - - oldself = self; - self = beam; - self.think(); - self = oldself; - - self.exteriorlgbeam = beam = spawn(); - setmodel(beam,"models/turrets/phaser_beam.md3"); - beam.effects = EF_LOWPRECISION; - beam.solid = SOLID_NOT; - beam.think = exteriorlgbeam_think; - beam.owner = self; - beam.movetype = MOVETYPE_NONE; - //beam.viewmodelforclient = self; - if(self.weaponentity.oldorigin_x > 0) - { - setattachment(beam, self.exteriorweaponentity, ""); - setorigin(beam, self.weaponentity.oldorigin); - } - else - { - if(gettagindex(self.exteriorweaponentity, "shot")) - setattachment(beam, self.exteriorweaponentity, "shot"); - else - setattachment(beam, self.exteriorweaponentity, "tag_shot"); - } - beam.shot_spread = 0; beam.bot_dodge = TRUE; beam.bot_dodgerating = cvar("g_balance_electro_primary_damage"); @@ -302,6 +260,15 @@ void W_Electro_Attack3 (void) self = oldself; } +void ElectroInit() +{ + weapon_action(WEP_ELECTRO, WR_PRECACHE); + electro_shotorigin[0] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), TRUE, FALSE, 1); + electro_shotorigin[1] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), TRUE, FALSE, 2); + electro_shotorigin[2] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), TRUE, FALSE, 3); + electro_shotorigin[3] = shotorg_adjust_values(CL_Weapon_GetShotOrg(WEP_ELECTRO), TRUE, FALSE, 4); +} + void spawnfunc_weapon_electro (void) { weapon_defaultspawnfunc(WEP_ELECTRO); @@ -399,7 +366,12 @@ float w_electro(float req) else if (req == WR_SETUP) weapon_setup(WEP_ELECTRO); else if (req == WR_CHECKAMMO1) - return self.ammo_cells >= cvar("g_balance_electro_primary_ammo"); + { + if(cvar("g_balance_electro_lightning")) + return self.ammo_cells >= cvar("g_balance_electro_primary_ammo") * cvar("g_balance_electro_primary_refire"); + else + return self.ammo_cells >= cvar("g_balance_electro_primary_ammo"); + } else if (req == WR_CHECKAMMO2) return self.ammo_cells >= cvar("g_balance_electro_secondary_ammo"); else if (req == WR_RESETPLAYER)