Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent saving during the tutorial #700

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Prevent saving during the tutorial #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion engine/src/main/java/org/destinationsol/game/SolGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ public void startGame(String shipName, boolean isNewGame, EntitySystemManager en
Timer.schedule(new Timer.Task() {
@Override
public void run() {
if (!hero.isTranscendent()) {
if (!hero.isTranscendent() && !isTutorial()) {
saveShip();
// Console.getInstance().println("Game saved");
}
Expand Down
4 changes: 2 additions & 2 deletions engine/src/main/java/org/destinationsol/game/StarPort.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public void update(SolGame game) {
if (ship != null && ship.getMoney() >= FARE && ship.getPosition().dst(position) < .05f * SIZE) {
ship.setMoney(ship.getMoney() - FARE);
Transcendent transcendent = new Transcendent(ship, fromPlanet, toPlanet, game);
if (transcendent.getShip().getPilot().isPlayer()) {
if (transcendent.getShip().getPilot().isPlayer() && !game.isTutorial()) {
SaveManager.saveWorld(game.getWorldConfig());
game.getHero().setTranscendent(transcendent);
}
Expand Down Expand Up @@ -402,7 +402,7 @@ public void update(SolGame game) {
ship.setPos(position);
ship.setVelocity(new Vector2());
SolShip ship = this.ship.toObject(game);
if (ship.getPilot().isPlayer()) {
if (ship.getPilot().isPlayer() && !game.isTutorial()) {
game.getHero().setSolShip(ship, game);
SaveManager.saveWorld(game.getWorldConfig());
}
Expand Down