diff --git a/FNA/obj/Release/FNA.csproj.FileListAbsolute.txt b/FNA/obj/Release/FNA.csproj.FileListAbsolute.txt --- a/FNA/obj/Release/FNA.csproj.FileListAbsolute.txt +++ b/FNA/obj/Release/FNA.csproj.FileListAbsolute.txt @@ -10,3 +10,4 @@ /Users/alys/repos/isometric-park-fna/FNA/bin/Release/FNA.dll /Users/alys/repos/isometric-park-fna/FNA/obj/Release/FNA.csproj.CoreCompileInputs.cache /Users/alys/repos/isometric-park-fna/FNA/obj/Release/FNA.dll +/Users/alys/repos/isometric-park-fna/FNA/obj/Release/FNA.csprojAssemblyReference.cache diff --git a/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Debug/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index 09f263a5e251ed61d98c6b1e95c877b687758fe6..385477544be552dd76b6ca205da1ec6ee0f95310 GIT binary patch literal 24807 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 ODoS9!n?MaqAp3vDk&(Rs diff --git a/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache b/SpriteFontPlus/src/obj/Release/net45/SpriteFontPlus.FNA.csprojAssemblyReference.cache index a7bdf91612271316a725622f87c408ecc8c7d9e7..6bf9031e80fcefa3cfd31a82166578e8c752266e GIT binary patch literal 23660 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 opvt40$L!&~inY^fq}yR09j}yEdT%j diff --git a/isometric-park-fna/.DS_Store b/isometric-park-fna/.DS_Store index 5573feb918ef634934099262b047ee1f195c7d8a..76f33929f141785412230ad2163813bf4234f203 GIT binary patch literal 12292 zc%1E8TWl2P6+UM%Fc-kH#<9m{Fg&p)^0@67qWnFRpsNk;qtjQ}8k?UhvkB@%#Fh8z?4QeewyL0a7Qx&jb| z1ZeE9VHVrLF~=NRGUfuieoJUs3B3@@uHWh2kP!>fqoyEF*&It~ zrxR@LkQs|7daa2Qijp+7M>LwJPiuWNn|3W@N7_G?&|^{apcXgD*9Cm`wTqWl-B-P# zu5oi~=l1S})oV%>sZ1&#oz_h~WM~Iw^ho05c+d=M(TE;BaY&D7(S-h}uEj;S>yS7S z4Nhtc%9_&E6_u(wmJI11P3nm=N}V9s$MUE(qH;wz5}_;E7mKhxBUVK9sI`J{n2qvbf-ue^-I0hE5$Xbs zJWmSJ!@CM30L77+<-s8AK_2%XLuhz zfSd4l6wr-jxE42HBW}hm=tDnl!(G^oJ=lwT@ev%s19%W8@C54k7@ooe&fz?M96y0i z;yHW@KZjqz3;0dEh%ew}{2~5`!w)$Q2XbMFKVB$R+-2Jyl=IWThIa*2H7^Cq%k*z6 zQ{1I$jk-H84M*m!W2W;_mpV%tNmhc^gAaOO4;+IjI0H{oa=r?e;R?J6KZV!fSMVEn zhf?w${Eejr5nWh<%W(}>Vm;oE8!0t@+<`kOE&aF;_u~*gjE5*CK@4FS4UAJ#k~ob| z;HU62_*qKK=kd$87!FW4`o3ihq6f|XZ$`Umz@3^t`Ijn_Vzkk{`WbIdWvtmlK5`vCXzwnrX!abJ?P zkHWo|`vCXzwnskC#eE6)0{05{UhV_j&)c3qw9v&pKQnTLf(rLu?gMvp%Z@qre`Ty} z3b}uZN{klc{?)|&>+dP|zrKo*UU%8r^80G)8k_wOJQzqb#XN49!{D=NyT#URI&RVQ z6b-kf0m*`@>UGlk#RSCx+Cw`nFj}gtT&Sv4D>itms};u21#7dup;}UqB!p;fHZ@Sx zMKN|@sioQ{l2A~V+2?7KIs}pg%5po}C2bQ)G$f zJoX44B`$lC==~|;vQeDD(|8tViROQj^VxIwG(LmR;(2_IcGfdfAfanQDesL%6G1(y#jTx5B+`^4qx8Rx&Gf{Q(TI6CD`1^yLaCme z^|!XRHhca4t#i%ZS--ENtJ&M>@0^~K707(+2rXB9Y}F5808SXLotJrjzQ zuP9zxQ|b9o!=^3mTX*(aT23yPD{f1&Z^jSV+*xv z3KkiydIu8qDqM%(kwkr$O8mY5oJ7ql^u2k7{+FUKPIZ^378R-lONGC;;ry{OSHZQZ^8{i>P`3u;Zwpg zLa3L}*@9gbI$861$Z9?hTkn>R;xRl3{wSAxmWa;$DlaDiT?39i7cypCz&UU4EvwNO0wAtY_`pSX5)3&)i>j-_CqBNolIf zi)yMpYX|o(Su$Fnsn(Xua+Y?=r;aH~X%S7gYmf__LQTbvRa{fCND)oNhI2I)8_CsF zY$Q)pv7rJ@<$V9U>)-#D9Fmu=ta|xw$|@_`C+`+nF)DCdkXP38sgO~J`rJ&#z zZv$>*;F_nbRzR3WC*cGnLC<{$mh+Zysl5mEb+l7oYHiCjsjk+pfAKwF&W)yXaM$!d zopZT;`bPHs|DnZy|L2%vj{OfCmh=tx^+5UuK?TOXwR>qfp4tJ5{}6z$3*7s%#sb{W U+x{N?2*Bz8PXBlMzXjBP0^i*yasU7T diff --git a/isometric-park-fna/FNAGame.cs b/isometric-park-fna/FNAGame.cs --- a/isometric-park-fna/FNAGame.cs +++ b/isometric-park-fna/FNAGame.cs @@ -674,12 +674,19 @@ if (MathUtils.Between(this.mouseGrid.X, -1, this.simulation.map.MapWidth) && MathUtils.Between(this.mouseGrid.Y, -1, this.simulation.map.MapHeight)) { - OutlineSquare(this.mouseGrid.X, this.mouseGrid.Y, Color.Yellow); + OutlineSquare(this.mouseGrid.X, this.mouseGrid.Y, Color.Yellow, 1); } - + + OutlineSquare(1, 1, Color.Red, 2); + OutlineSquare(3, 1, Color.Blue, 2); + OutlineSquare(5, 1, Color.Green, 2); + OutlineSquare(7, 1, Color.Orange, 2); - #endregion draw_cursor - /* + + + + #endregion draw_cursor + /* for (int i = 0; i< 80; i++) { @@ -700,8 +707,8 @@ } }//*/ - #region draw_trees - for (int i = 0; i < this.simulation.map.MapHeight; i++) + #region draw_trees + for (int i = 0; i < this.simulation.map.MapHeight; i++) { for (int j = 0; j < this.simulation.map.MapWidth; j += 1) { @@ -815,8 +822,12 @@ base.Draw(gameTime); } + private void OutlineSquare(float x, float y, Color color) + { + this.OutlineSquare(x, y, color, 1); + } - private void OutlineSquare(float x, float y, Color color) + private void OutlineSquare(float x, float y, Color color, int size) { Vector2 adjust2 = new Vector2(Tile.TileSpriteWidth / 2, Tile.TileSpriteHeight); //TODO figure out why this second value shouldn't be halved @@ -826,26 +837,26 @@ Line.drawLine(batch, new Vector2(((x - y) * Tile.TileSpriteWidth / 2), (x + y) * Tile.TileSpriteHeight / 2) + adjust2, //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight), - new Vector2(((x - y + 1) * Tile.TileSpriteWidth / 2), (x + y + 1) * Tile.TileSpriteHeight / 2) + adjust2, + new Vector2(((x - y + size) * Tile.TileSpriteWidth / 2), (x + y + size) * Tile.TileSpriteHeight / 2) + adjust2, color, 0.79f); //Bottom right Line.drawLine(batch, - new Vector2(((x + 1 - y) * Tile.TileSpriteWidth / 2), (x + 1 + y) * Tile.TileSpriteHeight / 2) + adjust2, + new Vector2(((x + size - y) * Tile.TileSpriteWidth / 2), (x + size + y) * Tile.TileSpriteHeight / 2) + adjust2, //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight), - new Vector2(((x + 1 - (y + 1)) * Tile.TileSpriteWidth / 2), (x + 1 + (y + 1)) * Tile.TileSpriteHeight / 2) + adjust2, + new Vector2(((x + size - (y + size)) * Tile.TileSpriteWidth / 2), (x + size + (y + size)) * Tile.TileSpriteHeight / 2) + adjust2, color, 0.79f); //Bottom left Line.drawLine(batch, - new Vector2(((x - (y + 1)) * Tile.TileSpriteWidth / 2), (x + y + 1) * Tile.TileSpriteHeight / 2) + adjust2, + new Vector2(((x - (y + size)) * Tile.TileSpriteWidth / 2), (x + y + size) * Tile.TileSpriteHeight / 2) + adjust2, //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight), - new Vector2(((x + 1 - (y + 1)) * Tile.TileSpriteWidth / 2), (x + 1 + (y + 1)) * Tile.TileSpriteHeight / 2) + adjust2, + new Vector2(((x + size - (y + size)) * Tile.TileSpriteWidth / 2), (x + size + (y + size)) * Tile.TileSpriteHeight / 2) + adjust2, color, 0.79f); //Upper left Line.drawLine(batch, new Vector2(((x - y) * Tile.TileSpriteWidth / 2), (x + y) * Tile.TileSpriteHeight / 2) + adjust2, //new Vector2(this.squaresAcross * Tile.TileSpriteWidth, (y+1) * Tile.TileSpriteHeight), - new Vector2(((x - (y + 1)) * Tile.TileSpriteWidth / 2), (x + (y + 1)) * Tile.TileSpriteHeight / 2) + adjust2, + new Vector2(((x - (y + size)) * Tile.TileSpriteWidth / 2), (x + (y + size)) * Tile.TileSpriteHeight / 2) + adjust2, color, 0.79f); } }