diff --git a/core/assets/sprites/torch.png b/core/assets/sprites/torch.png index 4601909..0aa2c84 100644 Binary files a/core/assets/sprites/torch.png and b/core/assets/sprites/torch.png differ diff --git a/core/assets/tilesets/tileset_floor_1_Kilian.png b/core/assets/tilesets/tileset_floor_1_Kilian.png new file mode 100644 index 0000000..b6a1655 Binary files /dev/null and b/core/assets/tilesets/tileset_floor_1_Kilian.png differ diff --git a/core/src/com/dungeoncrawler/control/Controller.java b/core/src/com/dungeoncrawler/control/Controller.java index 2e7af6f..4e4962e 100644 --- a/core/src/com/dungeoncrawler/control/Controller.java +++ b/core/src/com/dungeoncrawler/control/Controller.java @@ -312,7 +312,14 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ d.setCurrentEntities(m.playerAttack(d.getCurrentEntities(), d.getPlayer(), batch)); } } - + /* + if(keycode == Input.Keys.F){ + if(v != null){} + if(m != null){ + d.setCurrentItemContainer(m.playerPickUp(d.getCurrentItemContainer(), d.getPlayer())); + } + } + */ if(keycode == Input.Keys.UP){ volume += 0.1f; diff --git a/core/src/com/dungeoncrawler/model/entities/Player.java b/core/src/com/dungeoncrawler/model/entities/Player.java index 6292850..8ba7f6b 100644 --- a/core/src/com/dungeoncrawler/model/entities/Player.java +++ b/core/src/com/dungeoncrawler/model/entities/Player.java @@ -7,6 +7,7 @@ package com.dungeoncrawler.model.entities; import com.dungeoncrawler.model.Entity; +import com.dungeoncrawler.model.ItemContainer; /** * * @author Jan @@ -24,4 +25,8 @@ public class Player extends Entity { // TODO: Sinnvolle Werte finden } + public void pickUp(ItemContainer items){ + + } + } diff --git a/core/src/com/dungeoncrawler/view/GameScreen.java b/core/src/com/dungeoncrawler/view/GameScreen.java index 0feab51..dde67d4 100644 --- a/core/src/com/dungeoncrawler/view/GameScreen.java +++ b/core/src/com/dungeoncrawler/view/GameScreen.java @@ -12,8 +12,10 @@ import com.badlogic.gdx.maps.tiled.TiledMap; import com.badlogic.gdx.maps.tiled.TiledMapRenderer; import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer; import com.badlogic.gdx.math.Intersector; +import com.badlogic.gdx.math.Rectangle; import com.dungeoncrawler.model.Dungeon; import com.dungeoncrawler.model.Entity; +import com.dungeoncrawler.model.ItemContainer; import com.dungeoncrawler.model.entities.*; public class GameScreen { @@ -221,13 +223,6 @@ public class GameScreen { } } } - for(int i = 0; i < arrowSprites.length; i++){ - if(arrowSprites[i] != null){ - arrowSprites[i].setX(arrows[i].getxPos()); - arrowSprites[i].setY(arrows[i].getyPos()); - arrowSprites[i].draw(batch); - } - } batch.end(); } @@ -318,7 +313,19 @@ public class GameScreen { } return e; } - + /* + public ItemContainer playerPickUp(ItemContainer[] items, Player p){ + for(int i = 0; i < items.length; i++){ + if(Intersector.overlaps(player.getBoundingRectangle(), itemSprite[i].getBoundingRectangle())){ + player.pickUp(items[i].getItem()); + items[i] = null; + } + + } + return items; + + } + */ public void cleanUp(){ music.dispose(); } diff --git a/core/src/com/dungeoncrawler/view/MainMenu.java b/core/src/com/dungeoncrawler/view/MainMenu.java index 65b1669..144a224 100644 --- a/core/src/com/dungeoncrawler/view/MainMenu.java +++ b/core/src/com/dungeoncrawler/view/MainMenu.java @@ -8,11 +8,21 @@ import com.badlogic.gdx.graphics.Pixmap; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.g2d.Sprite; +import com.badlogic.gdx.graphics.g2d.TextureRegion; import com.badlogic.gdx.math.Intersector; import com.badlogic.gdx.math.Rectangle; - +import com.badlogic.gdx.utils.Timer; public class MainMenu{ + + Texture torchTop; + Texture torchBottom; + Sprite torchTopSprite; + Sprite torchBottomSprite; + Timer torch; + TextureRegion[][] torchRegions; + int torchSpalte; + //MENU-SCREEN Texture startButtonTexture; Texture quitButtonTexture; @@ -74,6 +84,25 @@ public class MainMenu{ System.out.println(startButtonSprite.getWidth()); System.out.println(startButtonSprite.getHeight()); + + + torchTop = new Texture("sprites/torch.png"); + torchSpalte = 0; + torchRegions = TextureRegion.split(torchTop, 48, 48); + torchTopSprite = new Sprite(torchRegions[0][0]); + torchTopSprite.setY(48); + torch = new Timer(); + torch.scheduleTask(new Timer.Task() { + @Override + public void run() { + if(torchSpalte >= 6){ + torchSpalte = 1; + } + else{ + torchSpalte++; + } + } + },0,0.1f); } @@ -86,6 +115,8 @@ public class MainMenu{ backgroundSprite.draw(batch); startButtonSprite.draw(batch); quitButtonSprite.draw(batch); + torchTopSprite = new Sprite(torchRegions[0][torchSpalte]); + torchTopSprite.draw(batch); batch.end(); }