Solve http://dev.xonotic.org/issues/778

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index d1b82b67560fd6d5b7a9407f41aa494e4c602b04..6a1768840567b8dc3e2d0ff6b1cf8618194694dd 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -619,6 +619,11 @@ seta g_keyhunt_point_leadlimit -1  "Keyhunt point lead limit overriding the mapin
 seta g_race_laps_limit -1      "Race laps limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 seta g_nexball_goallimit -1 "Nexball goal limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
 seta g_nexball_goalleadlimit -1 "Nexball goal lead limit overriding the mapinfo specified one (use 0 to play without limit, and -1 to use the mapinfo's limit)"
+seta g_nexball_safepass_maxdist 5000    // Max distance to allow save fassping (0 to turn off safe passing)
+seta g_nexball_safepass_turnrate 0.1    // How fast the safe-pass ball can habge direction
+seta g_nexball_safepass_holdtime 0.75   // How long to remeber last teammate you pointed at
+seta g_nexball_viewmodel_scale 0.25     // How large the ball for the carrier
+seta g_nexball_viewmodel_offset "8 8 0" // Where the ball is located on carrier "forward right up"
 
 seta g_ctf_win_mode 0  "0: captures only, 1: captures, then points, 2: points only"
 seta g_ctf_ignore_frags 0      "1: regular frags give no points"

diff --git a/qcsrc/server/mutators/gamemode_nexball.qc b/qcsrc/server/mutators/gamemode_nexball.qc
index fab7523505f9488fa90d9ccb397d73a559209ea8..14c7348bcda50ac49b98cfcdd464f4879a87ba8c 100644 (file)
--- a/qcsrc/server/mutators/gamemode_nexball.qc
+++ b/qcsrc/server/mutators/gamemode_nexball.qc
@@ -1,3 +1,9 @@
+float autocvar_g_nexball_safepass_turnrate;
+float autocvar_g_nexball_safepass_maxdist;
+float autocvar_g_nexball_safepass_holdtime;
+float autocvar_g_nexball_viewmodel_scale;
+vector autocvar_g_nexball_viewmodel_offset;
+
 void basketball_touch();
 void football_touch();
 void ResetBall();
@@ -639,11 +645,28 @@ void spawnfunc_ball_bound(void)
 //      Weapon code      //
 //=======================//
 
+
+void W_Nexball_Think()
+{
+    dprint("W_Nexball_Think\n");
+    //vector new_dir = steerlib_arrive(self.enemy.origin, 2500);
+    vector new_dir = steerlib_pull(self.enemy.origin);
+    vector old_dir = normalize(self.velocity);     
+    float _speed = vlen(self.velocity);
+    
+    vector new_vel = (old_dir + (new_dir * autocvar_g_nexball_safepass_turnrate)) * _speed;
+    self.velocity = new_vel;
+    
+    self.nextthink = time;
+}
+
 void W_Nexball_Touch(void)
 {
        entity ball, attacker;
        attacker = self.owner;
-
+    //self.think = SUB_Null;
+    //self.enemy = world;
+    
        PROJECTILE_TOUCH;
        if(attacker.team != other.team || autocvar_g_nexball_basketball_teamsteal)
                if((ball = other.ballcarried) && (attacker.classname == "player"))
@@ -697,7 +720,17 @@ void W_Nexball_Attack(float t)
                        mul = 2 - mul;
                mul = mi + (ma - mi) * mul; // range from the minimal power to the maximal power
        }
-       DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, FALSE));
+       
+       if(ball.enemy)
+       {
+        ball.think = W_Nexball_Think;
+        ball.nextthink = time;
+           DropBall(ball, w_shotorg, trigger_push_calculatevelocity(ball.origin, ball.enemy, 32));
+       }
+       else
+        DropBall(ball, w_shotorg, W_CalculateProjectileVelocity(self.velocity, w_shotdir * autocvar_g_balance_nexball_primary_speed * mul, FALSE));
+       
+
        //TODO: use the speed_up cvar too ??
 }
 
@@ -734,12 +767,27 @@ var const float() nullfunc;
 float ball_customize()
 {
     if(!self.owner)
+    {
+        self.effects &~= EF_FLAME;
+        self.scale = 1;
         self.customizeentityforclient = nullfunc;
+        return TRUE;
+    }        
     
     if(other == self.owner)
-        self.scale = 0.5;
+    {
+        self.scale = autocvar_g_nexball_viewmodel_scale;
+        if(self.enemy)
+            self.effects |= EF_FLAME;
+        else
+            self.effects &~= EF_FLAME;
+    }    
     else
+    {
+        self.effects &~= EF_FLAME;
         self.scale = 1;
+    }
+        
     return TRUE;
 }
 
@@ -819,29 +867,64 @@ MUTATOR_HOOKFUNCTION(nexball_BuildMutatorsPrettyString)
        return 0;
 }
 
-
 MUTATOR_HOOKFUNCTION(nexball_PlayerPreThink)
 {
+    makevectors(self.v_angle);
     if(nexball_mode & NBM_BASKETBALL)
-    if(self.ballcarried)
-    {
-        makevectors(self.v_angle);
-        self.ballcarried.velocity = self.velocity;            
-        self.ballcarried.customizeentityforclient = ball_customize;
-        setorigin(self.ballcarried, self.origin + self.view_ofs + v_forward * 23 + v_right * 4);              
-    }
-    
-    if(!self.ballcarried && self.weaponentity.weapons)
-    {
-        self.weapons = self.weaponentity.weapons;        
-        weapon_action(WEP_PORTO, WR_RESETPLAYER);
-        self.switchweapon = self.weaponentity.switchweapon;
-        W_SwitchWeapon(self.switchweapon);
+    {        
+        if(self.ballcarried)
+        {
+            // 'view ball'
+            self.ballcarried.velocity = self.velocity;            
+            self.ballcarried.customizeentityforclient = ball_customize;
+            
+            setorigin(self.ballcarried, self.origin + self.view_ofs + 
+                      v_forward * autocvar_g_nexball_viewmodel_offset_x + 
+                      v_right * autocvar_g_nexball_viewmodel_offset_y + 
+                      v_up * autocvar_g_nexball_viewmodel_offset_z);    
+                      
+            // 'safe passing'
+            if(autocvar_g_nexball_safepass_maxdist)
+            {
+                if(self.ballcarried.wait < time && self.ballcarried.enemy)
+                {
+                    //centerprint(self, sprintf("Lost lock on %s", self.ballcarried.enemy.netname));
+                    self.ballcarried.enemy = world;
+                }
+                    
+                
+                //tracebox(self.origin + self.view_ofs, '-2 -2 -2', '2 2 2', self.origin + self.view_ofs + v_forward * autocvar_g_nexball_safepass_maxdist);
+                crosshair_trace(self);
+                if( trace_ent && 
+                    trace_ent.flags & FL_CLIENT &&
+                    trace_ent.deadflag == DEAD_NO &&
+                    trace_ent.team == self.team &&
+                    vlen(trace_ent.origin - self.origin) <= autocvar_g_nexball_safepass_maxdist )
+                {
+                    
+                    //if(self.ballcarried.enemy != trace_ent)
+                    //    centerprint(self, sprintf("Locked to %s", trace_ent.netname));
+                    self.ballcarried.enemy = trace_ent;
+                    self.ballcarried.wait = time + autocvar_g_nexball_safepass_holdtime;
+                    
+                    
+                }
+            }
+        }
+        else
+        {            
+            if(self.weaponentity.weapons)
+            {
+                self.weapons = self.weaponentity.weapons;        
+                weapon_action(WEP_PORTO, WR_RESETPLAYER);
+                self.switchweapon = self.weaponentity.switchweapon;
+                W_SwitchWeapon(self.switchweapon);
+                
+                self.weaponentity.weapons = 0;
+            }
+        }
         
-        self.weaponentity.weapons = 0;
-
     }
-    
     return FALSE;
 }