+#include "bd.qh"
REGISTER_MINIGAME(bd, "Bulldozer");
const int BD_TURN_MOVE = 0x0100; // player must move the bulldozer
const int BD_TILE_BRICK1 = 4;
const int BD_TILE_BRICK2 = 5;
const int BD_TILE_BRICK3 = 6;
-const int BD_TILE_LAST = 6;
+const int BD_TILE_BRICK4 = 7;
+const int BD_TILE_BRICK5 = 8;
+const int BD_TILE_BRICK6 = 9;
+const int BD_TILE_BRICK7 = 10;
+const int BD_TILE_BRICK8 = 11;
+const int BD_TILE_LAST = 11;
string autocvar_sv_minigames_bulldozer_startlevel = "level1";
// find same game piece given its tile name
entity bd_find_piece(entity minig, string tile, bool check_target)
{
- entity e = world;
+ entity e = NULL;
while ( ( e = findentity(e,owner,minig) ) )
if ( e.classname == "minigame_board_piece" && e.netname == tile && ((check_target) ? e.bd_tiletype == BD_TILE_TARGET : e.bd_tiletype != BD_TILE_TARGET) )
return e;
- return world;
+ return NULL;
}
// check if the tile name is valid (15x15 grid)
entity bd_find_dozer(entity minig)
{
- entity e = world;
+ entity e = NULL;
while ( ( e = findentity(e,owner,minig) ) )
if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_DOZER )
return e;
- return world;
+ return NULL;
}
void bd_check_winner(entity minig)
{
int total = 0, valid = 0;
- entity e = world;
+ entity e = NULL;
while ( ( e = findentity(e,owner,minig) ) )
if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_TARGET )
{
{
switch(ttype)
{
- case BD_TILE_BRICK1:
+ case BD_TILE_BRICK8:
+ case BD_TILE_BRICK7:
+ case BD_TILE_BRICK6:
+ case BD_TILE_BRICK5:
+ case BD_TILE_BRICK4:
+ case BD_TILE_BRICK3:
case BD_TILE_BRICK2:
- case BD_TILE_BRICK3: return true;
+ case BD_TILE_BRICK1: return true;
}
return false;
switch(hit.bd_tiletype)
{
case BD_TILE_DOZER: // wtf, but let's do this incase
- case BD_TILE_BRICK1:
+ case BD_TILE_BRICK8:
+ case BD_TILE_BRICK7:
+ case BD_TILE_BRICK6:
+ case BD_TILE_BRICK5:
+ case BD_TILE_BRICK4:
+ case BD_TILE_BRICK3:
case BD_TILE_BRICK2:
- case BD_TILE_BRICK3: return false;
+ case BD_TILE_BRICK1: return false;
case BD_TILE_BOULDER:
{
string testpos;
{
if ( minigame.minigame_flags & BD_TURN_MOVE )
if ( dir )
- if(bd_valid_tile(dir))
{
//if ( bd_valid_tile(pos) )
//if ( bd_find_piece(minigame, pos, false) )
int dx = bound(-1, dxs, 1);
int dy = bound(-1, dys, 1);
- dozer.bd_dir_x = dx;
- dozer.bd_dir_y = dy;
- dozer.bd_dir_z = 0;
+ int moved = 0;
+ entity e = NULL;
+ while ( ( e = findentity(e,owner,minigame) ) )
+ if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_DOZER )
+ {
+ e.bd_dir_x = dx;
+ e.bd_dir_y = dy;
+ e.bd_dir_z = 0;
+
+ if(bd_move_dozer(minigame, e))
+ ++moved;
+
+ minigame_server_sendflags(e,MINIG_SF_UPDATE); // update anyway
+ }
- if(bd_move_dozer(minigame, dozer))
+ if(moved)
player.bd_moves++;
bd_check_winner(minigame);
- minigame_server_sendflags(dozer,MINIG_SF_UPDATE); // update anyway
- minigame_server_sendflags(player, BD_SF_PLAYERMOVES);
+ minigame_server_sendflags(player,BD_SF_PLAYERMOVES);
minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
}
}
}
// editor
-void bd_editor_place(entity minigame, entity player, string pos, int thetile)
+void bd_editor_place(entity minigame, entity player, string pos, int thetile, string thedir)
{
if ( minigame.minigame_flags & BD_TURN_EDIT )
if ( pos && thetile )
{
if ( bd_valid_tile(pos) )
{
- bool exists = ( bd_find_piece(minigame, pos, false) || bd_find_piece(minigame, pos, true) );
+ entity found_piece = bd_find_piece(minigame, pos, false);
+ entity targ = bd_find_piece(minigame, pos, true);
- entity dozer = bd_find_dozer(minigame);
- if(dozer && thetile == BD_TILE_DOZER && pos != dozer.netname)
- return; // nice try
+ if(found_piece.bd_tiletype == BD_TILE_DOZER && thedir != "")
+ {
+ int dxs = 0, dys = 0;
+ string newdir = strtolower(thedir);
+ if(newdir == "up" || newdir == "u") { dxs = 0; dys = 1; }
+ if(newdir == "down" || newdir == "dn" || newdir == "d") { dxs = 0; dys = -1; }
+ if(newdir == "left" || newdir == "lt" || newdir == "l") { dxs = -1; dys = 0; }
+ if(newdir == "right" || newdir == "rt" || newdir == "r") { dxs = 1; dys = 0; }
+
+ int dx = bound(-1, dxs, 1);
+ int dy = bound(-1, dys, 1);
+
+ found_piece.bd_dir_x = dx;
+ found_piece.bd_dir_y = dy;
+ found_piece.bd_dir_z = 0;
+ minigame_server_sendflags(found_piece,MINIG_SF_UPDATE); // update anyway
+ return;
+ }
- if(exists)
+ //entity dozer = bd_find_dozer(minigame);
+ //if(dozer && thetile == BD_TILE_DOZER && pos != dozer.netname)
+ //return; // nice try
+
+ if(found_piece || (targ && thetile != BD_TILE_BOULDER))
{
entity piece = bd_find_piece(minigame, pos, false);
if(!piece) piece = bd_find_piece(minigame, pos, true);
return; // how?!
if(piece.netname) { strunzone(piece.netname); }
- remove(piece);
+ delete(piece);
minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
return;
}
piece.team = 1;
piece.netname = strzone(pos);
piece.bd_tiletype = thetile;
+ piece.bd_dir = '0 -1 0';
minigame_server_sendflags(piece,MINIG_SF_UPDATE);
minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
}
}
-void bd_do_move(entity minigame, entity player, string dir, string thetile)
+void bd_do_move(entity minigame, entity player, string dir, string thetile, string thedir)
{
if(minigame.minigame_flags & BD_TURN_MOVE)
bd_move(minigame, player, dir);
if(minigame.minigame_flags & BD_TURN_EDIT)
- bd_editor_place(minigame, player, dir, stof(thetile));
+ bd_editor_place(minigame, player, dir, stof(thetile), thedir);
}
void bd_fill_recurse(entity minigame, entity player, int thetype, int letter, int number)
if(bd_find_piece(minigame, pos, false) || bd_find_piece(minigame, pos, true))
return;
- bd_editor_place(minigame, player, pos, thetype);
+ bd_editor_place(minigame, player, pos, thetype, "");
bd_fill_recurse(minigame, player, thetype, letter - 1, number);
bd_fill_recurse(minigame, player, thetype, letter + 1, number);
bd_fill_recurse(minigame, player, thetype, letter, number + 1);
}
+void bd_unfill_recurse(entity minigame, entity player, int thetype, int letter, int number)
+{
+ string pos = minigame_tile_buildname(letter,number);
+ if(!bd_valid_tile(pos))
+ return;
+
+ entity targ = bd_find_piece(minigame, pos, true);
+ entity piece = bd_find_piece(minigame, pos, false);
+
+ if(targ && thetype == targ.bd_tiletype)
+ {
+ if(targ.netname) { strunzone(targ.netname); }
+ delete(targ);
+ }
+ else if(piece && thetype == piece.bd_tiletype)
+ {
+ if(piece.netname) { strunzone(piece.netname); }
+ delete(piece);
+ }
+ else return;
+
+ bd_unfill_recurse(minigame, player, thetype, letter - 1, number);
+ bd_unfill_recurse(minigame, player, thetype, letter + 1, number);
+ bd_unfill_recurse(minigame, player, thetype, letter, number - 1);
+ bd_unfill_recurse(minigame, player, thetype, letter, number + 1);
+}
+
void bd_do_fill(entity minigame, entity player, string dir, string thetile)
{
+#ifdef SVQC
+ if(!player.minigame_players.bd_canedit)
+ {
+ sprint(player.minigame_players, "You're not allowed to edit levels, sorry!\n");
+ return;
+ }
+#endif
+
if(minigame.minigame_flags & BD_TURN_EDIT)
{
int thetype = stof(thetile);
- if(!bd_canfill(thetype))
+ entity targ = bd_find_piece(minigame, dir, true);
+ entity piece = bd_find_piece(minigame, dir, false);
+
+ if(!bd_canfill(thetype) || (piece || targ))
+ {
+ int killtype = 0;
+
+ if(targ) { killtype = targ.bd_tiletype; }
+ if(piece) { killtype = piece.bd_tiletype; }
+
+ if(killtype)
+ {
+ int letter = minigame_tile_letter(dir);
+ int number = minigame_tile_number(dir);
+ bd_unfill_recurse(minigame, player, killtype, letter, number);
+ }
+
return;
+ }
int letter = minigame_tile_letter(dir);
int number = minigame_tile_number(dir);
#ifdef SVQC
for(e = minigame.minigame_players; e; e = e.list_next)
#elif defined(CSQC)
- e = world;
+ e = NULL;
while( (e = findentity(e,owner,minigame)) )
if ( e.classname == "minigame_player" )
#endif
void bd_load_level(entity minigame);
void bd_setup_pieces(entity minigame)
{
- 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);
}
bd_load_level(minigame);
bd_string = strcat(bd_string, "\"", e.netname, "\" ");
bd_string = strcat(bd_string, ftos(e.bd_tiletype), " ");
- bd_string = strcat(bd_string, sprintf("\"%.9v\"", e.bd_dir), " ");
- bd_string = strcat(bd_string, "; ");
+ bd_string = strcat(bd_string, sprintf("\"%.9v\"", e.bd_dir));
return bd_string;
}
void bd_set_nextlevel(entity minigame, string s)
{
- string blah = substring(s, 11, strlen(s));
+ tokenize_console(s);
if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); }
- minigame.bd_nextlevel = strzone(blah);
+ minigame.bd_nextlevel = strzone(argv(2));
}
entity bd_load_piece(entity minigame, string s)
{
// separate pieces between the ; symbols
- tokenizebyseparator(s, "; ");
- string bd_string = argv(0);
+ string bd_string = s;
tokenize_console(bd_string);
entity e = msle_spawn(minigame,"minigame_board_piece");
e.team = 1;
+ e.bd_dir = '0 -1 0';
int argv_num = 0;
e.netname = strzone(argv(argv_num)); ++argv_num;
{
if(minigame.bd_levelname && minigame.bd_levelname != "")
{
+ 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(boulder_count != target_count)
+ {
+ LOG_INFO("Not enough targets or boulders, fix your level!\n");
+ return false;
+ }
+
// saves all objects to the database file
string file_name;
float file_get;
file_get = fopen(file_name, FILE_WRITE);
fputs(file_get, strcat("// bulldozer storage \"", minigame.bd_levelname, "\" last updated ", strftime(true, "%d-%m-%Y %H:%M:%S"), "\n"));
- if(minigame.bd_nextlevel && minigame.bd_nextlevel != "" && fexists(strcat("minigames/bulldozer/storage_", minigame.bd_levelname, ".txt")))
- fputs(file_get, strcat("nextlevel=", minigame.bd_nextlevel, "\n"));
+ if(minigame.bd_nextlevel && minigame.bd_nextlevel != "" && fexists(strcat("minigames/bulldozer/storage_", minigame.bd_nextlevel, ".txt")))
+ fputs(file_get, strcat("nextlevel = \"", minigame.bd_nextlevel, "\"\n"));
- entity e = world;
+ entity e = NULL;
while ( ( e = findentity(e,owner,minigame) ) )
if ( e.classname == "minigame_board_piece" )
{
continue;
if(substring(file_read, 0, 1) == "#")
continue;
- if(substring(file_read, 0, 10) == "nextlevel=")
+ if(substring(file_read, 0, 9) == "nextlevel")
{
bd_set_nextlevel(minigame, file_read);
continue;
fclose(file_get);
}
-void bd_close_editor(entity minigame)
+void bd_close_editor(entity minigame, entity player)
{
+#ifdef SVQC
+ if(!player.minigame_players.bd_canedit)
+ {
+ sprint(player.minigame_players, "You're not allowed to edit levels, sorry!\n");
+ return;
+ }
+#endif
+
entity dozer = bd_find_dozer(minigame);
if(!dozer)
{
minigame.bd_levelname = strzone(autocvar_sv_minigames_bulldozer_startlevel);
bd_setup_pieces(minigame);
minigame.minigame_flags = BD_TURN_MOVE;
-
+
return true;
}
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);
}
if(minigame.bd_nextlevel) { strunzone(minigame.bd_nextlevel); }
switch(argv(0))
{
case "move":
- bd_do_move(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null));
+ 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":
bd_next_match(minigame,...(0,entity), ((...(1,int) >= 2 ? argv(1) : string_null)));
bd_activate_editor(minigame,...(0,entity));
return true;
case "save":
- bd_close_editor(minigame);
+ bd_close_editor(minigame,...(0,entity));
return true;
case "fill":
- bd_do_fill(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null));
+ bd_do_fill(minigame, ...(0,entity), ((...(1,int)) >= 2 ? argv(1) : string_null), ((...(1,int)) >= 3 ? argv(2) : string_null));
return true;
}
return false;
}
}
-
+
return false;
}
int bd_curr_tile;
string bd_curr_pos;
+.entity bd_enemy;
+.bool bd_hide;
+
vector bd_boardpos; // HUD board position
vector bd_boardsize;// HUD board size
case BD_TILE_BRICK1: return "bd/brick1";
case BD_TILE_BRICK2: return "bd/brick2";
case BD_TILE_BRICK3: return "bd/brick3";
+ case BD_TILE_BRICK4: return "bd/brick4";
+ case BD_TILE_BRICK5: return "bd/brick5";
+ case BD_TILE_BRICK6: return "bd/brick6";
+ case BD_TILE_BRICK7: return "bd/brick7";
+ case BD_TILE_BRICK8: return "bd/brick8";
case BD_TILE_TARGET: return "bd/target";
case BD_TILE_DOZER: return "bd/dozer";
}
minigame_hud_fitsqare(pos, mySize);
bd_boardpos = pos;
bd_boardsize = mySize;
-
+
minigame_hud_simpleboard(pos,mySize,minigame_texture("bd/board"));
vector tile_size = minigame_hud_denormalize_size('1 1 0' / BD_TILE_SIZE,pos,mySize);
entity e;
FOREACH_MINIGAME_ENTITY(e)
{
- if ( e.classname == "minigame_board_piece" && e.bd_tiletype != BD_TILE_TARGET && e.bd_tiletype != BD_TILE_DOZER )
+ if(e.classname == "minigame_board_piece")
{
- tile_pos = minigame_tile_pos(e.netname,BD_NUM_CNT,BD_LET_CNT);
- tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
-
- string thepiece = "bd/brick1";
- switch(e.bd_tiletype)
+ if(e.bd_tiletype == BD_TILE_TARGET)
{
- case BD_TILE_BOULDER: thepiece = "bd/boulder"; break;
- case BD_TILE_BRICK2: thepiece = "bd/brick2"; break;
- case BD_TILE_BRICK3: thepiece = "bd/brick3"; break;
+ e.bd_enemy = NULL;
+ e.bd_enemy = bd_find_piece(active_minigame, e.netname, false);
+ }
+ else if(e.bd_tiletype == BD_TILE_BOULDER)
+ {
+ e.bd_hide = false; // reset either way
+ e.bd_hide = ((bd_find_piece(active_minigame, e.netname, true)) != NULL);
}
-
- minigame_drawpic_centered( tile_pos,
- minigame_texture(thepiece),
- tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
- }
-
- if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_TARGET && e.bd_tiletype != BD_TILE_DOZER )
- {
- tile_pos = minigame_tile_pos(e.netname,BD_NUM_CNT,BD_LET_CNT);
- tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
-
- minigame_drawpic_centered( tile_pos,
- minigame_texture("bd/target"),
- tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
- }
-
- if ( e.classname == "minigame_board_piece" && e.bd_tiletype != BD_TILE_TARGET && e.bd_tiletype == BD_TILE_DOZER )
- {
- tile_pos = minigame_tile_pos(e.netname,BD_NUM_CNT,BD_LET_CNT);
- tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
-
- vector thedir = e.bd_dir;
- float theang = 0;
-
- if(thedir_y == -1) { theang = M_PI; }
- if(thedir_x == 1) { theang = M_PI/2; }
- if(thedir_x == -1) { theang = M_PI*3/2; }
-
- drawrotpic(tile_pos, theang, minigame_texture("bd/dozer"),
- tile_size, tile_size/2, '1 1 1',
- panel_fg_alpha, DRAWFLAG_NORMAL );
}
}
-
FOREACH_MINIGAME_ENTITY(e)
{
- if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_TARGET )
+ if ( e.classname == "minigame_board_piece" )
{
- tile_pos = minigame_tile_pos(e.netname,BD_NUM_CNT,BD_LET_CNT);
- tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
+ if(e.bd_tiletype != BD_TILE_DOZER && !e.bd_hide) // hide boulders
+ {
+ tile_pos = minigame_tile_pos(e.netname,BD_NUM_CNT,BD_LET_CNT);
+ tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
+
+ string thepiece = bd_get_tile_pic(e.bd_tiletype);
+
+ if(e.bd_enemy)
+ thepiece = "bd/boulder_target";
- minigame_drawpic_centered( tile_pos,
- minigame_texture("bd/target"),
- tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
+ minigame_drawpic_centered( tile_pos,
+ minigame_texture(thepiece),
+ tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
+ }
}
}
+ // draw dozers on top, always
FOREACH_MINIGAME_ENTITY(e)
{
if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_DOZER )
if(active_minigame.minigame_flags & BD_TURN_EDIT)
if(bd_valid_tile(bd_curr_pos))
{
- bool exists = (bd_find_piece(active_minigame, bd_curr_pos, false) || bd_find_piece(active_minigame, bd_curr_pos, true));
- string thepiece = ((exists) ? "bd/delete" : bd_get_tile_pic(bd_curr_tile));
+ entity piece = bd_find_piece(active_minigame, bd_curr_pos, false);
+ entity targ = bd_find_piece(active_minigame, bd_curr_pos, true);
+ string thepiece = ((piece || (targ && bd_curr_tile != BD_TILE_BOULDER)) ? "bd/delete" : bd_get_tile_pic(bd_curr_tile));
tile_pos = minigame_tile_pos(bd_curr_pos,BD_LET_CNT,BD_NUM_CNT);
tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
- minigame_drawpic_centered( tile_pos,
- minigame_texture(thepiece),
- tile_size, '1 1 1', panel_fg_alpha/2, DRAWFLAG_NORMAL );
+ if(bd_curr_tile == BD_TILE_DOZER)
+ {
+ drawrotpic(tile_pos, M_PI, minigame_texture("bd/dozer"),
+ tile_size, tile_size/2, '1 1 1',
+ panel_fg_alpha/2, DRAWFLAG_NORMAL );
+ }
+ else
+ {
+ minigame_drawpic_centered( tile_pos,
+ minigame_texture(thepiece),
+ tile_size, '1 1 1', panel_fg_alpha/2, DRAWFLAG_NORMAL );
+ }
}
if ( (active_minigame.minigame_flags & BD_TURN_LOSS) || (active_minigame.minigame_flags & BD_TURN_WIN) )
string victory_text = "Game over!";
if(active_minigame.minigame_flags & BD_TURN_WIN)
- victory_text = "You win!";
-
+ 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),
+ sprintf("%s", 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),
+ sprintf("%s", victory_text),
winfs, panel_fg_alpha, DRAWFLAG_NORMAL, 0.5);
}
}
// Required function, draw the game status panel
void bd_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);
{
mypos = pos;
minigame_drawcolorcodedstring_trunc(mySize_x,mypos,
- GetPlayerName(e.minigame_playerslot-1),
+ entcs_GetName(e.minigame_playerslot-1),
player_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
mypos_y += player_fontsize_y;
if ( turnflags & BD_TURN_WIN )
if(random() > 0.5)
- return _("Tubular! Press ""Next Level"" to continue!");
+ return _("Tubular! Press \"Next Level\" to continue!");
else
- return _("Wicked! Press ""Next Level"" to continue!");
+ return _("Wicked! Press \"Next Level\" to continue!");
if( turnflags & BD_TURN_EDIT )
return _("Press the space bar to change your currently selected tile");
if ( turnflags & BD_TURN_MOVE )
return _("Push the boulders onto the targets");
-
+
return "";
}
}
}
-void bd_editor_make_move(entity minigame)
+void bd_editor_make_move(entity minigame, string dir)
{
if ( minigame.minigame_flags == BD_TURN_EDIT )
{
- minigame_cmd("move ", bd_curr_pos, " ", ftos(bd_curr_tile));
+ minigame_cmd("move ", bd_curr_pos, " ", ftos(bd_curr_tile), " ", dir);
}
}
return false;
}
+bool bd_change_dozer_angle(entity minigame)
+{
+ entity dozer = bd_find_piece(minigame, bd_curr_pos, false);
+ if(!dozer || dozer.bd_tiletype != BD_TILE_DOZER)
+ return false;
+
+ string thedir = "";
+ vector dir = dozer.bd_dir;
+ if(dir.x == 0 && dir.y == 0) { thedir = "r"; }
+
+ if(dir.x == 0 && dir.y == 1) { thedir = "r"; }
+ if(dir.x == 0 && dir.y ==-1) { thedir = "l"; }
+ if(dir.x ==-1 && dir.y == 0) { thedir = "u"; }
+ if(dir.x == 1 && dir.y == 0) { thedir = "d"; }
+
+ bd_editor_make_move(minigame, thedir);
+ return true;
+}
+
bool bd_editor_move(entity minigame, int themove)
{
switch ( themove )
return true;
case K_ENTER:
case K_KP_ENTER:
- bd_editor_make_move(minigame);
+ bd_editor_make_move(minigame, "");
return true;
case K_SPACE:
- bd_curr_tile = max(1, (bd_curr_tile + 1) % BD_TILE_LAST);
+ 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;
}
{
if(...(0,int) == K_MOUSE1)
{
- bd_editor_make_move(minigame);
+ bd_editor_make_move(minigame, "");
return true;
}
return false;
}
-#endif
\ No newline at end of file
+#endif
projects / xonotic / xonotic-data.pk3dir.git / blobdiff