1
Fork 0
mirror of https://github.com/Steffo99/stack.git synced 2024-11-22 07:54:20 +00:00

Tentativo di sistemare #1 e #2.

Parzialmente riuscito, solo sul menu principale.
This commit is contained in:
Steffo 2013-06-23 22:29:10 +03:00
parent 82dd1a2b69
commit 5d69718b61
11 changed files with 208 additions and 15 deletions

View file

@ -78,11 +78,10 @@
<object>objects\box</object> <object>objects\box</object>
<object>objects\text</object> <object>objects\text</object>
<object>objects\btotal</object> <object>objects\btotal</object>
<object>objects\lift</object> <object>objects\magnet</object>
<object>objects\debugobj</object> <object>objects\debugobj</object>
</objects> </objects>
<rooms name="rooms"> <rooms name="rooms">
<room>rooms\s_lifttest</room>
<room>rooms\menu</room> <room>rooms\menu</room>
<room>rooms\stackselect</room> <room>rooms\stackselect</room>
<room>rooms\boomer</room> <room>rooms\boomer</room>
@ -93,6 +92,7 @@
<room>rooms\s_stairs</room> <room>rooms\s_stairs</room>
<room>rooms\s_sidewalls</room> <room>rooms\s_sidewalls</room>
<room>rooms\s_maxi</room> <room>rooms\s_maxi</room>
<room>rooms\s_lifttest</room>
</rooms> </rooms>
</rooms> </rooms>
<help> <help>

View file

@ -8,7 +8,7 @@
<parentName>&lt;undefined&gt;</parentName> <parentName>&lt;undefined&gt;</parentName>
<maskName>&lt;undefined&gt;</maskName> <maskName>&lt;undefined&gt;</maskName>
<events> <events>
<event eventtype="4" ename="lift"> <event eventtype="4" ename="magnet">
<action> <action>
<libid>1</libid> <libid>1</libid>
<id>603</id> <id>603</id>

View file

@ -52,7 +52,7 @@
<isnot>0</isnot> <isnot>0</isnot>
</action> </action>
</event> </event>
<event eventtype="4" ename="lift"> <event eventtype="4" ename="magnet">
<action> <action>
<libid>1</libid> <libid>1</libid>
<id>603</id> <id>603</id>

109
objects/magnet.object.gmx Normal file
View file

@ -0,0 +1,109 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>up</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>1</depth>
<persistent>0</persistent>
<parentName>&lt;undefined&gt;</parentName>
<maskName>&lt;undefined&gt;</maskName>
<events>
<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_lime);
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>1</PhysicsObjectShape>
<PhysicsObjectDensity>0</PhysicsObjectDensity>
<PhysicsObjectRestitution>0</PhysicsObjectRestitution>
<PhysicsObjectGroup>1</PhysicsObjectGroup>
<PhysicsObjectLinearDamping>0.100000001490116</PhysicsObjectLinearDamping>
<PhysicsObjectAngularDamping>0.100000001490116</PhysicsObjectAngularDamping>
<PhysicsObjectFriction>0.200000002980232</PhysicsObjectFriction>
<PhysicsObjectAwake>-1</PhysicsObjectAwake>
<PhysicsObjectKinematic>0</PhysicsObjectKinematic>
<PhysicsShapePoints>
<point>0,0</point>
<point>32,0</point>
<point>32,32</point>
<point>0,32</point>
</PhysicsShapePoints>
</object>

View file

@ -52,7 +52,7 @@
<isnot>0</isnot> <isnot>0</isnot>
</action> </action>
</event> </event>
<event eventtype="4" ename="lift"> <event eventtype="4" ename="magnet">
<action> <action>
<libid>1</libid> <libid>1</libid>
<id>603</id> <id>603</id>

View file

@ -75,6 +75,34 @@
</action> </action>
</event> </event>
<event eventtype="6" enumb="53"> <event eventtype="6" enumb="53">
<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>collision_point(mouse_x, mouse_y, wall, false, true)</string>
</argument>
<argument>
<kind>0</kind>
<string>-4</string>
</argument>
<argument>
<kind>4</kind>
<string>0</string>
</argument>
</arguments>
</action>
<action> <action>
<libid>1</libid> <libid>1</libid>
<id>201</id> <id>201</id>

View file

@ -78,7 +78,7 @@
<isnot>0</isnot> <isnot>0</isnot>
</action> </action>
</event> </event>
<event eventtype="4" ename="lift"> <event eventtype="4" ename="magnet">
<action> <action>
<libid>1</libid> <libid>1</libid>
<id>603</id> <id>603</id>

View file

@ -221,6 +221,48 @@
</action> </action>
</event> </event>
<event eventtype="6" enumb="53"> <event eventtype="6" enumb="53">
<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>collision_point(mouse_x, mouse_y, wall, false, true)</string>
</argument>
<argument>
<kind>0</kind>
<string>-4</string>
</argument>
<argument>
<kind>4</kind>
<string>0</string>
</argument>
</arguments>
</action>
<action>
<libid>1</libid>
<id>422</id>
<kind>1</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> <action>
<libid>1</libid> <libid>1</libid>
<id>201</id> <id>201</id>
@ -273,6 +315,20 @@
</argument> </argument>
</arguments> </arguments>
</action> </action>
<action>
<libid>1</libid>
<id>424</id>
<kind>2</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>
</event> </event>
<event eventtype="6" enumb="51"> <event eventtype="6" enumb="51">
<action> <action>

View file

@ -8,7 +8,7 @@
<parentName>&lt;undefined&gt;</parentName> <parentName>&lt;undefined&gt;</parentName>
<maskName>&lt;undefined&gt;</maskName> <maskName>&lt;undefined&gt;</maskName>
<events> <events>
<event eventtype="4" ename="lift"> <event eventtype="4" ename="magnet">
<action> <action>
<libid>1</libid> <libid>1</libid>
<id>603</id> <id>603</id>

View file

@ -50,14 +50,14 @@
<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"/>
</views> </views>
<instances> <instances>
<instance objName="lift" x="160" y="320" name="inst_88AEAC80" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="magnet" x="160" y="320" name="inst_88AEAC80" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="lift" x="96" y="320" name="inst_8919D2E4" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="magnet" x="96" y="320" name="inst_8919D2E4" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="lift" x="128" y="320" name="inst_30F97425" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="magnet" x="128" y="320" name="inst_30F97425" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="lift" x="64" y="320" name="inst_F608B511" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="magnet" x="64" y="320" name="inst_F608B511" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="lift" x="480" y="320" name="inst_A8D5AB2C" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="magnet" x="480" y="320" name="inst_A8D5AB2C" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="lift" x="512" y="320" name="inst_D3A3A4F6" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="magnet" x="512" y="320" name="inst_D3A3A4F6" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="lift" x="544" y="320" name="inst_50F9C691" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="magnet" x="544" y="320" name="inst_50F9C691" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="lift" x="576" y="320" name="inst_48E085F8" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="magnet" x="576" y="320" name="inst_48E085F8" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="stack" x="0" y="0" name="inst_42583382" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/> <instance objName="stack" x="0" y="0" name="inst_42583382" locked="0" code="" scaleX="1" scaleY="1" colour="4294967295" rotation="0"/>
<instance objName="wall" x="320" y="256" name="inst_CB405B18" locked="0" code="" scaleX="7" scaleY="7" colour="4294967295" rotation="0"/> <instance objName="wall" x="320" y="256" name="inst_CB405B18" locked="0" code="" scaleX="7" scaleY="7" colour="4294967295" rotation="0"/>
</instances> </instances>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 B

After

Width:  |  Height:  |  Size: 191 B