From 19c5bed5fcd260f506b5ababc8b0a6ebffb377e2 Mon Sep 17 00:00:00 2001 From: MasterGordon Date: Wed, 21 Dec 2022 13:49:52 +0100 Subject: [PATCH] updated textures --- Mine2d/assets/blocks/cobalt-ore.png | Bin 0 -> 250 bytes Mine2d/assets/blocks/copper-ore.png | Bin 0 -> 233 bytes Mine2d/assets/blocks/diamond-ore.png | Bin 0 -> 177 bytes Mine2d/assets/blocks/gold-ore.png | Bin 0 -> 156 bytes Mine2d/assets/blocks/iron-ore.png | Bin 0 -> 255 bytes Mine2d/assets/blocks/lead-ore.png | Bin 0 -> 220 bytes Mine2d/assets/blocks/platinum-ore.png | Bin 0 -> 221 bytes Mine2d/assets/blocks/silver-ore.png | Bin 0 -> 241 bytes Mine2d/assets/blocks/tine-ore.png | Bin 0 -> 279 bytes Mine2d/assets/blocks/tungsten-ore.png | Bin 0 -> 199 bytes Mine2d/assets/blocks/uranium-ore.png | Bin 0 -> 242 bytes Mine2d/assets/blocks/zinc-ore.png | Bin 0 -> 161 bytes Mine2d/assets/character/character.aseprite | Bin 0 -> 1541 bytes Mine2d/assets/character/character.png | Bin 0 -> 720 bytes Mine2d/assets/items/diamond.png | Bin 0 -> 217 bytes Mine2d/assets/items/raw-cobalt.png | Bin 0 -> 222 bytes Mine2d/assets/items/raw-copper.png | Bin 0 -> 235 bytes Mine2d/assets/items/raw-gold.png | Bin 0 -> 178 bytes Mine2d/assets/items/raw-iron.png | Bin 0 -> 254 bytes Mine2d/assets/items/raw-lead.png | Bin 0 -> 175 bytes Mine2d/assets/items/raw-platinum.png | Bin 0 -> 194 bytes Mine2d/assets/items/raw-silver.png | Bin 0 -> 170 bytes Mine2d/assets/items/raw-tin.png | Bin 0 -> 249 bytes Mine2d/assets/items/raw-tungsten.png | Bin 0 -> 218 bytes Mine2d/assets/items/raw-uranium.png | Bin 0 -> 248 bytes Mine2d/assets/items/raw-zinc.png | Bin 0 -> 208 bytes Mine2d/game/core/PlayerEntity.cs | 2 -- Mine2d/game/core/world/WorldGenerator.cs | 30 ++++++++++++++++++ .../game/frontend/renderer/PlayerRenderer.cs | 24 +++++++++++--- Mine2d/ores.md | 20 ++++++++++++ 30 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 Mine2d/assets/blocks/cobalt-ore.png create mode 100644 Mine2d/assets/blocks/copper-ore.png create mode 100644 Mine2d/assets/blocks/diamond-ore.png create mode 100644 Mine2d/assets/blocks/gold-ore.png create mode 100644 Mine2d/assets/blocks/iron-ore.png create mode 100644 Mine2d/assets/blocks/lead-ore.png create mode 100644 Mine2d/assets/blocks/platinum-ore.png create mode 100644 Mine2d/assets/blocks/silver-ore.png create mode 100644 Mine2d/assets/blocks/tine-ore.png create mode 100644 Mine2d/assets/blocks/tungsten-ore.png create mode 100644 Mine2d/assets/blocks/uranium-ore.png create mode 100644 Mine2d/assets/blocks/zinc-ore.png create mode 100644 Mine2d/assets/character/character.aseprite create mode 100644 Mine2d/assets/character/character.png create mode 100644 Mine2d/assets/items/diamond.png create mode 100644 Mine2d/assets/items/raw-cobalt.png create mode 100644 Mine2d/assets/items/raw-copper.png create mode 100644 Mine2d/assets/items/raw-gold.png create mode 100644 Mine2d/assets/items/raw-iron.png create mode 100644 Mine2d/assets/items/raw-lead.png create mode 100644 Mine2d/assets/items/raw-platinum.png create mode 100644 Mine2d/assets/items/raw-silver.png create mode 100644 Mine2d/assets/items/raw-tin.png create mode 100644 Mine2d/assets/items/raw-tungsten.png create mode 100644 Mine2d/assets/items/raw-uranium.png create mode 100644 Mine2d/assets/items/raw-zinc.png create mode 100644 Mine2d/game/core/world/WorldGenerator.cs create mode 100644 Mine2d/ores.md diff --git a/Mine2d/assets/blocks/cobalt-ore.png b/Mine2d/assets/blocks/cobalt-ore.png new file mode 100644 index 0000000000000000000000000000000000000000..f9c71be0edec11c171cb8831fa72afccb5e5562b GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|ws^WYhFJ6_ zCrD%*;7Im3{{H{}FGr=>+U73okyv#n{QvZ60*MvB9`Q0Ce%{W*v**)|tA;z)|2v;> z^|So)(jQMwutv;jd?KYW0i#&Dg^&FT2AuPE*5H}wdUTTasnvz?y}jglrii>pgBFgTZ$ V#4ir0*#NYb!PC{xWt~$(69ABRMT!6b literal 0 HcmV?d00001 diff --git a/Mine2d/assets/blocks/gold-ore.png b/Mine2d/assets/blocks/gold-ore.png new file mode 100644 index 0000000000000000000000000000000000000000..6ead1411b8688fddbeb49dd0d7fe3f4ac93121a2 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|!aQ9ZLo9le z6Be-jsGs}r|L(~=|5qkO?CjPx#xk*GpR5*>zQacWVFbp-NQtrc?d-xQY8Q>aRfC2Qbm6?sn5|TR+Ic=b2Xw^3* zj^8Ivi2eqx_XI%4anvik+rDT*P!XXR<6$!Z1&|pe0cNh=k%@>zB&*-;rtkaeEUt*q zx~}Cbl-z9GogC*mGbuVw)1=$Bk#mli`7~8ZV5eW#^+)92p!9SWFGB>Nt@l|?L}(ZW zwLL`v0JDI04*LGT>b9f#RCrqYE?&^tr!3R002ovPDHLk FV1nwXWnusT literal 0 HcmV?d00001 diff --git a/Mine2d/assets/blocks/lead-ore.png b/Mine2d/assets/blocks/lead-ore.png new file mode 100644 index 0000000000000000000000000000000000000000..c2a9fe7416a9f7af362f115f456f91d5a5d9426a GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|rg^$JhFJ8j zow!l(hyo7_f0n{hy{LsOOhKXxSBXqm#V&Jj&);8?dvjAc-sMefFz=rEeE+Np(P*_Z zHqqJ3ewt}4Wnl=oy546=ZZzuOFJ@VwVko)%&41JfA(=*SK!60Wm6QCHmKE` z^34W3 zOHT@{U9$gL5{acvhe*f*1#vhJf4@c;{Zd;dofj`;N?}yACKK0-# VmBW8t%>X))!PC{xWt~$(69BDpTCe~B literal 0 HcmV?d00001 diff --git a/Mine2d/assets/blocks/silver-ore.png b/Mine2d/assets/blocks/silver-ore.png new file mode 100644 index 0000000000000000000000000000000000000000..35f07ba863c770fdaaa7829c48ad00f116ea297c GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|R(rZQhFJ8T z4Kn0oR^%~W;jQwlnt%O+iF=y9w@g%gT*}489<$y%R9~PVM~LYUtCwcF=F>gz%44MW zGc?Sc7*rIlWc=8IkHMkm;!W#b+Xla&(zLdD?E=ffJ3Q`Jug(*m8j?NtNN0vlBCAqU z2Tuw^@XET<%=s(UZDWsSe4Q8m_F^*Q>$2zn1TCN6p7}#+wc_o6hqNMHE<{P6TmJI$ n`s%3f7mi3QR$gQmV1H0LkR@ZSwPTD9(Af;0u6{1-oD!M<0gziv literal 0 HcmV?d00001 diff --git a/Mine2d/assets/blocks/tine-ore.png b/Mine2d/assets/blocks/tine-ore.png new file mode 100644 index 0000000000000000000000000000000000000000..f317747fbe07f49458301eda355fab876c052e8a GIT binary patch literal 279 zcmV+y0qFjTP)Px#(Md!>R5*>bQY#XJFc5vz5L@4)L~;u}4i$l2nF=mY-&-ItoQ0VpGMNFjRp}%U zLfdJd%r+v%-_7O&->zFMmEy}VWK&UaE(9Lq zhaAZ-W dhDqYLcmkH%fnyn23;O^7002ovPDHLkV1nbnao_*| literal 0 HcmV?d00001 diff --git a/Mine2d/assets/blocks/tungsten-ore.png b/Mine2d/assets/blocks/tungsten-ore.png new file mode 100644 index 0000000000000000000000000000000000000000..2c09c51188b732ebb3d328e380774407d7775461 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|8a-VcLo9mN z2HxgnP~^CLTKAa{-$^0a70w0mF&z7Ze{OEw=HzA0-N1A~QhwuempM;vs0b}qVF+>g zckj(?Z_P@RoH-xA)$yv_+%eH->ou7|{j&XG(=CJq1$%#N^T@xEzyI|vFVoU3H>?e7 x&kHkJKljq8+sL@M!GHT+ANvctPfh*Bu=UQ2nhWLsm4S|7@O1TaS?83{1OQ{&OY8su literal 0 HcmV?d00001 diff --git a/Mine2d/assets/blocks/uranium-ore.png b/Mine2d/assets/blocks/uranium-ore.png new file mode 100644 index 0000000000000000000000000000000000000000..27eef8a2d1419e6bbaee9c3b0a984327bc2b6a24 GIT binary patch literal 242 zcmVPx#tVu*cR5*>@kueU!Fc1U>jF2L^jO0}L2alkj%>!vEc!ZyUM8!$zNNbrQvO{7! z(85+%?C$N}!Jot8vG_I0rYKy%JPdM@gug90o4Wx(^$GxK1amQoacW@ks#i!W0Jz#k zvmCMsT=v->by!M>o?H szmOAG&+7XG0s5@t(S~mL$p1mS0Fyj9x~N>1x&QzG07*qoM6N<$f(+?nxc~qF literal 0 HcmV?d00001 diff --git a/Mine2d/assets/blocks/zinc-ore.png b/Mine2d/assets/blocks/zinc-ore.png new file mode 100644 index 0000000000000000000000000000000000000000..7d791822c123b38b6994671f4a3ce4ccb81c0949 GIT binary patch literal 161 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|qCH(4Lo9mF zPP!|2z=5SDcJHg3O54nBPh=k}w4ZrL<-V|3v*IUjkE*AWzpUVAWr&@#g!#qnB?nU$ zz1IvsA(UPgxnc3##LDy6XHT22_ER=Wgrjo;poTg}maTr4fN@DWm4t8EaqA0?l zf`Dcafo75f0-__jYb$37Y7p)6JdIKI<#0U zFh4&Z78De~!oosWTwDxGOG{y8WhJbxu7-7Wb+DnK0k*ZZL95jYhlYmW=;$c4F@(t5 zy&WDuu^+act${9b0e!sPVBmZY7_#75sPUf-!(Q})OV!UoLx}W7QH$rnb@~M`Hew+R z^m2hqeWbTG1}NYZoSHa9>(%J}vl*a4EMKC%h9L6O?Kyylz#MGs5 zdzO^X3+w#gOYs5F@gwOu7uT$YzNe+%r}+Cri&_oy?Aaa(4Q2kNUJpAWBVlif6SS2D z!lq1V?ZuoJ*k2eAt*51IfB)tv>>GR;R#mTuU!P5YUENz?SXc^NzC0U7MM*~1tT_NT zZ1@ze%o~6aSEOvc?nx}YCGoUw`ojb|id z7`?bfELKs9Ph?^ejW|Rg_E3j6q+twQxIz?`Bt>O`$iWO+aDotQpaKs_zyR@+J;9SY zk&`!JlQc1tF#(e<(UPka>RJPTOO|{kMIt0W!c!8Nqsn30jzxlS5-St3H>atB_mHYw zB?y-t!6yHAJT1IM*0IAS9Z?R;X6iE+;ru2Wtf4^`KGOh4H-HJP^Yw_hjC^|!RvyN@g% zR+QA=)IL$-01gA)U*+_J5vF}Z_2t3j{*BxZ+2pBB5L?foSaGryYX d9)DE+PP4M>Lf5I5GtCcFkv&uAWlDp$>>oOXH8KDI literal 0 HcmV?d00001 diff --git a/Mine2d/assets/character/character.png b/Mine2d/assets/character/character.png new file mode 100644 index 0000000000000000000000000000000000000000..0a4900d57a465ac14a76645ded9c6ae8ed1943b0 GIT binary patch literal 720 zcmV;>0x$iEP)Px%ib+I4R7i>KmCb7tK^TXhw7bc6L%K^!(>6sLOHKicN)IB`mg2bw4<5vGFP_w1 zyjVSmmr759wB8i|46*hiSVRzdQT(Woen4Wvy2~W9c0Gh0GWjTiSAVCO_v3lrd1sb| z|N3VoIt>fOY;;n>>(5m!N82nEv(ahSQv0z?iiT|QYN83iUQK9_L}#*VCHq!SnF$WP zh6WjE4~UafW#H|0?M$m;&ea0TM>Pez_25bG8JKp4e9k4GbD3IPR`#jIWo3^G#L@um zRlmR5=(+CfOnV0xOB0c08rYV>i?zF2;Ek0>1R_Mpkhi=0-S40s0AO1N+wZ>uFn8e$ zfd~Ok2K0i&iMC}>^@Nt(J%icts9qZ8%C)Nq8B+BGLblqzw6sLMG)#VWTzd#cd$Ln- zFzl8|&X3XbC1DU^*an{GW7q~x!2yWMI|tp@Xpau5b<>xv3bsKqZIa2PyJ8d|uHN(| z$+W4QVGxo`n+g`Mor0r|qICeU|Ly?K^Hufu7_qNY3SiiV3XI!LrcG@Iy`+X12a2D9 z_0287y6n_t;Oihx1W>J0A&07wzwSN7E2 z9BOsYOFaSopnt8I>Cvb->8h`;IO#?+)1y8ASbqR~F(9h~Ge&a&0000e;!svmvt9i03*%k1k~`wen#kAlwJ*|x$A P=sX5bS3j3^P6yH@mw$&>BNOb?uA*t7Vss(*H?LSX4eHk*9a)ic@@ zHd-(~__adewlxFCdZwG*8+m6`9sU`lu)*cf`8)Q`rM#=HPNcs+Hs$*#`Px#rAb6VR5*?8kUb89Koo>O*v*WpDrh literal 0 HcmV?d00001 diff --git a/Mine2d/assets/items/raw-gold.png b/Mine2d/assets/items/raw-gold.png new file mode 100644 index 0000000000000000000000000000000000000000..cf1c62ce6a96b851ec3ca17e99d5b40485694d6a GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|ay(reLo9mV zPSECSFc4r}zJ!VSVA2PVck{nUT|KJc&9tZ~B~ZZSXX^v2Pfy>blq-JZKbIlcZS!(f zM1@RP?w-vPj~>ztVffPQrZfGv3u~(RD$Nj+ubWQCaWd?gX~Px#xJg7oR5*?8ku45`KoCYB)dV%FqK825H3&hYH%QJ)x z$kLRzbEql+B0^b~$w4p-gO7o+IOnMAI!G=+ur8g}aF(Xwtg1NY==(l2+>Fy2LvF2K z10sT|GS4$j(;Sw5`U~rwOw$yFqk_HYS`_{a{^v{i0L_FNhWiun`ft?2sUG4+=8dm+tEUG)Rc?2FF1U1C^pP4M`N zpCTSj#qZ`Fm5}yLcetdY*wPSmDrAR`L6tDa`*)%>mZ` XceFyhvjcttEoJa@^>bP0l+XkK6SY5J literal 0 HcmV?d00001 diff --git a/Mine2d/assets/items/raw-platinum.png b/Mine2d/assets/items/raw-platinum.png new file mode 100644 index 0000000000000000000000000000000000000000..e4739463c5d02cfe23fda60ea8874e155a232802 GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|YCK&WLo9mV zPPFA~P!MTeUHCy=&rPlOyFFjJfmLQq&w;kf#v1$|8S0W3F4a8XKc!OY?d{56B1@)B z>q$}TRsQ*D)kUt#z(udw-|thOa5JOzuK@$YMYA=M3`Tx2*LX{(I&bk^VR^qnIwx|w rw#Jo5hh$IlE_O_||77{+`8m!KRi_>m{oZJxI~Y7&{an^LB{Ts5I7dg~ literal 0 HcmV?d00001 diff --git a/Mine2d/assets/items/raw-silver.png b/Mine2d/assets/items/raw-silver.png new file mode 100644 index 0000000000000000000000000000000000000000..9713e9b674393655485ea71119f963a1d8d5fd74 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|QaoK8Lo9mV z_HX1ppuoe@@1b||B=-h2?hOpqJ4+mQaj0sjOuSUM^y`1C!;j*#*5*#*EO#w;cL}(f z$d_O(@1@Cm;Ece;l_ygbmWnVW_3Zflr12m_!>YD>2hQ+qzW!v+eo^uBHyKNPRRjg1 St~mqkWAJqKb6Mw<&;$Tl06Y=^ literal 0 HcmV?d00001 diff --git a/Mine2d/assets/items/raw-tin.png b/Mine2d/assets/items/raw-tin.png new file mode 100644 index 0000000000000000000000000000000000000000..4789d0d382cbcd2f79f45b9109394bdc81859468 GIT binary patch literal 249 zcmVPx#vq?ljR5*>@k~LFOH~vvzy8BD5mZPBH+; zVJHgsWhs=jBE_OjQY>`VzL3+n=EYYYM0nN02a^WN)2z5TukD%$a7`Mb>^QWc?v=?C zUKOvpDX=00RRVCE=Y0=S^vb|I_QgHZcwv?slb5V0T)1-|b8Te0iph$n;bDz=RlBk+inC^1JQ=IQU!-tphQexv zUe5J=uSL14WjGiv_#WJGd{bBU`xw;&5|M%o4Suh#WH+s;S&{mp#42NA1v~qW3ni=U vCrs>HlJCbpBPm?ZQ{>mf-kL&>{l}Rd>%#VIJ!SnD=z0cES3j3^P6-P?NH)kZKF+~5EudQE^=&l?t`dJL settings = new (); + + public WorldGenerator() { + this.settings.Add(new GenerationSettings { + xOffset = 50, + yOffset = 16, + tile = Tiles.Stone + }); + } +} \ No newline at end of file diff --git a/Mine2d/game/frontend/renderer/PlayerRenderer.cs b/Mine2d/game/frontend/renderer/PlayerRenderer.cs index 2f8209d..49018cf 100644 --- a/Mine2d/game/frontend/renderer/PlayerRenderer.cs +++ b/Mine2d/game/frontend/renderer/PlayerRenderer.cs @@ -4,11 +4,18 @@ namespace Mine2d.game.frontend.renderer; public class PlayerRenderer : IRenderer { + private IntPtr playerTexture; + public void Render() { + if(this.playerTexture == IntPtr.Zero) + { + this.playerTexture = Context.Get().TextureFactory.LoadTexture("character.character"); + } var ctx = Context.Get(); var camera = ctx.FrontendGameState.Camera; var scale = ctx.FrontendGameState.Settings.GameScale; + var (width, height) = ctx.Window.GetSize(); foreach (var player in ctx.GameState.Players) { if (player.Name == ctx.FrontendGameState.PlayerName) @@ -20,11 +27,18 @@ public class PlayerRenderer : IRenderer ctx.Renderer.SetColor(255, 0, 0); } - ctx.Renderer.DrawRect( - (player.Position.X - (int)camera.Position.X) * scale, - (player.Position.Y - (int)camera.Position.Y) * scale - 28 * scale, - 14 * scale, - 28 * scale + // ctx.Renderer.DrawRect( + // (player.Position.X - (int)camera.Position.X) * scale, + // (player.Position.Y - (int)camera.Position.Y) * scale - 28 * scale, + // 14 * scale, + // 28 * scale + // ); + ctx.Renderer.DrawTexture( + this.playerTexture, + width / 2, + (height / 2) - (31 * scale), + 16 * scale, + 32 * scale ); } } diff --git a/Mine2d/ores.md b/Mine2d/ores.md new file mode 100644 index 0000000..e9f7076 --- /dev/null +++ b/Mine2d/ores.md @@ -0,0 +1,20 @@ +- Iron ore: #A9A9A9 +- Copper ore: #B87333 +- Tin ore: #668080 +- Silver ore: #C0C0C0 +- Gold ore: #FFD700 +- Lead ore: #A9A9A9 +- Nickel ore: #A8A8A8 +- Platinum ore: #E5E4E2 +- Cobalt ore: #0047AB +- Zinc ore: #A9A9A9 +- Tungsten ore: #BFBFBF +- Uranium ore: #00FF00 +- Diamond ore: #B9F2FF +- Emerald ore: #50C878 +- Ruby ore: #E0115F +- Mythril ore: #C5C9C7 +- Adamantine ore: #B5A642 +- Orichalcum ore: #90713D +- Celestite ore: #5DADE2 +- Aetherium ore: #00FFFF \ No newline at end of file