JonathanHager
/
dungeoncrawler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jonathan'

Browse Source 
merge
master
Jonathan Hager 6 years ago
parent acdb934a34 2345dca4b7
commit ea1b6bb81f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

BIN
core/assets/player2.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 574 B

4
core/src/com/dungeoncrawler/view/GameScreen.java
Unescape View File

@ -55,8 +55,8 @@ public class GameScreen {
//PLAYER //PLAYER
p = new Texture("player.png"); p = new Texture("player2.png");
regions = TextureRegion.split(p, 48, 48); regions = TextureRegion.split(p, 16, 16);
player = new Sprite(regions[0][2]); player = new Sprite(regions[0][2]);
player.setX(200); player.setX(200);
player.setY(200); player.setY(200);

8
core/src/com/dungeoncrawler/view/MapGenerator.java
Unescape View File

@ -82,7 +82,7 @@ public class MapGenerator {
collisionLayer.getObjects().remove(top); collisionLayer.getObjects().remove(top);
RectangleMapObject tempLeft = new RectangleMapObject(0, mapDimensionY*48 - 48, (mapDimensionX / 2) * 48, 48); RectangleMapObject tempLeft = new RectangleMapObject(0, mapDimensionY*48 - 48, (mapDimensionX / 2) * 48, 48);
RectangleMapObject tempRight = new RectangleMapObject(((mapDimensionX / 2) + 2) * 48, mapDimensionY*48 - 48, mapDimensionX*48, 48); RectangleMapObject tempRight = new RectangleMapObject(((mapDimensionX / 2) + 1) * 48, mapDimensionY*48 - 48, (mapDimensionX / 2) * 48, 48);
collisionLayer.getObjects().add(tempLeft); collisionLayer.getObjects().add(tempLeft);
collisionLayer.getObjects().add(tempRight); collisionLayer.getObjects().add(tempRight);
@ -96,7 +96,7 @@ public class MapGenerator {
collisionLayer.getObjects().remove(right); collisionLayer.getObjects().remove(right);
RectangleMapObject tempTop = new RectangleMapObject(mapDimensionX*48 - 48, ((mapDimensionY / 2) + 2) * 48, 48, (mapDimensionY / 2) * 48); RectangleMapObject tempTop = new RectangleMapObject(mapDimensionX*48 - 48, ((mapDimensionY / 2) + 1) * 48, 48, (mapDimensionY / 2) * 48);
RectangleMapObject tempBottom = new RectangleMapObject(mapDimensionX*48 - 48, 0, 48, (mapDimensionY / 2) * 48); RectangleMapObject tempBottom = new RectangleMapObject(mapDimensionX*48 - 48, 0, 48, (mapDimensionY / 2) * 48);
collisionLayer.getObjects().add(tempTop); collisionLayer.getObjects().add(tempTop);
@ -112,7 +112,7 @@ public class MapGenerator {
collisionLayer.getObjects().remove(bottom); collisionLayer.getObjects().remove(bottom);
RectangleMapObject tempLeft = new RectangleMapObject(0, 0, (mapDimensionX / 2) * 48, 48); RectangleMapObject tempLeft = new RectangleMapObject(0, 0, (mapDimensionX / 2) * 48, 48);
RectangleMapObject tempRight = new RectangleMapObject(((mapDimensionX / 2) + 2) * 48, 0, mapDimensionX*48, 48); RectangleMapObject tempRight = new RectangleMapObject(((mapDimensionX / 2) + 1) * 48, 0, (mapDimensionX / 2) * 48, 48);
collisionLayer.getObjects().add(tempLeft); collisionLayer.getObjects().add(tempLeft);
collisionLayer.getObjects().add(tempRight); collisionLayer.getObjects().add(tempRight);
@ -126,7 +126,7 @@ public class MapGenerator {
collisionLayer.getObjects().remove(left); collisionLayer.getObjects().remove(left);
RectangleMapObject tempTop = new RectangleMapObject(0, ((mapDimensionY / 2) + 2) * 48, 48, (mapDimensionY / 2) * 48); RectangleMapObject tempTop = new RectangleMapObject(0, ((mapDimensionY / 2) + 1) * 48, 48, (mapDimensionY / 2) * 48);
RectangleMapObject tempBottom = new RectangleMapObject(0, 0, 48, (mapDimensionY / 2) * 48); RectangleMapObject tempBottom = new RectangleMapObject(0, 0, 48, (mapDimensionY / 2) * 48);
collisionLayer.getObjects().add(tempTop); collisionLayer.getObjects().add(tempTop);

Write Preview
Loading…
Cancel
Save