diff --git a/boom.project.gmx b/boom.project.gmx index ab78bca..f5d064f 100644 --- a/boom.project.gmx +++ b/boom.project.gmx @@ -28,27 +28,24 @@ sprites\i_esplosione sprites\i_moneta sprites\i_clock_100_yellow + sprites\i_blocco sprites\i_clock_100_totem - - sprites\i_blocco - sprites\i_redlock - sprites\i_maxi - sprites\i_sidewalls - sprites\i_twotris - sprites\i_classic - sprites\i_sandbox - sprites\i_stairs - sprites\i_base_classic - sprites\i_base_sand - sprites\i_base_sandbox - sprites\i_base_sidewalls_1 - sprites\i_base_sidewalls_2 - sprites\i_half_L_D - sprites\i_half_L_U - sprites\i_half_R_U - sprites\i_half_R_D - sprites\i_locked - + sprites\i_maxi + sprites\i_sidewalls + sprites\i_sandbox + sprites\i_stairs + sprites\i_classic + sprites\i_twotris + sprites\i_base_classic + sprites\i_base_sand + sprites\i_base_sandbox + sprites\i_base_sidewalls_1 + sprites\i_base_sidewalls_2 + sprites\i_half_L_D + sprites\i_half_R_U + sprites\i_half_L_U + sprites\i_half_R_D + sprites\i_locked sprites\i_totemA @@ -93,8 +90,16 @@ sprites\i_sea sprites\part_totem - sprites\i_button + sprites\i_button_red + sprites\i_button_blue + sprites\i_button_green sprites\i_chiave_red + sprites\i_chiave_blue + sprites\i_chiave_green + sprites\i_lock_red + sprites\i_lock_blue + sprites\i_lock_green + sprites\i_CD background\cloud @@ -123,9 +128,7 @@ objects\o_generale objects\o_wall_norm - objects\o_lock_red - objects\o_bott_red - objects\o_chiave_red + objects\o_CD objects\o_squadra_sin objects\o_squadra_des @@ -188,6 +191,23 @@ objects\o_clock_hou objects\o_count_ent + + + objects\o_lock_red + objects\o_bott_red + objects\o_chiave_red + + + objects\o_lock_blue + objects\o_bott_blue + objects\o_chiave_blue + + + objects\o_lock_green + objects\o_bott_green + objects\o_chiave_green + + objects\o_wall_inv @@ -226,7 +246,6 @@ - rooms\t_classic rooms\menu rooms\stackselect rooms\boomer @@ -239,6 +258,9 @@ rooms\s_maxi rooms\s_lifttest + + rooms\t_classic + help.rtf diff --git a/objects/o_CD.object.gmx b/objects/o_CD.object.gmx new file mode 100644 index 0000000..ce2f50a --- /dev/null +++ b/objects/o_CD.object.gmx @@ -0,0 +1,26 @@ + + + i_CD + -1 + -1 + 0 + 0 + o_generale + <undefined> + + -1 + 0 + 0 + 0.300000011920929 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 10 + -1 + 0 + + 16,16 + 16,16 + + diff --git a/objects/o_bott_blue.object.gmx b/objects/o_bott_blue.object.gmx new file mode 100644 index 0000000..3484195 --- /dev/null +++ b/objects/o_bott_blue.object.gmx @@ -0,0 +1,73 @@ + + + i_button_blue + -1 + -1 + 0 + 0 + o_generale + <undefined> + + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + o_lock_blue + 0 + 0 + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + self + 0 + 0 + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + other + 0 + 0 + + + + -1 + 0 + 1 + 0.300000011920929 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 10 + -1 + 0 + + 0,0 + 16,0 + 16,16 + 0,16 + + diff --git a/objects/o_bott_green.object.gmx b/objects/o_bott_green.object.gmx new file mode 100644 index 0000000..2b0e38a --- /dev/null +++ b/objects/o_bott_green.object.gmx @@ -0,0 +1,73 @@ + + + i_button_green + -1 + -1 + 0 + 0 + o_generale + <undefined> + + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + o_lock_green + 0 + 0 + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + self + 0 + 0 + + + 1 + 203 + 0 + 0 + 0 + -1 + 1 + action_kill_object + + other + 0 + 0 + + + + -1 + 0 + 1 + 0.300000011920929 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 10 + -1 + 0 + + 0,0 + 16,0 + 16,16 + 0,16 + + diff --git a/objects/o_bott_red.object.gmx b/objects/o_bott_red.object.gmx index a86c375..6546650 100644 --- a/objects/o_bott_red.object.gmx +++ b/objects/o_bott_red.object.gmx @@ -1,6 +1,6 @@ - i_button + i_button_red -1 -1 0 diff --git a/objects/o_chiave_blue.object.gmx b/objects/o_chiave_blue.object.gmx new file mode 100644 index 0000000..a3f7bc9 --- /dev/null +++ b/objects/o_chiave_blue.object.gmx @@ -0,0 +1,28 @@ + + + i_chiave_blue + -1 + -1 + 0 + 0 + o_generale + <undefined> + + -1 + 0 + 1 + 0.300000011920929 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + -1 + 0 + + 0,0 + 10,0 + 10,10 + 0,10 + + diff --git a/objects/o_chiave_green.object.gmx b/objects/o_chiave_green.object.gmx new file mode 100644 index 0000000..9bdc51c --- /dev/null +++ b/objects/o_chiave_green.object.gmx @@ -0,0 +1,28 @@ + + + i_chiave_green + -1 + -1 + 0 + 0 + o_generale + <undefined> + + -1 + 0 + 1 + 0.300000011920929 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + -1 + 0 + + 0,0 + 10,0 + 10,10 + 0,10 + + diff --git a/objects/o_lock_blue.object.gmx b/objects/o_lock_blue.object.gmx new file mode 100644 index 0000000..0715124 --- /dev/null +++ b/objects/o_lock_blue.object.gmx @@ -0,0 +1,28 @@ + + + i_lock_blue + -1 + -1 + 0 + 0 + o_generale + <undefined> + + -1 + 0 + 1 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + -1 + 0 + + 0,0 + 64,0 + 64,24 + 0,24 + + diff --git a/objects/o_lock_green.object.gmx b/objects/o_lock_green.object.gmx new file mode 100644 index 0000000..df595b6 --- /dev/null +++ b/objects/o_lock_green.object.gmx @@ -0,0 +1,28 @@ + + + i_lock_green + -1 + -1 + 0 + 0 + o_generale + <undefined> + + -1 + 0 + 1 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + -1 + 0 + + 0,0 + 64,0 + 64,24 + 0,24 + + diff --git a/objects/o_lock_red.object.gmx b/objects/o_lock_red.object.gmx index 857597d..f15f8a8 100644 --- a/objects/o_lock_red.object.gmx +++ b/objects/o_lock_red.object.gmx @@ -1,6 +1,6 @@ - i_redlock + i_lock_red -1 -1 0 diff --git a/objects/o_wall_norm.object.gmx b/objects/o_wall_norm.object.gmx index d20d305..68e52ac 100644 --- a/objects/o_wall_norm.object.gmx +++ b/objects/o_wall_norm.object.gmx @@ -8,6 +8,56 @@ o_generale <undefined> + + + 1 + 410 + 0 + 0 + -1 + -1 + 1 + action_if_aligned + + self + 0 + -1 + + + 0 + 32 + + + 0 + 32 + + + + + 1 + 117 + 0 + 0 + 0 + -1 + 1 + action_snap + + self + 0 + 0 + + + 0 + 32 + + + 0 + 32 + + + + 1 diff --git a/scripts/m_stack_init.gml b/scripts/m_stack_init.gml index e4806eb..2b0049f 100644 --- a/scripts/m_stack_init.gml +++ b/scripts/m_stack_init.gml @@ -1,7 +1,7 @@ //Seleziona il primo oggetto. selected = 0; //Definisci qual รจ il numero massimo, ad esempio se arriva a stack_names[9] scrivi 9. -totalitems = 35; +totalitems = 42; //Definisci l'array con tutti i nomi degli oggetti da fare spawnare. stack_names[0] = o_squadra_sin; stack_names[1] = o_squadra_des; @@ -39,6 +39,13 @@ stack_names[32] = o_count_ent; stack_names[33] = o_bott_red; stack_names[34] = o_lock_red; stack_names[35] = o_chiave_red; +stack_names[36] = o_bott_blue; +stack_names[37] = o_lock_blue; +stack_names[38] = o_chiave_blue; +stack_names[39] = o_bott_green; +stack_names[40] = o_lock_green; +stack_names[41] = o_chiave_green; +stack_names[42] = o_CD; //Disattiva il mouse normale visto che viene generato automaticamente. window_set_cursor(cr_none); //Apri il file di salvataggio, carica il record e chiudi il file. diff --git a/sprites/i_CD.sprite.gmx b/sprites/i_CD.sprite.gmx new file mode 100644 index 0000000..c689ca7 --- /dev/null +++ b/sprites/i_CD.sprite.gmx @@ -0,0 +1,24 @@ + + + 16 + 16 + 1 + 0 + 0 + 0 + 0 + 31 + 0 + 31 + 0 + 0 + + 0 + + 0 + 32 + 32 + + images\i_CD_0.png + + diff --git a/sprites/i_button_blue.sprite.gmx b/sprites/i_button_blue.sprite.gmx new file mode 100644 index 0000000..3601069 --- /dev/null +++ b/sprites/i_button_blue.sprite.gmx @@ -0,0 +1,24 @@ + + + 8 + 8 + 1 + 0 + 0 + 0 + 0 + 15 + 0 + 15 + 0 + 0 + + 0 + + 0 + 16 + 16 + + images\i_button_blue_0.png + + diff --git a/sprites/i_button_green.sprite.gmx b/sprites/i_button_green.sprite.gmx new file mode 100644 index 0000000..2153c54 --- /dev/null +++ b/sprites/i_button_green.sprite.gmx @@ -0,0 +1,24 @@ + + + 8 + 8 + 1 + 0 + 0 + 0 + 0 + 15 + 0 + 15 + 0 + 0 + + 0 + + 0 + 16 + 16 + + images\i_button_green_0.png + + diff --git a/sprites/i_button_red.sprite.gmx b/sprites/i_button_red.sprite.gmx new file mode 100644 index 0000000..ee1e1a6 --- /dev/null +++ b/sprites/i_button_red.sprite.gmx @@ -0,0 +1,24 @@ + + + 8 + 8 + 1 + 0 + 0 + 0 + 0 + 15 + 0 + 15 + 0 + 0 + + 0 + + 0 + 16 + 16 + + images\i_button_red_0.png + + diff --git a/sprites/i_chiave_blue.sprite.gmx b/sprites/i_chiave_blue.sprite.gmx new file mode 100644 index 0000000..7909079 --- /dev/null +++ b/sprites/i_chiave_blue.sprite.gmx @@ -0,0 +1,24 @@ + + + 5 + 5 + 1 + 0 + 0 + 0 + 2 + 7 + 0 + 9 + 0 + 0 + + 0 + + 0 + 10 + 10 + + images\i_chiave_blue_0.png + + diff --git a/sprites/i_chiave_green.sprite.gmx b/sprites/i_chiave_green.sprite.gmx new file mode 100644 index 0000000..9f73423 --- /dev/null +++ b/sprites/i_chiave_green.sprite.gmx @@ -0,0 +1,24 @@ + + + 5 + 5 + 1 + 0 + 0 + 0 + 2 + 7 + 0 + 9 + 0 + 0 + + 0 + + 0 + 10 + 10 + + images\i_chiave_green_0.png + + diff --git a/sprites/i_lock_blue.sprite.gmx b/sprites/i_lock_blue.sprite.gmx new file mode 100644 index 0000000..43d7520 --- /dev/null +++ b/sprites/i_lock_blue.sprite.gmx @@ -0,0 +1,24 @@ + + + 32 + 12 + 1 + 0 + 0 + 0 + 0 + 63 + 0 + 23 + 0 + 0 + + 0 + + 0 + 64 + 24 + + images\i_lock_blue_0.png + + diff --git a/sprites/i_lock_green.sprite.gmx b/sprites/i_lock_green.sprite.gmx new file mode 100644 index 0000000..64727b7 --- /dev/null +++ b/sprites/i_lock_green.sprite.gmx @@ -0,0 +1,24 @@ + + + 32 + 12 + 1 + 0 + 0 + 0 + 0 + 63 + 0 + 23 + 0 + 0 + + 0 + + 0 + 64 + 24 + + images\i_lock_green_0.png + + diff --git a/sprites/i_lock_red.sprite.gmx b/sprites/i_lock_red.sprite.gmx new file mode 100644 index 0000000..fd7f2e7 --- /dev/null +++ b/sprites/i_lock_red.sprite.gmx @@ -0,0 +1,24 @@ + + + 32 + 12 + 1 + 0 + 0 + 0 + 0 + 63 + 0 + 23 + 0 + 0 + + 0 + + 0 + 64 + 24 + + images\i_lock_red_0.png + + diff --git a/sprites/images/i_CD_0.png b/sprites/images/i_CD_0.png new file mode 100644 index 0000000..723bf3f Binary files /dev/null and b/sprites/images/i_CD_0.png differ diff --git a/sprites/images/i_button_blue_0.png b/sprites/images/i_button_blue_0.png new file mode 100644 index 0000000..37eebb8 Binary files /dev/null and b/sprites/images/i_button_blue_0.png differ diff --git a/sprites/images/i_button_green_0.png b/sprites/images/i_button_green_0.png new file mode 100644 index 0000000..4904f90 Binary files /dev/null and b/sprites/images/i_button_green_0.png differ diff --git a/sprites/images/i_button_red_0.png b/sprites/images/i_button_red_0.png new file mode 100644 index 0000000..a35258d Binary files /dev/null and b/sprites/images/i_button_red_0.png differ diff --git a/sprites/images/i_chiave_blue_0.png b/sprites/images/i_chiave_blue_0.png new file mode 100644 index 0000000..2c80636 Binary files /dev/null and b/sprites/images/i_chiave_blue_0.png differ diff --git a/sprites/images/i_chiave_green_0.png b/sprites/images/i_chiave_green_0.png new file mode 100644 index 0000000..5ad4b78 Binary files /dev/null and b/sprites/images/i_chiave_green_0.png differ diff --git a/sprites/images/i_lock_blue_0.png b/sprites/images/i_lock_blue_0.png new file mode 100644 index 0000000..c7fbc46 Binary files /dev/null and b/sprites/images/i_lock_blue_0.png differ diff --git a/sprites/images/i_lock_green_0.png b/sprites/images/i_lock_green_0.png new file mode 100644 index 0000000..6f6f2a8 Binary files /dev/null and b/sprites/images/i_lock_green_0.png differ diff --git a/sprites/images/i_lock_red_0.png b/sprites/images/i_lock_red_0.png new file mode 100644 index 0000000..4443cd4 Binary files /dev/null and b/sprites/images/i_lock_red_0.png differ