da/HeatUp
1
0
Fork 0
mirror of https://github.com/jokerx3/HeatUp synced 2026-07-27 11:39:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:jokerx3/prp

Browse Source
This commit is contained in:
toksikk
2014-11-11 15:59:06 +01:00
parent 742a29259a c684221bdd
commit bb1efca992
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HeatUp/src/de/heatup/testing/Opponent.java
+7 -14
View File
@@ -55,25 +55,26 @@ public class Opponent extends Player {
this.prevX = this.getGridLocation().x; this.prevX = this.getGridLocation().x;
this.prevY = this.getGridLocation().y; this.prevY = this.getGridLocation().y;
// Kreuzung erkennen
if ( d == 'x' ) { if ( d == 'x' ) {
if ( MapGrid.getGridCell(this.getGridLocation().x, this.getGridLocation().y+1).isPath() ) { if ( CollisionHandler.checkCollision(this, 'd') ) {
this.move = false; this.move = false;
} }
if ( MapGrid.getGridCell(this.getGridLocation().x, this.getGridLocation().y-1).isPath() ) { if ( CollisionHandler.checkCollision(this, 'u') ) {
this.move = false; this.move = false;
} }
} }
if ( d == 'y' ) { if ( d == 'y' ) {
if ( MapGrid.getGridCell(this.getGridLocation().x-1, this.getGridLocation().y).isPath() ) { if ( CollisionHandler.checkCollision(this, 'l') ) {
this.move = false; this.move = false;
} }
if ( MapGrid.getGridCell(this.getGridLocation().x+1, this.getGridLocation().y).isPath() ) { if ( CollisionHandler.checkCollision(this, 'r') ) {
this.move = false; this.move = false;
} }
} }
// Umentscheiden oder weiter in die vorgegeben Richtung // Umentscheiden oder weiter in die vorgegeben Richtung
if ( ! this.move ) { if ( ! this.move ) {
//Logger.write("Redeciding..."); //Logger.write("Redeciding...");
@@ -85,7 +86,7 @@ public class Opponent extends Player {
} }
} else { } else {
Logger.write("Moving..."); //Logger.write("Moving...");
} }
this.move = true; this.move = true;
@@ -119,7 +120,6 @@ public class Opponent extends Player {
} }
if (CollisionHandler.checkCollision(this, charDir)) { if (CollisionHandler.checkCollision(this, charDir)) {
System.out.println("Kollision!");
this.setGridLocation(testX, testY); this.setGridLocation(testX, testY);
this.prevd = d; this.prevd = d;
this.previ = i; this.previ = i;
@@ -156,8 +156,6 @@ public class Opponent extends Player {
} }
if (stepCounter <= 0) { if (stepCounter <= 0) {
stepCounter = 25; stepCounter = 25;
if ( ! MapGrid.getGridCell(newx,newy).isPath()) {
redecide = true; redecide = true;
animate = false; animate = false;
} else { } else {
@@ -165,9 +163,4 @@ public class Opponent extends Player {
} }
} }
} }
}
} }