Move action logic to ContextMenu vue component.

delaford · Jan 3, 2018 · 1963b25 · 1963b25
1 parent 43ae632
commit 1963b25
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/components/sub/ContextMenu.vue b/src/components/sub/ContextMenu.vue
@@ -21,7 +21,6 @@ export default {
   props: ['game'],
   created() {
     bus.$on('PLAYER:MENU', this.openMenu);
-    this.$forceUpdate();
   },
   data() {
     return {
@@ -48,10 +47,9 @@ export default {
       const data = {
         item,
         tile: this.tile,
-        actions: this.actions,
       };
 
-      bus.$emit('ITEM:DO', data);
+      this.actions.do(data);
 
       this.closeMenu();
     },

diff --git a/src/core/engine/actions.js b/src/core/engine/actions.js
@@ -5,18 +5,17 @@ class Actions {
   constructor(data) {
     this.player = data.player;
     this.board = data.board;
-
-    bus.$on('ITEM:DO', Actions.do);
   }
 
   /**
    * Execute the certain action by checking (if allowed)
    *
    * @param {object} data Information of tile, Action class and items
    */
-  static do(data) {
+  do(data) {
+    const player = this.player;
+    const board = this.board;
     const item = data.item;
-    const { player, board } = data.actions;
     const clickedTile = data.tile;
 
     switch (item) {

diff --git a/src/core/player.js b/src/core/player.js
@@ -112,7 +112,6 @@ class Player {
           } else {
             // We are done walking
             // so let's reset path
-            debugger;
             this.stopMovement();
           }
         } else {