games/spacetac
games/spacetac
1
0
Fork 0
Code Releases Activity

map: Fixed refresh triggers (for displayed fleet mainly)

Browse source
This commit is contained in:
Michaël Lemaire 2017-07-16 19:55:38 +02:00
parent 266a9eee09
commit 81f7174b58
4 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/character/CharacterSheet.ts
View file

@ -192,7 +192,7 @@ module TS.SpaceTac.UI {
* Update the fleet sidebar
*/
updateFleet(fleet: Fleet) {
if (fleet != this.fleet) {
if (fleet != this.fleet || fleet.ships.length != this.portraits.children.length) {
this.portraits.removeAll(true);
this.fleet = fleet;
}

2
src/ui/map/ActiveMissionsDisplay.ts
View file

@ -22,6 +22,8 @@ module TS.SpaceTac.UI {
* Check if the active missions' status changed
*/
checkUpdate(): boolean {
this.missions.checkStatus();
let new_hash = this.missions.getHash();
if (new_hash != this.hash) {
this.hash = new_hash;

1
src/ui/map/FleetDisplay.ts
View file

@ -107,7 +107,6 @@ module TS.SpaceTac.UI {
this.game.state.start("router");
} else {
this.map.current_location.setFleetMoving(false);
this.map.updateInfo(location.star);
this.loopOrbit();
}

26
src/ui/map/UniverseMapView.ts
View file

@ -47,6 +47,9 @@ module TS.SpaceTac.UI {
zoom_in: Phaser.Button
zoom_out: Phaser.Button
// Options button
button_options: Phaser.Button
/**
* Init the view, binding it to a universe
*/
@ -110,11 +113,11 @@ module TS.SpaceTac.UI {
this.zoom_out.anchor.set(0.5, 0.5);
this.layer_overlay.add(this.zoom_out);
this.tooltip.bindStaticText(this.zoom_out, "Zoom out");
let options = new Phaser.Button(this.game, 1436, 69, "map-buttons", () => this.showOptions(), undefined, 5, 2);
options.angle = -90;
options.anchor.set(0.5, 0.5);
this.layer_overlay.add(options);
this.tooltip.bindStaticText(options, "Game options");
this.button_options = new Phaser.Button(this.game, 1436, 69, "map-buttons", () => this.showOptions(), undefined, 5, 2);
this.button_options.angle = -90;
this.button_options.anchor.set(0.5, 0.5);
this.layer_overlay.add(this.button_options);
this.tooltip.bindStaticText(this.button_options, "Game options");
this.character_sheet = new CharacterSheet(this, this.getWidth() - 307);
this.character_sheet.show(this.player.fleet.ships[0], false);
@ -192,12 +195,7 @@ module TS.SpaceTac.UI {
this.actions.setFromLocation(this.player.fleet.location, this);
this.missions.checkUpdate();
this.conversation.updateFromMissions(this.player.missions, () => {
this.player.missions.checkStatus();
if (this.missions.checkUpdate()) {
this.refresh();
}
});
this.conversation.updateFromMissions(this.player.missions, () => this.checkMissionsUpdate());
if (interactive) {
this.setInteractionEnabled(true);
@ -319,7 +317,10 @@ module TS.SpaceTac.UI {
moveToLocation(dest: StarLocation): void {
if (this.interactive && dest != this.player.fleet.location) {
this.setInteractionEnabled(false);
this.player_fleet.moveToLocation(dest, 1, null, () => this.refresh());
this.player_fleet.moveToLocation(dest, 1, null, () => {
this.setInteractionEnabled(true);
this.refresh();
});
}
}
@ -332,6 +333,7 @@ module TS.SpaceTac.UI {
this.missions.setVisible(enabled && this.zoom == 2, 300);
this.animations.setVisible(this.zoom_in, enabled && this.zoom < 2, 300);
this.animations.setVisible(this.zoom_out, enabled && this.zoom > 0, 300);
this.animations.setVisible(this.button_options, enabled, 300);
this.animations.setVisible(this.character_sheet, enabled, 300);
}
}