Merge pull request #2 from badookey/develop

Merge changes for release

Author: badookey

FoodEat.lsproj

@@ -1,20 +1,26 @@
 // -----JS CODE-----
 // @input Component.ScriptComponent behaviorScript
+// @input Component.ScriptComponent highScoreController
 
+// Don't process script without the behaviorScript.
+if (!script.behaviorScript) {
+    return;
+}
 
 var eaten = false;
 global.canEat = true;
-//When the object is eaten
+//Functionality to trigger when the food is ate.
 function eat() {
     if (global.canEat) {
         unbindCollisionDetection();
         script.getSceneObject().enabled = false;
         global.canEat = false;
-        global.scBehaviorSystem.sendCustomTrigger("Increment Score");
+        script.highScoreController.api.incrementScore();
         eaten = true;
     }
 }
 
+//Ensure trigger doesn't happen multiple times for one event
 function unbindCollisionDetection() {
     script.behaviorScript.api.removeTriggerResponse(mouthCollision)
 }
@@ -36,9 +42,6 @@ function onMouthOpened(eventData) {
 }
 
 function mouthCollision() {
-    //Debug Statement
-    //print("mouth collided --food.js");
-
     //This function abstracts 'eat', as this function can ONLY be called if both the mouth closed event AND the mouth collision event are triggered.
     if (!eaten) {
         eat();
@@ -51,8 +54,6 @@ event.bind(onMouthClosed);
 var event = script.createEvent("MouthOpenedEvent");
 event.bind(onMouthOpened);
 
-if (!script.behaviorScript) {
-    return;
-}
+
 
 

Orange.png

@@ -2,29 +2,44 @@
 // @input Asset.ObjectPrefab orangeContainer
 // @input Component.Camera camera
 // @input int numOrangesShouldSpawn
+// @input Component.ScriptComponent highScoreController
+
 script.createEvent("BrowsRaisedEvent").bind(onBrowRaise);
 
 var numOrangesSpawned = 0;
+var objectsSpawned = [];
+var gameStarted = false;
 function onBrowRaise(e) {
-    if (script) {
+    if (script && !gameStarted) {
         spawnOranges();
+        gameStarted = true;
     }
 
 }
 function spawnOranges() {
     if (numOrangesSpawned < script.numOrangesShouldSpawn) {
         var mySceneObject = createObjectFromPrefab();
         mySceneObject.getTransform().setWorldPosition(script.getTransform().getWorldPosition());
+        objectsSpawned.push(mySceneObject);
+
         var delayedEvent = script.createEvent("DelayedCallbackEvent");
         delayedEvent.bind(spawnOranges);
         delayedEvent.reset(3.5);
         numOrangesSpawned++;
     }
+    else { //Spawned max amount of oranges -- the game is over
+        removeAllSpawnedObjects();
+        script.highScoreController.api.endGame();
+    }
 
 }
 
-spawnOranges();
-
+function removeAllSpawnedObjects() {
+    objectsSpawned.forEach(function (orangeContainer) {
+        orangeContainer.destroy();
+    });
+    objectsSpawned = [];
+}
 
 function createObjectFromPrefab() {
     if (script.orangeContainer) {

Public/Orange Container.oprfb

@@ -5,6 +5,8 @@
 
 // @input Component.Text scoreText
 // @input Component.Text highScoreText
+// @input Component.Text endGameText
+
 
 var currentScore = 0;
 var highScore = 0;
@@ -54,6 +56,9 @@ function resetGame() {
 }
 
 function endGame() {
+    print("Congratulations, you scored: " + currentScore.toString() + ".");
+    script.endGameText.enabled = true;
+    script.endGameText.text = "Wow, you ate " + currentScore.toString() + " oranges. Did you know binge eating disorder is the most common eating disorder?";
     setHighScore();
     resetGame();
 }