diff --git a/PetGB.sublime-workspace b/PetGB.sublime-workspace index 5f07239..a54f2a6 100644 --- a/PetGB.sublime-workspace +++ b/PetGB.sublime-workspace @@ -3,9 +3,77 @@ { "selected_items": [ + [ + "_hou", + "_hoursSuffering" + ], + [ + "E", + "ENDGAME" + ], + [ + "els", + "elapsed" + ], + [ + "End", + "EndState\tclass" + ], + [ + "_is", + "_isHungry\tBool" + ], + [ + "a", + "arrowInput" + ], + [ + "m", + "muted\tBool" + ], + [ + "_g", + "_usingArrows\tBool" + ], + [ + "_txt", + "_txtTitle\tflixel.text.FlxText" + ], + [ + "str", + "_strControls\tString" + ], + [ + "_", + "_gameMuted\tBool" + ], + [ + "menu", + "_menuChoice\tInt" + ], + [ + "Flx", + "FlxG" + ], + [ + "_str", + "_strControls\tString" + ], + [ + "_s", + "_sprCursor" + ], [ "_spr", - "_sprEgg\tflixel.FlxSprite" + "_sprCursor\tflixel.FlxSprite" + ], + [ + "FlxS", + "FlxSprite\tclass" + ], + [ + "Conf", + "ConfigMenu\tclass" ], [ "_sp", @@ -67,10 +135,6 @@ "_tx", "_txtTime" ], - [ - "_txt", - "_txtDIS\tflixel.text.FlxText" - ], [ "int", "Interact__png\tString" @@ -139,14 +203,6 @@ "Menu", "InfoMenu\tclass" ], - [ - "_", - "_txtTitle" - ], - [ - "E", - "EarlyGameBoy__ttf\tString" - ], [ "FlxTw", "FlxTween\tclass" @@ -159,10 +215,6 @@ "Fl", "FlxG\tclass" ], - [ - "a", - "animation\tflixel.animation.FlxAnimationController" - ], [ "an", "animation\tflixel.animation.FlxAnimationController" @@ -175,10 +227,6 @@ "Cu", "CurrentMood\tMood" ], - [ - "_is", - "_isTired\tBool" - ], [ "Sl", "Sleepiness\tInt" @@ -267,10 +315,6 @@ "W", "Wait" ], - [ - "Flx", - "FlxG\tflixel" - ], [ "it", "itemLeave\tfunction" @@ -291,10 +335,6 @@ "_in", "_sprInteraction\tvar" ], - [ - "_s", - "_sprInteraction" - ], [ "_sprin", "_sprInteraction\tvar" @@ -307,10 +347,6 @@ "Ma", "MAX_LEVEL\tInt" ], - [ - "menu", - "_menuOption\tInt" - ], [ "_st", "_statDiscipline" @@ -359,10 +395,6 @@ "sp", "_sprRest" ], - [ - "FlxS", - "FlxSprite\tflixel" - ], [ "From", "fromRGB(...)\tflixel.util.FlxColor" @@ -482,57 +514,51 @@ [ "add", "addons\tpackage" - ], - [ - "FlxTil", - "FlxTilemap\tflixel.tile" - ], - [ - "F", - "FlxObject\tclass" - ], - [ - "move", - "movement( )\tVoid" - ], - [ - "ro", - "rotate(...)\tflixel.math.FlxPoint" - ], - [ - "flix", - "flixel\tpackage" - ], - [ - "ass", - "assets" - ], - [ - "l", - "listdir" - ], - [ - "in", - "input" ] ] }, "buffers": [ { - "file": "source/PlayState.hx", + "file": "source/EndState.hx", "settings": { - "buffer_size": 2117, + "buffer_size": 856, "encoding": "UTF-8", + "line_ending": "Windows" + } + }, + { + "file": "source/InfoMenu.hx", + "settings": + { + "buffer_size": 2608, + "encoding": "UTF-8", + "line_ending": "Windows" + } + }, + { + "file": "source/ConfigMenu.hx", + "settings": + { + "buffer_size": 4503, + "encoding": "UTF-8", + "line_ending": "Windows" + } + }, + { + "file": "Project.xml", + "settings": + { + "buffer_size": 3131, "line_ending": "Unix" } }, { - "file": "source/MenuState.hx", + "file": "source/Gel.hx", "settings": { - "buffer_size": 1967, + "buffer_size": 8542, "encoding": "UTF-8", "line_ending": "Windows" } @@ -541,25 +567,24 @@ "file": "source/HUD.hx", "settings": { - "buffer_size": 10975, - "encoding": "UTF-8", + "buffer_size": 11997, "line_ending": "Windows" } }, { - "file": "source/Gel.hx", + "file": "source/PlayState.hx", "settings": { - "buffer_size": 7875, + "buffer_size": 1589, "encoding": "UTF-8", - "line_ending": "Windows" + "line_ending": "Unix" } }, { "file": "source/Main.hx", "settings": { - "buffer_size": 686, + "buffer_size": 636, "encoding": "UTF-8", "line_ending": "Unix" } @@ -573,29 +598,29 @@ "command_palette": { "height": 357.0, - "last_filter": "TOD", + "last_filter": "", "selected_items": [ [ - "TOD", + "im", + "Haxe: Organize Imports" + ], + [ + "todo", "TodoReview: Open Files" ], [ "i", "Haxe: Organize Imports" ], + [ + "TOD", + "TodoReview: Open Files" + ], [ "to", "TodoReview: Open Files" ], - [ - "todo", - "TodoReview: Open Files" - ], - [ - "im", - "Haxe: Organize Imports" - ], [ "install", "Package Control: Install Package" @@ -737,7 +762,7 @@ "Package Control: Install Package" ] ], - "width": 446.0 + "width": 414.0 }, "console": { @@ -764,15 +789,17 @@ ], "file_history": [ + "/C/Users/melon/Documents/Projects/Pet.GB/source/HUD.hx", + "/C/Users/melon/Documents/Projects/Pet.GB/source/PlayState.hx", + "/C/Users/melon/Documents/Projects/Pet.GB/source/MenuState.hx", + "/C/Users/melon/Documents/Projects/Pet.GB/source/Main.hx", + "/C/Users/melon/Documents/Projects/Pet.GB/source/Gel.hx", + "/C/Users/melon/Documents/Projects/Pet.GB/source/EndState.hx", "/C/Users/melon/Documents/Projects/Pet.GB/source/InfoMenu.hx", "/C/Users/melon/Documents/Projects/Pet.GB/source/Clock.hx", - "/C/Users/melon/Documents/Projects/Pet.GB/source/PlayState.hx", - "/C/Users/melon/Documents/Projects/Pet.GB/source/Main.hx", - "/C/Users/melon/Documents/Projects/Pet.GB/source/MenuState.hx", "/c/haxetoolkit/haxe/lib/flixel/4,1,1/flixel/FlxBasic.hx", "/C/Users/melon/Documents/Projects/Pet.GB/Project.xml", "/C/Users/melon/Documents/Projects/Pet.GB/GelNotes.md", - "/C/Users/melon/Documents/Projects/Pet.GB/source/Gel.hx", "/C/Users/melon/Documents/Projects/Pet.GB/_tmp/GelNotes.html", "/C/Users/melon/Documents/Projects/Pet.GB/_tmp/MoodNotes.md", "/C/HaxeToolkit/haxe/lib/flixel/4,1,1/flixel/text/FlxBitmapText.hx", @@ -889,9 +916,7 @@ "/C/Users/melon/Downloads/HENkaku/samples-master/hello_world/Makefile", "/C/Users/melon/Downloads/HENkaku/samples-master/hello_cpp_world/Makefile", "/C/Users/melon/Downloads/HENkaku/samples-master/hello_world/main.c", - "/C/msys64/msys2_shell.cmd", - "/C/Users/melon/AppData/Local/Temp/7zO8E3FA4B2/Readme.txt", - "/C/Users/melon/Downloads/vpk-tmp/MGBA00001/sce_sys/livearea/contents/template.xml" + "/C/msys64/msys2_shell.cmd" ], "find": { @@ -909,6 +934,8 @@ "case_sensitive": false, "find_history": [ + "end", + "END", "TODO", "_wasteReady", "POOPY", @@ -990,30 +1017,30 @@ "reverse": false, "show_context": true, "use_buffer2": true, - "whole_word": true, + "whole_word": false, "wrap": true }, "groups": [ { - "selected": 4, + "selected": 1, "sheets": [ { "buffer": 0, - "file": "source/PlayState.hx", + "file": "source/EndState.hx", "semi_transient": false, "settings": { - "buffer_size": 2117, + "buffer_size": 856, "regions": { }, "selection": [ [ - 1171, - 1171 + 449, + 449 ] ], "settings": @@ -1025,127 +1052,8 @@ { "1": [ - 1170, - 1171 - ] - }, - "icon": - { - "1": - [ - "Packages/BracketHighlighter/icons/curly_bracket.png", - "brackethighlighter.default" - ] - }, - "open": - { - "1": - [ - 378, - 379 - ] - }, - "unmatched": - { - } - }, - "bracket_highlighter.regions": - [ - "bh_curly", - "bh_curly_center", - "bh_curly_open", - "bh_curly_close", - "bh_curly_content", - "bh_regex", - "bh_regex_center", - "bh_regex_open", - "bh_regex_close", - "bh_regex_content", - "bh_default", - "bh_default_center", - "bh_default_open", - "bh_default_close", - "bh_default_content", - "bh_round", - "bh_round_center", - "bh_round_open", - "bh_round_close", - "bh_round_content", - "bh_single_quote", - "bh_single_quote_center", - "bh_single_quote_open", - "bh_single_quote_close", - "bh_single_quote_content", - "bh_double_quote", - "bh_double_quote_center", - "bh_double_quote_open", - "bh_double_quote_close", - "bh_double_quote_content", - "bh_angle", - "bh_angle_center", - "bh_angle_open", - "bh_angle_close", - "bh_angle_content", - "bh_tag", - "bh_tag_center", - "bh_tag_open", - "bh_tag_close", - "bh_tag_content", - "bh_square", - "bh_square_center", - "bh_square_open", - "bh_square_close", - "bh_square_content", - "bh_unmatched", - "bh_unmatched_center", - "bh_unmatched_open", - "bh_unmatched_close", - "bh_unmatched_content", - "bh_c_define", - "bh_c_define_center", - "bh_c_define_open", - "bh_c_define_close", - "bh_c_define_content" - ], - "haxe-build-id": 0, - "syntax": "Packages/Haxe/Haxe.tmLanguage", - "translate_tabs_to_spaces": false - }, - "translation.x": 0.0, - "translation.y": 60.0, - "zoom_level": 1.0 - }, - "stack_index": 4, - "type": "text" - }, - { - "buffer": 1, - "file": "source/MenuState.hx", - "semi_transient": false, - "settings": - { - "buffer_size": 1967, - "regions": - { - }, - "selection": - [ - [ - 1053, - 1053 - ] - ], - "settings": - { - "bracket_highlighter.busy": false, - "bracket_highlighter.locations": - { - "close": - { - "1": - [ - 1060, - 1061 + 449, + 450 ] }, "icon": @@ -1160,8 +1068,8 @@ { "1": [ - 1031, - 1032 + 432, + 433 ] }, "unmatched": @@ -1170,26 +1078,36 @@ }, "bracket_highlighter.regions": [ - "bh_curly", - "bh_curly_center", - "bh_curly_open", - "bh_curly_close", - "bh_curly_content", - "bh_regex", - "bh_regex_center", - "bh_regex_open", - "bh_regex_close", - "bh_regex_content", + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", "bh_default", "bh_default_center", "bh_default_open", "bh_default_close", "bh_default_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", "bh_round", "bh_round_center", "bh_round_open", "bh_round_close", "bh_round_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", "bh_single_quote", "bh_single_quote_center", "bh_single_quote_open", @@ -1200,21 +1118,6 @@ "bh_double_quote_open", "bh_double_quote_close", "bh_double_quote_content", - "bh_angle", - "bh_angle_center", - "bh_angle_open", - "bh_angle_close", - "bh_angle_content", - "bh_tag", - "bh_tag_center", - "bh_tag_open", - "bh_tag_close", - "bh_tag_content", - "bh_square", - "bh_square_center", - "bh_square_open", - "bh_square_close", - "bh_square_content", "bh_unmatched", "bh_unmatched_center", "bh_unmatched_open", @@ -1224,34 +1127,38 @@ "bh_c_define_center", "bh_c_define_open", "bh_c_define_close", - "bh_c_define_content" + "bh_c_define_content", + "bh_tag", + "bh_tag_center", + "bh_tag_open", + "bh_tag_close", + "bh_tag_content" ], "haxe-build-id": 0, - "syntax": "Packages/Haxe/Haxe.tmLanguage", - "translate_tabs_to_spaces": false + "syntax": "Packages/Haxe/Haxe.tmLanguage" }, "translation.x": 0.0, - "translation.y": 38.0, + "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 2, + "stack_index": 7, "type": "text" }, { - "buffer": 2, - "file": "source/HUD.hx", + "buffer": 1, + "file": "source/InfoMenu.hx", "semi_transient": false, "settings": { - "buffer_size": 10975, + "buffer_size": 2608, "regions": { }, "selection": [ [ - 7417, - 7369 + 1184, + 1184 ] ], "settings": @@ -1263,8 +1170,127 @@ { "1": [ - 7830, - 7831 + 1248, + 1249 + ] + }, + "icon": + { + "1": + [ + "Packages/BracketHighlighter/icons/round_bracket.png", + "brackethighlighter.default" + ] + }, + "open": + { + "1": + [ + 1176, + 1177 + ] + }, + "unmatched": + { + } + }, + "bracket_highlighter.regions": + [ + "bh_c_define", + "bh_c_define_center", + "bh_c_define_open", + "bh_c_define_close", + "bh_c_define_content", + "bh_round", + "bh_round_center", + "bh_round_open", + "bh_round_close", + "bh_round_content", + "bh_default", + "bh_default_center", + "bh_default_open", + "bh_default_close", + "bh_default_content", + "bh_double_quote", + "bh_double_quote_center", + "bh_double_quote_open", + "bh_double_quote_close", + "bh_double_quote_content", + "bh_single_quote", + "bh_single_quote_center", + "bh_single_quote_open", + "bh_single_quote_close", + "bh_single_quote_content", + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_unmatched", + "bh_unmatched_center", + "bh_unmatched_open", + "bh_unmatched_close", + "bh_unmatched_content", + "bh_tag", + "bh_tag_center", + "bh_tag_open", + "bh_tag_close", + "bh_tag_content", + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content" + ], + "haxe-build-id": 0, + "syntax": "Packages/Haxe/Haxe.tmLanguage", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 195.0, + "zoom_level": 1.0 + }, + "stack_index": 0, + "type": "text" + }, + { + "buffer": 2, + "file": "source/ConfigMenu.hx", + "semi_transient": false, + "settings": + { + "buffer_size": 4503, + "regions": + { + }, + "selection": + [ + [ + 3222, + 3222 + ] + ], + "settings": + { + "bracket_highlighter.busy": false, + "bracket_highlighter.locations": + { + "close": + { + "1": + [ + 3303, + 3304 ] }, "icon": @@ -1279,8 +1305,8 @@ { "1": [ - 6150, - 6151 + 3191, + 3192 ] }, "unmatched": @@ -1289,26 +1315,36 @@ }, "bracket_highlighter.regions": [ - "bh_curly", - "bh_curly_center", - "bh_curly_open", - "bh_curly_close", - "bh_curly_content", - "bh_regex", - "bh_regex_center", - "bh_regex_open", - "bh_regex_close", - "bh_regex_content", + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", "bh_default", "bh_default_center", "bh_default_open", "bh_default_close", "bh_default_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", "bh_round", "bh_round_center", "bh_round_open", "bh_round_close", "bh_round_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", "bh_single_quote", "bh_single_quote_center", "bh_single_quote_open", @@ -1319,21 +1355,6 @@ "bh_double_quote_open", "bh_double_quote_close", "bh_double_quote_content", - "bh_angle", - "bh_angle_center", - "bh_angle_open", - "bh_angle_close", - "bh_angle_content", - "bh_tag", - "bh_tag_center", - "bh_tag_open", - "bh_tag_close", - "bh_tag_content", - "bh_square", - "bh_square_center", - "bh_square_open", - "bh_square_close", - "bh_square_content", "bh_unmatched", "bh_unmatched_center", "bh_unmatched_open", @@ -1343,14 +1364,19 @@ "bh_c_define_center", "bh_c_define_open", "bh_c_define_close", - "bh_c_define_content" + "bh_c_define_content", + "bh_tag", + "bh_tag_center", + "bh_tag_open", + "bh_tag_close", + "bh_tag_content" ], "haxe-build-id": 0, "syntax": "Packages/Haxe/Haxe.tmLanguage", "translate_tabs_to_spaces": false }, "translation.x": 0.0, - "translation.y": 1890.0, + "translation.y": 819.0, "zoom_level": 1.0 }, "stack_index": 3, @@ -1358,19 +1384,19 @@ }, { "buffer": 3, - "file": "source/Gel.hx", - "semi_transient": false, + "file": "Project.xml", + "semi_transient": true, "settings": { - "buffer_size": 7875, + "buffer_size": 3131, "regions": { }, "selection": [ [ - 1566, - 1566 + 789, + 784 ] ], "settings": @@ -1382,15 +1408,15 @@ { "1": [ - 1566, - 1567 + 789, + 790 ] }, "icon": { "1": [ - "Packages/BracketHighlighter/icons/square_bracket.png", + "Packages/BracketHighlighter/icons/double_quote.png", "brackethighlighter.default" ] }, @@ -1398,8 +1424,8 @@ { "1": [ - 1543, - 1544 + 783, + 784 ] }, "unmatched": @@ -1408,26 +1434,36 @@ }, "bracket_highlighter.regions": [ - "bh_curly", - "bh_curly_center", - "bh_curly_open", - "bh_curly_close", - "bh_curly_content", - "bh_regex", - "bh_regex_center", - "bh_regex_open", - "bh_regex_close", - "bh_regex_content", + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", "bh_default", "bh_default_center", "bh_default_open", "bh_default_close", "bh_default_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", "bh_round", "bh_round_center", "bh_round_open", "bh_round_close", "bh_round_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", "bh_single_quote", "bh_single_quote_center", "bh_single_quote_open", @@ -1438,21 +1474,6 @@ "bh_double_quote_open", "bh_double_quote_close", "bh_double_quote_content", - "bh_angle", - "bh_angle_center", - "bh_angle_open", - "bh_angle_close", - "bh_angle_content", - "bh_tag", - "bh_tag_center", - "bh_tag_open", - "bh_tag_close", - "bh_tag_content", - "bh_square", - "bh_square_center", - "bh_square_open", - "bh_square_close", - "bh_square_content", "bh_unmatched", "bh_unmatched_center", "bh_unmatched_open", @@ -1462,34 +1483,147 @@ "bh_c_define_center", "bh_c_define_open", "bh_c_define_close", - "bh_c_define_content" + "bh_c_define_content", + "bh_tag", + "bh_tag_center", + "bh_tag_open", + "bh_tag_close", + "bh_tag_content" ], - "haxe-build-id": 0, - "syntax": "Packages/Haxe/Haxe.tmLanguage", + "syntax": "Packages/XML/XML.sublime-syntax", "translate_tabs_to_spaces": false }, "translation.x": 0.0, - "translation.y": 450.0, + "translation.y": 0.0, "zoom_level": 1.0 }, - "stack_index": 1, + "stack_index": 2, "type": "text" }, { "buffer": 4, - "file": "source/Main.hx", + "file": "source/Gel.hx", "semi_transient": false, "settings": { - "buffer_size": 686, + "buffer_size": 8542, "regions": { }, "selection": [ [ - 284, - 284 + 7594, + 7594 + ] + ], + "settings": + { + "bracket_highlighter.busy": false, + "bracket_highlighter.locations": + { + "close": + { + }, + "icon": + { + }, + "open": + { + }, + "unmatched": + { + "1": + [ + 8420, + 8421 + ] + } + }, + "bracket_highlighter.regions": + [ + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", + "bh_default", + "bh_default_center", + "bh_default_open", + "bh_default_close", + "bh_default_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", + "bh_round", + "bh_round_center", + "bh_round_open", + "bh_round_close", + "bh_round_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", + "bh_single_quote", + "bh_single_quote_center", + "bh_single_quote_open", + "bh_single_quote_close", + "bh_single_quote_content", + "bh_double_quote", + "bh_double_quote_center", + "bh_double_quote_open", + "bh_double_quote_close", + "bh_double_quote_content", + "bh_unmatched", + "bh_unmatched_center", + "bh_unmatched_open", + "bh_unmatched_close", + "bh_unmatched_content", + "bh_c_define", + "bh_c_define_center", + "bh_c_define_open", + "bh_c_define_close", + "bh_c_define_content", + "bh_tag", + "bh_tag_center", + "bh_tag_open", + "bh_tag_close", + "bh_tag_content" + ], + "haxe-build-id": 0, + "syntax": "Packages/Haxe/Haxe.tmLanguage", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 1638.0, + "zoom_level": 1.0 + }, + "stack_index": 6, + "type": "text" + }, + { + "buffer": 5, + "file": "source/HUD.hx", + "semi_transient": false, + "settings": + { + "buffer_size": 11997, + "regions": + { + }, + "selection": + [ + [ + 11874, + 11853 ] ], "settings": @@ -1501,8 +1635,8 @@ { "1": [ - 684, - 685 + 11934, + 11935 ] }, "icon": @@ -1517,8 +1651,8 @@ { "1": [ - 138, - 139 + 11780, + 11781 ] }, "unmatched": @@ -1527,26 +1661,36 @@ }, "bracket_highlighter.regions": [ - "bh_curly", - "bh_curly_center", - "bh_curly_open", - "bh_curly_close", - "bh_curly_content", - "bh_regex", - "bh_regex_center", - "bh_regex_open", - "bh_regex_close", - "bh_regex_content", + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", "bh_default", "bh_default_center", "bh_default_open", "bh_default_close", "bh_default_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", "bh_round", "bh_round_center", "bh_round_open", "bh_round_close", "bh_round_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", "bh_single_quote", "bh_single_quote_center", "bh_single_quote_open", @@ -1557,21 +1701,6 @@ "bh_double_quote_open", "bh_double_quote_close", "bh_double_quote_content", - "bh_angle", - "bh_angle_center", - "bh_angle_open", - "bh_angle_close", - "bh_angle_content", - "bh_tag", - "bh_tag_center", - "bh_tag_open", - "bh_tag_close", - "bh_tag_content", - "bh_square", - "bh_square_center", - "bh_square_open", - "bh_square_close", - "bh_square_content", "bh_unmatched", "bh_unmatched_center", "bh_unmatched_open", @@ -1581,17 +1710,245 @@ "bh_c_define_center", "bh_c_define_open", "bh_c_define_close", - "bh_c_define_content" + "bh_c_define_content", + "bh_tag", + "bh_tag_center", + "bh_tag_open", + "bh_tag_close", + "bh_tag_content" ], "haxe-build-id": 0, "syntax": "Packages/Haxe/Haxe.tmLanguage", "translate_tabs_to_spaces": false }, "translation.x": 0.0, - "translation.y": 0.0, + "translation.y": 5444.0, "zoom_level": 1.0 }, - "stack_index": 0, + "stack_index": 5, + "type": "text" + }, + { + "buffer": 6, + "file": "source/PlayState.hx", + "semi_transient": false, + "settings": + { + "buffer_size": 1589, + "regions": + { + }, + "selection": + [ + [ + 1074, + 1074 + ] + ], + "settings": + { + "bracket_highlighter.busy": false, + "bracket_highlighter.locations": + { + "close": + { + "1": + [ + 1145, + 1146 + ] + }, + "icon": + { + "1": + [ + "Packages/BracketHighlighter/icons/curly_bracket.png", + "brackethighlighter.default" + ] + }, + "open": + { + "1": + [ + 415, + 416 + ] + }, + "unmatched": + { + } + }, + "bracket_highlighter.regions": + [ + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", + "bh_default", + "bh_default_center", + "bh_default_open", + "bh_default_close", + "bh_default_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", + "bh_round", + "bh_round_center", + "bh_round_open", + "bh_round_close", + "bh_round_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", + "bh_single_quote", + "bh_single_quote_center", + "bh_single_quote_open", + "bh_single_quote_close", + "bh_single_quote_content", + "bh_double_quote", + "bh_double_quote_center", + "bh_double_quote_open", + "bh_double_quote_close", + "bh_double_quote_content", + "bh_unmatched", + "bh_unmatched_center", + "bh_unmatched_open", + "bh_unmatched_close", + "bh_unmatched_content", + "bh_c_define", + "bh_c_define_center", + "bh_c_define_open", + "bh_c_define_close", + "bh_c_define_content", + "bh_tag", + "bh_tag_center", + "bh_tag_open", + "bh_tag_close", + "bh_tag_content" + ], + "haxe-build-id": 0, + "syntax": "Packages/Haxe/Haxe.tmLanguage", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 416.0, + "zoom_level": 1.0 + }, + "stack_index": 4, + "type": "text" + }, + { + "buffer": 7, + "file": "source/Main.hx", + "semi_transient": false, + "settings": + { + "buffer_size": 636, + "regions": + { + }, + "selection": + [ + [ + 301, + 301 + ] + ], + "settings": + { + "bracket_highlighter.busy": false, + "bracket_highlighter.locations": + { + "close": + { + }, + "icon": + { + }, + "open": + { + }, + "unmatched": + { + } + }, + "bracket_highlighter.regions": + [ + "bh_angle", + "bh_angle_center", + "bh_angle_open", + "bh_angle_close", + "bh_angle_content", + "bh_default", + "bh_default_center", + "bh_default_open", + "bh_default_close", + "bh_default_content", + "bh_regex", + "bh_regex_center", + "bh_regex_open", + "bh_regex_close", + "bh_regex_content", + "bh_round", + "bh_round_center", + "bh_round_open", + "bh_round_close", + "bh_round_content", + "bh_square", + "bh_square_center", + "bh_square_open", + "bh_square_close", + "bh_square_content", + "bh_curly", + "bh_curly_center", + "bh_curly_open", + "bh_curly_close", + "bh_curly_content", + "bh_single_quote", + "bh_single_quote_center", + "bh_single_quote_open", + "bh_single_quote_close", + "bh_single_quote_content", + "bh_double_quote", + "bh_double_quote_center", + "bh_double_quote_open", + "bh_double_quote_close", + "bh_double_quote_content", + "bh_unmatched", + "bh_unmatched_center", + "bh_unmatched_open", + "bh_unmatched_close", + "bh_unmatched_content", + "bh_c_define", + "bh_c_define_center", + "bh_c_define_open", + "bh_c_define_close", + "bh_c_define_content", + "bh_tag", + "bh_tag_center", + "bh_tag_open", + "bh_tag_close", + "bh_tag_content" + ], + "haxe-build-id": 0, + "syntax": "Packages/Haxe/Haxe.tmLanguage", + "translate_tabs_to_spaces": false + }, + "translation.x": 0.0, + "translation.y": 62.0, + "zoom_level": 1.0 + }, + "stack_index": 1, "type": "text" } ] @@ -1630,7 +1987,7 @@ "menu_visible": true, "output.exec": { - "height": 107.0 + "height": 129.0 }, "output.find_results": { diff --git a/_tmp/BoxArt.png b/_tmp/BoxArt.png new file mode 100644 index 0000000..8028543 Binary files /dev/null and b/_tmp/BoxArt.png differ diff --git a/_tmp/FKGFGKHF.kra b/_tmp/FKGFGKHF.kra new file mode 100644 index 0000000..e304ced Binary files /dev/null and b/_tmp/FKGFGKHF.kra differ diff --git a/_tmp/Pallet.png b/_tmp/Pallet.png new file mode 100644 index 0000000..6beb410 Binary files /dev/null and b/_tmp/Pallet.png differ diff --git a/assets/images/Cursor.png b/assets/images/Cursor.png new file mode 100644 index 0000000..1fe614d Binary files /dev/null and b/assets/images/Cursor.png differ diff --git a/assets/images/Player.png b/assets/images/Player.png index 980fc46..a6a56cc 100644 Binary files a/assets/images/Player.png and b/assets/images/Player.png differ diff --git a/source/ConfigMenu.hx b/source/ConfigMenu.hx new file mode 100644 index 0000000..9f04a3b --- /dev/null +++ b/source/ConfigMenu.hx @@ -0,0 +1,195 @@ +package; + +import flixel.FlxG; +import flixel.FlxSprite; +import flixel.group.FlxGroup; +import flixel.text.FlxText; +import flixel.util.FlxColor; +import flixel.util.FlxSave; +import haxe.xml.Parser; + +class ConfigMenu extends FlxTypedGroup +{ + private var _sprBackground:FlxSprite; + + private var _sprCursor:FlxSprite; + private var _menuChoice:Int = 0; + + private var _txtTitle:FlxText; + private var _txtVolume:FlxText; + private var _txtControls:FlxText; + + private var _txtFooter:FlxText; + + private var _gameMuted:Bool = false; + private var _strMuted:String = "On"; + + private var _usingArrows:Bool = true; + private var _strControls:String = "Arrows"; + + public function new() + { + super(); + + loadSettings(); + + _sprBackground = new FlxSprite(9, 9, AssetPaths.Menu__png); + add(_sprBackground); + + // Title + _txtTitle = new FlxText((_sprBackground.x + 11), (_sprBackground.y + 2), 0, "Config", 16); + _txtTitle.setFormat(AssetPaths.EarlyGameBoy__ttf, 16, FlxColor.fromRGB(8, 24, 32, 0), CENTER); + _txtTitle.x = (FlxG.width/2) - (_txtTitle.width/2); + add(_txtTitle); + + _sprCursor = new FlxSprite(0, 0, AssetPaths.Cursor__png); + _sprCursor.x = (_txtTitle.x - 15); + _sprCursor.y = (_sprBackground.y + 37); + add(_sprCursor); + + // Content + _txtVolume = new FlxText((_sprCursor.x + _sprCursor.width), (_sprBackground.y + 33), 0 , "Sound: " + _strMuted); + _txtVolume.setFormat(AssetPaths.EarlyGameBoy__ttf, 8, FlxColor.fromRGB(8, 24, 32, 0), CENTER); + add(_txtVolume); + + _txtControls = new FlxText(_txtVolume.x, (_txtVolume.y + _txtVolume.height + 1), 0, "Controls: " + _strControls); + _txtControls.setFormat(AssetPaths.EarlyGameBoy__ttf, 8, FlxColor.fromRGB(8, 24, 32, 0), CENTER); + add (_txtControls); + + // Footer + _txtFooter = new FlxText((_sprBackground.x), (_sprBackground.height - 12), 0, "Press Start To Save", 8); + _txtFooter.setFormat(AssetPaths.EarlyGameBoy__ttf, 8, FlxColor.fromRGB(8, 24, 32, 0), CENTER); + add(_txtFooter); + + active = false; + visible = false; + } + + + override public function update(elapsed:Float):Void + { + super.update(elapsed); + + if (FlxG.keys.pressed.ENTER || FlxG.gamepads.anyJustPressed(START)) + saveConfig(); + + if (_usingArrows) + { + if (FlxG.keys.justPressed.UP || FlxG.gamepads.anyJustPressed(DPAD_UP)) + nextChoice(-1); + else if (FlxG.keys.justPressed.DOWN || FlxG.gamepads.anyJustPressed(DPAD_DOWN)) + nextChoice(1); + else if (FlxG.keys.justPressed.LEFT || FlxG.gamepads.anyJustPressed(DPAD_LEFT)) + makeChoice(); + else if (FlxG.keys.justPressed.RIGHT || FlxG.gamepads.anyJustPressed(DPAD_RIGHT)) + makeChoice(); + + + } + else + { + if (FlxG.keys.justPressed.W || FlxG.gamepads.anyJustPressed(DPAD_UP)) + nextChoice(-1); + else if (FlxG.keys.justPressed.S || FlxG.gamepads.anyJustPressed(DPAD_DOWN)) + nextChoice(1); + else if (FlxG.keys.justPressed.A || FlxG.gamepads.anyJustPressed(DPAD_LEFT)) + makeChoice(); + else if (FlxG.keys.justPressed.D || FlxG.gamepads.anyJustPressed(DPAD_RIGHT)) + makeChoice(); + } + + } + + private function nextChoice(amount:Int) + { + _menuChoice += amount; + if (_menuChoice < 0) + _menuChoice = 2; + else if (_menuChoice > 1) + _menuChoice = 0; + + switch (_menuChoice) + { + case 0: + _sprCursor.y = (_sprBackground.y + 37); + + case 1: + _sprCursor.y = (_txtControls.y + 4); + } + } + + private function makeChoice() + { + switch (_menuChoice) + { + case 0: + _gameMuted = !_gameMuted; + case 1: + _usingArrows = !_usingArrows; + } + updateInfo(); + } + + private function saveConfig():Void + { + + var _save = new FlxSave(); + _save.bind("Pet.GB"); + + if (_gameMuted) + _save.data.muted = true; + else if (!_gameMuted) + _save.data.muted = false; + + if (_usingArrows) + _save.data.arrowInput = true; + else if (!_usingArrows) + _save.data.arrowInput = false; + + _save.close(); + + closeMenu(); + } + + public function OpenMenu():Void + { + loadSettings(); + + visible = true; + active = true; + updateInfo(); + } + + private function closeMenu():Void + { + active = false; + visible = false; + } + + private function updateInfo():Void + { + if (!_gameMuted) + _strMuted = "On"; + else + _strMuted = "Off"; + + if (_usingArrows) + _strControls = "Arrows"; + else + _strControls = "WASD"; + + _txtVolume.text = "Volume: " + _strMuted; + _txtControls.text = "Controls: " + _strControls; + } + + private function loadSettings():Void + { + var _save = new FlxSave(); + _save.bind("Pet.GB"); + + _usingArrows = _save.data.arrowInput; + FlxG.sound.muted = _save.data.muted; + + _save.close(); + } +} \ No newline at end of file diff --git a/source/EndState.hx b/source/EndState.hx new file mode 100644 index 0000000..dae3e22 --- /dev/null +++ b/source/EndState.hx @@ -0,0 +1,39 @@ +package; + +import flixel.FlxG; +import flixel.FlxState; +import flixel.text.FlxText; +import flixel.util.FlxColor; + +class EndState extends FlxState +{ + private var _txtMessage:FlxText; + + override public function create():Void + { + super.create(); + + + _txtMessage = new FlxText(9, 9, 0, "Your Pet Gel Buddy\nHas Moved On.\n\nIt Feels You Should\nDo The Same."); + _txtMessage.setFormat(AssetPaths.EarlyGameBoy__ttf, 8, FlxColor.fromRGB(136, 192, 112, 0), CENTER); + add(_txtMessage); + } + + override public function update(elapsed:Float):Void + { + super.update(elapsed); + + set_bgColor(FlxColor.fromRGB(8, 24, 32, 0)); + + if (FlxG.keys.pressed.ENTER || FlxG.gamepads.anyJustPressed(START)) + goMainMenu(); + } + + private function goMainMenu():Void + { + FlxG.camera.fade(FlxColor.BLACK, .33, false, function() + { + FlxG.switchState(new MenuState()); + }); + } +} \ No newline at end of file diff --git a/source/Gel.hx b/source/Gel.hx index 288236f..aa2561c 100644 --- a/source/Gel.hx +++ b/source/Gel.hx @@ -3,6 +3,7 @@ package; import flixel.FlxG; import flixel.FlxSprite; import flixel.system.FlxSound; +import flixel.util.FlxSave; class Gel extends FlxSprite { @@ -10,6 +11,11 @@ class Gel extends FlxSprite private var MIN_LEVEL(default, never):Int = 0; private var MAX_LEVEL(default, never):Int = 100; + // END_GAME + public var ENDGAME:Bool = false; + private var _endFlags:Int = 0; + private var _hoursSuffering:Int = 0; + // Usless Stats that have no pupose yet public var Intellect:Int = 1; // Had to be somewhat smart to get out of the egg public var Age:Int = 1; @@ -65,6 +71,9 @@ class Gel extends FlxSprite _sndAshamed = FlxG.sound.load(AssetPaths.Ashamed__ogg); // DEBUG + FlxG.watch.add(this, "ENDGAME"); + FlxG.watch.add(this, "_endFlags"); + FlxG.watch.add(this, "_hoursSuffering"); FlxG.watch.add(this, "Age"); FlxG.watch.add(this, "CurrentMood"); FlxG.watch.add(animation, "finished"); @@ -90,6 +99,11 @@ class Gel extends FlxSprite { super.update(elapsed); + loadSettings(); + + if (_endFlags > 2) + ENDGAME = true; + _clock.update(); if (_clock.HourPassed) newHour(); @@ -358,12 +372,22 @@ class Gel extends FlxSprite _hasStudied = false; _clock.HourPassed = false; + + // END_GAME Checks + if (CurrentMood == ANGRY || _madeWaste || _isHungry) + _hoursSuffering ++; + else + _hoursSuffering = 0; + + if (_hoursSuffering > 1) + _endFlags++; + else if (_hoursSuffering > 3) + ENDGAME = true; } private function newDay():Void { Age++; - // TODO: Add END_GAME checks here _clock.DayPassed = false; } @@ -395,6 +419,15 @@ class Gel extends FlxSprite else if (Waste < MIN_LEVEL) Waste = MIN_LEVEL; } + private function loadSettings():Void + { + var _save = new FlxSave(); + _save.bind("Pet.GB"); + + FlxG.sound.muted = _save.data.muted; + + _save.close(); + } } enum Mood diff --git a/source/HUD.hx b/source/HUD.hx index 8c3245c..0ca3de2 100644 --- a/source/HUD.hx +++ b/source/HUD.hx @@ -8,6 +8,8 @@ import flixel.group.FlxGroup; import flixel.system.FlxSound; import flixel.text.FlxText; import flixel.util.FlxColor; +import flixel.util.FlxSave; +import haxe.xml.Parser; using flixel.util.FlxSpriteUtil; @@ -52,22 +54,29 @@ class HUD extends FlxTypedGroup // Menus private var _infoMenu:InfoMenu; + private var _configMenu:ConfigMenu; // Misc private var _menuOption:Int; private var _sprSelect:FlxSprite; private var _gel:Gel; private var _clock:Clock; + private var _usingArrows:Bool = true; - public function new(gel:Gel, clock:Clock, infoMenu:InfoMenu) + public function new(gel:Gel, clock:Clock, infoMenu:InfoMenu, configMenu:ConfigMenu) { super(); + loadSettings(); + // Misc _menuOption = 0; _gel = gel; _clock = clock; _infoMenu = infoMenu; + _configMenu = configMenu; + + // Top _sprTop = new FlxSprite(0, 0, AssetPaths.HUD_Background__png); @@ -179,19 +188,43 @@ class HUD extends FlxTypedGroup override public function update(elapsed:Float):Void { super.update(elapsed); + loadSettings(); - // TODO: Add WASD support? - // TODO: Start + Select gives prompt to delete save file - if (FlxG.keys.justPressed.UP || FlxG.gamepads.anyJustPressed(DPAD_UP)) - nextOption(UP); - else if (FlxG.keys.justPressed.DOWN || FlxG.gamepads.anyJustPressed(DPAD_DOWN)) - nextOption(DOWN); - else if (FlxG.keys.justPressed.LEFT || FlxG.gamepads.anyJustPressed(DPAD_LEFT)) - nextOption(LEFT); - else if (FlxG.keys.justPressed.RIGHT || FlxG.gamepads.anyJustPressed(DPAD_RIGHT)) - nextOption(RIGHT); - else if (FlxG.keys.justPressed.X || FlxG.gamepads.anyJustPressed(B)) - makeOption(_menuOption); + if (_gel.ENDGAME) + { + FlxG.camera.fade(FlxColor.fromRGB(8, 24, 32, 0), 0.5, true, function() + { + FlxG.switchState(new EndState()); + }); + } + + + if (_usingArrows) + { + if (FlxG.keys.justPressed.UP || FlxG.gamepads.anyJustPressed(DPAD_UP)) + nextOption(UP); + else if (FlxG.keys.justPressed.DOWN || FlxG.gamepads.anyJustPressed(DPAD_DOWN)) + nextOption(DOWN); + else if (FlxG.keys.justPressed.LEFT || FlxG.gamepads.anyJustPressed(DPAD_LEFT)) + nextOption(LEFT); + else if (FlxG.keys.justPressed.RIGHT || FlxG.gamepads.anyJustPressed(DPAD_RIGHT)) + nextOption(RIGHT); + else if (FlxG.keys.justPressed.X || FlxG.gamepads.anyJustPressed(B)) + makeOption(_menuOption); + } + else + { + if (FlxG.keys.justPressed.W || FlxG.gamepads.anyJustPressed(DPAD_UP)) + nextOption(UP); + else if (FlxG.keys.justPressed.S || FlxG.gamepads.anyJustPressed(DPAD_DOWN)) + nextOption(DOWN); + else if (FlxG.keys.justPressed.A || FlxG.gamepads.anyJustPressed(DPAD_LEFT)) + nextOption(LEFT); + else if (FlxG.keys.justPressed.D || FlxG.gamepads.anyJustPressed(DPAD_RIGHT)) + nextOption(RIGHT); + else if (FlxG.keys.justPressed.X || FlxG.gamepads.anyJustPressed(B)) + makeOption(_menuOption); + } // Wasting Check if (_gel._madeWaste == true) @@ -281,9 +314,9 @@ class HUD extends FlxTypedGroup _sprSelect.x = _menuOption * 40; _sprSelect.y = 0; } + } + _sndNext.play(true); } - _sndNext.play(true); -} private function makeOption(option:Int):Void { @@ -382,7 +415,7 @@ class HUD extends FlxTypedGroup private function showConfig():Void { - // TODO: Make Config menu and call it here + _configMenu.OpenMenu(); } private function showThought(thought:String):Void @@ -410,6 +443,18 @@ class HUD extends FlxTypedGroup _sprInteraction.animation.play("none"); _gel.Wait = false; } + + private function loadSettings():Void + { + var _save = new FlxSave(); + _save.bind("Pet.GB"); + + _usingArrows = _save.data.arrowInput; + FlxG.sound.muted = _save.data.muted; + + _save.close(); + } + } private enum MenuDirection diff --git a/source/InfoMenu.hx b/source/InfoMenu.hx index 0776cc9..9381634 100644 --- a/source/InfoMenu.hx +++ b/source/InfoMenu.hx @@ -27,6 +27,7 @@ class InfoMenu extends FlxTypedGroup _sprBackground = new FlxSprite(9, 9, AssetPaths.Menu__png); add(_sprBackground); + // Title _txtTitle = new FlxText((_sprBackground.x + 11), (_sprBackground.y + 2), 0, "Gel Info", 16); _txtTitle.setFormat(AssetPaths.EarlyGameBoy__ttf, 16, FlxColor.fromRGB(8, 24, 32, 0), CENTER); add(_txtTitle); @@ -60,8 +61,6 @@ class InfoMenu extends FlxTypedGroup public function OpenMenu():Void { - //_sprBackground.drawFrame(); - visible = true; active = true; updateInfo(); diff --git a/source/Main.hx b/source/Main.hx index baf2682..8216aad 100644 --- a/source/Main.hx +++ b/source/Main.hx @@ -7,7 +7,6 @@ import openfl.display.Sprite; class Main extends Sprite { - // TODO: Fix Gel Colors // TODO: Add END_GAME Flags // TODO: Makes saving work for at least the config screen // TODO: Make Game Over screen @@ -18,17 +17,13 @@ class Main extends Sprite _save.bind("Pet.GB"); super(); - addChild(new FlxGame(0, 0, MenuState)); + addChild(new FlxGame(0, 0, MenuState, 1, 60, 60, true, false)); - // Loads volume if exists - if (_save.data.volume != null) - FlxG.sound.volume = _save.data.volume; - // Set save data volume to default (100%) - else - _save.data.volume = 1; - - // SAVE WRITE - _save.flush(); + // Loads Settings + if (_save.data.gameMuted = true) + FlxG.sound.muted = _save.data.muted; + if (_save.data.arrowInput == null) + _save.data.arrowInput = true; // SAVE END _save.close(); diff --git a/source/PlayState.hx b/source/PlayState.hx index 045372e..b06c97a 100644 --- a/source/PlayState.hx +++ b/source/PlayState.hx @@ -17,6 +17,7 @@ class PlayState extends FlxState private var _hud:HUD; private var _infoMenu:InfoMenu; + private var _configMenu:ConfigMenu; override public function create():Void @@ -30,33 +31,28 @@ class PlayState extends FlxState _clock = new Clock(); - if (_save.data.GelPet == null) - { - _gelPet = new Gel(0, 0, _clock); - _gelPet.x = ((FlxG.width/2) - (_gelPet.width/2)); - _gelPet.y = ((FlxG.height/2) - (_gelPet.height/2)); - } - else - { - _gelPet = _save.data.gel; - _gelPet._clock = _save.data.clock; - } + _gelPet = new Gel(0, 0, _clock); + _gelPet.x = ((FlxG.width/2) - (_gelPet.width/2)); + _gelPet.y = ((FlxG.height/2) - (_gelPet.height/2)); add(_gelPet); // Interface _infoMenu = new InfoMenu(_gelPet); - if (_save.data.HUD == null) - _hud = new HUD(_gelPet, _clock, _infoMenu); - else - _hud = _save.data.hud; + _configMenu = new ConfigMenu(); + _hud = new HUD(_gelPet, _clock, _infoMenu, _configMenu); add(_hud); add(_infoMenu); + add(_configMenu); super.create(); // DEBUG FlxG.debugger.setLayout(FlxDebuggerLayout.RIGHT); + // Loads Settings + FlxG.sound.muted = _save.data.muted; + + // SAVE END _save.close(); } @@ -64,10 +60,10 @@ class PlayState extends FlxState override public function update(elapsed:Float):Void { super.update(elapsed); - if (_infoMenu.visible) + if (_infoMenu.visible || _configMenu.visible) { _gelPet.active = false; - _clock.pause(true); + _clock.pause(); _hud.active = false; } else @@ -75,7 +71,6 @@ class PlayState extends FlxState _gelPet.active = true; _clock.pause(false); _hud.active = true; - saveGame(); } if (_gelPet.CurrentMood == Gel.Mood.EXCITED || _gelPet.CurrentMood == Gel.Mood.ASHAMED) @@ -83,36 +78,4 @@ class PlayState extends FlxState else _clock.pause(false); } - - private function saveGame() - { - // SAVE BEGIN - var _save:FlxSave = new FlxSave(); - _save.bind("Pet.GB"); - - // SAVED DATA - _save.data.gel = _gelPet; - _save.data.clock = _gelPet._clock; - _save.data.hud = _hud; - //_save.data.age = _gel.age; - - // WRITE SAVE - //_save.flush(); - - // SAVE END - _save.close; - } - - private function quitGame():Void - { - // SAVE BEGIN - var _save:FlxSave = new FlxSave(); - _save.bind("Pet.GB"); - - // SAVED DATA - _save.data.HUD = _hud; - - // SAVE END - _save.close; - } }