From c9142a948121554af9b72b1142ef975fa8cd35a4 Mon Sep 17 00:00:00 2001 From: Imaginos16 <77556824+Imaginos16@users.noreply.github.com> Date: Mon, 28 Aug 2023 19:26:56 -0300 Subject: [PATCH 1/5] HELL --- Blocktest/Code/Blocks/WhiteSand.cs | 13 +++++++++++++ Blocktest/Code/Scenes/GameScene.cs | 7 +++++++ Blocktest/Content/Graphics/Blocks/whitesand.png | Bin 0 -> 372 bytes 3 files changed, 20 insertions(+) create mode 100644 Blocktest/Code/Blocks/WhiteSand.cs create mode 100644 Blocktest/Content/Graphics/Blocks/whitesand.png diff --git a/Blocktest/Code/Blocks/WhiteSand.cs b/Blocktest/Code/Blocks/WhiteSand.cs new file mode 100644 index 0000000..85eeb1e --- /dev/null +++ b/Blocktest/Code/Blocks/WhiteSand.cs @@ -0,0 +1,13 @@ +namespace Blocktest.Blocks +{ + public class WhiteSand : Block + { + public override void Initialize() + { + blockName = "White Sand"; + blockID = 16; + blockSmoothing = true; + base.Initialize(); + } + } +} \ No newline at end of file diff --git a/Blocktest/Code/Scenes/GameScene.cs b/Blocktest/Code/Scenes/GameScene.cs index fc80263..d880251 100644 --- a/Blocktest/Code/Scenes/GameScene.cs +++ b/Blocktest/Code/Scenes/GameScene.cs @@ -81,6 +81,13 @@ public void Draw(GameTime gameTime, GraphicsDevice graphicsDevice) { _spriteBatch.Begin(); Globals.BackgroundTilemap.Draw(_spriteBatch); Globals.ForegroundTilemap.Draw(_spriteBatch); + // placement preview + if (buildMode) + _spriteBatch.Draw(BlockManager.AllBlocks[blockSelected].blockSprite.Texture, + new Vector2Int(Mouse.GetState().X - (Mouse.GetState().X % 8), + (Mouse.GetState().Y - Mouse.GetState().Y % 8)), + new Rectangle(1, 1, 10, 10), Color.DimGray); + _spriteBatch.End(); } diff --git a/Blocktest/Content/Graphics/Blocks/whitesand.png b/Blocktest/Content/Graphics/Blocks/whitesand.png new file mode 100644 index 0000000000000000000000000000000000000000..b8f41c765308c7d8cd3b32a2c7e377f838a8d49c GIT binary patch literal 372 zcmV-)0gL{LP)Px$E=fc|RA_`u3$>c*(Y?%Cr&H)D& zUosHdmkhA@(hCWnKzgB2=fEq`VBgy?`JF!po_?VwF)MORraz4(4(+FKXe*stViw;! z1HK!7+wXh^_|(0=DLa7TKfK->WMZRdQg SA*!wb0000 Date: Mon, 28 Aug 2023 20:09:57 -0300 Subject: [PATCH 2/5] nice --- Blocktest/Content/Graphics/Blocks/whitesand.png | Bin 372 -> 402 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Blocktest/Content/Graphics/Blocks/whitesand.png b/Blocktest/Content/Graphics/Blocks/whitesand.png index b8f41c765308c7d8cd3b32a2c7e377f838a8d49c..90206f9e917ca300a6759cf9498b6cbd9d93de38 100644 GIT binary patch delta 362 zcmV-w0hRvr0+IueF@H=+L_t(&f$f+(YQsPjMX!Qdc>!q!A!^b%WvaAUfGgE1vWhH2 zsC40F7*eN7V-s+j1=tH1S5M4OwlIOYirxjmFmog^KjtvNf6BJ&%(m-{U&s9YObW;2 zulf1jwh+5<8!Gv?G9M3-U84c z1vdUp3YXxbDj}o8#yfjJAOL+YWePX%AI?u$_+Sr6hSnY%@9cpXbZLz;@O=mTHD`lG zRRW)1PCFZqwr-4Fmd9_qmDkK7>O#yeWQU2Lj|=%>;YYhiY>hJT>O!gc@h;?rjaL`a z{6*A-Qn?V|o?~*??roU($-7XX5;3@_N<6>3MvwZ`d>(^<&^`PqX5oW9Ai3t@Ec}dI zNbiL-Gl;qnvkUoQ;V17xlfM@l?LtFI&8rKg=Jj4^EUy{J8MI63J|m!m_W%F@07*qo IM6N<$g5^-KmH+?% delta 332 zcmV-S0ki&+1M~urF@G*eL_t(&f$f;Fs=_c7hW|p>`T(v4v5Sk2PIvVIoH|MdpTfr| z9UXiO;m%HXQ3O{XKp!AZkr-PEBIfVS`JfPzuYq#rR}kK+_iUoAqu1y zV(x`(nEZ&&0S6XeG7#FA46yjp3kjb_|(0=DL ea7TKfK->WMZRdQgA*!wb0000 Date: Mon, 28 Aug 2023 20:17:10 -0300 Subject: [PATCH 3/5] tweak --- Blocktest/Content/Graphics/Blocks/whitesand.png | Bin 402 -> 409 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Blocktest/Content/Graphics/Blocks/whitesand.png b/Blocktest/Content/Graphics/Blocks/whitesand.png index 90206f9e917ca300a6759cf9498b6cbd9d93de38..c629cc2a7d5e6845b6cbc7657e0da2336dbc97f5 100644 GIT binary patch delta 369 zcmV-%0gnEX1DOMmF@IA@L_t(&f$f+*PQx%5hTl|K(*v+ZLS$iqk%^T9bjqB8Q*ewZ zBLm_9%$1nw!ctVJD+g!~U?xZQ=llsF`3?DADUxMBN#xj$9~t;h**1;YHjR;W%+F73 z;dJ^ohtDsZ_s6y|D{@?3UjYEt>x;y_k%dnIpf0Nxb|E))S$~=8xlY*l)K;ALN8D^4 z0#JShHhyIbLvU8)uwRFb_trpHFYOS%JU)3ZVc~-{VAD7E*m!RZbU{ONl!0$MAm^MM zHoSj$?QA^ivNCSjUb5}Cyk-$m7h-lHH%$C;Tu6q6pX?r8bCiKs7mCeKcOelrUR_A@ z7f~0A0{K-7hpT}Xz7pS=ss{#+;xD1@8F*pSEM)rDg7dM-4T*YxBEB@63VAu{c7 P00000NkvXXu0mjfX1}fK delta 362 zcmV-w0hRul1Cj%fF@H=+L_t(&f$f+(YQsPjMX!Qdc>!q!A!^b%WvaAUfGgE1vWhH2 zsC40F7*eN7V-s+j1=tH1S5M4OwlIOYirxjmFmog^KjtvNf6BJ&%(m-{U&s9YObW;2 zulf1jwh+5<8!Gv?G9M3-U84c z1vdUp3YXxbDj}o8#yfjJAOL+YWePX%AI?u$_+Sr6hSnY%@9cpXbZLz;@O=mTHD`lG zRRW)1PCFZqwr-4Fmd9_qmDkK7>O#yeWQU2Lj|=%>;YYhiY>hJT>O!gc@h;?rjaL`a z{6*A-Qn?V|o?~*??roU($-7XX5;3@_N<6>3MvwZ`d>(^<&^`PqX5oW9Ai3t@Ec}dI zNbiL-Gl;qnvkUoQ;V17xlfM@l?LtFI&8rKg=Jj4^EUy{J8MI63J|m!m_W%F@07*qo IM6N<$f@TY_JOBUy From 97a8fc244b717c111c86169d6bdb9437057b8fad Mon Sep 17 00:00:00 2001 From: Imaginos16 <77556824+Imaginos16@users.noreply.github.com> Date: Sat, 9 Sep 2023 16:46:08 -0300 Subject: [PATCH 4/5] BOOYEA --- Blocktest/Code/Blocks/HardenedWhiteSand.cs | 13 +++++++++++++ Blocktest/Code/Blocks/PuceStone.cs | 13 +++++++++++++ Blocktest/Code/Blocks/PucestoneSlab.cs | 13 +++++++++++++ Blocktest/Code/Blocks/PurpleGrass.cs | 13 +++++++++++++ Blocktest/Code/Blocks/Salt.cs | 13 +++++++++++++ Blocktest/Code/Blocks/WhiteSandstoneBrick.cs | 13 +++++++++++++ .../Content/Graphics/Blocks/hardenedwhitesand.png | Bin 0 -> 501 bytes Blocktest/Content/Graphics/Blocks/pucestone.png | Bin 0 -> 436 bytes .../Content/Graphics/Blocks/pucestoneslab.png | Bin 0 -> 579 bytes Blocktest/Content/Graphics/Blocks/purplegrass.png | Bin 0 -> 555 bytes Blocktest/Content/Graphics/Blocks/salt.png | Bin 0 -> 522 bytes .../Graphics/Blocks/whitesandstonebrick.png | Bin 0 -> 891 bytes 12 files changed, 78 insertions(+) create mode 100644 Blocktest/Code/Blocks/HardenedWhiteSand.cs create mode 100644 Blocktest/Code/Blocks/PuceStone.cs create mode 100644 Blocktest/Code/Blocks/PucestoneSlab.cs create mode 100644 Blocktest/Code/Blocks/PurpleGrass.cs create mode 100644 Blocktest/Code/Blocks/Salt.cs create mode 100644 Blocktest/Code/Blocks/WhiteSandstoneBrick.cs create mode 100644 Blocktest/Content/Graphics/Blocks/hardenedwhitesand.png create mode 100644 Blocktest/Content/Graphics/Blocks/pucestone.png create mode 100644 Blocktest/Content/Graphics/Blocks/pucestoneslab.png create mode 100644 Blocktest/Content/Graphics/Blocks/purplegrass.png create mode 100644 Blocktest/Content/Graphics/Blocks/salt.png create mode 100644 Blocktest/Content/Graphics/Blocks/whitesandstonebrick.png diff --git a/Blocktest/Code/Blocks/HardenedWhiteSand.cs b/Blocktest/Code/Blocks/HardenedWhiteSand.cs new file mode 100644 index 0000000..83e4ee3 --- /dev/null +++ b/Blocktest/Code/Blocks/HardenedWhiteSand.cs @@ -0,0 +1,13 @@ +namespace Blocktest.Blocks +{ + public class HardenedWhiteSand : Block + { + public override void Initialize() + { + blockName = "Hardened White Sand"; + blockID = 18; + blockSmoothing = true; + base.Initialize(); + } + } +} \ No newline at end of file diff --git a/Blocktest/Code/Blocks/PuceStone.cs b/Blocktest/Code/Blocks/PuceStone.cs new file mode 100644 index 0000000..9dc31e2 --- /dev/null +++ b/Blocktest/Code/Blocks/PuceStone.cs @@ -0,0 +1,13 @@ +namespace Blocktest.Blocks +{ + public class Pucestone : Block + { + public override void Initialize() + { + blockName = "Pucestone"; + blockID = 19; + blockSmoothing = true; + base.Initialize(); + } + } +} \ No newline at end of file diff --git a/Blocktest/Code/Blocks/PucestoneSlab.cs b/Blocktest/Code/Blocks/PucestoneSlab.cs new file mode 100644 index 0000000..6109971 --- /dev/null +++ b/Blocktest/Code/Blocks/PucestoneSlab.cs @@ -0,0 +1,13 @@ +namespace Blocktest.Blocks +{ + public class PucestoneSlab : Block + { + public override void Initialize() + { + blockName = "Pucestone Slab"; + blockID = 22; + blockSmoothing = true; + base.Initialize(); + } + } +} \ No newline at end of file diff --git a/Blocktest/Code/Blocks/PurpleGrass.cs b/Blocktest/Code/Blocks/PurpleGrass.cs new file mode 100644 index 0000000..b13e314 --- /dev/null +++ b/Blocktest/Code/Blocks/PurpleGrass.cs @@ -0,0 +1,13 @@ +namespace Blocktest.Blocks +{ + public class PurpleGrass : Block + { + public override void Initialize() + { + blockName = "Purple Grass"; + blockID = 17; + blockSmoothing = true; + base.Initialize(); + } + } +} \ No newline at end of file diff --git a/Blocktest/Code/Blocks/Salt.cs b/Blocktest/Code/Blocks/Salt.cs new file mode 100644 index 0000000..1494262 --- /dev/null +++ b/Blocktest/Code/Blocks/Salt.cs @@ -0,0 +1,13 @@ +namespace Blocktest.Blocks +{ + public class Salt : Block + { + public override void Initialize() + { + blockName = "Salt"; + blockID = 20; + blockSmoothing = true; + base.Initialize(); + } + } +} \ No newline at end of file diff --git a/Blocktest/Code/Blocks/WhiteSandstoneBrick.cs b/Blocktest/Code/Blocks/WhiteSandstoneBrick.cs new file mode 100644 index 0000000..e3c20fd --- /dev/null +++ b/Blocktest/Code/Blocks/WhiteSandstoneBrick.cs @@ -0,0 +1,13 @@ +namespace Blocktest.Blocks +{ + public class WhiteSandstoneBrick : Block + { + public override void Initialize() + { + blockName = "White Sandstone Brick"; + blockID = 21; + blockSmoothing = true; + base.Initialize(); + } + } +} \ No newline at end of file diff --git a/Blocktest/Content/Graphics/Blocks/hardenedwhitesand.png b/Blocktest/Content/Graphics/Blocks/hardenedwhitesand.png new file mode 100644 index 0000000000000000000000000000000000000000..a8625e9e9c3f40b00e4b9e0a02cb08e46ac419df GIT binary patch literal 501 zcmVPx$uSrBfRA_8sI-^RTTZID0=f6=lf6SVEy{s z13;CRNEX=uoLyc`_RqQS4glmgi#~`$1aXL9K2uOvx9I8?#L#t4yhDS{W(xrDA|F*= zqN`hYk&h%x5yau(4RGNdGl*uLWGTA3#nbIQn#~rA$9w`q9C!zS7ECj5HrtQcelFqu z5_95J4$!w{z5y@tVUBU))h9$tROKbS$kzgsEFIj83$G<{lBKwQxYM$o#!PYJ2W5;l zbL_Xg=qw~&$O7*IU)}=%I>UPa7?d$iyh{i4+a~W3%xCZ-f7GXN;t%#hKRv`If3O$Y z7bjl4kZoSP(4oBOEF@mY0 rua!|skg8k)(6fE4%yHty3)#{;wIU!iPx$Zb?KzRA_UZ{rYe1__H9#mW9#nlf{;XPH2|MJu|s!mm2AdoQt zAbeePQ%s2$0PuPG@%$)6AY%kF?kcQ~XEbGvL$)=hm=bTSfu^j{lr;hwWB2tv7y*5R zsPIDXsGz2-u}l-(3I*OMV3{UHrRsTXHz39Lw=s3~-~E;6JVe-q9PrjIq=ypEF65e@ z02lYzr%5}V&j0|2YzsdMFC$RagAt;{vkSTA*@bL*&O?M<$N_KcLbm5Nl=%B_A;A0> zZ@CI3Ug(hRxeX=WSOd1MLWyS=BEz!_asDCfLJoLq7rGV-JiCxPx${YgYYRA_S{V9d*g( zAh;|-MNFl3}TYf+s^sblm?sCl;dZzb6$t8L2yZf%W3megg?7D5eA(vw@sWOKFnp;AsN9ATpW4 zFB0hY0Pz1h-f9%(dD7u&0{5fa)MQB8>G!y+q06%q)!`fT26K^gq(|NgY4BO;@TpBq ze(bp{$f`W=u@Jp&RC)UGaGP!EhlaePi}F@g)#i91%qFyx+iWM7cOxn9-T0~fRaSgz zo(6||(vQc%aG08qDSWOM63G<4dR|C*07Lj(FO+Q;oUI_Tv99?gqRJQ>D|JX}pJX;qkGyWoh-+B!>5{c?IrttNp zo*9YiHm2~o379UW1Wa+BJU*4cDs>)H_(m4sb&?fd*Uc+=A)ZX(trxP=)aH00wr&ID zdlj}WRAziS$kTW%T_Lt^V-mj^R>EXeD*+SgJgf3bUPu;v-Mp;}sq$6=eFGl2J}M$y R+8+P_002ovPDHLkV1oE)5MBTP literal 0 HcmV?d00001 diff --git a/Blocktest/Content/Graphics/Blocks/purplegrass.png b/Blocktest/Content/Graphics/Blocks/purplegrass.png new file mode 100644 index 0000000000000000000000000000000000000000..b457308e5484902003ea52e1179220c1efeafa3b GIT binary patch literal 555 zcmV+`0@VG9P)Px$b(Dav(pfq@7H$jg<~?;tl^tH`y)VCi^$x!W#(C*?C<_1c33!BnS|*{OWk2-FjW#5}bH_FXR(9KK4Sf{;Q?-Lf(Qpa~n>);ScD{Z8-7D0d&0zCqAAF zh0RC93ju&71nJIgIPo&UapuZhJb8VSCr=i0cxm4#8*t-eFBI#)io6%{&TTmH+FmF~ z9Qf7oLVj`KmwqlJW%s+3&Q!<}f-E5@ovDynu94%+18)g#JS-u|?sv&?=5nPo6|(zX tvV{1Nz=hZL9@{&6$~DK0kG)V>`T|yo5T0Iw9l!tp002ovPDHLkV1n9f0i6H< literal 0 HcmV?d00001 diff --git a/Blocktest/Content/Graphics/Blocks/salt.png b/Blocktest/Content/Graphics/Blocks/salt.png new file mode 100644 index 0000000000000000000000000000000000000000..8a37d8248f42dd5c4a93636811d5f503b18cdfc5 GIT binary patch literal 522 zcmV+l0`>igP)Px$#7RU!RA__P z1r!@WD?#?a!bT1P24WS&khKWA?Cm9zNMI*s2M%U#zbs5PM)Q zOW;Y0$Gdlg4W{CQuhaJZ^UXCi-jf-J4W_bxd-=@8rcvPw08l@p7mJxl*yf2Mc`2!z7Io z@9B#Ga+?A3dz1?A=?h_lg97 z&1ow9#%m#!KpgQ*X1YIb?o#1Z-^rdcOC{q)J!+eGTF5rI>>1?kkPVSAN(7%F_O0%ob=hy%#ab}GC&#H(l(O1#rTWO%2AoUOr} z7P56OBo~*xx1q#uycTlzLbiFQg>3Vg7Lq9)d>Iq;s5{u M07*qoM6N<$f@;z1qW}N^ literal 0 HcmV?d00001 diff --git a/Blocktest/Content/Graphics/Blocks/whitesandstonebrick.png b/Blocktest/Content/Graphics/Blocks/whitesandstonebrick.png new file mode 100644 index 0000000000000000000000000000000000000000..50b7aea9348d965f2c61d887d01fdb27c5b7c7fc GIT binary patch literal 891 zcmV->1BCpEP)Px&HAzH4RA_% zUmpr@(rZ(9j?UPODQ@c%S$|^M%5`*yC!xB^S@C2S3hI9M4k*HtU5Gs;RpZGnBtFi);G2WW`vAvVrhpn& z^8AD4Y+3`rFC)LNfV#0LLq2`Zg-@ zyf->FcAM0D#Ep`vB)rE#oS( zJe%{(h3vy)7%O?SbDO11N@HVL9%%e&XBz-C+{UzQmpf5-=4O{JLc&~9VaE{ zeH#GDh1YHKFFt+TeSV6ou)YmIa~0ON@jAa}F7!WrA({MS7ZUq6D)D3&68kW!@g(;U z?<6YmWET?qHY)LC7ZUq6D)D3&68k)|JexaL7ZP2?w5n1((B5rYg)Dzz;~&0K_c1V3 R(nkOQ002ovPDHLkV1oUkqQw9J literal 0 HcmV?d00001 From 6511ad7cc674b38934de5304962ecf85dbbd37f3 Mon Sep 17 00:00:00 2001 From: Imaginos16 <77556824+Imaginos16@users.noreply.github.com> Date: Wed, 13 Sep 2023 20:42:11 -0300 Subject: [PATCH 5/5] Feex --- Blocktest/Code/Scenes/GameScene.cs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Blocktest/Code/Scenes/GameScene.cs b/Blocktest/Code/Scenes/GameScene.cs index d880251..cee338b 100644 --- a/Blocktest/Code/Scenes/GameScene.cs +++ b/Blocktest/Code/Scenes/GameScene.cs @@ -99,14 +99,12 @@ public GameScene(BlocktestGame game) { Globals.ForegroundTilemap = new Tilemap(Globals.maxX, Globals.maxY); for (int i = 0; i < Globals.maxX; i++) { - BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[2], true, new Vector2Int(i, 5)); - BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 4)); - BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 3)); - BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 2)); - BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 1)); - BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[1], true, new Vector2Int(i, 0)); + BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[2], true, new Vector2Int(i, 59)); + BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 58)); + BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 57)); + BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 56)); + BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(i, 55)); + BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[1], true, new Vector2Int(i, 54)); } - - BuildSystem.PlaceBlockCell(BlockManager.AllBlocks[0], true, new Vector2Int(20, 20)); } } \ No newline at end of file