ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt1-racetrack
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Track feature #21

Merged
fassband merged 9 commits from track-feature into main 2022-03-11 18:41:11 +01:00
Conversation 0 Commits 9 Files Changed 6 +12 -6
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 46e6b838c2 - Show all commits

18
src/main/java/ch/zhaw/pm2/racetrack/Track.java
View File

@ -193,15 +193,21 @@ public class Track implements TrackSpecification {
//Adds Car at new Position //Adds Car at new Position
positionVector = cars.get(carIndex).nextPosition(); positionVector = cars.get(carIndex).nextPosition();
line = track.get(positionVector.getY()); line = track.get(positionVector.getY());
line = line.substring(0,positionVector.getX()) + cars.get(carIndex).getId() + line.substring(positionVector.getX()+1); line = line.substring(0,positionVector.getX()) + cars.get(carIndex).getID() + line.substring(positionVector.getX()+1);
track.add(positionVector.getY(),line); track.add(positionVector.getY(),line);
//Change position of car //Change position of car
getCar(carIndex).move(); getCar(carIndex).move();
} }
public char getRealCharAtPosition(PositionVector positionVector) { /**
return track.get(positionVector.getY()).charAt(positionVector.getX()); * This Method will check if the Car could crash at the specific position
* @param positionVector the position to check if the car could crash
* @return true if car would crash. Else false.
*/
public boolean willCrashAtPosition(PositionVector positionVector) {
char charAtPosition = track.get(positionVector.getY()).charAt(positionVector.getX());
return charAtPosition != ConfigSpecification.SpaceType.TRACK.value;
} }
/** /**
@ -255,7 +261,7 @@ public class Track implements TrackSpecification {
*/ */
@Override @Override
public char getCarId(int carIndex) { public char getCarId(int carIndex) {
return cars.get(carIndex).getId(); return cars.get(carIndex).getID();
} }
/** /**
@ -267,7 +273,7 @@ public class Track implements TrackSpecification {
*/ */
@Override @Override
public PositionVector getCarPos(int carIndex) { public PositionVector getCarPos(int carIndex) {
return findChar(cars.get(carIndex).getId()); return findChar(cars.get(carIndex).getID());
} }
/** /**
@ -294,7 +300,7 @@ public class Track implements TrackSpecification {
public char getCharAtPosition(int y, int x, Config.SpaceType currentSpace) { public char getCharAtPosition(int y, int x, Config.SpaceType currentSpace) {
char charAtPos = track.get(y).charAt(x); char charAtPos = track.get(y).charAt(x);
for (Car car : cars) { for (Car car : cars) {
if(charAtPos == car.getId()) { if(charAtPos == car.getID()) {
if(car.isCrashed()) { if(car.isCrashed()) {
return CRASH_INDICATOR; return CRASH_INDICATOR;
} }