X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fminigame%2Fttt.qc;h=e06bb46628c5366db60f07a129feaf0cc18358f7;hp=91da259b49cdcfbc59b4bfb97437e5f452f4d473;hb=c039d054a46888048d214000273ccfc63e4611b6;hpb=bb39677b24abd8ba975139e1d1c7a59a2adef1b8 diff --git a/qcsrc/common/minigames/minigame/ttt.qc b/qcsrc/common/minigames/minigame/ttt.qc index 91da259b4..e06bb4662 100644 --- a/qcsrc/common/minigames/minigame/ttt.qc +++ b/qcsrc/common/minigames/minigame/ttt.qc @@ -1,3 +1,6 @@ +#include "ttt.qh" +REGISTER_MINIGAME(ttt, "Tic Tac Toe"); + const int TTT_TURN_PLACE = 0x0100; // player has to place a piece on the board const int TTT_TURN_WIN = 0x0200; // player has won const int TTT_TURN_DRAW = 0x0400; // no moves are possible @@ -12,6 +15,10 @@ const int TTT_TURN_TEAM = 0x000f; // turn team mask const int TTT_SF_PLAYERSCORE = MINIG_SF_CUSTOM; // send minigame_player scores (won matches) const int TTT_SF_SINGLEPLAYER = MINIG_SF_CUSTOM<<1;// send minigame.ttt_ai +const int TTT_LET_CNT = 3; +const int TTT_NUM_CNT = 3; +const int TTT_TILE_SIZE = 3; + .int ttt_npieces; // (minigame) number of pieces on the board (simplifies checking a draw) .int ttt_nexteam; // (minigame) next team (used to change the starting team on following matches) .int ttt_ai; // (minigame) when non-zero, singleplayer vs AI @@ -19,11 +26,11 @@ const int TTT_SF_SINGLEPLAYER = MINIG_SF_CUSTOM<<1;// send minigame.ttt_ai // find tic tac toe piece given its tile name entity ttt_find_piece(entity minig, string tile) { - entity e = world; + entity e = NULL; while ( ( e = findentity(e,owner,minig) ) ) if ( e.classname == "minigame_board_piece" && e.netname == tile ) return e; - return world; + return NULL; } // Checks if the given piece completes a row @@ -31,29 +38,29 @@ bool ttt_winning_piece(entity piece) { int number = minigame_tile_number(piece.netname); int letter = minigame_tile_letter(piece.netname); - + if ( ttt_find_piece(piece.owner,minigame_tile_buildname(0,number)).team == piece.team ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(1,number)).team == piece.team ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(2,number)).team == piece.team ) return true; - + if ( ttt_find_piece(piece.owner,minigame_tile_buildname(letter,0)).team == piece.team ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(letter,1)).team == piece.team ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(letter,2)).team == piece.team ) return true; - + if ( number == letter ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(0,0)).team == piece.team ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(1,1)).team == piece.team ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(2,2)).team == piece.team ) return true; - + if ( number == 2-letter ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(0,2)).team == piece.team ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(1,1)).team == piece.team ) if ( ttt_find_piece(piece.owner,minigame_tile_buildname(2,0)).team == piece.team ) return true; - + return false; } @@ -64,7 +71,7 @@ bool ttt_valid_tile(string tile) return 0; int number = minigame_tile_number(tile); int letter = minigame_tile_letter(tile); - return 0 <= number && number < 3 && 0 <= letter && letter < 3; + return 0 <= number && number < TTT_NUM_CNT && 0 <= letter && letter < TTT_LET_CNT; } // make a move @@ -89,7 +96,7 @@ void ttt_move(entity minigame, entity player, string pos ) minigame_server_sendflags(player, TTT_SF_PLAYERSCORE); minigame.minigame_flags = TTT_TURN_WIN | player.team; } - else if ( minigame.ttt_npieces >= 9 ) + else if ( minigame.ttt_npieces >= (TTT_LET_CNT * TTT_NUM_CNT) ) minigame.minigame_flags = TTT_TURN_DRAW; else minigame.minigame_flags = TTT_TURN_PLACE | minigame.ttt_nexteam; @@ -114,10 +121,10 @@ void ttt_next_match(entity minigame, entity player) minigame.minigame_flags = TTT_TURN_PLACE | minigame.ttt_nexteam; minigame_server_sendflags(minigame,MINIG_SF_UPDATE); minigame.ttt_npieces = 0; - entity e = world; + entity e = NULL; while ( ( e = findentity(e,owner,minigame) ) ) if ( e.classname == "minigame_board_piece" ) - remove(e); + delete(e); } } @@ -136,19 +143,19 @@ int ttt_server_event(entity minigame, string event, ...) } case "end": { - entity e = world; + entity e = NULL; while( (e = findentity(e, owner, minigame)) ) if(e.classname == "minigame_board_piece") { if(e.netname) { strunzone(e.netname); } - remove(e); + delete(e); } return false; } case "join": { int pl_num = minigame_count_players(minigame); - + // Don't allow joining a single player match if ( (minigame.ttt_ai) && pl_num > 0 ) return false; @@ -167,8 +174,8 @@ int ttt_server_event(entity minigame, string event, ...) { switch(argv(0)) { - case "move": - ttt_move(minigame, ...(0,entity), ...(1,int) == 2 ? argv(1) : string_null ); + case "move": + ttt_move(minigame, ...(0,entity), ...(1,int) == 2 ? argv(1) : string_null ); return true; case "next": ttt_next_match(minigame,...(0,entity)); @@ -199,7 +206,7 @@ int ttt_server_event(entity minigame, string event, ...) return false; } } - + return false; } @@ -217,34 +224,34 @@ void ttt_hud_board(vector pos, vector mySize) minigame_hud_fitsqare(pos, mySize); ttt_boardpos = pos; ttt_boardsize = mySize; - + minigame_hud_simpleboard(pos,mySize,minigame_texture("ttt/board")); - vector tile_size = minigame_hud_denormalize_size('1 1 0'/3,pos,mySize); + vector tile_size = minigame_hud_denormalize_size('1 1 0'/TTT_TILE_SIZE,pos,mySize); vector tile_pos; if ( (active_minigame.minigame_flags & TTT_TURN_TEAM) == minigame_self.team ) if ( ttt_valid_tile(ttt_curr_pos) ) { - tile_pos = minigame_tile_pos(ttt_curr_pos,3,3); + tile_pos = minigame_tile_pos(ttt_curr_pos,TTT_LET_CNT,TTT_NUM_CNT); tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize); - minigame_drawpic_centered( tile_pos, + minigame_drawpic_centered( tile_pos, minigame_texture(strcat("ttt/piece",ftos(minigame_self.team))), tile_size, '1 1 1', panel_fg_alpha/2, DRAWFLAG_NORMAL ); } - + entity e; FOREACH_MINIGAME_ENTITY(e) { if ( e.classname == "minigame_board_piece" ) { - tile_pos = minigame_tile_pos(e.netname,3,3); + tile_pos = minigame_tile_pos(e.netname,TTT_LET_CNT,TTT_NUM_CNT); tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize); - + if ( active_minigame.minigame_flags & TTT_TURN_WIN ) if ( !e.ttt_checkwin ) e.ttt_checkwin = ttt_winning_piece(e) ? 1 : -1; - + float icon_color = 1; if ( e.ttt_checkwin == -1 ) icon_color = 0.4; @@ -254,8 +261,8 @@ void ttt_hud_board(vector pos, vector mySize) minigame_drawpic_centered( tile_pos, minigame_texture("ttt/winglow"), tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_ADDITIVE ); } - - minigame_drawpic_centered( tile_pos, + + minigame_drawpic_centered( tile_pos, minigame_texture(strcat("ttt/piece",ftos(e.team))), tile_size, '1 1 1'*icon_color, panel_fg_alpha, DRAWFLAG_NORMAL ); } @@ -266,14 +273,14 @@ void ttt_hud_board(vector pos, vector mySize) // Required function, draw the game status panel void ttt_hud_status(vector pos, vector mySize) { - HUD_Panel_DrawBg(1); + HUD_Panel_DrawBg(); 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); - + pos_y += ts_y; mySize_y -= ts_y; - + vector player_fontsize = hud_fontsize * 1.75; ts_y = ( mySize_y - 2*player_fontsize_y ) / 2; ts_x = mySize_x; @@ -289,16 +296,16 @@ void ttt_hud_status(vector pos, vector mySize) if ( e.team == 2 ) mypos_y += player_fontsize_y + ts_y; minigame_drawcolorcodedstring_trunc(mySize_x,mypos, - (e.minigame_playerslot ? GetPlayerName(e.minigame_playerslot-1) : _("AI")), + (e.minigame_playerslot ? entcs_GetName(e.minigame_playerslot-1) : _("AI")), player_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL); - + mypos_y += player_fontsize_y; - drawpic( mypos, + drawpic( mypos, minigame_texture(strcat("ttt/piece",ftos(e.team))), tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL ); - + mypos_x += tile_size_x; - + drawstring(mypos,ftos(e.minigame_flags),tile_size, '0.7 0.84 1', panel_fg_alpha, DRAWFLAG_NORMAL); } @@ -310,27 +317,27 @@ string ttt_turn_to_string(int turnflags) { if ( turnflags & TTT_TURN_DRAW ) return _("Draw"); - + if ( turnflags & TTT_TURN_WIN ) { if ( (turnflags&TTT_TURN_TEAM) != minigame_self.team ) return _("You lost the game!\nSelect \"^1Next Match^7\" on the menu for a rematch!"); return _("You win!\nSelect \"^1Next Match^7\" on the menu to start a new match!"); } - + if ( turnflags & TTT_TURN_NEXT ) { if ( (turnflags&TTT_TURN_TEAM) != minigame_self.team ) return _("Select \"^1Next Match^7\" on the menu to start a new match!"); return _("Wait for your opponent to confirm the rematch"); } - + if ( (turnflags & TTT_TURN_TEAM) != minigame_self.team ) return _("Wait for your opponent to make their move"); - + if ( turnflags & TTT_TURN_PLACE ) return _("Click on the game board to place your piece"); - + return ""; } @@ -355,21 +362,21 @@ string ttt_ai_piece_flag2pos(int pieceflag) return "a2"; case TTT_AI_POSFLAG_A3: return "a3"; - + case TTT_AI_POSFLAG_B1: return "b1"; case TTT_AI_POSFLAG_B2: return "b2"; case TTT_AI_POSFLAG_B3: return "b3"; - + case TTT_AI_POSFLAG_C1: return "c1"; case TTT_AI_POSFLAG_C2: return "c2"; case TTT_AI_POSFLAG_C3: return "c3"; - + default: return string_null; } @@ -385,13 +392,13 @@ int ttt_ai_1of3(int piecemask, int flag1, int flag2, int flag3) { if ( ttt_ai_checkmask(piecemask,flag1|flag2|flag3) ) return 0; - + if ( ttt_ai_checkmask(piecemask,flag1|flag2) ) return flag3; - + if ( ttt_ai_checkmask(piecemask,flag3|flag2) ) return flag1; - + if ( ttt_ai_checkmask(piecemask,flag3|flag1) ) return flag2; @@ -403,19 +410,19 @@ int ttt_ai_random(int piecemask) { if ( !piecemask ) return 0; - + int f = 1; - + RandomSelection_Init(); - + for ( int i = 0; i < 9; i++ ) { if ( piecemask & f ) - RandomSelection_Add(world, f, string_null, 1, 1); + RandomSelection_Add(NULL, f, string_null, 1, 1); f <<= 1; } - - dprint(sprintf("TTT AI: selected %x from %x\n", + + LOG_TRACE(sprintf("TTT AI: selected %x from %x", RandomSelection_chosen_float, piecemask) ); return RandomSelection_chosen_float; } @@ -424,7 +431,7 @@ int ttt_ai_random(int piecemask) int ttt_ai_block3 ( int piecemask, int piecemask_free ) { int r = 0; - + r |= ttt_ai_1of3(piecemask,TTT_AI_POSFLAG_A1,TTT_AI_POSFLAG_A2,TTT_AI_POSFLAG_A3); r |= ttt_ai_1of3(piecemask,TTT_AI_POSFLAG_B1,TTT_AI_POSFLAG_B2,TTT_AI_POSFLAG_B3); r |= ttt_ai_1of3(piecemask,TTT_AI_POSFLAG_C1,TTT_AI_POSFLAG_C2,TTT_AI_POSFLAG_C3); @@ -433,7 +440,7 @@ int ttt_ai_block3 ( int piecemask, int piecemask_free ) r |= ttt_ai_1of3(piecemask,TTT_AI_POSFLAG_A3,TTT_AI_POSFLAG_B3,TTT_AI_POSFLAG_C3); r |= ttt_ai_1of3(piecemask,TTT_AI_POSFLAG_A1,TTT_AI_POSFLAG_B2,TTT_AI_POSFLAG_C3); r |= ttt_ai_1of3(piecemask,TTT_AI_POSFLAG_A3,TTT_AI_POSFLAG_B2,TTT_AI_POSFLAG_C1); - dprint(sprintf("TTT AI: possible 3 in a rows in %x: %x (%x)\n",piecemask,r, r&piecemask_free)); + LOG_TRACE(sprintf("TTT AI: possible 3 in a rows in %x: %x (%x)",piecemask,r, r&piecemask_free)); r &= piecemask_free; return ttt_ai_random(r); } @@ -445,16 +452,16 @@ int ttt_ai_block3 ( int piecemask, int piecemask_free ) string ttt_ai_choose_simple(int piecemask_self, int piecemask_opponent, int piecemask_free ) { int move = 0; - - dprint("TTT AI: checking winning move\n"); + + LOG_TRACE("TTT AI: checking winning move"); if (( move = ttt_ai_block3(piecemask_self,piecemask_free) )) return ttt_ai_piece_flag2pos(move); // place winning move - - dprint("TTT AI: checking opponent's winning move\n"); + + LOG_TRACE("TTT AI: checking opponent's winning move"); if (( move = ttt_ai_block3(piecemask_opponent,piecemask_free) )) return ttt_ai_piece_flag2pos(move); // block opponent - - dprint("TTT AI: random move\n"); + + LOG_TRACE("TTT AI: random move"); return ttt_ai_piece_flag2pos(ttt_ai_random(piecemask_free)); } @@ -463,18 +470,18 @@ void ttt_aimove(entity minigame) { if ( minigame.minigame_flags == (TTT_TURN_PLACE|minigame.ttt_ai) ) { - entity aiplayer = world; + entity aiplayer = NULL; while ( ( aiplayer = findentity(aiplayer,owner,minigame) ) ) if ( aiplayer.classname == "minigame_player" && !aiplayer.minigame_playerslot ) break; - + /* * Build bit masks for the board pieces * .---.---.---. * | 4 | 32|256| 3 - * |---+---+---| + * |---+---+---| * | 2 | 16|128| 2 - * |---+---+---| + * |---+---+---| * | 1 | 8 | 64| 1 * '---'---'---' * A B C @@ -502,14 +509,14 @@ void ttt_aimove(entity minigame) pieceflag <<= 1; } } - + // TODO multiple AI difficulties - dprint(sprintf("TTT AI: self: %x opponent: %x free: %x\n", + LOG_TRACE(sprintf("TTT AI: self: %x opponent: %x free: %x", piecemask_self, piecemask_opponent, piecemask_free)); pos = ttt_ai_choose_simple(piecemask_self, piecemask_opponent, piecemask_free); - dprint("TTT AI: chosen move: ",pos,"\n\n"); + LOG_TRACE("TTT AI: chosen move: ", pos); if ( !pos ) - dprint("Tic Tac Toe AI has derped!\n"); + LOG_TRACE("Tic Tac Toe AI has derped!"); else ttt_move(minigame,aiplayer,pos); } @@ -562,28 +569,28 @@ int ttt_client_event(entity minigame, string event, ...) if ( ! ttt_curr_pos ) ttt_set_curr_pos("a3"); else - ttt_set_curr_pos(minigame_relative_tile(ttt_curr_pos,1,0,3,3)); + ttt_set_curr_pos(minigame_relative_tile(ttt_curr_pos,1,0,TTT_LET_CNT,TTT_NUM_CNT)); return true; case K_LEFTARROW: case K_KP_LEFTARROW: if ( ! ttt_curr_pos ) ttt_set_curr_pos("c3"); else - ttt_set_curr_pos(minigame_relative_tile(ttt_curr_pos,-1,0,3,3)); + ttt_set_curr_pos(minigame_relative_tile(ttt_curr_pos,-1,0,TTT_LET_CNT,TTT_NUM_CNT)); return true; case K_UPARROW: case K_KP_UPARROW: if ( ! ttt_curr_pos ) ttt_set_curr_pos("a1"); else - ttt_set_curr_pos(minigame_relative_tile(ttt_curr_pos,0,1,3,3)); + ttt_set_curr_pos(minigame_relative_tile(ttt_curr_pos,0,1,TTT_LET_CNT,TTT_NUM_CNT)); return true; case K_DOWNARROW: case K_KP_DOWNARROW: if ( ! ttt_curr_pos ) ttt_set_curr_pos("a3"); else - ttt_set_curr_pos(minigame_relative_tile(ttt_curr_pos,0,-1,3,3)); + ttt_set_curr_pos(minigame_relative_tile(ttt_curr_pos,0,-1,TTT_LET_CNT,TTT_NUM_CNT)); return true; case K_ENTER: case K_KP_ENTER: @@ -609,7 +616,7 @@ int ttt_client_event(entity minigame, string event, ...) { vector mouse_pos = minigame_hud_normalize(mousepos,ttt_boardpos,ttt_boardsize); if ( minigame.minigame_flags == (TTT_TURN_PLACE|minigame_self.team) ) - ttt_set_curr_pos(minigame_tile_name(mouse_pos,3,3)); + ttt_set_curr_pos(minigame_tile_name(mouse_pos,TTT_LET_CNT,TTT_NUM_CNT)); if ( ! ttt_valid_tile(ttt_curr_pos) ) ttt_set_curr_pos(""); @@ -627,24 +634,23 @@ int ttt_client_event(entity minigame, string event, ...) if ( sent.minigame_flags & minigame_self.team ) minigame_prompt(); } - + if ( (sf & TTT_SF_SINGLEPLAYER) ) { int ai = ReadByte(); bool spawnai = ai && !sent.ttt_ai; sent.ttt_ai = ai; - + if ( spawnai ) { - entity aiplayer = spawn(); - aiplayer.classname = "minigame_player"; + entity aiplayer = new(minigame_player); aiplayer.owner = minigame; aiplayer.team = ai; aiplayer.minigame_playerslot = 0; aiplayer.minigame_autoclean = 1; ttt_aimove(minigame); } - + } } else if ( sent.classname == "minigame_player" && (sf & TTT_SF_PLAYERSCORE ) ) @@ -684,4 +690,4 @@ int ttt_client_event(entity minigame, string event, ...) return false; } -#endif \ No newline at end of file +#endif