Tweaks and fixes

Emoji doesn't display question until activation. Needy clears when timer expires.
timtmok · Aug 14, 2016 · 82123b8 · 82123b8
1 parent b701944
commit 82123b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Assets/Scripts/EmojiMathModule.cs b/Assets/Scripts/EmojiMathModule.cs
@@ -22,13 +22,9 @@ public class EmojiMathModule : MathModule
 
 	void Start()
 	{
+		DisplayText.text = string.Empty;
 		Init();
-	}
-
-	protected override void Init()
-	{
-		base.Init();
-		SetDisplay();
+		GetComponent<KMBombModule>().OnActivate += SetDisplay;
 	}
 
 	protected override void Solve()

diff --git a/Assets/Scripts/NeedyMathModule.cs b/Assets/Scripts/NeedyMathModule.cs
@@ -1,4 +1,3 @@
-using System;
 using UnityEngine;
 
 public class NeedyMathModule : MathModule
@@ -23,6 +22,7 @@ protected void OnNeedyDeactivation()
 
 	protected void OnNeedyActivation()
 	{
+		Answer = string.Empty;
 		Puzzle = MathFactory.Instance.GenerateQuestion();
 		SetDisplay();
 	}
@@ -68,6 +68,7 @@ protected override void Solve()
 
 	protected void OnTimerExpired()
 	{
+		OnNeedyDeactivation();
 		GetComponent<KMNeedyModule>().HandleStrike();
 	}
 }