nikita/game-of-prod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved cameraFree

Browse Source
This commit is contained in:
musilto9 2020-04-16 11:36:00 +02:00
parent 1fc63bd1d9
commit 22b177ca57
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ruscz/game/gameOfProd/Cells/InteractionCell.java
View File

@ -50,6 +50,7 @@ public class InteractionCell extends Cell {
public void readNextLine() { public void readNextLine() {
if (scanner.hasNextLine() && !dialog.getTimerIsRunning()) { if (scanner.hasNextLine() && !dialog.getTimerIsRunning()) {
String data = scanner.nextLine(); String data = scanner.nextLine();
window.getCamera().setCameraFirstMove(false);
if (data.equals("<end>")) { if (data.equals("<end>")) {
endEvent(); endEvent();
} }
@ -70,6 +71,7 @@ public class InteractionCell extends Cell {
readNextLine(); readNextLine();
} }
else if (data.contains("<wait>")) { else if (data.contains("<wait>")) {
window.getCamera().setCameraFirstMove(true);
return; return;
} }
else if (data.contains("<dialog>")) { else if (data.contains("<dialog>")) {

1
src/main/java/ruscz/game/gameOfProd/Cells/Person.java
View File

@ -94,6 +94,7 @@ public class Person extends Cell {
} }
else if (map.isActiveTriggerCell(x,y) && isInEvent) { else if (map.isActiveTriggerCell(x,y) && isInEvent) {
map.findTriggerByXY(x,y).readNextLine(); map.findTriggerByXY(x,y).readNextLine();
} }
else if (isDoorInFront(x,y,directionSight)) { else if (isDoorInFront(x,y,directionSight)) {
DoorCell door = map.findDoorByXY(x, y, directionSight); DoorCell door = map.findDoorByXY(x, y, directionSight);