From 8a1ed2f3975068d69ada3aad0ab0cfdaeacc87b7 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 16 Jun 2013 15:07:57 +0200 Subject: [PATCH] Nuovi livelli! Stack! --- boom.project.gmx | 10 +- objects/debugobj.object.gmx | 233 ++++++++++++++++++++++++++++++++++++ objects/stack.object.gmx | 214 --------------------------------- rooms/map1.room.gmx | 4 +- rooms/menu.room.gmx | 5 +- rooms/room4.room.gmx | 67 +++++++++++ rooms/s_classic.room.gmx | 67 +++++++++++ rooms/s_maxi.room.gmx | 65 ++++++++++ rooms/s_sandbox.room.gmx | 85 +++++++++++++ rooms/s_sidewalls.room.gmx | 68 +++++++++++ rooms/s_slide.room.gmx | 88 ++++++++++++++ rooms/s_stairs.room.gmx | 68 +++++++++++ rooms/s_twotris.room.gmx | 66 ++++++++++ scripts/loadrecord.gml | 2 +- scripts/resetrecord.gml | 2 +- scripts/saverecord.gml | 2 +- 16 files changed, 824 insertions(+), 222 deletions(-) create mode 100644 objects/debugobj.object.gmx create mode 100644 rooms/room4.room.gmx create mode 100644 rooms/s_classic.room.gmx create mode 100644 rooms/s_maxi.room.gmx create mode 100644 rooms/s_sandbox.room.gmx create mode 100644 rooms/s_sidewalls.room.gmx create mode 100644 rooms/s_slide.room.gmx create mode 100644 rooms/s_stairs.room.gmx create mode 100644 rooms/s_twotris.room.gmx diff --git a/boom.project.gmx b/boom.project.gmx index ac2597b..5c634c3 100644 --- a/boom.project.gmx +++ b/boom.project.gmx @@ -54,11 +54,19 @@ objects\box objects\text objects\lift + objects\debugobj - rooms\map1 rooms\menu rooms\boomer + + rooms\s_twotris + rooms\s_classic + rooms\s_sandbox + rooms\s_stairs + rooms\s_sidewalls + rooms\s_maxi + help.rtf diff --git a/objects/debugobj.object.gmx b/objects/debugobj.object.gmx new file mode 100644 index 0000000..e1b0e2f --- /dev/null +++ b/objects/debugobj.object.gmx @@ -0,0 +1,233 @@ + + + <undefined> + 0 + -1 + 0 + -1 + <undefined> + <undefined> + + + + 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 + 524 + 0 + 0 + 0 + 0 + 1 + action_color + + self + 0 + 0 + + + 13 + 16777215 + + + + + 1 + 526 + 0 + 0 + 0 + 0 + 1 + action_font + + self + 0 + 0 + + + 12 + devbeaten + + + 4 + 1 + + + + + 1 + 613 + 0 + -1 + 0 + -1 + 1 + action_draw_variable + + self + 0 + 0 + + + 0 + room + + + 0 + 320 + + + 0 + 240 + + + + + 1 + 424 + 2 + 0 + 0 + 0 + 0 + + + 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 + room_goto(get_integer("Livello?", 0)); + + + + + + 1 + 424 + 2 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/stack.object.gmx b/objects/stack.object.gmx index dc69fae..a0c147c 100644 --- a/objects/stack.object.gmx +++ b/objects/stack.object.gmx @@ -535,220 +535,6 @@ - - 1 - 612 - 0 - 0 - -1 - -1 - 1 - action_if_variable - - self - 0 - 0 - - - 0 - blocksp - - - 0 - devrecord - - - 4 - 2 - - - - - 1 - 422 - 1 - 0 - 0 - 0 - 0 - - - self - 0 - 0 - - - 1 - 526 - 0 - 0 - 0 - 0 - 1 - action_font - - self - 0 - 0 - - - 12 - devbeaten - - - 4 - 1 - - - - - 1 - 524 - 0 - 0 - 0 - 0 - 1 - action_color - - self - 0 - 0 - - - 13 - 65280 - - - - - 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 - 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 - 12615680 - - - - - 1 - 424 - 2 - 0 - 0 - 0 - 0 - - - self - 0 - 0 - - - 1 - 613 - 0 - -1 - 0 - -1 - 1 - action_draw_variable - - self - 0 - 0 - - - 0 - devrecord - - - 0 - 320 - - - 0 - 0 - - - diff --git a/rooms/map1.room.gmx b/rooms/map1.room.gmx index 1aba711..1ad155f 100644 --- a/rooms/map1.room.gmx +++ b/rooms/map1.room.gmx @@ -4,7 +4,7 @@ 640 480 32 - 8 + 32 0 60 0 @@ -51,7 +51,7 @@ - + diff --git a/rooms/menu.room.gmx b/rooms/menu.room.gmx index 5d2b962..19548e4 100644 --- a/rooms/menu.room.gmx +++ b/rooms/menu.room.gmx @@ -50,6 +50,8 @@ + + @@ -144,8 +146,6 @@ - - @@ -182,6 +182,7 @@ + -1 diff --git a/rooms/room4.room.gmx b/rooms/room4.room.gmx new file mode 100644 index 0000000..05b6365 --- /dev/null +++ b/rooms/room4.room.gmx @@ -0,0 +1,67 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 8388608 + -1 + + 0 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/rooms/s_classic.room.gmx b/rooms/s_classic.room.gmx new file mode 100644 index 0000000..05b6365 --- /dev/null +++ b/rooms/s_classic.room.gmx @@ -0,0 +1,67 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 8388608 + -1 + + 0 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/rooms/s_maxi.room.gmx b/rooms/s_maxi.room.gmx new file mode 100644 index 0000000..aab8130 --- /dev/null +++ b/rooms/s_maxi.room.gmx @@ -0,0 +1,65 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 8388608 + -1 + + 0 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/rooms/s_sandbox.room.gmx b/rooms/s_sandbox.room.gmx new file mode 100644 index 0000000..097ee42 --- /dev/null +++ b/rooms/s_sandbox.room.gmx @@ -0,0 +1,85 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 8388608 + -1 + + 0 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/rooms/s_sidewalls.room.gmx b/rooms/s_sidewalls.room.gmx new file mode 100644 index 0000000..05209f2 --- /dev/null +++ b/rooms/s_sidewalls.room.gmx @@ -0,0 +1,68 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 8388608 + -1 + + 0 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/rooms/s_slide.room.gmx b/rooms/s_slide.room.gmx new file mode 100644 index 0000000..7c8699c --- /dev/null +++ b/rooms/s_slide.room.gmx @@ -0,0 +1,88 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 8388608 + -1 + + 0 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/rooms/s_stairs.room.gmx b/rooms/s_stairs.room.gmx new file mode 100644 index 0000000..3e52c98 --- /dev/null +++ b/rooms/s_stairs.room.gmx @@ -0,0 +1,68 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 8388608 + -1 + + 0 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/rooms/s_twotris.room.gmx b/rooms/s_twotris.room.gmx new file mode 100644 index 0000000..5b52ff6 --- /dev/null +++ b/rooms/s_twotris.room.gmx @@ -0,0 +1,66 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 8388608 + -1 + + 0 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/scripts/loadrecord.gml b/scripts/loadrecord.gml index 11650d7..92f4b5f 100644 --- a/scripts/loadrecord.gml +++ b/scripts/loadrecord.gml @@ -1,3 +1,3 @@ ini_open("savefile.ini"); -stack.blocksr = ini_read_real("Stack","r_map1","0"); // Soldi +stack.blocksr = ini_read_real("Stack",room_get_name(room),"0"); // Soldi ini_close(); diff --git a/scripts/resetrecord.gml b/scripts/resetrecord.gml index 648431b..e73ae30 100644 --- a/scripts/resetrecord.gml +++ b/scripts/resetrecord.gml @@ -1,3 +1,3 @@ ini_open("savefile.ini"); -ini_write_real("Stack","r_map1",0); // Record +ini_write_real("Stack",room_get_name(room),0); // Record ini_close(); diff --git a/scripts/saverecord.gml b/scripts/saverecord.gml index 9c311b9..eaa1e02 100644 --- a/scripts/saverecord.gml +++ b/scripts/saverecord.gml @@ -1,3 +1,3 @@ ini_open("savefile.ini"); -ini_write_real("Stack","r_map1",stack.blocksr); // Record +ini_write_real("Stack",room_get_name(room),stack.blocksr); // Record ini_close();