From ecec3da74d8707872e0913741cb72e7d13a281e5 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Wed, 17 Jul 2013 17:41:33 +0200 Subject: [PATCH] Aggiunti nuovi muri usabili. --- boom.project.gmx | 4 ++ objects/o_wall_norm_L_D.object.gmx | 108 +++++++++++++++++++++++++++++ objects/o_wall_norm_L_U.object.gmx | 108 +++++++++++++++++++++++++++++ objects/o_wall_norm_R_D.object.gmx | 108 +++++++++++++++++++++++++++++ objects/o_wall_norm_R_U.object.gmx | 108 +++++++++++++++++++++++++++++ objects/stack.object.gmx | 2 +- rooms/t_classic.room.gmx | 2 +- scripts/m_stack_init.gml | 7 +- scripts/scrcursor.gml | 2 +- 9 files changed, 445 insertions(+), 4 deletions(-) create mode 100644 objects/o_wall_norm_L_D.object.gmx create mode 100644 objects/o_wall_norm_L_U.object.gmx create mode 100644 objects/o_wall_norm_R_D.object.gmx create mode 100644 objects/o_wall_norm_R_U.object.gmx diff --git a/boom.project.gmx b/boom.project.gmx index c7c6e0a..a69c79d 100644 --- a/boom.project.gmx +++ b/boom.project.gmx @@ -235,6 +235,10 @@ objects\o_wall_norm + objects\o_wall_norm_L_D + objects\o_wall_norm_L_U + objects\o_wall_norm_R_U + objects\o_wall_norm_R_D diff --git a/objects/o_wall_norm_L_D.object.gmx b/objects/o_wall_norm_L_D.object.gmx new file mode 100644 index 0000000..cb9436b --- /dev/null +++ b/objects/o_wall_norm_L_D.object.gmx @@ -0,0 +1,108 @@ + + + i_half_L_D + -1 + -1 + 0 + 0 + o_generale + <undefined> + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + debug_mode + + + 0 + true + + + 4 + 0 + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_set_color(c_ltgray); +physics_draw_debug(); + + + + + + 1 + 421 + 3 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 500 + 0 + 0 + 0 + 0 + 2 + + draw_self(); + self + 0 + 0 + + + + -1 + 0 + 2 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + 0 + 0 + + 0,0 + 32,32 + 0,32 + + diff --git a/objects/o_wall_norm_L_U.object.gmx b/objects/o_wall_norm_L_U.object.gmx new file mode 100644 index 0000000..fe86045 --- /dev/null +++ b/objects/o_wall_norm_L_U.object.gmx @@ -0,0 +1,108 @@ + + + i_half_L_U + -1 + -1 + 0 + 0 + o_generale + <undefined> + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + debug_mode + + + 0 + true + + + 4 + 0 + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_set_color(c_ltgray); +physics_draw_debug(); + + + + + + 1 + 421 + 3 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 500 + 0 + 0 + 0 + 0 + 2 + + draw_self(); + self + 0 + 0 + + + + -1 + 0 + 2 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + 0 + 0 + + 0,0 + 32,0 + 0,32 + + diff --git a/objects/o_wall_norm_R_D.object.gmx b/objects/o_wall_norm_R_D.object.gmx new file mode 100644 index 0000000..3f241fd --- /dev/null +++ b/objects/o_wall_norm_R_D.object.gmx @@ -0,0 +1,108 @@ + + + i_half_R_D + -1 + -1 + 0 + 0 + o_generale + <undefined> + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + debug_mode + + + 0 + true + + + 4 + 0 + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_set_color(c_ltgray); +physics_draw_debug(); + + + + + + 1 + 421 + 3 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 500 + 0 + 0 + 0 + 0 + 2 + + draw_self(); + self + 0 + 0 + + + + -1 + 0 + 2 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + 0 + 0 + + 32,0 + 32,32 + 0,32 + + diff --git a/objects/o_wall_norm_R_U.object.gmx b/objects/o_wall_norm_R_U.object.gmx new file mode 100644 index 0000000..16c11f0 --- /dev/null +++ b/objects/o_wall_norm_R_U.object.gmx @@ -0,0 +1,108 @@ + + + i_half_R_U + -1 + -1 + 0 + 0 + o_generale + <undefined> + + + + 1 + 612 + 0 + 0 + -1 + -1 + 1 + action_if_variable + + self + 0 + 0 + + + 0 + debug_mode + + + 0 + true + + + 4 + 0 + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_set_color(c_ltgray); +physics_draw_debug(); + + + + + + 1 + 421 + 3 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + 1 + 500 + 0 + 0 + 0 + 0 + 2 + + draw_self(); + self + 0 + 0 + + + + -1 + 0 + 2 + 0 + 0 + 1 + 0.100000001490116 + 0.100000001490116 + 0.5 + 0 + 0 + + 0,0 + 32,0 + 32,32 + + diff --git a/objects/stack.object.gmx b/objects/stack.object.gmx index e40cb51..09792b8 100644 --- a/objects/stack.object.gmx +++ b/objects/stack.object.gmx @@ -298,7 +298,7 @@ 1 //Fai spawnare l'oggetto selezionato in base all'array stack_names. -if (selected = 10) +if (selected = 10 || selected = 43 || selected = 44 || selected = 45 || selected = 46) { instance_create(floor((mouse_x div 32))*32,floor((mouse_y div 32))*32,stack_names[selected]); } diff --git a/rooms/t_classic.room.gmx b/rooms/t_classic.room.gmx index 9046153..16193b3 100644 --- a/rooms/t_classic.room.gmx +++ b/rooms/t_classic.room.gmx @@ -54,7 +54,7 @@ - + diff --git a/scripts/m_stack_init.gml b/scripts/m_stack_init.gml index 2b0049f..9fa724b 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 = 42; +totalitems = 46; //Definisci l'array con tutti i nomi degli oggetti da fare spawnare. stack_names[0] = o_squadra_sin; stack_names[1] = o_squadra_des; @@ -46,6 +46,11 @@ stack_names[39] = o_bott_green; stack_names[40] = o_lock_green; stack_names[41] = o_chiave_green; stack_names[42] = o_CD; +stack_names[43] = o_wall_norm_L_D; +stack_names[44] = o_wall_norm_R_D; +stack_names[45] = o_wall_norm_R_U; +stack_names[46] = o_wall_norm_L_U; + //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/scripts/scrcursor.gml b/scripts/scrcursor.gml index 28bb1a4..dc8e02c 100644 --- a/scripts/scrcursor.gml +++ b/scripts/scrcursor.gml @@ -1,4 +1,4 @@ -if (selected = 10) +if (selected = 10 || selected = 43 || selected = 44 || selected = 45 || selected = 46) { draw_sprite_ext(object_get_sprite(stack_names[selected]), 0, floor((mouse_x div 32))*32,floor((mouse_y div 32))*32, 1, 1, 0, c_white, 0.4); }