diff --git a/boom.project.gmx b/boom.project.gmx index 52592ad..8c8da06 100644 --- a/boom.project.gmx +++ b/boom.project.gmx @@ -34,6 +34,7 @@ sprites\i_clock_100_red sprites\i_clock_100_cyan sprites\i_blocco + sprites\i_spiral sprites\i_bombspitter sprites\i_clock_100_totem sprites\i_maxi @@ -163,6 +164,7 @@ objects\o_radio_palla objects\o_radio_palla_blue objects\o_radio_palla_orange + objects\o_radio_palla_orange_inactive objects\o_radio_palla_grande objects\o_radio_cubo objects\o_radio_triangolo @@ -236,7 +238,8 @@ objects\o_gravity_down objects\o_gravity_left objects\o_gravity_right - objects\o_move + objects\o_click_move + objects\o_collision_move @@ -260,6 +263,7 @@ rooms\menu + rooms\menu_roll rooms\s_twotris rooms\s_classic diff --git a/objects/o_move.object.gmx b/objects/o_click_move.object.gmx similarity index 100% rename from objects/o_move.object.gmx rename to objects/o_click_move.object.gmx diff --git a/objects/o_collision_move.object.gmx b/objects/o_collision_move.object.gmx new file mode 100644 index 0000000..6fe4559 --- /dev/null +++ b/objects/o_collision_move.object.gmx @@ -0,0 +1,97 @@ + + + i_spiral + -1 + -1 + 0 + 0 + o_wall_inv + <undefined> + + + + 1 + 611 + 6 + -1 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + room_specified + + + 0 + 0 + + + + + + + 1 + 601 + 0 + 0 + 0 + -1 + 1 + action_execute_script + + self + 0 + 0 + + + 9 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + 0 + + + + + + + -1 + 0 + 1 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + -1 + 0 + + 0,0 + 32,0 + 32,32 + 0,32 + + diff --git a/objects/o_radio_palla_orange_inactive.object.gmx b/objects/o_radio_palla_orange_inactive.object.gmx new file mode 100644 index 0000000..6beaa97 --- /dev/null +++ b/objects/o_radio_palla_orange_inactive.object.gmx @@ -0,0 +1,26 @@ + + + i_radio_ball_orange + -1 + -1 + -3 + 0 + o_generale + <undefined> + + -1 + 0 + 0 + 1.20000004768372 + 0 + 1 + 0.100000001490116 + 3 + 25 + -1 + 0 + + 8,8 + 8,8 + + diff --git a/objects/stack.object.gmx b/objects/stack.object.gmx index 7882f63..3900635 100644 --- a/objects/stack.object.gmx +++ b/objects/stack.object.gmx @@ -74,128 +74,6 @@ - - - 1 - 612 - 0 - 0 - -1 - -1 - 1 - action_if_variable - - self - 0 - 0 - - - 0 - blocksp - - - 0 - blocksr - - - 4 - 2 - - - - - 1 - 422 - 1 - 0 - 0 - 0 - 0 - - - self - 0 - 0 - - - 1 - 611 - 6 - -1 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - blocksr - - - 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 - 424 - 2 - 0 - 0 - 0 - 0 - - - self - 0 - 0 - - 1 @@ -453,88 +331,6 @@ else - - - 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 - 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/rooms/menu.room.gmx b/rooms/menu.room.gmx index 6d8e3e1..ade9f26 100644 --- a/rooms/menu.room.gmx +++ b/rooms/menu.room.gmx @@ -105,9 +105,9 @@ - - - + + + diff --git a/rooms/menu_roll.room.gmx b/rooms/menu_roll.room.gmx new file mode 100644 index 0000000..c393b8f --- /dev/null +++ b/rooms/menu_roll.room.gmx @@ -0,0 +1,127 @@ + + + + 640 + 480 + 32 + 32 + 0 + 60 + 0 + 64 + -1 + room_specified = r_CD; + 0 + -1 + + -1 + 875 + 460 + -1 + -1 + -1 + -1 + -1 + 0 + 0 + -1 + 0 + -230 + 220 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1 + 0 + 0 + 640 + 480 + 0 + 60 + 0.100000001490116 + diff --git a/sprites/i_spiral.sprite.gmx b/sprites/i_spiral.sprite.gmx new file mode 100644 index 0000000..e145895 --- /dev/null +++ b/sprites/i_spiral.sprite.gmx @@ -0,0 +1,24 @@ + + + 16 + 16 + 1 + 0 + 0 + 0 + 0 + 31 + 0 + 31 + 0 + 0 + + 0 + + 0 + 32 + 32 + + images\i_spiral_0.png + + diff --git a/sprites/images/i_esplosione_0.png b/sprites/images/i_esplosione_0.png index a692f6a..30b3f8e 100644 Binary files a/sprites/images/i_esplosione_0.png and b/sprites/images/i_esplosione_0.png differ diff --git a/sprites/images/i_spiral_0.png b/sprites/images/i_spiral_0.png new file mode 100644 index 0000000..8f1f3d7 Binary files /dev/null and b/sprites/images/i_spiral_0.png differ