From 12bbe9b52207d30b6ead7ee0dfc24c2461c314f3 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Fri, 1 Apr 2016 13:48:46 -0700
Subject: [PATCH] made plant static

---
 .../DomainContent/Home/growingPlant/wrapper.js       |  1 -
 .../DomainContent/Home/kineticObjects/deskLamp.json  | 12 ++++++------
 .../DomainContent/Home/kineticObjects/wrapper.js     |  2 +-
 .../Home/switches/livingRoomDeskLamp.js              |  7 +++++--
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
index 2799e8bf6f..409a99827a 100644
--- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
@@ -33,7 +33,6 @@ Plant = function(spawnPosition, spawnRotation) {
     type: "Model",
     modelURL: BOWL_MODEL_URL,
     dimensions: bowlDimensions,
-    dynamic: true,
     shapeType: 'compound',
     compoundShapeURL: BOWL_COLLISION_HULL_URL,
     name: "home_model_plantBowl",
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json b/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json
index 625e6d071e..d727614dbc 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/deskLamp.json
@@ -14,7 +14,7 @@
         },
         "id": "{c7c6108b-4c60-4735-b2bf-5559d7e30e7d}",
         "ignoreForCollisions": 1,
-        "name": "hifi-home-living-room-desk-lamp-trigger",
+        "name": "home_box_livingRoomDeskLampTrigger",
         "parentID": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}",
         "position": {
             "x": 0.0062166899442672729,
@@ -55,12 +55,12 @@
         "id": "{47e2c415-854c-4b6a-b71e-06c760675afd}",
         "intensity": 20,
         "isSpotlight": 1,
-        "name": "hifi-home-living-room-desk-lamp-spotlight",
+        "name": "home_light_livingRoomLight",
         "parentID": "{c7c6108b-4c60-4735-b2bf-5559d7e30e7d}",
         "position": {
-            "x": -0.10525670647621155,
+            "x": 0,
             "y": -0.14917388558387756,
-            "z": 0.71759903430938721
+            "z": 0
         },
         "queryAACube": {
             "scale": 20.784608840942383,
@@ -94,7 +94,7 @@
         },
         "id": "{6c59ca6f-e3f6-42c1-ae4d-1549b5bdaee1}",
         "modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Shade.fbx",
-        "name": "hifi-home-model-bulldog-shade",
+        "name": "home_model_bulldogShade",
         "position": {
             "x": 0.085205078125,
             "y": 0.5194091796875,
@@ -138,7 +138,7 @@
         },
         "id": "{f59b50d8-13fb-4ceb-b80a-62cd03428a7c}",
         "modelURL": "atp:/kineticObjects/lamp/Lamp-Bulldog-Base.fbx",
-        "name": "hifi-home-model-bulldog-base",
+        "name": "home_model_BulldogBase",
         "position": {
             "x": 0.08642578125,
             "y": 0.306884765625,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js
index a4b91a5403..602437de15 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/wrapper.js
@@ -204,7 +204,7 @@ Books = function(spawnLocation, spawnRotation) {
 }
 
 Blocks = function(spawnLocation, spawnRotation) {
-    print('CREATE BLOCKS')
+    print('EBL CREATE BLOCKS')
     var created = [];
 
     function create() {
diff --git a/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js b/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js
index 502e4c9bf0..791908c5b8 100644
--- a/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js
+++ b/unpublishedScripts/DomainContent/Home/switches/livingRoomDeskLamp.js
@@ -11,6 +11,7 @@
 
     Switch.prototype = {
         prefix: 'hifi-home-living-room-desk-lamp-',
+        lightName: 'home_light_livingRoomLight',
         clickReleaseOnEntity: function(entityID, mouseEvent) {
             if (!mouseEvent.isLeftButton) {
                 return;
@@ -63,9 +64,11 @@
             var results = Entities.findEntities(_this.position, SEARCH_RADIUS);
             results.forEach(function(result) {
                 var properties = Entities.getEntityProperties(result);
-                if (properties.name === _this.prefix + "spotlight") {
-                    print("EBL FOUND THE SPOTLIGHT!");
+                if (properties.name === _this.lightName) {
+                    print("EBL FOUND THE LIGHT!");
                     found.push(result);
+                } else {
+                    print("EBL DID NOT FIND THE LIGHT!");
                 }
             });
             return found;