From c0b2f944dcc9b9b48cc4e6add7d5c7ff86d53890 Mon Sep 17 00:00:00 2001 From: Anonymus Raccoon Date: Thu, 30 Apr 2020 18:27:05 +0200 Subject: [PATCH] Adding a farmer and the mayor --- assets/sprites/npc/farmer1.png | Bin 0 -> 3981 bytes assets/sprites/npc/mayor.png | Bin 0 -> 1571 bytes lib/gamacon | 2 +- prefabs/game.gcprefab | 54 ++++++++++++++++++++++++--------- 4 files changed, 41 insertions(+), 15 deletions(-) create mode 100644 assets/sprites/npc/farmer1.png create mode 100644 assets/sprites/npc/mayor.png diff --git a/assets/sprites/npc/farmer1.png b/assets/sprites/npc/farmer1.png new file mode 100644 index 0000000000000000000000000000000000000000..4dbc580a04961cfc6ad195c1350fe82d2a551bfd GIT binary patch literal 3981 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 literal 0 HcmV?d00001 diff --git a/assets/sprites/npc/mayor.png b/assets/sprites/npc/mayor.png new file mode 100644 index 0000000000000000000000000000000000000000..6277addd186e171639aaccf50e20fddf925709c8 GIT binary patch literal 1571 zcma)+|3A}v6vy8mv&np!sWG&Nm~dTXw{j6O+H8~Wkx|Q54e9$AQrZlub;%?xMN)2s z+@*W-rO70ZyF}49O{2({mg@@hWw#BxyZ^yGkH_mgAFuN`kH`7toO3=rlwyLkMgjm# zXjD?9j#Qm^%V4^EgFjHC19U8s5&(U8?wX-9hKH%K#{e)|{+}RltrV*(riTYdk#!uB z0rPHWM&}ctcPv1gFe_uCK@jXcb{hGPh5a8tKWl+WPB%AcT;|*%c)?Ef z*e)FsR40X_D!7fap7pAiGwD%f&p6RU#IJPI%j~g24yM53e)jR_64UnAcVdKY=C44K z`eZso zZq4qTE3Jyu7lExW`&hPoudVDonLn1hB$5W#$STd-td)Os6Xa0=9I!POr+pB^$G)3+Xwgeo7$cF}dBSQ5+{X3kxQaEN`!F97o^=sQC zR(BfmsS~3+dporv_hR5Yo+>|k%_Jk(Xe@SaH!k^a#iFR;GmKf1Ae~$Z?N39YUnh_b zct#AoHDH#;J3;mI1Rv7FF^vfx89bcOsV3$v9&E|&!>JkPVrvSRR|!YFY4fP`Oujri z$96xDU4=6{H_Y-v3(2?Mem~uh>%~MgRp%>a&NE)Koa!zu4{Ge%qWLoQ$5K4UGo$En zkL_Mis`LyuN{Ekw;8S-ea(CV2A*k!IIZx9ET>E5Dtsz+)SNGWM+c?i>X0N7^6X#qG zQ`YS5J2a3ZX}k|bDpMuoM`Vo)n7{43tr1g7v3Lb6HA6!c0Ru7+CGA}&S>7FvEm^%bsl<1qsT|wYJ0l&m-P4@Vprt7_Q8LxvrdEv0zMta4@ zB`o@)YMZ#6Re624=&b(XMPWw1d2WjL)E0Y7yJGY*V+->vs}K6|cyx~8q^fzaBr4;0 zZe<0{r&m?-pietk@A%lG6){n}atA$lcIw!`1liGgdM%oEsco92-Dl8^k6m+-|DuSn z5!cmy7l+ASnU6hUA9p!WEc0sKHyb-yg;EHXwsT2dP!2qI1`jVlj1T4JX&lK!M0km5 z!jV--XE4iR$a{VnrHFaP?Tf?p2O0#M;vLGNc6h7Uhok*6yg)^V0|KtAAuQ~-6GylX zMoGZ<4Z@?%!_}`)-&C>;_6mB|R2oL($bP==N;Pm~p6>Af%CFS;IvPc0-d z?#lwW4#*u)w3qLa+k>!|GZi;$NSRx>D?r-@zv{cBxeb2SJJpfgsF{UIssHx(D-2e< zcM6irY+G%b!O%h_a@zFU%5K5arGAQ7xI+cXqyBEH?k&?Ny3$9-%NijXsSG^rN1ZU4}R*6fjqlp>_0Vf2?9HqNU{$h!opil=RR4( zJDE*f_iFuWyfM>~d1{aSm?J##tzqUR_fOmXZ{ovt-(F}h)Pp@a<{5(usMQa{j}*{s zm3Y%t-u5T?BGh+ut~d)-xa)>rm4N7=@b`6ZYCxY~a!#xIh-#Ic`G@)sp83ee!*>R+ zxiLjCk0|E*XhN|$Lagm`l3lX8E`yKj8T+26^NheeKC)u-$i7ck&>>DOP%-~*vGqtd QUH41@jT}l61u(Pz1#HUUa{vGU literal 0 HcmV?d00001 diff --git a/lib/gamacon b/lib/gamacon index ebfdd0b..c9e7795 160000 --- a/lib/gamacon +++ b/lib/gamacon @@ -1 +1 @@ -Subproject commit ebfdd0b4e979c8d2f56856e90597f04806569921 +Subproject commit c9e77951c86e0bf921d22eae39f1e6f5a2a86164 diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab index 0b4f8dd..e2a4cc7 100644 --- a/prefabs/game.gcprefab +++ b/prefabs/game.gcprefab @@ -138,9 +138,12 @@ - - + + + + + @@ -168,23 +171,46 @@ - + - - + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +