From c0c253b2847df3e55f7471ebf81275284bd07705 Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Sat, 6 Jul 2013 22:06:52 +0300
Subject: [PATCH] Roba.

---
 boom.project.gmx             |   3 +-
 objects/following.object.gmx | 102 +++++++++++++++++++++++++++++++++++
 objects/m_totem.object.gmx   |  48 ++---------------
 objects/stack.object.gmx     |   4 +-
 rooms/t_classic.room.gmx     |  21 ++++----
 scripts/m_totem_init.gml     |   4 +-
 scripts/totemcursor.gml      |   1 -
 7 files changed, 123 insertions(+), 60 deletions(-)
 create mode 100644 objects/following.object.gmx
 delete mode 100644 scripts/totemcursor.gml

diff --git a/boom.project.gmx b/boom.project.gmx
index 3a087dc..471ce9a 100644
--- a/boom.project.gmx
+++ b/boom.project.gmx
@@ -56,6 +56,7 @@
       <sprite>sprites\i_half_R_D</sprite>
       <sprite>sprites\i_locked</sprite>
     </sprites>
+    <sprite>sprites\clock60</sprite>
   </sprites>
   <backgrounds name="background"/>
   <paths name="paths"/>
@@ -69,7 +70,6 @@
     <script>scripts\m_stack_init.gml</script>
     <script>scripts\m_totem_init.gml</script>
     <script>scripts\scrcursor.gml</script>
-    <script>scripts\totemcursor.gml</script>
     <script>scripts\rollL.gml</script>
     <script>scripts\rollR.gml</script>
     <script>scripts\rocketup.gml</script>
@@ -157,6 +157,7 @@
       <object>objects\btotal</object>
       <object>objects\stack</object>
       <object>objects\m_totem</object>
+      <object>objects\following</object>
       <object>objects\debugobj</object>
       <object>objects\strategy</object>
       <object>objects\boom</object>
diff --git a/objects/following.object.gmx b/objects/following.object.gmx
new file mode 100644
index 0000000..9c775dc
--- /dev/null
+++ b/objects/following.object.gmx
@@ -0,0 +1,102 @@
+<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
+<object>
+  <spriteName>&lt;undefined&gt;</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="5" enumb="40">
+      <action>
+        <libid>1</libid>
+        <id>109</id>
+        <kind>0</kind>
+        <userelative>-1</userelative>
+        <isquestion>0</isquestion>
+        <useapplyto>-1</useapplyto>
+        <exetype>1</exetype>
+        <functionname>action_move_to</functionname>
+        <codestring></codestring>
+        <whoName>self</whoName>
+        <relative>-1</relative>
+        <isnot>0</isnot>
+        <arguments>
+          <argument>
+            <kind>0</kind>
+            <string>0</string>
+          </argument>
+          <argument>
+            <kind>0</kind>
+            <string>+2</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
+    <event eventtype="5" enumb="38">
+      <action>
+        <libid>1</libid>
+        <id>109</id>
+        <kind>0</kind>
+        <userelative>-1</userelative>
+        <isquestion>0</isquestion>
+        <useapplyto>-1</useapplyto>
+        <exetype>1</exetype>
+        <functionname>action_move_to</functionname>
+        <codestring></codestring>
+        <whoName>self</whoName>
+        <relative>-1</relative>
+        <isnot>0</isnot>
+        <arguments>
+          <argument>
+            <kind>0</kind>
+            <string>0</string>
+          </argument>
+          <argument>
+            <kind>0</kind>
+            <string>-2</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
+    <event eventtype="6" enumb="53">
+      <action>
+        <libid>1</libid>
+        <id>109</id>
+        <kind>0</kind>
+        <userelative>-1</userelative>
+        <isquestion>0</isquestion>
+        <useapplyto>-1</useapplyto>
+        <exetype>1</exetype>
+        <functionname>action_move_to</functionname>
+        <codestring></codestring>
+        <whoName>self</whoName>
+        <relative>-1</relative>
+        <isnot>0</isnot>
+        <arguments>
+          <argument>
+            <kind>0</kind>
+            <string>0</string>
+          </argument>
+          <argument>
+            <kind>0</kind>
+            <string>-32</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
+  </events>
+  <PhysicsObject>0</PhysicsObject>
+  <PhysicsObjectSensor>0</PhysicsObjectSensor>
+  <PhysicsObjectShape>0</PhysicsObjectShape>
+  <PhysicsObjectDensity>0.5</PhysicsObjectDensity>
+  <PhysicsObjectRestitution>0.100000001490116</PhysicsObjectRestitution>
+  <PhysicsObjectGroup>0</PhysicsObjectGroup>
+  <PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
+  <PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
+  <PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
+  <PhysicsObjectAwake>-1</PhysicsObjectAwake>
+  <PhysicsObjectKinematic>0</PhysicsObjectKinematic>
+  <PhysicsShapePoints/>
+</object>
diff --git a/objects/m_totem.object.gmx b/objects/m_totem.object.gmx
index a80ed6b..144edad 100644
--- a/objects/m_totem.object.gmx
+++ b/objects/m_totem.object.gmx
@@ -115,8 +115,8 @@ instance_create(mouse_x,mouse_y,totem_list[selected]);
 pile = pile + 1;
 //Seleziona un altro totem casuale.
 selected = irandom(totalitems);
-//Metti il mouse in una posizione casuale sullo schermo. Bwhahaha!
-display_mouse_set(irandom(640), irandom(480));
+/*Metti il mouse in una posizione casuale sullo schermo. Bwhahaha!
+display_mouse_set(irandom(640), irandom(480));*/
 </string>
           </argument>
         </arguments>
@@ -157,7 +157,7 @@ display_mouse_set(irandom(640), irandom(480));
           </argument>
           <argument>
             <kind>4</kind>
-            <string>0</string>
+            <string>1</string>
           </argument>
         </arguments>
       </action>
@@ -222,47 +222,7 @@ display_mouse_set(irandom(640), irandom(480));
           </argument>
           <argument>
             <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-        </arguments>
-      </action>
-      <action>
-        <libid>1</libid>
-        <id>601</id>
-        <kind>0</kind>
-        <userelative>0</userelative>
-        <isquestion>0</isquestion>
-        <useapplyto>-1</useapplyto>
-        <exetype>1</exetype>
-        <functionname>action_execute_script</functionname>
-        <codestring></codestring>
-        <whoName>self</whoName>
-        <relative>0</relative>
-        <isnot>0</isnot>
-        <arguments>
-          <argument>
-            <kind>9</kind>
-            <script>totemcursor</script>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
-          </argument>
-          <argument>
-            <kind>0</kind>
-            <string>0</string>
+            <string>320</string>
           </argument>
           <argument>
             <kind>0</kind>
diff --git a/objects/stack.object.gmx b/objects/stack.object.gmx
index b7f039b..215c42b 100644
--- a/objects/stack.object.gmx
+++ b/objects/stack.object.gmx
@@ -49,7 +49,7 @@
         <arguments>
           <argument>
             <kind>9</kind>
-            <script>init</script>
+            <script>m_stack_init</script>
           </argument>
           <argument>
             <kind>0</kind>
@@ -617,7 +617,7 @@ instance_create(mouse_x,mouse_y,stack_names[selected]);
         <arguments>
           <argument>
             <kind>9</kind>
-            <script>init</script>
+            <script>m_stack_init</script>
           </argument>
           <argument>
             <kind>0</kind>
diff --git a/rooms/t_classic.room.gmx b/rooms/t_classic.room.gmx
index 7c1a5f8..145359e 100644
--- a/rooms/t_classic.room.gmx
+++ b/rooms/t_classic.room.gmx
@@ -2,7 +2,7 @@
 <room>
   <caption></caption>
   <width>640</width>
-  <height>480</height>
+  <height>960</height>
   <vsnap>32</vsnap>
   <hsnap>32</hsnap>
   <isometric>0</isometric>
@@ -11,13 +11,13 @@
   <colour>64</colour>
   <showcolour>-1</showcolour>
   <code></code>
-  <enableViews>0</enableViews>
+  <enableViews>-1</enableViews>
   <clearViewBackground>-1</clearViewBackground>
   <makerSettings>
     <isSet>-1</isSet>
-    <w>822</w>
-    <h>454</h>
-    <showGrid>-1</showGrid>
+    <w>1050</w>
+    <h>463</h>
+    <showGrid>0</showGrid>
     <showObjects>-1</showObjects>
     <showTiles>-1</showTiles>
     <showBackgrounds>-1</showBackgrounds>
@@ -25,9 +25,9 @@
     <showViews>0</showViews>
     <deleteUnderlyingObj>0</deleteUnderlyingObj>
     <deleteUnderlyingTiles>-1</deleteUnderlyingTiles>
-    <page>1</page>
-    <xoffset>45</xoffset>
-    <yoffset>136</yoffset>
+    <page>4</page>
+    <xoffset>175</xoffset>
+    <yoffset>180</yoffset>
   </makerSettings>
   <backgrounds>
     <background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
@@ -40,7 +40,7 @@
     <background visible="0" foreground="0" name="" x="0" y="0" htiled="-1" vtiled="-1" hspeed="0" vspeed="0" stretch="0"/>
   </backgrounds>
   <views>
-    <view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="640" hview="480" xport="0" yport="0" wport="640" hport="480" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
+    <view visible="-1" objName="following" xview="0" yview="480" wview="640" hview="480" xport="0" yport="0" wport="640" hport="480" hborder="320" vborder="240" hspeed="2" vspeed="2"/>
     <view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="640" hview="480" xport="0" yport="0" wport="640" hport="480" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
     <view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="640" hview="480" xport="0" yport="0" wport="640" hport="480" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
     <view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="640" hview="480" xport="0" yport="0" wport="640" hport="480" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
@@ -50,8 +50,9 @@
     <view visible="0" objName="&lt;undefined&gt;" xview="0" yview="0" wview="640" hview="480" xport="0" yport="0" wport="640" hport="480" hborder="32" vborder="32" hspeed="-1" vspeed="-1"/>
   </views>
   <instances>
-    <instance objName="o_wall_inv_classic" x="320" y="448" name="inst_F8162FC6" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
+    <instance objName="o_wall_inv_classic" x="320" y="928" name="inst_F8162FC6" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
     <instance objName="m_totem" x="0" y="0" name="inst_9BBB578C" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
+    <instance objName="following" x="320" y="896" name="inst_1F7DBCD7" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
   </instances>
   <tiles/>
   <PhysicsWorld>-1</PhysicsWorld>
diff --git a/scripts/m_totem_init.gml b/scripts/m_totem_init.gml
index 5c1abf8..d434332 100644
--- a/scripts/m_totem_init.gml
+++ b/scripts/m_totem_init.gml
@@ -15,8 +15,8 @@ totem_list[6] = o_totem_G;
 totem_list[7] = o_totem_H;
 totem_list[8] = o_totem_I;
 totem_list[9] = o_totem_J;
-//Disattiva il mouse normale visto che viene generato automaticamente.
-window_set_cursor(cr_none);
+//Cambia il mouse.
+window_set_cursor(cr_cross);
 //Apri il file di salvataggio, carica il record e chiudi il file.
 ini_open("savefile.ini");
 m_totem.blocksr = ini_read_real("Totem",room_get_name(room),"0");
diff --git a/scripts/totemcursor.gml b/scripts/totemcursor.gml
deleted file mode 100644
index 8ffcd46..0000000
--- a/scripts/totemcursor.gml
+++ /dev/null
@@ -1 +0,0 @@
-draw_sprite_ext(object_get_sprite(totem_list[selected]), -1, mouse_x, mouse_y, 1, 1, 0, c_white, 0.4);