From d917286669e87d120ee0a1de99bf8a6f5a05f4bd Mon Sep 17 00:00:00 2001
From: koehr <n@koehr.in>
Date: Mon, 23 Apr 2018 00:35:47 +0200
Subject: [PATCH] player

---
 src/Field.vue                 |  50 +++++++++++++++++++++++++++++-----
 src/assets/dwarf.png          | Bin 0 -> 1102 bytes
 src/level/def.js              |  19 +++++++------
 src/level/first-iteration.js  |   9 +++---
 src/level/index.js            |  25 ++++++++---------
 src/level/second-iteration.js |   4 +--
 src/level/third-iteration.js  |  17 ++++++++++++
 7 files changed, 88 insertions(+), 36 deletions(-)
 create mode 100644 src/assets/dwarf.png

diff --git a/src/Field.vue b/src/Field.vue
index 06b5b7a..85fa318 100644
--- a/src/Field.vue
+++ b/src/Field.vue
@@ -3,11 +3,12 @@
     <input v-keep-focussed type="text"
       @keydown.down="goDown($event)"
       @keydown.up="goUp($event)"
-      @keydown.right="x = x + 1"
-      @keydown.left="x = x > 0 ? x - 1 : 0"
+      @keydown.right="goRight($event)"
+      @keydown.left="goLeft($event)"
     />
+    <div id="level-indicator">x:{{ x }}, y:{{ y }}</div>
     <template v-for="row in rows">
-      <div v-for="block in row" class="block" :class="block.type" />
+      <div v-for="block in row" class="block" :class="[block.type, block.background]" />
     </template>
   </div>
 </template>
@@ -24,12 +25,17 @@ export default {
   data () {
     return {
       x: 0,
-      y: 0
+      y: 0,
+      player_x: 0,
+      player_y: 0
     }
   },
+  mounted () {
+    this.findStartPos()
+  },
   computed: {
     rows () {
-      return level.grid(this.x, this.y)
+      return level.grid(this.x, this.y, this.player_x, this.player_y)
     }
   },
   methods: {
@@ -41,6 +47,26 @@ export default {
       if (ev.shiftKey) this.y -= 32
       else this.y--
       this.y = Math.max(0, this.y)
+    },
+    goRight (ev) {
+      if (ev.shiftKey) this.x += 32
+      else this.x++
+    },
+    goLeft (ev) {
+      if (ev.shiftKey) this.x -= 32
+      else this.x--
+    },
+    findStartPos () {
+      const x = parseInt(WIDTH / 2)
+
+      for (let y = HEIGHT - 1; y; y--) {
+        const block = this.rows[y][x]
+        if (block.walkable) {
+          this.player_x = x
+          this.player_y = y
+          break
+        }
+      }
     }
   }
 }
@@ -48,12 +74,11 @@ export default {
 
 <style>
 .field {
+  position: relative;
   display: flex;
   flex-flow: row wrap;
   width: 1024px;
   margin: auto;
-  margin-top: calc(100vh - 1056px);
-  border: 16px solid #222;
 }
 .field > input {
   position: absolute;
@@ -62,6 +87,12 @@ export default {
   width: 1px;
   height: 1px;
 }
+#level-indicator {
+  position: absolute;
+  top: 0;
+  right: 0;
+  color: white;
+}
 .block {
   flex: 0 0 auto;
   width: 30px;
@@ -78,6 +109,11 @@ export default {
 .block.stone { background-color: #555; }
 .block.bedrock { background-color: #333; }
 .block.cave { background-color: #000; }
+.block.player {
+  background-image: url(./assets/dwarf.png);
+  background-position: center;
+  background-repeat: no-repeat;
+}
 .block:hover {
   border-color: rgba(255,255,255,0.2);
 }
diff --git a/src/assets/dwarf.png b/src/assets/dwarf.png
new file mode 100644
index 0000000000000000000000000000000000000000..61b5c2cf89030f07a6f2a6af489bec8c58c8c779
GIT binary patch
literal 1102
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP)7c-wF_sX5wYCs{`%#er@=ltB<)VvZPmw~~#C^fMp
zHASI3vm`^o-P1Q9MK6_|fq{9Gr;B4q#jUru6iZ%32sAvjw-pR`QBYdf(cz$=B+$XZ
z!W0<TxMD@cq9oU+r@W2`YiotCi3p4Y3awb-5TYOeR8YwJs7qU*qhrowQN=0SpMRZ`
zKI_9RNzXG+t&NM*IpXF$_t+z!?xf(rqyk5Za2Am9QJT@#&Q6T!i(k+2$4Mqql}umw
z`V5zSEdH^)qqw#<mf_C*`_;blpFT0lu#gdBn0?l5)|dZ_uYcoiF!6o){WsGW?VBYR
zLyNjY4db83iMaZx2_JjBk^KUfNOPaoKN;7f)7hkW*p61%=rP2_#o09E|DBT`{+xyD
z+A&k6r*jXjets|^;7Fm5%<+u18?PnxC<Ycg$u4s4EuD7qF;7F8%%%v-WvkEpo@Be?
z_S;FzG_7kpH}^d)0urYKPhD2}eC?Q^hD3?oKKr?IqrPRVt*_X3rs~Wy?KyWJu6g|P
z{c5F{r(dR7Ha6{^y(GdX&z|R%3fobOKE@5#<m^_TIwNs7N%m6EZlNAk23ZA<+bW(-
zTjk9Q=d%QC4LVX-<FKlLt?FD;L+&=#?d*5ApS^lX=#@aa?DP48FBYxtx~q3QH~meN
z=CK*hW|GMs(QWn1C8v8HGke@H<+lUh`PaIV-RG;jw?^$^;F#jfzJOU?_KC|xrMK}5
zN_)1p+3)i|(YdiK_IKVh^UlQ~4MB_x-|u*#X*Qc@_vgxaX)J41ukHP+vb4$V+|3BK
zyLVMwS2*YWzxih3w3sg<4364qR?(X`SjNVtT|KRKa7OEQ)rLIx!iz7b?L8KG{BClY
z!z;PFp8`YDt{ys+cHO7*DqqOM7aOLmIJM%`5}W8n%zOdewNq84D-Nii-V`<Q+$+7+
ze&)v_+e^h>>zuQiH!qIy#HQGrJ>{xCB2!hx^X{!HTl(tmyT4Y(%YTRb<JiU=mf8LM
z>$eYk<fm>9P-l`YpRsS<H(zO|12S_%G()dU_1rr3M)P}d?SyUr7iIqYw)A{)#9P5P
zA7@=``fRpmm)XY1<VW8USFGV)v5jX{!MeQP7Ox|8b<b>XzqB%`s%DAqo?S)mr?<5I
zof4Zazlt~Gne&zGsl4W%r+8-OpVqmhe6#%8gvZ;Z=Wp}0Pv03H`}$hsB$bDZ^1Jod
zuDY`-^l`|dkEvIW<nkEE@MSU|tn2<Cd1bC`?>R^F`m=REY<w?oFPd{!sy(yj>W`_F
z%RFaHzVWQSt%OTMo%xG(%O87>1{MTz!peCOe58J^_THEJ9CA#cZ0+gl=d#Wzp$PzG
Cwdpqi

literal 0
HcmV?d00001

diff --git a/src/level/def.js b/src/level/def.js
index 0670d50..f620b28 100644
--- a/src/level/def.js
+++ b/src/level/def.js
@@ -1,13 +1,14 @@
 export const type = {
-  air: {type: 'air', hp: 0},
-  grass: {type: 'grass', hp: 1},
-  leaves: {type: 'leaves', hp: 1},
-  wood: {type: 'wood', hp: 5},
-  soil: {type: 'soil', hp: 2},
-  gravel: {type: 'gravel', hp: 5},
-  stone: {type: 'stone', hp: 10},
-  bedrock: {type: 'bedrock', hp: 25},
-  cave: {type: 'cave', hp: 0}
+  air: {type: 'air', hp: 0, walkable: true},
+  grass: {type: 'grass', hp: 1, walkable: true},
+  leaves: {type: 'leaves', hp: 1, walkable: true},
+  wood: {type: 'wood', hp: 5, walkable: true},
+  soil: {type: 'soil', hp: 2, walkable: false},
+  gravel: {type: 'gravel', hp: 5, walkable: false},
+  stone: {type: 'stone', hp: 10, walkable: false},
+  bedrock: {type: 'bedrock', hp: 25, walkable: false},
+  cave: {type: 'cave', hp: 0, walkable: true},
+  player: {type: 'player', hp: 10, background: 'air'}
 }
 
 export const level = {
diff --git a/src/level/first-iteration.js b/src/level/first-iteration.js
index 33696ea..0dd1454 100644
--- a/src/level/first-iteration.js
+++ b/src/level/first-iteration.js
@@ -3,14 +3,13 @@ import FastSimplexNoise from 'fast-simplex-noise'
 import {type as T, level as L, probability as P} from './def'
 
 export default class BlockGen {
-  constructor (seed = 'so freakin random') {
-    const simplex = new FastSimplexNoise({ random: SeedRng(seed) })
-    this.rand = (x, y) => 0.5 + 0.5 * simplex.raw2D(x, y)
+  constructor (noiseGen) {
+    this.rand = (x, y) => 0.5 + 0.5 * noiseGen.raw2D(x, y)
   }
 
-  level (level, row, previousRow) {
+  level (level, column, row, previousRow) {
     for (let i = 0; i < row.length; i++) {
-      row[i] = this.block(level, i, row[i], row[i - 1], previousRow[i])
+      row[i] = this.block(level, column + i, row[i], row[i - 1], previousRow[i])
     }
   }
 
diff --git a/src/level/index.js b/src/level/index.js
index 2fa4322..ed719b0 100644
--- a/src/level/index.js
+++ b/src/level/index.js
@@ -4,36 +4,35 @@ import FastSimplexNoise from 'fast-simplex-noise'
 import {type as T, level as L} from './def'
 import BlockGen from './first-iteration'
 import BlockExt from './second-iteration'
+import Player from './third-iteration'
 
 export default class Level {
   constructor (width, height, seed = 'super random seed') {
     const random = SeedRng(seed)
     const noiseGen = new FastSimplexNoise({ random })
-    this._x = 0
-    this._y = 0
     this._w = width
     this._h = height
     this._grid = new Array(this._h)
     this.blockGen = new BlockGen(noiseGen)
     this.blockExt = new BlockExt(noiseGen)
+    this.player = new Player(this._grid)
   }
 
-  grid (x, y) {
-    this._x = x
-    this._y = y
-
-    this.generate()
+  grid (x, y, px, py) {
+    this.generate(x, y, this._w, this._h, px, py)
     return this._grid
   }
 
-  generate () {
-    for (let i = 0; i < this._h; i++) {
-      const level = this._y + i
-      const row = Array(this._w)
+  generate (x, y, w, h, px, py) {
+    for (let i = 0; i < h; i++) {
+      const level = y + i
+      const column = x
+      const row = Array(w)
       const previousRow = this._grid[i - 1] || Array()
-      this.blockGen.level(level, row, previousRow)
-      this.blockExt.level(level, row, previousRow)
+      this.blockGen.level(level, column, row, previousRow)
+      this.blockExt.level(level, column, row, previousRow)
       this._grid[i] = row
     }
+    this.player.setPosition(px, py)
   }
 }
diff --git a/src/level/second-iteration.js b/src/level/second-iteration.js
index 55e91f0..e05a4ee 100644
--- a/src/level/second-iteration.js
+++ b/src/level/second-iteration.js
@@ -5,9 +5,9 @@ export default class BlockExt {
     this.rand = (x, y) => 0.5 + 0.5 * noiseGen.raw2D(x, y)
   }
 
-  level (level, row, previousRow) {
+  level (level, column, row, previousRow) {
     for (let i = 0; i < row.length; i++) {
-      const r = Math.abs(this.rand(level, i))
+      const r = Math.abs(this.rand(level, column + i))
 
       if (level < L.ground) this.trees(r, i, row, previousRow, level)
       else if (level < L.rock) this.ground(r, i, row, previousRow)
diff --git a/src/level/third-iteration.js b/src/level/third-iteration.js
index e69de29..ef58af5 100644
--- a/src/level/third-iteration.js
+++ b/src/level/third-iteration.js
@@ -0,0 +1,17 @@
+import {type as T} from './def'
+
+export default class Player {
+  constructor (grid) {
+    this._player_changes = []
+    this._grid = grid
+  }
+
+  setPosition (px, py) {
+    const block = this._grid[py][px]
+
+    if (block.walkable) {
+      T.player.background = block.type
+      this._grid[py][px] = T.player
+    }
+  }
+}