From 3a22beb7cac8eb0046f62cee2849c36e75b6d30b Mon Sep 17 00:00:00 2001
From: Rain Clark <bread.melon@gmail.com>
Date: Tue, 4 Oct 2016 04:08:00 -0400
Subject: [PATCH] Renamed 'Train' to 'Study

---
 assets/images/{Train.png => Study.png}        | Bin
 .../windows/neko/bin/assets/images/Study.png  | Bin 0 -> 294 bytes
 source/HUD.hx                                 |  84 ++++++++++++------
 3 files changed, 55 insertions(+), 29 deletions(-)
 rename assets/images/{Train.png => Study.png} (100%)
 create mode 100644 export/windows/neko/bin/assets/images/Study.png

diff --git a/assets/images/Train.png b/assets/images/Study.png
similarity index 100%
rename from assets/images/Train.png
rename to assets/images/Study.png
diff --git a/export/windows/neko/bin/assets/images/Study.png b/export/windows/neko/bin/assets/images/Study.png
new file mode 100644
index 0000000000000000000000000000000000000000..1bfe2ce3f525f09ea8c7c1d69bdef9162b701818
GIT binary patch
literal 294
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJx1KJJArY;~2@)?GCdTy22yy+N
z_|rblM&Y#1B-4XB`#vTxckO6%Vu<8Zj55^gzR0+ePjN*@MEA*34nNN#UA3!<5v-Of
zBL9N349(gTijO?tVVuESx2NKO#ez(RWs;WXg=cejY@E{w1g#U8b{u46(-3>0#U8S!
zL;?if<?MEvveTvgKrg$r1QVCkgHPsWF%E(Jn=4Ll5!=z+!O1vhC&RI}rOYYv%GNAw
zW<Cz0i*GQR%jGmkJ7qbkEHzQl;yu7~DS+dLzlZKdvBM03fevdDLl_NCU(AeRREv_b
m<8nKwA;G#hL4=2sf#LClc0JzNh3kPHXYh3Ob6Mw<&;$VIZ(^_j

literal 0
HcmV?d00001

diff --git a/source/HUD.hx b/source/HUD.hx
index 4cb7809..328de47 100644
--- a/source/HUD.hx
+++ b/source/HUD.hx
@@ -6,6 +6,7 @@ import flixel.group.FlxGroup;
 import flixel.system.FlxSound;
 import flixel.text.FlxText;
 import flixel.util.FlxColor;
+using flixel.util.FlxSpriteUtil;
 
 class HUD extends FlxTypedGroup<FlxSprite>
 {
@@ -15,8 +16,8 @@ class HUD extends FlxTypedGroup<FlxSprite>
 	private var _sprInfo:FlxSprite;
 	private var _txtFeed:FlxText;
 	private var _sprFeed:FlxSprite;
-	private var _txtTrain:FlxText;
-	private var _sprTrain:FlxSprite;
+	private var _txtStudy:FlxText;
+	private var _sprStudy:FlxSprite;
 	private var _txtRest:FlxText;
 	private var _sprRest:FlxSprite;
 
@@ -72,15 +73,15 @@ class HUD extends FlxTypedGroup<FlxSprite>
 		_sprFeed = new FlxSprite((_txtFeed.x + 2), (_txtFeed.y - 17), AssetPaths.Feed__png);
 		add(_sprFeed);
 
-		// Train
-		_txtTrain = new FlxText((_txtFeed.x + _txtFeed.width - 1), (_sprTop.height - 13), 0, "Train", 8);
-		_txtTrain.setFormat(AssetPaths.EarlyGameBoy__ttf, 8, FlxColor.fromRGB(8, 24, 32, 0), CENTER);
-		add(_txtTrain);
-		_sprTrain = new FlxSprite((_txtTrain.x + 6), (_txtTrain.y - 17), AssetPaths.Train__png);
-		add(_sprTrain);
+		// Study
+		_txtStudy = new FlxText((_txtFeed.x + _txtFeed.width - 1), (_sprTop.height - 13), 0, "Study", 8);
+		_txtStudy.setFormat(AssetPaths.EarlyGameBoy__ttf, 8, FlxColor.fromRGB(8, 24, 32, 0), CENTER);
+		add(_txtStudy);
+		_sprStudy = new FlxSprite((_txtStudy.x + 6), (_txtStudy.y - 17), AssetPaths.Study__png);
+		add(_sprStudy);
 
 		// Rest
-		_txtRest = new FlxText((_txtTrain.x + _txtTrain.width), (_sprTop.height - 13), 0, "Rest", 8);
+		_txtRest = new FlxText((_txtStudy.x + _txtStudy.width), (_sprTop.height - 13), 0, "Rest", 8);
 		_txtRest.setFormat(AssetPaths.EarlyGameBoy__ttf, 8, FlxColor.fromRGB(8, 24, 32, 0), CENTER);
 		add(_txtRest);
 		_sprRest = new FlxSprite((_txtRest.x + 2), (_txtRest.y - 17), AssetPaths.Rest__png);
@@ -135,11 +136,14 @@ class HUD extends FlxTypedGroup<FlxSprite>
 		_sprInteraction.visible = false;
 		add(_sprInteraction);
 
-		_tmpText = new FlxText(_sprInteraction.x, _sprInteraction.y, 0, "X", 8);
+		_tmpText = new FlxText(_sprInteraction.x, _sprInteraction.y, 0, "", 8);
 		add(_tmpText);
 
 		// DEBUG
 		FlxG.watch.add(this, "_menuOption", "Menu Index");
+		FlxG.watch.add(_sprInteraction, "alpha", "Interact Alpha");
+		FlxG.watch.add(_sprInteraction, "visible", "Interact Visible");
+		FlxG.watch.add(_tmpText, "text", "Temp Text");
 	}
 
 	override public function update(elapsed:Float):Void
@@ -201,47 +205,69 @@ class HUD extends FlxTypedGroup<FlxSprite>
 
 	private function makeOption(option:Int):Void
 	{
-		switch(option)
+		if(!_gel.Wait)
 		{
-			case 0:
+			switch(option)
+			{
+				case 0:
 				//
 
-			// FEED
-			case 1:
-				feedGel();
+				// FEED
+				case 1:
+					feedGel();
 
-			case 2:
-				//
+				case 2:
+					//
 
-			case 3:
-				//
+				case 3:
+					//
 
-			case 4:
-				//
+				case 4:
+					//
 
-			case 5:
-				//
+				case 5:
+					//
 
-			case 6:
-				//
+				case 6:
+					//
 
-			case 7:
-				//
+				case 7:
+					//
+			}
+			_sndSelect.play(true);
 		}
-		_sndSelect.play(true);
+
 	}
 
 	private function feedGel():Void
 	{
+		itemJoin("F");
 		_gel.EatFood();
+		_sprInteraction.fadeOut(2, itemLeave);
+	}
+
+	private function itemJoin(letter:String = ""):Void
+	{
+		_sprInteraction.visible = true;
+		_tmpText.text = letter;
+	}
+
+	private function itemLeave(_):Void
+	{
+		_sprInteraction.visible = false;
+		_tmpText.text = "";
+		_sprInteraction.alpha = 1;
+		_gel.Wait = false;
 	}
 
 }
+
+// TODO: Actually use this instead of _menuChoice
 enum MenuOption
 {
 	INFO;
 	FEED;
-	TRAIN;
+	STUDY;
 	REST;
 	CHEER;
 	SCOLD;