From 55fb38aa0a2220a61c92a7eb9125bd46bdd59e4b Mon Sep 17 00:00:00 2001
From: Wirus <wirus006@gmail.com>
Date: Sun, 5 Apr 2020 21:46:04 +0200
Subject: [PATCH 1/3] add water texture to Map

---
 data/images/terrain/water.jpg | Bin 0 -> 4383 bytes
 data/mapdata/map.txt          |  40 +++++++++++++++++-----------------
 src/game/Map.py               |   4 ++++
 3 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 data/images/terrain/water.jpg

diff --git a/data/images/terrain/water.jpg b/data/images/terrain/water.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a7ecffeabb2a37f72bc793e8c24ddacb5b747712
GIT binary patch
literal 4383
zcmbW)X;72Nx&YuW3wuzIfC&Z+i;x865ctrr2U!!6KoW34#$iz)88?U^i#Q1&YK*Kw
zF=kL8D}u@>3ggV2AiHBwli-Fr2m%7)h=MrkIbP<RTlZGoU-#a(tNTyC)zwdRRlnU|
zAAKDKtf-NcNB{x>0LXF!zWx&k2xCQr#>cY!u^GEIa1ZRxz~&M?y|B0(9%o+$mO_of
zQsW|`u(=z(@$0c!IVpQM2lKH(*iF9XUq^s2z|`2-#MsEx#KgqR%+wr#v_x1~AkeF9
zRw5nj*E%}bV=!1(Pj{^IdKU}^w+X-AiwJ_?T6e!7l6Rn|59s~ZA`mk(GlT^KWoe1>
zcEUJ$|DWTl2Cy~-J^`O#5N7~t4S`uhzV-lXmyt%0e+BTL0fEBcM#d(lX66>l3GG$@
z6as@m;V>g3ID9#~Xn7uhTN|x%B8D2<FjGvNvyk3`ss>Y+&23$_tov_WeNwZF&CKmq
zqtN#2+}v?^0_eMO6Uom%EIcAIDw;xN$0uyrx@~)6+OFN{8JQd|?_f^up}hQplG3AP
z$Bv&6R@aDYPoJqfD`{+!$rVbKy7|Ye*V?b&=;-|ER(DTtU;n`1ZJpjQ{NUlE$4_32
zjlZ0joO(4qGym@W!s3UekAHsp%LM^o|7I<Z|Aze!m-Vs>3WvksCV#mg&_l}|W(_xT
zA{ws>Wtya9**JR(Op%+b8rr(dTzpt>ZBw)Fo7=g9FV@ZfMf;cRe+Mi6f64v}_TR22
z00IVCK0KH;5CUjn;Nn;vUh{Ao@n`7od6Q>Qj)s%HA$!9tMD7zy7j}(5uRR76p7wni
z_pCB$U$>yw_sqmax8Q67+Suju??<V%n&v4JTRU!~YM}L=CjR1xFjaWgYE*gzDeDqw
zDfVA9Rpg!AUGUtN5!;?!4xtKz>;UkEbF<Lk<|JN(p#$TL@iRV8$~32LI2N+0mD${G
z*!_Ifj#e{KMu8Xu>5U+}qnf#6>%PBPbN836Y1%-k`EjWvE6nZ;ct3WjcO#4vaui(r
zAm4xc+($hbuNbSxK~M7UWKo3TazDk~2W58UlLKRwEWz_K^5Ue-vE;q#VJp>i$S7Sy
zJgvM0(fW{-YT!MqCsrU@Nmc&sPQR`-zr>{6a!cj=IqDiw%QJjKHfJu{fAR)2TvP@t
zC$KuEkdNM1QpW0c)cduJ9D>AW_^Fv@Xsx%G#jer#k+Qk=Rmp28C~PtdxzG=OLF7y!
z`v?6NR5W8pk`juSeHkg#7i37TVCG8REvP=}%FlvUS(5L_C=Q;!F3vL0kS_PNNx<5G
zuk``?<}&y_BY?+9Btv+N5dkA^<<1|bw_SEBC^S4Zy-SPFUs7Htg!HKqRa@$}mW!L9
zwH4fR)e*XSOYr{lx>bUjip1a_)D0anEuDWRA1gdD6al=SW_Av0!FEWQ7(#cG68b`d
z%cN@@{PlRUHu}W)po>lsS~93z*Rk;V8UD4`cj%x!P`fE;Q%2zXUi^SxpaH%Jj`4H<
z7?S=x&n#hK$AfEQ$*yMo$Uc;7hHsjA@QWb-`1RfesSQDq;hbxV>T6bIbrHdJJqcJ8
z-7Ugp6A7s~lA=uva~;CZOC^_*+FX~^FG%n-*9G~y3xmg?l0Mm}r|Hy_#vH%tH$@jg
zr_%Ryr6*AvGRPa^zNzfaaXKvIXx+K%qvah<hmdvhUa!?b>c<KJV~z!_>J5Jc6Y@4;
z;%SDlGB?g_4Grc?Fjo*q*=<53tA4TWSichmcF>kslmGc?;qV@5>JI}L1L=67^g2Yb
zs(>l{Mm8zAXS||)eGx~%$YQVsC1D1$@>uXxHE}aPtE6|u_x5*8lTw>}UD6wUn;{md
zP3c<F5~w3xBu8?@?{FiMYno)t@JKRh>S#ZvARgl76ALe|wHaP9afw%N8Z?7;sPX&!
zj5Nnsm8JQl-_EOk+%>mdzPE4l`8>x)CAy!<#Et6vo*ulI?8o+-rFoPSQq87+uVFg=
z>_}j{l7BV4Hm8m8pNlndeu~p(Z!$N~+$3RPnCc>}7eYT@6C=DSA_K~b#EqYHN7c#H
zQb(NQ0s<1#m#?y#pg$gyvW4M$5U^N`@XUcVLO_|;0VeN7ftQ?0lXE7|)e{*m$fsHH
zrG5<D2Fc!ab|@uDVXgJA)I-GjShptMXw<V#W%C%HK*nEplCi8=sgek4GImt|_~csZ
ze(L7D#)o**JjJB=emrsFoI#fcF0vR#o=?tIM=hTk!{+Z?sGVy8YZ8jEkL#Re9sg&V
zbe`1`cyOw9#TN9p88q|F(lMpS6+Xwj+Gje-%W7N-iwQ&U$O_0bLyJu^oOE2->ZZw@
zoo3<2-Q^^l!?6eF2jCgPvYt&78X1;d?CJOA6&4_BJ@`)xb>6}(uw<5IoF-k~>D$6o
zNkLqlb*>y1l-F<!Y`V}4-I#<BR<tt6?oxw^P}b9Len0_ZD0%|pijJ;BtL<%CHzDVq
zsdGo!>(hf&{cT^=;|_GU*b9xL(M|A4dBWhdzBRnmT1#DvYI*5IO_OFZmxl7SF&%q9
zsIH!tl?Df%uM=o#0QSmVCG|wmC-b;3dxusB;fW2^d!ORsv26~-uoS_#lA1nd<A7hV
zUURtLff#L!-?q=_D50E~_$}EH=%qH<qNZa_+#PEXCLiR?D&bzgthheHr8kyt+9rA6
zkL86z`irY2C68D)p&L3)+Cf-VZ#1u}9~|_z(R59!iKfxApeS&3^}hW6{fYGEPy$aI
zAV8yn7t(A!!dJ_^fXMHu9RB0gDLeCgzxipZosRE^OUsKJT-;kZRsiJ{At&sL&%sv&
z5M@*`!5)}onW6x5R?*RvmUI49wA}<BR_)z8#zmYT-`uJuscEv~2B;tSvs%8}WYXlV
z9GlGU=xZAn?q1n7E|2O+kU1aVl5aJj)pqjZM@U0Fsu3Y;D8&De>!&S;EX?$;IHW+`
z6viGHM<UXTa3;B-$jk5Q19Y(Bki_IQLH=y=WW7Bf0@rtx&M_?X1|3exr@Ij~y9!v+
zmusoWbZI=Ip6dxi3jz%pXiy2C0`+%Ez7*4f;1D^G-x7m?(a;VvnM1~ut~p68IebU#
zbC(fGf!M`iWrwn3=P#5w$<Yxrep8MG^O(fE=BfGdU+)zXUm1l{(64yYv()B|nDgf^
zySHaHR+bJ?+{6fs#3VJuzS5Jd4d4q%Q}5I(ED%}I{^hr1ntm82{yOnkc5-=H?e3@M
z*YzV3j{BNpR11%Bk=KV=>O<76jb2avbLE~5ClWN^v>iEHv+zgU#!%lFW<`~_DLJh}
zl`F{$T#yYcT}(7O)?D*k4j8Ceu_o8K+g*R_gE&iz@>K@WJI?3h<5GL=1)JHJE|9N3
z3J^aAewb#ye8-In2-SuTPA6Ec&e8@^u+n+DMZH3F__?8ncCspVEl<}d5(u8igZmoz
z%?FO8ND9}A9fQR~c*?i~cRlgc64&`L>JLWMBN3Y!ie4mLOmtcWe^yeZEB^RrQU>xR
zqsa7wyec~2>VUi`GBOEcH2X!}vNd?26f<SJCavwuOf{rhP#xh_Y3U(3scx-?9&~9?
z7ys}}h<&j$Wbh5)$>`G9)zkdQB77*;y52IH?R;(`%_NAskH6pJVHMr|S1)cV5jAz$
z*UlS9101F%-EA=^heH2B$f*dd5zq()1^QTKW7~pi$)Lw3xCc(j6Wr?;ujSxw2oF&M
z(nSU<61#iUaB$`{KlgP#m+4%*15;qn*YjddzkGW5$Ni)}Kh<$3H67p$HdDLTi3F#f
zaWE<60Xl%#>-jw2H;9Z}drM)WAgQ<!VBJa?*g1Ai-x_V&?NRfQ4fC4r!;gm~a_)Ww
z5+!I{>VPt26C*SGo9x)28LySR2h!lU{K;B==)24A6N?L~m&_88et?9{Fm6gEe;USm
zgd}E!v17`g5juT;&VeQ*`zL&?LtPa~?y$EyotYRJY0qF`6UUVde5iHP!6BkH>hGNw
z2F%A%Eqh?wUTgXjLusBnRI`ky<`r?ot;wz|U~saU<~`>SOLG+88b<GN^uN~#M&Y|Q
z^eZgmH=K6G!GZ{Pw4LOUkHdT0f3_>}w4q2c<?1$<ZgzKi!w}Ara=~ptA<5*LHTIm8
z<c8YXal)7>)x}00UVR0I?Q*RLB5#j<!LI~+W<)9dC((Q6q{#5dj3@M=vFoqBg~*^P
zhr2H%tOGu@f$8&dH*fzh&&4g!3{bE2%<ILZwyY0zr(WXz_BLxa;Zd^W0oH;&1*A44
z#dkK6V<xkMrY&sxxSos73)%?&PQ%Sp>tI#n{#|<d1~?1qEjyo>!j@dE;$K*qq|g0a
zaa&S3FwcO2qeNEo;m$t`7PRgjrk8F<Y;5_-W^jh<Tn8FTz2fMeM4B%deh-h2@N!_7
z$i2n!qRJd4M8a*So~#at-;{#r#j)tytQ+>&P;S7-ly$qPzf@4!0-f{#kp}K_TA2vx
zbw{3cZq|ex`b{%Ub8I{(q0L8>xt1J&AMs6ERFClUo2Qm<N+i42i`~n%T`nTibfgb&
zHV$@@C!ntJHFce5Z0S$T#hoEtu&+1-!l)YB&FpNBW?t9utQW1mqIbO;JnVY-9|VNd
zaKg=)NNJ2g4NS?28W^<F&snl#LKPjphu}@v%zGe-;PNxk@{uUNF)9Aanj6a%yz04F
zAP`VT!6HK5jQtNJhvg@C=bH$xc26EXZOH!t2hh(_O>Q8c<b4_jbj6bRjMkWHy!WQU
z`?>J-@)bo~pZ>%)m;L>)@_)9&cnMa{ywi$Qne$oUFaU{(K$;#PfwzuuEdj)Pvfdu@
zI|DtaZ06NaZtPu+y2rWA)73q-KYX~V99OuayDdg|#834uXyy<~JmD~XAzp>s)uz!o
z*190lDzgJ}6&s0N+Rdr<L4V3!M7s3i$NjpxzACCen~qb!dN+Wq4>BiCR~t<}!|__T
zp<bLJN|pG;upluyVIr`ZBjQZfbqh0%ZOZZ2S|STruzEtJ<-S_9uS-3_W(%LmP?%S;
zQ!P6${O$6$RI#W3K`^?`Azw8KIXhl{?UYXNK#b6%VF>$b%nJGn05p)aTV6G0=gS6`
zuMakleH-?meuYV5dZyMA=4u(rtpGc<cI$+^2pn2z`$2vn{9vP4#A2i7W9WdsIUJ=_
zO)meQbjcLaJq^?dm=}h9iWddwuMXj5V>LN;kY2v(n|Z1>uB};UWjELa-q8tl8oa_f
zR@Mu`0QJ52Jhi^2rmL4$w@P*Uv%Qe{-n!l>kTh`j$f85nOWwyV+$HFyer`cYIVAYk
zVY|8hC+DY-aQuwdcae3kBixhpJ|cF7i(6Bgv@k)IaLlG8k{%^V8s4^^W{H;l5fNS2
zsT7vi`|Ec7$Yi+H;R_{q;M~lYI$y%D`OCrI!BWv^-1&mjO{yL_@=0QHpgk*#?!XDq
zU9pf*sXGmTj_amQY~0tL1-TI4z&RNk6k#diVDuDayU#D68*Y}hlF2N;Hc#RE#M62f
qmF<xR9ZJXXp%&Qh-5#Br*BjXlmHO*K6741svr(XUrtSRK$NvGWW_phR

literal 0
HcmV?d00001

diff --git a/data/mapdata/map.txt b/data/mapdata/map.txt
index 606c117..801cf61 100644
--- a/data/mapdata/map.txt
+++ b/data/mapdata/map.txt
@@ -1,20 +1,20 @@
-....................
-..wwww..w...w...ww..
-..w......w.w...w..w.
-,,wwww,,,,w,,,,wwww,
-..w......w.w...w..w.
-..wwww..w...w..w..w.
-....................
-.w...w...ww...w..ww.
-.ww.ww..w..w..w..w..
-,w,w,w,,wwww,,w,,ww,
-.w...w..w.....w..w..
-.w...w..w.....ww.ww.
-....................
-..w...w...ww...ww...
-..ww.ww..w..w.w..w..
-,,w,w,w,,wwww,wwww,,
-..w...w..w..w.w.....
-..w...w..w..w.w.....
-....................
-....................
\ No newline at end of file
+xxxxxxxxxxxxxxxxxxxx
+xwwww..w...w...ww..x
+xw......w.w...w..w.x
+xwwww,,,,w,,,,wwww,x
+xw......w.w...w..w.x
+xwwww..w...w..w..w.x
+x..................x
+xw...w...ww...w..wwx
+xww.ww..w..w..w..w.x
+xw,w,w,,wwww,,w,,wwx
+xw...w..w.....w..w.x
+xw...w..w.....ww.wwx
+x..................x
+x.w...w...ww...ww..x
+x.ww.ww..w..w.w..w.x
+x,w,w,w,,wwww,wwww,x
+x.w...w..w..w.w....x
+x.w...w..w..w.w....x
+x..................x
+xxxxxxxxxxxxxxxxxxxx
\ No newline at end of file
diff --git a/src/game/Map.py b/src/game/Map.py
index f0e9a9c..dbc976f 100644
--- a/src/game/Map.py
+++ b/src/game/Map.py
@@ -33,6 +33,10 @@ class Map:
                     self.screen.draw(TerrainTile(col, row, 'floor.png', self.tileSize), Locations.MAP, 0, 0)
                 elif tile == '.':
                     self.screen.draw(TerrainTile(col, row, 'grass.png', self.tileSize), Locations.MAP, 0, 0)
+                elif tile == 'x':
+                    object = TerrainTile(col, row, 'water.jpg', self.tileSize)
+                    self.screen.draw(object, Locations.MAP, 0, 0)
+                    self.collidables.add(object)
 
     def addEntity(self, entity):
         self.screen.draw(entity, Locations.MAP, 0, 0)

From 46d018dbfdd6110b31a818f6b5fbc2e39a253e69 Mon Sep 17 00:00:00 2001
From: Marcin Kostrzewski <komar86311@gmail.com>
Date: Sun, 5 Apr 2020 21:48:55 +0200
Subject: [PATCH 2/3] Fixed wrong spawnpoint coords

---
 src/entities/Player.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/entities/Player.py b/src/entities/Player.py
index ed6f38a..3f33f5b 100644
--- a/src/entities/Player.py
+++ b/src/entities/Player.py
@@ -7,7 +7,7 @@ import pygame
 
 class Player(Entity):
     def __init__(self, spawnpoint, size):
-        super().__init__("player.jpg", size, spawnpoint)
+        super().__init__("player.jpg", size, (spawnpoint[0] * size, spawnpoint[1] * size))
         # Where the player is facing, 0 - north, 1
         self.rotation = Rotations.NORTH
 

From 2f605c291996541d2837c0405abf298776e68062 Mon Sep 17 00:00:00 2001
From: Wirus <wirus006@gmail.com>
Date: Sun, 5 Apr 2020 21:53:10 +0200
Subject: [PATCH 3/3] Game: change player spawnpoint

---
 src/game/Game.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/Game.py b/src/game/Game.py
index 88f4647..b0573ab 100644
--- a/src/game/Game.py
+++ b/src/game/Game.py
@@ -42,7 +42,7 @@ class Game:
 
         self.mapDataFolder = path.dirname("../data/mapdata/")
         self.map = Map(path.join(self.mapDataFolder, 'map.txt'), self.screen)
-        self.player = Player((0, 0), self.map.tileSize)
+        self.player = Player((6, 2), self.map.tileSize)
         self.map.addEntity(self.player)
         self.eventManager = EventManager(self, self.player)