mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-22 06:22:19 +00:00
6a1e34b16a
## Description: Add progress bars to show construction time, loading time and health bars in the UI layer The progress bars always show at least one pixel of progression (better visuals)    ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced - [x] I understand that submitting code with bugs that could have been caught through manual testing blocks releases and new features for all contributors ## Please put your Discord username so you can be contacted if a bug or regression is found: Vivacious Box --------- Co-authored-by: evanpelle <evanpelle@gmail.com>
137 lines
3.9 KiB
TypeScript
137 lines
3.9 KiB
TypeScript
/**
|
|
* @jest-environment jsdom
|
|
*/
|
|
import { UILayer } from "../../../src/client/graphics/layers/UILayer";
|
|
import { UnitSelectionEvent } from "../../../src/client/InputHandler";
|
|
import { UnitView } from "../../../src/core/game/GameView";
|
|
|
|
describe("UILayer", () => {
|
|
let game: any;
|
|
let eventBus: any;
|
|
let transformHandler: any;
|
|
|
|
beforeEach(() => {
|
|
game = {
|
|
width: () => 100,
|
|
height: () => 100,
|
|
config: () => ({
|
|
theme: () => ({
|
|
territoryColor: () => ({
|
|
lighten: () => ({ alpha: () => ({ toRgbString: () => "#fff" }) }),
|
|
}),
|
|
}),
|
|
}),
|
|
x: () => 10,
|
|
y: () => 10,
|
|
unitInfo: () => ({ maxHealth: 10, constructionDuration: 5 }),
|
|
myPlayer: () => ({ id: () => 1 }),
|
|
ticks: () => 1,
|
|
updatesSinceLastTick: () => undefined,
|
|
};
|
|
eventBus = { on: jest.fn() };
|
|
transformHandler = {};
|
|
});
|
|
|
|
it("should initialize and redraw canvas", () => {
|
|
const ui = new UILayer(game, eventBus, transformHandler);
|
|
ui.redraw();
|
|
expect(ui["canvas"].width).toBe(100);
|
|
expect(ui["canvas"].height).toBe(100);
|
|
expect(ui["context"]).not.toBeNull();
|
|
});
|
|
|
|
it("should handle unit selection event", () => {
|
|
const ui = new UILayer(game, eventBus, transformHandler);
|
|
ui.redraw();
|
|
const unit = {
|
|
type: () => "Warship",
|
|
isActive: () => true,
|
|
tile: () => ({}),
|
|
owner: () => ({}),
|
|
};
|
|
const event = { isSelected: true, unit };
|
|
ui.drawSelectionBox = jest.fn();
|
|
ui["onUnitSelection"](event as UnitSelectionEvent);
|
|
expect(ui.drawSelectionBox).toHaveBeenCalledWith(unit);
|
|
});
|
|
|
|
it("should add and clear health bars", () => {
|
|
const ui = new UILayer(game, eventBus, transformHandler);
|
|
ui.redraw();
|
|
const unit = {
|
|
id: () => 1,
|
|
type: () => "Warship",
|
|
health: () => 5,
|
|
tile: () => ({}),
|
|
owner: () => ({}),
|
|
isActive: () => true,
|
|
} as unknown as UnitView;
|
|
ui.drawHealthBar(unit);
|
|
expect(ui["allHealthBars"].has(1)).toBe(true);
|
|
|
|
// a full hp unit doesnt have a health bar
|
|
unit.health = () => 10;
|
|
ui.drawHealthBar(unit);
|
|
expect(ui["allHealthBars"].has(1)).toBe(false);
|
|
|
|
// a dead unit doesnt have a health bar
|
|
unit.health = () => 5;
|
|
ui.drawHealthBar(unit);
|
|
expect(ui["allHealthBars"].has(1)).toBe(true);
|
|
unit.health = () => 0;
|
|
ui.drawHealthBar(unit);
|
|
expect(ui["allHealthBars"].has(1)).toBe(false);
|
|
});
|
|
|
|
it("should add loading bar for unit", () => {
|
|
const ui = new UILayer(game, eventBus, transformHandler);
|
|
ui.redraw();
|
|
const unit = {
|
|
id: () => 2,
|
|
tile: () => ({}),
|
|
isActive: () => true,
|
|
} as unknown as UnitView;
|
|
ui.drawLoadingBar(unit, 5);
|
|
expect(ui["allProgressBars"].has(2)).toBe(true);
|
|
});
|
|
|
|
it("should remove loading bar for inactive unit", () => {
|
|
const ui = new UILayer(game, eventBus, transformHandler);
|
|
ui.redraw();
|
|
const unit = {
|
|
id: () => 2,
|
|
type: () => "Construction",
|
|
constructionType: () => "City",
|
|
owner: () => ({ id: () => 1 }),
|
|
tile: () => ({}),
|
|
isActive: () => true,
|
|
} as unknown as UnitView;
|
|
ui.onUnitEvent(unit);
|
|
expect(ui["allProgressBars"].has(2)).toBe(true);
|
|
|
|
// an inactive unit should not have a loading bar
|
|
unit.isActive = () => false;
|
|
ui.tick();
|
|
expect(ui["allProgressBars"].has(2)).toBe(false);
|
|
});
|
|
|
|
it("should remove loading bar for a finished progress bar", () => {
|
|
const ui = new UILayer(game, eventBus, transformHandler);
|
|
ui.redraw();
|
|
const unit = {
|
|
id: () => 2,
|
|
type: () => "Construction",
|
|
constructionType: () => "City",
|
|
owner: () => ({ id: () => 1 }),
|
|
tile: () => ({}),
|
|
isActive: () => true,
|
|
} as unknown as UnitView;
|
|
ui.onUnitEvent(unit);
|
|
expect(ui["allProgressBars"].has(2)).toBe(true);
|
|
|
|
game.ticks = () => 6; // simulate enough ticks for completion
|
|
ui.tick();
|
|
expect(ui["allProgressBars"].has(2)).toBe(false);
|
|
});
|
|
});
|