From ecfa9d7268dc8112a612af5b3e00b2f01b49120f Mon Sep 17 00:00:00 2001 From: Aaron Mueller Date: Sat, 6 Dec 2014 19:01:21 +0100 Subject: [PATCH] hud work --- .gitignore | 3 ++- public/images/HUD.png | Bin 890 -> 0 bytes public/images/Thumbs.db | Bin 8192 -> 0 bytes public/images/hud.png | Bin 0 -> 867 bytes src/game.coffee | 6 +----- src/hud.coffee | 1 + src/main.coffee | 6 +++--- 7 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 public/images/HUD.png delete mode 100644 public/images/Thumbs.db create mode 100644 public/images/hud.png diff --git a/.gitignore b/.gitignore index 50e1d6a..c005620 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ node_modules -public/app.js \ No newline at end of file +public/app.js +.Thumbs.db diff --git a/public/images/HUD.png b/public/images/HUD.png deleted file mode 100644 index cd09c62442abb3603d0cee6cec11061256b1d553..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 890 zcmV-=1BLvFP)000yS1^@s63Y0cZ00009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-vt1`r)LUyKhy0000TX;fHrLvL+uWo~o;00000Lvm$d zbY)~9cWHEJAV*0}P-HG;2LJ#9@JU2LRA}Dqo6By~Koo|5PsUI;!bzKwUZPSY@FHSC zq&yPOg%F#*0}Iwjh)NKODnS{R)@qb6cI&lw}SoO9}gz351&t>YgKU@dpkS9e$%$`;M);q zAzb!wnUjdt!7UW$@~xt4RVV5frfJ&%FqcnNTSViY#)nbb2=;rI7gJ+AExxi$vQM~$ zBJ_3(ZlQ>Nc^le(<4{zdSUA3RG8OQ)KxgG?eiZ;F%CRVuOuILVf(Jy zA&s52#s~0x`wGX`4qlYkKoHB~<@pu#b_>iK^eGy|(vew~Qz(e6BTuIErhiA*@o{C%dNbKC%6T8;)mA{)6}4vaAXBDDD4$|Xa+*e*!hyut(MsqbwDCBv&?ptvtZAl z2?()#H_xM2H|34O3~o2x5_(J+@$!HvAD#iXjPN*>C{p zZB?+}I83}Cnx31sjowxzcyC-e{~7!?H1dhLe&yM70P*$4u<$i3Vhw+pNxMclO#m4c z*mkWdOwLihe@|)89KWM{cYL|pqtz93++>wU|H~)n%wK}otkrQd62Y~m&XxCNVV<>G zS%3N71^A!B(g=rVX$w{Cr8-*LIbVMW?e)o-SU-3dyGWvv*C!z>6qVJ7JEb%7 diff --git a/public/images/Thumbs.db b/public/images/Thumbs.db deleted file mode 100644 index 4f078e6c9bf4ffd1975e7ba94d16aecae78054a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8192 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 YJNpqqqyOpL|AY5KxcdLf|DOl`0U4sPZvX%Q diff --git a/public/images/hud.png b/public/images/hud.png new file mode 100644 index 0000000000000000000000000000000000000000..afb56818a9da36a12f7109fd43deb26cf020bde5 GIT binary patch literal 867 zcmV-p1DyPcP)000yS1ONa4pq>8300009a7bBm000XU z000XU0RWnu7ytkO2XskIMF-vt1`+@XVg;(000095Nkl{%> zPExxH3M3e4B|yPQ3?RDEfdQ!%3lm?U6W@WM8*|4l3`j*{W8wn<5))IX2$UvD4Fsi) ziQ*VLwl70&+-p1jlU58Qek|+W_dU=1-lL;)&pq!G+|%+4K8lRRt>C2D55Ni$6_pX| z^Ptu@Tkcv%uTEmcN@7%r|HD!4-mP_44z4JI-9C?N13RrDuO_b`_`zjW??)4Q9^4#m zi}(0=!mSGNwR%ea7D}4RRhxAEfP+$Rhn=Vq(wpwpEp+bc7cC>>U@?yyvUq z{E14>;MD)A{-s1Z-Ir@v=}+HD43>~Fj}2KZFIu&)PIvh#_RoCij?hjvA15*z%F>@F zCYnO?YG%D6P?M6;)^I2lGd{s*ra10KE7Hkt?<0R(G%N6@MVpG6HeJ(Jj~Ul--52K~ zJSjvXVNWjhVp;gL_3kkAoNXBgie|iF$s@~}T4rO$4L4jnHyPH}5se5RYrSpEB{Pct zkXEoGrQmIQHeHMlIow0(+=OouguO|-XWN_?+}9Lps#x%YA$db*xRl7{g8?nS}Zf2;Dd5Hx+N0x976RKQb1k(Hhc7hZ4fjlE+?m z!4>a{V^3Z~pr_mbLNGH{=eOX!aI$Ac&t1J3RS*N#DP7z~KL;8uZc-J>4(!QHU zYE%YtHNL(5pFU{4r}Q56@fo>+nzDxlNr~fEDU`J}knORZjOy6ZpN)@VD+AWTm>rJ1 zFUOpmfYPbey{D10uJ*Zjgj}q8RJu|*D{``U;8;#S7UYX|yB+DblGQsY&p#37^NHC^ tk2kvm{uTQy`96CsW-P}I^wB|%e*s-_*57X=`cwb_002ovPDHLkV1go|lA-_r literal 0 HcmV?d00001 diff --git a/src/game.coffee b/src/game.coffee index 375941f..69b71d5 100644 --- a/src/game.coffee +++ b/src/game.coffee @@ -9,15 +9,11 @@ app.game = @currentSelectedTile = new Tile render: -> - app.layer.save().scale(5, 5) - for tile, i in @map y = Math.floor(i/20) x = i-(y*20) tile.render(x, y) - app.layer.restore() - @hud.render() step: -> @@ -53,7 +49,7 @@ app.game = @currentSelectedTile.attachMiner newMiner posToTile: (x, y)-> - pos = (Math.floor(y/8/5)*20) + Math.floor(x/8/5) + pos = (Math.floor(y/8)*20) + Math.floor(x/8) @map[pos] map: [] diff --git a/src/hud.coffee b/src/hud.coffee index 32d96f1..be7f855 100644 --- a/src/hud.coffee +++ b/src/hud.coffee @@ -1,5 +1,6 @@ app.game.hud = render: -> + app.layer.drawImage app.images.hud, 0, 12*8+2 posy = 49 for type, amount of app.game.resources if amount > 0 diff --git a/src/main.coffee b/src/main.coffee index 5d7a67a..5261f5c 100644 --- a/src/main.coffee +++ b/src/main.coffee @@ -1,11 +1,11 @@ app = playground( - width: 8*20*5, - height: 8*15*5, + width: 8*20, + height: 8*15, scaleToFit: true, smoothing: false, create: -> - @loadImages "layers", "active", "selected", "entities" + @loadImages "layers", "active", "selected", "entities", "hud" @currentHoveredTile = new Tile ready: ->