diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx index 17a8bdf..7735737 100644 --- a/Configs/Default.config.gmx +++ b/Configs/Default.config.gmx @@ -213,7 +213,7 @@ true false 100 - 8 + 9 diff --git a/boom.project.gmx b/boom.project.gmx index 6e25baf..6e122d5 100644 --- a/boom.project.gmx +++ b/boom.project.gmx @@ -28,13 +28,17 @@ sprites\X sprites\cblock sprites\V + sprites\locked + + + @@ -63,6 +67,7 @@ objects\walltopl objects\walltopr objects\wallsloper + objects\blocklock objects\toboom objects\box objects\text diff --git a/objects/blocklock.object.gmx b/objects/blocklock.object.gmx new file mode 100644 index 0000000..1eaaf98 --- /dev/null +++ b/objects/blocklock.object.gmx @@ -0,0 +1,307 @@ + + + locked + -1 + -1 + 0 + 0 + <undefined> + <undefined> + + + + 1 + 611 + 6 + -1 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + topass + + + 0 + 12345 + + + + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + global.boxtotal + + + 0 + topass + + + 4 + 4 + + + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + self + 0 + 0 + + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + debug_mode + + + 0 + true + + + 4 + 0 + + + + + 1 + 422 + 1 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_set_color(c_white); +physics_draw_debug(); + + + + + + 1 + 424 + 2 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 421 + 3 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 422 + 1 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 500 + 0 + 0 + 0 + 0 + 2 + + draw_self(); + self + 0 + 0 + + + 1 + 424 + 2 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 526 + 0 + 0 + 0 + 0 + 1 + action_font + + self + 0 + 0 + + + 12 + points + + + 4 + 1 + + + + + 1 + 524 + 0 + 0 + 0 + 0 + 1 + action_color + + self + 0 + 0 + + + 13 + 16777215 + + + + + 1 + 613 + 0 + -1 + 0 + -1 + 1 + action_draw_variable + + self + -1 + 0 + + + 0 + topass-global.boxtotal + + + 0 + 0 + + + 0 + -12 + + + + + + -1 + 0 + 1 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + -1 + 0 + + 0,0 + 96,0 + 96,32 + 0,32 + + diff --git a/objects/boxtotal.object.gmx b/objects/boxtotal.object.gmx new file mode 100644 index 0000000..93cec49 --- /dev/null +++ b/objects/boxtotal.object.gmx @@ -0,0 +1,307 @@ + + + locked + -1 + -1 + 0 + 0 + <undefined> + <undefined> + + + + 1 + 611 + 6 + -1 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + topass + + + 0 + 12345 + + + + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + global.boxtotal + + + 0 + topass + + + 4 + 4 + + + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + self + 0 + 0 + + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + debug_mode + + + 0 + true + + + 4 + 0 + + + + + 1 + 422 + 1 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_set_color(c_white); +physics_draw_debug(); + + + + + + 1 + 424 + 2 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 421 + 3 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 422 + 1 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 500 + 0 + 0 + 0 + 0 + 2 + + draw_self(); + self + 0 + 0 + + + 1 + 424 + 2 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 526 + 0 + 0 + 0 + 0 + 1 + action_font + + self + 0 + 0 + + + 12 + points + + + 4 + 1 + + + + + 1 + 524 + 0 + 0 + 0 + 0 + 1 + action_color + + self + 0 + 0 + + + 13 + 16777215 + + + + + 1 + 613 + 0 + -1 + 0 + -1 + 1 + action_draw_variable + + self + -1 + 0 + + + 0 + topass + + + 0 + 0 + + + 0 + 0 + + + + + + -1 + 0 + 1 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + -1 + 0 + + 0,0 + 96,0 + 96,32 + 0,32 + + diff --git a/objects/debugobj.object.gmx b/objects/debugobj.object.gmx index e1b0e2f..8938205 100644 --- a/objects/debugobj.object.gmx +++ b/objects/debugobj.object.gmx @@ -8,7 +8,7 @@ <undefined> <undefined> - + 1 612 diff --git a/objects/menus.object.gmx b/objects/menus.object.gmx index 5316c38..c135e2f 100644 --- a/objects/menus.object.gmx +++ b/objects/menus.object.gmx @@ -33,6 +33,46 @@ + + 1 + 601 + 0 + 0 + 0 + -1 + 1 + action_execute_script + + self + 0 + 0 + + + 9 + + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + @@ -64,6 +104,48 @@ + + + 1 + 601 + 0 + 0 + 0 + -1 + 1 + action_execute_script + + self + 0 + 0 + + + 9 + + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + + 1 diff --git a/objects/stack.object.gmx b/objects/stack.object.gmx index fefee46..c3e605f 100644 --- a/objects/stack.object.gmx +++ b/objects/stack.object.gmx @@ -655,6 +655,70 @@ + + 1 + 611 + 6 + -1 + 0 + -1 + 2 + + + self + -1 + 0 + + + 1 + global.boxtotal + + + 0 + blocksp + + + + + 1 + 601 + 0 + 0 + 0 + -1 + 1 + action_execute_script + + self + 0 + 0 + + + 9 + + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 0 + 0 + + + 1 223 diff --git a/objects/walltest.object.gmx b/objects/walltest.object.gmx new file mode 100644 index 0000000..35303b3 --- /dev/null +++ b/objects/walltest.object.gmx @@ -0,0 +1,28 @@ + + + up + -1 + -1 + -100 + 0 + <undefined> + <undefined> + + 0 + 0 + 1 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + -1 + 0 + + 0,0 + 32,0 + 32,32 + 0,32 + + diff --git a/rooms/stackselect.room.gmx b/rooms/stackselect.room.gmx index 3c3a4f2..8ded980 100644 --- a/rooms/stackselect.room.gmx +++ b/rooms/stackselect.room.gmx @@ -176,6 +176,11 @@ + + + + + -1 diff --git a/scripts/loadX.gml b/scripts/loadX.gml new file mode 100644 index 0000000..f18a81f --- /dev/null +++ b/scripts/loadX.gml @@ -0,0 +1,3 @@ +ini_open("savefile.ini"); +global.boxtotal = ini_read_real("Stack","totalboxes","0"); // Soldi +ini_close(); diff --git a/scripts/resetX.gml b/scripts/resetX.gml new file mode 100644 index 0000000..1dc1ac9 --- /dev/null +++ b/scripts/resetX.gml @@ -0,0 +1,3 @@ +ini_open("savefile.ini"); +ini_write_real("Stack","totalboxes",0); // Record +ini_close(); diff --git a/scripts/saveX.gml b/scripts/saveX.gml new file mode 100644 index 0000000..2375d6d --- /dev/null +++ b/scripts/saveX.gml @@ -0,0 +1,3 @@ +ini_open("savefile.ini"); +ini_write_real("Stack","totalboxes",global.boxtotal); // Record +ini_close(); diff --git a/sprites/images/locked_0.png b/sprites/images/locked_0.png new file mode 100644 index 0000000..95d2532 Binary files /dev/null and b/sprites/images/locked_0.png differ diff --git a/sprites/locked.sprite.gmx b/sprites/locked.sprite.gmx new file mode 100644 index 0000000..31f57b9 --- /dev/null +++ b/sprites/locked.sprite.gmx @@ -0,0 +1,24 @@ + + + 48 + 16 + 1 + 0 + 0 + 0 + 0 + 95 + 0 + 31 + 0 + 0 + + 0 + + 0 + 96 + 32 + + images\locked_0.png + +