#include "bd.qh"
-REGISTER_MINIGAME(bd, "Bulldozer");
+REGISTER_MINIGAME(bd, _("Bulldozer"));
REGISTER_NET_LINKED(ENT_CLIENT_BD_CONTROLLER)
const int BD_TILE_SIZE = 20;
const int BD_TEAMS = 1;
+const int BD_SPECTATOR_TEAM = 255; // must be above max teams and equal to or below 255
.int bd_dir;
}
else
{
- entity piece = msle_spawn(minigame,"minigame_board_piece");
+ entity piece = msle_spawn(minigame,new(minigame_board_piece));
piece.team = 1;
piece.netname = strzone(pos);
piece.bd_tiletype = thetile;
}
else
{
- entity e = msle_spawn(minigame,"minigame_board_piece");
+ entity e = msle_spawn(minigame,new(minigame_board_piece));
e.netname = tilename;
e.team = 1;
e.bd_dir = dir;
int target_count = 0, boulder_count = 0;
entity piece = NULL;
while((piece = findentity(piece,owner,minigame)))
- if(piece.classname == "minigame_board_piece")
- if(piece.bd_tiletype == BD_TILE_BOULDER)
- ++boulder_count;
- else if(piece.bd_tiletype == BD_TILE_TARGET)
- ++target_count;
+ if(piece.classname == "minigame_board_piece")
+ {
+ if(piece.bd_tiletype == BD_TILE_BOULDER)
+ ++boulder_count;
+ else if(piece.bd_tiletype == BD_TILE_TARGET)
+ ++target_count;
+ }
if(boulder_count != target_count)
{
{
int pl_num = minigame_count_players(minigame);
- if(pl_num >= BD_TEAMS) { return false; }
+ if(pl_num >= BD_TEAMS) { return BD_SPECTATOR_TEAM; }
return 1;
}
case "cmd":
{
+ entity player = ...(0,entity);
+ bool event_blocked = (player.team == BD_SPECTATOR_TEAM);
switch(argv(0))
{
case "move":
+ if(event_blocked)
+ return true;
bd_do_move(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null), ((...(1,int)) >= 4 ? argv(3) : string_null));
return true;
case "next":
+ if(event_blocked)
+ return true;
bd_next_match(minigame,...(0,entity), ((...(1,int) >= 2 ? argv(1) : string_null)));
return true;
case "restart":
+ if(event_blocked)
+ return true;
bd_restart_match(minigame,...(0,entity));
return true;
case "edit":
+ if(event_blocked)
+ return true;
bd_activate_editor(minigame,...(0,entity));
return true;
case "save":
+ if(event_blocked)
+ return true;
bd_close_editor(minigame,...(0,entity));
return true;
case "fill":
+ if(event_blocked)
+ return true;
bd_do_fill(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null));
return true;
}
if ( (active_minigame.minigame_flags & BD_TURN_LOSS) || (active_minigame.minigame_flags & BD_TURN_WIN) )
{
vector winfs = hud_fontsize*2;
- string victory_text = "Game over!";
+ string victory_text = _("Game over!");
if(active_minigame.minigame_flags & BD_TURN_WIN)
- victory_text = "Well done! Click 'Next Level' to continue";
+ victory_text = _("Well done! Click 'Next Level' to continue");
vector win_pos = pos+eY*(mySize_y-winfs_y)/2;
vector win_sz;
win_sz = minigame_drawcolorcodedstring_wrapped(mySize_x,win_pos,
- sprintf("%s", victory_text),
- winfs, 0, DRAWFLAG_NORMAL, 0.5);
+ victory_text, winfs, 0, DRAWFLAG_NORMAL, 0.5);
drawfill(win_pos-eY*hud_fontsize_y,win_sz+2*eY*hud_fontsize_y,'0.3 0.3 1',0.8,DRAWFLAG_ADDITIVE);
minigame_drawcolorcodedstring_wrapped(mySize_x,win_pos,
- sprintf("%s", victory_text),
- winfs, panel_fg_alpha, DRAWFLAG_NORMAL, 0.5);
+ victory_text, winfs, panel_fg_alpha, DRAWFLAG_NORMAL, 0.5);
}
}
vector mypos;
vector tile_size = '48 48 0';
- mypos = pos;
- drawfill(mypos,eX*mySize_x+eY*player_fontsize_y,'1 1 1',0.5,DRAWFLAG_ADDITIVE);
- mypos_y += player_fontsize_y;
- drawfill(mypos,eX*mySize_x+eY*tile_size_y,'1 1 1',0.25,DRAWFLAG_ADDITIVE);
+ if(minigame_self.team != BD_SPECTATOR_TEAM)
+ {
+ mypos = pos;
+ drawfill(mypos,eX*mySize_x+eY*player_fontsize_y,'1 1 1',0.5,DRAWFLAG_ADDITIVE);
+ mypos_y += player_fontsize_y;
+ drawfill(mypos,eX*mySize_x+eY*tile_size_y,'1 1 1',0.25,DRAWFLAG_ADDITIVE);
+ }
entity e;
FOREACH_MINIGAME_ENTITY(e)
{
- if ( e.classname == "minigame_player" )
+ if ( e.classname == "minigame_player" && e.team != BD_SPECTATOR_TEAM )
{
mypos = pos;
minigame_drawcolorcodedstring_trunc(mySize_x,mypos,
string thepiece = "bd/dozer";
if(active_minigame.minigame_flags & BD_TURN_EDIT)
thepiece = bd_get_tile_pic(bd_curr_tile);
- drawpic( mypos,
+ const float tile_scale = 0.7;
+ drawpic( mypos + tile_size * 0.5 * (1 - tile_scale),
minigame_texture(thepiece),
- tile_size * 0.7, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
+ tile_size * tile_scale, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
mypos_x += tile_size_x;
// Turn a set of flags into a help message
string bd_turn_to_string(int turnflags)
{
+ if(minigame_self.team == BD_SPECTATOR_TEAM)
+ return _("You are spectating");
+
if ( turnflags & BD_TURN_LOSS )
return _("Better luck next time!");
if ( turnflags & BD_TURN_WIN )
+ {
if(random() > 0.5)
return _("Tubular! Press \"Next Level\" to continue!");
else
return _("Wicked! Press \"Next Level\" to continue!");
+ }
if( turnflags & BD_TURN_EDIT )
return _("Press the space bar to change your currently selected tile");
bd_curr_pos = s;
}
-bool bd_normal_move(entity minigame, int themove)
-{
- switch ( themove )
- {
- case K_RIGHTARROW:
- case K_KP_RIGHTARROW:
- bd_make_move(minigame, "r");
- return true;
- case K_LEFTARROW:
- case K_KP_LEFTARROW:
- bd_make_move(minigame, "l");
- return true;
- case K_UPARROW:
- case K_KP_UPARROW:
- bd_make_move(minigame, "u");
- return true;
- case K_DOWNARROW:
- case K_KP_DOWNARROW:
- bd_make_move(minigame, "d");
- return true;
- }
-
- return false;
-}
-
bool bd_change_dozer_angle(entity minigame)
{
entity dozer = bd_find_piece(minigame, bd_curr_pos, false);
return true;
}
-bool bd_editor_move(entity minigame, int themove)
-{
- switch ( themove )
- {
- case K_RIGHTARROW:
- case K_KP_RIGHTARROW:
- if ( ! bd_curr_pos )
- bd_set_curr_pos("a3");
- else
- bd_set_curr_pos(minigame_relative_tile(bd_curr_pos,1,0,BD_NUM_CNT,BD_LET_CNT));
- return true;
- case K_LEFTARROW:
- case K_KP_LEFTARROW:
- if ( ! bd_curr_pos )
- bd_set_curr_pos("c3");
- else
- bd_set_curr_pos(minigame_relative_tile(bd_curr_pos,-1,0,BD_NUM_CNT,BD_LET_CNT));
- return true;
- case K_UPARROW:
- case K_KP_UPARROW:
- if ( ! bd_curr_pos )
- bd_set_curr_pos("a1");
- else
- bd_set_curr_pos(minigame_relative_tile(bd_curr_pos,0,1,BD_NUM_CNT,BD_LET_CNT));
- return true;
- case K_DOWNARROW:
- case K_KP_DOWNARROW:
- if ( ! bd_curr_pos )
- bd_set_curr_pos("a3");
- else
- bd_set_curr_pos(minigame_relative_tile(bd_curr_pos,0,-1,BD_NUM_CNT,BD_LET_CNT));
- return true;
- case K_ENTER:
- case K_KP_ENTER:
- bd_editor_make_move(minigame, "");
- return true;
- case K_SPACE:
- if(bd_change_dozer_angle(minigame))
- return true;
- bd_curr_tile += 1;
- if(bd_curr_tile > BD_TILE_LAST)
- bd_curr_tile = 1;
- return true;
- }
-
- return false;
-}
-
// Required function, handle client events
int bd_client_event(entity minigame, string event, ...)
{
{
case "activate":
{
- minigame.message = bd_turn_to_string(minigame.minigame_flags);
+ strcpy(minigame.message, bd_turn_to_string(minigame.minigame_flags));
bd_set_curr_pos("");
bd_curr_tile = BD_TILE_BRICK1;
return false;
}
+ case "deactivate":
+ {
+ strfree(minigame.message);
+ return false;
+ }
case "key_pressed":
+ case "key_released":
{
- if(minigame.minigame_flags & BD_TURN_MOVE)
+ bool event_blocked = ((event == "key_released")
+ || !(minigame.minigame_flags & BD_TURN_MOVE) || (minigame_self.team == BD_SPECTATOR_TEAM));
+ if (!(minigame.minigame_flags & BD_TURN_WIN) && !(minigame.minigame_flags & BD_TURN_LOSS))
{
- if(bd_normal_move(minigame, ...(0,int)))
- return true;
+ switch ( ...(0,int) )
+ {
+ case K_RIGHTARROW:
+ case K_KP_RIGHTARROW:
+ if (event_blocked)
+ return true;
+ bd_make_move(minigame, "r");
+ return true;
+ case K_LEFTARROW:
+ case K_KP_LEFTARROW:
+ if (event_blocked)
+ return true;
+ bd_make_move(minigame, "l");
+ return true;
+ case K_UPARROW:
+ case K_KP_UPARROW:
+ if (event_blocked)
+ return true;
+ bd_make_move(minigame, "u");
+ return true;
+ case K_DOWNARROW:
+ case K_KP_DOWNARROW:
+ if (event_blocked)
+ return true;
+ bd_make_move(minigame, "d");
+ return true;
+ }
}
if(minigame.minigame_flags & BD_TURN_EDIT)
{
- if(bd_editor_move(minigame, ...(0,int)))
- return true;
+ switch ( ...(0,int) )
+ {
+ case K_RIGHTARROW:
+ case K_KP_RIGHTARROW:
+ if (event_blocked)
+ return true;
+ if ( ! bd_curr_pos )
+ bd_set_curr_pos("a3");
+ else
+ bd_set_curr_pos(minigame_relative_tile(bd_curr_pos,1,0,BD_NUM_CNT,BD_LET_CNT));
+ return true;
+ case K_LEFTARROW:
+ case K_KP_LEFTARROW:
+ if (event_blocked)
+ return true;
+ if ( ! bd_curr_pos )
+ bd_set_curr_pos("c3");
+ else
+ bd_set_curr_pos(minigame_relative_tile(bd_curr_pos,-1,0,BD_NUM_CNT,BD_LET_CNT));
+ return true;
+ case K_UPARROW:
+ case K_KP_UPARROW:
+ if (event_blocked)
+ return true;
+ if ( ! bd_curr_pos )
+ bd_set_curr_pos("a1");
+ else
+ bd_set_curr_pos(minigame_relative_tile(bd_curr_pos,0,1,BD_NUM_CNT,BD_LET_CNT));
+ return true;
+ case K_DOWNARROW:
+ case K_KP_DOWNARROW:
+ if (event_blocked)
+ return true;
+ if ( ! bd_curr_pos )
+ bd_set_curr_pos("a3");
+ else
+ bd_set_curr_pos(minigame_relative_tile(bd_curr_pos,0,-1,BD_NUM_CNT,BD_LET_CNT));
+ return true;
+ case K_ENTER:
+ case K_KP_ENTER:
+ if (event_blocked)
+ return true;
+ bd_editor_make_move(minigame, "");
+ return true;
+ case K_SPACE:
+ if (event_blocked)
+ return true;
+ if(bd_change_dozer_angle(minigame))
+ return true;
+ bd_curr_tile += 1;
+ if(bd_curr_tile > BD_TILE_LAST)
+ bd_curr_tile = 1;
+ return true;
+ }
}
return false;
}
case "mouse_pressed":
{
- if(minigame.minigame_flags & BD_TURN_EDIT)
+ if((minigame.minigame_flags & BD_TURN_EDIT) && minigame_self.team != BD_SPECTATOR_TEAM)
{
if(...(0,int) == K_MOUSE1)
{
+ bd_client_event(minigame, "mouse_moved");
bd_editor_make_move(minigame, "");
return true;
}
if(...(0,int) == K_MOUSE2)
{
+ bd_client_event(minigame, "mouse_moved");
bd_editor_fill(minigame);
return true;
}
}
case "mouse_moved":
{
- if(minigame.minigame_flags & BD_TURN_EDIT)
+ if((minigame.minigame_flags & BD_TURN_EDIT) && minigame_self.team != BD_SPECTATOR_TEAM)
{
vector mouse_pos = minigame_hud_normalize(mousepos,bd_boardpos,bd_boardsize);
bd_set_curr_pos(minigame_tile_name(mouse_pos,BD_LET_CNT,BD_NUM_CNT));
{
if ( sf & MINIG_SF_UPDATE )
{
- sent.message = bd_turn_to_string(sent.minigame_flags);
+ strcpy(sent.message, bd_turn_to_string(sent.minigame_flags));
//if ( sent.minigame_flags & minigame_self.team )
- minigame_prompt();
+ //minigame_prompt();
}
}
else if(sent.classname == "minigame_board_piece")
projects / xonotic / xonotic-data.pk3dir.git / blobdiff