From afcd0fb02822ac57b3699b27f86b9729f6d25c1d Mon Sep 17 00:00:00 2001 From: MasterGordon Date: Sun, 11 Mar 2018 21:46:00 +0100 Subject: [PATCH] Tile Textures --- README.md | 2 +- images/tiles/convayorbelt.png | Bin 3126 -> 0 bytes images/tiles/conveyorbelt00.png | Bin 0 -> 459 bytes images/tiles/conveyorbelt01.png | Bin 0 -> 453 bytes images/tiles/conveyorbelt02.png | Bin 0 -> 415 bytes images/tiles/conveyorbelt03.png | Bin 0 -> 431 bytes images/tiles/conveyorbelt04.png | Bin 0 -> 438 bytes images/tiles/conveyorbelt05.png | Bin 0 -> 442 bytes images/tiles/conveyorbelt06.png | Bin 0 -> 408 bytes images/tiles/lazer0.png | Bin 0 -> 261 bytes images/tiles/lazer1.png | Bin 0 -> 657 bytes index.html | 2 ++ js/baseclasses.js | 39 ++++++++++++++++++-------------- js/game.js | 37 ++++++++++++++++++------------ js/tiles.js | 9 ++++++++ js/util.js | 22 ++++++++++++++++++ 16 files changed, 79 insertions(+), 32 deletions(-) delete mode 100644 images/tiles/convayorbelt.png create mode 100644 images/tiles/conveyorbelt00.png create mode 100644 images/tiles/conveyorbelt01.png create mode 100644 images/tiles/conveyorbelt02.png create mode 100644 images/tiles/conveyorbelt03.png create mode 100644 images/tiles/conveyorbelt04.png create mode 100644 images/tiles/conveyorbelt05.png create mode 100644 images/tiles/conveyorbelt06.png create mode 100644 images/tiles/lazer0.png create mode 100644 images/tiles/lazer1.png create mode 100644 js/tiles.js create mode 100644 js/util.js diff --git a/README.md b/README.md index 9bc5edf..fad4648 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Das Ziel dieses Projektes ist es ein auf Javascript und HTML5 basierten "clon" v ## Features - Produktion von Items in Maschinen -- Verkaufen Items für Geld +- Verkaufen von Items für Geld - Bau von neuen Maschinen aus Items und Geld - Verbessern von Maschinen mit Items und Geld - Eröffnen von neuen Fabriken diff --git a/images/tiles/convayorbelt.png b/images/tiles/convayorbelt.png deleted file mode 100644 index 9dd84b047b728c9f090bb9deba248ba25e4727c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3126 zcmeH_I}XA?3`9fE0VpXsK@O0fGv(^Ba5Nf?z1|h10Fjjv`SWJ%tg<}k>-0Lay&v}6 z_vbR*EV8rrJ@NN?p1-^S`~#nVeY8TQ_{YH13jkv)DOxHf0!WwBl$4^Ug~|Z#avZI^ z8|!RRciG?K2)9PCFsgWgnnX96pk+bqe$NQ(*=q+bgEZZ`$wqGSg)Pvrun3`U4K z>TXhZc~Fa#dM%OZfW^eqbi)w|nAD*#=k?-BV%s%0Kuq8ub)E|*%3W0e-iqd_{|F|` y$VzYT&=Pu`-?Ejb3?OFGi(Ii7BnQH@Fq42x0#LT=By}Z;C1rt33 zJtM=93Yk-ZrdoTtIEF;HzrF4_smVdWC9wb5MT=icZrZyGY?yeBL+oq#v+ipv)^5+7 z_0Dtt|K@2sB;WJZ$X0dFmu2}Y^jhI~S-=Lqq8xTsarTwVy526hr>~X45YHb}ckQ@Z z*Ic%bg%_f}Pw-!98~nzkNoENHd#<9gX-E$H+(XYDxn}PT4tOsvYSNa@7j%LDgV}XA z-4*RQ?3OQzWo$hh;}2P#*eENqrdj5;<3W;{d+s^vT=&>0yQP`S>TBt??4rHc)i1Sgu*+xz4*|)j_y}`WyhRa6T5*~5( zpNx*yD;5ODr(0`Od{WrfysxEnLNbuOv3c1`e&L@_J>CaTS`7?q22WQ%mvv4FO#q8k BwpIWD literal 0 HcmV?d00001 diff --git a/images/tiles/conveyorbelt01.png b/images/tiles/conveyorbelt01.png new file mode 100644 index 0000000000000000000000000000000000000000..ad3907fadd20f037e05eb7d68b5ca89b1ea357ce GIT binary patch literal 453 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H0#LT=By}Z;C1rt33 zJtM=93Yk-ZrkZ-XIEF;Hzr7Kd*BrpZdQoSsck;{9V~>}KaC}%0WM>n!^qz9ZpR>t} z)@!A!oh>w-Z~bA{mfq$3lm7AkUU14+=mvXe-lPNj*|2m8F8p0^HoNLAhSHO#j-;d_a7j_eU;wcG?1-o5YCR(>cAcsKuE!jol7 zT@F|L;*NT0#LT=By}Z;C1rt33 zJtM=93Yk-Zrt*8bIEF;Hzr7L2btr(xC2;z+r8`TGKe5}mwbW#Nll)GF8P3|D-#)d9 za=RnA<=EYdcg@!qGOyujs%y4Ak;q@P!`Q=-Z>O?GlUK#XbmyDxGZyV|Pu;^GBz?AT zLjK|!pThpE9a2j^ompV}L_$^T9mg-B?ad)wkNOn8cXO>us-4i}=gOw};H4$2<&(Yz z9KYDkOD0#LT=By}Z;C1rt33 zJtM=93Yk-ZrpkM|IEF;HzrEp|ci4f4B~aei{q)7VdDk>1cU)^PYS4+${_M#7#Sh@NYH%ek#ASuddI9~TPI5_+Tm`R zGGSKfTiH+9BJ(xh1v1w22i@U2H6dAK#SYmL*2#`sR!({BmMdDevuVC4{$cBpc)1)R z^unYrXF}7vME;_HHkb`Jnq{Wo7x>Z7epJ>mJiu}3^E>h~K$i-sHSdu9!X_G0b?)tg zw+ek1`Ly!3i-tO|t^Iz7PwQQv7HbV}S2U~Z1Wk&buPb{;h+&WRqKdTfNo(!I@elF{r5}E+%dZm~E literal 0 HcmV?d00001 diff --git a/images/tiles/conveyorbelt04.png b/images/tiles/conveyorbelt04.png new file mode 100644 index 0000000000000000000000000000000000000000..6a1b47353c448da5bee6aa6ae56414c1aa0ffb9b GIT binary patch literal 438 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H0#LT=By}Z;C1rt33 zJtM=93Yk-ZrmA_mIEF;HzrA7Ici4f4B~U)MZ=1XMRh_Ei3s^Gk8kxgV>^$6#S8cua zZ`YeIJ4Cd(K+IgeE{LqIa6cEx+eT@iOK zvi#%UWOu8)^-tFy!)|M-qmv!Qwl|%dpj@;CXpThuUaQIrvPIe+j*oX(ooF(9cwOQ2 z)kk3vq4NdL6}Y1gNQpRdW(TmSu5lEcvVqMt;1FJc58K&aGB&wgXcGHZ{9GZAwfFI* z>-_w)s^&)TJX0_KX-BA7w#f7S3nK4aT-l@4{Ab&rFALZ+QcE`O5H0CFuAsM+y${H0 v6f^m1wS80ZVW0uJ3A|kkTI|hMY&HLT^`=LfqFORASQ$KB{an^LB{Ts5sOG7e literal 0 HcmV?d00001 diff --git a/images/tiles/conveyorbelt05.png b/images/tiles/conveyorbelt05.png new file mode 100644 index 0000000000000000000000000000000000000000..e91cec11a8403d9fd21b21c700f418c3985e7282 GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H0#LT=By}Z;C1rt33 zJtM=93Yk-ZrfPY*IEF;HzrA6|*X+RK64*Cwap9L4ALEazDcnfq=K8Ny*OZYptv||H zPi%XWk=(K3#s7b12$+aw2XLHK(jYua>jNDsFEQxzZ`j7I}f^4*#YY zojg{sPzkd-|E2|jYaA6dl6kotC1KVblM-n%y0$=I%0{-<1wE!3EU73;e*AK*s|w(c zy71!lWcEVs6~fycW4!ot3bkLb=w`eq%}ag0_`S2-_Fv+wx#epeH}8mUztmd1&#>zM zizJX5$s;M1& literal 0 HcmV?d00001 diff --git a/images/tiles/conveyorbelt06.png b/images/tiles/conveyorbelt06.png new file mode 100644 index 0000000000000000000000000000000000000000..63d1d385e9e4d0322715881db3abe82f73a6ddaa GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H0#LT=By}Z;C1rt33 zJtM=93Yk-ZrgC_?IEF;HzrEqecgR41#c|%T%b!ZrUT@<#VzBKov&U`qZBrIlJ}+CJ z+rEG==U8#@|H@KM*(BJ6r4Su>}e^^Ty3 zBj0uYpbH|;6xuCMB=Qx_XqLgk{K4P6Lpg&*)a2{0UygSKO`3Qfb#-aH~o6G7vY8{Wt&UO9z_^N(J*Y0am>SDh2ZY(*b)Meciwd0NUnx}ZLrTPbkLMvpYk>jB;OXk;vd$@?2>@OdpH2V( literal 0 HcmV?d00001 diff --git a/images/tiles/lazer0.png b/images/tiles/lazer0.png new file mode 100644 index 0000000000000000000000000000000000000000..86013fc8648fbd17e0ce991355f56af3c496422e GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1SD@H0#LT=By}Z;C1rt33 zJtM=93Yk-Zib_3Q977`9-`+6fVo>B^aGXEwfBmZvrbn_e(P~Ha#Fm{(c-fJbd%^ga zm1TG-kFI0n!k2M>ou(7j&xa4u5}p j7Psk5!!0bPT1iZg439adELyPw=l}*!S3j3^P6!lvI6;>1s;*b3=DjSL74G){)!Z!pk#?_L`iUdT1k0gQ7S`0VrE{6US4X6f{C7i zo{`~4h0Li83`~rkE{-7?&R6>#vzQG9SpJ&){~s*vl94fM(jMDJQ%e!4t2t{Kn`UU9aUj#o4vcL%qE2`kjU%CRPojk8|r+?__++!WED* zsru|EUJdnt1}0mh{ipMz0{kpmGoNoh0b(sMm}|nl^Gms-W#gfuWdUfcMDb;ob2oo3 zcewdU(`)nYl;`%1n_A_*-?+PG_k3NA=of|jSKnMPf1Tra)2Tl_#;IdLm z_rAY=r)iU_eE5Vt^E-c=ZeNgd^0=tV`}A|?J^}T8`WQRo{@;@OAQj&=?mvA~ecu$M z!uDLbd@1L}Op^Evp%>@Pq=$_i)wz4GRS zzr)Q*f^y4l?ms#A56cu?$%l!OmA8CBg3C`_&SN??t;fQ3UYT&fwv;29pSH{fny2hH zars@4(!wsAw`xFpJA$8Nnlq+)yJ?&`8G9}`U|T@TBO{}|?}2g)Ir=~Ewf>*RbxN$O z!2Pq;%lA=0=@WYI?*C_g^s(N7-_CX4e&(gl_Ww+7K3P!mf_=YZ+25kQbqpu>ORo02 S)R+uRF$|urelF{r5}E+8&n#O2 literal 0 HcmV?d00001 diff --git a/index.html b/index.html index 87e7054..48e0975 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,9 @@ + + diff --git a/js/baseclasses.js b/js/baseclasses.js index 670fb0b..bba7dcd 100644 --- a/js/baseclasses.js +++ b/js/baseclasses.js @@ -4,6 +4,12 @@ class Tile { this.y = y this.direction = "right" this.input = new Inventory() + this.frames = 1 + this.name = "base" + } + + nextFrame(fulltime) { + return (fulltime % this.frames); } work() { @@ -61,22 +67,9 @@ class Item { } setDFromDirection(direction) { - if (direction == "left") { - this.dx = -1 - this.dy = 0 - } else if (direction == "right") { - this.dx = 1 - this.dy = 0 - } else if (direction == "up") { - this.dx = 0 - this.dy = -1 - } else if (direction == "down") { - this.dx = 0 - this.dy = 1 - } else { - this.dx = 0 - this.dy = 0 - } + this.dx = directions[direction].dx + this.dy = directions[direction].dy + this.dy = 0 this.x += this.dx this.y += this.dy } @@ -108,7 +101,7 @@ class Factory { for (var i = 0; i < this.items.length; i++) { this.items[i].move() if (this.items[i].x % 48 == 0 && this.items[i].y % 48 == 0) { - var tile = this.tiles [this.items[i].x / 48] [this.items[i].y / 48] + var tile = this.tiles[this.items[i].x / 48][this.items[i].y / 48] if (tile != 0) { tile.input.addItem(this.items[i]) } @@ -116,6 +109,18 @@ class Factory { } } + getTiles() { + var temp = [] + for (var x = 0; x < 32; x++) { + for (var y = 0; y < 16; y++) { + if (this.tiles[x][y] != 0) { + temp.push(this.tiles[x][y]) + } + } + } + return temp + } + workTiles() { for (var x = 0; x < 32; x++) { for (var y = 0; y < 16; y++) { diff --git a/js/game.js b/js/game.js index 810b434..57a546b 100644 --- a/js/game.js +++ b/js/game.js @@ -8,6 +8,7 @@ var delta = 0 var lastFrameTimeMs = 0 var ctx = {} var currentFactory = 0 +var fulltime = 0 $(document).ready(function() { loadGameData() @@ -21,7 +22,7 @@ function loadGameData() { factorys.push(new Factory()) } -function loadItems(){ +function loadItems() { var itemRequest = new XMLHttpRequest(); itemRequest.open('GET', 'js/items.json', false) itemRequest.send(null) @@ -53,45 +54,53 @@ function loop(timestamp) { function gametick(timestep) { //time gibt an in den Wievielten von 40 Ticks man sich befindet - time ++ - time = time%48 + time++ + time = time % 48 //Wird 40 mal in einer Sekunde aufgerufen - for(var i=0;i