From 4a0278e90c0f99498f03b2cbd445745181c7474b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ruben=20M=C3=BCller?= Date: Sun, 7 Dec 2014 20:48:54 +0100 Subject: [PATCH] Fixed some bugs, made gameplay better --- public/images/buildinfo.png | Bin 2274 -> 2290 bytes public/images/speechbubbles.png | Bin 2141 -> 2140 bytes public/images/speechbubbles.psd | Bin 63683 -> 60640 bytes src/entities/base.coffee | 2 +- src/entities/miner.coffee | 7 +++++-- src/entities/silo.coffee | 2 +- src/game.coffee | 10 ++++------ src/hud.coffee | 2 +- src/tiles/tile.coffee | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/public/images/buildinfo.png b/public/images/buildinfo.png index c7711c9270a7b9409a2bdbf5ae1c3384e42ee40c..bcbf0ad0f13180107ca4ff5e4327c2dc62c495e9 100644 GIT binary patch delta 1581 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 delta 1250 zcmV<81ReX_5Zw^4S^^(1HbX>2GC4UnHZ?;rF-0^&K}A7BGDJZ)K|wb%F*cKV0v#VP zHbX>2GC4RmHZ?;rF-0^&K}A7BGDJZ)K|wb%F*cL60%Hn6HZ(9sLNrA(IFnuj7n3;y zeScHy$rJzp1dB;TK~#9!?3`_K+aM4?BabErXfD*Atm(MeUkfg?1Y!6 z3&$;)g3I#X?fw7bFD|2ad;@ev>|g&}6Mt~!=AjvMn4MClm%a%^&_owDuU#QO`i=@^!`DhX!;6`9LTOpd-kyKflnp9&j-PvOz5S z1?%2B*et%@SH3tdMpDW2J$V#ZCQ`{Vyb7#UGn9@;h*Gx1CnM#`$w%~To{qh*y!D#f?MCZr^jj+9G1GDuU#t{0lwuYalXN5QXJ{+7$Wk`!u{OQViU@8f#7&Qx+I ztB^`aC8QG6oJpmcp`3)$)-BcJQDjxEVbRPq($4-# z?KY#SYsTwEmFtjZ8ny0kl#)}Wx}^`ObrF(V(3)Pz$eq4Q8J!yLd(8B1dskZ2nUYdc z`(3JAQ^zc>LzStm8-I6?sJoQ4UfbwY4HRasbp|5L@HUi4y2M1=*SPa z8McmmpPwz4F0uU0gIucGQz_>hQhP0>&JXWPEo~UF#LdgTOI1=Sx13D#%XeuhUGI?p z$mMIML+~15bkxvz*4ah_e`t0sH2%gIU^7e1b!T1q!^iJPZpq)95( z-lr{l^b$8upijB{&4a(W((*SK{b;0;L9YX;WaT=LN=BdwX9E@j(10cY4QN0Ulj8?9 zJb(rPpaD$)8qk0y01apY(0~Rs0cb!IfCe<62|xpy05qU49e)HE03^SO1V4!_YybcN M07*qoM6N<$f_zR>YXATM diff --git a/public/images/speechbubbles.psd b/public/images/speechbubbles.psd index 0c5e3dcc3b7aa909d8404b424a9bc38e1b671661..746b0a7146c1cc77e21bdda385d0719fed1ca471 100644 GIT binary patch delta 3058 zcma)830PBC7JeZV5T&3ZXhp%HsK^$!gk{7^QKVBu#{!>3#EQ|W8pS23P)sVH@Tsu~ zR|p9zZosfQcu_{3Auuj+K@r&mq@olw0b$TaFp|8v?>?Zoe05%O?mOo{=lti~llxt` z+RtonW*)Jz*vR(s4+_@TC#c8LiV;CDr`rXlI$N13A}u?2Uf7~;t?)itsob-wG=iyT zT6aQdDeIbm(OV6uhX1Uw*sYb^SNkk$gWcV z?4qfh`$ICL@|l;lo1A$Md!sjHP3!i%@oNvC+y8R9D#7%Ar0zgaZ(y1HTDDfjuMb*B z68E-9FL%X>+r-b@XH`^qGmR;c=-X!ars@eAJFKhql{azfpbh z_Nph5TTS>sM~4JyefvxQ>-MrhxZzBbU!5|J%?n-XqAYDrNXeVYP;74ucwCs++FoH@ z+oArkP!OQY32mEG@Z{HM0f#5Zchjj-0!Npyy6EH_Vw_$VZ$aMj^^4t0lpf31`#ESX)+ntvJ`PcCbJa%GhTqV1r^{NT z$&m_sb%$RIKi=SKYRd5jw(0quJ*{pFRw&inz*B#DA%Ah9iRaZkh3oGpS7#627W5BI zJJ#b`8z)(^-X+{g<@E33o6E}cI=MR*sWrAQI9zs@-1<#{W2su+BUt;CBt+_->e$)# zH|{Bl)GbnJ$`;?)--eO{3x&(>JU-gpD!A0TQPsHi#l^=D;$Mpt2rG4iTF{{FYT-y+_Ho-3+BvA+8iI-Ao;1`ybnLUN!c*eyCJ80_2qK~!8hZ5 zO85_();49=JIZJND=98kwtx5Fe-!uo9)wm@$FtdO8F9k1;TqHLc7-X$cN5m;`P?bk z!ASMsZkgS$cy%H=$8Nt_4dZY{1%o3QS2j<4mR0;>%?H?(H$iWmdUzr4&6f zq>nsQDjSIv;fznv%uj(Z-y&S6#faVqIheDH#ix8+MLQ< z{BAqu=nl08QE77lDG~!RONi+=kIt)qAD&k_9uQ1P+=}Ow-hk)D6&pj_{mW_SE!>l| z4XYV;urGO7{f1(KR}M_4JuxG5hHnopqM_3i1i50GIfG_)NjHXlhiT@Fw{TGkO((H} zSB?y;{?IjT52ld(ZM2&jK(k6RFsn;C%__NxBltPS@M;FlDpA2{nKV_VIZTlbt5m-d za4hR7HHXZdI1M!eZi(3V{P2$Bd1U5}5}KT#&roJPf^489o955dfU0~8$UMcxJxXn0 z^l7?=bTO_Ga~9W-ZlahVKPQBalfkOo{j^$*J>UO*nBgU?%BLA*mXK2@z(F!^SXxAn zK^BeTXTsnT)A8m_6HJMXe5;y$!LjB^9aX=zmxlpF_s8z9wp(G(x_pg6(h7w`>^MesPXT? zu=Z*s0|Z@~3@^(&EYQDVi^jPVKIkI!COELS(U$Q?rXd3cxAZf>fv0B13=#Sn@lOt% zI&CM4h^M5M{9HtJjlW=3r~OCJ)K0sPpjo|hC(sN`ia`hN^g4jt4tKb#?WExscjfJf zn~>i{@&suN`Iypnrns*GWU*`y1Nhq%nnT xCr+aGIB9Gt`;Va19zTrD>YZmywaTROsbWqbLhTCe`(_&g=HNF_`g)$;{{TVwp5*`l delta 3411 zcmai02~<;88h!x;MYa=a5Cvhz4Uj+(REn)MwP>jsk-7~fxNjuy>^!C-$qwr;F#o0^gE?v3RN{6D*qDXEf$(c2`s?y4v8WzlpPpYh% zchB#}eqEjUF76(#8$1N-L5$9(X$L}`6kS8%dN;wA58b@hx`RypWpJndUA?)n#UOpb zdj>23OkKFc%}nAByq;9N{*wO=!ef1ww_(K)i51m!$b5 ztxs`~c7-{@8>YtYBw>UT)(64%0NxU7KWZ_>q5n7!M(m;^%Z(T_PdtdxqZ~EV3IY;Jm`+A?s zvV0;dXsV;Hq@hK%jsIkiAn5GWYO}S^6w0uI8}}vS#)<6>qN-|@WIVdzMBwWex2wi7 zg2&VKPbnlv7ajO4vNYJa&blfwJ4nsjJzV&_He$=hde1Uds;KSC`#((Ny#h2k>2%!;fzCe7;egbSxvpk82Ruo4X?C<15}P zay}8!GNlHN7lHC!t3(yA{VgV>-I^ae(`>5KYGvwzZ0U$+gc{VzyK9Gw_tR80O+}73 zbgJTNR3X>+CMAA0osF?ueeTECl?MmCoaYo*5j8BeDC-R3H;;c2zALS!rF7|-`?%Ur z^Dy|_)eY(|T6qIIPf7A)&fdCv`==${R^Jx^RdRn=Z}{M+t)i`!X=QC=(GRX(2x$+y z`P#AoT*E6Jn2DOcU^ek;sPVQF9AO3jffx5KL;(G1GxzAVaoap^|L)f8BO)7`_ zwXL6YH{5+8w;PL7^F=LbIk_RsMW zI(|*NQAATW!w2_$rqqZ|s;cc(op}+P*CdyBRmCnJtyOp`&v`=%eDTr#0SkWKKCm7&#Fd?W7gNFhyKviqAV~_cqGN-+guq_Rg}su zO+1uR? zg)a5MkIg5az++%!ok~-ak|;mm*mO^{Jt8zNNOUQu=X`gh|AT~*$|0w4i@i_$M|{GA zP1~Yg<|ok9o~l(e736FomnMUP!0?DAg{Fp=6F&!%b^%mmWq`aqke%<QkNJLi8O<{WQmWMH$T6v)B-p?_bE7c`ww3UDP-5p{RYfbQj!za4%=x z3bQ=BDA*Wvh%t*mW0V~*6Y2xgoN8bhn@$S;2}@%CL<;QfKxirt_=^p}ws<3sD>$86 z0w&{2*CHJINb*^C$GzXu_Bi* zCdl}U2xlDD%{iuj3OS~OM0+;)Yf3mduEQV;T zGrSnLkhJHWWYG8zAt#gV8HLFb#&oiPBd1wYIGZDoY4B%wi z!YIJH4dejN&IXZ@P6NQEmi_!;ea7|_SGP-fIMO6 zbc_m~oi&7>7nniLH_0GrA&V@BHpMKm8s=V1BxnMg*+a+)E`LK#Aoz&1mzG*Ae5Z^4 z{~L%P&%8_gMnc>Leph8--X(n_E@k7~H{#qbFxAv1!oP|5hmm~ku&v!VKy0j83u)}& z#Rwdj@rg|$Oni1Rwpn!2jBRv_kkAf&8#I~3K;lYbA%Pcm2^2P`6Vvvb7*mWUksi`a z0B8{#zzHTyppd|e5e$;n#~vw0dM3jZ<1S19kHbY;GSg99Ko%n?TEs$VA#pQ-)z)dD zv<1`MxC}c)BY`jE;~-WfLiDtc<4i`|gr7f&&H`epP=z*z2Vi8fkiZ5DPnxmK+}feD zif5saVqC~922g|*!6cQq6W=7NwY3`e;mOnG+IcueP)I8-#~E@XffplYLfFSQ`urJV zCdE|aHWq#cniOe=63928iOV3O+PRp>eG3mRJAaxGMZ@d0!5mOlX%2H?KMy26_;`Uc zwGREpxS@YRmo*!3K=VVZ-wM6b;kAjoX*ErW+tBVo7Dr5LC>jW4E6pAwcY#=Y0!j_c z9@&^-x?*Z31&U;=4QII>G6#L^>WabqM|>-6VsH-b(ax1f+z3t%4;WeG368Lx7~fX$4DwasQ!U2}r>!1xo;db8rtLAY}IH?pp|O83H5)j`gtw7`M8QCBOy0^sxjGI0yG20_d|OPk@UFxb$x{ kc(;x2rqq;-?m@DZe*7C!L$#n98p$3osx*h+DeZLr2a_;+Hvj+t diff --git a/src/entities/base.coffee b/src/entities/base.coffee index 4d2e824..6fef735 100644 --- a/src/entities/base.coffee +++ b/src/entities/base.coffee @@ -21,6 +21,6 @@ class Base else @frame += 1 - spaceProvided: 300 + spaceProvided: 30 energyProvided: 7 isDockable: true diff --git a/src/entities/miner.coffee b/src/entities/miner.coffee index b5f010c..914c01b 100644 --- a/src/entities/miner.coffee +++ b/src/entities/miner.coffee @@ -3,8 +3,11 @@ class Miner @frame = 0 window.setInterval @changeAnimation, 500 - tick: (tile)-> - tile.click "left" + tick: (tile) -> + tile.click "left" + tile.click "left" + tile.click "left" + tile.click "left" sprite: -> [@frame*8, 16, 8, 8] diff --git a/src/entities/silo.coffee b/src/entities/silo.coffee index 36c5274..4020698 100644 --- a/src/entities/silo.coffee +++ b/src/entities/silo.coffee @@ -20,7 +20,7 @@ class Silo else @frame += 1 - spaceProvided: 150 + spaceProvided: 15 energyProvided: 0 isDockable: true diff --git a/src/game.coffee b/src/game.coffee index ece9e33..3ba6d72 100644 --- a/src/game.coffee +++ b/src/game.coffee @@ -4,8 +4,6 @@ app.game = @map[i] = new Tile(i) @map[20*5+10].entity = new Base - # TODO: BUG BUG: ... the base is some time replaced by a tile ... - @mouseX = 0 @mouseY = 0 @currentHoveredTile = new Tile(-1) @@ -158,7 +156,7 @@ app.game = createMiner: -> if @currentSelectedTile and !@currentSelectedTile.entity - if @checkResource('lubinit', 10, true) + if @checkResource('lubinit', 5, true) @currentSelectedTile.entity = new Miner else @speechbubble.say 'nores' @@ -168,7 +166,7 @@ app.game = createSilo: -> if @currentSelectedTile if @checkPosition(@currentSelectedTile) - if @checkResource('dirt', 10, true) + if @checkResource('dirt', 5, true) @currentSelectedTile.entity = new Silo else @speechbubble.say 'nores' @@ -181,7 +179,7 @@ app.game = createSolarpanel: -> if @currentSelectedTile if @checkPosition(@currentSelectedTile) - if @checkResource('notch', 10, true) + if @checkResource('notch', 30, true) @currentSelectedTile.entity = new Solarpanel else @speechbubble.say 'nores' @@ -230,7 +228,7 @@ app.game = map: [] miners: [] - maxTileAmount: 15 + maxTileAmount: 75 availableSiloStorage: -> space = 0 diff --git a/src/hud.coffee b/src/hud.coffee index e295940..f3ae15d 100644 --- a/src/hud.coffee +++ b/src/hud.coffee @@ -73,7 +73,7 @@ app.game.hud = showBuildInfo: -> clearTimeout(@timeout) if @timeout @buildinfo = true - @timeout = window.setTimeout @hideBuildInfo, 4000 + @timeout = window.setTimeout @hideBuildInfo, 6000 hideBuildInfo: -> app.game.hud.buildinfo = false diff --git a/src/tiles/tile.coffee b/src/tiles/tile.coffee index 3d6ebad..43a28d1 100644 --- a/src/tiles/tile.coffee +++ b/src/tiles/tile.coffee @@ -14,7 +14,7 @@ class Tile @entity = null @isActive = false @isBuildable = !(Math.round(Math.random()*10) == 5) - @isBuildable = true if @isBuildable == 20*5+10 + @isBuildable = true if @position == 20*5+10 @randomSeed = Math.round(Math.random()*10) click: (button)->