From f78580d898a0cdafc0f73ae72157680c39638f93 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Wed, 27 Jun 2018 00:24:50 -0400
Subject: [PATCH 01/17] WIP for store layout and two markets

---
 src/App.vue                  |  14 +++--
 src/components/Inventory.vue |  40 +++++++++++++
 src/components/Market.vue    |  29 ++-------
 src/main.js                  |   4 +-
 src/store/index.js           | 111 ++++++++++++-----------------------
 5 files changed, 91 insertions(+), 107 deletions(-)
 create mode 100644 src/components/Inventory.vue

diff --git a/src/App.vue b/src/App.vue
index 53ea126..f10c93a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,21 +1,23 @@
 <template>
   <div id="app">
-    <Market/>
-    <ResourceList/>
+    <Market v-for="(inventory, name) in inventories" v-bind:inventory="inventory" v-bind:name="name" :key="name"/>
   </div>
 </template>
 
 <script>
-import Market from './components/Market'
-import ResourceList from './components/ResourceList'
+import Inventory from './components/Inventory'
 
 // Parent root element for the entire application
 // Does nothing but display the children
 export default {
   name: 'App',
   components: {
-    Market,
-    ResourceList
+    Inventory
+  },
+  computed: {
+    markets ()  {
+      return this.$store.state.markets
+    }
   }
 }
 </script>
diff --git a/src/components/Inventory.vue b/src/components/Inventory.vue
new file mode 100644
index 0000000..64eb826
--- /dev/null
+++ b/src/components/Inventory.vue
@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <p class="invheader">{{name}}</p>
+    <table>
+      <tr>
+        <th>Item</th>
+        <th>Quantity</th>
+      </tr>
+      <tr v-for="item in items" :key="item.id">
+        <td>{{item.id}}</td>
+        <td>{{item.quantity}}</td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Inventory',
+  props: ['name'],
+  computed: {
+    inventory () {
+      return this.$store.state.inventories[this.name]
+    },
+    items () {
+      return this.inventory.items.map(itemId => {
+        return {
+          id: itemId,
+          quantity: this.inventory.quantities[itemId]
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+p.invheader {
+  font-size: 1.5em;
+}
diff --git a/src/components/Market.vue b/src/components/Market.vue
index b38da71..df6b273 100644
--- a/src/components/Market.vue
+++ b/src/components/Market.vue
@@ -1,37 +1,18 @@
 <template>
   <div id="market">
-    <button v-on:click="buyWorker" shortCode="worker">Buy worker - ${{workerCost}}</button>
+    <p>Market {{name}}</p>
+    <Inventory v-bind:name="inventory" />
   </div>
 </template>
 
 <script>
-import {mapGetters} from 'vuex'
-import Engine from '@/Engine.js'
 
 export default {
   name: 'Market',
-  data () {
-    // Initial state for the component
-    return {
-      workerBaseCost: 10,
-      workerBaseRate: 0.2
-    }
-  },
+  props: ['name'],
   computed: {
-    ...mapGetters({
-      money: 'money',
-      workers: 'workers'
-    }),
-    // Dynamically calculate worker cost based on data and worker count
-    workerCost () {
-      const workerRate = Math.floor(this.workerBaseCost * this.workerBaseRate * this.workers)
-      return this.workerBaseCost + workerRate
-    }
-  },
-  methods: {
-    buyWorker (event) {
-      // Call the external engine method for buyItem
-      Engine.buyItem('worker', 1, this.workerCost)
+    inventory () {
+      return this.$store.state.markets[this.name].inventory
     }
   }
 }
diff --git a/src/main.js b/src/main.js
index 01cf5de..5e9b01d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -18,8 +18,8 @@ new Vue({
     counter: 0
   },
   mounted () {
-    Engine.store = this.$store
-    Engine.start()
+    // Engine.store = this.$store
+    // Engine.start()
   },
   beforeDestroy () {
     Engine.stop()
diff --git a/src/store/index.js b/src/store/index.js
index 43c45cf..ec67e45 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -4,89 +4,50 @@ import Vuex from 'vuex'
 
 Vue.use(Vuex)
 
-// Set up persistent storage
-// Leave this commented out during development
-// const vuexlocalstorage = new VuexPersist({
-//   key: 'railway-simulator',
-//   storage: window.localStorage
-// })
-
-// The initial state of the application
 const state = {
-  money: 100,
-  inventory: {
-    worker: 0
-  },
-  resources: [{
-    shortCode: 'worker',
-    name: 'Worker',
-    description: 'Basic worker',
-    income: 2,
-    cost: 10,
-    rate: 0.2
-  }],
-  timestamp: Math.floor(new Date() / 1000)
-}
-
-// Define getters here
-// Use this.$store.getters.<foo> to access
-const getters = {
-  money: state => state.money,
-  workers: state => state.inventory.worker,
-  timestamp: state => state.timestamp,
-  inventory: state => state.inventory,
-  resource (state) {
-    // This takes a shortCode parameter and returns the item in the resources
-    // list that corresponds with the shortCode
-    return shortCode => state.resources.filter(resource => {
-      return resource.shortCode === shortCode
-    })[0]
-  }
-}
-
-// Define actions here
-// Use this.$store.dispatch('foo', {}) to access
-const actions = {
-  buy ({commit}, {item, amount, cost}) {
-    commit('BUY', {
-      item: item,
-      amount,
-      cost
-    })
-  },
-  income ({commit}, {amount}) {
-    commit('INCOME', {amount})
-  },
-  setTime ({commit}, {timestamp}) {
-    commit('SETTIME', {timestamp})
-  }
-}
-
-// Define the mutations here
-// Ideally, this is what the actions will call to actually change the state
-// Use this.$store.commit('FOO', {}) to access
-const mutations = {
-  BUY (state, {item, amount, cost}) {
-    if (item in state.inventory) {
-      state.inventory[item] += amount
-    } else {
-      state.inventory[item] = amount
+  items: {
+    'wood': {
+      craftable: true,
+      weight: 1,
+      description: 'Wood'
+    },
+    'metal': {
+      craftable: true,
+      weight: 5,
+      description: 'Metal'
     }
-    state.money -= cost
   },
-  INCOME (state, {amount}) {
-    state.money += amount
+  inventories: {
+    'abc': {
+      items: ['wood'],
+      quantities: {
+        'wood': 2
+      }
+    },
+    'def': {
+      items: ['metal', 'wood'],
+      quantities: {
+        'wood': 0,
+        'metal': 2
+      }
+    }
   },
-  SETTIME (state, {timestamp}) {
-    state.timestamp = timestamp
+  markets: {
+    'market1': {
+      inventory: 'abc'
+    },
+    'market2': {
+      inventory: 'def'
+    }
   }
 }
 
 // Export store by default
 export default new Vuex.Store({
   state,
-  getters,
-  mutations,
-  actions
-  // plugins: [vuexlocalstorage.plugin]
+  mutations: {
+    CHANGE (state) {
+      state.inventories['abc'].quantities['wood'] += 1
+    }
+  }
 })

From b6494961dca0e038b8f065024221b3dba37b0fff Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Thu, 28 Jun 2018 17:40:13 -0400
Subject: [PATCH 02/17] More wip

---
 src/App.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index f10c93a..dfdba5c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,22 +1,22 @@
 <template>
   <div id="app">
-    <Market v-for="(inventory, name) in inventories" v-bind:inventory="inventory" v-bind:name="name" :key="name"/>
+    <Market v-for="for market in markets" :key="market"/>
   </div>
 </template>
 
 <script>
-import Inventory from './components/Inventory'
+import Market from './components/Market'
 
 // Parent root element for the entire application
 // Does nothing but display the children
 export default {
   name: 'App',
   components: {
-    Inventory
+    Market
   },
   computed: {
     markets ()  {
-      return this.$store.state.markets
+      return Object.keys(this.$store.state.markets)
     }
   }
 }

From 7debff4ea83b6b4a7daf1709bfb8892e944d8a86 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Thu, 28 Jun 2018 18:44:44 -0400
Subject: [PATCH 03/17] View components are working

---
 src/App.vue                  | 4 ++--
 src/components/Inventory.vue | 2 +-
 src/components/Market.vue    | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index dfdba5c..1e6a85f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <Market v-for="for market in markets" :key="market"/>
+    <Market v-for="market in markets" :key="market" v-bind:name="market"/>
   </div>
 </template>
 
@@ -15,7 +15,7 @@ export default {
     Market
   },
   computed: {
-    markets ()  {
+    markets () {
       return Object.keys(this.$store.state.markets)
     }
   }
diff --git a/src/components/Inventory.vue b/src/components/Inventory.vue
index 64eb826..2d962d3 100644
--- a/src/components/Inventory.vue
+++ b/src/components/Inventory.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <p class="invheader">{{name}}</p>
+    <p class="invheader">Inventory - {{name}}</p>
     <table>
       <tr>
         <th>Item</th>
diff --git a/src/components/Market.vue b/src/components/Market.vue
index df6b273..b0d9c0b 100644
--- a/src/components/Market.vue
+++ b/src/components/Market.vue
@@ -1,15 +1,18 @@
 <template>
   <div id="market">
-    <p>Market {{name}}</p>
+    <p>Market - {{name}}</p>
     <Inventory v-bind:name="inventory" />
   </div>
 </template>
 
 <script>
-
+import Inventory from './Inventory'
 export default {
   name: 'Market',
   props: ['name'],
+  components: {
+    Inventory
+  },
   computed: {
     inventory () {
       return this.$store.state.markets[this.name].inventory

From dcfffe4c66cd67244f738948e597fda453f7b54c Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Sat, 30 Jun 2018 00:04:43 -0400
Subject: [PATCH 04/17] Initial layout for market buys and player inventory

---
 src/App.vue                        |  5 ++++-
 src/components/Market.vue          |  6 +++---
 src/components/MarketInventory.vue | 27 +++++++++++++++++++++++++++
 src/components/Player.vue          | 21 +++++++++++++++++++++
 src/store/index.js                 |  9 +++++++++
 5 files changed, 64 insertions(+), 4 deletions(-)
 create mode 100644 src/components/MarketInventory.vue
 create mode 100644 src/components/Player.vue

diff --git a/src/App.vue b/src/App.vue
index 1e6a85f..7c49462 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,18 +1,21 @@
 <template>
   <div id="app">
     <Market v-for="market in markets" :key="market" v-bind:name="market"/>
+    <Player />
   </div>
 </template>
 
 <script>
 import Market from './components/Market'
+import Player from './components/Player'
 
 // Parent root element for the entire application
 // Does nothing but display the children
 export default {
   name: 'App',
   components: {
-    Market
+    Market,
+    Player
   },
   computed: {
     markets () {
diff --git a/src/components/Market.vue b/src/components/Market.vue
index b0d9c0b..5e6e0ba 100644
--- a/src/components/Market.vue
+++ b/src/components/Market.vue
@@ -1,17 +1,17 @@
 <template>
   <div id="market">
     <p>Market - {{name}}</p>
-    <Inventory v-bind:name="inventory" />
+    <MarketInventory v-bind:name="inventory" />
   </div>
 </template>
 
 <script>
-import Inventory from './Inventory'
+import MarketInventory from './MarketInventory'
 export default {
   name: 'Market',
   props: ['name'],
   components: {
-    Inventory
+    MarketInventory
   },
   computed: {
     inventory () {
diff --git a/src/components/MarketInventory.vue b/src/components/MarketInventory.vue
new file mode 100644
index 0000000..d803cd4
--- /dev/null
+++ b/src/components/MarketInventory.vue
@@ -0,0 +1,27 @@
+<template>
+  <div>
+    <table>
+      <tr>
+        <th>Item</th>
+        <th>Quantity</th>
+        <th>Actions</th>
+      </tr>
+      <tr v-for="item in items" :key="item.id">
+        <td>{{item.id}}</td>
+        <td>{{item.quantity}}</td>
+        <td>
+          <button>Buy</button>
+          <button>Sell</button>
+        </td>
+      </tr>
+    </table>
+  </div>
+</template>
+
+<script>
+import Inventory from './Inventory'
+export default {
+  name: 'MarketInventory',
+  extends: Inventory
+}
+</script>
diff --git a/src/components/Player.vue b/src/components/Player.vue
new file mode 100644
index 0000000..5e9a0e0
--- /dev/null
+++ b/src/components/Player.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <p>Player</p>
+    <Inventory v-bind:name="inventory"/>
+  </div>
+</template>
+
+<script>
+import Inventory from './Inventory'
+export default {
+  name: 'Player',
+  components: {
+    Inventory
+  },
+  computed: {
+    inventory () {
+      return this.$store.state.player.inventory
+    }
+  }
+}
+</script>
diff --git a/src/store/index.js b/src/store/index.js
index ec67e45..384e6fa 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -30,6 +30,12 @@ const state = {
         'wood': 0,
         'metal': 2
       }
+    },
+    'player': {
+      items: ['wood'],
+      quantities: {
+        'wood': 1
+      }
     }
   },
   markets: {
@@ -39,6 +45,9 @@ const state = {
     'market2': {
       inventory: 'def'
     }
+  },
+  player: {
+    inventory: 'player'
   }
 }
 

From b8952f83e1329d4fbd35b00bd5cdbe9a0c6c604e Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Mon, 2 Jul 2018 20:57:19 -0400
Subject: [PATCH 05/17] Added store items and stub functions for buy and sell

---
 src/components/MarketInventory.vue | 18 +++++++++++++++---
 src/store/index.js                 | 27 +++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/components/MarketInventory.vue b/src/components/MarketInventory.vue
index d803cd4..1577d3b 100644
--- a/src/components/MarketInventory.vue
+++ b/src/components/MarketInventory.vue
@@ -10,8 +10,8 @@
         <td>{{item.id}}</td>
         <td>{{item.quantity}}</td>
         <td>
-          <button>Buy</button>
-          <button>Sell</button>
+          <button @click="buy" :item="item.id">Buy</button>
+          <button @click="sell" :item="item.id">Sell</button>
         </td>
       </tr>
     </table>
@@ -19,9 +19,21 @@
 </template>
 
 <script>
+import {mapActions} from 'vuex'
 import Inventory from './Inventory'
 export default {
   name: 'MarketInventory',
-  extends: Inventory
+  extends: Inventory,
+  methods: {
+    ...mapActions(['buyItem']),
+    buy (event) {
+      const item = event.target.attributes.getNamedItem('item').value
+      console.log('Buying', item)
+    },
+    sell (event) {
+      const item = event.target.attributes.getNamedItem('item').value
+      console.log('Selling', item)
+    }
+  }
 }
 </script>
diff --git a/src/store/index.js b/src/store/index.js
index 384e6fa..7112543 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -54,9 +54,32 @@ const state = {
 // Export store by default
 export default new Vuex.Store({
   state,
+  actions: {
+    buyItem ({commit}, toinv, frominv, item, quantity) {
+      commit('REMOVE_ITEM', {
+        inv: frominv,
+        item,
+        quantity
+      })
+      commit('ADD_ITEM', {
+        inv: toinv,
+        item,
+        quantity
+      })
+    }
+  },
   mutations: {
-    CHANGE (state) {
-      state.inventories['abc'].quantities['wood'] += 1
+    ADD_ITEM (state, {inv, item, quantity}) {
+      const inventory = state.inventories[inv]
+      inventory.quantities[item] += quantity
+    },
+    REMOVE_ITEM (state, {inv, item, quantity}) {
+      const inventory = state.inventories[inv]
+      if (inventory.quantities[item] < quantity) {
+        inventory.quantities[item] -= quantity
+      } else {
+        throw new Error(`${inv} has less than ${quantity} of ${item}`)
+      }
     }
   }
 })

From ef73ea02fba1d6d057d52febcfa52c0d790cbeb3 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Mon, 2 Jul 2018 21:37:48 -0400
Subject: [PATCH 06/17] Buy operations working

---
 src/components/MarketInventory.vue | 14 ++++++++++++--
 src/store/index.js                 | 17 ++++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/components/MarketInventory.vue b/src/components/MarketInventory.vue
index 1577d3b..670cb28 100644
--- a/src/components/MarketInventory.vue
+++ b/src/components/MarketInventory.vue
@@ -10,7 +10,12 @@
         <td>{{item.id}}</td>
         <td>{{item.quantity}}</td>
         <td>
-          <button @click="buy" :item="item.id">Buy</button>
+          <button
+            @click="buy"
+            :item="item.id"
+            :disabled="inventory.quantities[item.id] <= 0">
+            Buy
+          </button>
           <button @click="sell" :item="item.id">Sell</button>
         </td>
       </tr>
@@ -28,7 +33,12 @@ export default {
     ...mapActions(['buyItem']),
     buy (event) {
       const item = event.target.attributes.getNamedItem('item').value
-      console.log('Buying', item)
+      this.buyItem({
+        toinv: 'player',
+        frominv: this.name,
+        item,
+        quantity: 1
+      })
     },
     sell (event) {
       const item = event.target.attributes.getNamedItem('item').value
diff --git a/src/store/index.js b/src/store/index.js
index 7112543..82b6b9d 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -55,7 +55,8 @@ const state = {
 export default new Vuex.Store({
   state,
   actions: {
-    buyItem ({commit}, toinv, frominv, item, quantity) {
+    buyItem ({commit}, {toinv, frominv, item, quantity}) {
+      console.log('Transferring from', frominv)
       commit('REMOVE_ITEM', {
         inv: frominv,
         item,
@@ -71,11 +72,21 @@ export default new Vuex.Store({
   mutations: {
     ADD_ITEM (state, {inv, item, quantity}) {
       const inventory = state.inventories[inv]
-      inventory.quantities[item] += quantity
+      // Make copy of an object
+      let quantities = Object.assign({}, inventory.quantities)
+      if (inventory.items.includes(item)) {
+        quantities[item] += quantity
+      } else {
+        inventory.items.push(item)
+        quantities[item] = quantity
+      }
+      // Set the copy back to the state
+      inventory.quantities = quantities
     },
     REMOVE_ITEM (state, {inv, item, quantity}) {
+      console.log(inv, item, quantity)
       const inventory = state.inventories[inv]
-      if (inventory.quantities[item] < quantity) {
+      if (inventory.quantities[item] - quantity >= 0) {
         inventory.quantities[item] -= quantity
       } else {
         throw new Error(`${inv} has less than ${quantity} of ${item}`)

From 52cbe9e3601b45f59f22d22acddc66da175dbe89 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Mon, 2 Jul 2018 22:43:47 -0400
Subject: [PATCH 07/17] Sell functionality working

---
 src/components/MarketInventory.vue | 11 ++++++++---
 src/store/index.js                 |  3 +--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/MarketInventory.vue b/src/components/MarketInventory.vue
index 670cb28..7e422f8 100644
--- a/src/components/MarketInventory.vue
+++ b/src/components/MarketInventory.vue
@@ -30,10 +30,10 @@ export default {
   name: 'MarketInventory',
   extends: Inventory,
   methods: {
-    ...mapActions(['buyItem']),
+    ...mapActions(['transferItem']),
     buy (event) {
       const item = event.target.attributes.getNamedItem('item').value
-      this.buyItem({
+      this.transferItem({
         toinv: 'player',
         frominv: this.name,
         item,
@@ -42,7 +42,12 @@ export default {
     },
     sell (event) {
       const item = event.target.attributes.getNamedItem('item').value
-      console.log('Selling', item)
+      this.transferItem({
+        toinv: this.name,
+        frominv: 'player',
+        item,
+        quantity: 1
+      })
     }
   }
 }
diff --git a/src/store/index.js b/src/store/index.js
index 82b6b9d..965d686 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -55,8 +55,7 @@ const state = {
 export default new Vuex.Store({
   state,
   actions: {
-    buyItem ({commit}, {toinv, frominv, item, quantity}) {
-      console.log('Transferring from', frominv)
+    transferItem ({commit}, {toinv, frominv, item, quantity}) {
       commit('REMOVE_ITEM', {
         inv: frominv,
         item,

From b2e9f8e4f394c82a3bec254a6e172ca83edec7e2 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Wed, 4 Jul 2018 12:17:09 -0400
Subject: [PATCH 08/17] Put store inventories in a separate module

---
 src/components/MarketInventory.vue |  6 +--
 src/store/index.js                 | 66 ++++--------------------------
 src/store/modules/inventories.js   | 48 ++++++++++++++++++++++
 3 files changed, 59 insertions(+), 61 deletions(-)
 create mode 100644 src/store/modules/inventories.js

diff --git a/src/components/MarketInventory.vue b/src/components/MarketInventory.vue
index 7e422f8..6489017 100644
--- a/src/components/MarketInventory.vue
+++ b/src/components/MarketInventory.vue
@@ -30,10 +30,10 @@ export default {
   name: 'MarketInventory',
   extends: Inventory,
   methods: {
-    ...mapActions(['transferItem']),
+    ...mapActions(['buyItem']),
     buy (event) {
       const item = event.target.attributes.getNamedItem('item').value
-      this.transferItem({
+      this.buyItem({
         toinv: 'player',
         frominv: this.name,
         item,
@@ -42,7 +42,7 @@ export default {
     },
     sell (event) {
       const item = event.target.attributes.getNamedItem('item').value
-      this.transferItem({
+      this.buyItem({
         toinv: this.name,
         frominv: 'player',
         item,
diff --git a/src/store/index.js b/src/store/index.js
index 965d686..7ac7c4b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,42 +1,13 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
+import inventories from './modules/inventories'
 // import VuexPersist from 'vuex-persist'
 
 Vue.use(Vuex)
 
 const state = {
-  items: {
-    'wood': {
-      craftable: true,
-      weight: 1,
-      description: 'Wood'
-    },
-    'metal': {
-      craftable: true,
-      weight: 5,
-      description: 'Metal'
-    }
-  },
   inventories: {
-    'abc': {
-      items: ['wood'],
-      quantities: {
-        'wood': 2
-      }
-    },
-    'def': {
-      items: ['metal', 'wood'],
-      quantities: {
-        'wood': 0,
-        'metal': 2
-      }
-    },
-    'player': {
-      items: ['wood'],
-      quantities: {
-        'wood': 1
-      }
-    }
+
   },
   markets: {
     'market1': {
@@ -54,42 +25,21 @@ const state = {
 // Export store by default
 export default new Vuex.Store({
   state,
+  modules: {
+    inventories
+  },
   actions: {
-    transferItem ({commit}, {toinv, frominv, item, quantity}) {
-      commit('REMOVE_ITEM', {
+    buyItem ({commit}, {toinv, frominv, item, quantity}) {
+      commit('inventories/REMOVE_ITEM', {
         inv: frominv,
         item,
         quantity
       })
-      commit('ADD_ITEM', {
+      commit('inventories/ADD_ITEM', {
         inv: toinv,
         item,
         quantity
       })
     }
-  },
-  mutations: {
-    ADD_ITEM (state, {inv, item, quantity}) {
-      const inventory = state.inventories[inv]
-      // Make copy of an object
-      let quantities = Object.assign({}, inventory.quantities)
-      if (inventory.items.includes(item)) {
-        quantities[item] += quantity
-      } else {
-        inventory.items.push(item)
-        quantities[item] = quantity
-      }
-      // Set the copy back to the state
-      inventory.quantities = quantities
-    },
-    REMOVE_ITEM (state, {inv, item, quantity}) {
-      console.log(inv, item, quantity)
-      const inventory = state.inventories[inv]
-      if (inventory.quantities[item] - quantity >= 0) {
-        inventory.quantities[item] -= quantity
-      } else {
-        throw new Error(`${inv} has less than ${quantity} of ${item}`)
-      }
-    }
   }
 })
diff --git a/src/store/modules/inventories.js b/src/store/modules/inventories.js
new file mode 100644
index 0000000..e803080
--- /dev/null
+++ b/src/store/modules/inventories.js
@@ -0,0 +1,48 @@
+export default {
+  namespaced: true,
+  state: {
+    'abc': {
+      items: ['wood'],
+      quantities: {
+        'wood': 2
+      }
+    },
+    'def': {
+      items: ['metal', 'wood'],
+      quantities: {
+        'wood': 0,
+        'metal': 2
+      }
+    },
+    'player': {
+      items: ['wood'],
+      quantities: {
+        'wood': 1
+      }
+    }
+  },
+  mutations: {
+    ADD_ITEM (state, {inv, item, quantity}) {
+      const inventory = state[inv]
+      // Make copy of an object
+      let quantities = Object.assign({}, inventory.quantities)
+      if (inventory.items.includes(item)) {
+        quantities[item] += quantity
+      } else {
+        inventory.items.push(item)
+        quantities[item] = quantity
+      }
+      // Set the copy back to the state
+      inventory.quantities = quantities
+    },
+    REMOVE_ITEM (state, {inv, item, quantity}) {
+      console.log(inv, item, quantity)
+      const inventory = state[inv]
+      if (inventory.quantities[item] - quantity >= 0) {
+        inventory.quantities[item] -= quantity
+      } else {
+        throw new Error(`${inv} has less than ${quantity} of ${item}`)
+      }
+    }
+  }
+}

From e7b4b6ff35a94f1f6ec82df1780cb58901d867bf Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Wed, 4 Jul 2018 13:50:40 -0400
Subject: [PATCH 09/17] Namespaced the store and refactored to match

---
 src/App.vue                                   | 11 +++++--
 src/components/Inventory.vue                  | 15 +++++++--
 src/components/Market.vue                     | 11 ++++++-
 src/components/MarketInventory.vue            | 19 ++++++++---
 src/components/Player.vue                     |  6 +++-
 src/store/index.js                            | 31 +++--------------
 .../modules/{inventories.js => inventory.js}  |  4 ++-
 src/store/modules/market.js                   | 33 +++++++++++++++++++
 8 files changed, 90 insertions(+), 40 deletions(-)
 rename src/store/modules/{inventories.js => inventory.js} (94%)
 create mode 100644 src/store/modules/market.js

diff --git a/src/App.vue b/src/App.vue
index 7c49462..89b85d8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,6 +8,11 @@
 <script>
 import Market from './components/Market'
 import Player from './components/Player'
+import {createNamespacedHelpers} from 'vuex'
+
+// Set up the helpers
+// TODO: move this to a MarketList
+const { mapState } = createNamespacedHelpers('market')
 
 // Parent root element for the entire application
 // Does nothing but display the children
@@ -18,9 +23,9 @@ export default {
     Player
   },
   computed: {
-    markets () {
-      return Object.keys(this.$store.state.markets)
-    }
+    ...mapState({
+      markets: state => Object.keys(state)
+    })
   }
 }
 </script>
diff --git a/src/components/Inventory.vue b/src/components/Inventory.vue
index 2d962d3..1171d3b 100644
--- a/src/components/Inventory.vue
+++ b/src/components/Inventory.vue
@@ -15,21 +15,32 @@
 </template>
 
 <script>
+import {createNamespacedHelpers} from 'vuex'
+const { mapGetters } = createNamespacedHelpers('inventory')
+
 export default {
   name: 'Inventory',
   props: ['name'],
   computed: {
+    ...mapGetters([
+      'getInventory'
+    ]),
     inventory () {
-      return this.$store.state.inventories[this.name]
+      return this.getInventory(this.name)
     },
     items () {
       return this.inventory.items.map(itemId => {
         return {
           id: itemId,
-          quantity: this.inventory.quantities[itemId]
+          quantity: this.getQuantity(itemId)
         }
       })
     }
+  },
+  methods: {
+    getQuantity (item) {
+      return this.inventory.quantities[item]
+    }
   }
 }
 </script>
diff --git a/src/components/Market.vue b/src/components/Market.vue
index 5e6e0ba..58f471c 100644
--- a/src/components/Market.vue
+++ b/src/components/Market.vue
@@ -7,6 +7,9 @@
 
 <script>
 import MarketInventory from './MarketInventory'
+import {createNamespacedHelpers} from 'vuex'
+
+const { mapGetters } = createNamespacedHelpers('market')
 export default {
   name: 'Market',
   props: ['name'],
@@ -14,8 +17,14 @@ export default {
     MarketInventory
   },
   computed: {
+    ...mapGetters([
+      'getMarket'
+    ]),
+    market () {
+      return this.getMarket(this.name)
+    },
     inventory () {
-      return this.$store.state.markets[this.name].inventory
+      return this.market.inventory
     }
   }
 }
diff --git a/src/components/MarketInventory.vue b/src/components/MarketInventory.vue
index 6489017..99f5e6f 100644
--- a/src/components/MarketInventory.vue
+++ b/src/components/MarketInventory.vue
@@ -13,7 +13,7 @@
           <button
             @click="buy"
             :item="item.id"
-            :disabled="inventory.quantities[item.id] <= 0">
+            :disabled="getQuantity(item.id) <= 0">
             Buy
           </button>
           <button @click="sell" :item="item.id">Sell</button>
@@ -24,15 +24,24 @@
 </template>
 
 <script>
-import {mapActions} from 'vuex'
+import {createNamespacedHelpers} from 'vuex'
 import Inventory from './Inventory'
+
+// Set up helpers
+const { mapActions } = createNamespacedHelpers('market')
+
 export default {
   name: 'MarketInventory',
   extends: Inventory,
   methods: {
-    ...mapActions(['buyItem']),
+    ...mapActions([
+      'buyItem'
+    ]),
+    getItemFromEvent (event) {
+      return event.target.attributes.getNamedItem('item').value
+    },
     buy (event) {
-      const item = event.target.attributes.getNamedItem('item').value
+      const item = this.getItemFromEvent(event)
       this.buyItem({
         toinv: 'player',
         frominv: this.name,
@@ -41,7 +50,7 @@ export default {
       })
     },
     sell (event) {
-      const item = event.target.attributes.getNamedItem('item').value
+      const item = this.getItemFromEvent(event)
       this.buyItem({
         toinv: this.name,
         frominv: 'player',
diff --git a/src/components/Player.vue b/src/components/Player.vue
index 5e9a0e0..cdb5c63 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -7,14 +7,18 @@
 
 <script>
 import Inventory from './Inventory'
+import {mapState} from 'vuex'
 export default {
   name: 'Player',
   components: {
     Inventory
   },
   computed: {
+    ...mapState({
+      player: state => state.player
+    }),
     inventory () {
-      return this.$store.state.player.inventory
+      return this.player.inventory
     }
   }
 }
diff --git a/src/store/index.js b/src/store/index.js
index 7ac7c4b..26dd165 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,22 +1,12 @@
 import Vue from 'vue'
 import Vuex from 'vuex'
-import inventories from './modules/inventories'
+import inventory from './modules/inventory'
+import market from './modules/market'
 // import VuexPersist from 'vuex-persist'
 
 Vue.use(Vuex)
 
 const state = {
-  inventories: {
-
-  },
-  markets: {
-    'market1': {
-      inventory: 'abc'
-    },
-    'market2': {
-      inventory: 'def'
-    }
-  },
   player: {
     inventory: 'player'
   }
@@ -26,20 +16,7 @@ const state = {
 export default new Vuex.Store({
   state,
   modules: {
-    inventories
-  },
-  actions: {
-    buyItem ({commit}, {toinv, frominv, item, quantity}) {
-      commit('inventories/REMOVE_ITEM', {
-        inv: frominv,
-        item,
-        quantity
-      })
-      commit('inventories/ADD_ITEM', {
-        inv: toinv,
-        item,
-        quantity
-      })
-    }
+    inventory,
+    market
   }
 })
diff --git a/src/store/modules/inventories.js b/src/store/modules/inventory.js
similarity index 94%
rename from src/store/modules/inventories.js
rename to src/store/modules/inventory.js
index e803080..485e01c 100644
--- a/src/store/modules/inventories.js
+++ b/src/store/modules/inventory.js
@@ -21,6 +21,9 @@ export default {
       }
     }
   },
+  getters: {
+    getInventory: state => id => state[id]
+  },
   mutations: {
     ADD_ITEM (state, {inv, item, quantity}) {
       const inventory = state[inv]
@@ -36,7 +39,6 @@ export default {
       inventory.quantities = quantities
     },
     REMOVE_ITEM (state, {inv, item, quantity}) {
-      console.log(inv, item, quantity)
       const inventory = state[inv]
       if (inventory.quantities[item] - quantity >= 0) {
         inventory.quantities[item] -= quantity
diff --git a/src/store/modules/market.js b/src/store/modules/market.js
new file mode 100644
index 0000000..9d05e3d
--- /dev/null
+++ b/src/store/modules/market.js
@@ -0,0 +1,33 @@
+export default {
+  namespaced: true,
+  state: {
+    'market1': {
+      inventory: 'abc'
+    },
+    'market2': {
+      inventory: 'def'
+    }
+  },
+  getters: {
+    getMarket: state => id => state[id]
+  },
+  actions: {
+    // For cross module commits, put {root: true} on the commit call
+    buyItem ({commit}, {toinv, frominv, item, quantity}) {
+      commit('inventory/REMOVE_ITEM', {
+        inv: frominv,
+        item,
+        quantity
+      }, {
+        root: true
+      })
+      commit('inventory/ADD_ITEM', {
+        inv: toinv,
+        item,
+        quantity
+      }, {
+        root: true
+      })
+    }
+  }
+}

From e121cd91da7221c706455ee0ce1e3287619f996b Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Tue, 10 Jul 2018 17:45:43 -0400
Subject: [PATCH 10/17] WIP for adding trains

---
 src/store/index.js             |  4 +++-
 src/store/modules/inventory.js |  6 ++++++
 src/store/modules/train.js     | 27 +++++++++++++++++++++++++++
 src/view/App.vue               |  3 +++
 4 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 src/store/modules/train.js

diff --git a/src/store/index.js b/src/store/index.js
index 26dd165..0d4fa7b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import inventory from './modules/inventory'
 import market from './modules/market'
+import trains from './modules/trains'
 // import VuexPersist from 'vuex-persist'
 
 Vue.use(Vuex)
@@ -17,6 +18,7 @@ export default new Vuex.Store({
   state,
   modules: {
     inventory,
-    market
+    market,
+    trains
   }
 })
diff --git a/src/store/modules/inventory.js b/src/store/modules/inventory.js
index 485e01c..e3f6747 100644
--- a/src/store/modules/inventory.js
+++ b/src/store/modules/inventory.js
@@ -19,6 +19,12 @@ export default {
       quantities: {
         'wood': 1
       }
+    },
+    'asdf': {
+      items: ['wood'],
+      quantities: {
+        'wood': 1
+      }
     }
   },
   getters: {
diff --git a/src/store/modules/train.js b/src/store/modules/train.js
new file mode 100644
index 0000000..4db7ed9
--- /dev/null
+++ b/src/store/modules/train.js
@@ -0,0 +1,27 @@
+export default {
+  namespaced: true,
+  state: {
+    trains: ['train1'],
+    'train1': {
+      cars: [
+        'train1-car1'
+      ],
+      speed: 80,
+      fuel: 100
+    },
+    'train1-car1': {
+      inventory: 'asdf'
+    }
+  },
+  getters: {
+    getTrain: (state, getters) => trainId => state[trainId],
+    getTrainCars: (state, getters, rootState, rootGetters) => trainId => {
+      state[trainId].cars.map(i => {
+        const invId = state[i].inventory
+        const inv = rootGetters['inventory/getInventory'](invId)
+        console.log('inv', inv)
+        return inv
+      })
+    }
+  }
+}
diff --git a/src/view/App.vue b/src/view/App.vue
index 89b85d8..a916b7a 100644
--- a/src/view/App.vue
+++ b/src/view/App.vue
@@ -26,6 +26,9 @@ export default {
     ...mapState({
       markets: state => Object.keys(state)
     })
+  },
+  mounted () {
+    console.log(this.$store.getters['trains/getTrainCars']('train1'))
   }
 }
 </script>

From 65a0cda92a838b0ee24f1a6dd5ccccf075103d62 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Tue, 10 Jul 2018 23:13:28 -0400
Subject: [PATCH 11/17] Engine working with tick events

---
 src/Engine.js            | 45 ++++++++++-----------
 src/main.js              |  5 +--
 src/modules/Constants.js |  2 +
 src/modules/EventBus.js  | 84 +---------------------------------------
 4 files changed, 26 insertions(+), 110 deletions(-)
 create mode 100644 src/modules/Constants.js

diff --git a/src/Engine.js b/src/Engine.js
index 00f6fb0..4e26cc6 100644
--- a/src/Engine.js
+++ b/src/Engine.js
@@ -1,40 +1,35 @@
 // Set up the event bus
 import EventBus from '@/modules/EventBus.js'
+import {TIMESCALE, TICKRATE} from '@/modules/Constants'
 
 export default {
   store: null,
   eventBus: EventBus,
-  buyItem (item, amount, cost) {
-    this.store.dispatch('buy', {
-      item,
-      amount,
-      cost
-    })
+  clock: {
+    count: 0,
+    hour: 0,
+    day: 0,
+    month: 0
   },
   tick () {
-    const timestamp = Math.floor(new Date() / 1000)
-    EventBus.emit('tick', {current: timestamp, previous: this.store.getters.timestamp})
-    this.store.dispatch('setTime', {timestamp})
+    EventBus.$emit('tick', TIMESCALE)
+    this.clock.count += TIMESCALE
+    if (this.clock.count >= 1) {
+      EventBus.$emit('tick-hour')
+      this.clock.hour++
+      this.clock.count = 0
+    }
+    if (this.clock.hour >= 24) {
+      EventBus.$emit('tick-day')
+      this.clock.hour = 0
+      this.clock.day++
+    }
+    console.table(this.clock)
   },
   start () {
-    this.interval = setInterval(() => this.tick(), 1000)
-
-    // Set up the other listeners
-    EventBus.on('tick', () => this.income())
+    this.interval = setInterval(() => this.tick(), TICKRATE)
   },
   stop () {
     clearInterval(this.interval)
-    EventBus.reset()
-  },
-  income () {
-    let income = 0
-    for (const key in this.store.getters.inventory) {
-      const resource = this.store.getters.resource(key)
-      const amount = this.store.getters.inventory[key]
-      income += amount * resource.income
-    }
-    this.store.dispatch('income', {
-      amount: income
-    })
   }
 }
diff --git a/src/main.js b/src/main.js
index 5e9b01d..8299db6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,6 @@
 import Vue from 'vue'
 import App from './App'
 import store from './store'
-// import EventBus from './EventBus.js'
 import Engine from '@/Engine.js'
 
 Vue.config.productionTip = false
@@ -18,8 +17,8 @@ new Vue({
     counter: 0
   },
   mounted () {
-    // Engine.store = this.$store
-    // Engine.start()
+    Engine.store = this.$store
+    Engine.start()
   },
   beforeDestroy () {
     Engine.stop()
diff --git a/src/modules/Constants.js b/src/modules/Constants.js
new file mode 100644
index 0000000..265439f
--- /dev/null
+++ b/src/modules/Constants.js
@@ -0,0 +1,2 @@
+export const TIMESCALE = 0.1
+export const TICKRATE = 50
diff --git a/src/modules/EventBus.js b/src/modules/EventBus.js
index 005799d..b0230b5 100644
--- a/src/modules/EventBus.js
+++ b/src/modules/EventBus.js
@@ -1,82 +1,2 @@
-// Originally borrowed from https://gist.github.com/zangue/7384f593df908d4a7ee2
-
-class EventBus {
-  constructor () {
-    this.listeners = {}
-  }
-
-  _getListenerIdx (eventName, callback, scope) {
-    let eventListeners = this.listeners[eventName]
-    let i
-    let idx = -1
-
-    if (!eventListeners || eventListeners.length === 0) {
-      return idx
-    }
-    for (i = 0; i < eventListeners.length; i++) {
-      if (eventListeners[i].callback === callback &&
-        (!scope || scope === eventListeners[i].scope)) {
-        idx = i
-        break
-      }
-    }
-    return idx
-  }
-
-  on (eventName, callback, scope) {
-    let listener,
-      idx
-
-    if (!eventName) {
-      throw new Error('Event name cannot be null or undefined')
-    }
-
-    if (!callback || typeof (callback) !== 'function') {
-      throw new Error('Listener must be of type function.')
-    }
-
-    idx = this._getListenerIdx(eventName, callback, scope)
-
-    if (idx >= 0) return
-
-    listener = {
-      callback: callback,
-      scope: scope
-    }
-
-    this.listeners[eventName] = this.listeners[eventName] || []
-    this.listeners[eventName].push(listener)
-  }
-
-  unsubscribe (eventName, callback, scope) {
-    let idx
-    if (!eventName || !callback || !this.listeners[eventName]) {
-      return
-    }
-    idx = this._getListenerIdx(eventName, callback, scope)
-    if (idx === -1) return
-    this.listeners[eventName].splice(idx, 1)
-  }
-
-  emit (eventName, args) {
-    let eventListeners = this.listeners[eventName]
-
-    if (!eventName || !this.listeners[eventName]) {
-      return
-    }
-
-    args = args || {}
-
-    eventListeners.forEach((listener) => {
-      listener.callback.call(listener.scope, args)
-    })
-  }
-
-  reset () {
-    this.listeners = {}
-  }
-}
-
-// Singleton
-let eventBus = new EventBus()
-export default eventBus
+import Vue from 'vue'
+export default new Vue()

From 2a7eee49a70687ddda2901d5d168cd133d2bfe46 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Wed, 11 Jul 2018 00:03:21 -0400
Subject: [PATCH 12/17] Stub out a train component

---
 src/components/Train.vue | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/components/Train.vue

diff --git a/src/components/Train.vue b/src/components/Train.vue
new file mode 100644
index 0000000..9434586
--- /dev/null
+++ b/src/components/Train.vue
@@ -0,0 +1,18 @@
+<template>
+</template>
+
+<script>
+import EventBus from '@/modules/EventBus'
+export default {
+  name: 'Train',
+  props: ['trainId'],
+  computed: {},
+  methods: {
+    move (scale) {
+      // move the train
+    }
+  },
+  mounted () {
+    EventBus.$on('tick', (scale) => this.move(scale))
+  }
+}

From 1d85b6f64398680f941cfb94c5b15fb242ab4c34 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Wed, 11 Jul 2018 17:57:42 -0400
Subject: [PATCH 13/17] Standardized the engine and clock ticks

---
 src/Engine.js            | 30 ++++++++++++++++--------------
 src/main.js              |  4 ++--
 src/modules/Constants.js |  2 +-
 src/store/index.js       |  2 +-
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/Engine.js b/src/Engine.js
index 4e26cc6..3b48f18 100644
--- a/src/Engine.js
+++ b/src/Engine.js
@@ -9,22 +9,24 @@ export default {
     count: 0,
     hour: 0,
     day: 0,
-    month: 0
+    month: 0,
+    increment () {
+      this.count++
+      if (this.count * TIMESCALE >= 1) {
+        this.hour++
+        this.count = 0
+        EventBus.$emit('tick-hour')
+      }
+      if (this.hour >= 24) {
+        this.hour = 0
+        this.day++
+        EventBus.$emit('tick-day')
+      }
+    }
   },
   tick () {
-    EventBus.$emit('tick', TIMESCALE)
-    this.clock.count += TIMESCALE
-    if (this.clock.count >= 1) {
-      EventBus.$emit('tick-hour')
-      this.clock.hour++
-      this.clock.count = 0
-    }
-    if (this.clock.hour >= 24) {
-      EventBus.$emit('tick-day')
-      this.clock.hour = 0
-      this.clock.day++
-    }
-    console.table(this.clock)
+    EventBus.$emit('tick')
+    this.clock.increment()
   },
   start () {
     this.interval = setInterval(() => this.tick(), TICKRATE)
diff --git a/src/main.js b/src/main.js
index 96c5c6f..d69a648 100644
--- a/src/main.js
+++ b/src/main.js
@@ -17,8 +17,8 @@ new Vue({
     counter: 0
   },
   mounted () {
-    // Engine.store = this.$store
-    // Engine.start()
+    Engine.store = this.$store
+    Engine.start()
   },
   beforeDestroy () {
     Engine.stop()
diff --git a/src/modules/Constants.js b/src/modules/Constants.js
index 265439f..74cef7c 100644
--- a/src/modules/Constants.js
+++ b/src/modules/Constants.js
@@ -1,2 +1,2 @@
-export const TIMESCALE = 0.1
+export const TIMESCALE = 0.05
 export const TICKRATE = 50
diff --git a/src/store/index.js b/src/store/index.js
index 0d4fa7b..4ce3870 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import inventory from './modules/inventory'
 import market from './modules/market'
-import trains from './modules/trains'
+import trains from './modules/train'
 // import VuexPersist from 'vuex-persist'
 
 Vue.use(Vuex)

From f211f8f46d62c93a44e2223d20d7b1470c6a4521 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Wed, 11 Jul 2018 23:46:48 -0400
Subject: [PATCH 14/17] Train movement working in one direction

---
 src/App.vue                        | 41 --------------
 src/Engine.js                      |  2 +-
 src/components/Inventory.vue       | 51 -----------------
 src/components/Market.vue          | 37 -------------
 src/components/MarketInventory.vue | 63 ---------------------
 src/components/Player.vue          | 25 ---------
 src/components/Train.vue           | 18 ------
 src/store/index.js                 |  2 +-
 src/store/modules/train.js         | 27 ---------
 src/store/modules/trains.js        | 69 +++++++++++++++++++++++
 src/view/App.vue                   |  9 +--
 src/view/components/Train.vue      | 88 ++++++++++++++++++++++++++++++
 12 files changed, 164 insertions(+), 268 deletions(-)
 delete mode 100644 src/App.vue
 delete mode 100644 src/components/Inventory.vue
 delete mode 100644 src/components/Market.vue
 delete mode 100644 src/components/MarketInventory.vue
 delete mode 100644 src/components/Player.vue
 delete mode 100644 src/components/Train.vue
 delete mode 100644 src/store/modules/train.js
 create mode 100644 src/store/modules/trains.js
 create mode 100644 src/view/components/Train.vue

diff --git a/src/App.vue b/src/App.vue
deleted file mode 100644
index 89b85d8..0000000
--- a/src/App.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div id="app">
-    <Market v-for="market in markets" :key="market" v-bind:name="market"/>
-    <Player />
-  </div>
-</template>
-
-<script>
-import Market from './components/Market'
-import Player from './components/Player'
-import {createNamespacedHelpers} from 'vuex'
-
-// Set up the helpers
-// TODO: move this to a MarketList
-const { mapState } = createNamespacedHelpers('market')
-
-// Parent root element for the entire application
-// Does nothing but display the children
-export default {
-  name: 'App',
-  components: {
-    Market,
-    Player
-  },
-  computed: {
-    ...mapState({
-      markets: state => Object.keys(state)
-    })
-  }
-}
-</script>
-
-<style>
-#app {
-  font-family: 'Avenir', Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color: #2c3e50;
-  margin-top: 60px;
-}
-</style>
diff --git a/src/Engine.js b/src/Engine.js
index 3b48f18..d78a113 100644
--- a/src/Engine.js
+++ b/src/Engine.js
@@ -25,7 +25,7 @@ export default {
     }
   },
   tick () {
-    EventBus.$emit('tick')
+    EventBus.$emit('tick', TIMESCALE)
     this.clock.increment()
   },
   start () {
diff --git a/src/components/Inventory.vue b/src/components/Inventory.vue
deleted file mode 100644
index 1171d3b..0000000
--- a/src/components/Inventory.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<template>
-  <div>
-    <p class="invheader">Inventory - {{name}}</p>
-    <table>
-      <tr>
-        <th>Item</th>
-        <th>Quantity</th>
-      </tr>
-      <tr v-for="item in items" :key="item.id">
-        <td>{{item.id}}</td>
-        <td>{{item.quantity}}</td>
-      </tr>
-    </table>
-  </div>
-</template>
-
-<script>
-import {createNamespacedHelpers} from 'vuex'
-const { mapGetters } = createNamespacedHelpers('inventory')
-
-export default {
-  name: 'Inventory',
-  props: ['name'],
-  computed: {
-    ...mapGetters([
-      'getInventory'
-    ]),
-    inventory () {
-      return this.getInventory(this.name)
-    },
-    items () {
-      return this.inventory.items.map(itemId => {
-        return {
-          id: itemId,
-          quantity: this.getQuantity(itemId)
-        }
-      })
-    }
-  },
-  methods: {
-    getQuantity (item) {
-      return this.inventory.quantities[item]
-    }
-  }
-}
-</script>
-
-<style>
-p.invheader {
-  font-size: 1.5em;
-}
diff --git a/src/components/Market.vue b/src/components/Market.vue
deleted file mode 100644
index 58f471c..0000000
--- a/src/components/Market.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-  <div id="market">
-    <p>Market - {{name}}</p>
-    <MarketInventory v-bind:name="inventory" />
-  </div>
-</template>
-
-<script>
-import MarketInventory from './MarketInventory'
-import {createNamespacedHelpers} from 'vuex'
-
-const { mapGetters } = createNamespacedHelpers('market')
-export default {
-  name: 'Market',
-  props: ['name'],
-  components: {
-    MarketInventory
-  },
-  computed: {
-    ...mapGetters([
-      'getMarket'
-    ]),
-    market () {
-      return this.getMarket(this.name)
-    },
-    inventory () {
-      return this.market.inventory
-    }
-  }
-}
-</script>
-
-<style>
-#market {
-  border: 1px black solid;
-}
-</style>
diff --git a/src/components/MarketInventory.vue b/src/components/MarketInventory.vue
deleted file mode 100644
index 99f5e6f..0000000
--- a/src/components/MarketInventory.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
-  <div>
-    <table>
-      <tr>
-        <th>Item</th>
-        <th>Quantity</th>
-        <th>Actions</th>
-      </tr>
-      <tr v-for="item in items" :key="item.id">
-        <td>{{item.id}}</td>
-        <td>{{item.quantity}}</td>
-        <td>
-          <button
-            @click="buy"
-            :item="item.id"
-            :disabled="getQuantity(item.id) <= 0">
-            Buy
-          </button>
-          <button @click="sell" :item="item.id">Sell</button>
-        </td>
-      </tr>
-    </table>
-  </div>
-</template>
-
-<script>
-import {createNamespacedHelpers} from 'vuex'
-import Inventory from './Inventory'
-
-// Set up helpers
-const { mapActions } = createNamespacedHelpers('market')
-
-export default {
-  name: 'MarketInventory',
-  extends: Inventory,
-  methods: {
-    ...mapActions([
-      'buyItem'
-    ]),
-    getItemFromEvent (event) {
-      return event.target.attributes.getNamedItem('item').value
-    },
-    buy (event) {
-      const item = this.getItemFromEvent(event)
-      this.buyItem({
-        toinv: 'player',
-        frominv: this.name,
-        item,
-        quantity: 1
-      })
-    },
-    sell (event) {
-      const item = this.getItemFromEvent(event)
-      this.buyItem({
-        toinv: this.name,
-        frominv: 'player',
-        item,
-        quantity: 1
-      })
-    }
-  }
-}
-</script>
diff --git a/src/components/Player.vue b/src/components/Player.vue
deleted file mode 100644
index cdb5c63..0000000
--- a/src/components/Player.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div>
-    <p>Player</p>
-    <Inventory v-bind:name="inventory"/>
-  </div>
-</template>
-
-<script>
-import Inventory from './Inventory'
-import {mapState} from 'vuex'
-export default {
-  name: 'Player',
-  components: {
-    Inventory
-  },
-  computed: {
-    ...mapState({
-      player: state => state.player
-    }),
-    inventory () {
-      return this.player.inventory
-    }
-  }
-}
-</script>
diff --git a/src/components/Train.vue b/src/components/Train.vue
deleted file mode 100644
index 9434586..0000000
--- a/src/components/Train.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-</template>
-
-<script>
-import EventBus from '@/modules/EventBus'
-export default {
-  name: 'Train',
-  props: ['trainId'],
-  computed: {},
-  methods: {
-    move (scale) {
-      // move the train
-    }
-  },
-  mounted () {
-    EventBus.$on('tick', (scale) => this.move(scale))
-  }
-}
diff --git a/src/store/index.js b/src/store/index.js
index 4ce3870..0d4fa7b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import inventory from './modules/inventory'
 import market from './modules/market'
-import trains from './modules/train'
+import trains from './modules/trains'
 // import VuexPersist from 'vuex-persist'
 
 Vue.use(Vuex)
diff --git a/src/store/modules/train.js b/src/store/modules/train.js
deleted file mode 100644
index 4db7ed9..0000000
--- a/src/store/modules/train.js
+++ /dev/null
@@ -1,27 +0,0 @@
-export default {
-  namespaced: true,
-  state: {
-    trains: ['train1'],
-    'train1': {
-      cars: [
-        'train1-car1'
-      ],
-      speed: 80,
-      fuel: 100
-    },
-    'train1-car1': {
-      inventory: 'asdf'
-    }
-  },
-  getters: {
-    getTrain: (state, getters) => trainId => state[trainId],
-    getTrainCars: (state, getters, rootState, rootGetters) => trainId => {
-      state[trainId].cars.map(i => {
-        const invId = state[i].inventory
-        const inv = rootGetters['inventory/getInventory'](invId)
-        console.log('inv', inv)
-        return inv
-      })
-    }
-  }
-}
diff --git a/src/store/modules/trains.js b/src/store/modules/trains.js
new file mode 100644
index 0000000..24928ae
--- /dev/null
+++ b/src/store/modules/trains.js
@@ -0,0 +1,69 @@
+export default {
+  namespaced: true,
+  state: {
+    trains: ['train1'],
+    'train1': {
+      cars: [
+        'train1-car1'
+      ],
+      acceleration: 3,
+      deceleration: -7,
+      maxSpeed: 30,
+      currentSpeed: 0,
+      fuel: 100,
+      position: {
+        distanceTo: 200,
+        destination: 'city1',
+        source: 'city2'
+      },
+      atStation: false
+    },
+    'train1-car1': {
+      inventory: 'asdf'
+    }
+  },
+  getters: {
+    getTrain: (state, getters, _, rootGetters) => trainId => state[trainId],
+    getTrainCars: (state, getters, rootState, rootGetters) => trainId => {
+      state[trainId].cars.map(i => {
+        const invId = state[i].inventory
+        const inv = rootGetters['inventory/getInventory'](invId)
+        return inv
+      })
+    }
+  },
+  actions: {
+    update ({commit}, {trainId, position, fuel, atStation, currentSpeed}) {
+      commit('UPDATE_POSITION', {
+        trainId,
+        position
+      })
+      commit('UPDATE_FUEL', {
+        trainId,
+        fuel
+      })
+      commit('UPDATE_STATION', {
+        trainId,
+        atStation
+      })
+      commit('UPDATE_SPEED', {
+        trainId,
+        currentSpeed
+      })
+    }
+  },
+  mutations: {
+    UPDATE_POSITION (state, {trainId, position}) {
+      state[trainId].position = position
+    },
+    UPDATE_FUEL (state, {trainId, fuel}) {
+      state[trainId].fuel = fuel
+    },
+    UPDATE_STATION (state, {trainId, atStation}) {
+      state[trainId].atStation = atStation
+    },
+    UPDATE_SPEED (state, {trainId, currentSpeed}) {
+      state[trainId].currentSpeed = currentSpeed
+    }
+  }
+}
diff --git a/src/view/App.vue b/src/view/App.vue
index a916b7a..4fa7c92 100644
--- a/src/view/App.vue
+++ b/src/view/App.vue
@@ -2,12 +2,15 @@
   <div id="app">
     <Market v-for="market in markets" :key="market" v-bind:name="market"/>
     <Player />
+    Train here:
+    <Train trainId="train1"/>
   </div>
 </template>
 
 <script>
 import Market from './components/Market'
 import Player from './components/Player'
+import Train from './components/Train'
 import {createNamespacedHelpers} from 'vuex'
 
 // Set up the helpers
@@ -20,15 +23,13 @@ export default {
   name: 'App',
   components: {
     Market,
-    Player
+    Player,
+    Train
   },
   computed: {
     ...mapState({
       markets: state => Object.keys(state)
     })
-  },
-  mounted () {
-    console.log(this.$store.getters['trains/getTrainCars']('train1'))
   }
 }
 </script>
diff --git a/src/view/components/Train.vue b/src/view/components/Train.vue
new file mode 100644
index 0000000..8696a77
--- /dev/null
+++ b/src/view/components/Train.vue
@@ -0,0 +1,88 @@
+<template>
+  <div>
+    <p>I am a train</p>
+  </div>
+</template>
+
+<script>
+import EventBus from '@/modules/EventBus'
+import {createNamespacedHelpers} from 'vuex'
+
+const { mapGetters, mapActions } = createNamespacedHelpers('trains')
+
+export default {
+  name: 'Train',
+  props: ['trainId'],
+  computed: {
+    ...mapGetters([
+      'getTrain'
+    ]),
+    train () {
+      return this.getTrain(this.trainId)
+    }
+  },
+  methods: {
+    ...mapActions([
+      'update'
+    ]),
+    accelerate (rate, initial, time) {
+      let speed
+      speed = (rate * time) + initial
+      if (speed > this.train.maxSpeed) {
+        speed = this.train.maxSpeed
+      } else if (speed < 0) {
+        // Shouldn't hit this but just in case
+        speed = 0
+      }
+      return speed
+    },
+    doAccelerate (rate, distance, speed) {
+      // distance = (final^2 - initial^2) / 2 (acceleration)
+      const decelDistance = (0 - Math.pow(speed, 2)) / (2 * rate)
+      return decelDistance <= distance
+    },
+    move (scale) {
+      if (this.train.atStation) {
+        // Don't need to move if at a station
+        return
+      }
+      // First see if we need to accelerate
+      let rate
+      if (this.doAccelerate(this.train.deceleration, this.train.position.distanceTo, this.train.currentSpeed)) {
+        console.log('accelerating')
+        rate = this.train.acceleration
+      } else {
+        console.log('decelerating')
+        rate = this.train.deceleration
+      }
+      // Get the new speed through de/acceleration
+      console.log('rate', rate)
+      const speed = this.accelerate(rate, this.train.currentSpeed, scale)
+      // distance = speed * time
+      const travelDistance = speed * scale
+      // Copy the position object so we can modify it and pass it back
+      let position = Object.assign({}, this.train.position)
+      let station = this.train.atStation
+      // Calculate the new distance to the station
+      position.distanceTo -= travelDistance
+      if (position.distanceTo <= 0) {
+        console.log('Arrived!')
+        station = true
+      }
+      console.log(speed, position.distanceTo)
+      // Finally update all the stats
+      this.update({
+        trainId: this.trainId,
+        position: position,
+        fuel: this.train.fuel,
+        atStation: station,
+        currentSpeed: speed
+      })
+    }
+  },
+  mounted () {
+    EventBus.$on('tick', (scale) => this.move(scale))
+    console.log(this.train)
+  }
+}
+</script>

From 2b95a1311ea78dd7c4089fa458bab2d6a97bea8d Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Thu, 12 Jul 2018 00:07:03 -0400
Subject: [PATCH 15/17] Returns the nested inventory objects with the train

---
 src/store/modules/trains.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/trains.js b/src/store/modules/trains.js
index 24928ae..ee85c6d 100644
--- a/src/store/modules/trains.js
+++ b/src/store/modules/trains.js
@@ -23,13 +23,19 @@ export default {
     }
   },
   getters: {
-    getTrain: (state, getters, _, rootGetters) => trainId => state[trainId],
-    getTrainCars: (state, getters, rootState, rootGetters) => trainId => {
-      state[trainId].cars.map(i => {
-        const invId = state[i].inventory
-        const inv = rootGetters['inventory/getInventory'](invId)
-        return inv
+    getTrain: (state, getters, _, rootGetters) => trainId => {
+      //Get a copy of the train object from the state
+      let train = Object.assign({}, state[trainId])
+      // For all of the cars, get the inventory object
+      train.cars = train.cars.map(i => {
+        const carInventory = state[i].inventory
+        const inventory = rootGetters['inventory/getInventory'](carInventory)
+        return {
+          name: i,
+          inventory
+        }
       })
+      return train
     }
   },
   actions: {

From ddc84d4db34fe251f57ea779741879e4451814f3 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Thu, 12 Jul 2018 00:07:18 -0400
Subject: [PATCH 16/17] Shows the current status of the train

---
 src/view/components/Train.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/view/components/Train.vue b/src/view/components/Train.vue
index 8696a77..2bc54a0 100644
--- a/src/view/components/Train.vue
+++ b/src/view/components/Train.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
-    <p>I am a train</p>
+    <p>Heading to: {{ train.position.destination }}</p>
+    <p>{{ train.position.distanceTo }} left with current speed of {{ train.currentSpeed }}</p>
   </div>
 </template>
 
@@ -57,19 +58,23 @@ export default {
       }
       // Get the new speed through de/acceleration
       console.log('rate', rate)
-      const speed = this.accelerate(rate, this.train.currentSpeed, scale)
+      let speed = this.accelerate(rate, this.train.currentSpeed, scale)
+      // Round it to the nearest two decimals
+      speed = +(speed).toFixed(2)
       // distance = speed * time
       const travelDistance = speed * scale
       // Copy the position object so we can modify it and pass it back
       let position = Object.assign({}, this.train.position)
       let station = this.train.atStation
       // Calculate the new distance to the station
-      position.distanceTo -= travelDistance
+      position.distanceTo = (position.distanceTo - travelDistance).toFixed(2)
       if (position.distanceTo <= 0) {
+        // Made it to the station so we can set everything to zero
+        position.distanceTo = 0
+        speed = 0
         console.log('Arrived!')
         station = true
       }
-      console.log(speed, position.distanceTo)
       // Finally update all the stats
       this.update({
         trainId: this.trainId,

From 1ba03ad1aadf2fea44fb2b4dae7c85e0853b2143 Mon Sep 17 00:00:00 2001
From: pemcne <pemcneill8@gmail.com>
Date: Thu, 12 Jul 2018 20:46:53 -0400
Subject: [PATCH 17/17] Departures working

---
 src/store/modules/trains.js   | 15 +++++++++++++--
 src/view/components/Train.vue | 21 +++++++++++++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/store/modules/trains.js b/src/store/modules/trains.js
index ee85c6d..039b90c 100644
--- a/src/store/modules/trains.js
+++ b/src/store/modules/trains.js
@@ -16,7 +16,12 @@ export default {
         destination: 'city1',
         source: 'city2'
       },
-      atStation: false
+      atStation: false,
+      route: [
+        'city1',
+        'city2'
+      ],
+      routeIndex: 0
     },
     'train1-car1': {
       inventory: 'asdf'
@@ -24,7 +29,7 @@ export default {
   },
   getters: {
     getTrain: (state, getters, _, rootGetters) => trainId => {
-      //Get a copy of the train object from the state
+      // Get a copy of the train object from the state
       let train = Object.assign({}, state[trainId])
       // For all of the cars, get the inventory object
       train.cars = train.cars.map(i => {
@@ -56,6 +61,12 @@ export default {
         trainId,
         currentSpeed
       })
+    },
+    depart ({commit}, {trainId}) {
+      commit('UPDATE_STATION', {
+        trainId,
+        atStation: false
+      })
     }
   },
   mutations: {
diff --git a/src/view/components/Train.vue b/src/view/components/Train.vue
index 2bc54a0..881ce78 100644
--- a/src/view/components/Train.vue
+++ b/src/view/components/Train.vue
@@ -1,7 +1,9 @@
 <template>
   <div>
-    <p>Heading to: {{ train.position.destination }}</p>
+    <p v-if="train.atStation">Arrived at {{ train.position.source }}</p>
+    <p v-else>Heading to: {{ train.position.destination }}</p>
     <p>{{ train.position.distanceTo }} left with current speed of {{ train.currentSpeed }}</p>
+    <button @click="departStation" :disabled="train.atStation ? false : true">Depart</button>
   </div>
 </template>
 
@@ -24,8 +26,14 @@ export default {
   },
   methods: {
     ...mapActions([
-      'update'
+      'update',
+      'depart'
     ]),
+    departStation (event) {
+      this.depart({
+        trainId: this.trainId
+      })
+    },
     accelerate (rate, initial, time) {
       let speed
       speed = (rate * time) + initial
@@ -50,14 +58,11 @@ export default {
       // First see if we need to accelerate
       let rate
       if (this.doAccelerate(this.train.deceleration, this.train.position.distanceTo, this.train.currentSpeed)) {
-        console.log('accelerating')
         rate = this.train.acceleration
       } else {
-        console.log('decelerating')
         rate = this.train.deceleration
       }
       // Get the new speed through de/acceleration
-      console.log('rate', rate)
       let speed = this.accelerate(rate, this.train.currentSpeed, scale)
       // Round it to the nearest two decimals
       speed = +(speed).toFixed(2)
@@ -70,10 +75,14 @@ export default {
       position.distanceTo = (position.distanceTo - travelDistance).toFixed(2)
       if (position.distanceTo <= 0) {
         // Made it to the station so we can set everything to zero
-        position.distanceTo = 0
         speed = 0
         console.log('Arrived!')
         station = true
+        position = {
+          distanceTo: 300,
+          destination: 'city2',
+          source: 'city1'
+        }
       }
       // Finally update all the stats
       this.update({