}
if(self.noise != "")
{
- self.origin = p;
+ setorigin(self, p);
sound(self, CH_AMBIENT, self.noise, VOL_BASE * self.volume, self.atten);
}
self.just_toggled = 0;
--i;
}
}
- self.origin = o;
+ setorigin(self, o);
}
void Ent_PointParticles_Remove()
//draw either the old v2.3 beam or the new beam
charge = sqrt(charge); // divide evenly among trail spacing and alpha
- particles_alphamin = particles_alphamax = charge;
+ particles_alphamin = particles_alphamax = particles_fade = charge;
+
if (autocvar_cl_particles_oldnexbeam && (getstati(STAT_ALLOW_OLDNEXBEAM) || isdemo()))
- WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos, charge, 1);
+ WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum("TE_TEI_G3"), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE);
else
- WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum("nex_beam"), shotorg, endpos, charge, 1);
+ WarpZone_TrailParticles_WithMultiplier(world, particleeffectnum("nex_beam"), shotorg, endpos, 1, PARTICLES_USEALPHA | PARTICLES_USEFADE);
}
.vector sw_shotorg;
void Draw_Shockwave()
{
- float a = bound(0, (0.6 - ((time - self.sw_time) / 0.4)), 0.6);
+ float a = bound(0, (0.5 - ((time - self.sw_time) / 0.4)), 0.5);
if not(a) { remove(self); }
vector deviation, angle;
- vector new_end;
- vector first_min_end, prev_min_end, new_min_end;
- vector first_max_end, prev_max_end, new_max_end;
+ vector sw_color = getcsqcplayercolor(self.sv_entnum); // GetTeamRGB(GetPlayerColor(self.sv_entnum));
- float prev_min_dist, new_min_dist;
- float prev_max_dist, new_max_dist;
+ vector first_min_end = '0 0 0', prev_min_end = '0 0 0', new_min_end = '0 0 0';
+ vector first_max_end = '0 0 0', prev_max_end = '0 0 0', new_max_end = '0 0 0';
+ float new_max_dist, new_min_dist;
vector shotdir = normalize(self.sw_endpos - self.sw_shotorg);
vectorvectors(shotdir);
vector right = v_right;
vector up = v_up;
-
+
float counter, dist_before_normal = 200, shots = 20;
vector min_end = ((self.sw_shotorg + (shotdir * dist_before_normal)) + (up * self.sw_spread_min));
vector max_end = (self.sw_endpos + (up * self.sw_spread_max));
-
- vector angle_to_min = normalize(min_end - self.sw_shotorg);
- vector angle_to_max = normalize(max_end - min_end);
- float spread_to_min = vlen(angle_to_min - shotdir);
- float spread_to_max = vlen(angle_to_max - shotdir);
+ float spread_to_min = vlen(normalize(min_end - self.sw_shotorg) - shotdir);
+ float spread_to_max = vlen(normalize(max_end - min_end) - shotdir);
for(counter = 0; counter < shots; ++counter)
{
// first do the spread_to_min effect
deviation = angle * spread_to_min;
deviation = ((shotdir + (right * deviation_y) + (up * deviation_z)));
-
new_min_dist = dist_before_normal;
new_min_end = (self.sw_shotorg + (deviation * new_min_dist));
-
//te_lightning2(world, new_min_end, self.sw_shotorg);
-
// then calculate spread_to_max effect
deviation = angle * spread_to_max;
deviation = ((shotdir + (right * deviation_y) + (up * deviation_z)));
-
new_max_dist = vlen(new_min_end - self.sw_endpos);
new_max_end = (new_min_end + (deviation * new_max_dist));
-
//te_lightning2(world, new_end, prev_min_end);
-
-
+
if(counter == 0)
{
first_max_end = new_max_end;
}
- if(prev_min_dist)
+ if(counter >= 1)
{
R_BeginPolygon("", DRAWFLAG_NORMAL);
- R_PolygonVertex(prev_min_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(new_min_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(self.sw_shotorg, '0 0 0', '1 0 0', a);
+ R_PolygonVertex(prev_min_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(new_min_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(self.sw_shotorg, '0 0 0', sw_color, a);
R_EndPolygon();
R_BeginPolygon("", DRAWFLAG_NORMAL);
- R_PolygonVertex(new_min_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(prev_min_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(prev_max_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(new_max_end, '0 0 0', '1 0 0', a);
+ R_PolygonVertex(new_min_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(prev_min_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(prev_max_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(new_max_end, '0 0 0', sw_color, a);
R_EndPolygon();
}
- prev_min_dist = new_min_dist;
prev_min_end = new_min_end;
- prev_max_dist = new_max_dist;
prev_max_end = new_max_end;
if((counter + 1) == shots)
{
R_BeginPolygon("", DRAWFLAG_NORMAL);
- R_PolygonVertex(prev_min_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(first_min_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(self.sw_shotorg, '0 0 0', '1 0 0', a);
+ R_PolygonVertex(prev_min_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(first_min_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(self.sw_shotorg, '0 0 0', sw_color, a);
R_EndPolygon();
R_BeginPolygon("", DRAWFLAG_NORMAL);
- R_PolygonVertex(first_min_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(prev_min_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(prev_max_end, '0 0 0', '1 0 0', a);
- R_PolygonVertex(first_max_end, '0 0 0', '1 0 0', a);
+ R_PolygonVertex(first_min_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(prev_min_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(prev_max_end, '0 0 0', sw_color, a);
+ R_PolygonVertex(first_max_end, '0 0 0', sw_color, a);
R_EndPolygon();
}
}
shockwave.sw_spread_max = ReadByte();
shockwave.sw_spread_min = ReadByte();
+ shockwave.sv_entnum = ReadByte();
+
shockwave.sw_time = time;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff