From: Jakob MG Date: Tue, 11 Oct 2011 17:29:47 +0000 (+0200) Subject: use W_PrepareExplosionByDamage for walker. fix eWheel 'no-first-anim'. get rid of... X-Git-Tag: xonotic-v0.6.0~40^2~55 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0823812949dbaaab170db3906b3bc732a768aba5;p=xonotic%2Fxonotic-data.pk3dir.git use W_PrepareExplosionByDamage for walker. fix eWheel 'no-first-anim'. get rid of TFL_DMG_DEATH_NOGIBS (gibs are purly clientside now) --- diff --git a/qcsrc/server/tturrets/units/unit_ewheel.qc b/qcsrc/server/tturrets/units/unit_ewheel.qc index 2381ef17a..6b8f8e7d4 100644 --- a/qcsrc/server/tturrets/units/unit_ewheel.qc +++ b/qcsrc/server/tturrets/units/unit_ewheel.qc @@ -4,8 +4,6 @@ #define ewheel_amin_bck_slow 3 #define ewheel_amin_bck_fast 4 - - void ewheel_attack() { float i; @@ -109,12 +107,14 @@ void ewheel_move_enemy() movelib_beak_simple(autocvar_g_turrets_unit_ewheel_speed_stop); } - if(self.frame != newframe) + turrets_setframe(newframe , FALSE); + + /*if(self.frame != newframe) { self.frame = newframe; self.SendFlags |= TNSF_ANIM; self.anim_start_time = time; - } + }*/ } @@ -247,22 +247,19 @@ void turret_ewheel_dinit() remove(self); return; } - + + self.frame = 1; self.target_select_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_LOS; self.target_validate_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_LOS; - - self.damage_flags |= TFL_DMG_DEATH_NOGIBS; - self.iscreature = TRUE; self.damagedbycontents = TRUE; self.movetype = MOVETYPE_WALK; self.solid = SOLID_SLIDEBOX; self.takedamage = DAMAGE_AIM; + self.idle_aim = '0 0 0'; + self.pos1 = self.origin; setsize(self, '-32 -32 0', '32 32 48'); - self.idle_aim = '0 0 0'; - - self.pos1 = self.origin; // Our fire routine self.turret_firefunc = ewheel_attack; diff --git a/qcsrc/server/tturrets/units/unit_walker.qc b/qcsrc/server/tturrets/units/unit_walker.qc index 9a9140b45..646fccccb 100644 --- a/qcsrc/server/tturrets/units/unit_walker.qc +++ b/qcsrc/server/tturrets/units/unit_walker.qc @@ -36,9 +36,9 @@ void walker_meele_do_dmg() e = findradius(where,32); while (e) { - if (turret_validate_target(self,e,self.target_validate_flags)) + if (turret_validate_target(self, e, self.target_validate_flags)) if (e != self && e.owner != self) - Damage(e, self, self, autocvar_g_turrets_unit_walker_std_meele_dmg ,DEATH_TURRET_WALKER_MEELE,'0 0 0', v_forward * autocvar_g_turrets_unit_walker_std_meele_force); + Damage(e, self, self, autocvar_g_turrets_unit_walker_std_meele_dmg, DEATH_TURRET_WALKER_MEELE, '0 0 0', v_forward * autocvar_g_turrets_unit_walker_std_meele_force); e = e.chain; } @@ -51,17 +51,7 @@ void walker_setnoanim() } void walker_rocket_explode() { - if (self.event_damage != SUB_Null) - { - self.event_damage = SUB_Null; - self.takedamage = DAMAGE_NO; - self.think = walker_rocket_explode; - self.nextthink = time; - return; - } - - RadiusDamage (self, self.owner, autocvar_g_turrets_unit_walker_std_rocket_dmg, 0, autocvar_g_turrets_unit_walker_std_rocket_radius, world,autocvar_g_turrets_unit_walker_std_rocket_force, DEATH_TURRET_WALKER_ROCKET, world); - + RadiusDamage (self, self.owner, autocvar_g_turrets_unit_walker_std_rocket_dmg, 0, autocvar_g_turrets_unit_walker_std_rocket_radius, self, autocvar_g_turrets_unit_walker_std_rocket_force, DEATH_TURRET_WALKER_ROCKET, world); remove (self); } @@ -69,8 +59,9 @@ void walker_rocket_damage (entity inflictor, entity attacker, float damage, floa { self.health = self.health - damage; self.velocity = self.velocity + vforce; + if (self.health <= 0) - walker_rocket_explode(); + W_PrepareExplosionByDamage(self.owner, walker_rocket_explode); } #define WALKER_ROCKET_MOVE movelib_move_simple(newdir, autocvar_g_turrets_unit_walker_std_rocket_speed, autocvar_g_turrets_unit_walker_std_rocket_turnrate); UpdateCSQCProjectile(self) @@ -97,7 +88,7 @@ void walker_rocket_think() self.cnt = time + 0.5; } - if (edist < 256) + if (edist < 128) self.tur_shotorg = '0 0 0'; if (self.tur_health < time) @@ -308,9 +299,6 @@ void walker_move_path() } .float idletime; - - - void walker_postthink() { fixedmakevectors(self.angles); @@ -521,7 +509,6 @@ void walker_postthink() self.oldorigin = self.origin; turrets_setframe(self.animflag, FALSE); - } void walker_attack() @@ -538,7 +525,7 @@ void walker_respawnhook() entity e; // Respawn is called & first spawn to, to set team. need to make sure we do not move the initial spawn. - if(self.movetype != MOVETYPE_WALK) + if(self.movetype != MOVETYPE_WALK) return; setorigin(self, self.pos1); @@ -546,7 +533,7 @@ void walker_respawnhook() if (self.target != "") { - e = find(world,targetname,self.target); + e = find(world, targetname, self.target); if (!e) { dprint("Warning! initital waypoint for Walker does NOT exsist!\n"); @@ -563,25 +550,21 @@ void walker_respawnhook() #else self.pathcurrent = e; #endif - //self.pathcurrent = WALKER_PATH(self.origin,e.origin); - //self.pathgoal = e; } } } void walker_diehook() { -#ifdef self.pathcurrent +#ifdef WALKER_FANCYPATHING if (self.pathcurrent) pathlib_deletepath(self.pathcurrent.owner); #endif - self.pathcurrent = world; } void turret_walker_dinit() { - entity e; if (self.netname == "") self.netname = "Walker Turret"; @@ -605,26 +588,19 @@ void turret_walker_dinit() remove(self); return; } - - self.damage_flags |= TFL_DMG_DEATH_NOGIBS; + setsize(self, WALKER_MIN, WALKER_MAX); self.target_select_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_LOS; self.target_validate_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK | TFL_TARGETSELECT_LOS; - self.iscreature = TRUE; self.damagedbycontents = TRUE; self.movetype = MOVETYPE_WALK; self.solid = SOLID_SLIDEBOX; - self.takedamage = DAMAGE_AIM; - - - setsize(self, WALKER_MIN, WALKER_MAX); - + self.takedamage = DAMAGE_AIM; setorigin(self, self.origin); - tracebox(self.origin + '0 0 128', self.mins,self.maxs,self.origin - '0 0 10000', MOVE_NORMAL, self); + tracebox(self.origin + '0 0 128', self.mins, self.maxs, self.origin - '0 0 10000', MOVE_NORMAL, self); setorigin(self, trace_endpos + '0 0 4'); self.pos1 = self.origin; self.pos2 = self.angles; - self.idle_aim = '0 0 0'; self.turret_firecheckfunc = walker_firecheck; self.turret_firefunc = walker_attack;