Skip to content

Commit

Permalink
Fixed massive memory leak. Added new rpg-looking font. Started adding…
Browse files Browse the repository at this point in the history 
… elements to UI
  • Loading branch information
@stanica
stanica committed May 26, 2014
1 parent 131ecad commit 7531a1e
Show file tree
Hide file tree
Showing 47 changed files with 600 additions and 247 deletions.
17 changes: 13 additions & 4 deletions Dungeon.project.gmx
View file
Expand Up @@ -9,7 +9,10 @@
<sprite>sprites\spr_block</sprite>
<sprite>sprites\spr_player</sprite>
<sprite>sprites\spr_smallRat</sprite>
<sprite>sprites\spr_scroll_button</sprite>
<sprite>sprites\spr_scrollButton</sprite>
<sprite>sprites\spr_smallHelm</sprite>
<sprite>sprites\spr_armorUI</sprite>
<sprite>sprites\spr_indent</sprite>
</sprites>
<backgrounds name="background"/>
<paths name="paths"/>
Expand All @@ -23,11 +26,11 @@
<script>scripts\map1.gml</script>
<script>scripts\doCombat.gml</script>
<script>scripts\meleeDamage.gml</script>
<script>scripts\checkHealth.gml</script>
<script>scripts\addToLog.gml</script>
<script>scripts\start_chase.gml</script>
<script>scripts\chase.gml</script>
</scripts>
<fonts name="fonts">
<font>fonts\fnt_8bit</font>
</fonts>
<objects name="objects">
<object>objects\obj_control</object>
<object>objects\obj_entity</object>
Expand All @@ -42,6 +45,12 @@
<object>objects\obj_ui</object>
<object>objects\obj_up_button</object>
<object>objects\obj_down_button</object>
<object>objects\obj_indent</object>
<object>objects\obj_smallHelm</object>
<object>objects\obj_helm</object>
<object>objects\obj_chest</object>
<object>objects\obj_wep</object>
<object>objects\obj_shield</object>
</objects>
<rooms name="rooms">
<room>rooms\room0</room>
Expand Down
Binary file removed Resources/WallSet.png
View file
Binary file not shown.
115 changes: 115 additions & 0 deletions fonts/fnt_8bit.font.gmx
View file
@@ -0,0 +1,115 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<font>
<name>Yoster Island</name>
<size>12</size>
<bold>0</bold>
<italic>0</italic>
<charset>1</charset>
<aa>3</aa>
<texgroups>
<texgroup0>0</texgroup0>
</texgroups>
<ranges>
<range0>32,127</range0>
</ranges>
<glyphs>
<glyph character="113" x="174" y="2" w="10" h="16" shift="11" offset="1"/>
<glyph character="87" x="50" y="53" w="10" h="13" shift="11" offset="1"/>
<glyph character="50" x="146" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="108" x="70" y="68" w="5" h="13" shift="5" offset="1"/>
<glyph character="61" x="53" y="68" w="8" h="9" shift="11" offset="2"/>
<glyph character="77" x="62" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="56" x="227" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="35" x="64" y="2" w="18" h="16" shift="21" offset="2"/>
<glyph character="115" x="155" y="53" w="9" h="13" shift="9" offset="1"/>
<glyph character="122" x="50" y="20" w="10" h="15" shift="11" offset="1"/>
<glyph character="105" x="63" y="68" w="5" h="13" shift="5" offset="1"/>
<glyph character="47" x="108" y="68" w="3" h="15" shift="5" offset="1"/>
<glyph character="80" x="95" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="82" x="26" y="53" w="10" h="13" shift="11" offset="1"/>
<glyph character="125" x="44" y="2" w="18" h="16" shift="21" offset="2"/>
<glyph character="48" x="14" y="53" w="10" h="13" shift="11" offset="1"/>
<glyph character="32" x="23" y="68" w="5" h="16" shift="5" offset="0"/>
<glyph character="91" x="233" y="53" w="10" h="11" shift="11" offset="0"/>
<glyph character="57" x="74" y="53" w="10" h="13" shift="11" offset="1"/>
<glyph character="79" x="62" y="53" w="10" h="13" shift="11" offset="1"/>
<glyph character="97" x="122" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="98" x="170" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="107" x="182" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="114" x="133" y="53" w="9" h="13" shift="9" offset="1"/>
<glyph character="46" x="103" y="68" w="3" h="15" shift="5" offset="1"/>
<glyph character="38" x="124" y="2" w="18" h="16" shift="21" offset="2"/>
<glyph character="100" x="218" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="44" x="98" y="68" w="3" h="16" shift="5" offset="1"/>
<glyph character="81" x="38" y="20" w="10" h="15" shift="11" offset="1"/>
<glyph character="90" x="110" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="92" x="221" y="53" w="10" h="11" shift="11" offset="0"/>
<glyph character="68" x="158" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="36" x="104" y="2" w="18" h="16" shift="21" offset="2"/>
<glyph character="86" x="230" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="64" x="84" y="20" w="9" h="15" shift="9" offset="1"/>
<glyph character="37" x="84" y="2" w="18" h="16" shift="21" offset="2"/>
<glyph character="63" x="73" y="20" w="9" h="15" shift="9" offset="1"/>
<glyph character="69" x="144" y="53" w="9" h="13" shift="9" offset="1"/>
<glyph character="83" x="86" y="53" w="10" h="13" shift="11" offset="1"/>
<glyph character="89" x="2" y="53" w="10" h="13" shift="11" offset="1"/>
<glyph character="41" x="125" y="68" w="4" h="5" shift="5" offset="2"/>
<glyph character="112" x="186" y="2" w="10" h="16" shift="11" offset="1"/>
<glyph character="43" x="144" y="2" w="15" h="16" shift="21" offset="4"/>
<glyph character="96" x="26" y="20" w="10" h="16" shift="11" offset="1"/>
<glyph character="104" x="98" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="111" x="167" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="120" x="155" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="126" x="110" y="53" w="10" h="12" shift="11" offset="1"/>
<glyph character="33" x="46" y="68" w="5" h="15" shift="7" offset="1"/>
<glyph character="99" x="191" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="73" x="38" y="68" w="6" h="13" shift="7" offset="1"/>
<glyph character="106" x="62" y="20" w="9" h="16" shift="9" offset="1"/>
<glyph character="88" x="119" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="102" x="199" y="53" w="9" h="13" shift="9" offset="1"/>
<glyph character="109" x="131" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="118" x="215" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="67" x="50" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="101" x="210" y="53" w="9" h="13" shift="9" offset="1"/>
<glyph character="121" x="161" y="2" w="11" h="16" shift="11" offset="0"/>
<glyph character="74" x="86" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="84" x="74" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="39" x="113" y="68" w="4" h="5" shift="5" offset="2"/>
<glyph character="94" x="234" y="2" w="10" h="16" shift="11" offset="1"/>
<glyph character="59" x="77" y="68" w="4" h="13" shift="7" offset="2"/>
<glyph character="49" x="30" y="68" w="6" h="13" shift="11" offset="2"/>
<glyph character="51" x="14" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="54" x="26" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="66" x="2" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="60" x="14" y="20" w="10" h="16" shift="11" offset="1"/>
<glyph character="71" x="38" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="95" x="2" y="20" w="10" h="16" shift="11" offset="1"/>
<glyph character="116" x="166" y="53" w="9" h="13" shift="9" offset="1"/>
<glyph character="119" x="107" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="40" x="119" y="68" w="4" h="5" shift="5" offset="2"/>
<glyph character="65" x="203" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="110" x="179" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="123" x="23" y="2" w="19" h="16" shift="21" offset="1"/>
<glyph character="127" x="98" y="53" w="10" h="12" shift="11" offset="1"/>
<glyph character="55" x="134" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="53" x="206" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="62" x="210" y="2" w="10" h="16" shift="11" offset="1"/>
<glyph character="45" x="2" y="68" w="10" h="9" shift="12" offset="1"/>
<glyph character="42" x="14" y="68" w="7" h="12" shift="11" offset="1"/>
<glyph character="52" x="122" y="53" w="9" h="13" shift="11" offset="1"/>
<glyph character="93" x="222" y="2" w="10" h="16" shift="11" offset="1"/>
<glyph character="103" x="198" y="2" w="10" h="16" shift="11" offset="1"/>
<glyph character="78" x="242" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="70" x="188" y="53" w="9" h="13" shift="9" offset="1"/>
<glyph character="76" x="177" y="53" w="9" h="13" shift="9" offset="1"/>
<glyph character="117" x="143" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="124" x="2" y="2" w="19" h="16" shift="21" offset="1"/>
<glyph character="34" x="83" y="68" w="7" h="7" shift="11" offset="1"/>
<glyph character="72" x="239" y="20" w="10" h="13" shift="11" offset="1"/>
<glyph character="75" x="38" y="53" w="10" h="13" shift="11" offset="1"/>
<glyph character="85" x="194" y="38" w="10" h="13" shift="11" offset="1"/>
<glyph character="58" x="92" y="68" w="4" h="12" shift="7" offset="2"/>
</glyphs>
<kerningPairs/>
<image>fnt_8bit.png</image>
</font>
Binary file added fonts/fnt_8bit.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 51 additions & 0 deletions objects/obj_chest.object.gmx
View file
@@ -0,0 +1,51 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>spr_armorUI</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="0" enumb="0">
<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>image_index = 1;
image_speed = 0;
</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>
<point>15,15</point>
<point>16,16</point>
</PhysicsShapePoints>
</object>
34 changes: 31 additions & 3 deletions objects/obj_down_button.object.gmx
View file
@@ -1,6 +1,6 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>spr_scroll_button</spriteName>
<spriteName>spr_scrollButton</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>0</depth>
Expand All @@ -27,6 +27,30 @@
<kind>1</kind>
<string>image_index = 1;
image_speed = 0;
</string>
</argument>
</arguments>
</action>
</event>
<event eventtype="6" enumb="7">
<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>image_index=1;

</string>
</argument>
</arguments>
Expand All @@ -49,8 +73,12 @@ image_speed = 0;
<arguments>
<argument>
<kind>1</kind>
<string>if (logSize - logIndex &gt; 5)
logIndex = logIndex + 1;
<string>image_index=3;

logSize = ds_list_size(combatStrings);
if (logSize - logIndex &gt; 5)
logIndex = logIndex + 1;

</string>
</argument>
</arguments>
Expand Down
51 changes: 51 additions & 0 deletions objects/obj_helm.object.gmx
View file
@@ -0,0 +1,51 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>spr_armorUI</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="0" enumb="0">
<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>image_index = 0;
image_speed = 0;
</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>
<point>15,15</point>
<point>16,16</point>
</PhysicsShapePoints>
</object>
23 changes: 23 additions & 0 deletions objects/obj_indent.object.gmx
View file
@@ -0,0 +1,23 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<object>
<spriteName>spr_indent</spriteName>
<solid>0</solid>
<visible>-1</visible>
<depth>0</depth>
<persistent>0</persistent>
<parentName>&lt;undefined&gt;</parentName>
<maskName>&lt;undefined&gt;</maskName>
<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>
7 changes: 6 additions & 1 deletion objects/obj_player.object.gmx
View file
Expand Up @@ -89,6 +89,11 @@ view_yview[0] = y - (view_hview[0] / 2);

var x1 = floor(x/32);
var y1 = floor(y/32);

if (health &lt; 0) {
show_message("Game over. You were killed.");
game_restart();
}
</string>
</argument>
</arguments>
Expand All @@ -111,7 +116,7 @@ var y1 = floor(y/32);
<arguments>
<argument>
<kind>1</kind>
<string>doCombat(other.id, other.enemyType);
<string>doCombat(other.id);
</string>
</argument>
</arguments>
Expand Down

0 comments on commit 7531a1e

Please sign in to comment.