From d991fe4abd6154275c8f8b498fbac7f10b1223f0 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Sun, 30 Jun 2013 19:39:09 +0300
Subject: [PATCH] Riorganizzato gli oggetti.

---
 boom.project.gmx            |  92 +++++++++++++------------
 objects/menuball.object.gmx | 130 ------------------------------------
 2 files changed, 48 insertions(+), 174 deletions(-)
 delete mode 100644 objects/menuball.object.gmx

diff --git a/boom.project.gmx b/boom.project.gmx
index 3a8921a..fd2c61c 100644
--- a/boom.project.gmx
+++ b/boom.project.gmx
@@ -6,22 +6,7 @@
   <NewExtensions/>
   <sounds name="sound"/>
   <sprites name="sprites">
-    <sprite>sprites\ytile</sprite>
-    <sprite>sprites\t_maxi</sprite>
-    <sprite>sprites\t_sidewalls</sprite>
-    <sprite>sprites\t_twotris</sprite>
-    <sprite>sprites\t_classic</sprite>
-    <sprite>sprites\t_sandbox</sprite>
-    <sprite>sprites\t_stairs</sprite>
     <sprite>sprites\up</sprite>
-    <sprite>sprites\bclassic</sprite>
-    <sprite>sprites\bsandbox</sprite>
-    <sprite>sprites\bsidewalls1</sprite>
-    <sprite>sprites\bsidewalls2</sprite>
-    <sprite>sprites\yslabl</sprite>
-    <sprite>sprites\ytopl</sprite>
-    <sprite>sprites\ytopr</sprite>
-    <sprite>sprites\yslabr</sprite>
     <sprite>sprites\rtile</sprite>
     <sprite>sprites\octo</sprite>
     <sprite>sprites\radio</sprite>
@@ -38,6 +23,23 @@
     <sprite>sprites\explosion</sprite>
     <sprite>sprites\locked</sprite>
     <sprite>sprites\coin</sprite>
+    <sprites name="Tiles">
+      <sprite>sprites\ytile</sprite>
+      <sprite>sprites\t_maxi</sprite>
+      <sprite>sprites\t_sidewalls</sprite>
+      <sprite>sprites\t_twotris</sprite>
+      <sprite>sprites\t_classic</sprite>
+      <sprite>sprites\t_sandbox</sprite>
+      <sprite>sprites\t_stairs</sprite>
+      <sprite>sprites\bclassic</sprite>
+      <sprite>sprites\bsandbox</sprite>
+      <sprite>sprites\bsidewalls1</sprite>
+      <sprite>sprites\bsidewalls2</sprite>
+      <sprite>sprites\yslabl</sprite>
+      <sprite>sprites\ytopl</sprite>
+      <sprite>sprites\ytopr</sprite>
+      <sprite>sprites\yslabr</sprite>
+    </sprites>
   </sprites>
   <backgrounds name="background"/>
   <paths name="paths"/>
@@ -58,6 +60,37 @@
     <font>fonts\devbeaten</font>
   </fonts>
   <objects name="objects">
+    <objects name="Oggetti">
+      <object>objects\stackdrop</object>
+      <object>objects\squadraL</object>
+      <object>objects\gomma</object>
+      <object>objects\pallinacartas</object>
+      <object>objects\moneta</object>
+      <object>objects\libro</object>
+      <object>objects\temperino</object>
+      <object>objects\gommag</object>
+      <object>objects\specialroll</object>
+      <object>objects\matita</object>
+      <object>objects\moon</object>
+    </objects>
+    <objects name="Pezzi">
+      <object>objects\wall</object>
+      <object>objects\gotostack</object>
+      <object>objects\gotoboom</object>
+      <object>objects\wclassic</object>
+      <object>objects\wsandbox</object>
+      <object>objects\wallslopel</object>
+      <object>objects\walltopl</object>
+      <object>objects\walltopr</object>
+      <object>objects\wallsloper</object>
+      <object>objects\goto_twotris</object>
+      <object>objects\goto_maxi</object>
+      <object>objects\goto_sidewalls</object>
+      <object>objects\goto_classic</object>
+      <object>objects\goto_sandbox</object>
+      <object>objects\goto_stairs</object>
+      <object>objects\blocklock</object>
+    </objects>
     <object>objects\nbomb</object>
     <object>objects\dbomb</object>
     <object>objects\menuball</object>
@@ -65,42 +98,13 @@
     <object>objects\menus</object>
     <object>objects\placer</object>
     <object>objects\strategy</object>
-    <object>objects\gotostack</object>
-    <object>objects\gotoboom</object>
-    <object>objects\goto_twotris</object>
-    <object>objects\goto_sidewalls</object>
-    <object>objects\goto_maxi</object>
-    <object>objects\goto_classic</object>
-    <object>objects\goto_stairs</object>
-    <object>objects\goto_sandbox</object>
-    <object>objects\blocklock</object>
     <object>objects\text</object>
     <object>objects\btotal</object>
     <object>objects\debugobj</object>
     <objects name="Stack">
       <object>objects\stack</object>
-      <object>objects\wall</object>
-      <object>objects\wclassic</object>
-      <object>objects\wsandbox</object>
-      <object>objects\wallslopel</object>
-      <object>objects\walltopl</object>
-      <object>objects\walltopr</object>
-      <object>objects\wallsloper</object>
       <object>objects\magnet</object>
       <object>objects\money</object>
-      <objects name="Oggetti">
-        <object>objects\stackdrop</object>
-        <object>objects\squadraL</object>
-        <object>objects\gomma</object>
-        <object>objects\pallinacartas</object>
-        <object>objects\moneta</object>
-        <object>objects\libro</object>
-        <object>objects\temperino</object>
-        <object>objects\gommag</object>
-        <object>objects\specialroll</object>
-        <object>objects\matita</object>
-        <object>objects\moon</object>
-      </objects>
     </objects>
   </objects>
   <rooms name="rooms">
diff --git a/objects/menuball.object.gmx b/objects/menuball.object.gmx
deleted file mode 100644
index 13cefec..0000000
--- a/objects/menuball.object.gmx
+++ /dev/null
@@ -1,130 +0,0 @@
-<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
-<object>
-  <spriteName>lball</spriteName>
-  <solid>0</solid>
-  <visible>-1</visible>
-  <depth>0</depth>
-  <persistent>0</persistent>
-  <parentName>&lt;undefined&gt;</parentName>
-  <maskName>&lt;undefined&gt;</maskName>
-  <events>
-    <event eventtype="4" ename="magnet">
-      <action>
-        <libid>1</libid>
-        <id>603</id>
-        <kind>7</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>2</exetype>
-        <functionname></functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>1</kind>
-            <string>physics_apply_local_force(0, 0, 0, -400)
-</string>
-          </argument>
-        </arguments>
-      </action>
-    </event>
-    <event eventtype="8" enumb="0">
-      <action>
-        <libid>1</libid>
-        <id>612</id>
-        <kind>0</kind>
-        <userelative>0</userelative>
-        <isquestion>-1</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>1</exetype>
-        <functionname>action_if_variable</functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>0</kind>
-            <string>debug_mode</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>true</string>
-          </argument>
-          <argument>
-            <kind>4</kind>
-            <string>0</string>
-          </argument>
-        </arguments>
-      </action>
-      <action>
-        <libid>1</libid>
-        <id>603</id>
-        <kind>7</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>2</exetype>
-        <functionname></functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>1</kind>
-            <string>draw_set_color(c_orange);
-physics_draw_debug();
-</string>
-          </argument>
-        </arguments>
-      </action>
-      <action>
-        <libid>1</libid>
-        <id>421</id>
-        <kind>3</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>0</useapplyto>
-        <exetype>0</exetype>
-        <functionname></functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-      </action>
-      <action>
-        <libid>1</libid>
-        <id>500</id>
-        <kind>0</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>0</useapplyto>
-        <exetype>2</exetype>
-        <functionname></functionname>
-        <codestring>draw_self();</codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-      </action>
-    </event>
-  </events>
-  <PhysicsObject>-1</PhysicsObject>
-  <PhysicsObjectSensor>0</PhysicsObjectSensor>
-  <PhysicsObjectShape>0</PhysicsObjectShape>
-  <PhysicsObjectDensity>0.5</PhysicsObjectDensity>
-  <PhysicsObjectRestitution>0</PhysicsObjectRestitution>
-  <PhysicsObjectGroup>1</PhysicsObjectGroup>
-  <PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
-  <PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
-  <PhysicsObjectFriction>0.100000001490116</PhysicsObjectFriction>
-  <PhysicsObjectAwake>-1</PhysicsObjectAwake>
-  <PhysicsObjectKinematic>0</PhysicsObjectKinematic>
-  <PhysicsShapePoints>
-    <point>8,8</point>
-    <point>8,0</point>
-  </PhysicsShapePoints>
-</object>