From 0d1e7a478a07177c6dbf0c59fef7762ba218320a Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Wed, 30 Mar 2016 15:36:21 -0700
Subject: [PATCH] fishie fish fish

---
 .../Home/fishTank/singleSpawner.js            |  3 ++-
 .../DomainContent/Home/fishTank/wrapper.js    | 26 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js b/unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js
index 107665b258..f81c5311d6 100644
--- a/unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js
+++ b/unpublishedScripts/DomainContent/Home/fishTank/singleSpawner.js
@@ -1,4 +1,5 @@
-    var fishTankPath = Script.resolvePath('wrapper.js');
+    var fishTankPath = Script.resolvePath('atp:/fishTank/wrapper.js');
+        var fishTankPath = Script.resolvePath('wrapper.js');
     Script.include(fishTankPath);
     var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
         x: 0,
diff --git a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
index abbd07c707..28062eecea 100644
--- a/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
@@ -22,9 +22,9 @@ FishTank = function(spawnPosition, spawnRotation) {
         z: 2.1404
     };
 
-    var INNER_TANK_SCALE = 0.7;
+    var INNER_TANK_SCALE = 0.85;
     var INNER_TANK_DIMENSIONS = Vec3.multiply(INNER_TANK_SCALE, TANK_DIMENSIONS);
-    INNER_TANK_DIMENSIONS.y = INNER_TANK_DIMENSIONS.y - 0.4;
+    INNER_TANK_DIMENSIONS.y = INNER_TANK_DIMENSIONS.y - 0.2;
     var TANK_WIDTH = TANK_DIMENSIONS.z;
     var TANK_HEIGHT = TANK_DIMENSIONS.y;
 
@@ -64,11 +64,10 @@ FishTank = function(spawnPosition, spawnRotation) {
     var bubbleSound = SoundCache.getSound(BUBBLE_SOUND_URL);
 
 
-    var ANEMONE_FORWARD_OFFSET = TANK_DIMENSIONS.x - 0.35;
-    var ANEMONE_LATERAL_OFFSET = -0.05;
+    var ANEMONE_FORWARD_OFFSET = -TANK_DIMENSIONS.x+0.1;
+    var ANEMONE_LATERAL_OFFSET = 0.2;
     var ANEMONE_VERTICAL_OFFSET = -0.12;
 
-
     var ANEMONE_MODEL_URL = 'atp:/fishTank/anemone.fbx';
     var ANEMONE_ANIMATION_URL = 'atp:/fishTank/anemone.fbx';
     var ANEMONE_DIMENSIONS = {
@@ -89,9 +88,9 @@ FishTank = function(spawnPosition, spawnRotation) {
         z: 1.64
     }
 
-    var TREASURE_FORWARD_OFFSET = -TANK_DIMENSIONS.x;
-    var TREASURE_LATERAL_OFFSET = -0.15;
-    var TREASURE_VERTICAL_OFFSET = -0.23;
+    var TREASURE_FORWARD_OFFSET = TANK_DIMENSIONS.x - 0.075;
+    var TREASURE_LATERAL_OFFSET = 0.15;
+    var TREASURE_VERTICAL_OFFSET = -0.26;
 
     var TREASURE_MODEL_URL = 'atp:/fishTank/Treasure-Chest2-SM.fbx';
 
@@ -273,7 +272,7 @@ FishTank = function(spawnPosition, spawnRotation) {
             modelURL: TREASURE_MODEL_URL,
             position: finalPosition,
             dimensions: TREASURE_DIMENSIONS,
-            rotation: Quat.fromPitchYawRollDegrees(10, 135, 10),
+            rotation: Quat.fromPitchYawRollDegrees(10, 35, 10),
             userData: JSON.stringify({
                 'hifiHomeKey': {
                     'reset': true
@@ -322,23 +321,25 @@ FishTank = function(spawnPosition, spawnRotation) {
             },
             position: TANK_POSITION,
             rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),
-            color: DEBUG_COLOR,
             collisionless: true,
             script: TANK_SCRIPT,
-            visible: true,
+            visible: false,
             userData: JSON.stringify({
                 'hifiHomeKey': {
                     'reset': true
                 }
             }),
         }
-        innerTank = Entities.addEntity(innerTank);
+        print('INNER TANK PROPS ' + properties)
+        innerTank = Entities.addEntity(properties);
     }
 
     createFishTank();
 
     createBubbleSystems();
 
+    createInnerTank();
+
     createAnenome();
 
     createRocks();
@@ -355,6 +356,7 @@ FishTank = function(spawnPosition, spawnRotation) {
         Entities.deleteEntity(thirdBubbleSystem);
         Entities.deleteEntity(anemone);
         Entities.deleteEntity(rocks);
+        Entities.deleteEntity(innerTank);
     }
 
     this.cleanup = cleanup;