diff --git a/DangerousD/Content/level1.tmx b/DangerousD/Content/lvl.tmx similarity index 66% rename from DangerousD/Content/level1.tmx rename to DangerousD/Content/lvl.tmx index 0febad6..7d3b4c8 100644 --- a/DangerousD/Content/level1.tmx +++ b/DangerousD/Content/lvl.tmx @@ -1,7 +1,7 @@ - - - + + + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -311,7 +311,7 @@ - + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -441,39 +441,162 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,144,144,144,144,144,144,144,144,247,144, -0,0,0,0,0,0,157,157,167,157,157,157,157,157,260,157, -0,0,0,0,0,0,157,157,180,157,254,255,157,157,260,157, -0,0,0,0,0,0,157,157,193,157,267,268,157,157,260,157, -0,0,0,0,0,0,204,204,204,204,280,281,204,272,260,272, -0,0,0,0,0,0,147,199,148,0,0,0,0,0,260,0, -0,0,0,0,0,0,147,199,148,144,144,144,144,144,260,144, -0,0,0,0,0,0,147,199,148,157,157,157,157,157,260,157, -0,0,0,0,0,0,147,199,148,157,157,157,157,157,260,157, -0,0,0,0,0,0,147,199,148,157,157,157,157,157,260,157, -0,0,0,0,0,0,147,199,148,204,272,157,157,157,260,157, -0,0,0,0,0,0,147,199,148,0,0,157,157,157,260,157, -0,0,0,0,0,0,147,199,148,144,144,157,157,157,260,157, -0,0,0,0,0,0,147,199,148,157,157,157,157,157,260,157, -0,0,0,0,0,0,147,199,148,157,157,157,157,157,260,157 +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,147,199,148,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,147,199,148,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,147,199,148,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,147,199,148,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,147,199,148,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + +0,0,0,0,0,0,147,199,148,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + +0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,160,199,161,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +183,184,185,186,199,187,188,189,190,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 + + + + + + +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,2,3,4, +29,29,29,29,5,6,29,29,29,29,29,29,14,15,16,17, +29,29,29,29,29,29,29,29,29,29,29,29,27,28,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,2,3,4,29,29,29,23,24,29,29,29,29,29, +29,29,14,15,16,17,29,29,29,29,29,29,29,29,29,29, +29,29,27,28,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,5,6, +29,29,29,23,24,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29 + + +29,29,29,29,29,0,0,0,0,0,0,0,0,0,0,0, +29,29,29,29,29,0,144,144,144,144,144,144,144,144,247,144, +29,29,29,29,0,0,157,157,167,157,157,157,157,157,260,157, +29,29,29,29,0,0,157,157,180,157,254,255,157,157,260,157, +29,29,29,29,0,0,157,157,193,157,267,268,157,157,260,157, +29,29,29,29,0,0,204,204,204,204,280,281,204,272,260,272, +29,29,29,29,0,0,147,199,148,0,0,0,0,0,260,0, +29,29,29,29,0,0,147,199,148,144,144,144,144,144,260,144, +29,29,29,29,0,0,147,199,148,157,157,157,157,157,260,157, +29,29,29,29,0,0,147,199,148,157,157,157,157,157,260,157, +29,29,29,29,0,0,147,199,148,157,157,157,157,157,260,157, +29,29,29,29,0,0,147,199,148,204,272,157,157,157,260,157, +29,29,29,29,0,0,147,199,148,0,0,157,157,157,260,157, +29,29,29,29,0,0,147,199,148,144,144,157,157,157,260,157, +29,29,29,29,0,0,147,199,148,157,157,157,157,157,260,157, +29,29,29,29,0,0,147,199,148,157,157,157,157,157,260,157 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,157,178,179,157,157,157,157,157,157,157,157,157,157,157, 157,157,157,191,192,157,157,252,253,157,157,157,157,157,157,258, -157,157,157,157,157,157,157,265,266,157,157,157,157,157,157,271, -204,204,204,204,204,204,204,278,279,204,204,204,204,204,204,284, +157,157,157,157,157,157,157,265,266,157,157,157,696,697,157,271, +204,204,204,204,204,204,204,278,279,204,204,204,709,710,204,284, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,157,157,157,157,157,157,157,157,157,157,157,157,157,157, 157,157,157,157,157,157,258,157,157,157,252,253,157,157,157,157, -157,157,157,157,157,157,271,157,157,157,265,266,157,157,157,157, -157,157,272,204,204,204,284,204,204,204,278,279,204,204,204,204, +157,157,157,157,157,157,271,157,157,157,265,266,157,696,697,157, +157,157,272,204,204,204,284,204,204,204,278,279,204,709,710,204, 157,157,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 157,157,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,157,157,157,157,157,157,157,157,157,167,157,157,209,210, @@ -484,8 +607,8 @@ 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,157,157,243,157,157,157,157,157,157,157,157,157,157,157, 157,157,157,157,256,257,157,157,157,157,157,157,157,157,157,157, -157,157,157,157,269,270,157,157,157,157,157,261,262,263,264,157, -204,204,204,204,282,283,204,204,204,204,204,274,275,276,277,204, +157,157,157,157,269,270,157,157,157,157,217,261,262,263,264,217, +204,204,204,204,282,283,204,204,204,204,230,274,275,276,277,230, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,157,157,209,210,211,212,157,157,157,167,157,157,157,157, @@ -495,15 +618,15 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 211,212,157,157,157,157,157,157,157,157,157,157,157,157,157,157, -224,225,157,157,252,253,157,157,157,157,157,258,157,157,157,157 +224,225,157,157,252,253,157,248,249,157,157,258,157,157,157,157 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,621,622,144,144,144,0,0,0, 157,157,157,157,157,157,157,157,634,635,157,157,157,0,0,0, -157,157,157,157,157,157,272,157,647,648,157,272,157,0,0,0, -157,157,157,157,157,157,145,147,199,200,148,145,157,0,0,0, -204,204,204,204,204,204,204,160,199,200,161,204,204,0,0,0, +157,248,249,157,157,157,272,157,647,648,157,272,157,0,0,0, +157,250,251,157,157,157,145,147,199,200,148,145,157,0,0,0, +204,239,240,204,204,204,204,160,199,200,161,204,204,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,144,144,144,144,144,0,0,0, 178,179,157,157,157,157,157,243,157,157,157,157,157,0,0,0, @@ -516,50 +639,50 @@ 254,255,157,147,199,148,157,256,257,157,252,253,157,0,0,0 -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,19,20,21,22,0,0,0,0,0,0,0,0,0, -0,30,31,32,33,34,35,0,0,0,0,0,0,0,0,0, -0,43,44,45,46,47,48,0,0,0,0,0,0,0,0,0, -64,65,18,58,59,60,18,0,0,0,0,0,0,0,0,0, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,2,3,4,29, +29,29,29,29,29,29,29,29,29,29,29,14,15,16,17,29, +29,29,29,29,29,29,29,29,29,29,29,27,28,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,5,6,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,5, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29, +29,29,29,19,20,21,22,0,0,29,29,29,29,29,29,29, +29,30,31,32,33,34,35,0,0,29,29,29,29,29,29,29, +29,43,44,45,46,47,48,0,0,29,29,29,29,29,29,29, +64,65,18,58,59,60,18,0,0,29,29,29,29,29,29,29, 77,78,18,71,72,73,18,0,0,68,56,56,55,56,56,69, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -0,0,0,0,0,0,147,199,148,157,157,157,157,157,260,157, -0,0,0,0,0,0,160,200,161,204,204,272,157,157,260,157, -0,0,0,0,0,0,0,0,0,0,0,0,157,157,260,157, -0,0,0,0,0,0,144,144,144,144,144,144,157,157,260,157, -0,0,0,0,0,0,157,167,157,157,157,157,157,157,260,157, -0,0,0,0,0,0,157,180,157,252,253,157,157,157,260,157, -0,0,0,0,0,0,157,193,157,265,266,157,157,157,260,157, -0,0,0,0,0,0,204,204,204,278,279,204,272,157,260,157, -0,0,0,0,0,0,0,0,0,0,0,0,0,157,260,157, -0,0,0,0,0,0,144,144,144,144,144,144,144,157,260,157, -0,0,0,0,0,0,157,157,157,157,157,157,157,219,220,221, -0,0,0,12,0,0,157,157,157,254,255,157,157,232,233,234, -0,0,0,0,26,63,157,157,157,267,268,218,213,214,215,216, -0,0,0,38,39,63,204,204,204,280,281,231,226,227,228,229, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +29,29,29,29,0,0,147,199,148,157,157,157,157,157,260,157, +29,29,29,29,0,0,160,200,161,204,204,272,157,157,260,157, +29,29,29,29,0,0,0,0,0,0,0,0,157,157,260,157, +29,29,29,29,0,0,144,144,144,144,144,144,157,157,260,157, +29,29,29,29,0,0,157,167,157,157,157,157,157,157,260,157, +29,29,29,29,0,0,157,180,157,252,253,157,157,157,260,157, +29,29,29,29,0,0,157,193,157,265,266,157,157,157,260,157, +6,29,29,29,0,0,204,204,204,278,279,204,272,157,260,157, +29,29,29,29,0,0,0,0,0,0,0,0,0,157,260,157, +29,29,29,29,0,0,144,144,144,144,144,144,144,157,260,157, +29,29,29,29,0,0,157,157,157,157,157,157,157,219,220,221, +29,29,29,12,0,0,157,157,157,254,255,157,157,232,233,234, +29,29,29,29,26,63,157,157,157,267,268,218,213,214,215,216, +29,29,29,38,39,63,204,204,204,280,281,231,226,227,228,229, +29,29,29,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -157,157,157,157,267,268,157,157,157,157,157,193,157,157,235,236, -157,272,204,204,280,281,204,204,204,204,204,204,204,204,204,204, +157,157,157,157,267,268,157,696,697,157,157,193,157,157,235,236, +157,272,204,204,280,281,204,709,710,204,204,204,204,204,204,204, 157,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 157,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,157,178,179,157,157,157,157,157,157,157,157,157,157,157, -157,157,157,191,192,157,157,157,157,157,157,157,157,157,157,157, -157,157,157,157,157,157,157,157,157,157,261,262,263,264,157,157, -272,204,204,204,204,204,204,204,204,204,274,275,276,277,204,204, +157,157,157,191,192,157,248,249,157,157,157,157,157,157,157,157, +157,157,157,157,157,157,250,251,157,217,261,262,263,264,217,157, +272,204,204,204,204,204,239,240,204,230,274,275,276,277,230,204, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,157,157,157,157,157,157,243,157,157,209,210,211,212,157, @@ -570,35 +693,35 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -237,238,157,157,265,266,157,157,157,157,157,271,157,157,157,157, -204,204,204,204,278,279,204,204,204,204,204,284,204,204,204,204, +237,238,157,157,265,266,157,250,251,157,157,271,157,157,157,157, +204,204,204,204,278,279,204,239,240,204,204,284,204,204,204,204, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,157,157,157,157,157,157,157,243,157,157,209,210,211,212, -157,157,254,255,157,157,157,157,157,256,257,157,222,223,224,225, -157,157,267,268,157,157,157,157,157,269,270,157,235,236,237,238, -204,204,280,281,204,204,204,204,204,282,283,204,204,204,204,204, +157,157,254,255,157,248,249,157,157,256,257,157,222,223,224,225, +157,157,267,268,157,250,251,157,157,269,270,157,235,236,237,238, +204,204,280,281,204,239,240,204,204,282,283,204,204,204,204,204, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 144,144,144,144,144,144,144,144,144,144,144,144,144,144,144,144, 157,157,178,179,157,157,157,157,157,157,157,157,157,157,157,157, -157,157,191,192,157,157,157,157,258,157,157,157,157,157,157,157, -157,157,157,157,157,157,157,157,271,157,157,157,157,157,157,157, -204,204,204,204,204,204,204,204,284,204,204,204,204,204,204,204, +157,157,191,192,157,157,157,157,258,157,157,157,248,249,157,157, +157,157,157,157,157,696,697,157,271,157,157,157,250,251,157,157, +204,204,204,204,204,709,710,204,284,204,204,204,239,240,204,204, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -267,268,157,147,199,148,157,269,270,157,265,266,157,0,0,0, -280,281,204,160,200,161,204,282,283,204,278,279,204,0,0,0, +267,268,157,147,199,148,157,269,270,157,265,266,218,0,0,0, +280,281,204,160,200,161,204,282,283,204,278,279,231,0,0,0, 0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, 144,144,144,147,199,148,144,144,144,144,144,144,144,0,0,0, 157,157,157,147,199,148,157,157,157,157,157,157,157,0,0,0, 157,157,157,147,199,148,157,157,157,157,252,253,157,0,0,0, -157,157,157,147,199,148,157,157,157,157,265,266,157,0,0,0, -204,204,204,160,200,161,204,204,204,204,278,279,204,0,0,0, +157,157,157,147,199,148,157,217,157,157,265,266,157,0,0,0, +204,204,204,160,200,161,204,230,204,204,278,279,204,0,0,0, 0,0,0,147,199,148,0,0,0,0,0,0,0,0,0,0, 144,144,144,147,199,148,144,144,144,144,144,144,144,0,0,0, -157,157,159,160,199,161,162,157,157,157,157,157,157,0,0,0, +157,157,159,160,200,161,162,157,157,157,157,157,157,0,0,0, 157,171,172,173,199,174,175,176,157,157,252,253,157,0,0,0, 183,184,185,186,199,187,188,189,190,157,265,266,157,0,0,0, 196,197,198,199,199,200,201,202,203,204,278,279,204,0,0,0, @@ -607,5 +730,94 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/DangerousD/Content/references/MonoGame.Extended.Content.Pipeline.dll b/DangerousD/Content/references/MonoGame.Extended.Content.Pipeline.dll deleted file mode 100644 index 230a912..0000000 Binary files a/DangerousD/Content/references/MonoGame.Extended.Content.Pipeline.dll and /dev/null differ diff --git a/DangerousD/Content/references/MonoGame.Extended.Graphics.dll b/DangerousD/Content/references/MonoGame.Extended.Graphics.dll deleted file mode 100644 index 0460327..0000000 Binary files a/DangerousD/Content/references/MonoGame.Extended.Graphics.dll and /dev/null differ diff --git a/DangerousD/Content/references/MonoGame.Extended.Tiled.dll b/DangerousD/Content/references/MonoGame.Extended.Tiled.dll deleted file mode 100644 index dd72fb2..0000000 Binary files a/DangerousD/Content/references/MonoGame.Extended.Tiled.dll and /dev/null differ diff --git a/DangerousD/Content/references/MonoGame.Extended.dll b/DangerousD/Content/references/MonoGame.Extended.dll deleted file mode 100644 index d4e7679..0000000 Binary files a/DangerousD/Content/references/MonoGame.Extended.dll and /dev/null differ diff --git a/DangerousD/Content/references/Newtonsoft.Json.dll b/DangerousD/Content/references/Newtonsoft.Json.dll deleted file mode 100644 index b501fb6..0000000 Binary files a/DangerousD/Content/references/Newtonsoft.Json.dll and /dev/null differ diff --git a/DangerousD/GameCore/Managers/AppManager.cs b/DangerousD/GameCore/Managers/AppManager.cs index bc69f2d..67c6644 100644 --- a/DangerousD/GameCore/Managers/AppManager.cs +++ b/DangerousD/GameCore/Managers/AppManager.cs @@ -135,7 +135,7 @@ namespace DangerousD.GameCore case GameState.Lobby: break; case GameState.Game: - GameManager.mapManager.LoadLevel("Level1"); + GameManager.mapManager.LoadLevel("lvl"); break; default: throw new ArgumentOutOfRangeException(); diff --git a/DangerousD/GameCore/Managers/GameManager.cs b/DangerousD/GameCore/Managers/GameManager.cs index ae78c21..a198d08 100644 --- a/DangerousD/GameCore/Managers/GameManager.cs +++ b/DangerousD/GameCore/Managers/GameManager.cs @@ -17,12 +17,14 @@ namespace DangerousD.GameCore public List livingEntities; public List entities; public List mapObjects; + public List others; public MapManager mapManager; public PhysicsManager physicsManager; public List players; public Player GetPlayer1 { get; private set; } public GameManager() { + others = new List(); livingEntities = new List(); mapObjects = new List(); entities = new List(); @@ -44,15 +46,15 @@ namespace DangerousD.GameCore { if (gameObject is LivingEntity) livingEntities.Add(gameObject as LivingEntity); - if (gameObject is Entity) + else if (gameObject is Entity) entities.Add(gameObject as Entity); - if (gameObject is MapObject) + else if (gameObject is MapObject) mapObjects.Add(gameObject as MapObject); - if (gameObject is Player) + else if (gameObject is Player) { players.Add(gameObject as Player); GetPlayer1= players[0]; - } + }else others.Add(gameObject); } public void Draw(SpriteBatch _spriteBatch) @@ -63,6 +65,8 @@ namespace DangerousD.GameCore item.Draw(_spriteBatch); foreach (var item in livingEntities) item.Draw(_spriteBatch); + foreach (var item in others) + item.Draw(_spriteBatch); } public void Update(GameTime gameTime) diff --git a/DangerousD/GameCore/Managers/MapManager.cs b/DangerousD/GameCore/Managers/MapManager.cs index bee1050..f108485 100644 --- a/DangerousD/GameCore/Managers/MapManager.cs +++ b/DangerousD/GameCore/Managers/MapManager.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Diagnostics; using System.Linq; using System.Xml; using DangerousD.GameCore.GameObjects.MapObjects; @@ -25,9 +26,10 @@ namespace DangerousD.GameCore.Managers xml.Load($"../../../Content/{level}.tmx"); Vector2 tileSize = new(int.Parse(xml.DocumentElement.Attributes["tilewidth"].Value), int.Parse(xml.DocumentElement.Attributes["tileheight"].Value)); + //tileSize *= _scale; - XmlNodeList layers = xml.DocumentElement.SelectNodes("//layer"); - + XmlNodeList layers = xml.DocumentElement.SelectNodes("layer"); + Debug.Write(layers.Count); foreach (XmlNode layer in layers) { InstantiateTiles(layer, tileSize); @@ -37,8 +39,12 @@ namespace DangerousD.GameCore.Managers private void InstantiateTiles(XmlNode layer, Vector2 tileSize) { string tileType = layer.Attributes["class"].Value; + float offsetX = layer.Attributes["offsetx"] is not null ? float.Parse(layer.Attributes["offsetx"].Value) : 0; + float offsetY = layer.Attributes["offsety"] is not null ? float.Parse(layer.Attributes["offsety"].Value) : 0; + - foreach (XmlNode chunk in layer.SelectNodes("//chunk")) + Debug.Write(layer.SelectNodes("data/chunk").Count); + foreach (XmlNode chunk in layer.SelectNodes("data/chunk")) { int chunkW = int.Parse(chunk.Attributes["width"].Value); int chunkX = int.Parse(chunk.Attributes["x"].Value); @@ -48,25 +54,28 @@ namespace DangerousD.GameCore.Managers List tiles = chunk.InnerText.Split(',').Select(int.Parse).ToList(); for (int i = 0; i < tiles.Count; i++) { - if (tiles[i] == 0) continue; - - Vector2 pos = new((chunkX + i % chunkW) * tileSize.X, - (chunkY + i / chunkW) * tileSize.Y); - pos *= _scale; - Rectangle sourceRect = new(new Point(tiles[i] % _columns, tiles[i] / _columns ) * tileSize.ToPoint(), tileSize.ToPoint()); - - switch (tileType) + if (tiles[i] != 0) { - case "collidable": - new StopTile(pos, tileSize * _scale, sourceRect); - break; - case "platform": - new Platform(pos, tileSize * _scale, sourceRect); - break; - case "non_collidable": - new Tile(pos, tileSize * _scale, sourceRect); - break; - }} + Vector2 pos = new((chunkX+ i % chunkW) * tileSize.X * _scale + offsetX, + (chunkY + i / chunkW) * tileSize.Y * _scale + offsetY); + //pos *= _scale; + Rectangle sourceRect = new(new Point((tiles[i] -1) % _columns, (tiles[i] -1) / _columns) * tileSize.ToPoint(), tileSize.ToPoint()); + + switch (tileType) + { + case "collidable": + new StopTile(pos, tileSize * _scale, sourceRect); + break; + case "platform": + new Platform(pos, tileSize * _scale, sourceRect); + break; + case "non_collidable": + new Tile(pos, tileSize * _scale, sourceRect); + break; + } + } + + } } }