From 322eda1c5e91d9ef7950c5e769eaa40a15e6b9da Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Thu, 2 Apr 2020 12:49:30 +0200 Subject: [PATCH 1/8] Map funktioniert soweit --- core/src/com/dungeoncrawler/view/Map.java | 11 ++++++----- core/src/com/dungeoncrawler/view/View.java | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/src/com/dungeoncrawler/view/Map.java b/core/src/com/dungeoncrawler/view/Map.java index 7d2ad04..85a3213 100644 --- a/core/src/com/dungeoncrawler/view/Map.java +++ b/core/src/com/dungeoncrawler/view/Map.java @@ -34,11 +34,12 @@ public class Map { TextureRegion[][] splitTiles = TextureRegion.split(getTiles(), 48, 48); MapLayers layers = getMap().getLayers(); - for(int i=0;i<6;i++){ - TiledMapTileLayer layer = new TiledMapTileLayer(6, 6, 48, 48); + //for(int i=0;i<6;i++){ + int size = 10; + TiledMapTileLayer layer = new TiledMapTileLayer(size, size, 48, 48); - for(int x=0;x<6;x++){ - for(int y=0;y<6;y++){ + for(int x=0;x Date: Thu, 2 Apr 2020 15:43:54 +0200 Subject: [PATCH 2/8] Map Generator kann generieren --- core/src/com/dungeoncrawler/view/Map.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/core/src/com/dungeoncrawler/view/Map.java b/core/src/com/dungeoncrawler/view/Map.java index 85a3213..f60f539 100644 --- a/core/src/com/dungeoncrawler/view/Map.java +++ b/core/src/com/dungeoncrawler/view/Map.java @@ -41,11 +41,20 @@ public class Map { for(int x=0;x Date: Sat, 4 Apr 2020 13:19:58 +0200 Subject: [PATCH 3/8] Temp --- core/src/com/dungeoncrawler/model/Room.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/dungeoncrawler/model/Room.java b/core/src/com/dungeoncrawler/model/Room.java index 69d1dfe..55dbfd8 100644 --- a/core/src/com/dungeoncrawler/model/Room.java +++ b/core/src/com/dungeoncrawler/model/Room.java @@ -12,10 +12,10 @@ import com.dungeoncrawler.model.Entity; * @author jonathan */ public class Room { - private ItemContainer item; + private ItemContainer[] item; private Entity[] enemies; - public Room(ItemContainer item, Entity[] enemies){ + public Room(ItemContainer[] item, Entity[] enemies){ this.item = item; this.enemies = enemies; } @@ -31,14 +31,14 @@ public class Room { /** * @return the item */ - public ItemContainer getItem() { + public ItemContainer[] getItem() { return item; } /** * @param item the item to set */ - public void setItem(ItemContainer item) { + public void setItem(ItemContainer[] item) { this.item = item; } From a0355e4414441f3dc8bf4e3c48efd7ac18a9f37b Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Sat, 4 Apr 2020 13:30:16 +0200 Subject: [PATCH 4/8] DungeonGenerator added --- .../src/com/dungeoncrawler/model/Dungeon.java | 6 ----- .../model/DungeonGenerator.java | 22 +++++++++++++++++++ 2 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 core/src/com/dungeoncrawler/model/DungeonGenerator.java diff --git a/core/src/com/dungeoncrawler/model/Dungeon.java b/core/src/com/dungeoncrawler/model/Dungeon.java index 3a063d2..2e2f374 100644 --- a/core/src/com/dungeoncrawler/model/Dungeon.java +++ b/core/src/com/dungeoncrawler/model/Dungeon.java @@ -22,18 +22,12 @@ public class Dungeon { this.player = player; this.playerRoom = 0; this.playerLevel = 0; - - createLvl(); } public void update(){ // TODO: Implementieren } - private void createLvl(){ - // TODO. Implementieren - } - /** * @return the level */ diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java new file mode 100644 index 0000000..2150d4e --- /dev/null +++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java @@ -0,0 +1,22 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package com.dungeoncrawler.model; + +/** + * + * @author jonathan + */ +public class DungeonGenerator { + + public DungeonGenerator(){ + + } + + public Dungeon generateDungeon(int sizeX, int sizeY){ + + return null; + } +} From cc168a2f84e6ce0fa98195b47ecbfa1d6d8a6d87 Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Sat, 4 Apr 2020 13:53:19 +0200 Subject: [PATCH 5/8] Nix geht --- .../model/DungeonGenerator.java | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java index 2150d4e..5eb6259 100644 --- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java +++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java @@ -15,8 +15,25 @@ public class DungeonGenerator { } - public Dungeon generateDungeon(int sizeX, int sizeY){ + public Dungeon generateDungeon(int sizeX, int sizeY, int tileSize){ return null; } + + private int[] generatePos(int sizeX, int sizeY, int tileSize){ + + int[] position = new int[2]; + + int xPos = (int) (Math.random() * sizeX); + int yPos = (int) (Math.random() * sizeY); + + if(xPos > sizeX / 2){ + xPos -= tileSize; + } + else if(xPos < sizeX / 2){ + + } + + return position; + } } From bc660abce5e125c6b15d14a42816d87b9c2eeaf2 Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Sun, 5 Apr 2020 14:12:10 +0200 Subject: [PATCH 6/8] Generator Grundstruktur implementiert --- .../src/com/dungeoncrawler/model/Dungeon.java | 6 +++ .../model/DungeonGenerator.java | 37 +++++++++++++++---- core/src/com/dungeoncrawler/model/Level.java | 6 +++ 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/core/src/com/dungeoncrawler/model/Dungeon.java b/core/src/com/dungeoncrawler/model/Dungeon.java index 2e2f374..8f24b91 100644 --- a/core/src/com/dungeoncrawler/model/Dungeon.java +++ b/core/src/com/dungeoncrawler/model/Dungeon.java @@ -42,6 +42,12 @@ public class Dungeon { this.level = level; } + public void setLevel(Level level, int i){ + if(i < this.level.length){ + this.level[i] = level; + } + } + /** * @return the player */ diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java index 5eb6259..4381613 100644 --- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java +++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java @@ -5,6 +5,8 @@ */ package com.dungeoncrawler.model; +import com.dungeoncrawler.model.entities.Player; + /** * * @author jonathan @@ -15,7 +17,33 @@ public class DungeonGenerator { } - public Dungeon generateDungeon(int sizeX, int sizeY, int tileSize){ + public Dungeon generateDungeon(int sizeX, int sizeY, int tileSize, Player player){ + + Dungeon tempDungeon = new Dungeon(player); + int levelAmount = tempDungeon.getLevel().length; + + for(int i = 0; i < levelAmount; i++){ + tempDungeon.setLevel(generateLevel(), i); + } + + return tempDungeon; + + } + + private Level generateLevel(){ + + int roomAmount = (int) (Math.random() * 6) + 5; + Level tempLevel = new Level(roomAmount); + + for(int i = 0; i < roomAmount; i++){ + Room tempRoom = generateRoom(); + tempLevel.setRoom(tempRoom, i); + } + + return tempLevel; + } + + private Room generateRoom(){ return null; } @@ -27,13 +55,6 @@ public class DungeonGenerator { int xPos = (int) (Math.random() * sizeX); int yPos = (int) (Math.random() * sizeY); - if(xPos > sizeX / 2){ - xPos -= tileSize; - } - else if(xPos < sizeX / 2){ - - } - return position; } } diff --git a/core/src/com/dungeoncrawler/model/Level.java b/core/src/com/dungeoncrawler/model/Level.java index 15d0fb5..c3e3e7b 100644 --- a/core/src/com/dungeoncrawler/model/Level.java +++ b/core/src/com/dungeoncrawler/model/Level.java @@ -30,5 +30,11 @@ public class Level { this.rooms = rooms; } + public void setRoom(Room room, int i){ + if(i < this.rooms.length){ + this.rooms[i] = room; + } + } + } From da491716717bc121f308c93844bd11bf14e52475 Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Sun, 5 Apr 2020 21:17:21 +0200 Subject: [PATCH 7/8] Temp --- core/src/com/dungeoncrawler/model/DungeonGenerator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java index 4381613..8e18d5e 100644 --- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java +++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java @@ -40,6 +40,8 @@ public class DungeonGenerator { tempLevel.setRoom(tempRoom, i); } + // TODO: Zufällig Türen setzen + return tempLevel; } From c997111829177426d28246bf6964c721c298f3b1 Mon Sep 17 00:00:00 2001 From: Jonathan Hager Date: Sun, 5 Apr 2020 21:51:38 +0200 Subject: [PATCH 8/8] Vor Merge, testen von Ausgabe Methode --- .../com/dungeoncrawler/model/DungeonGenerator.java | 14 ++++++++++++++ .../com/dungeoncrawler/model/entities/Player.java | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/core/src/com/dungeoncrawler/model/DungeonGenerator.java b/core/src/com/dungeoncrawler/model/DungeonGenerator.java index 8e18d5e..a283f0b 100644 --- a/core/src/com/dungeoncrawler/model/DungeonGenerator.java +++ b/core/src/com/dungeoncrawler/model/DungeonGenerator.java @@ -59,4 +59,18 @@ public class DungeonGenerator { return position; } + + public void ichWillSpielen(){ + Dungeon d = this.generateDungeon(200, 200, 200, new Player()); + + for(int i=0;i