Skip to content

Commit f901e58

Browse files
hyx3179oliversalzburg
authored andcommitted
refactor(ui): Use the Array build in types
1 parent a2f51e6 commit f901e58

File tree

2 files changed

+5
-18
lines changed

2 files changed

+5
-18
lines changed

packages/kitten-scientists/source/ui/BonfireSettingsUi.ts

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,16 @@ export class BonfireSettingsUi extends SettingsSectionUi<BonfireSettings> {
2222
this._trigger.element.insertAfter(this._expando.element);
2323
this.children.add(this._trigger);
2424

25-
const stagedBuildingArray: Array<StagedBuilding> = [
26-
"solarfarm",
27-
"hydroplant",
28-
"dataCenter",
29-
"spaceport",
30-
"broadcasttower",
31-
];
32-
3325
this._buildings = [];
3426
for (const buildingGroup of this._host.game.bld.buildingGroups) {
3527
this._buildings.push(new HeaderListItem(this._host, buildingGroup.title));
3628
for (const building of buildingGroup.buildings) {
3729
if (building === "unicornPasture" || isNil(this.setting.buildings[building])) continue;
3830
const meta = this._host.game.bld.getBuildingExt(building).meta;
3931
if (!isNil(meta.stages)) {
40-
const name = stagedBuildingArray.shift() as StagedBuilding;
32+
const name = Object.values(this.setting.buildings).find(
33+
item => item.baseBuilding === building,
34+
)?.building as StagedBuilding;
4135
this._buildings.push(
4236
this._getBuildOption(this.setting.buildings[building], meta.stages[0].label),
4337
this._getBuildOption(this.setting.buildings[name], meta.stages[1].label, false, true),

packages/kitten-scientists/source/ui/ReligionSettingsUi.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { isNil } from "@oliversalzburg/js-utils/nil.js";
22
import { UserScript } from "../UserScript.js";
3-
import { ReligionItem } from "../index.js";
3+
import { UnicornItemArray, ZiggurathUpgrades } from "../index.js";
44
import { ReligionOptionsArray, ReligionSettings } from "../settings/ReligionSettings.js";
55
import { SettingsSectionUi } from "./SettingsSectionUi.js";
66
import { HeaderListItem } from "./components/HeaderListItem.js";
@@ -25,14 +25,7 @@ export class ReligionSettingsUi extends SettingsSectionUi<ReligionSettings> {
2525
this._trigger.element.insertAfter(this._expando.element);
2626
this.children.add(this._trigger);
2727

28-
const unicornsArray: Array<ReligionItem> = [
29-
"ivoryCitadel",
30-
"ivoryTower",
31-
"skyPalace",
32-
"sunspire",
33-
"unicornTomb",
34-
"unicornUtopia",
35-
];
28+
const unicornsArray: Array<ZiggurathUpgrades | "unicornPasture"> = [...UnicornItemArray];
3629

3730
this._unicornBuildings = [
3831
this._getBuildOption(

0 commit comments

Comments
 (0)