+#include "bd.qh"
REGISTER_MINIGAME(bd, "Bulldozer");
+REGISTER_NET_LINKED(ENT_CLIENT_BD_CONTROLLER)
+
const int BD_TURN_MOVE = 0x0100; // player must move the bulldozer
const int BD_TURN_WIN = 0x0200; // victory
const int BD_TURN_LOSS = 0x0400; // they did it?!
const int BD_TURN_EDIT = 0x0800; // editing mode
const int BD_TURN_TYPE = 0x0f00; // turn type mask
+// send flags
const int BD_SF_PLAYERMOVES = MINIG_SF_CUSTOM;
+const int BD_SF_UPDATE_SINGLE = MINIG_SF_CUSTOM<<1;
+const int BD_SF_UPDATE_ALL = MINIG_SF_CUSTOM<<2;
// 240 tiles...
const int BD_LET_CNT = 20;
const int BD_TEAMS = 1;
-.vector bd_dir;
+.int bd_dir;
+
+.int bd_dirs[BD_NUM_CNT];
.int bd_moves;
+.int bd_tilelet;
+
.string bd_levelname;
.string bd_nextlevel;
#ifdef SVQC
.bool bd_canedit;
+.int bd_forceupdate;
#endif
+.int bd_tiletypes[BD_NUM_CNT];
+
.int bd_tiletype;
const int BD_TILE_DOZER = 1;
const int BD_TILE_TARGET = 2;
const int BD_TILE_BRICK2 = 5;
const int BD_TILE_BRICK3 = 6;
const int BD_TILE_BRICK4 = 7;
-const int BD_TILE_LAST = 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;
+const int BD_DIR_UP = 0;
+const int BD_DIR_DN = 1;
+const int BD_DIR_LF = 2;
+const int BD_DIR_RT = 3;
+
+#ifdef SVQC
string autocvar_sv_minigames_bulldozer_startlevel = "level1";
+#endif
// 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;
+}
+
+entity bd_find_controller(entity minig, int letter)
+{
+ entity e = NULL;
+ while ( ( e = findentity(e,owner,minig) ) )
+ if ( e.classname == "bd_controller" && e.bd_tilelet == letter )
+ return e;
+ return NULL;
}
// check if the tile name is valid (15x15 grid)
return 0 <= number && number < BD_NUM_CNT && 0 <= letter && letter < BD_LET_CNT;
}
+void bd_controller_update(entity controller, int number)
+{
+#ifdef SVQC
+ controller.bd_forceupdate = number;
+#endif
+ minigame_server_sendflags(controller,BD_SF_UPDATE_SINGLE);
+}
+
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;
+}
+
+#ifdef SVQC
+bool bd_controller_send(entity this, entity to, int sf)
+{
+ WriteHeader(MSG_ENTITY, ENT_CLIENT_BD_CONTROLLER);
+ if(sf & BD_SF_UPDATE_ALL)
+ sf &= ~BD_SF_UPDATE_SINGLE;
+
+ WriteByte(MSG_ENTITY, sf);
+ WriteByte(MSG_ENTITY, this.bd_tilelet);
+ WriteString(MSG_ENTITY,this.owner.netname);
+
+ if(sf & BD_SF_UPDATE_SINGLE)
+ {
+ int number = this.bd_forceupdate;
+ //this.bd_forceupdate = 0;
+ int ttype = this.bd_tiletypes[number];
+ int dir = this.bd_dirs[number];
+ WriteByte(MSG_ENTITY, number);
+ WriteByte(MSG_ENTITY, ttype);
+ WriteByte(MSG_ENTITY, dir);
+ }
+
+ if(sf & BD_SF_UPDATE_ALL)
+ {
+ for(int j = 0; j < BD_NUM_CNT; ++j)
+ {
+ int ttype = this.bd_tiletypes[j];
+ int dir = this.bd_dirs[j];
+ WriteByte(MSG_ENTITY, ttype);
+ WriteByte(MSG_ENTITY, dir);
+ }
+ }
+
+ return true;
}
+#elif defined(CSQC)
+void minigame_read_owner(entity this);
+
+NET_HANDLE(ENT_CLIENT_BD_CONTROLLER, bool isNew)
+{
+ this.classname = "bd_controller";
+ return = true;
+
+ int sf = ReadByte();
+ this.bd_tilelet = ReadByte();
+ minigame_read_owner(this);
+
+ if(sf & BD_SF_UPDATE_SINGLE)
+ {
+ int number = ReadByte();
+ this.bd_tiletypes[number] = ReadByte();
+ this.bd_dirs[number] = ReadByte();
+ }
+
+ if(sf & BD_SF_UPDATE_ALL)
+ {
+ for(int j = 0; j < BD_NUM_CNT; ++j)
+ {
+ this.bd_tiletypes[j] = ReadByte();
+ this.bd_dirs[j] = ReadByte();
+ }
+ }
+}
+#endif
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 )
{
}
}
+vector bd_get_dir(int bdir)
+{
+ switch(bdir)
+ {
+ case BD_DIR_UP: return '0 1 0'; // up
+ default:
+ case BD_DIR_DN: return '0 -1 0'; // down
+ case BD_DIR_LF: return '-1 0 0'; // left
+ case BD_DIR_RT: return '1 0 0'; // right
+ }
+}
+
+string bd_get_dir_name(int bdir)
+{
+ switch(bdir)
+ {
+ case BD_DIR_UP: return "u"; // up
+ default:
+ case BD_DIR_DN: return "d"; // down
+ case BD_DIR_LF: return "l"; // left
+ case BD_DIR_RT: return "r"; // right
+ }
+}
+
+int bd_dir_fromname(string bdir)
+{
+ if(bdir == "up" || bdir == "u")
+ return BD_DIR_UP; // up
+ if(bdir == "down" || bdir == "dn" || bdir == "d")
+ return BD_DIR_DN; /// down
+ if(bdir == "left" || bdir == "lt" || bdir == "l")
+ return BD_DIR_LF; // left
+ if(bdir == "right" || bdir == "rt" || bdir == "r")
+ return BD_DIR_RT; // right
+
+ return BD_DIR_DN; // down
+}
+
bool bd_canfill(int ttype)
{
switch(ttype)
{
- case BD_TILE_BRICK1:
- case BD_TILE_BRICK2:
+ 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_BRICK4: return true;
+ case BD_TILE_BRICK2:
+ case BD_TILE_BRICK1: return true;
}
return false;
bool bd_move_dozer(entity minigame, entity dozer)
{
- if(!dozer.bd_dir_x && !dozer.bd_dir_y)
- return false; // nope!
+ //if(!dozer.bd_dir)
+ //return false; // nope!
int myx = minigame_tile_letter(dozer.netname);
int myy = minigame_tile_number(dozer.netname);
- myx += dozer.bd_dir_x;
- myy += dozer.bd_dir_y;
+ vector dir = bd_get_dir(dozer.bd_dir);
- string newpos = minigame_tile_buildname(myx, myy);
- entity hit = bd_find_piece(minigame, newpos, false);
+ myx += dir.x;
+ myy += dir.y;
+ string newpos = minigame_tile_buildname(myx, myy);
if(!bd_valid_tile(newpos))
return false;
+ entity hit = bd_find_piece(minigame, newpos, false);
+
if(hit)
switch(hit.bd_tiletype)
{
case BD_TILE_DOZER: // wtf, but let's do this incase
- case BD_TILE_BRICK1:
- case BD_TILE_BRICK2:
+ 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_BRICK4: return false;
+ case BD_TILE_BRICK2:
+ case BD_TILE_BRICK1: return false;
case BD_TILE_BOULDER:
{
string testpos;
int tx = minigame_tile_letter(hit.netname);
int ty = minigame_tile_number(hit.netname);
- tx += dozer.bd_dir_x;
- ty += dozer.bd_dir_y;
+ tx += dir.x;
+ ty += dir.y;
testpos = minigame_tile_buildname(tx, ty);
+ if(!bd_valid_tile(testpos))
+ return false;
entity testhit = bd_find_piece(minigame, testpos, false);
-
- if(!bd_valid_tile(testpos) || testhit)
+ if(testhit)
return false;
+ entity controller = bd_find_controller(minigame, minigame_tile_letter(testpos));
+ int tnum = minigame_tile_number(testpos);
+ switch(controller.bd_tiletypes[tnum])
+ {
+ 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_BRICK1: return false;
+ }
+
if(hit.netname) { strunzone(hit.netname); }
hit.netname = strzone(testpos);
minigame_server_sendflags(hit,MINIG_SF_UPDATE);
}
}
+ entity controller = bd_find_controller(minigame, minigame_tile_letter(newpos));
+ int number = minigame_tile_number(newpos);
+ switch(controller.bd_tiletypes[number])
+ {
+ 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_BRICK1: return false;
+ }
+
if(dozer.netname) { strunzone(dozer.netname); }
dozer.netname = strzone(newpos);
return; // should not happen... TODO: end match?
}
- int dxs = 0, dys = 0;
string thedir = strtolower(dir);
- if(thedir == "up" || thedir == "u") { dxs = 0; dys = 1; }
- if(thedir == "down" || thedir == "dn" || thedir == "d") { dxs = 0; dys = -1; }
- if(thedir == "left" || thedir == "lt" || thedir == "l") { dxs = -1; dys = 0; }
- if(thedir == "right" || thedir == "rt" || thedir == "r") { dxs = 1; dys = 0; }
+ int bdir = bd_dir_fromname(thedir);
- int dx = bound(-1, dxs, 1);
- int dy = bound(-1, dys, 1);
+ 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 = bdir;
+
+ if(bd_move_dozer(minigame, e))
+ ++moved;
- dozer.bd_dir_x = dx;
- dozer.bd_dir_y = dy;
- dozer.bd_dir_z = 0;
+ 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(minigame,MINIG_SF_UPDATE);
}
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 bdir = bd_dir_fromname(newdir);
- 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;
+ found_piece.bd_dir = bdir;
minigame_server_sendflags(found_piece,MINIG_SF_UPDATE); // update anyway
return;
}
- entity dozer = bd_find_dozer(minigame);
- if(dozer && thetile == BD_TILE_DOZER && pos != dozer.netname)
- return; // nice try
+ //entity dozer = bd_find_dozer(minigame);
+ //if(dozer && thetile == BD_TILE_DOZER && pos != dozer.netname)
+ //return; // nice try
+
+ int tlet = minigame_tile_letter(pos);
+ int tnum = minigame_tile_number(pos);
+ entity controller = bd_find_controller(minigame, tlet);
+ if(controller.bd_tiletypes[tnum])
+ {
+ controller.bd_tiletypes[tnum] = 0;
+ controller.bd_dirs[tnum] = 0;
+ bd_controller_update(controller, tnum);
+ return;
+ }
if(found_piece || (targ && thetile != BD_TILE_BOULDER))
{
return; // how?!
if(piece.netname) { strunzone(piece.netname); }
- remove(piece);
+ delete(piece);
minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
return;
}
- entity piece = msle_spawn(minigame,"minigame_board_piece");
- piece.team = 1;
- piece.netname = strzone(pos);
- piece.bd_tiletype = thetile;
- piece.bd_dir = '0 -1 0';
- minigame_server_sendflags(piece,MINIG_SF_UPDATE);
+ if(bd_canfill(thetile))
+ {
+ int number = minigame_tile_number(pos);
+ int letter = minigame_tile_letter(pos);
+ entity controller = bd_find_controller(minigame, letter);
+ controller.bd_tiletypes[number] = thetile;
+ controller.bd_dirs[number] = 0;
+ bd_controller_update(controller, number);
+ }
+ else
+ {
+ entity piece = msle_spawn(minigame,"minigame_board_piece");
+ piece.team = 1;
+ piece.netname = strzone(pos);
+ piece.bd_tiletype = thetile;
+ piece.bd_dir = 0;
+ minigame_server_sendflags(piece,MINIG_SF_UPDATE);
+ }
minigame_server_sendflags(minigame,MINIG_SF_UPDATE);
}
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);
+ }
+ e = NULL;
+ while( (e = findentity(e, owner, minigame)) )
+ if(e.classname == "bd_controller")
+ {
+ delete(e);
}
+ for(int letter = 0; letter < BD_LET_CNT; ++letter)
+ {
+ entity controller = new_pure(bd_controller);
+ controller.owner = minigame;
+ controller.bd_tilelet = letter;
+ #ifdef SVQC
+ Net_LinkEntity(controller, false, 0, bd_controller_send);
+ #endif
+ }
+
bd_load_level(minigame);
}
bd_setup_pieces(minigame);
}
+string bd_save_controller_piece(entity minigame, entity e, int number)
+{
+ string bd_string = "";
+
+ string tilename = minigame_tile_buildname(e.bd_tilelet, number);
+
+ bd_string = strcat(bd_string, "\"", tilename, "\" ");
+ bd_string = strcat(bd_string, ftos(e.bd_tiletypes[number]), " ");
+ bd_string = strcat(bd_string, ftos(e.bd_dirs[number]));
+
+ return bd_string;
+}
+
string bd_save_piece(entity minigame, entity e)
{
string bd_string = "";
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, ftos(e.bd_dir));
return bd_string;
}
minigame.bd_nextlevel = strzone(argv(2));
}
-entity bd_load_piece(entity minigame, string s)
+int bd_fix_dir(vector dir)
+{
+ if(dir.x == 0 && dir.y == 1) { return BD_DIR_UP; } // up
+ if(dir.x == 0 && dir.y == -1) { return BD_DIR_DN; } // down
+ if(dir.x == -1 && dir.y == 0) { return BD_DIR_LF; } // left
+ if(dir.x == 1 && dir.y == 0) { return BD_DIR_RT; } // right
+
+ return BD_DIR_DN; // down if all else fails
+}
+
+void 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;
- e.bd_tiletype = stof(argv(argv_num)); ++argv_num;
- e.bd_dir = stov(argv(argv_num)); ++argv_num;
+ string tilename = strzone(argv(argv_num)); ++argv_num;
+ int tiletype = stoi(argv(argv_num)); ++argv_num;
+ int dir = stoi(argv(argv_num)); ++argv_num;
- minigame_server_sendflags(e,MINIG_SF_ALL);
+ if(bd_canfill(tiletype))
+ {
+ int letter = minigame_tile_letter(tilename);
+ int number = minigame_tile_number(tilename);
+ entity controller = bd_find_controller(minigame, letter);
+ controller.bd_tiletypes[number] = tiletype;
+ controller.bd_dirs[number] = dir;
- return e;
+ bd_controller_update(controller, number);
+ }
+ else
+ {
+ entity e = msle_spawn(minigame,"minigame_board_piece");
+ e.netname = tilename;
+ e.team = 1;
+ e.bd_dir = dir;
+ e.bd_tiletype = tiletype;
+ minigame_server_sendflags(e,MINIG_SF_ALL);
+ }
}
bool bd_save_level(entity minigame)
if(minigame.bd_levelname && minigame.bd_levelname != "")
{
int target_count = 0, boulder_count = 0;
- entity piece = world;
+ entity piece = NULL;
while((piece = findentity(piece,owner,minigame)))
if(piece.classname == "minigame_board_piece")
if(piece.bd_tiletype == BD_TILE_BOULDER)
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 == "bd_controller" )
+ {
+ for(int j = 0; j < BD_NUM_CNT; ++j)
+ {
+ // use a line of text for each object, listing all properties
+ fputs(file_get, strcat(bd_save_controller_piece(minigame, e, j), "\n"));
+ }
+ }
+ e = NULL;
+
while ( ( e = findentity(e,owner,minigame) ) )
if ( e.classname == "minigame_board_piece" )
{
continue;
}
- entity e;
- e = bd_load_piece(minigame, file_read);
+ bd_load_piece(minigame, file_read);
}
}
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);
+ }
+ e = NULL;
+ while( (e = findentity(e, owner, minigame)) )
+ if(e.classname == "bd_controller")
+ {
+ 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), ((...(1,int)) >= 4 ? argv(3) : 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;
}
WriteByte(MSG_ENTITY,sent.bd_tiletype);
- int dx = sent.bd_dir_x;
- int dy = sent.bd_dir_y;
- if(dx == -1) dx = 2;
- if(dy == -1) dy = 2;
- WriteByte(MSG_ENTITY,dx);
- WriteByte(MSG_ENTITY,dy);
+ WriteByte(MSG_ENTITY,sent.bd_dir);
}
else if(sent.classname == "minigame_player" && (sf & BD_SF_PLAYERMOVES))
WriteShort(MSG_ENTITY,sent.bd_moves);
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_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_get_tile_pic(e.bd_tiletype);
-
- minigame_drawpic_centered( tile_pos,
- minigame_texture(thepiece),
- tile_size, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL );
+ if(e.bd_tiletype == BD_TILE_TARGET)
+ {
+ 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);
+ }
}
-
- if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_TARGET && e.bd_tiletype != BD_TILE_DOZER )
+ }
+ FOREACH_MINIGAME_ENTITY(e)
+ {
+ if ( e.classname == "bd_controller" )
{
- 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 );
- }
+ for(int j = 0; j < BD_NUM_CNT; ++j)
+ {
+ if(!e.bd_tiletypes[j]) continue;
- 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);
+ int letter = e.bd_tilelet;
+ string mypos = minigame_tile_buildname(letter, j);
- vector thedir = e.bd_dir;
- float theang = 0;
+ tile_pos = minigame_tile_pos(mypos,BD_NUM_CNT,BD_LET_CNT);
+ tile_pos = minigame_hud_denormalize(tile_pos,pos,mySize);
- if(thedir_y == -1) { theang = M_PI; }
- if(thedir_x == 1) { theang = M_PI/2; }
- if(thedir_x == -1) { theang = M_PI*3/2; }
+ string thepiece = bd_get_tile_pic(e.bd_tiletypes[j]);
- drawrotpic(tile_pos, theang, minigame_texture("bd/dozer"),
- tile_size, tile_size/2, '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 );
+ }
}
- }
-
- FOREACH_MINIGAME_ENTITY(e)
- {
- if ( e.classname == "minigame_board_piece" && e.bd_tiletype == BD_TILE_TARGET )
+ else 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 )
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;
+ int bdir = 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; }
+ switch(bdir)
+ {
+ case BD_DIR_UP: theang = 0; break;
+ default:
+ case BD_DIR_DN: theang = M_PI; break;
+ case BD_DIR_LF: theang = M_PI * 3 / 2; break;
+ case BD_DIR_RT: theang = M_PI / 2; break;
+ }
drawrotpic(tile_pos, theang, minigame_texture("bd/dozer"),
tile_size, tile_size/2, '1 1 1',
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 "";
}
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"; }
+ switch(dozer.bd_dir)
+ {
+ case BD_DIR_UP: dozer.bd_dir = BD_DIR_LF; break; // up -> left
+ default:
+ case BD_DIR_DN: dozer.bd_dir = BD_DIR_RT; break; // down -> right
+ case BD_DIR_LF: dozer.bd_dir = BD_DIR_DN; break; // left -> down
+ case BD_DIR_RT: dozer.bd_dir = BD_DIR_UP; break; // right -> up
+ }
+ string thedir = bd_get_dir_name(dozer.bd_dir);
bd_editor_make_move(minigame, thedir);
return true;
sent.bd_tiletype = ReadByte();
- int dx = ReadByte();
- int dy = ReadByte();
-
- if(dx == 2) dx = -1;
- if(dy == 2) dy = -1;
-
- sent.bd_dir_x = dx;
- sent.bd_dir_y = dy;
- sent.bd_dir_z = 0;
+ sent.bd_dir = ReadByte();
}
}
else if(sent.classname == "minigame_player" && (sf & BD_SF_PLAYERMOVES))
return false;
}
-#endif
\ No newline at end of file
+#endif
projects / xonotic / xonotic-data.pk3dir.git / blobdiff