]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/blobdiff - qcsrc/server/tturrets/units/unit_walker.qc
Merge remote-tracking branch 'origin/master' into samual/spawn_weapons
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / tturrets / units / unit_walker.qc
index d1d48c46cdb82b4f5d90746ea7ab8c5d42afe041..482e919c25f8c57742f19b135dc72b67fbdb34b0 100644 (file)
 #define ANIM_MEELE      9
 #define ANIM_SWIM       10
 #define ANIM_ROAM       11
-
 .float animflag;
-.entity wkr_spawn;
 
 #define WALKER_MIN '-70 -70 0'
 #define WALKER_MAX '70 70 95'
 
 #define WALKER_PATH(s,e) pathlib_astar(s,e)
 
-float walker_meele_dmg;
-float walker_meele_force;
-
-float walker_speed_stop;
-float walker_speed_walk;
-float walker_speed_run;
-float walker_speed_jump;
-float walker_speed_roam;
-float walker_speed_swim;
-
-float walker_std_rocket_dmg;
-float walker_std_rocket_radius;
-float walker_std_rocket_force;
-float walker_std_rocket_speed;
-float walker_std_rocket_turnrate;
-
-void walker_loadcvars()
-{
-    walker_meele_dmg    = autocvar_g_turrets_unit_walker_std_meele_dmg;
-    walker_meele_force  = autocvar_g_turrets_unit_walker_std_meele_force;
-
-    walker_speed_stop   = autocvar_g_turrets_unit_walker_speed_stop;
-    walker_speed_walk   = autocvar_g_turrets_unit_walker_speed_walk;
-    walker_speed_run    = autocvar_g_turrets_unit_walker_speed_run;
-    walker_speed_jump   = autocvar_g_turrets_unit_walker_speed_jump;
-    walker_speed_roam   = autocvar_g_turrets_unit_walker_speed_roam;
-    walker_speed_swim   = autocvar_g_turrets_unit_walker_speed_swim;
-
-    walker_std_rocket_dmg       = autocvar_g_turrets_unit_walker_std_rocket_dmg;
-    walker_std_rocket_radius    = autocvar_g_turrets_unit_walker_std_rocket_radius;
-    walker_std_rocket_force     = autocvar_g_turrets_unit_walker_std_rocket_force;
-    walker_std_rocket_speed     = autocvar_g_turrets_unit_walker_std_rocket_speed;
-    walker_std_rocket_turnrate  = autocvar_g_turrets_unit_walker_std_rocket_turnrate;
-
-}
-
-
-
 float walker_firecheck()
 {
     if (self.animflag == ANIM_MEELE)
@@ -69,171 +29,29 @@ void walker_meele_do_dmg()
 {
     vector where;
     entity e;
+    
     makevectors(self.angles);
     where = self.origin + v_forward * 128;
 
-    //w_deathtypestring = "tried to hug the cute spider thingy.";
     e = findradius(where,32);
-    while (e)
+    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, walker_meele_dmg ,DEATH_TURRET,'0 0 0', v_forward * walker_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;
     }
 }
-void walker_setnoanim()
-{
-    self.frame = ANIM_NO;
-    self.animflag = self.owner.frame;
-    dprint("walker_setnoanim\n");
 
-}
-
-void walker_dly_meele_do_dmg()
-{
-    walker_meele_do_dmg();
-    dprint("walker_dly_meele_do_dmg\n");
-
-}
-
-void walker_animate()
+void walker_setnoanim()
 {
-    vector real_angle;
-    float  vz;
-
-    real_angle = vectoangles(self.steerto) - self.angles;
-    vz         = self.velocity_z;
-
-    if (self.tur_head.frame != 0)
-        self.tur_head.frame = self.tur_head.frame +1;
-
-    if (self.tur_head.frame > 12)
-        self.tur_head.frame = 0;
-
-    switch (self.animflag)
-    {
-
-    case ANIM_NO:
-        self.frame = 0;
-        movelib_beak_simple(walker_speed_stop);
-        break;
-
-    /*
-    case ANIM_REVERSE:
-        if ((self.frame < 5) || (self.frame > 25))
-            self.frame = 25;
-
-        self.frame = self.frame -1;
-        movelib_move_simple(v_forward * -1, walker_speed_walk, 0.6);
-
-        if (self.frame < 5)
-            self.frame = 25;
-
-        break;
-    */
-
-    case ANIM_TURN:
-        self.frame = ANIM_TURN;
-        self.angles_y += bound(-15, shortangle_f(real_angle_y, self.angles_y), 15);
-        movelib_beak_simple(walker_speed_stop);
-        break;
-
-    case ANIM_WALK:
-        self.frame = ANIM_WALK;
-        self.angles_y += bound(-10, shortangle_f(real_angle_y, self.angles_y), 10);
-        movelib_move_simple(v_forward, walker_speed_walk, 0.6);
-        break;
-
-    case ANIM_RUN:
-        self.frame = ANIM_RUN;
-        self.angles_y += bound(-5, shortangle_f(real_angle_y, self.angles_y), 5);
-        movelib_move_simple(v_forward, walker_speed_run, 0.6);
-        break;
-
-    case ANIM_STRAFE_L:
-        self.frame = ANIM_STRAFE_L;
-        self.angles_y += bound(-2.5, shortangle_f(real_angle_y, self.angles_y), 2.5);
-        movelib_move_simple(v_right * -1, walker_speed_walk, 0.8);
-        break;
-
-    case ANIM_STRAFE_R:
-        self.frame = ANIM_STRAFE_R;
-        self.angles_y += bound(-2.5, shortangle_f(real_angle_y, self.angles_y), 2.5);
-        movelib_move_simple(v_right, walker_speed_walk, 0.8);
-        break;
-
-    case ANIM_JUMP:
-        self.frame = ANIM_JUMP;
-        self.velocity += '0 0 1' * walker_speed_jump;
-        break;
-
-    case ANIM_LAND:
-        self.frame = ANIM_LAND;
-        break;
-
-    case ANIM_PAIN:
-        if(self.frame != ANIM_PAIN)
-            defer(0.25,walker_setnoanim);
-
-        self.frame = ANIM_PAIN;
-
-        break;
-
-    case ANIM_MEELE:
-        if(self.frame != ANIM_MEELE)
-        {
-            defer(0.41, walker_setnoanim);
-            defer(0.21, walker_dly_meele_do_dmg);
-        }
-
-        self.frame = ANIM_MEELE;
-        movelib_beak_simple(walker_speed_stop);
-        break;
-
-    case ANIM_SWIM:
-        self.frame = ANIM_SWIM;
-        self.angles_y += bound(-10, shortangle_f(real_angle_y, self.angles_y), 10);
-        self.angles_x += bound(-10, shortangle_f(real_angle_x, self.angles_x), 10);
-        movelib_move_simple(v_forward, walker_speed_swim, 0.3);
-        vz = self.velocity_z + sin(time * 4) * 8;
-        break;
-
-    case ANIM_ROAM:
-        self.frame = ANIM_ROAM;
-        self.angles_y += bound(-5, shortangle_f(real_angle_y, self.angles_y), 5);
-        movelib_move_simple(v_forward ,walker_speed_roam, 0.5);
-        break;
-
-    }
-
-    self.velocity_z = vz;
-
-    if (self.flags & FL_ONGROUND)
-        movelib_groundalign4point(300, 100, 0.25);
-
+    turrets_setframe(ANIM_NO, FALSE);
+    self.animflag = self.frame;
 }
-
-
 void walker_rocket_explode()
 {
-    vector org2;
-
-    if (self.event_damage != SUB_Null)
-    {
-        self.event_damage = SUB_Null;
-        self.think = walker_rocket_explode;
-        self.nextthink = time;
-        return;
-    }
-
-    sound (self, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
-    org2 = findbetterlocation (self.origin, 16);
-
-    pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1);
-    RadiusDamage (self, self.owner, walker_std_rocket_dmg, 0, walker_std_rocket_radius, world,walker_std_rocket_force, DEATH_TURRET, world);
-
+    RadiusDamage (self, self.owner, autocvar_g_turrets_unit_walker_std_rocket_dmg, 0, autocvar_g_turrets_unit_walker_std_rocket_radius, self, world, autocvar_g_turrets_unit_walker_std_rocket_force, DEATH_TURRET_WALKER_ROCKET, world);
     remove (self);
 }
 
@@ -241,11 +59,12 @@ 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, walker_std_rocket_speed, walker_std_rocket_turnrate); UpdateCSQCProjectile(self)
+#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)
 void walker_rocket_loop();
 void walker_rocket_think()
 {
@@ -262,49 +81,42 @@ void walker_rocket_think()
     if (self.cnt < time)
     {
         if (edist < 1000)
-            self.tur_shotorg = randomvec() * min(edist,64);
+            self.tur_shotorg = randomvec() * min(edist, 64);
         else
-            self.tur_shotorg = randomvec() * min(edist,256);
+            self.tur_shotorg = randomvec() * min(edist, 256);
 
         self.cnt = time + 0.5;
     }
 
-    if (edist < 256)
+    if (edist < 128)
         self.tur_shotorg = '0 0 0';
 
-
     if (self.tur_health < time)
     {
-        self.think = walker_rocket_explode;
-        self.nextthink = time;
+        self.think      = walker_rocket_explode;
+        self.nextthink  = time;
         return;
     }
 
-    if (self.shot_dmg != 1337)
-        if (random() < 0.01)
-        {
-            walker_rocket_loop();
-            return;
-        }
+    if (self.shot_dmg != 1337 && random() < 0.01)
+    {
+        walker_rocket_loop();
+        return;
+    }
 
     m_speed = vlen(self.velocity);
 
     // Enemy dead? just keep on the current heading then.
-    if ((self.enemy == world) || (self.enemy.deadflag != DEAD_NO))
-    {
-        // Make sure we dont return to tracking a respawned entity
+    if (self.enemy == world || self.enemy.deadflag != DEAD_NO)
         self.enemy = world;
-    }
 
     if (self.enemy)
     {
-        itime = max(edist / m_speed,1);
+        itime = max(edist / m_speed, 1);
         newdir = steerlib_pull(self.enemy.origin + self.tur_shotorg);
     }
     else
-    {
         newdir  = normalize(self.velocity);
-    }
 
     WALKER_ROCKET_MOVE;
 }
@@ -320,7 +132,7 @@ void walker_rocket_loop3()
         return;
     }
 
-    if (vlen(self.origin - self.tur_shotorg) < 128 )
+    if (vlen(self.origin - self.tur_shotorg) < 100 )
     {
         self.think = walker_rocket_think;
         return;
@@ -344,7 +156,7 @@ void walker_rocket_loop2()
         return;
     }
 
-    if (vlen(self.origin - self.tur_shotorg) < 128 )
+    if (vlen(self.origin - self.tur_shotorg) < 100 )
     {
         self.tur_shotorg = self.origin - '0 0 200';
         self.think = walker_rocket_loop3;
@@ -358,43 +170,36 @@ void walker_rocket_loop2()
 void walker_rocket_loop()
 {
     self.nextthink = time;
-    self.tur_shotorg = self.origin + '0 0 400';
+    self.tur_shotorg = self.origin + '0 0 300';
     self.think = walker_rocket_loop2;
     self.shot_dmg = 1337;
 }
 
 void walker_fire_rocket(vector org)
 {
-
     entity rocket;
-
-
-    //self.angles_x *= -1;
     fixedmakevectors(self.angles);
-    //self.angles_x *= -1;
 
     te_explosion (org);
 
     rocket = spawn ();
     setorigin(rocket, org);
 
-    sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", VOL_BASE, ATTN_NORM);
+    sound (self, CH_WEAPON_A, "weapons/hagar_fire.wav", VOL_BASE, ATTN_NORM);
     setsize (rocket, '-3 -3 -3', '3 3 3'); // give it some size so it can be shot
 
     rocket.classname          = "walker_rocket";
     rocket.owner              = self;
-
     rocket.bot_dodge          = TRUE;
     rocket.bot_dodgerating    = 50;
-
     rocket.takedamage         = DAMAGE_YES;
-
     rocket.damageforcescale   = 2;
     rocket.health             = 25;
     rocket.tur_shotorg        = randomvec() * 512;
     rocket.cnt                = time + 1;
     rocket.enemy              = self.enemy;
-
+    
     if (random() < 0.01)
         rocket.think          = walker_rocket_loop;
     else
@@ -402,54 +207,56 @@ void walker_fire_rocket(vector org)
 
     rocket.event_damage       = walker_rocket_damage;
 
-    rocket.nextthink          = time;// + 0.25;
+    rocket.nextthink          = time;
     rocket.movetype           = MOVETYPE_FLY;
-    rocket.velocity           = normalize((v_forward + v_up * 0.5) + (randomvec() * 0.2)) * walker_std_rocket_speed;
+    rocket.velocity           = normalize((v_forward + v_up * 0.5) + (randomvec() * 0.2)) * autocvar_g_turrets_unit_walker_std_rocket_speed;
     rocket.angles             = vectoangles(rocket.velocity);
     rocket.touch              = walker_rocket_explode;
     rocket.flags              = FL_PROJECTILE;
     rocket.solid              = SOLID_BBOX;
     rocket.tur_health         = time + 9;
-
+    rocket.missile_flags = MIF_SPLASH | MIF_PROXY | MIF_GUIDED_HEAT;
+    
     CSQCProjectile(rocket, FALSE, PROJECTILE_ROCKET, FALSE); // no culling, has fly sound
 }
 
-void rv_think()
+.vector enemy_last_loc;
+.float enemy_last_time;
+void walker_move_to(vector _target, float _dist)
 {
-    float f;
-    vector org;
-    entity oldself;
-
-    if (self.owner.deadflag != DEAD_NO)
+    switch (self.waterlevel)
     {
-        remove(self);
-        return;
+    case WATERLEVEL_NONE:
+        if (_dist > 500)
+            self.animflag = ANIM_RUN;
+        else
+            self.animflag = ANIM_WALK;
+    case WATERLEVEL_WETFEET:
+    case WATERLEVEL_SWIMMING:
+        if (self.animflag != ANIM_SWIM)
+            self.animflag = ANIM_WALK;
+        else
+            self.animflag = ANIM_SWIM;
+        break;
+    case WATERLEVEL_SUBMERGED:
+        self.animflag = ANIM_SWIM;
     }
 
-    self.cnt = self.cnt -1;
+    self.moveto = _target;
+    self.steerto = steerlib_attract2(self.moveto, 0.5, 500, 0.95);
 
-    if (self.cnt < 0)
+    if(self.enemy)
     {
-        remove(self);
-        return;
+        self.enemy_last_loc = _target;
+        self.enemy_last_time = time;        
     }
-
-    if (self.cnt > 1)
-        f = gettagindex(self.owner,"tag_rocket01");
-    else
-        f = gettagindex(self.owner,"tag_rocket02");
-
-    org = gettaginfo(self.owner,f);
-
-    self.nextthink = time + 0.2;
-    oldself = self;
-    self = self.owner;
-    walker_fire_rocket(org);
-    self = oldself;
 }
 
+//#define WALKER_FANCYPATHING
+
 void walker_move_path()
 {
+#ifdef WALKER_FANCYPATHING
     // Are we close enougth to a path node to switch to the next?
     if (vlen(self.origin  - self.pathcurrent.origin) < 64)
         if (self.pathcurrent.path_next == world)
@@ -475,182 +282,259 @@ void walker_move_path()
         else
             self.pathcurrent = self.pathcurrent.path_next;
 
-    switch (self.waterlevel)
-    {
-    case 0:
-        self.animflag = ANIM_WALK;
-    case 1:
-    case 2:
-        if (self.animflag == ANIM_WALK)
-            self.animflag = ANIM_WALK;
-        else
-            self.animflag = ANIM_SWIM;
-        break;
-    case 3:
-        self.animflag = ANIM_SWIM;
-    }
-
     self.moveto = self.pathcurrent.origin;
     self.steerto = steerlib_attract2(self.moveto,0.5,500,0.95);
+    walker_move_to(self.moveto, 0);
 
+#else
+    if (vlen(self.origin - self.pathcurrent.origin) < 64)    
+        self.pathcurrent = self.pathcurrent.enemy;
+    
+    if(!self.pathcurrent)
+        return;
+    
+    self.moveto = self.pathcurrent.origin;
+    self.steerto = steerlib_attract2(self.moveto, 0.5, 500, 0.95);
+    walker_move_to(self.moveto, 0);
+#endif
 }
 
-void walker_move_enemy()
-{
-    switch (self.waterlevel)
-    {
-    case 0:
-        if (self.tur_dist_enemy > 500)
-            self.animflag = ANIM_RUN;
-        else
-            self.animflag = ANIM_WALK;
-    case 1:
-    case 2:
-        if (self.animflag != ANIM_SWIM)
-            self.animflag = ANIM_WALK;
-        else
-            self.animflag = ANIM_SWIM;
-        break;
-    case 3:
-        self.animflag = ANIM_SWIM;
-    }
-
-    self.moveto = self.enemy.origin;
-    self.steerto = steerlib_attract2(self.moveto,0.5,500,0.95);
-
-}
-
-void walker_move_idle_pause()
-{
-    self.moveto   = self.origin;
-    self.steerto  = v_forward;
-    self.animflag = ANIM_NO;
-}
-
-void walker_move_idle_roam()
-{
-}
-
-void walker_move_idle()
-{
-}
-
-float walker_attack_meele()
-{
-
-    vector wish_angle;
-
-
-    if (self.animflag == ANIM_SWIM || self.animflag == ANIM_MEELE)
-        return 0;
-
-    wish_angle = angleofs(self,self.enemy);
-
-    if (self.tur_dist_enemy > autocvar_g_turrets_unit_walker_std_meele_range)
-        return 0;
-    else
-        if (fabs(wish_angle_y) > 15)
-            return 0;
-
-    self.moveto   = self.enemy.origin;
-    self.steerto  = steerlib_attract2(self.moveto,0.5,500,0.95);
-    self.animflag = ANIM_MEELE;
-
-    return 1;
-}
-
-float walker_attack_rockets()
-{
-    if (self.tur_head.attack_finished_single > time)
-        return 0;
-
-    if (self.tur_dist_enemy < autocvar_g_turrets_unit_walker_std_rockets_range_min)
-        return 0;
-
-    if (self.tur_dist_enemy > autocvar_g_turrets_unit_walker_std_rockets_range)
-        return 0;
-
-    entity rv;
-
-    rv           = spawn();
-    rv.think     = rv_think;
-    rv.nextthink = time;
-    rv.cnt       = 4;
-    rv.owner     = self;
-
-    self.tur_head.attack_finished_single = time + autocvar_g_turrets_unit_walker_std_rocket_refire;
-
-    return 1;
-}
-
+.float idletime;
 void walker_postthink()
 {
-
-    //self.angles_x *= -1;
     fixedmakevectors(self.angles);
-    //self.angles_x *= -1;
 
-    if ((self.spawnflags & TSF_NO_PATHBREAK) && self.pathcurrent)
+    if (self.spawnflags & TSF_NO_PATHBREAK && self.pathcurrent)
         walker_move_path();
     else if (self.enemy == world)
     {
         if(self.pathcurrent)
             walker_move_path();
         else
-            walker_move_idle_pause();
+        {
+            if(self.enemy_last_time != 0)
+            {
+                if(vlen(self.origin - self.enemy_last_loc) < 128 || time - self.enemy_last_time > 10)
+                    self.enemy_last_time = 0;
+                else                
+                    walker_move_to(self.enemy_last_loc, 0);
+            }
+            else
+            {        
+                if(self.animflag != ANIM_NO)
+                {                    
+                    traceline(self.origin + '0 0 64', self.origin + '0 0 64' + v_forward * 128, MOVE_NORMAL, self);
+                    
+                    if(trace_fraction != 1.0)
+                        self.tur_head.idletime = -1337;
+                    else
+                    {
+                        traceline(trace_endpos, trace_endpos - '0 0 256', MOVE_NORMAL, self);            
+                        if(trace_fraction == 1.0)
+                            self.tur_head.idletime = -1337;
+                    }
+                    
+                    if(self.tur_head.idletime == -1337)
+                    {
+                        self.moveto = self.origin + randomvec() * 256;        
+                        self.tur_head.idletime = 0;
+                    }
+
+                    self.moveto = self.moveto * 0.9 + ((self.origin + v_forward * 500) + randomvec() * 400) * 0.1;
+                    self.moveto_z = self.origin_z + 64;            
+                    walker_move_to(self.moveto, 0);
+                }         
+                
+                if(self.idletime < time)
+                {
+                    if(random() < 0.5 || !(self.spawnflags & TSL_ROAM))
+                    {
+                        self.idletime = time + 1 + random() * 5;
+                        self.moveto = self.origin;
+                        self.animflag = ANIM_NO;
+                    }
+                    else
+                    {
+                        self.animflag = ANIM_WALK;
+                        self.idletime = time + 4 + random() * 2;
+                        self.moveto = self.origin + randomvec() * 256;        
+                        self.tur_head.moveto = self.moveto;
+                        self.tur_head.idletime = 0;
+                    }
+                }
+            }            
+        }
     }
     else
     {
-        if not (self.animflag == ANIM_MEELE)
-            if not (walker_attack_rockets())
-                walker_attack_meele();
-
-        if not (self.animflag == ANIM_MEELE)
-            walker_move_enemy();
+        if (self.tur_dist_enemy < autocvar_g_turrets_unit_walker_std_meele_range && self.animflag != ANIM_MEELE)
+        {
+            vector wish_angle;
+            
+            wish_angle = angleofs(self, self.enemy);    
+            if (self.animflag != ANIM_SWIM)
+            if (fabs(wish_angle_y) < 15)
+            {
+                self.moveto   = self.enemy.origin;
+                self.steerto  = steerlib_attract2(self.moveto, 0.5, 500, 0.95);
+                self.animflag = ANIM_MEELE;
+            }
+        }
+        else if (self.tur_head.attack_finished_single < time)
+        {            
+            if(self.tur_head.shot_volly)
+            {
+                self.animflag = ANIM_NO;
+                
+                self.tur_head.shot_volly = self.tur_head.shot_volly -1;
+                if(self.tur_head.shot_volly == 0)
+                    self.tur_head.attack_finished_single = time + autocvar_g_turrets_unit_walker_std_rocket_refire;
+                else
+                    self.tur_head.attack_finished_single = time + 0.2;
+                
+                if(self.tur_head.shot_volly > 1)
+                    walker_fire_rocket(gettaginfo(self, gettagindex(self, "tag_rocket01")));
+                else
+                    walker_fire_rocket(gettaginfo(self, gettagindex(self, "tag_rocket02")));
+            }
+            else
+            {
+                if (self.tur_dist_enemy > autocvar_g_turrets_unit_walker_std_rockets_range_min)        
+                if (self.tur_dist_enemy < autocvar_g_turrets_unit_walker_std_rockets_range)
+                    self.tur_head.shot_volly = 4;
+            }
+        }
+        else
+        {            
+            if (self.animflag != ANIM_MEELE)
+                walker_move_to(self.enemy.origin, self.tur_dist_enemy);
+        }
     }
 
+    //if(self.animflag != ANIM_NO)
+    {
+        vector real_angle;
+        float turny, turnx;
+        float  vz;
+
+        real_angle = vectoangles(self.steerto) - self.angles;
+        vz         = self.velocity_z;
+            
+        switch (self.animflag)
+        {
+            case ANIM_NO:
+                movelib_beak_simple(autocvar_g_turrets_unit_walker_speed_stop);
+                break;
+
+            case ANIM_TURN:
+                turny = autocvar_g_turrets_unit_walker_turn;
+                movelib_beak_simple(autocvar_g_turrets_unit_walker_speed_stop);
+                break;
+
+            case ANIM_WALK:
+                turny = autocvar_g_turrets_unit_walker_turn_walk;
+                movelib_move_simple(v_forward, autocvar_g_turrets_unit_walker_speed_walk, 0.6);
+                break;
+
+            case ANIM_RUN:
+                turny = autocvar_g_turrets_unit_walker_turn_run;
+                movelib_move_simple(v_forward, autocvar_g_turrets_unit_walker_speed_run, 0.6);
+                break;
+
+            case ANIM_STRAFE_L:
+                turny = autocvar_g_turrets_unit_walker_turn_strafe;
+                movelib_move_simple(v_right * -1, autocvar_g_turrets_unit_walker_speed_walk, 0.8);
+                break;
+
+            case ANIM_STRAFE_R:
+                turny = autocvar_g_turrets_unit_walker_turn_strafe;
+                movelib_move_simple(v_right, autocvar_g_turrets_unit_walker_speed_walk, 0.8);
+                break;
+
+            case ANIM_JUMP:
+                self.velocity += '0 0 1' * autocvar_g_turrets_unit_walker_speed_jump;
+                break;
+
+            case ANIM_LAND:
+                break;
+
+            case ANIM_PAIN:
+                if(self.frame != ANIM_PAIN)
+                    defer(0.25, walker_setnoanim);
+                
+                break;
+
+            case ANIM_MEELE:
+                if(self.frame != ANIM_MEELE)
+                {
+                    defer(0.41, walker_setnoanim);
+                    defer(0.21, walker_meele_do_dmg);
+                }
+
+                movelib_beak_simple(autocvar_g_turrets_unit_walker_speed_stop);
+                break;
+
+            case ANIM_SWIM:
+                turny = autocvar_g_turrets_unit_walker_turn_swim;
+                turnx = autocvar_g_turrets_unit_walker_turn_swim;
+                
+                self.angles_x += bound(-10, shortangle_f(real_angle_x, self.angles_x), 10);
+                movelib_move_simple(v_forward, autocvar_g_turrets_unit_walker_speed_swim, 0.3);
+                vz = self.velocity_z + sin(time * 4) * 8;
+                break;
+
+            case ANIM_ROAM:
+                turny = autocvar_g_turrets_unit_walker_turn_walk;
+                movelib_move_simple(v_forward ,autocvar_g_turrets_unit_walker_speed_roam, 0.5);
+                break;
+        }
+            
+        if(turny)
+        {        
+            turny = bound( turny * -1, shortangle_f(real_angle_y, self.angles_y), turny );
+            self.angles_y += turny;
+        }
 
-    walker_animate();
+        if(turnx)
+        {        
+            turnx = bound( turnx * -1, shortangle_f(real_angle_x, self.angles_x), turnx );
+            self.angles_x += turnx;
+        }
+
+        self.velocity_z = vz;        
+    }
+
+    
+    if(self.origin != self.oldorigin)
+        self.SendFlags |= TNSF_MOVE;
+    
+    self.oldorigin = self.origin;
+    turrets_setframe(self.animflag, FALSE);
 }
 
 void walker_attack()
 {
-    sound (self, CHAN_WEAPON, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM);
-    fireBallisticBullet (self.tur_shotorg, self.tur_shotdir_updated,self.shot_spread, self.shot_speed, 5, self.shot_dmg, 0, self.shot_force, DEATH_TURRET, 0, 1, autocvar_g_balance_uzi_bulletconstant);
+    sound (self, CH_WEAPON_A, "weapons/uzi_fire.wav", VOL_BASE, ATTN_NORM);
+    fireBallisticBullet (self.tur_shotorg, self.tur_shotdir_updated, self.shot_spread, self.shot_speed, 5, self.shot_dmg, 0, self.shot_force, DEATH_TURRET_WALKER_GUN, 0, 1, autocvar_g_balance_uzi_bulletconstant);
     endFireBallisticBullet();
-    if (self.misc_bulletcounter == 2)
-    {
-
-               UziFlash();
-               setattachment(self.muzzle_flash, self.tur_head, "tag_fire");
-
-        self.misc_bulletcounter = 0;
-    }
-
-    self.misc_bulletcounter = self.misc_bulletcounter + 1;
-    self.tur_head.frame    = self.tur_head.frame + 1;
+    pointparticles(particleeffectnum("laser_muzzleflash"), self.tur_shotorg, self.tur_shotdir_updated * 1000, 1);
 }
 
 
 void walker_respawnhook()
 {
-    vector vtmp;
     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.wkr_spawn.origin);
-
-    self.angles = self.wkr_spawn.angles;
-    vtmp = self.wkr_spawn.origin;
-    vtmp_z += self.wkr_spawn.maxs_z;
-    setorigin(self,vtmp);
-
+    setorigin(self, self.pos1);
+    self.angles = self.pos2;
+    
     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");
@@ -661,34 +545,30 @@ void walker_respawnhook()
             dprint("Warning: not a turrret path\n");
         else
         {
-            self.pathcurrent = WALKER_PATH(self.origin,e.origin);
+ #ifdef WALKER_FANCYPATHING
+            self.pathcurrent = WALKER_PATH(self.origin, e.origin);
             self.pathgoal = e;
+#else
+            self.pathcurrent = e;
+#endif
         }
     }
 }
 
 void walker_diehook()
 {
-    turret_trowgib2(self.origin, self.velocity + v_up * 200, '-0.6 -0.2 -02', self,time + random() * 1);
-    turret_trowgib2(self.origin + '0 0 64', self.velocity + v_forward * 150 + v_up * 150, '-0.2 -0.2 -02', self.tur_head, 3 + time + random() * 2);
-
+#ifdef WALKER_FANCYPATHING
     if (self.pathcurrent)
         pathlib_deletepath(self.pathcurrent.owner);
-
+#endif
     self.pathcurrent = world;
-
-    if (self.damage_flags & TFL_DMG_DEATH_NORESPAWN)
-        remove(self.wkr_spawn);
-
 }
 
 void turret_walker_dinit()
 {
-
     entity e;
 
     if (self.netname == "")      self.netname     = "Walker Turret";
-    self.wkr_spawn = spawn();
 
     self.ammo_flags = TFL_AMMO_BULLETS | TFL_AMMO_RECHARGE | TFL_AMMO_RECIVE;
     self.turrcaps_flags = TFL_TURRCAPS_PLAYERKILL | TFL_TURRCAPS_MOVE ;
@@ -704,38 +584,24 @@ void turret_walker_dinit()
     self.turret_diehook = walker_diehook;
 
     self.ticrate = 0.05;
-    if (turret_stdproc_init("walker_std",FALSE,"models/turrets/walker_body.md3","models/turrets/walker_head_minigun.md3") == 0)
+    if (turret_stdproc_init("walker_std", "models/turrets/walker_body.md3", "models/turrets/walker_head_minigun.md3", TID_WALKER) == 0)
     {
         remove(self);
         return;
     }
-
-    if (!turret_tag_fire_update())
-        dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
-
-    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;
-
-    setmodel(self.wkr_spawn,"models/turrets/walker_spawn.md3");
-
-    self.wkr_spawn.angles   = self.angles;
-    self.wkr_spawn.solid    = SOLID_NOT;
-
-    setsize(self, WALKER_MIN, WALKER_MAX);
-
-    setorigin(self,self.origin);
-    //traceline(self.origin + '0 0 128', 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.wkr_spawn, trace_endpos + '0 0 4');
-    setorigin(self, self.wkr_spawn.origin);
-
+    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);
+    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;
@@ -743,7 +609,7 @@ void turret_walker_dinit()
 
     if (self.target != "")
     {
-        e = find(world,targetname,self.target);
+        e = find(world, targetname, self.target);
         if (!e)
         {
             dprint("Initital waypoint for walker does NOT exsist, fix your map!\n");
@@ -754,8 +620,12 @@ void turret_walker_dinit()
             dprint("Warning: not a turrret path\n");
         else
         {
-            self.pathcurrent = WALKER_PATH(self.origin,e.origin);
+#ifdef WALKER_FANCYPATHING
+            self.pathcurrent = WALKER_PATH(self.origin, e.origin);
             self.pathgoal = e;
+#else
+            self.pathcurrent = e;
+#endif
         }
     }
 }
@@ -763,14 +633,10 @@ void turret_walker_dinit()
 
 void spawnfunc_turret_walker()
 {
-    walker_loadcvars();
-
     g_turrets_common_precash();
 
     precache_model ("models/turrets/walker_head_minigun.md3");
     precache_model ("models/turrets/walker_body.md3");
-    precache_model ("models/turrets/walker_props.md3");
-    precache_model ("models/turrets/walker_spawn.md3");
     precache_model ( "models/turrets/rocket.md3");
     precache_sound ( "weapons/rocket_impact.wav" );