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

coolcool

Browse Source
master
GammelJan 6 years ago
parent 0da0ee156f
commit 908da5b748
4 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File

7
core/src/com/dungeoncrawler/control/Controller.java
Unescape View File

@ -54,7 +54,6 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
roomX = 8;
roomY = 6;
e = new Entity[5];
batch = new SpriteBatch();
v = new MainMenu();
dg = new DungeonGenerator();
@ -101,7 +100,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
entityMovement.scheduleTask(new Timer.Task() {
@Override
public void run() {
for(int i = 0; i <= 4; i++){
for(int i = 0; i < e.length; i++){
if(e[i] != null){
e[i].randomMove(roomX, roomY);
}
@ -116,7 +115,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
//PASSIERT IN MAINMENU
if(v != null){
v.render(batch, d.getPlayer() , e);
v.render(batch);
}
//PASSIERT IN GAMESCREEN
@ -237,12 +236,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{
switch(ent.getId()){
case 0:
e[i] = new Archer(x,y,lvl);
m.newEntity(i,ent,x,y);
i = 11;
break;
case 1:
e[i] = new Swordsman(x,y,lvl);
m.newEntity(i,ent,x,y);
i = 11;
break;
}

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

@ -133,7 +133,28 @@ public class GameScreen {
camera.update();
batch.setProjectionMatrix(camera.combined);
for(int i = 0; i < e.length; i++){
if(e[i].getId() == 0){ //nimmt entity ID -> 0 = Archer || 1 = Swordsman || 2 = Arrow
entityTextures[i] = new Texture("archer.png");
archerRegions = TextureRegion.split(entityTextures[i], 48, 48);
entitySprites[i] = new Sprite(archerRegions[0][2]);
entitySprites[i].setX(e[i].getxPos());
entitySprites[i].setY(e[i].getyPos());
}
if(e[i].getId() == 1){
entityTextures[i] = new Texture("swordsman.png");
swordsmanRegions = TextureRegion.split(entityTextures[i], 48, 48);
entitySprites[i] = new Sprite(swordsmanRegions[0][2]);
entitySprites[i].setX(e[i].getxPos());
entitySprites[i].setY(e[i].getyPos());
}
if(e[i].getId() == 2){
arrowTextures[i] = new Texture("key.png");
arrowSprites[i] = new Sprite(arrowTextures[i]);
arrowSprites[i].setX(e[i].getxPos());
arrowSprites[i].setY(e[i].getyPos());
}
}
//BATCH
@ -196,41 +217,19 @@ public class GameScreen {
}
public void newEntity(int i,Entity e, float x, float y){
if(e.getId() == 0){ //nimmt entity ID -> 0 = Archer || 1 = Swordsman || 2 = Arrow
entityTextures[i] = new Texture("archer.png");
archerRegions = TextureRegion.split(entityTextures[i], 48, 48);
entitySprites[i] = new Sprite(archerRegions[0][2]);
entitySprites[i].setX(x);
entitySprites[i].setY(y);
}
if(e.getId() == 1){
entityTextures[i] = new Texture("swordsman.png");
swordsmanRegions = TextureRegion.split(entityTextures[i], 48, 48);
entitySprites[i] = new Sprite(swordsmanRegions[0][2]);
entitySprites[i].setX(x);
entitySprites[i].setY(y);
}
if(e.getId() == 2){
arrowTextures[i] = new Texture("key.png");
arrowSprites[i] = new Sprite(arrowTextures[i]);
arrowSprites[i].setX(x);
arrowSprites[i].setY(y);
}
}
public void playerAttack(Entity e[], Player p){
public Entity[] playerAttack(Entity e[], Player p){
if(p.direction() == 0){
Texture verticalAttack = new Texture("AttackHori.png");
Sprite verticalAttackSprite = new Sprite(verticalAttack);
verticalAttackSprite.setX(p.getxPos());
verticalAttackSprite.setY(p.getyPos());
for(int i = 0; i<entitySprites.length ; i++){
if(entitySprites[i] != null){
for(int i = 0; i< e.length ; i++){
if(e[i] != null){
if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), verticalAttackSprite.getBoundingRectangle())){
e[i] = null;
entitySprites[i] = null;
entityTextures[i] = null;
return e;
}
}
}
@ -240,12 +239,11 @@ public class GameScreen {
Sprite horizontalAttackSprite = new Sprite(horizontalAttack);
horizontalAttackSprite.setX(p.getxPos());
horizontalAttackSprite.setY(p.getyPos());
for(int i = 0; i<entitySprites.length ; i++){
for(int i = 0; i< e.length ; i++){
if(entitySprites[i] != null){
if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), horizontalAttackSprite.getBoundingRectangle())){
e[i] = null;
entitySprites[i] = null;
entityTextures[i] = null;
return e;
}
}
}
@ -259,8 +257,7 @@ public class GameScreen {
if(entitySprites[i] != null){
if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), verticalAttackSprite.getBoundingRectangle())){
e[i] = null;
entitySprites[i] = null;
entityTextures[i] = null;
return e;
}
}
}
@ -274,12 +271,12 @@ public class GameScreen {
if(entitySprites[i] != null){
if(Intersector.overlaps(entitySprites[i].getBoundingRectangle(), horizontalAttackSprite.getBoundingRectangle())){
e[i] = null;
entitySprites[i] = null;
entityTextures[i] = null;
return e;
}
}
}
}
return e;
}

2
core/src/com/dungeoncrawler/view/MainMenu.java
Unescape View File

@ -80,7 +80,7 @@ public class MainMenu{
}
public void render (SpriteBatch batch, Player p, Entity[] a) {
public void render (SpriteBatch batch) {
Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
cursor.setX(cursor.getX()+ CursorMoveX);

2
desktop/src/com/dungeoncrawler/desktop/DesktopLauncher.java
Unescape View File

@ -12,7 +12,7 @@ public class DesktopLauncher {
config.width = 1600;
config.height = 900;
config.title = "The Restless Caverns";
config.addIcon("logo.png", Files.FileType.Internal);
//config.addIcon("logo.png", Files.FileType.Internale);
new LwjglApplication(new Controller(), config);
}

Write Preview
Loading…
Cancel
Save