X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Ftturrets.qc;h=2b9ec0297b2ef63411d210cc8a8597bc8438691f;hb=4337108fce31bfd194b2e7c01304a4a0cd7fef20;hp=1332d60ca106f35fd90f1658be69f978b20a22f4;hpb=8ba8bed747f6303d3724c1aedb4be994b1e87455;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/tturrets.qc b/qcsrc/client/tturrets.qc index 1332d60ca..2b9ec0297 100644 --- a/qcsrc/client/tturrets.qc +++ b/qcsrc/client/tturrets.qc @@ -17,7 +17,6 @@ void turret_precache(float _tid) { if (!turret_is_precache[TID_COMMON]) { - dprint("turret_precache TID_COMMON\n"); precache_sound ("weapons/rocket_impact.wav"); precache_model ("models/turrets/base-gib1.md3"); precache_model ("models/turrets/base-gib2.md3"); @@ -33,12 +32,7 @@ void turret_precache(float _tid) } turret_tid2info(_tid); if(turret_is_precache[_tid]) - { - dprint("turret_precache: ", tid2info_name, " allready precachd, skipping.\n"); return; - } - else - dprint("turret_precache: ", tid2info_name, " precaching.\n"); switch(_tid) { @@ -158,38 +152,44 @@ void turret_tid2info(float _tid) } void turret_remove() -{ - turret_tid2info(self.turret_type); - dprint("Removing ", tid2info_name, " turrret.\n"); - +{ remove(self.tur_head); + //remove(self.enemy); self.tur_head = world; } +.vector glowmod; void turret_changeteam() -{ - self.colormod = '0 0 0'; - - switch(self.team) +{ + switch(self.team - 1) { case COLOR_TEAM1: // Red - self.colormod = '2 0.5 0.5'; + self.glowmod = '2 0 0'; + self.teamradar_color = '1 0 0'; break; case COLOR_TEAM2: // Blue - self.colormod = '0.5 0.5 2'; + self.glowmod = '0 0 2'; + self.teamradar_color = '0 0 1'; break; case COLOR_TEAM3: // Yellow - self.colormod = '1.4 1.4 0.6'; + self.glowmod = '1 1 0'; + self.teamradar_color = '1 1 0'; break; case COLOR_TEAM4: // Pink - self.colormod = '1.4 0.6 1.4'; + self.glowmod = '1 0 1'; + self.teamradar_color = '1 0 1'; break; } - self.tur_head.colormod = self.colormod; + if(self.team) + self.colormap = 1024 + (self.team - 1) * 17; + + self.tur_head.colormap = self.colormap; + self.tur_head.glowmod = self.glowmod; + } void turret_head_draw() @@ -212,19 +212,160 @@ void turret_draw() { dt = random(); - if(dt < 0.25) - te_spark(self.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16); - + if(dt < 0.03) + te_spark(self.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16); } - if(self.health < 85) - if(dt < 0.1) - pointparticles(particleeffectnum("smoke_small"), (self.origin + (randomvec() * 80)), '0 0 0', 1); + if(self.health < 85) + if(dt < 0.01) + pointparticles(particleeffectnum("smoke_large"), (self.origin + (randomvec() * 80)), '0 0 0', 1); if(self.health < 32) - if(dt < 0.1) - pointparticles(particleeffectnum("smoke_large"), (self.origin + (randomvec() * 80)), '0 0 0', 1); + if(dt < 0.015) + pointparticles(particleeffectnum("smoke_small"), (self.origin + (randomvec() * 80)), '0 0 0', 1); + +} + +void turret_draw2d() +{ + if(self.netname == "") + return; + + if(autocvar_cl_hidewaypoints) // also check g_waypointsprites_turrets after next release (needs changed to clients default/config .cfg) + return; + + float dist = vlen(self.origin - view_origin); + vector o; + /* + // TODO: Vehicle tactical hud + o = project_3d_to_2d(self.origin + '0 0 32'); + if(o_z < 0 + || o_x < (vid_conwidth * waypointsprite_edgeoffset_left) + || o_y < (vid_conheight * waypointsprite_edgeoffset_top) + || o_x > (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) + || o_y > (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom))) + return; // Dont draw wp's for turrets out of view + o_z = 0; + if(hud != HUD_NORMAL) + { + switch(hud) + { + case HUD_SPIDERBOT: + case HUD_WAKIZASHI: + case HUD_RAPTOR: + vector pz = drawgetimagesize("gfx/vehicles/axh-bracket.tga") * 0.25; + drawpic(o - pz * 0.5 , "gfx/vehicles/axh-bracket.tga", pz , '1 1 1', 0.75, DRAWFLAG_NORMAL); + break; + } + } + */ + if(dist > self.maxdistance) + return; + + string spriteimage = self.netname; + float t = (GetPlayerColor(player_localnum) + 1); + float a = self.alpha * autocvar_hud_panel_fg_alpha; + vector rgb = spritelookupcolor(spriteimage, self.teamradar_color); + + + if(self.maxdistance > waypointsprite_normdistance) + a *= pow(bound(0, (self.maxdistance - dist) / (self.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent); + else if(self.maxdistance > 0) + a *= pow(bound(0, (waypointsprite_fadedistance - dist) / (waypointsprite_fadedistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent) * (1 - waypointsprite_minalpha) + waypointsprite_minalpha; + + if(rgb == '0 0 0') + { + self.teamradar_color = '1 0 1'; + print(sprintf("WARNING: sprite of name %s has no color, using pink so you notice it\n", spriteimage)); + } + + string txt = self.netname; + if(autocvar_g_waypointsprite_spam && waypointsprite_count >= autocvar_g_waypointsprite_spam) + txt = _("Spam"); + else + txt = spritelookuptext(spriteimage); + + if(time - floor(time) > 0.5 && t == self.team) + { + if(self.helpme && time < self.helpme) + { + a *= SPRITE_HELPME_BLINK; + txt = sprintf(_("%s under attack!"), txt); + } + else + a *= spritelookupblinkvalue(spriteimage); + } + + if(autocvar_g_waypointsprite_uppercase) + txt = strtoupper(txt); + + if(a > 1) + { + rgb *= a; + a = 1; + } + + if(a <= 0) + return; + + rgb = fixrgbexcess(rgb); + + o = project_3d_to_2d(self.origin + '0 0 64'); + if(o_z < 0 + || o_x < (vid_conwidth * waypointsprite_edgeoffset_left) + || o_y < (vid_conheight * waypointsprite_edgeoffset_top) + || o_x > (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) + || o_y > (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom))) + return; // Dont draw wp's for turrets out of view + + o_z = 0; + + float edgedistance_min, crosshairdistance; + edgedistance_min = min((o_y - (vid_conheight * waypointsprite_edgeoffset_top)), + (o_x - (vid_conwidth * waypointsprite_edgeoffset_left)), + (vid_conwidth - (vid_conwidth * waypointsprite_edgeoffset_right)) - o_x, + (vid_conheight - (vid_conheight * waypointsprite_edgeoffset_bottom)) - o_y); + + float vidscale = max(vid_conwidth / vid_width, vid_conheight / vid_height); + + crosshairdistance = sqrt( pow(o_x - vid_conwidth/2, 2) + pow(o_y - vid_conheight/2, 2) ); + + t = waypointsprite_scale * vidscale; + a *= waypointsprite_alpha; + + { + a = a * (1 - (1 - waypointsprite_distancefadealpha) * (bound(0, dist/waypointsprite_distancefadedistance, 1))); + t = t * (1 - (1 - waypointsprite_distancefadescale) * (bound(0, dist/waypointsprite_distancefadedistance, 1))); + } + if (edgedistance_min < waypointsprite_edgefadedistance) { + a = a * (1 - (1 - waypointsprite_edgefadealpha) * (1 - bound(0, edgedistance_min/waypointsprite_edgefadedistance, 1))); + t = t * (1 - (1 - waypointsprite_edgefadescale) * (1 - bound(0, edgedistance_min/waypointsprite_edgefadedistance, 1))); + } + if(crosshairdistance < waypointsprite_crosshairfadedistance) { + a = a * (1 - (1 - waypointsprite_crosshairfadealpha) * (1 - bound(0, crosshairdistance/waypointsprite_crosshairfadedistance, 1))); + t = t * (1 - (1 - waypointsprite_crosshairfadescale) * (1 - bound(0, crosshairdistance/waypointsprite_crosshairfadedistance, 1))); + } + + o = drawspritearrow(o, M_PI, rgb, a, SPRITE_ARROW_SCALE * t); + o = drawspritetext(o, M_PI, (SPRITE_HEALTHBAR_WIDTH + 2 * SPRITE_HEALTHBAR_BORDER) * t, rgb, a, waypointsprite_fontsize * '1 1 0', txt); + drawhealthbar( + o, + 0, + self.health / 255, + '0 0 0', + '0 0 0', + 0.5 * SPRITE_HEALTHBAR_WIDTH * t, + 0.5 * SPRITE_HEALTHBAR_HEIGHT * t, + SPRITE_HEALTHBAR_MARGIN * t + 0.5 * waypointsprite_fontsize, + SPRITE_HEALTHBAR_BORDER * t, + 0, + rgb, + a * SPRITE_HEALTHBAR_BORDERALPHA, + rgb, + a * SPRITE_HEALTHBAR_HEALTHALPHA, + DRAWFLAG_NORMAL + ); } void turret_walker_draw() @@ -238,16 +379,12 @@ void turret_walker_draw() fixedmakevectors(self.angles); movelib_groundalign4point(300, 100, 0.25); - setorigin(self, self.origin + self.velocity * dt); - setorigin(self.tur_head, gettaginfo(self, gettagindex(self, "tag_head"))); - self.tur_head.angles += dt * self.tur_head.move_avelocity; - self.angles_y = self.move_angles_y; if (self.health < 127) - if(random() < 0.25) + if(random() < 0.15) te_spark(self.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16); } @@ -260,40 +397,36 @@ void turret_ewheel_draw() if(dt <= 0) return; - fixedmakevectors(self.angles); - movelib_groundalign4point(300, 100, 0.25); - + fixedmakevectors(self.angles); setorigin(self, self.origin + self.velocity * dt); - setorigin(self.tur_head, self.origin); - self.tur_head.angles += dt * self.tur_head.move_avelocity; - - // Simulate banking - //self.angles_z -= self.angles_z * dt * 2; - //self.angles_z = bound(-45, self.angles_z + ((self.move_angles_y - self.angles_y * -25) * dt), 45); - self.angles_y = self.move_angles_y; if (self.health < 127) - if(random() < 0.25) + if(random() < 0.05) te_spark(self.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16); } +void(entity e, entity tagentity, string tagname) setattachment = #443; void turret_construct() { if(self.tur_head == world) self.tur_head = spawn(); turret_tid2info(self.turret_type); - dprint("Constructing ", tid2info_name , " turret (", ftos(self.turret_type), ")\n"); + self.netname = tid2info_name; setorigin(self, self.origin); setmodel(self, tid2info_base); setmodel(self.tur_head, tid2info_head); setsize(self, tid2info_min, tid2info_max); setsize(self.tur_head, '0 0 0', '0 0 0'); - setorigin(self.tur_head, gettaginfo(self, gettagindex(self, "tag_head"))); - + + if(self.turret_type == TID_EWHEEL) + setattachment(self.tur_head, self, ""); + else + setattachment(self.tur_head, self, "tag_head"); + self.tur_head.classname = "turret_head"; self.tur_head.owner = self; self.tur_head.move_movetype = MOVETYPE_NOCLIP; @@ -306,16 +439,21 @@ void turret_construct() self.tur_head.movetype = MOVETYPE_NOCLIP; self.draw = turret_draw; self.entremove = turret_remove; - self.drawmask = MASK_NORMAL; - self.tur_head.drawmask = MASK_NORMAL; - + self.drawmask = MASK_NORMAL; + self.tur_head.drawmask = MASK_NORMAL; + self.anim_start_time = 0; + self.draw2d = turret_draw2d; + self.maxdistance = 4000; // use g_waypointsprites_turrets_maxdist after next release (needs changed to cleint's default) + self.teamradar_color = '1 0 0'; + self.alpha = 1; + if(self.turret_type == TID_EWHEEL || self.turret_type == TID_WALKER) { self.gravity = 1; self.movetype = MOVETYPE_BOUNCE; self.move_movetype = MOVETYPE_BOUNCE; self.move_origin = self.origin; - self.move_time = time; + self.move_time = time; switch(self.turret_type) { case TID_EWHEEL: @@ -323,6 +461,8 @@ void turret_construct() break; case TID_WALKER: self.draw = turret_walker_draw; + break; + } } } @@ -334,7 +474,7 @@ void turret_gib_draw() Movetype_Physics_MatchTicrate(autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy); self.drawmask = MASK_NORMAL; - + if(self.cnt) { if(time >= self.nextthink) @@ -359,13 +499,17 @@ void turret_gibboom() pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1); for (i = 1; i < 5; i = i + 1) - turret_gibtoss(strcat("models/turrets/head-gib", ftos(i), ".md3"), self.origin, self.velocity + randomvec() * 700, '0 0 0', FALSE); + turret_gibtoss(strcat("models/turrets/head-gib", ftos(i), ".md3"), self.origin + '0 0 2', self.velocity + randomvec() * 700, '0 0 0', FALSE); } entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, float _explode) { entity gib; - + + traceline(_from, _to, MOVE_NOMONSTERS, world); + if(trace_startsolid) + return world; + gib = spawn(); setorigin(gib, _from); setmodel(gib, _model); @@ -373,7 +517,7 @@ entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, flo gib.solid = SOLID_CORPSE; gib.draw = turret_gib_draw; gib.cnt = _explode; - + setsize(gib, '-1 -1 -1', '1 1 1'); if(_explode) { gib.nextthink = time + 0.2 * (autocvar_cl_gibs_lifetime * (1 + prandom() * 0.15)); @@ -389,6 +533,7 @@ entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, flo gib.move_avelocity = prandomvec() * 32; gib.move_time = time; gib.damageforcescale = 1; + gib.classname = "turret_gib"; return gib; } @@ -397,37 +542,40 @@ void turret_die() { entity headgib; - setmodel(self, ""); - setmodel(self.tur_head, ""); sound (self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1); turret_tid2info(self.turret_type); - dprint("Turret ", tid2info_name, " dies.\n"); // Base if(self.turret_type == TID_EWHEEL) - turret_gibtoss(tid2info_base, self.origin, self.velocity, '-1 -1 -1', FALSE); + turret_gibtoss(tid2info_base, self.origin + '0 0 18', self.velocity + '0 0 400' + '0.1 0.1 1' * (random() * 400), '-1 -1 -1', TRUE); else if (self.turret_type == TID_WALKER) - turret_gibtoss(tid2info_base, self.origin, self.velocity, '-1 -1 -1', FALSE); + turret_gibtoss(tid2info_base, self.origin + '0 0 18', self.velocity + '0 0 300' + '0.1 0.1 1' * (random() * 200), '-1 -1 -1', TRUE); else if (self.turret_type == TID_TESLA) - turret_gibtoss(tid2info_base, self.origin, self.velocity, '-1 -1 -1', FALSE); + turret_gibtoss(tid2info_base, self.origin + '0 0 18', '0 0 200', '-1 -1 -1', FALSE); else { if (random() > 0.5) - { - turret_gibtoss("models/turrets/base-gib2.md3", self.origin + '0 0 2', '0 0 50' + randomvec() * 150, '0 0 0', FALSE); - turret_gibtoss("models/turrets/base-gib3.md3", self.origin + '0 0 2', '0 0 50' + randomvec() * 150, '0 0 0', FALSE); - turret_gibtoss("models/turrets/base-gib4.md3", self.origin + '0 0 2', '0 0 50' + randomvec() * 150, '0 0 0', FALSE); + { + turret_gibtoss("models/turrets/base-gib2.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', FALSE); + turret_gibtoss("models/turrets/base-gib3.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', FALSE); + turret_gibtoss("models/turrets/base-gib4.md3", self.origin + '0 0 8', '0 0 50' + randomvec() * 150, '0 0 0', FALSE); } else - turret_gibtoss("models/turrets/base-gib1.md3", self.origin + '0 0 4', '0 0 0', '0 0 0', TRUE); + turret_gibtoss("models/turrets/base-gib1.md3", self.origin + '0 0 8', '0 0 0', '0 0 0', TRUE); + + headgib = turret_gibtoss(tid2info_head, self.origin + '0 0 32', '0 0 200' + randomvec() * 200, '-1 -1 -1', TRUE); + if(headgib) + { + headgib.angles = headgib.move_angles = self.tur_head.angles; + headgib.avelocity = headgib.move_avelocity = self.tur_head.move_avelocity + randomvec() * 45; + headgib.avelocity_y = headgib.move_avelocity_y = headgib.move_avelocity_y * 5; + headgib.gravity = 0.5; + } } - headgib = turret_gibtoss(tid2info_head, self.origin + '0 0 32', '0 0 200' + randomvec() * 200, '-1 -1 -1', TRUE); - headgib.angles = headgib.move_angles = self.tur_head.angles; - headgib.avelocity = headgib.move_avelocity = self.tur_head.move_avelocity + randomvec() * 45; - headgib.avelocity_y = headgib.move_avelocity_y = headgib.move_avelocity_y * 5; - headgib.gravity = 0.5; + setmodel(self, "null"); + setmodel(self.tur_head, "null"); } void ent_turret() @@ -448,17 +596,28 @@ void ent_turret() turret_precache(self.turret_type); turret_construct(); + self.colormap = 1024; + self.glowmod = '0 1 1'; + self.tur_head.colormap = self.colormap; + self.tur_head.glowmod = self.glowmod; } if(sf & TNSF_ANG) { + if(self.tur_head == world) // aparenly this can happpen before TNSF_SETUP. great. + self.tur_head = spawn(); + self.tur_head.move_angles_x = ReadShort(); self.tur_head.move_angles_y = ReadShort(); - self.tur_head.angles = self.angles + self.tur_head.move_angles; + //self.tur_head.angles = self.angles + self.tur_head.move_angles; + self.tur_head.angles = self.tur_head.move_angles; } if(sf & TNSF_AVEL) { + if(self.tur_head == world) // aparenly this can happpen before TNSF_SETUP. great. + self.tur_head = spawn(); + self.tur_head.move_avelocity_x = ReadShort(); self.tur_head.move_avelocity_y = ReadShort(); } @@ -489,18 +648,21 @@ void ent_turret() if(sf & TNSF_STATUS) { - float _team; - _team = ReadByte(); - _team -= 1; // /&)=(%&#)&%)/#&)=½!!!½!!". thanks. - self.health = ReadByte(); - if(_team != self.team) - { - self.team = _team; - turret_changeteam(); + float _tmp; + _tmp = ReadByte(); + if(_tmp != self.team) + { + self.team = _tmp; + turret_changeteam(); } - if(self.health == 0) + _tmp = ReadByte(); + if(_tmp == 0 && self.health != 0) turret_die(); + else if(self.health && self.health != _tmp) + self.helpme = servertime + 10; + + self.health = _tmp; } - + //self.enemy.health = self.health / 255; }