From fd2005cdf853e02117f36362be54bdddcbc0de10 Mon Sep 17 00:00:00 2001 From: Jonas1989 Date: Sat, 6 Dec 2014 20:52:31 +0100 Subject: [PATCH 1/3] add hud --- public/images/hud.png | Bin 867 -> 660 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/hud.png b/public/images/hud.png index afb56818a9da36a12f7109fd43deb26cf020bde5..ac544c7b57ae447fcfc6602c0f545a042ff6cf74 100644 GIT binary patch delta 617 zcmV-v0+#*b29yPm83+OZ004#dp&5}OA%7Dz7FFdwtpET39cffpbVF}#ZDnqB00000 z07G(RVRU6=Aa`kWXdp*PO;BVmWd{HN0t!h)K~!koWBmXBKLa*kW@^SjC2;EWDF&(n zD!OgB0(h7+nwps6Qj{GRLAgy+7p*{xW1Wp!+I-3@9XCU`;ro5}y*l+e{3V=w^?%dd zEB@CYT%#`Cmx>>rhCW7%U8=ZkxPqyRRv;pH^_^>I(p?ep@DMbywxz_TGe-}j#c}w4 z-y^He{8InRCe8jd^l|up-+dQPvfX56aAJXQ5A8h7^pVjf%w(nG=J5T#dmfx%zr<|o zX9`IW$gxYI+lDJRbM!EB1hWW9h<_tXS2%c}g`kcxndRY?v!_g~ZO~_$P71x?I!b2y}wsK z-NhQaWV>y+f-7gyYeOtWG!;V-VjprorVxzAF2Mjt&%wyGqnW80bwg0c*nbQ;A5&P7 zkH#(;fCW>Cx*-UUV+yPA(b%Olf|2_k)D1yWO~WkMM`M?4z(n97ki9>U|{a5j+~ZLwb~BFh=lb>{1b+jW;lj#_sSdpOMElm_}oF*u*Yo z`HX#_V>EV$ZtOyW5qU_1WmYtHhgs})9N0l12V-q*)2_*f8N2j!!?0;NLxQnv#lm+l zULwmf!dG;_XBz0=a delta 826 zcmV-A1I7H51>**g83+Ub005w!{>70YA%7A831S7Rm;e9+0!c(cR9M69*gtPuWfTVR z-@SJ1)J{^n3JN3`XeB_wNDLsl(SZS}6$=wzpcCJLp&N6@E(}OTVq@Y101^{Zs0frM zN(}_1jfvtIJGL)FZrp1-{*zV=Bz`RG-uFGv``)9YbI(2R6Wr7C3qFdB#jW6^*?$kf z3K12R5$p4y);C-3T1T%=V#P{gREht?QSRQYbyp6qD1zNSk81-vts$=_uORrrWmWG- z6M7!p9BzyE_;|vt3h}jiO8(@l3a4NfCSVP69!MXkdMzp`P2kX$tw=DA_2n4*r_Ku2 z)ufx<;rAoSciryZ--({(u_aq)B!7Svq>~eeA{(+^(zfP`87Ys|EZFg5B78T4QLnHw zl7V>*$1hwY&^nQoZX^bE2XZcWsP0WIbv1b{ZNEEzI2g;wBK=`vV$buoRh6W4gckhl z9T(NS=d0uViAvAl)c>jer9?X2mupz*Pv1!lmXI-z4OuNOTD7lEclj#z&wqUAj?hjv zA15*z%F>@FCYnO?YG%D6P?M6;)^I2lGd{s*ra10KE7Hkt?<0R(G%N6@MVpG6HeJ(J zj~Ul--52K~JSjvXVNWjhVp;gL_3kkAoNXBgie|iF$s@~}T4rO$4L4jnHyPH}5se5R zYrSpEB{PctkXEoGrQmIQHh*1=4>{aJ>D+{G5`?`;yJy>+7u?qrYN}Z9sxU#j6`Ys+ zi~4>;0+>w<{&LYJheE4DJL;OM_I0dHzZk<#BAJBx5D48j=QkB^nYZV%$Uia`rqLSG zNQV-_(2~bqcfl3!isa1c*z(YVm#5Jh)<`GSuYFlr^Ez5K%&RN268pNz5Sm)XuYTO9`*4Vxq+IphXqNA<5ww^wKb6Kv7L9>;A zJ1NgU5$5xW*-Vc&yC(zw75gmtK6@=@EXNJ>(Ls)X0bOy{-)|)PQ~&?~07*qoM6N<$ Eg8fI2%K!iX From 2a865bb72e0e7f479c7e6e8fc95a6b037dc250df Mon Sep 17 00:00:00 2001 From: Jonas1989 Date: Sat, 6 Dec 2014 20:54:37 +0100 Subject: [PATCH 2/3] add hud --- public/images/hud.png | Bin 660 -> 702 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/hud.png b/public/images/hud.png index ac544c7b57ae447fcfc6602c0f545a042ff6cf74..6233ec3fc238adee0e5beff6c8932f5b1f1c5f04 100644 GIT binary patch delta 618 zcmV-w0+s!g1-=E483+ad000Vv{K^%tP z$u66lhoV&Isdy0DSWC0J7ZXrVUeccI=A<9MyYwRz?|y)KO7v8`v``Z959lU6C`Jf0 zPzZsh1!;0KG@TwwmSi)@M%*2<@_UYxC7H?lFn@l`GR`@MVH)P}2YkRT*bI`8F&<*{ zyqTdJo`GzCtfd3%%=S)3C}Hg5GyZ&H2HB;3r`^h@c-PhQwPP*`?=vW5DDlmQOFAGuD>&A zDJS{HpNPzoOOTselJ9{C7^V^h$@f473`1xnU-(w3TM0<=5q{FiD)a)9eBnh@=Z%nj zgv{mFU3ZR2D+a#Orm7f5Js;8H-qnxc~qF07*qoM6N<$ Eg0DF&3jhEB delta 576 zcmV-G0>Ayf1(XGl83+OZ004#dp&5}OA_g=TRpmadkx49n3Q0skRA}B~{Qv(y12$l0 zYQ{h%aO(6a2C4!ox^1`uc$hPqnwa8JlpPmAxlL0Stw4)oosC-Be99{wH$%AL`+fJl zI`umIC7gTp)7>ln*C1S@F5Q=kAD)IjMvGmlxNW$Csf$)1B6#(kYiQD45%KU4G_kg& z#HKSx52M9@arl1UBdgB*Qvb^)&Hgm>arl1UeHTx%-DGBPVu5fE?L5u&kRZ|{dD)2`d_x2%r^Q43=9l^eC(oZH<^E_|8){EfpGsw{A2sb z3^#=BCi73dzgIuq#TvV0yKT6FD`(MbLo7u!6+;kWA96mX5RAqy!2n0k!N|3vnW-6d zLr}-q3^^ZDSdov$E*XFYQ;51D2#;e5tMJj-r8I((`ySK{K~hb_EZ9e5mu$d9^?ngm znhB$Su}hN(9`L@$XzbEFf(I}hM`M@jeI)D=JQ}-0dX!@@M(}9tQW2nyH!zLH?(i$0 zk;gWeMq_u_#4cv}jD4VEG>_UPOc}Rn0G~@ O0000 Date: Sat, 6 Dec 2014 20:52:56 +0100 Subject: [PATCH 3/3] Add game tick --- src/entities/tile.coffee | 14 +++++++++----- src/game.coffee | 6 ++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/entities/tile.coffee b/src/entities/tile.coffee index 3985b03..49cd777 100644 --- a/src/entities/tile.coffee +++ b/src/entities/tile.coffee @@ -45,6 +45,10 @@ class Tile extends BaseEntity detachMiner: -> @currentMiner = null + gameTick: -> + if @currentMiner + @layers[@currentLayer].collect() + render: (x, y)-> tileLayer = @layers[@currentLayer] app.layer.drawRegion app.images.layers, tileLayer.sprite, x*8, y*8 @@ -59,9 +63,9 @@ class Tile extends BaseEntity app.layer.drawImage app.images.active, x*8, y*8 # Draw the status indicator. - numPercent = Math.floor((tileLayer.amount*6)/app.game.maxTileAmount) - for i in [0..numPercent] - color = ["#f00", "#a00", "#f60", "#aa0", "#0a0", "#0a0"][numPercent] - color = ["#f00", "#f00", "#f80", "#ff0", "#0f0", "#0f0"][numPercent] if i == numPercent - app.layer.setPixel(color, x*8+1+i, y*8+6) + numPercent = Math.floor((tileLayer.amount*6)/app.game.maxTileAmount) + for i in [0..numPercent] + color = ["#f00", "#a00", "#f60", "#aa0", "#0a0", "#0a0"][numPercent] + color = ["#f00", "#f00", "#f80", "#ff0", "#0f0", "#0f0"][numPercent] if i == numPercent + app.layer.setPixel(color, x*8+1+i, y*8+6) diff --git a/src/game.coffee b/src/game.coffee index 04e5800..32fbce7 100644 --- a/src/game.coffee +++ b/src/game.coffee @@ -6,6 +6,9 @@ app.game = @currentHoveredTile = new Tile @currentSelectedTile = new Tile + # Start the game tick + window.setInterval(@gameTick, 1000) + render: -> for tile, i in @map y = Math.floor(i/20) @@ -41,6 +44,9 @@ app.game = @currentSelectedTile.deselect() if @currentSelectedTile @currentSelectedTile = null + gameTick: -> + tile.gameTick() for tile in @map + createMiner: -> if @currentSelectedTile and @checkRessources 'lubinit', 30, true newMiner = new Miner