Wow this is some shitty fucking code god damn

10 files changed, 34 insertions, 25 deletions

diff --git a/src/entities/bigblue.js b/src/entities/bigblue.js
index 5b6af0f..bcf80d5 100644
--- a/src/entities/bigblue.js
+++ b/src/entities/bigblue.js
@@ -3,10 +3,10 @@ game.createBigBlue = () => {
   bigBlue.addComponent(game.components.LoadPriority({priority: 1}));
   bigBlue.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
   bigBlue.addComponent(game.components.Alive());
-  bigBlue.addComponent(game.components.Sprite({spriteName: "bigBlue"}))
+  bigBlue.addComponent(game.components.Sprite({spriteName: "bigBlue"}));
   
-  // TODO: Remove this
-  bigBlue.addComponent(game.components.Controllable({controls: ['left', 'right', 'up', 'down']}));
 
+//  bigBlue.addComponent(game.components.Controllable({controls: ['left', 'right', 'up', 'down']}));
+  bigBlue.addComponent(game.components.Name({selector: "bigblue"}));
   return bigBlue;
-}
\ No newline at end of file
+};
diff --git a/src/entities/rock.js b/src/entities/rock.js
index 4d73f8d..6a28f6e 100644
--- a/src/entities/rock.js
+++ b/src/entities/rock.js
@@ -3,10 +3,11 @@ game.createRock = () => {
   rock.addComponent(game.components.LoadPriority({priority: 2}));
   rock.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
   rock.addComponent(game.components.Alive());
-  rock.addComponent(game.components.Sprite({spriteName: "rock"}))
+  rock.addComponent(game.components.Sprite({spriteName: "rock"}));;
 
-  //TODO: Remove this
-  rock.addComponent(game.components.Pushable());
+
+//  rock.addComponent(game.components.Pushable());
+  rock.addComponent(game.components.Name({selector: "rock"}));
 
   return rock;
-}
+};
diff --git a/src/entities/wall.js b/src/entities/wall.js
index af9aa1d..7b5c65f 100644
--- a/src/entities/wall.js
+++ b/src/entities/wall.js
@@ -2,8 +2,9 @@ game.createWall = () => {
   const wall = game.Entity();
   wall.addComponent(game.components.LoadPriority({priority: 3}));
   wall.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
-  wall.addComponent(game.components.Stop());
+//  wall.addComponent(game.components.Stop());
+  wall.addComponent(game.components.Name({selector: "wall"}));
   wall.addComponent(game.components.Alive());
-  wall.addComponent(game.components.Sprite({spriteName: "wall"}))
+  wall.addComponent(game.components.Sprite({spriteName: "wall"}));
   return wall;
-}
+};
diff --git a/src/entities/wordBigBlue.js b/src/entities/wordBigBlue.js
index b6dd661..15aaa0e 100644
--- a/src/entities/wordBigBlue.js
+++ b/src/entities/wordBigBlue.js
@@ -4,6 +4,7 @@ game.createWordBigBlue = () => {
   wordBigBlue.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
   wordBigBlue.addComponent(game.components.Pushable({pushable: true}));
   wordBigBlue.addComponent(game.components.Alive());
-  wordBigBlue.addComponent(game.components.Sprite({spriteName: "wordBigBlue"}))
+  wordBigBlue.addComponent(game.components.Sprite({spriteName: "wordBigBlue"}));
+  wordBigBlue.addComponent(game.components.Noun({select: "bigblue"}));
   return wordBigBlue;
-}
+};
diff --git a/src/entities/wordIs.js b/src/entities/wordIs.js
index 15bcbea..041f10c 100644
--- a/src/entities/wordIs.js
+++ b/src/entities/wordIs.js
@@ -5,6 +5,7 @@ game.createWordIs = () => {
   // wordIs.addComponent(game.components.Stop({stop: true}));
   wordIs.addComponent(game.components.Pushable());
   wordIs.addComponent(game.components.Alive());
-  wordIs.addComponent(game.components.Sprite({spriteName: "wordIs"}))
+  wordIs.addComponent(game.components.Sprite({spriteName: "wordIs"}));
+  wordIs.addComponent(game.components.Verb({action: "Is"}));
   return wordIs;
-}
+};
diff --git a/src/entities/wordPush.js b/src/entities/wordPush.js
index 09478f6..5594e46 100644
--- a/src/entities/wordPush.js
+++ b/src/entities/wordPush.js
@@ -4,6 +4,7 @@ game.createWordPush = () => {
   wordPush.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
   wordPush.addComponent(game.components.Pushable({pushable: true}));
   wordPush.addComponent(game.components.Alive());
-  wordPush.addComponent(game.components.Sprite({spriteName: "wordPush"}))
+  wordPush.addComponent(game.components.Sprite({spriteName: "wordPush"}));
+  wordPush.addComponent(game.components.Verb({action: "push"}));
   return wordPush;
-}
+};
diff --git a/src/entities/wordRock.js b/src/entities/wordRock.js
index 0897e35..648f6ba 100644
--- a/src/entities/wordRock.js
+++ b/src/entities/wordRock.js
@@ -4,6 +4,7 @@ game.createWordRock = () => {
   wordRock.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
   wordRock.addComponent(game.components.Pushable({pushable: true}));
   wordRock.addComponent(game.components.Alive());
-  wordRock.addComponent(game.components.Sprite({spriteName: "wordRock"}))
+  wordRock.addComponent(game.components.Sprite({spriteName: "wordRock"}));
+  wordRock.addComponent(game.components.Noun({select: "rock"}));
   return wordRock;
-}
+};
diff --git a/src/entities/wordStop.js b/src/entities/wordStop.js
index 6eb79ea..e2ad45c 100644
--- a/src/entities/wordStop.js
+++ b/src/entities/wordStop.js
@@ -4,6 +4,7 @@ game.createWordStop = () => {
   wordStop.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
   wordStop.addComponent(game.components.Pushable({pushable: true}));
   wordStop.addComponent(game.components.Alive());
-  wordStop.addComponent(game.components.Sprite({spriteName: "wordStop"}))
+  wordStop.addComponent(game.components.Sprite({spriteName: "wordStop"}));
+  wordStop.addComponent(game.components.Verb({action: "stop"}));
   return wordStop;
-}
+};
diff --git a/src/entities/wordWall.js b/src/entities/wordWall.js
index ea7068f..277ab69 100644
--- a/src/entities/wordWall.js
+++ b/src/entities/wordWall.js
@@ -4,6 +4,7 @@ game.createWordWall = () => {
   wordWall.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
   wordWall.addComponent(game.components.Pushable({pushable: true}));
   wordWall.addComponent(game.components.Alive());
-  wordWall.addComponent(game.components.Sprite({spriteName: "wordWall"}))
+  wordWall.addComponent(game.components.Noun({select: "wall"}));
+  wordWall.addComponent(game.components.Sprite({spriteName: "wordWall"}));
   return wordWall;
-}
+};
diff --git a/src/entities/wordYou.js b/src/entities/wordYou.js
index 89a3723..1bf698f 100644
--- a/src/entities/wordYou.js
+++ b/src/entities/wordYou.js
@@ -4,6 +4,7 @@ game.createWordYou = () => {
   wordYou.addComponent(game.components.Appearance({rot: 0, width: 100, height: 100}));
   wordYou.addComponent(game.components.Pushable({pushable: true}));
   wordYou.addComponent(game.components.Alive());
-  wordYou.addComponent(game.components.Sprite({spriteName: "wordYou"}))
+  wordYou.addComponent(game.components.Sprite({spriteName: "wordYou"}));
+  wordYou.addComponent(game.components.Verb({action: "you"}));
   return wordYou;
-}
+};