From 98adab68e25ab788b7adb799be114adda98ff1d0 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Tue, 20 May 2014 15:49:30 +0200 Subject: [PATCH] Roba. --- boom.project.gmx | 6 +- ...ove.object.gmx => o_click_move.object.gmx} | 0 objects/o_collision_move.object.gmx | 97 +++++++++ .../o_radio_palla_orange_inactive.object.gmx | 26 +++ objects/stack.object.gmx | 204 ------------------ rooms/menu.room.gmx | 6 +- rooms/menu_roll.room.gmx | 127 +++++++++++ sprites/i_spiral.sprite.gmx | 24 +++ sprites/images/i_esplosione_0.png | Bin 1164 -> 1170 bytes sprites/images/i_spiral_0.png | Bin 0 -> 159 bytes 10 files changed, 282 insertions(+), 208 deletions(-) rename objects/{o_move.object.gmx => o_click_move.object.gmx} (100%) create mode 100644 objects/o_collision_move.object.gmx create mode 100644 objects/o_radio_palla_orange_inactive.object.gmx create mode 100644 rooms/menu_roll.room.gmx create mode 100644 sprites/i_spiral.sprite.gmx create mode 100644 sprites/images/i_spiral_0.png 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 a692f6acbd3d28a534272884107082709342b490..30b3f8e4caf539beff96266c6578d55927f884d6 100644 GIT binary patch delta 1149 zcmV-@1cLjF36cqrB!5{+L_t(|ob8(-bK5`=h4owV^ZY9c0t^BQ3JL-W3JMB3lY)YR z&J+|B1QZw)1QY}W6cltk1*&b`R;%Z?dwY_6b?ksgGLqu=?b|);BscA|rm3VwQfp|H zRO|EXRP&!L+RL3M24%rO5YieGk}$UF4Xt|4^mR}<7{fHk z>T+-Zyw|bnQPZzLQ5b$2if6<0$Ya%+aWwndkOu`5!O}3ICCVxvsXCgr%)SBTpfC_# z8iGlPS3X*GW`7*bZuJ(#j5nb(!~s&1Lx>LZ99qd|CS zU`gm9xUG<1?pXAhd8_Ko>{g#Z>==ZAAQ%Kb56mQti+?`G-m5w@{Mir#l1l@d2?eb% zE&85$G>&G!fGikR8W@BTtzZKviN2U;RksX(1zA9>Gzf%vD`WwTi$1G7R-GBX1u-Bj z4J-*0T7d(IMqdv+W*)08X1^Ii7&;9Mf*y>~Ru}~U&9mrZ>~qFfpd1L+4wwQ4Aq*he z`?=^d^MB0rcMyZ&LCCd2a27PJ+%^;6-1|OO>_Z`y_-QAOu3B72*J7zd!-V#lI8) zn%9-TS9(a&f3uQcr632uhENdzniu0glMsZ4aDNm4Z~*G*kHZgpU&mg|i}7Dc8iWRL z2LNuH{qF_i24Mk!xvGx_CZin*#PV06!2;hu1M4q<9k~%UqHbvRSDBB^P zcYjm#CT)gXY`k9h08VpTJPY9LAB>EDG^Sgj)}yh~=K)~=Q(6HbFc1s|nzpL$nJD259`AO63jjzfEOxPpv;tcmSsJvMS(H_E%RHO<%Z=&FedBomkyc>s;H5#!GONX^ z&SF0z`Vjz!dr68xVaG7z6~A&zxIFH!4ptf%3=0Z7Mqk6O zx=efdd?DlG01P1<%j@zIdFlCs0l?LvPlA<(D2$wGuh(UrukeEjt0n%|PiEY2cy=`a zNE-B9SePIXh9^Al3VMB+dfoYkR}X+S8#D+Dh$TEvDn6mt4+(%LVwj4>?!#a0v~RG} zItkC~r~3>QKRkf`rz(p9jLUx!ZVj!I@I1NREETT-z)MF=6+cs507t05XpmsG$9i0F P00000NkvXXu0mjfS3U#Y delta 1143 zcmV--1c>{R35*GlB!5#$L_t(|ob8)Gs}oTW#q(M6eMCeN5m7`$2_mA1h$4Ot3k$(Q zun;0x2o@HCgeZ^_QZj$qxGjlh)H?!*T zY&MV-sG+`3tsy^b@$XTsO3_}_kq5A;sx_(E)wT@(zVDL-gr%aBM08ehWLz5ibNkj2$XdQW3b!1$c{dNn>f+7=v z($J(OiYo7^x_>mSnf-b*RSpUQVWq*F1b5}VRY%69*`U1}sn9VR2xl6)0l;HlQgzF0 z(3eFjbc}@IO+(2t>7MqMd0BO7T$=rS9ZQ2E6QQL+Kya-N#nC78R@J3(WcJgwR2C2f z0;PcPgFakIg^rOB zBnSjSnFneT8bx2m-l{q>{Qfc)0+LGunh7PX&?@?td1+jleRnC92182&g3zQDQ~)K> zC-bQ4n&Gz>Q)xi7G!TS>R>%Tq6n#{AS#@Oi&4pA52ucG=LYr2A0KC!X0}q*()h4sA z&tpj#Jbw)c0w0XtR%ir3nn%%>vCkQQbuLv71ZoGF0tCSgz}x$|=p*yU^vkoU5DW`K zt`)qqU>0dCtm+5x!KX!E_PjJtW?!7a;xHrxG#F(oIA_6f?R8lMK&!qLearmw(^y^z zxmL)u!4`n3r2i2BEBa)fs>}^PJGCzffj|%hPk$>E0HFH?2LN*MF9jgY^U9OyprI&C-YBEYy$|d5d_`}96*q~ zE@(Ii{Q$bEJ^>)ZRh5cf=QE+J6pR9ZjJ^gyrr;RBt^hc)Eim~ZIE7`f-kLI@3!&B8 z>whW%5Ft$EQaG4jWq%Iu@QHXMb%`6xG9QmjG{Zl9p4mP z#+xDYwb!``U`KC@X8}z9!ARprW7Y%Fz8;O0J`ZpMXwwQqJsj;K`dI)w^mx3!3tR$# zS|OyswJMn}6r72Xg4C=GlrEO0as z5{4ytUVOhzug88jukZ!~pv?vjLIa{no<|jL)9ZZ#fQb;P2wH|JN^?xBD0$vyx_43W z-T_nxe^ps<7@=Qd6)Q!nD0v>eUndnG0)UkcmxlaKgMQc;^&bnpOi#4WXVxhFv4Xj69dp6M zhwmAZK7J@>*je$yx*@9Kg=Irn#Ruz#xQY*!2@5_nSTiu(xgGFxsY2@^pp6Wku6{1- HoD!M<$Xh*k literal 0 HcmV?d00001