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

map: Fixed location badge not updating

Browse source
This commit is contained in:
Michaël Lemaire 2017-09-13 00:37:56 +02:00
parent 55d83b1649
commit 98e75c67c8
3 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
TODO.md
View file

@ -21,7 +21,6 @@ Map/story
* Forbid to end up with more than 5 ships in the fleet because of escorts
* Fix problems when several dialogs are active at the same time
* Handle case where cargo is full to give a reward (give money?)
* Fix question mark not being cleared on no encounter
Character sheet
---------------

30
src/ui/map/StarSystemDisplay.spec.ts Normal file
View file

@ -0,0 +1,30 @@
module TS.SpaceTac.UI.Specs {
describe("StarSystemDisplay", function () {
let testgame = setupMapview();
it("displays a badge with the current state for a star location", function () {
let mapview = testgame.mapview;
let location = nn(mapview.player.fleet.location);
let ssdisplay = nn(first(mapview.starsystems, ss => ss.starsystem == location.star));
let l1display = nn(first(ssdisplay.locations, loc => loc[0] == location));
expect(l1display[2].name).toEqual("map-status-dockyard");
let l2display = nn(first(ssdisplay.locations, loc => loc[0] != location));
expect(l2display[2].name).toEqual("map-status-unvisited");
l2display[0].setupEncounter();
ssdisplay.updateInfo(2, true);
expect(l2display[2].name).toEqual("map-status-unvisited");
mapview.player.setVisited(l2display[0]);
ssdisplay.updateInfo(2, true);
expect(l2display[2].name).toEqual("map-status-enemy");
l2display[0].shop = null;
l2display[0].clearEncounter();
ssdisplay.updateInfo(2, true);
expect(l2display[2].name).toEqual("map-status-clear");
});
});
}

7
src/ui/map/StarSystemDisplay.ts
View file

@ -60,8 +60,8 @@ module TS.SpaceTac.UI {
});
if (location_sprite) {
let frame = this.getBadgeFrame(location);
let status_badge = this.addImage(location.x + 0.005, location.y + 0.005, `map-status-${frame}`);
let status = this.getBadgeFrame(location);
let status_badge = this.addImage(location.x + 0.005, location.y + 0.005, `map-status-${status}`);
this.locations.push([location, location_sprite, status_badge]);
}
});
@ -127,7 +127,8 @@ module TS.SpaceTac.UI {
*/
updateInfo(level: number, focus: boolean) {
this.locations.forEach(info => {
info[2].frame = this.getBadgeFrame(info[0]);
let status = this.getBadgeFrame(info[0]);
this.view.changeImage(info[2], `map-status-${status}`);
});
// LOD