X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2Fprojectile.qc;h=f597797ca1141d5616658a8dd9ecc77291601633;hb=a7a6ac0b8def59be46e86e3c8bd0bf6eb13a4983;hp=e8274c8cd95d44a9ca61904e43ea20b3627c883c;hpb=37b68c473f411c96bd746069ccc915a04447a15c;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/projectile.qc b/qcsrc/client/projectile.qc index e8274c8cd..f597797ca 100644 --- a/qcsrc/client/projectile.qc +++ b/qcsrc/client/projectile.qc @@ -4,10 +4,6 @@ .float trail_oldtime; .float fade_time, fade_rate; -void SUB_Null() -{ -} - void SUB_Stop() { self.move_velocity = self.move_avelocity = '0 0 0'; @@ -20,7 +16,6 @@ void SUB_Stop() .float gravity; .float snd_looping; .float silent; -.float traileffect; void Projectile_ResetTrail(vector to) { @@ -106,6 +101,18 @@ void Projectile_Draw() case PROJECTILE_GRENADE_BOUNCING: rot = '0 -1000 0'; // sideways break; + case PROJECTILE_NADE_RED_BURN: + case PROJECTILE_NADE_RED: + case PROJECTILE_NADE_BLUE_BURN: + case PROJECTILE_NADE_BLUE: + case PROJECTILE_NADE_YELLOW_BURN: + case PROJECTILE_NADE_YELLOW: + case PROJECTILE_NADE_PINK_BURN: + case PROJECTILE_NADE_PINK: + case PROJECTILE_NADE_BURN: + case PROJECTILE_NADE: + rot = self.avelocity; + break; case PROJECTILE_HOOKBOMB: rot = '1000 0 0'; // forward break; @@ -129,6 +136,18 @@ void Projectile_Draw() trailorigin = self.origin; switch(self.cnt) { + case PROJECTILE_NADE_RED_BURN: + case PROJECTILE_NADE_RED: + case PROJECTILE_NADE_BLUE_BURN: + case PROJECTILE_NADE_BLUE: + case PROJECTILE_NADE_YELLOW_BURN: + case PROJECTILE_NADE_YELLOW: + case PROJECTILE_NADE_PINK_BURN: + case PROJECTILE_NADE_PINK: + case PROJECTILE_NADE_BURN: + case PROJECTILE_NADE: + trailorigin += v_up * 4; + break; case PROJECTILE_GRENADE: case PROJECTILE_GRENADE_BOUNCING: trailorigin += v_right * 1 + v_forward * -10; @@ -165,14 +184,11 @@ void loopsound(entity e, float ch, string samp, float vol, float attn) return; sound(e, ch, samp, vol, attn); - e.snd_looping = 1; + e.snd_looping = ch; } void Ent_RemoveProjectile() { - if(self.snd_looping) - sound(self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, ATTN_NORM); - if(self.count & 0x80) { tracebox(self.origin, self.mins, self.maxs, self.origin + self.velocity * 0.05, MOVE_NORMAL, self); @@ -200,7 +216,7 @@ void Ent_Projectile() f = ReadByte(); self.count = (f & 0x80); - self.iflags = (self.iflags & IFLAG_INTERNALMASK) | IFLAG_AUTOANGLES | IFLAG_ANGLES; + self.iflags = (self.iflags & IFLAG_INTERNALMASK) | IFLAG_AUTOANGLES | IFLAG_ANGLES | IFLAG_ORIGIN; self.solid = SOLID_TRIGGER; //self.effects = EF_NOMODELFLAGS; @@ -230,6 +246,7 @@ void Ent_Projectile() self.origin_x = ReadCoord(); self.origin_y = ReadCoord(); self.origin_z = ReadCoord(); + setorigin(self, self.origin); if(self.count & 0x80) { self.velocity_x = ReadCoord(); @@ -289,8 +306,8 @@ void Ent_Projectile() case PROJECTILE_PORTO_RED: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_WIZSPIKE"); self.scale = 4; break; case PROJECTILE_PORTO_BLUE: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_WIZSPIKE"); self.scale = 4; break; case PROJECTILE_HOOKBOMB: setmodel(self, "models/grenademodel.md3");self.traileffect = particleeffectnum("TR_KNIGHTSPIKE"); break; - case PROJECTILE_HAGAR: setmodel(self, "models/hagarmissile.mdl");self.traileffect = particleeffectnum("TR_GRENADE"); self.scale = 0.75; break; - case PROJECTILE_HAGAR_BOUNCING: setmodel(self, "models/hagarmissile.mdl");self.traileffect = particleeffectnum("TR_GRENADE"); self.scale = 0.75; break; + case PROJECTILE_HAGAR: setmodel(self, "models/hagarmissile.mdl");self.traileffect = particleeffectnum("tr_hagar"); self.scale = 0.75; break; + case PROJECTILE_HAGAR_BOUNCING: setmodel(self, "models/hagarmissile.mdl");self.traileffect = particleeffectnum("tr_hagar"); self.scale = 0.75; break; case PROJECTILE_FIREBALL: self.model = ""; self.modelindex = 0; self.traileffect = particleeffectnum("fireball"); break; // particle effect is good enough case PROJECTILE_FIREMINE: self.model = ""; self.modelindex = 0; self.traileffect = particleeffectnum("firemine"); break; // particle effect is good enough case PROJECTILE_TAG: setmodel(self, "models/laser.mdl"); self.traileffect = particleeffectnum("TR_ROCKET"); break; @@ -304,6 +321,21 @@ void Ent_Projectile() case PROJECTILE_SPIDERROCKET: setmodel(self, "models/vehicles/rocket02.md3"); self.traileffect = particleeffectnum("spiderbot_rocket_thrust"); break; case PROJECTILE_WAKIROCKET: setmodel(self, "models/vehicles/rocket01.md3"); self.traileffect = particleeffectnum("wakizashi_rocket_thrust"); break; case PROJECTILE_WAKICANNON: setmodel(self, "models/laser.mdl"); self.traileffect = particleeffectnum(""); break; + + case PROJECTILE_BUMBLE_GUN: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break; + case PROJECTILE_BUMBLE_BEAM: setmodel(self, "models/elaser.mdl");self.traileffect = particleeffectnum("TR_NEXUIZPLASMA"); break; + + case PROJECTILE_NADE_RED: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_red"); break; + case PROJECTILE_NADE_RED_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_red_burn"); break; + case PROJECTILE_NADE_BLUE: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_blue"); break; + case PROJECTILE_NADE_BLUE_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_blue_burn"); break; + case PROJECTILE_NADE_YELLOW: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_yellow"); break; + case PROJECTILE_NADE_YELLOW_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_yellow_burn"); break; + case PROJECTILE_NADE_PINK: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_pink"); break; + case PROJECTILE_NADE_PINK_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_pink_burn"); break; + case PROJECTILE_NADE: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade"); break; + case PROJECTILE_NADE_BURN: setmodel(self, "models/weapons/v_ok_grenade.md3");self.traileffect = particleeffectnum("nade_burn"); break; + default: error("Received invalid CSQC projectile, can't work with this!"); break; @@ -324,7 +356,7 @@ void Ent_Projectile() self.mins = '0 0 -4'; self.maxs = '0 0 -4'; self.move_movetype = MOVETYPE_BOUNCE; - self.move_touch = SUB_Null; + self.move_touch = func_null; self.move_bounce_factor = g_balance_electro_secondary_bouncefactor; self.move_bounce_stopspeed = g_balance_electro_secondary_bouncestop; break; @@ -341,10 +373,27 @@ void Ent_Projectile() self.mins = '-3 -3 -3'; self.maxs = '3 3 3'; self.move_movetype = MOVETYPE_BOUNCE; - self.move_touch = SUB_Null; + self.move_touch = func_null; self.move_bounce_factor = g_balance_grenadelauncher_bouncefactor; self.move_bounce_stopspeed = g_balance_grenadelauncher_bouncestop; break; + case PROJECTILE_NADE_RED_BURN: + case PROJECTILE_NADE_RED: + case PROJECTILE_NADE_BLUE_BURN: + case PROJECTILE_NADE_BLUE: + case PROJECTILE_NADE_YELLOW_BURN: + case PROJECTILE_NADE_YELLOW: + case PROJECTILE_NADE_PINK_BURN: + case PROJECTILE_NADE_PINK: + case PROJECTILE_NADE_BURN: + case PROJECTILE_NADE: + self.mins = '-16 -16 -16'; + self.maxs = '16 16 16'; + self.move_movetype = MOVETYPE_BOUNCE; + self.move_touch = func_null; + self.scale = 1.5; + self.avelocity = randomvec() * 720; + break; case PROJECTILE_MINE: self.mins = '-4 -4 -4'; self.maxs = '4 4 4'; @@ -353,21 +402,21 @@ void Ent_Projectile() self.colormod = '2 1 1'; self.alphamod = 0.5; self.move_movetype = MOVETYPE_BOUNCE; - self.move_touch = SUB_Null; + self.move_touch = func_null; break; case PROJECTILE_PORTO_BLUE: self.colormod = '1 1 2'; self.alphamod = 0.5; self.move_movetype = MOVETYPE_BOUNCE; - self.move_touch = SUB_Null; + self.move_touch = func_null; break; case PROJECTILE_HAGAR_BOUNCING: self.move_movetype = MOVETYPE_BOUNCE; - self.move_touch = SUB_Null; + self.move_touch = func_null; break; case PROJECTILE_CRYLINK_BOUNCING: self.move_movetype = MOVETYPE_BOUNCE; - self.move_touch = SUB_Null; + self.move_touch = func_null; break; case PROJECTILE_FIREBALL: loopsound(self, CH_SHOTS_SINGLE, "weapons/fireball_fly2.wav", VOL_BASE, ATTN_NORM); @@ -377,7 +426,7 @@ void Ent_Projectile() case PROJECTILE_FIREMINE: loopsound(self, CH_SHOTS_SINGLE, "weapons/fireball_fly.wav", VOL_BASE, ATTN_NORM); self.move_movetype = MOVETYPE_BOUNCE; - self.move_touch = SUB_Null; + self.move_touch = func_null; self.mins = '-4 -4 -4'; self.maxs = '4 4 4'; break; @@ -407,12 +456,25 @@ void Ent_Projectile() break; case PROJECTILE_WAKIROCKET: loopsound(self, CH_SHOTS_SINGLE, "weapons/tag_rocket_fly.wav", VOL_BASE, ATTN_NORM); - break; + break; + /* case PROJECTILE_WAKICANNON: break; + case PROJECTILE_BUMBLE_GUN: + // only new engines support sound moving with object + loopsound(self, CH_SHOTS_SINGLE, "weapons/electro_fly.wav", VOL_BASE, ATTN_NORM); + self.mins = '0 0 -4'; + self.maxs = '0 0 -4'; + self.move_movetype = MOVETYPE_BOUNCE; + self.move_touch = func_null; + self.move_bounce_factor = g_balance_electro_secondary_bouncefactor; + self.move_bounce_stopspeed = g_balance_electro_secondary_bouncestop; + break; + */ default: break; } + setsize(self, self.mins, self.maxs); } if(self.gravity) @@ -450,6 +512,8 @@ void Projectile_Precache() precache_model("models/rocket.md3"); precache_model("models/tagrocket.md3"); precache_model("models/tracer.mdl"); + + precache_model("models/weapons/v_ok_grenade.md3"); precache_sound("weapons/electro_fly.wav"); precache_sound("weapons/rocket_fly.wav");