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

fixed return of camera

Browse Source
This commit is contained in:
musilto9 2020-03-24 21:09:48 +01:00
parent 5741aef781
commit 050344648d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,8 +99,10 @@ public class InteractionCell extends Cell {
if (!window.getCamera().getCameraBound()) {
window.getCamera().returnFreeCamera();
}
WindowOfFreeMove.setCanPersonMove(true);
else {
Person.setInEvent(false);
WindowOfFreeMove.setCanPersonMove(true);
}
}
@Override

9
src/main/java/ruscz/game/gameOfProd/Windows/Camera.java
View File

@ -78,12 +78,20 @@ public class Camera {
if (coordX != endX || coordY != endY) {
int distanceX = endX - startX;
int distanceY = endY - startY;
if (Math.abs(distanceX) < CELL_SIZE && Math.abs(distanceY) < CELL_SIZE) {
isBound = true;
isReturning = false;
return;
}
int stepX = distanceX * speed / CELL_SIZE;
int stepY = distanceY * speed / CELL_SIZE;
canvas.setLocation(coordX + stepX, coordY + stepY);
}
if (coordX == endX && coordY == endY && isReturning) {
isBound = true;
isReturning = false;
window.setCanPersonMove(true);
window.getMapPainter().getActualMap().getPerson().setInEvent(false);
}
}
@ -105,7 +113,6 @@ public class Camera {
}
speed = 1;
isReturning = true;
isBound = true; //SMTH WRONG, BUT IT WORKS
}
public void setCameraStart() {

2
src/main/resources/roses-are-red.txt
View File

@ -1,4 +1,4 @@
Roses are red<br/>violets are blue
<cameraFree> -40 0 1
<cameraFree> -240 -40 1
unexpected "{"<br/>on line 32
<end>