X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fvehicle%2Fbumblebee_weapons.qc;h=b2e838f944b92ccec09440b3e37a6b3781e4c762;hp=722c6852e7ddf56d66844cdcc14b8de294c95a7e;hb=fc15d72b041c9a748b605ba28735380fbe5b5b01;hpb=9dd43f196ca7bc0979f94a0fb0f87cdd82a951c7 diff --git a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc index 722c6852e..b2e838f94 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc +++ b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc @@ -1,28 +1,15 @@ -#ifndef VEHICLE_BUMBLEBEE_WEAPONS_H -#define VEHICLE_BUMBLEBEE_WEAPONS_H - -#include "../../weapons/all.qh" - -#endif +#include "bumblebee_weapons.qh" #ifdef IMPLEMENTATION -#ifdef SVQC - -float autocvar_g_vehicle_bumblebee_cannon_cost; -float autocvar_g_vehicle_bumblebee_cannon_damage; -float autocvar_g_vehicle_bumblebee_cannon_radius; -float autocvar_g_vehicle_bumblebee_cannon_refire; -float autocvar_g_vehicle_bumblebee_cannon_speed; -float autocvar_g_vehicle_bumblebee_cannon_spread; -float autocvar_g_vehicle_bumblebee_cannon_force; +REGISTER_NET_LINKED(ENT_CLIENT_BUMBLE_RAYGUN) -bool bumble_raygun_send(entity this, entity to, int sf); +#ifdef SVQC -void bumblebee_fire_cannon(entity _gun, string _tagname, entity _owner) +void bumblebee_fire_cannon(entity this, entity _gun, string _tagname, entity _owner) { vector v = gettaginfo(_gun, gettagindex(_gun, _tagname)); - vehicles_projectile(EFFECT_BIGPLASMA_MUZZLEFLASH.eent_eff_name, SND(VEH_BUMBLEBEE_FIRE), + vehicles_projectile(this, EFFECT_BIGPLASMA_MUZZLEFLASH.eent_eff_name, SND_VEH_BUMBLEBEE_FIRE, v, normalize(v_forward + randomvec() * autocvar_g_vehicle_bumblebee_cannon_spread) * autocvar_g_vehicle_bumblebee_cannon_speed, autocvar_g_vehicle_bumblebee_cannon_damage, autocvar_g_vehicle_bumblebee_cannon_radius, autocvar_g_vehicle_bumblebee_cannon_force, 0, DEATH_VH_BUMB_GUN.m_id, PROJECTILE_BUMBLE_GUN, 0, true, true, _owner); @@ -30,28 +17,28 @@ void bumblebee_fire_cannon(entity _gun, string _tagname, entity _owner) bool bumble_raygun_send(entity this, entity to, float sf) { - WriteByte(MSG_ENTITY, ENT_CLIENT_BUMBLE_RAYGUN); + WriteHeader(MSG_ENTITY, ENT_CLIENT_BUMBLE_RAYGUN); WriteByte(MSG_ENTITY, sf); if(sf & BRG_SETUP) { - WriteByte(MSG_ENTITY, num_for_edict(self.realowner)); - WriteByte(MSG_ENTITY, self.realowner.team); - WriteByte(MSG_ENTITY, self.cnt); + WriteByte(MSG_ENTITY, etof(this.realowner)); + WriteByte(MSG_ENTITY, this.realowner.team); + WriteByte(MSG_ENTITY, this.cnt); } if(sf & BRG_START) { - WriteCoord(MSG_ENTITY, self.hook_start_x); - WriteCoord(MSG_ENTITY, self.hook_start_y); - WriteCoord(MSG_ENTITY, self.hook_start_z); + WriteCoord(MSG_ENTITY, this.hook_start_x); + WriteCoord(MSG_ENTITY, this.hook_start_y); + WriteCoord(MSG_ENTITY, this.hook_start_z); } if(sf & BRG_END) { - WriteCoord(MSG_ENTITY, self.hook_end_x); - WriteCoord(MSG_ENTITY, self.hook_end_y); - WriteCoord(MSG_ENTITY, self.hook_end_z); + WriteCoord(MSG_ENTITY, this.hook_end_x); + WriteCoord(MSG_ENTITY, this.hook_end_y); + WriteCoord(MSG_ENTITY, this.hook_end_z); } return true; @@ -63,58 +50,60 @@ bool bumble_raygun_send(entity this, entity to, float sf) void bumble_raygun_draw(entity this); -void bumble_raygun_read(bool bIsNew) -{SELFPARAM(); +NET_HANDLE(ENT_CLIENT_BUMBLE_RAYGUN, bool isnew) +{ int sf = ReadByte(); if(sf & BRG_SETUP) { - self.cnt = ReadByte(); - self.team = ReadByte(); - self.cnt = ReadByte(); + this.cnt = ReadByte(); + this.team = ReadByte(); + this.cnt = ReadByte(); - if(self.cnt) - self.colormod = '1 0 0'; + if(this.cnt) + this.colormod = '1 0 0'; else - self.colormod = '0 1 0'; + this.colormod = '0 1 0'; - self.traileffect = EFFECT_BUMBLEBEE_HEAL_MUZZLEFLASH.m_id; - self.lip = particleeffectnum(EFFECT_BUMBLEBEE_HEAL_IMPACT); + this.traileffect = EFFECT_BUMBLEBEE_HEAL_MUZZLEFLASH.m_id; + this.lip = particleeffectnum(EFFECT_BUMBLEBEE_HEAL_IMPACT); - self.draw = bumble_raygun_draw; + this.draw = bumble_raygun_draw; } if(sf & BRG_START) { - self.origin_x = ReadCoord(); - self.origin_y = ReadCoord(); - self.origin_z = ReadCoord(); - setorigin(self, self.origin); + this.origin_x = ReadCoord(); + this.origin_y = ReadCoord(); + this.origin_z = ReadCoord(); + setorigin(this, this.origin); } if(sf & BRG_END) { - self.move_origin_x = ReadCoord(); - self.move_origin_y = ReadCoord(); - self.move_origin_z = ReadCoord(); + this.move_origin_x = ReadCoord(); + this.move_origin_y = ReadCoord(); + this.move_origin_z = ReadCoord(); } + return true; } +.float bumble_raygun_nextdraw; void bumble_raygun_draw(entity this) { float _len; vector _dir; vector _vtmp1, _vtmp2; - _len = vlen(self.origin - self.move_origin); - _dir = normalize(self.move_origin - self.origin); + _len = vlen(this.origin - this.move_origin); + _dir = normalize(this.move_origin - this.origin); - if(self.total_damages < time) + if(this.bumble_raygun_nextdraw < time) { - boxparticles(particleeffectnum(Effects[self.traileffect]), self, self.origin, self.origin + _dir * -64, _dir * -_len , _dir * -_len, 1, PARTICLES_USEALPHA); - boxparticles(self.lip, self, self.move_origin, self.move_origin + _dir * -64, _dir * -200 , _dir * -200, 1, PARTICLES_USEALPHA); - self.total_damages = time + 0.1; + boxparticles(particleeffectnum(Effects_from(this.traileffect)), this, this.origin, this.origin + _dir * -64, _dir * -_len , _dir * -_len, 1, PARTICLES_USEALPHA); + boxparticles(this.lip, this, this.move_origin, this.move_origin + _dir * -64, _dir * -200 , _dir * -200, 1, PARTICLES_USEALPHA); + this.bumble_raygun_nextdraw = time + 0.1; } float i, df, sz, al; @@ -123,19 +112,19 @@ void bumble_raygun_draw(entity this) df = DRAWFLAG_NORMAL; //((random() < 0.5) ? DRAWFLAG_ADDITIVE : DRAWFLAG_SCREEN); sz = 5 + random() * 5; al = 0.25 + random() * 0.5; - _vtmp1 = self.origin + _dir * _len * (0.25 + i); - _vtmp1 += (randomvec() * (_len * 0.2) * (frametime * 2)); //self.raygun_l1; - Draw_CylindricLine(self.origin, _vtmp1, sz, "gfx/colors/white.tga", 1, 1, self.colormod, al, df, view_origin); + _vtmp1 = this.origin + _dir * _len * (0.25 + i); + _vtmp1 += (randomvec() * (_len * 0.2) * (frametime * 2)); //this.raygun_l1; + Draw_CylindricLine(this.origin, _vtmp1, sz, "gfx/colors/white.tga", 1, 1, this.colormod, al, df, view_origin); - _vtmp2 = self.origin + _dir * _len * (0.5 + i); - _vtmp2 += (randomvec() * (_len * 0.2) * (frametime * 5)); //self.raygun_l2; - Draw_CylindricLine(_vtmp1, _vtmp2, sz, "gfx/colors/white.tga", 1, 1, self.colormod, al, df, view_origin); + _vtmp2 = this.origin + _dir * _len * (0.5 + i); + _vtmp2 += (randomvec() * (_len * 0.2) * (frametime * 5)); //this.raygun_l2; + Draw_CylindricLine(_vtmp1, _vtmp2, sz, "gfx/colors/white.tga", 1, 1, this.colormod, al, df, view_origin); - _vtmp1 = self.origin + _dir * _len * (0.75 + i); - _vtmp1 += randomvec() * (_len * 0.2) * (frametime * 10); //self.raygun_l3; - Draw_CylindricLine(_vtmp2, _vtmp1, sz, "gfx/colors/white.tga", 1, 1, self.colormod, al, df, view_origin); + _vtmp1 = this.origin + _dir * _len * (0.75 + i); + _vtmp1 += randomvec() * (_len * 0.2) * (frametime * 10); //this.raygun_l3; + Draw_CylindricLine(_vtmp2, _vtmp1, sz, "gfx/colors/white.tga", 1, 1, this.colormod, al, df, view_origin); - Draw_CylindricLine(_vtmp1, self.move_origin + randomvec() * 32, sz, "gfx/colors/white.tga", 1, 1, self.colormod, al, df, view_origin); + Draw_CylindricLine(_vtmp1, this.move_origin + randomvec() * 32, sz, "gfx/colors/white.tga", 1, 1, this.colormod, al, df, view_origin); } }