Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	ChilleniumProject.project.gmx
  • Loading branch information
@discospider13
discospider13 committed Sep 25, 2016
2 parents 53f6048 + 6b096d7 commit b6535d6
Show file tree
Hide file tree
Showing 133 changed files with 203 additions and 106 deletions.
2 changes: 2 additions & 0 deletions ChilleniumProject.project.gmx
View file
Expand Up @@ -22,6 +22,7 @@
<sprite>sprites\spr_sprite_4</sprite>
<sprite>sprites\spr_dead_ship</sprite>
<sprite>sprites\spr_cutscene</sprite>
<sprite>sprites\spr_win</sprite>
</sprites>
<backgrounds name="background">
<background>background\background0</background>
Expand Down Expand Up @@ -87,6 +88,7 @@
<object>objects\obj_howto</object>
<object>objects\obj_lostTheGame</object>
<object>objects\obj_wonTheGame</object>
<object>objects\obj_win_game</object>
</objects>
<rooms name="rooms">
<room>rooms\rm_mainMenu</room>
Expand Down
194 changes: 97 additions & 97 deletions fonts/fnt_stats.font.gmx
View file
@@ -1,7 +1,7 @@
<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
<font>
<name>Perfect DOS VGA 437 Win</name>
<size>14</size>
<size>18</size>
<bold>0</bold>
<renderhq>-1</renderhq>
<italic>0</italic>
Expand All @@ -16,102 +16,102 @@
<range0>32,127</range0>
</ranges>
<glyphs>
<glyph character="32" x="2" y="2" w="11" h="20" shift="11" offset="0"/>
<glyph character="33" x="144" y="60" w="5" h="16" shift="11" offset="3"/>
<glyph character="34" x="170" y="60" w="8" h="8" shift="11" offset="1"/>
<glyph character="35" x="103" y="2" w="10" h="16" shift="11" offset="0"/>
<glyph character="36" x="82" y="2" w="9" h="18" shift="11" offset="0"/>
<glyph character="37" x="178" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="38" x="244" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="39" x="224" y="60" w="4" h="8" shift="11" offset="1"/>
<glyph character="40" x="130" y="60" w="5" h="16" shift="11" offset="3"/>
<glyph character="41" x="102" y="60" w="5" h="16" shift="11" offset="3"/>
<glyph character="42" x="222" y="42" w="10" h="13" shift="11" offset="0"/>
<glyph character="43" x="71" y="60" w="8" h="13" shift="11" offset="1"/>
<glyph character="44" x="158" y="60" w="4" h="17" shift="11" offset="3"/>
<glyph character="45" x="81" y="60" w="9" h="11" shift="11" offset="0"/>
<glyph character="46" x="191" y="60" w="3" h="16" shift="11" offset="4"/>
<glyph character="47" x="101" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="48" x="211" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="49" x="22" y="60" w="8" h="16" shift="11" offset="1"/>
<glyph character="50" x="57" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="51" x="112" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="52" x="2" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="53" x="35" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="54" x="123" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="55" x="24" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="56" x="24" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="57" x="222" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="58" x="201" y="60" w="3" h="15" shift="11" offset="4"/>
<glyph character="59" x="164" y="60" w="4" h="16" shift="11" offset="3"/>
<glyph character="60" x="42" y="60" w="8" h="16" shift="11" offset="1"/>
<glyph character="61" x="92" y="60" w="8" h="12" shift="11" offset="1"/>
<glyph character="62" x="52" y="60" w="8" h="16" shift="11" offset="1"/>
<glyph character="63" x="167" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="64" x="123" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="65" x="134" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="66" x="90" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="67" x="115" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="68" x="145" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="69" x="156" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="70" x="68" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="71" x="101" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="72" x="57" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="73" x="137" y="60" w="5" h="16" shift="11" offset="3"/>
<glyph character="74" x="148" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="75" x="236" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="76" x="79" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="77" x="2" y="60" w="8" h="16" shift="11" offset="0"/>
<glyph character="78" x="13" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="79" x="189" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="80" x="68" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="81" x="27" y="2" w="9" h="19" shift="11" offset="0"/>
<glyph character="82" x="79" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="83" x="178" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="84" x="62" y="60" w="7" h="16" shift="11" offset="2"/>
<glyph character="85" x="203" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="86" x="134" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="87" x="46" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="88" x="181" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="89" x="32" y="60" w="8" h="16" shift="11" offset="1"/>
<glyph character="90" x="200" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="91" x="123" y="60" w="5" h="16" shift="11" offset="3"/>
<glyph character="92" x="189" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="93" x="116" y="60" w="5" h="16" shift="11" offset="3"/>
<glyph character="94" x="180" y="60" w="9" h="6" shift="11" offset="0"/>
<glyph character="95" x="15" y="2" w="10" h="18" shift="11" offset="0"/>
<glyph character="96" x="217" y="60" w="5" h="7" shift="11" offset="3"/>
<glyph character="97" x="200" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="98" x="2" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="99" x="192" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="100" x="112" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="101" x="137" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="102" x="234" y="42" w="8" h="16" shift="11" offset="1"/>
<glyph character="103" x="38" y="2" w="9" h="19" shift="11" offset="0"/>
<glyph character="104" x="159" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="105" x="151" y="60" w="5" h="16" shift="11" offset="3"/>
<glyph character="106" x="93" y="2" w="8" h="20" shift="11" offset="1"/>
<glyph character="107" x="13" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="108" x="109" y="60" w="5" h="16" shift="11" offset="3"/>
<glyph character="109" x="225" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="110" x="145" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="111" x="126" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="112" x="71" y="2" w="9" h="19" shift="11" offset="0"/>
<glyph character="113" x="49" y="2" w="9" h="19" shift="11" offset="0"/>
<glyph character="114" x="233" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="115" x="35" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="116" x="156" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="117" x="46" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="118" x="214" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="119" x="167" y="24" w="9" h="16" shift="11" offset="0"/>
<glyph character="120" x="170" y="2" w="9" h="16" shift="11" offset="0"/>
<glyph character="121" x="60" y="2" w="9" h="19" shift="11" offset="0"/>
<glyph character="122" x="90" y="42" w="9" h="16" shift="11" offset="0"/>
<glyph character="123" x="12" y="60" w="8" h="16" shift="11" offset="1"/>
<glyph character="124" x="196" y="60" w="3" h="16" shift="11" offset="4"/>
<glyph character="125" x="244" y="42" w="8" h="16" shift="11" offset="1"/>
<glyph character="126" x="206" y="60" w="9" h="5" shift="11" offset="0"/>
<glyph character="127" x="211" y="42" w="9" h="15" shift="11" offset="0"/>
<glyph character="32" x="2" y="2" w="14" h="24" shift="14" offset="0"/>
<glyph character="33" x="13" y="91" w="6" h="19" shift="14" offset="3"/>
<glyph character="34" x="104" y="91" w="9" h="8" shift="14" offset="2"/>
<glyph character="35" x="54" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="36" x="84" y="2" w="11" h="22" shift="14" offset="0"/>
<glyph character="37" x="2" y="70" w="11" h="19" shift="14" offset="0"/>
<glyph character="38" x="67" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="39" x="151" y="91" w="5" h="8" shift="14" offset="2"/>
<glyph character="40" x="45" y="91" w="6" h="19" shift="14" offset="3"/>
<glyph character="41" x="61" y="91" w="6" h="19" shift="14" offset="3"/>
<glyph character="42" x="119" y="70" w="12" h="16" shift="14" offset="0"/>
<glyph character="43" x="221" y="70" w="9" h="16" shift="14" offset="2"/>
<glyph character="44" x="77" y="91" w="5" h="20" shift="14" offset="3"/>
<glyph character="45" x="232" y="70" w="11" h="13" shift="14" offset="0"/>
<glyph character="46" x="120" y="91" w="3" h="19" shift="14" offset="5"/>
<glyph character="47" x="171" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="48" x="106" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="49" x="199" y="70" w="9" h="19" shift="14" offset="2"/>
<glyph character="50" x="210" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="51" x="145" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="52" x="41" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="53" x="28" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="54" x="158" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="55" x="67" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="56" x="93" y="70" w="11" h="19" shift="14" offset="0"/>
<glyph character="57" x="132" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="58" x="138" y="91" w="3" h="18" shift="14" offset="5"/>
<glyph character="59" x="84" y="91" w="5" h="19" shift="14" offset="3"/>
<glyph character="60" x="210" y="70" w="9" h="19" shift="14" offset="2"/>
<glyph character="61" x="2" y="91" w="9" h="14" shift="14" offset="2"/>
<glyph character="62" x="133" y="70" w="9" h="19" shift="14" offset="2"/>
<glyph character="63" x="15" y="70" w="11" h="19" shift="14" offset="0"/>
<glyph character="64" x="197" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="65" x="132" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="66" x="223" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="67" x="134" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="68" x="67" y="70" w="11" h="19" shift="14" offset="0"/>
<glyph character="69" x="54" y="70" w="11" h="19" shift="14" offset="0"/>
<glyph character="70" x="119" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="71" x="236" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="72" x="184" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="73" x="21" y="91" w="6" h="19" shift="14" offset="3"/>
<glyph character="74" x="171" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="75" x="2" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="76" x="80" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="77" x="236" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="78" x="106" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="79" x="145" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="80" x="93" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="81" x="97" y="2" w="11" h="22" shift="14" offset="0"/>
<glyph character="82" x="119" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="83" x="212" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="84" x="177" y="70" w="9" h="19" shift="14" offset="2"/>
<glyph character="85" x="199" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="86" x="223" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="87" x="41" y="70" w="11" h="19" shift="14" offset="0"/>
<glyph character="88" x="121" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="89" x="166" y="70" w="9" h="19" shift="14" offset="2"/>
<glyph character="90" x="28" y="70" w="11" h="19" shift="14" offset="0"/>
<glyph character="91" x="69" y="91" w="6" h="19" shift="14" offset="3"/>
<glyph character="92" x="80" y="70" w="11" h="19" shift="14" offset="0"/>
<glyph character="93" x="37" y="91" w="6" h="19" shift="14" offset="3"/>
<glyph character="94" x="91" y="91" w="11" h="7" shift="14" offset="0"/>
<glyph character="95" x="18" y="2" w="12" h="22" shift="14" offset="0"/>
<glyph character="96" x="143" y="91" w="6" h="7" shift="14" offset="3"/>
<glyph character="97" x="28" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="98" x="15" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="99" x="238" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="100" x="184" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="101" x="147" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="102" x="188" y="70" w="9" h="19" shift="14" offset="2"/>
<glyph character="103" x="45" y="2" w="11" h="23" shift="14" offset="0"/>
<glyph character="104" x="186" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="105" x="29" y="91" w="6" h="19" shift="14" offset="3"/>
<glyph character="106" x="110" y="2" w="9" h="24" shift="14" offset="2"/>
<glyph character="107" x="2" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="108" x="53" y="91" w="6" h="19" shift="14" offset="3"/>
<glyph character="109" x="160" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="110" x="54" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="111" x="225" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="112" x="58" y="2" w="11" h="23" shift="14" offset="0"/>
<glyph character="113" x="32" y="2" w="11" h="23" shift="14" offset="0"/>
<glyph character="114" x="41" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="115" x="80" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="116" x="197" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="117" x="93" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="118" x="173" y="2" w="11" h="19" shift="14" offset="0"/>
<glyph character="119" x="210" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="120" x="15" y="28" w="11" h="19" shift="14" offset="0"/>
<glyph character="121" x="71" y="2" w="11" h="23" shift="14" offset="0"/>
<glyph character="122" x="158" y="49" w="11" h="19" shift="14" offset="0"/>
<glyph character="123" x="144" y="70" w="9" h="19" shift="14" offset="2"/>
<glyph character="124" x="115" y="91" w="3" h="19" shift="14" offset="5"/>
<glyph character="125" x="155" y="70" w="9" h="19" shift="14" offset="2"/>
<glyph character="126" x="125" y="91" w="11" h="5" shift="14" offset="0"/>
<glyph character="127" x="106" y="70" w="11" h="18" shift="14" offset="0"/>
</glyphs>
<kerningPairs/>
<image>fnt_stats.png</image>
Expand Down
Binary file modified fonts/fnt_stats.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 10.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 10.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 11.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 11.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 12.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 12.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 13.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 13.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 14.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 14.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 15.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 15.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 16.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 16.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 17.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 17.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 18.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 18.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 19.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 19.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 2.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 2.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 20.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 20.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 21.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 21.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 22.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 22.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 23.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 23.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 24.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 24.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 25.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 25.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 26.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 26.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 27.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 27.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 28.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 28.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 29.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 29.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 3.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 3.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 30.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 30.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 31.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added goodbye mess maker 31.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 32.png
View file
Binary file added goodbye mess maker 32.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 33.png
View file
Binary file added goodbye mess maker 33.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 34.png
View file
Binary file added goodbye mess maker 34.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 35.png
View file
Binary file added goodbye mess maker 35.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 36.png
View file
Binary file added goodbye mess maker 36.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 37.png
View file
Binary file added goodbye mess maker 37.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 38.png
View file
Binary file added goodbye mess maker 38.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 39.png
View file
Binary file added goodbye mess maker 39.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 4.png
View file
Binary file added goodbye mess maker 4.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 40.png
View file
Binary file added goodbye mess maker 40.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 41.png
View file
Binary file added goodbye mess maker 41.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 5.png
View file
Binary file added goodbye mess maker 5.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 6.png
View file
Binary file added goodbye mess maker 6.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 7.png
View file
Binary file added goodbye mess maker 7.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 8.png
View file
Binary file added goodbye mess maker 8.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker 9.png
View file
Binary file added goodbye mess maker 9.xcf
View file
Binary file not shown.
Binary file added goodbye mess maker.png
View file
Binary file added goodbye mess maker.xcf
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions objects/NetworkInfoBox.object.gmx
View file
Expand Up @@ -42,6 +42,8 @@ trust_ready = true;
JOIN_URL = '';
SHORTCODE = '';

lossReason = '';

</string>
</argument>
</arguments>
Expand Down Expand Up @@ -207,6 +209,10 @@ if room == rm_lost_game || room == rm_won_game {
}
}

if (room == rm_lost_game) {
draw_text(room_width / 3, room_height / 2, lossReason);
}

</string>
</argument>
</arguments>
Expand Down
2 changes: 1 addition & 1 deletion objects/obj_objective.object.gmx
View file
Expand Up @@ -188,7 +188,7 @@ doProcess = false
// Objective Complete!
obj_shipData.objectives_completed++;
audio_play_sound(snd_ding,5,false);
if (obj_shipData.objectives_completed &gt;= 10) {
if (obj_shipData.objectives_completed &gt;= 3) {
// you win
room_goto(rm_won_game);
}
Expand Down
7 changes: 4 additions & 3 deletions objects/obj_shipData.object.gmx
View file
Expand Up @@ -27,9 +27,9 @@
<kind>1</kind>
<string>//Initialize data
//(these values will probbaly change)
ship_cleanliness = 10;
ship_cleanliness = 5;
objectives_completed = 0;
turns_remaining = 30;
turns_remaining = 10;
doProcess = false;
old_messy_number = 0;

Expand Down Expand Up @@ -87,6 +87,7 @@ if(doProcess){
ship_cleanliness = clamp(ship_cleanliness, -1, 10);

if (ship_cleanliness &lt;= 0) {
NetworkInfoBox.lossReason = "Your ship got too messy!"
room_goto(rm_lost_game);
}
}
Expand Down Expand Up @@ -131,7 +132,7 @@ if(messy_number != old_messy_number)

draw_text(x, y+40, "Rooms messy: " + string(messy_number))
draw_text(x, y+80, "Turns left: " +string((turns_remaining -(obj_turnCycle.turns_elapsed))))
draw_text(x, y+120, "Objectives completed: " +string(objectives_completed) + "/10")
draw_text(x, y+120, "Objectives completed: " +string(objectives_completed) + "/3")

</string>
</argument>
Expand Down
5 changes: 3 additions & 2 deletions objects/obj_turnCycle.object.gmx
View file
Expand Up @@ -56,8 +56,9 @@ choice_offered[3] = false;
<arguments>
<argument>
<kind>1</kind>
<string>
//room_goto(rm_lost_game)
<string>NetworkInfoBox.lossReason = "You ran out of turns!"
room_goto(rm_lost_game);

</string>
</argument>
</arguments>
Expand Down
23 changes: 23 additions & 0 deletions objects/obj_win_game.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_win</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>

0 comments on commit b6535d6

Please sign in to comment.