Merge branch 'TimePath/gamesettings' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / minigames / minigame / pong.qc

diff --git a/qcsrc/common/minigames/minigame/pong.qc b/qcsrc/common/minigames/minigame/pong.qc
index 2e4510627cf65c45299883e482060b7db2129d31..6aca04cf95f4675f90e318b02af6c479080d0e9f 100644 (file)
--- a/qcsrc/common/minigames/minigame/pong.qc
+++ b/qcsrc/common/minigames/minigame/pong.qc
@@ -29,6 +29,7 @@ float autocvar_sv_minigames_pong_paddle_speed;
 float autocvar_sv_minigames_pong_ball_wait;
 float autocvar_sv_minigames_pong_ball_speed;
 float autocvar_sv_minigames_pong_ball_radius;
+float autocvar_sv_minigames_pong_ball_number;
 
 float autocvar_sv_minigames_pong_ai_thinkspeed;
 float autocvar_sv_minigames_pong_ai_tolerance;
@@ -203,40 +204,49 @@ void pong_ai_think()
        float think_speed = autocvar_sv_minigames_pong_ai_thinkspeed;
        self.nextthink = time + think_speed;
        
-       float distance = self.pong_length/2 * autocvar_sv_minigames_pong_ai_tolerance;
-       distance += autocvar_sv_minigames_pong_paddle_speed * think_speed;
-       float target;
-       float self_pos;
-       
+       float distance;
+       float next_distance;
+       float min_distance = 1;
        entity ball = world;
-       self.pong_keys = 0;
-       while ( ( ball = findentity(ball,owner,self.owner) ) )
-               if ( ball.classname == "pong_ball" )
-               {                       
-                       if ( self.team <= 2 )
-                       {
-                               target = ball.origin_y + ball.velocity_y*think_speed;
-                               if ( ( self.team == 1 && ball.origin_x < 0.5 && ball.velocity_x < 0 ) ||
-                                               ( self.team == 2 && ball.origin_x > 0.5 && ball.velocity_x > 0 ) )
-                                       target = 0.5;
-                               self_pos = self.pong_ai_paddle.origin_y;
-                       }
-                       else
+       entity mayball = world;
+       while ( ( mayball = findentity(mayball,owner,self.owner) ) )
+               if ( mayball.classname == "pong_ball" )
+               {
+                       distance = vlen(mayball.origin-self.pong_ai_paddle.origin);
+                       next_distance = vlen(mayball.origin+mayball.velocity-self.pong_ai_paddle.origin);
+                       if (  distance < min_distance && ( distance < 0.5 || next_distance < distance ) )
                        {
-                               target = ball.origin_x + ball.velocity_x*think_speed;
-                               if ( ( self.team == 4 && ball.origin_y < 0.5 && ball.velocity_y < 0 ) ||
-                                               ( self.team == 3 && ball.origin_y > 0.5 && ball.velocity_y > 0 ) )
-                                       target = 0.5;
-                               self_pos = self.pong_ai_paddle.origin_x;
+                               min_distance = distance;
+                               ball = mayball;
                        }
-                       
-                       if (target < self_pos - distance)
-                               self.pong_keys = PONG_KEY_DECREASE;
-                       else if (target > self_pos + distance)
-                               self.pong_keys = PONG_KEY_INCREASE;
-                       
-                       break; // TODO support multiple balls?
                }
+       
+       float target = 0.5;
+       float self_pos;
+       
+       
+       if ( self.team <= 2 )
+       {
+               if ( ball )
+                       target = ball.origin_y + ball.velocity_y*think_speed;
+               self_pos = self.pong_ai_paddle.origin_y;
+       }
+       else
+       {
+               if ( ball )
+                       target = ball.origin_x + ball.velocity_x*think_speed;
+               self_pos = self.pong_ai_paddle.origin_x;
+       }
+       
+       distance = self.pong_length/2 * autocvar_sv_minigames_pong_ai_tolerance
+               + autocvar_sv_minigames_pong_paddle_speed * think_speed;
+
+       if (target < self_pos - distance)
+               self.pong_keys = PONG_KEY_DECREASE;
+       else if (target > self_pos + distance)
+               self.pong_keys = PONG_KEY_INCREASE;
+       else
+               self.pong_keys = 0;
 }
 
 entity pong_ai_spawn(entity paddle)
@@ -353,13 +363,15 @@ int pong_server_event(entity minigame, string event, ...)
                {
                        entity player = ...(0,entity);
                        entity paddle;
+                       entity ai;
                        int i;
                        for ( i = 0; i < PONG_MAX_PLAYERS; i++ )
                        {
                                paddle = minigame.pong_paddles[i];
                                if ( paddle != world && paddle.realowner == player )
                                {
-                                       pong_ai_spawn(paddle);
+                                       ai = pong_ai_spawn(paddle);
+                                       ai.pong_score = player.minigame_players.pong_score;
                                        break;
                                }
                                        
@@ -378,9 +390,14 @@ int pong_server_event(entity minigame, string event, ...)
                                                        (minigame.minigame_flags & ~PONG_STATUS_WAIT);
                                                minigame.SendFlags |= MINIG_SF_UPDATE;
                                                
-                                               entity ball = msle_spawn(minigame,"pong_ball");
-                                               ball.pong_length = autocvar_sv_minigames_pong_ball_radius;
-                                               pong_ball_reset(ball);
+                                               int i;
+                                               entity ball;
+                                               for ( i = 0; i < autocvar_sv_minigames_pong_ball_number; i++ )
+                                               {
+                                                       ball = msle_spawn(minigame,"pong_ball");
+                                                       ball.pong_length = autocvar_sv_minigames_pong_ball_radius;
+                                                       pong_ball_reset(ball);
+                                               }
                                        }
                                        return true;
                                case "+movei":
@@ -453,7 +470,7 @@ int pong_server_event(entity minigame, string event, ...)
 
 #elif defined(CSQC)
 
-#include "waypointsprites.qh" // drawrotpic
+void drawrotpic(vector org, float rot, string pic, vector sz, vector hotspot, vector rgb, float a, float f);
 
 float pong_team_to_angle(int nteam)
 {
@@ -492,14 +509,15 @@ void pong_hud_board(vector pos, vector mySize)
        {
                if ( e.classname == "pong_ball" )
                {
-                       obj_size =  minigame_hud_denormalize_size('2 2 0'*e.pong_length,pos,mySize);
+                       // Note: 4*radius = 2*diameter because the image is large enough to fit the glow around the ball
+                       obj_size =  minigame_hud_denormalize_size('4 4 0'*e.pong_length,pos,mySize);
                        obj_pos = minigame_hud_denormalize(e.origin,pos,mySize);
                        
                        minigame_drawpic_centered( obj_pos, minigame_texture("pong/ball"),
                                        obj_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
                        
                        minigame_drawpic_centered( obj_pos, minigame_texture("pong/ball-glow"),
-                                       2*obj_size, pong_team_to_color(e.team), 
+                                       obj_size, pong_team_to_color(e.team), 
                                        panel_fg_alpha, DRAWFLAG_ADDITIVE );
                }
                else if ( e.classname == "pong_paddle" )
@@ -526,7 +544,7 @@ void pong_hud_status(vector pos, vector mySize)
        vector ts;
        ts = minigame_drawstring_wrapped(mySize_x,pos,active_minigame.descriptor.message,
                hud_fontsize * 2, '0.25 0.47 0.72', panel_fg_alpha, DRAWFLAG_NORMAL,0.5);
-       
+       ts_y += hud_fontsize_y;
        pos_y += ts_y;
        mySize_y -= ts_y;
        
@@ -649,4 +667,4 @@ int pong_client_event(entity minigame, string event, ...)
 
        return false;
 }
-#endif
\ No newline at end of file
+#endif