+
{{values[1]}}
@@ -24,7 +25,7 @@
+ 
@@ -87,7 +87,7 @@
+ [ghs-label-args]="[brewed.id, brewed.name, gameManager.characterManager.characterName(character,true) , otherCharacter ? gameManager.characterManager.characterName(otherCharacter,true): '']">
diff --git a/src/app/ui/figures/items/dialog/items-dialog.ts b/src/app/ui/figures/items/dialog/items-dialog.ts
index 4330e8a4d..6b6e703f0 100644
--- a/src/app/ui/figures/items/dialog/items-dialog.ts
+++ b/src/app/ui/figures/items/dialog/items-dialog.ts
@@ -243,7 +243,7 @@ export class ItemsDialogComponent implements OnInit, OnDestroy {
if (this.unlocks.indexOf(item) != -1 && revealed) {
gameManager.game.party.unlockedItems = gameManager.game.party.unlockedItems || [];
if (!this.unlocked(item)) {
- gameManager.stateManager.before("addUnlockedItem", item.edition, '' + item.id, item.name);
+ gameManager.stateManager.before("addUnlockedItem", item.edition, item.id, item.name);
gameManager.game.party.unlockedItems.push(new CountIdentifier('' + item.id, item.edition));
gameManager.stateManager.after();
this.updateEditionItems();
@@ -253,7 +253,7 @@ export class ItemsDialogComponent implements OnInit, OnDestroy {
removeUnlocked(itemData: ItemData) {
if (this.unlocked(itemData)) {
- gameManager.stateManager.before("removeUnlockedItem", itemData.edition, '' + itemData.id, itemData.name);
+ gameManager.stateManager.before("removeUnlockedItem", itemData.edition, itemData.id, itemData.name);
gameManager.game.party.unlockedItems = gameManager.game.party.unlockedItems || [];
gameManager.game.party.unlockedItems = gameManager.game.party.unlockedItems.filter((identifier) => identifier.name != '' + itemData.id || identifier.edition != itemData.edition);
gameManager.stateManager.after();
diff --git a/src/app/ui/figures/items/items.ts b/src/app/ui/figures/items/items.ts
index e262ee158..ecee7f516 100644
--- a/src/app/ui/figures/items/items.ts
+++ b/src/app/ui/figures/items/items.ts
@@ -306,7 +306,7 @@ export class CharacterItemsComponent implements OnInit, OnDestroy {
toggleEquippedItem(itemData: ItemData, force: boolean = false) {
const disabled = gameManager.game.state != GameState.draw || gameManager.game.round > 0;
if ((!disabled || force) && this.character.progress.items.find((identifier) => identifier.name == '' + itemData.id && identifier.edition == itemData.edition) != undefined) {
- gameManager.stateManager.before(gameManager.itemManager.isEquipped(itemData, this.character) ? 'unequipItem' : 'equipItem', gameManager.characterManager.characterName(this.character), '' + itemData.id, itemData.edition)
+ gameManager.stateManager.before(gameManager.itemManager.isEquipped(itemData, this.character) ? 'unequipItem' : 'equipItem', gameManager.characterManager.characterName(this.character), itemData.id, itemData.edition)
gameManager.itemManager.toggleEquippedItem(itemData, this.character, force)
gameManager.stateManager.after();
}
diff --git a/src/app/ui/figures/loot/loot-card.ts b/src/app/ui/figures/loot/loot-card.ts
index a06598a2f..63f2a9445 100644
--- a/src/app/ui/figures/loot/loot-card.ts
+++ b/src/app/ui/figures/loot/loot-card.ts
@@ -142,7 +142,7 @@ export class LootComponent implements OnInit, OnChanges {
if (this.loot.type == LootType.random_item && name) {
randomItemIdentifier = charBefore.progress.equippedItems.find((value) => value.marker == "loot-random-item");
} else {
- gameManager.stateManager.before("removeLootCard", gameManager.characterManager.characterName(charBefore), "game.loot." + this.loot.type, gameManager.lootManager.getValue(this.loot) + '');
+ gameManager.stateManager.before("removeLootCard", gameManager.characterManager.characterName(charBefore), "game.loot." + this.loot.type, gameManager.lootManager.getValue(this.loot));
charBefore.lootCards = charBefore.lootCards.filter((index) => index != this.index);
if (this.loot.type == LootType.money || this.loot.type == LootType.special1 || this.loot.type == LootType.special2) {
charBefore.loot -= gameManager.lootManager.getValue(this.loot);
@@ -163,7 +163,7 @@ export class LootComponent implements OnInit, OnChanges {
const character = gameManager.game.figures.find((figure) => figure instanceof Character && figure.name == name);
if (character instanceof Character) {
if (this.loot.type != LootType.random_item) {
- gameManager.stateManager.before("addLootCard", gameManager.characterManager.characterName(character), "game.loot." + this.loot.type, gameManager.lootManager.getValue(this.loot) + '');
+ gameManager.stateManager.before("addLootCard", gameManager.characterManager.characterName(character), "game.loot." + this.loot.type, gameManager.lootManager.getValue(this.loot));
gameManager.lootManager.applyLoot(this.loot, character, this.index);
gameManager.stateManager.after();
} else {
@@ -179,7 +179,7 @@ export class LootComponent implements OnInit, OnChanges {
next: (result) => {
if (result) {
const item = result as ItemData;
- gameManager.stateManager.before("lootRandomItem", '' + item.id, item.edition, item.name, gameManager.characterManager.characterName(character));
+ gameManager.stateManager.before("lootRandomItem", item.id, item.edition, item.name, gameManager.characterManager.characterName(character));
let itemIdentifier: Identifier = new Identifier('' + item.id, item.edition);
gameManager.itemManager.addItemCount(item);
if (character.lootCards.indexOf(this.index) == -1) {
diff --git a/src/app/ui/figures/loot/loot-deck.ts b/src/app/ui/figures/loot/loot-deck.ts
index c68ba4f3f..91f4df858 100644
--- a/src/app/ui/figures/loot/loot-deck.ts
+++ b/src/app/ui/figures/loot/loot-deck.ts
@@ -184,7 +184,7 @@ export class LootDeckComponent implements OnInit, OnDestroy, OnChanges {
if (name) {
const character = gameManager.game.figures.find((figure) => figure instanceof Character && figure.name == name);
if (character instanceof Character) {
- gameManager.stateManager.before(loot.type == LootType.random_item ? "lootRandomItem" : "addResource", gameManager.characterManager.characterName(character), "game.loot." + loot.type, this.lootManager.getValue(loot) + '');
+ gameManager.stateManager.before(loot.type == LootType.random_item ? "lootRandomItem" : "addResource", gameManager.characterManager.characterName(character), "game.loot." + loot.type, this.lootManager.getValue(loot));
const result = gameManager.lootManager.applyLoot(loot, character, currentIndex);
gameManager.stateManager.after();
if (result) {
@@ -195,7 +195,7 @@ export class LootDeckComponent implements OnInit, OnDestroy, OnChanges {
next: (result) => {
if (result) {
const item = result as ItemData;
- gameManager.stateManager.before("lootRandomItem", '' + item.id, item.edition, item.name, gameManager.characterManager.characterName(character));
+ gameManager.stateManager.before("lootRandomItem", item.id, item.edition, item.name, gameManager.characterManager.characterName(character));
let itemIdentifier: Identifier = new Identifier('' + item.id, item.edition);
gameManager.itemManager.addItemCount(item);
if (character.lootCards.indexOf(currentIndex) == -1) {
@@ -243,7 +243,7 @@ export class LootDeckComponent implements OnInit, OnDestroy, OnChanges {
next: (result) => {
if (result) {
const item = result as ItemData;
- gameManager.stateManager.before("lootRandomItem", '' + item.id, item.edition, item.name, gameManager.characterManager.characterName(activeCharacter));
+ gameManager.stateManager.before("lootRandomItem", item.id, item.edition, item.name, gameManager.characterManager.characterName(activeCharacter));
let itemIdentifier: Identifier = new Identifier('' + item.id, item.edition);
gameManager.itemManager.addItemCount(item);
if (activeCharacter.lootCards.indexOf(this.current) == -1) {
diff --git a/src/app/ui/figures/monster/dialogs/numberpicker-dialog.html b/src/app/ui/figures/monster/dialogs/numberpicker-dialog.html
index efd6bd464..506443eb3 100644
--- a/src/app/ui/figures/monster/dialogs/numberpicker-dialog.html
+++ b/src/app/ui/figures/monster/dialogs/numberpicker-dialog.html
@@ -13,9 +13,9 @@
+ [ghs-label-args]="[entity.type, entity.number]">
+ [ghs-label-args]="[type, entitiesLeft()]">
diff --git a/src/app/ui/figures/monster/stats/stats.html b/src/app/ui/figures/monster/stats/stats.html
index 7716d12d3..8643434f5 100644
--- a/src/app/ui/figures/monster/stats/stats.html
+++ b/src/app/ui/figures/monster/stats/stats.html
@@ -23,10 +23,12 @@
+
{ this.update(); } });
+ }
+
+ update() {
if (!settingsManager.settings.statAnimations) {
this.highlightActions = [];
+ } else {
+ this.highlightActions = [ActionType.shield, ActionType.retaliate];
}
this.edition = gameManager.getEdition(this.monster);
- this.catching = this.monster.catching && gameManager.game.party.buildings.find((buildingModel) => buildingModel.name == 'stables' && buildingModel.level > 0 && buildingModel.state != 'wrecked') != undefined;
+ this.catching = this.monster.pet != undefined && gameManager.buildingsManager.petsAvailable;
+ this.catched = this.catching && gameManager.buildingsManager.petsEnabled && gameManager.game.party.pets.find((value) => value.edition == this.monster.edition && value.name == this.monster.pet) != undefined;
+ this.setStats();
this.flying = this.monster.flying && (!this.monster.statEffect || this.monster.statEffect.flying != 'disabled') || this.monster.statEffect != undefined && this.monster.statEffect.flying == true;
- gameManager.uiChange.subscribe({
- next: () => {
- if (!settingsManager.settings.statAnimations) {
- this.highlightActions = [];
- } else {
- this.highlightActions = [ActionType.shield, ActionType.retaliate];
- }
- this.edition = gameManager.getEdition(this.monster);
- this.catching = this.monster.catching && gameManager.game.party.buildings.find((buildingModel) => buildingModel.name == 'stables' && buildingModel.level > 0 && buildingModel.state != 'wrecked') != undefined;
- this.setStats();
- this.flying = this.monster.flying && (!this.monster.statEffect || this.monster.statEffect.flying != 'disabled') || this.monster.statEffect != undefined && this.monster.statEffect.flying == true;
- }
- })
}
setStats() {
@@ -89,7 +85,7 @@ export class MonsterStatsComponent implements OnInit {
setLevel(value: number) {
if (value != this.monster.level) {
- gameManager.stateManager.before("setLevel", "data.monster." + this.monster.name, '' + value);
+ gameManager.stateManager.before("setLevel", "data.monster." + this.monster.name, value);
gameManager.monsterManager.setLevel(this.monster, value);
gameManager.monsterManager.setLevel(this.monsterCopy, value);
this.setStats();
diff --git a/src/app/ui/figures/objective-container/objective-container.ts b/src/app/ui/figures/objective-container/objective-container.ts
index feb270cec..d50fe6646 100644
--- a/src/app/ui/figures/objective-container/objective-container.ts
+++ b/src/app/ui/figures/objective-container/objective-container.ts
@@ -182,7 +182,7 @@ export class ObjectiveContainerComponent implements OnInit, OnDestroy {
dragHpEnd(value: number) {
if (this.health != 0 && this.entity) {
- gameManager.stateManager.before("changeObjectiveEntityHP", gameManager.objectiveManager.objectiveName(this.objective), ghsValueSign(this.health), '' + this.entity.number);
+ gameManager.stateManager.before("changeObjectiveEntityHP", gameManager.objectiveManager.objectiveName(this.objective), ghsValueSign(this.health), this.entity.number);
gameManager.entityManager.changeHealth(this.entity, this.objective, this.health);
if (this.entity.health <= 0 && this.entity.maxHealth > 0) {
gameManager.objectiveManager.removeObjective(this.objective)
@@ -240,7 +240,7 @@ export class ObjectiveContainerComponent implements OnInit, OnDestroy {
}
}
- gameManager.stateManager.before('addObjective.entity', '' + (number + 1), name);
+ gameManager.stateManager.before('addObjective.entity', (number + 1), name);
gameManager.objectiveManager.addObjectiveEntity(this.objective, number);
gameManager.stateManager.after();
}
diff --git a/src/app/ui/figures/party/buildings/buildings.html b/src/app/ui/figures/party/buildings/buildings.html
index 869dbf932..3080241b0 100644
--- a/src/app/ui/figures/party/buildings/buildings.html
+++ b/src/app/ui/figures/party/buildings/buildings.html
@@ -6,7 +6,8 @@
[ghs-label-attribute]="'placeholder'">
-
-
+
@@ -72,6 +73,22 @@
+
+
+
+
+
+
+ 
+
+
+
@@ -88,7 +105,7 @@
+ *ngIf="building.model.state == 'normal' && building.model.level < building.data.upgrades.length + 1 && !building.data.upgrades[building.model.level - 1].manual">
{{building.data.upgrades[building.model.level - 1].prosperity|| '-'}}
@@ -120,7 +137,7 @@
span {
+ z-index: 2;
}
.name {
@@ -216,6 +232,15 @@
}
}
}
+
+ &.stables,
+ &.garden {
+
+ .icon,
+ .text {
+ cursor: pointer;
+ }
+ }
}
}
diff --git a/src/app/ui/figures/party/buildings/buildings.ts b/src/app/ui/figures/party/buildings/buildings.ts
index cce5f0db5..af7026ff0 100644
--- a/src/app/ui/figures/party/buildings/buildings.ts
+++ b/src/app/ui/figures/party/buildings/buildings.ts
@@ -2,14 +2,17 @@ import { Dialog } from "@angular/cdk/dialog";
import { Component, Input, OnInit } from "@angular/core";
import { gameManager, GameManager } from "src/app/game/businesslogic/GameManager";
import { SettingsManager, settingsManager } from "src/app/game/businesslogic/SettingsManager";
+import { BuildingModel } from "src/app/game/model/Building";
import { Character } from "src/app/game/model/Character";
import { Party } from "src/app/game/model/Party";
import { Scenario } from "src/app/game/model/Scenario";
-import { BuildingCosts, BuildingData, BuildingModel, SelectResourceResult } from "src/app/game/model/data/BuildingData";
+import { BuildingCosts, BuildingData, SelectResourceResult } from "src/app/game/model/data/BuildingData";
import { LootType } from "src/app/game/model/data/Loot";
import { ScenarioData } from "src/app/game/model/data/ScenarioData";
import { ScenarioConclusionComponent } from "src/app/ui/footer/scenario/scenario-conclusion/scenario-conclusion";
import { ScenarioSummaryComponent } from "src/app/ui/footer/scenario/summary/scenario-summary";
+import { GardenComponent } from "./garden/garden";
+import { StablesComponent } from "./stables/stables";
import { BuildingUpgradeDialog } from "./upgrade-dialog/upgrade-dialog";
export type Building = { model: BuildingModel, data: BuildingData };
@@ -106,10 +109,6 @@ export class PartyBuildingsComponent implements OnInit {
}
upgradeable(building: Building): boolean {
- if (building.data.manualUpgrades > 0 && building.model.level >= building.data.manualUpgrades) {
- return true;
- }
-
let costs: BuildingCosts = building.model.level ? building.data.upgrades[building.model.level - 1] : building.data.costs;
if (building.model.level && !building.data.repair) {
return false;
@@ -191,7 +190,7 @@ export class PartyBuildingsComponent implements OnInit {
}
upgrade(building: Building, force: boolean = false) {
- if (building.model.level < building.data.upgrades.length + 1 || building.model.level < building.data.manualUpgrades + 1) {
+ if (building.model.level < building.data.upgrades.length + 1) {
if (this.upgradeable(building) || force) {
const costs = building.model.level ? building.data.upgrades[building.model.level - 1] : building.data.costs;
this.dialog.open(BuildingUpgradeDialog, {
@@ -206,7 +205,7 @@ export class PartyBuildingsComponent implements OnInit {
next: (result) => {
if (force && result == true || result instanceof SelectResourceResult) {
setTimeout(() => {
- gameManager.stateManager.before(building.model.level ? "upgradeBuilding" : "buildBuilding", building.data.id, building.model.name, '' + (building.model.level + 1));
+ gameManager.stateManager.before(building.model.level ? "upgradeBuilding" : "buildBuilding", building.data.id, building.model.name, (building.model.level + 1));
if (!force && result instanceof SelectResourceResult) {
gameManager.lootManager.applySelectResources(result);
}
@@ -378,7 +377,7 @@ export class PartyBuildingsComponent implements OnInit {
gameManager.stateManager.after();
} else if (!gameManager.buildingsManager.initialBuilding(building.data) && !gameManager.buildingsManager.availableBuilding(building.data) || building.model.level > 1) {
- gameManager.stateManager.before("downgradeBuilding", building.data.id, building.model.name, '' + (building.model.level - 1));
+ gameManager.stateManager.before("downgradeBuilding", building.data.id, building.model.name, (building.model.level - 1));
building.model.level--;
if (building.model.level == 0) {
building.model.state = 'normal';
@@ -398,4 +397,15 @@ export class PartyBuildingsComponent implements OnInit {
}
}
+ openStables() {
+ this.dialog.open(StablesComponent, {
+ panelClass: ['dialog']
+ })
+ }
+
+ openGarden() {
+ this.dialog.open(GardenComponent, {
+ panelClass: ['dialog']
+ })
+ }
}
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/garden/garden.html b/src/app/ui/figures/party/buildings/garden/garden.html
new file mode 100644
index 000000000..c30427d52
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/garden/garden.html
@@ -0,0 +1,21 @@
+> = {};
+
+ constructor() {
+ const garden = gameManager.game.party.buildings.find((value) => value.name == 'garden' && value.level);
+ if (garden) {
+ this.level = garden.level;
+ switch (this.level) {
+ case 1:
+ this.slots = 1;
+ break;
+ case 2:
+ case 3:
+ this.slots = 2;
+ break;
+ case 4:
+ this.slots = 3;
+ break;
+ }
+ }
+ this.garden = gameManager.game.party.garden || new GardenModel();
+ this.disabled = gameManager.game.scenario != undefined;
+
+ this.herbs.forEach((type) => {
+ this.resources[type] = (gameManager.game.party.loot[type] || 0);
+ gameManager.game.figures.forEach((figure) => {
+ if (figure instanceof Character) {
+ this.resources[type] = (this.resources[type] || 0) + (figure.progress.loot[type] || 0);
+ }
+ })
+
+ if (!this.activeHerb && this.resources[type]) {
+ this.activeHerb = type;
+ }
+ })
+ }
+
+ setActive(herb: LootType, force: boolean = false) {
+ if (this.activeHerb == herb || this.resources[herb] || force) {
+ if (this.activeHerb == herb) {
+ this.activeHerb = undefined;
+ } else {
+ this.activeHerb = herb;
+ }
+ }
+ }
+
+ plantHerb(slot: number, force: boolean = false) {
+ if (this.activeHerb && (!this.disabled || force) && slot >= 0 && slot < this.slots && this.herbs.indexOf(this.activeHerb) != -1 && this.garden.plots[slot] != this.activeHerb && (this.level > 2 || !this.garden.flipped)) {
+ gameManager.stateManager.before('buildings.garden.plant', this.activeHerb, slot);
+ this.garden.plots = this.garden.plots || [];
+ this.garden.plots[slot] = this.activeHerb;
+ gameManager.game.party.garden = Object.assign(new GardenModel(), this.garden);
+ gameManager.stateManager.after();
+ }
+ }
+
+ flipGarden(force: boolean = false) {
+ if ((!this.disabled || force) && this.level && this.level < 3) {
+ gameManager.stateManager.before('buildings.garden.' + (this.garden.flipped ? 'flipPlant' : 'flipHarvest'));
+ this.garden.flipped = !this.garden.flipped;
+ gameManager.game.party.garden = Object.assign(new GardenModel(), this.garden);
+ gameManager.stateManager.after();
+ }
+ }
+
+ toggleAutomation() {
+ gameManager.stateManager.before('buildings.garden.' + (this.garden.automated ? 'automationOff' : 'automationOn'));
+ this.garden.automated = !this.garden.automated;
+ gameManager.game.party.garden = Object.assign(new GardenModel(), this.garden);
+ gameManager.stateManager.after();
+ }
+
+}
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.html b/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.html
new file mode 100644
index 000000000..2723417e3
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.html
@@ -0,0 +1,36 @@
+();
+
+ settingsManager: SettingsManager = settingsManager;
+ gameManager: GameManager = gameManager;
+ fontsize: string = "1em";
+
+ ngOnInit(): void {
+ gameManager.uiChange.subscribe({
+ next: () => {
+ this.fontsize = (this.containerElement.nativeElement.offsetWidth * 0.072) + 'px';;
+ }
+ })
+ }
+
+ ngAfterViewInit(): void {
+ setTimeout(() => {
+ this.fontsize = (this.containerElement.nativeElement.offsetWidth * 0.072) + 'px';
+ }, 1);
+ }
+}
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/stables/stables.html b/src/app/ui/figures/party/buildings/stables/stables.html
new file mode 100644
index 000000000..0fb205cdf
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/stables/stables.html
@@ -0,0 +1,40 @@
+
-
+
diff --git a/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.ts b/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.ts
index 1e3b264d1..2fec73ef3 100644
--- a/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.ts
+++ b/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.ts
@@ -32,8 +32,8 @@ export class BuildingUpgradeDialog implements OnInit {
force: boolean;
characters: Character[] = [];
characterSpent: BuildingCosts[] = [];
- fhSupportSpent: BuildingCosts = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0 };
- spent: BuildingCosts = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0 };
+ fhSupportSpent: BuildingCosts = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0, "manual": 0 };
+ spent: BuildingCosts = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0, "manual": 0 };
rewards: BuildingRewards | undefined;
rewardsOnly: boolean;
discount: boolean;
@@ -47,7 +47,7 @@ export class BuildingUpgradeDialog implements OnInit {
this.rewardsOnly = this.action == 'rewards';
this.discount = gameManager.game.party.buildings.find((buildingModel) => buildingModel.name == "carpenter" && buildingModel.level > 0 && buildingModel.state != 'wrecked') != undefined && !this.repair;
if (!this.repair && this.building) {
- this.costs = data.costs || { gold: 0, hide: 0, lumber: 0, metal: 0, prosperity: 0 };
+ this.costs = data.costs || { gold: 0, hide: 0, lumber: 0, metal: 0, prosperity: 0, manual: 0 };
this.costs.gold = this.costs.gold || 0;
this.costs.hide = this.costs.hide || 0;
this.costs.lumber = this.costs.lumber || 0;
@@ -93,11 +93,11 @@ export class BuildingUpgradeDialog implements OnInit {
}
} else {
- this.costs = { "gold": data.costs && data.costs.gold || 0, "hide": this.repair, "lumber": this.repair, "metal": this.repair, "prosperity": 0 }
+ this.costs = { "gold": data.costs && data.costs.gold || 0, "hide": this.repair, "lumber": this.repair, "metal": this.repair, "prosperity": 0, "manual": 0 }
}
this.characters = gameManager.game.figures.filter((figure) => figure instanceof Character).map((figure) => figure as Character);
this.characters.forEach((character, index) => {
- this.characterSpent[index] = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0 };
+ this.characterSpent[index] = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0, "manual": 0 };
})
}
diff --git a/src/app/ui/figures/party/party-sheet-dialog.ts b/src/app/ui/figures/party/party-sheet-dialog.ts
index 4db9d05f1..82565eb89 100644
--- a/src/app/ui/figures/party/party-sheet-dialog.ts
+++ b/src/app/ui/figures/party/party-sheet-dialog.ts
@@ -225,13 +225,13 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
}
changePlayer(event: any, index: number) {
- gameManager.stateManager.before("setPlayer", event.target.value, '' + (index + 1));
+ gameManager.stateManager.before("setPlayer", event.target.value, (index + 1));
this.party.players[index] = event.target.value;
gameManager.stateManager.after();
}
removePlayer(index: number) {
- gameManager.stateManager.before("removePlayer", this.party.players[index], '' + (index + 1));
+ gameManager.stateManager.before("removePlayer", this.party.players[index], (index + 1));
this.party.players.splice(index, 1);
gameManager.stateManager.after();
}
@@ -800,7 +800,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
removeItem(item: ItemData) {
const identifier = this.party.unlockedItems.find((identifier) => identifier.name == '' + item.id && identifier.edition == item.edition);
if (identifier) {
- gameManager.stateManager.before("removeUnlockedItem", item.edition, '' + item.id, item.name);
+ gameManager.stateManager.before("removeUnlockedItem", item.edition, item.id, item.name);
this.party.unlockedItems.splice(this.party.unlockedItems.indexOf(identifier), 1);
gameManager.stateManager.after();
this.update();
@@ -816,7 +816,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
}
incItemCount(item: ItemData, itemIdentifier: CountIdentifier) {
- gameManager.stateManager.before("updateUnlockedItemCount", item.edition, '' + item.id, item.name);
+ gameManager.stateManager.before("updateUnlockedItemCount", item.edition, item.id, item.name);
if (itemIdentifier.count < 0) {
itemIdentifier.count = 1;
} else {
@@ -975,7 +975,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
}
removeConclusion(section: string, edition: string) {
- gameManager.stateManager.before("removeConclusion", gameManager.game.party.name, section + '');
+ gameManager.stateManager.before("removeConclusion", gameManager.game.party.name, section);
gameManager.game.party.conclusions = gameManager.game.party.conclusions.filter((conclusion) => conclusion.edition != edition || conclusion.index != section);
// TODO: remove week
gameManager.stateManager.after();
@@ -1067,7 +1067,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
if (!isNaN(+event.target.value)) {
const value = +event.target.value - this.moraleDefense;
if (this.party.defense != value) {
- gameManager.stateManager.before("setPartyTotalDefense", this.party.name, '' + value);
+ gameManager.stateManager.before("setPartyTotalDefense", this.party.name, value);
this.party.defense = value;
gameManager.stateManager.after();
}
diff --git a/src/app/ui/figures/party/requirements/requirements.html b/src/app/ui/figures/party/requirements/requirements.html
index 4af380a0f..b3102b071 100644
--- a/src/app/ui/figures/party/requirements/requirements.html
+++ b/src/app/ui/figures/party/requirements/requirements.html
@@ -11,7 +11,7 @@
+
+
+
+
+
+
+
+
{{building.data.upgrades[building.model.level - 1].prosperity|| '-'}}
@@ -120,7 +137,7 @@
span {
+ z-index: 2;
}
.name {
@@ -216,6 +232,15 @@
}
}
}
+
+ &.stables,
+ &.garden {
+
+ .icon,
+ .text {
+ cursor: pointer;
+ }
+ }
}
}
diff --git a/src/app/ui/figures/party/buildings/buildings.ts b/src/app/ui/figures/party/buildings/buildings.ts
index cce5f0db5..af7026ff0 100644
--- a/src/app/ui/figures/party/buildings/buildings.ts
+++ b/src/app/ui/figures/party/buildings/buildings.ts
@@ -2,14 +2,17 @@ import { Dialog } from "@angular/cdk/dialog";
import { Component, Input, OnInit } from "@angular/core";
import { gameManager, GameManager } from "src/app/game/businesslogic/GameManager";
import { SettingsManager, settingsManager } from "src/app/game/businesslogic/SettingsManager";
+import { BuildingModel } from "src/app/game/model/Building";
import { Character } from "src/app/game/model/Character";
import { Party } from "src/app/game/model/Party";
import { Scenario } from "src/app/game/model/Scenario";
-import { BuildingCosts, BuildingData, BuildingModel, SelectResourceResult } from "src/app/game/model/data/BuildingData";
+import { BuildingCosts, BuildingData, SelectResourceResult } from "src/app/game/model/data/BuildingData";
import { LootType } from "src/app/game/model/data/Loot";
import { ScenarioData } from "src/app/game/model/data/ScenarioData";
import { ScenarioConclusionComponent } from "src/app/ui/footer/scenario/scenario-conclusion/scenario-conclusion";
import { ScenarioSummaryComponent } from "src/app/ui/footer/scenario/summary/scenario-summary";
+import { GardenComponent } from "./garden/garden";
+import { StablesComponent } from "./stables/stables";
import { BuildingUpgradeDialog } from "./upgrade-dialog/upgrade-dialog";
export type Building = { model: BuildingModel, data: BuildingData };
@@ -106,10 +109,6 @@ export class PartyBuildingsComponent implements OnInit {
}
upgradeable(building: Building): boolean {
- if (building.data.manualUpgrades > 0 && building.model.level >= building.data.manualUpgrades) {
- return true;
- }
-
let costs: BuildingCosts = building.model.level ? building.data.upgrades[building.model.level - 1] : building.data.costs;
if (building.model.level && !building.data.repair) {
return false;
@@ -191,7 +190,7 @@ export class PartyBuildingsComponent implements OnInit {
}
upgrade(building: Building, force: boolean = false) {
- if (building.model.level < building.data.upgrades.length + 1 || building.model.level < building.data.manualUpgrades + 1) {
+ if (building.model.level < building.data.upgrades.length + 1) {
if (this.upgradeable(building) || force) {
const costs = building.model.level ? building.data.upgrades[building.model.level - 1] : building.data.costs;
this.dialog.open(BuildingUpgradeDialog, {
@@ -206,7 +205,7 @@ export class PartyBuildingsComponent implements OnInit {
next: (result) => {
if (force && result == true || result instanceof SelectResourceResult) {
setTimeout(() => {
- gameManager.stateManager.before(building.model.level ? "upgradeBuilding" : "buildBuilding", building.data.id, building.model.name, '' + (building.model.level + 1));
+ gameManager.stateManager.before(building.model.level ? "upgradeBuilding" : "buildBuilding", building.data.id, building.model.name, (building.model.level + 1));
if (!force && result instanceof SelectResourceResult) {
gameManager.lootManager.applySelectResources(result);
}
@@ -378,7 +377,7 @@ export class PartyBuildingsComponent implements OnInit {
gameManager.stateManager.after();
} else if (!gameManager.buildingsManager.initialBuilding(building.data) && !gameManager.buildingsManager.availableBuilding(building.data) || building.model.level > 1) {
- gameManager.stateManager.before("downgradeBuilding", building.data.id, building.model.name, '' + (building.model.level - 1));
+ gameManager.stateManager.before("downgradeBuilding", building.data.id, building.model.name, (building.model.level - 1));
building.model.level--;
if (building.model.level == 0) {
building.model.state = 'normal';
@@ -398,4 +397,15 @@ export class PartyBuildingsComponent implements OnInit {
}
}
+ openStables() {
+ this.dialog.open(StablesComponent, {
+ panelClass: ['dialog']
+ })
+ }
+
+ openGarden() {
+ this.dialog.open(GardenComponent, {
+ panelClass: ['dialog']
+ })
+ }
}
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/garden/garden.html b/src/app/ui/figures/party/buildings/garden/garden.html
new file mode 100644
index 000000000..c30427d52
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/garden/garden.html
@@ -0,0 +1,21 @@
+
+
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/garden/garden.scss b/src/app/ui/figures/party/buildings/garden/garden.scss
new file mode 100644
index 000000000..35efcc2bc
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/garden/garden.scss
@@ -0,0 +1,184 @@
+.garden-container {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ color: var(--ghs-color-white);
+
+
+ .menu {
+ display: flex;
+ flex-direction: column;
+
+ .title {
+ font-family: var(--ghs-font-title);
+ font-size: calc(var(--ghs-unit) * 3 * var(--ghs-dialog-factor));
+ }
+
+ .herbs {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+
+ .herb {
+ cursor: pointer;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin: calc(var(--ghs-unit) * 0.5 * var(--ghs-dialog-factor));
+
+ .ghs-svg {
+ width: calc(var(--ghs-unit) * 4 * var(--ghs-dialog-factor));
+ height: auto;
+ filter: var(--ghs-filter-gray);
+ }
+
+ .value {
+ font-size: calc(var(--ghs-unit) * 2 * var(--ghs-dialog-factor));
+ color: var(--ghs-color-gray);
+ }
+
+ &.active {
+ .ghs-svg {
+ filter: var(--ghs-filter-white);
+ }
+
+ .value {
+ color: var(--ghs-color-white);
+ }
+ }
+
+ &:hover {
+ .ghs-svg {
+ filter: var(--ghs-filter-white);
+ }
+
+ .value {
+ color: var(--ghs-color-white);
+ }
+ }
+
+ &.disabled {
+ cursor: initial;
+
+ .ghs-svg {
+ filter: var(--ghs-filter-darkgray);
+ }
+
+ .value {
+ color: var(--ghs-color-darkgray);
+ }
+
+ &:hover {
+ .ghs-svg {
+ filter: var(--ghs-filter-darkgray);
+ }
+
+ .value {
+ color: var(--ghs-color-darkgray);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ .garden {
+ position: relative;
+ display: block;
+ width: calc(var(--ghs-unit) * 31 * var(--ghs-dialog-factor));
+ height: calc(var(--ghs-unit) * 27.1 * var(--ghs-dialog-factor));
+ margin-top: calc(var(--ghs-unit) * 1 * var(--ghs-dialog-factor));
+ background-repeat: no-repeat;
+ background-size: contain;
+
+ &.level-1 {
+ background-image: url('~src/assets/images/world-map/fh/buildings/fh-24-garden-1.png');
+ }
+
+ &.level-2 {
+ background-image: url('~src/assets/images/world-map/fh/buildings/fh-24-garden-2.png');
+ }
+
+ &.level-3 {
+ background-image: url('~src/assets/images/world-map/fh/buildings/fh-24-garden-3.png');
+ }
+
+ &.level-4 {
+ background-image: url('~src/assets/images/world-map/fh/buildings/fh-24-garden-4.png');
+ }
+
+ .plot {
+ position: absolute;
+ display: block;
+ width: calc(var(--ghs-unit) * 5.7 * var(--ghs-dialog-factor));
+ height: calc(var(--ghs-unit) * 9.9 * var(--ghs-dialog-factor));
+ background-repeat: no-repeat;
+ background-size: 0;
+ transform: rotate(-45deg);
+ cursor: pointer;
+
+ &:hover {
+ background-size: contain;
+ filter: brightness(1.2);
+ }
+
+ &.disabled {
+ cursor: initial;
+
+ &:hover {
+ filter: brightness(0.7) grayscale(0.3);
+ }
+ }
+
+ &.arrowvine,
+ &.plant-arrowvine:hover {
+ background-image: url('~src/assets/images/world-map/fh/overlays/fh-24-garden-arrowvine.png');
+ }
+
+ &.axenut,
+ &.plant-axenut:hover {
+ background-image: url('~src/assets/images/world-map/fh/overlays/fh-24-garden-axenut.png');
+ }
+
+ &.corpsecap,
+ &.plant-corpsecap:hover {
+ background-image: url('~src/assets/images/world-map/fh/overlays/fh-24-garden-corpsecap.png');
+ }
+
+ &.flamefruit,
+ &.plant-flamefruit:hover {
+ background-image: url('~src/assets/images/world-map/fh/overlays/fh-24-garden-flamefruit.png');
+ }
+
+ &.rockroot,
+ &.plant-rockroot:hover {
+ background-image: url('~src/assets/images/world-map/fh/overlays/fh-24-garden-rockroot.png');
+ }
+
+ &.snowthistle,
+ &.plant-snowthistle:hover {
+ background-image: url('~src/assets/images/world-map/fh/overlays/fh-24-garden-snowthistle.png');
+ }
+
+ &.harvest {
+ background-size: contain;
+ }
+
+ &.plot-1 {
+ top: calc(var(--ghs-unit) * 14.3 * var(--ghs-dialog-factor));
+ left: calc(var(--ghs-unit) * 12.5 * var(--ghs-dialog-factor));
+ }
+
+ &.plot-2 {
+ top: calc(var(--ghs-unit) * 7.2 * var(--ghs-dialog-factor));
+ left: calc(var(--ghs-unit) * 5.5 * var(--ghs-dialog-factor));
+ }
+
+ &.plot-3 {
+ top: calc(var(--ghs-unit) * 3.6 * var(--ghs-dialog-factor));
+ left: calc(var(--ghs-unit) * 10.5 * var(--ghs-dialog-factor));
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/garden/garden.ts b/src/app/ui/figures/party/buildings/garden/garden.ts
new file mode 100644
index 000000000..8a4066711
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/garden/garden.ts
@@ -0,0 +1,93 @@
+import { Component } from "@angular/core";
+import { gameManager } from "src/app/game/businesslogic/GameManager";
+import { GardenModel } from "src/app/game/model/Building";
+import { Character } from "src/app/game/model/Character";
+import { herbResourceLootTypes, LootType } from "src/app/game/model/data/Loot";
+
+@Component({
+
+ selector: 'ghs-garden',
+ templateUrl: 'garden.html',
+ styleUrls: ['./garden.scss'],
+})
+export class GardenComponent {
+
+ level: number = 0;
+ slots: number = 0;
+ garden!: GardenModel;
+ herbs: LootType[] = herbResourceLootTypes;
+ activeHerb: LootType | undefined;
+ disabled: boolean = false;
+ resources: Partial
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.scss b/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.scss
new file mode 100644
index 000000000..1eb7b7487
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.scss
@@ -0,0 +1,160 @@
+.pet-container {
+ position: relative;
+ width: 100%;
+ padding-bottom: 147%;
+}
+
+.pet {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+
+ .front {
+ background-image: url('~src/assets/images/fh/pets/pets-card-front.png');
+ background-size: 100% 100%;
+ background-position: center center;
+ background-repeat: no-repeat;
+ border-radius: 0.5em;
+ background-clip: padding-box;
+
+ .artwork {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
+ mask-image: url('~src/assets/images/fh/pets/pets-card-front-mask.png');
+ mask-size: 100% 100%;
+ mask-position: center center;
+ mask-repeat: no-repeat;
+ }
+
+ .title {
+ position: absolute;
+ top: 4%;
+ left: 0;
+ width: 100%;
+ height: 10%;
+ display: flex;
+ color: var(--ghs-color-white);
+ justify-content: center;
+ align-items: center;
+ font-family: ghs-title-fh;
+ font-size: 1.3em;
+ filter: var(--ghs-filter-outline-thin);
+ }
+
+ .name-container {
+ position: absolute;
+ top: 14%;
+ left: 5%;
+ width: 95%;
+ height: 8%;
+ color: var(--ghs-color-white);
+ font-size: 0.8em;
+ font-family: ghs-normal-fh;
+ filter: var(--ghs-filter-outline-thin);
+ display: flex;
+ align-items: center;
+
+ .name {
+ font-family: ghs-extra-fh;
+ font-size: 1.05em;
+ margin-left: 3%;
+ flex-grow: 1;
+ }
+ }
+
+ .action {
+ position: absolute;
+ top: 74%;
+ left: 5%;
+ width: 75%;
+ height: 26%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ font-family: ghs-normal-fh;
+ font-size: 1.25em;
+ line-height: 0.8em;
+ }
+
+
+ .round,
+ .lost {
+ position: absolute;
+ top: 72%;
+ left: 80%;
+ width: 20%;
+ height: 13%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ font-size: 1.8em;
+
+ &.lost {
+ top: 83%;
+ }
+ }
+
+ .card-id {
+ position: absolute;
+ bottom: 0;
+ left: 78%;
+ width: 15%;
+ height: 6%;
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ font-family: ghs-normal;
+ font-size: 0.65em;
+ }
+
+ }
+
+ .back {
+ background-image: url('~src/assets/images/fh/pets/pets-card-back.png');
+ background-size: 100% 100%;
+ background-position: center center;
+ background-repeat: no-repeat;
+ border-radius: 0.5em;
+ background-clip: padding-box;
+
+ .id {
+ position: absolute;
+ top: 0;
+ left: 40%;
+ width: 20%;
+ height: 7%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-family: ghs-title-fh;
+ font-size: 1.2em;
+ }
+ }
+
+
+ &.confirm {
+ .revealed {
+ position: relative;
+ top: 0;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ color: var(--ghs-color-white);
+ font-size: 1.5em;
+ filter: drop-shadow(calc(var(--ghs-unit) * 0.2) calc(var(--ghs-unit) * 0.2) calc(var(--ghs-unit) * 0.2) var(--ghs-color-black));
+
+ .text {
+ text-align: center;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.ts b/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.ts
new file mode 100644
index 000000000..7272d060b
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/stables/pet-card/pet-card.ts
@@ -0,0 +1,37 @@
+import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from "@angular/core";
+import { GameManager, gameManager } from "src/app/game/businesslogic/GameManager";
+import { SettingsManager, settingsManager } from "src/app/game/businesslogic/SettingsManager";
+import { PetCard } from "src/app/game/model/data/PetCard";
+
+@Component({
+ selector: 'ghs-pet-card',
+ templateUrl: './pet-card.html',
+ styleUrls: ['./pet-card.scss']
+})
+export class PetCardComponent implements OnInit, AfterViewInit {
+
+ @ViewChild('container') containerElement!: ElementRef;
+ @Input() petCard!: PetCard | undefined;
+ @Input() flipped: boolean = false;
+ @Input() reveal: boolean = false;
+ @Input() name: string = "";
+ @Output() revealed = new EventEmitter
+
+
+
+
+
+
+ {{petCard.id}}
+
+
+ ![]()
+
+
+
+ : {{name}}
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ 0{{petCard.cardId}}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/stables/stables.scss b/src/app/ui/figures/party/buildings/stables/stables.scss
new file mode 100644
index 000000000..9a11c0065
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/stables/stables.scss
@@ -0,0 +1,140 @@
+.stables-container {
+ display: flex;
+ flex-direction: column;
+ color: var(--ghs-color-white);
+
+ .menu {
+ display: flex;
+ flex-wrap: wrap;
+ font-family: var(--ghs-font-title);
+ font-size: calc(var(--ghs-unit) * 3 * var(--ghs-dialog-factor));
+ justify-content: center;
+ align-items: center;
+ z-index: 1;
+
+ .capacity {
+ margin: calc(var(--ghs-unit) * 0.5 * var(--ghs-dialog-factor));
+
+ .used.full {
+ color: var(--ghs-color-yellow);
+ }
+
+ .used.warning {
+ color: var(--ghs-color-red);
+ }
+ }
+
+ label {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ cursor: pointer;
+ color: var(--ghs-color-white);
+ margin: calc(var(--ghs-unit) * 0.5 * var(--ghs-dialog-factor));
+ }
+ }
+
+ .pet-list {
+ position: relative;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: center;
+ margin: calc(var(--ghs-unit) * 2 * var(--ghs-dialog-factor));
+ min-height: calc(var(--ghs-unit) * 40.5 * var(--ghs-dialog-factor));
+
+ .empty {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-family: var(--ghs-font-text);
+ font-size: calc(var(--ghs-unit) * 3.5 * var(--ghs-dialog-factor));
+ color: var(--ghs-color-yellow);
+ }
+
+ .pet {
+ position: relative;
+ margin: calc(var(--ghs-unit) * 0.5 * var(--ghs-dialog-factor));
+ width: calc(var(--ghs-unit) * 27 * var(--ghs-dialog-factor));
+ height: calc(var(--ghs-unit) * 40.5 * var(--ghs-dialog-factor));
+
+ ghs-pet-card {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100%;
+ border: calc(var(--ghs-unit) * 0.35 * var(--ghs-dialog-factor)) solid transparent;
+ border-radius: calc(var(--ghs-unit) * 1 * var(--ghs-dialog-factor));
+ overflow: hidden;
+
+ &.unavailable {
+ cursor: initial;
+ border-color: var(--ghs-color-darkgray);
+ filter: grayscale(0.7);
+ }
+
+ &.disabled {
+ cursor: not-allowed;
+ opacity: 0.5;
+ }
+
+ &.edit {
+ cursor: initial;
+ }
+
+ &.selectable {
+ cursor: pointer;
+ }
+
+ &.selected {
+ border-color: var(--ghs-color-green);
+ opacity: 1;
+ }
+ }
+
+ input.name {
+ position: absolute;
+ top: calc(var(--ghs-unit) * 6.2 * var(--ghs-dialog-factor));
+ left: calc(var(--ghs-unit) * 5.35 * var(--ghs-dialog-factor));
+ width: calc(var(--ghs-unit) * 21 * var(--ghs-dialog-factor));
+ height: calc(var(--ghs-unit) * 2.3 * var(--ghs-dialog-factor));
+ color: var(--ghs-color-white);
+ font-family: ghs-extra-fh;
+ filter: var(--ghs-filter-outline-thin);
+ font-size: calc(var(--ghs-unit) * 1.6 * var(--ghs-dialog-factor));
+ }
+
+ .button-remove {
+ z-index: 1;
+ position: absolute;
+ display: flex;
+ cursor: pointer;
+ top: calc(var(--ghs-unit) * 1 * var(--ghs-dialog-factor));
+ right: calc(var(--ghs-unit) * 1 * var(--ghs-dialog-factor));
+ justify-content: center;
+ align-items: center;
+ width: calc(var(--ghs-unit) * 2.5 * var(--ghs-dialog-factor));
+ height: calc(var(--ghs-unit) * 2.5 * var(--ghs-dialog-factor));
+ color: var(--ghs-filter-white) var(--ghs-filter-shadow);
+
+ .ghs-svg {
+ filter: var(--ghs-filter-white) var(--ghs-filter-shadow);
+ }
+
+ &:hover .ghs-svg {
+ filter: var(--ghs-filter-red) var(--ghs-filter-shadow);
+ }
+ }
+
+ .button-lost {
+ z-index: 1;
+ position: absolute;
+ display: block;
+ cursor: pointer;
+ bottom: calc(var(--ghs-unit) * 3.5 * var(--ghs-dialog-factor));
+ right: calc(var(--ghs-unit) * 1.2 * var(--ghs-dialog-factor));
+ width: calc(var(--ghs-unit) * 3.5 * var(--ghs-dialog-factor));
+ height: calc(var(--ghs-unit) * 3.5 * var(--ghs-dialog-factor));
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/stables/stables.ts b/src/app/ui/figures/party/buildings/stables/stables.ts
new file mode 100644
index 000000000..0e53fe047
--- /dev/null
+++ b/src/app/ui/figures/party/buildings/stables/stables.ts
@@ -0,0 +1,160 @@
+import { Component, OnInit } from "@angular/core";
+import { gameManager } from "src/app/game/businesslogic/GameManager";
+import { PetCard, PetIdentifier } from "src/app/game/model/data/PetCard";
+
+@Component({
+
+ selector: 'ghs-stables',
+ templateUrl: 'stables.html',
+ styleUrls: ['./stables.scss'],
+})
+export class StablesComponent implements OnInit {
+
+ pets: { card: PetCard | undefined, model: PetIdentifier | undefined }[] = [];
+
+ edit: boolean = false;
+ select: boolean = false;
+ running: boolean = false;
+ showAll: boolean = false;
+
+ capacity: number = 0;
+ used: number = 0;
+ active: number = 0;
+
+ ngOnInit() {
+ this.update();
+ gameManager.uiChange.subscribe({
+ next: () => {
+ this.updateState();
+ }
+ })
+ }
+
+ update() {
+ this.select = gameManager.game.scenario != undefined && gameManager.roundManager.firstRound;
+ this.running = gameManager.game.scenario != undefined && !this.select;
+ this.used = 0;
+ this.pets = [];
+ const stables = gameManager.game.party.buildings.find((model) => model.name == 'stables' && model.level);
+
+ if (stables) {
+ this.active = stables.level < 3 ? 1 : 2;
+ this.capacity = 4 + Math.floor(stables.level / 2) * 4;
+ }
+
+ if (this.showAll) {
+ const editionData = gameManager.editionData.find((editionData) => editionData.edition == gameManager.currentEdition());
+ if (editionData && editionData.pets) {
+ editionData.pets.forEach((petCard) => {
+ const model = gameManager.game.party.pets.find((value) => value.edition == petCard.edition && value.name == petCard.id);
+ if (model) {
+ this.used++;
+ }
+ this.pets.push({ card: petCard, model: model });
+ })
+ }
+ }
+
+ gameManager.game.party.pets.forEach((value) => {
+ if (this.pets.find((pet) => pet.model && pet.model.edition && value.edition && pet.model.name == value.name) == undefined) {
+ const editionData = gameManager.editionData.find((editionData) => editionData.edition == value.edition);
+ if (editionData && editionData.pets) {
+ const petCard = editionData.pets.find((petCard) => petCard.edition == value.edition && petCard.id == value.name);
+ this.pets.push({ card: petCard, model: value });
+ } else {
+ this.pets.push({ card: undefined, model: value });
+ }
+ this.used++;
+ }
+ })
+
+ this.pets.sort((a, b) => {
+ if (a.model && !b.model) {
+ return -1;
+ } else if (!a.model && b.model) {
+ return 1;
+ } else if (a.model && b.model && a.model.active != b.model.active) {
+ return a.model.active ? -1 : 1;
+ } else if (a.card && b.card) {
+ if (a.card.id < b.card.id) {
+ return -1;
+ } else {
+ return 1;
+ }
+ } else if (a.model && b.model) {
+ if (a.model.name < b.model.name) {
+ return -1;
+ } else {
+ return 1;
+ }
+ }
+ return 0;
+ })
+ }
+
+ updateState() {
+ gameManager.game.party.pets.forEach((value) => {
+ const pet = this.pets.find((pet) => pet.model && pet.model.edition && value.edition && pet.model.name == value.name);
+ if (pet && pet.model) {
+ pet.model.active = value.active;
+ pet.model.lost = value.lost;
+ pet.model.petname = value.petname;
+ }
+ })
+ }
+
+ addPet(pet: { card: PetCard | undefined, model: PetIdentifier | undefined }) {
+ if (pet.card && gameManager.game.party.pets.find((value) => pet.card && value.edition == pet.card.edition && value.name == pet.card.id) == undefined) {
+ const model = new PetIdentifier(pet.card.id, pet.card.edition);
+ gameManager.stateManager.before('buildings.stables.pets.add', model.edition, model.name);
+ gameManager.game.party.pets.push(model);
+ pet.model = model;
+ this.used++;
+ gameManager.stateManager.after();
+ }
+ }
+
+ updatePet(event: any, model: PetIdentifier | undefined) {
+ if (model && event.target) {
+ const name = event.target.value;
+ gameManager.stateManager.before(name ? 'buildings.stables.pets.setName' : 'buildings.stables.pets.unsetName', model.edition, model.name, name);
+ model.petname = name;
+ gameManager.stateManager.after();
+ }
+ }
+
+ removePet(model: PetIdentifier | undefined) {
+ if (model) {
+ gameManager.stateManager.before('buildings.stables.pets.remove', model.edition, model.name);
+ gameManager.game.party.pets = gameManager.game.party.pets.filter((value) => value.edition != model.edition || value.name != model.name);
+ this.update();
+ gameManager.stateManager.after();
+ }
+ }
+
+ toggleLost(model: PetIdentifier | undefined, force: boolean = false) {
+ if (model && (!model.lost || force)) {
+ gameManager.stateManager.before(model.lost ? 'buildings.stables.pets.restore' : 'buildings.stables.pets.play', model.edition, model.name);
+ model.lost = !model.lost;
+ gameManager.stateManager.after();
+ }
+ }
+
+
+ toggleActive(model: PetIdentifier | undefined, force: boolean = false) {
+ if (model && !this.edit && (this.select || force)) {
+ gameManager.stateManager.before(model.active ? 'buildings.stables.pets.setInactive' : 'buildings.stables.pets.setActive', model.edition, model.name, model.petname);
+ model.active = !model.active;
+ const stables = gameManager.game.party.buildings.find((model) => model.name == 'stables' && model.level);
+ while (!force && stables && gameManager.game.party.pets.filter((value) => value.active).length > (stables.level < 3 ? 1 : 2)) {
+ const other = gameManager.game.party.pets.find((value) => value.active && value != model);
+ if (other) {
+ other.active = false;
+ }
+ }
+
+ gameManager.stateManager.after();
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.html b/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.html
index ff38df5ba..8b3782129 100644
--- a/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.html
+++ b/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.html
@@ -29,7 +29,7 @@
+
+
+
+
+
diff --git a/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.ts b/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.ts
index 1e3b264d1..2fec73ef3 100644
--- a/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.ts
+++ b/src/app/ui/figures/party/buildings/upgrade-dialog/upgrade-dialog.ts
@@ -32,8 +32,8 @@ export class BuildingUpgradeDialog implements OnInit {
force: boolean;
characters: Character[] = [];
characterSpent: BuildingCosts[] = [];
- fhSupportSpent: BuildingCosts = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0 };
- spent: BuildingCosts = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0 };
+ fhSupportSpent: BuildingCosts = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0, "manual": 0 };
+ spent: BuildingCosts = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0, "manual": 0 };
rewards: BuildingRewards | undefined;
rewardsOnly: boolean;
discount: boolean;
@@ -47,7 +47,7 @@ export class BuildingUpgradeDialog implements OnInit {
this.rewardsOnly = this.action == 'rewards';
this.discount = gameManager.game.party.buildings.find((buildingModel) => buildingModel.name == "carpenter" && buildingModel.level > 0 && buildingModel.state != 'wrecked') != undefined && !this.repair;
if (!this.repair && this.building) {
- this.costs = data.costs || { gold: 0, hide: 0, lumber: 0, metal: 0, prosperity: 0 };
+ this.costs = data.costs || { gold: 0, hide: 0, lumber: 0, metal: 0, prosperity: 0, manual: 0 };
this.costs.gold = this.costs.gold || 0;
this.costs.hide = this.costs.hide || 0;
this.costs.lumber = this.costs.lumber || 0;
@@ -93,11 +93,11 @@ export class BuildingUpgradeDialog implements OnInit {
}
} else {
- this.costs = { "gold": data.costs && data.costs.gold || 0, "hide": this.repair, "lumber": this.repair, "metal": this.repair, "prosperity": 0 }
+ this.costs = { "gold": data.costs && data.costs.gold || 0, "hide": this.repair, "lumber": this.repair, "metal": this.repair, "prosperity": 0, "manual": 0 }
}
this.characters = gameManager.game.figures.filter((figure) => figure instanceof Character).map((figure) => figure as Character);
this.characters.forEach((character, index) => {
- this.characterSpent[index] = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0 };
+ this.characterSpent[index] = { "gold": 0, "hide": 0, "lumber": 0, "metal": 0, "prosperity": 0, "manual": 0 };
})
}
diff --git a/src/app/ui/figures/party/party-sheet-dialog.ts b/src/app/ui/figures/party/party-sheet-dialog.ts
index 4db9d05f1..82565eb89 100644
--- a/src/app/ui/figures/party/party-sheet-dialog.ts
+++ b/src/app/ui/figures/party/party-sheet-dialog.ts
@@ -225,13 +225,13 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
}
changePlayer(event: any, index: number) {
- gameManager.stateManager.before("setPlayer", event.target.value, '' + (index + 1));
+ gameManager.stateManager.before("setPlayer", event.target.value, (index + 1));
this.party.players[index] = event.target.value;
gameManager.stateManager.after();
}
removePlayer(index: number) {
- gameManager.stateManager.before("removePlayer", this.party.players[index], '' + (index + 1));
+ gameManager.stateManager.before("removePlayer", this.party.players[index], (index + 1));
this.party.players.splice(index, 1);
gameManager.stateManager.after();
}
@@ -800,7 +800,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
removeItem(item: ItemData) {
const identifier = this.party.unlockedItems.find((identifier) => identifier.name == '' + item.id && identifier.edition == item.edition);
if (identifier) {
- gameManager.stateManager.before("removeUnlockedItem", item.edition, '' + item.id, item.name);
+ gameManager.stateManager.before("removeUnlockedItem", item.edition, item.id, item.name);
this.party.unlockedItems.splice(this.party.unlockedItems.indexOf(identifier), 1);
gameManager.stateManager.after();
this.update();
@@ -816,7 +816,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
}
incItemCount(item: ItemData, itemIdentifier: CountIdentifier) {
- gameManager.stateManager.before("updateUnlockedItemCount", item.edition, '' + item.id, item.name);
+ gameManager.stateManager.before("updateUnlockedItemCount", item.edition, item.id, item.name);
if (itemIdentifier.count < 0) {
itemIdentifier.count = 1;
} else {
@@ -975,7 +975,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
}
removeConclusion(section: string, edition: string) {
- gameManager.stateManager.before("removeConclusion", gameManager.game.party.name, section + '');
+ gameManager.stateManager.before("removeConclusion", gameManager.game.party.name, section);
gameManager.game.party.conclusions = gameManager.game.party.conclusions.filter((conclusion) => conclusion.edition != edition || conclusion.index != section);
// TODO: remove week
gameManager.stateManager.after();
@@ -1067,7 +1067,7 @@ export class PartySheetDialogComponent implements OnInit, OnDestroy {
if (!isNaN(+event.target.value)) {
const value = +event.target.value - this.moraleDefense;
if (this.party.defense != value) {
- gameManager.stateManager.before("setPartyTotalDefense", this.party.name, '' + value);
+ gameManager.stateManager.before("setPartyTotalDefense", this.party.name, value);
this.party.defense = value;
gameManager.stateManager.after();
}
diff --git a/src/app/ui/figures/party/requirements/requirements.html b/src/app/ui/figures/party/requirements/requirements.html
index 4af380a0f..b3102b071 100644
--- a/src/app/ui/figures/party/requirements/requirements.html
+++ b/src/app/ui/figures/party/requirements/requirements.html
@@ -11,7 +11,7 @@
+ [ghs-label-args]="[achievement.name, (achievement.required - achievement.count) , achievement.required]">
@@ -25,7 +25,7 @@
+ [ghs-label-args]="[achievement.name, (achievement.required - achievement.count), achievement.required]">
@@ -39,7 +39,7 @@
-
-
@@ -64,16 +64,16 @@
-
-
@@ -82,24 +82,24 @@
@@ -107,37 +107,37 @@
-
-
-
-
-
-
diff --git a/src/app/ui/figures/party/week-dialog/week-dialog.ts b/src/app/ui/figures/party/week-dialog/week-dialog.ts
index febf93d34..9428415fc 100644
--- a/src/app/ui/figures/party/week-dialog/week-dialog.ts
+++ b/src/app/ui/figures/party/week-dialog/week-dialog.ts
@@ -98,7 +98,7 @@ export class PartyWeekDialogComponent {
}
sectionElement.classList.add('error');
if (gameManager.game.party.weekSections[this.week]?.indexOf(sectionElement.value) == -1) {
- gameManager.stateManager.before("addPartyWeekSection", gameManager.game.party.name, this.week + '', sectionElement.value + '');
+ gameManager.stateManager.before("addPartyWeekSection", gameManager.game.party.name, this.week, sectionElement.value);
gameManager.game.party.weekSections[this.week]?.push(sectionElement.value);
sectionElement.classList.remove('error');
sectionElement.value = "";
@@ -108,7 +108,7 @@ export class PartyWeekDialogComponent {
removeSection(section: string) {
if (gameManager.game.party.weekSections[this.week]?.indexOf(section) != -1) {
- gameManager.stateManager.before("removePartyWeekSection", gameManager.game.party.name, this.week + '', section + '');
+ gameManager.stateManager.before("removePartyWeekSection", gameManager.game.party.name, this.week, section);
gameManager.game.party.weekSections[this.week]?.splice(gameManager.game.party.weekSections[this.week]?.indexOf(section) || -1, 1);
if (gameManager.game.party.weekSections[this.week]?.length == 0) {
delete gameManager.game.party.weekSections[this.week];
diff --git a/src/app/ui/figures/party/world-map/world-map.ts b/src/app/ui/figures/party/world-map/world-map.ts
index c016a42a8..6aad52a24 100644
--- a/src/app/ui/figures/party/world-map/world-map.ts
+++ b/src/app/ui/figures/party/world-map/world-map.ts
@@ -244,7 +244,7 @@ export class WorldMapComponent implements AfterViewInit {
if (buildingData.coordinates && buildingData.coordinates.length) {
const overlayData = buildingData.coordinates[level || 0];
if (overlayData) {
- const imageName = overlayData.image || buildingData.edition + '-' + (buildingData.id ? buildingData.id + '-' : '') + buildingData.name + (buildingData.upgrades.length || buildingData.manualUpgrades ? '-' + (level != undefined ? level : '0') : '');
+ const imageName = overlayData.image || buildingData.edition + '-' + (buildingData.id ? buildingData.id + '-' : '') + buildingData.name + (buildingData.upgrades.length ? '-' + (level != undefined ? level : '0') : '');
const overlayBuilding: ImageOverlay = this.placeOverlay('./assets/images/world-map/' + buildingData.edition + '/buildings/' + imageName + '.png', overlayData, height, -1);
overlayBuilding.addTo(this.map);
const element = overlayBuilding.getElement();
diff --git a/src/app/ui/footer/level/level-dialog.html b/src/app/ui/footer/level/level-dialog.html
index b3b66600a..4f354b600 100644
--- a/src/app/ui/footer/level/level-dialog.html
+++ b/src/app/ui/footer/level/level-dialog.html
@@ -51,7 +51,10 @@
![]()
:
x{{loot}}
-
+
:
diff --git a/src/app/ui/footer/level/level-dialog.ts b/src/app/ui/footer/level/level-dialog.ts
index 8fe8e6286..d2602fc13 100644
--- a/src/app/ui/footer/level/level-dialog.ts
+++ b/src/app/ui/footer/level/level-dialog.ts
@@ -58,7 +58,7 @@ export class LevelDialogComponent implements OnInit, OnDestroy {
}
setBbMonsterDifficutly(level: number) {
- gameManager.stateManager.before("updateLevelAdjustmentBb", '' + level);
+ gameManager.stateManager.before("updateLevelAdjustmentBb", level);
gameManager.game.levelAdjustment = level - 2;
const editionData = gameManager.editionData.find((editionData) => editionData.edition == 'bb' && editionData.monsterAmTables && editionData.monsterAmTables.length);
if (editionData) {
@@ -104,7 +104,7 @@ export class LevelDialogComponent implements OnInit, OnDestroy {
}
setPlayerCount(playerCount: number) {
- gameManager.stateManager.before("updateManualPlayerCount", '' + playerCount);
+ gameManager.stateManager.before("updateManualPlayerCount", playerCount);
gameManager.game.playerCount = playerCount;
if (gameManager.game.levelCalculation) {
gameManager.levelManager.calculateScenarioLevel();
@@ -130,6 +130,10 @@ export class LevelDialogComponent implements OnInit, OnDestroy {
this.experience = gameManager.levelManager.experience();
this.loot = gameManager.levelManager.loot();
this.hazardousTerrain = gameManager.levelManager.terrain();
+
+ if (gameManager.trialsManager.activeFavor('fh', 'wealth')) {
+ this.loot += gameManager.trialsManager.activeFavor('fh', 'wealth');
+ }
}
}
diff --git a/src/app/ui/footer/level/level.ts b/src/app/ui/footer/level/level.ts
index bfcfcf80e..148591dac 100644
--- a/src/app/ui/footer/level/level.ts
+++ b/src/app/ui/footer/level/level.ts
@@ -65,6 +65,10 @@ export class LevelComponent implements OnInit, OnDestroy {
this.loot = gameManager.levelManager.loot();
this.hazardousTerrain = gameManager.levelManager.terrain();
this.monsterDifficulty = gameManager.levelManager.bbMonsterDifficutly();
+
+ if (gameManager.trialsManager.activeFavor('fh', 'wealth')) {
+ this.loot += gameManager.trialsManager.activeFavor('fh', 'wealth');
+ }
}
}
\ No newline at end of file
diff --git a/src/app/ui/footer/scenario-rules/scenario-rule.html b/src/app/ui/footer/scenario-rules/scenario-rule.html
index ac31a6fb8..31d1653c2 100644
--- a/src/app/ui/footer/scenario-rules/scenario-rule.html
+++ b/src/app/ui/footer/scenario-rules/scenario-rule.html
@@ -56,7 +56,7 @@
+ [ghs-label-args]="[figureNames(figureRule), figureRule.value || '', (settingsManager.settings.calculate && (figureRule.type == 'damage' && figureRule.value && figureRule.value.indexOf('H') == -1 || (figureRule.type == 'setHp' || figureRule.type == 'heal') && figureRule.value && figureRule.value.indexOf('H') == -1)) ? EntityValueFunction(figureRule.value || '') : (figureRule.value || ''), (figureRule.type == 'amAdd' || figureRule.type == 'amRemove') ? figureRule.value.split(':')[0] : '', (figureRule.type == 'amAdd' || figureRule.type == 'amRemove' || figureRule.type == 'transfer' && figureRule.value && figureRule.value.split(':').length > 1) ? figureRule.value.split(':')[1] : '', figureRule.type == 'transferEntities' && figureRule.identifier && figureRule.identifier.number ? figureRule.identifier.number : '']">
@@ -66,12 +66,12 @@
+ [ghs-label-args]="[achievement.name, (achievement.required - achievement.count), achievement.required]">
@@ -53,7 +53,7 @@
+ [ghs-label-args]="[achievement.name, achievement.level]">
:
diff --git a/src/app/ui/footer/level/level-dialog.ts b/src/app/ui/footer/level/level-dialog.ts
index 8fe8e6286..d2602fc13 100644
--- a/src/app/ui/footer/level/level-dialog.ts
+++ b/src/app/ui/footer/level/level-dialog.ts
@@ -58,7 +58,7 @@ export class LevelDialogComponent implements OnInit, OnDestroy {
}
setBbMonsterDifficutly(level: number) {
- gameManager.stateManager.before("updateLevelAdjustmentBb", '' + level);
+ gameManager.stateManager.before("updateLevelAdjustmentBb", level);
gameManager.game.levelAdjustment = level - 2;
const editionData = gameManager.editionData.find((editionData) => editionData.edition == 'bb' && editionData.monsterAmTables && editionData.monsterAmTables.length);
if (editionData) {
@@ -104,7 +104,7 @@ export class LevelDialogComponent implements OnInit, OnDestroy {
}
setPlayerCount(playerCount: number) {
- gameManager.stateManager.before("updateManualPlayerCount", '' + playerCount);
+ gameManager.stateManager.before("updateManualPlayerCount", playerCount);
gameManager.game.playerCount = playerCount;
if (gameManager.game.levelCalculation) {
gameManager.levelManager.calculateScenarioLevel();
@@ -130,6 +130,10 @@ export class LevelDialogComponent implements OnInit, OnDestroy {
this.experience = gameManager.levelManager.experience();
this.loot = gameManager.levelManager.loot();
this.hazardousTerrain = gameManager.levelManager.terrain();
+
+ if (gameManager.trialsManager.activeFavor('fh', 'wealth')) {
+ this.loot += gameManager.trialsManager.activeFavor('fh', 'wealth');
+ }
}
}
diff --git a/src/app/ui/footer/level/level.ts b/src/app/ui/footer/level/level.ts
index bfcfcf80e..148591dac 100644
--- a/src/app/ui/footer/level/level.ts
+++ b/src/app/ui/footer/level/level.ts
@@ -65,6 +65,10 @@ export class LevelComponent implements OnInit, OnDestroy {
this.loot = gameManager.levelManager.loot();
this.hazardousTerrain = gameManager.levelManager.terrain();
this.monsterDifficulty = gameManager.levelManager.bbMonsterDifficutly();
+
+ if (gameManager.trialsManager.activeFavor('fh', 'wealth')) {
+ this.loot += gameManager.trialsManager.activeFavor('fh', 'wealth');
+ }
}
}
\ No newline at end of file
diff --git a/src/app/ui/footer/scenario-rules/scenario-rule.html b/src/app/ui/footer/scenario-rules/scenario-rule.html
index ac31a6fb8..31d1653c2 100644
--- a/src/app/ui/footer/scenario-rules/scenario-rule.html
+++ b/src/app/ui/footer/scenario-rules/scenario-rule.html
@@ -56,7 +56,7 @@
+ [ghs-label-args]="[rule.randomDungeon.dungeonCount, randomDungeonsDungeonLabel().toString()]">
+ [ghs-label-args]="[rule.randomDungeon.monsterCount, randomDungeonsMonsterLabel(rule).toString()]">
diff --git a/src/app/ui/footer/scenario/dialog/scenario-dialog.ts b/src/app/ui/footer/scenario/dialog/scenario-dialog.ts
index 53ca875b7..6716feb29 100644
--- a/src/app/ui/footer/scenario/dialog/scenario-dialog.ts
+++ b/src/app/ui/footer/scenario/dialog/scenario-dialog.ts
@@ -113,7 +113,7 @@ export class ScenarioDialogComponent {
console.error("Could not find edition data!");
return;
}
- gameManager.stateManager.before(roomData.marker ? "openRoomMarker" : "openRoom", this.scenario.index, "data.scenario." + this.scenario.name, '' + roomData.ref, roomData.marker || '');
+ gameManager.stateManager.before(roomData.marker ? "openRoomMarker" : "openRoom", this.scenario.index, "data.scenario." + this.scenario.name, roomData.ref, roomData.marker || '');
gameManager.scenarioManager.openRoom(roomData, this.scenario, false);
gameManager.stateManager.after();
this.setupComponent && this.setupComponent.updateMonster();
diff --git a/src/app/ui/footer/scenario/scenario.ts b/src/app/ui/footer/scenario/scenario.ts
index 2e0c9b353..8d4dcbe54 100644
--- a/src/app/ui/footer/scenario/scenario.ts
+++ b/src/app/ui/footer/scenario/scenario.ts
@@ -95,7 +95,7 @@ export class ScenarioComponent implements OnInit, OnDestroy {
console.error("Could not find edition data!");
return;
}
- gameManager.stateManager.before(roomData.marker ? "openRoomMarker" : "openRoom", scenario.index, "data.scenario." + scenario.name, '' + roomData.ref, roomData.marker || '');
+ gameManager.stateManager.before(roomData.marker ? "openRoomMarker" : "openRoom", scenario.index, "data.scenario." + scenario.name, roomData.ref, roomData.marker || '');
gameManager.scenarioManager.openRoom(roomData, scenario, false);
gameManager.stateManager.after();
}
diff --git a/src/app/ui/footer/scenario/summary/scenario-summary.html b/src/app/ui/footer/scenario/summary/scenario-summary.html
index 75c0065d4..ad747e8c9 100644
--- a/src/app/ui/footer/scenario/summary/scenario-summary.html
+++ b/src/app/ui/footer/scenario/summary/scenario-summary.html
@@ -115,7 +115,8 @@
{{(success && rewards && rewards.gold ? rewards.gold : 0) + (collectiveGold[index] ?
collectiveGold[index] : 0) + (character.loot *
- gameManager.levelManager.loot()) | ghsValueSign}}
+ gameManager.levelManager.loot()) + (gameManager.trialsManager.favorsEnabled && gameManager.trialsManager.apply
+ ? character.loot *gameManager.trialsManager.activeFavor('fh', 'wealth') : 0) | ghsValueSign}}
({{character.progress.gold + (success && rewards && rewards.gold ? rewards.gold : 0)+ (collectiveGold[index] ?
collectiveGold[index] : 0) + character.loot *
gameManager.levelManager.loot() + (gameManager.trialsManager.favorsEnabled && gameManager.trialsManager.apply
@@ -214,7 +215,7 @@
}})
+ [ghs-label-args]="[character.level, (character.level + 1)]">
@@ -349,43 +350,43 @@
@@ -581,7 +582,7 @@
+ [ghs-label-args]="[item.type, ''+ EntityValueFunction(item.value)]">
@@ -592,7 +593,7 @@
+ [ghs-label-args]="[item.type, ''+ EntityValueFunction(item.value)]">
@@ -614,14 +615,14 @@
@@ -349,43 +350,43 @@
@@ -581,7 +582,7 @@
-
-
@@ -711,7 +712,7 @@
@@ -753,6 +754,14 @@
[ghs-label-args]="[rewards.overlaySticker.name, rewards.overlaySticker.location]">
+
+
@@ -781,7 +790,7 @@
-
-
-
{
+ this.change.emit(false);
+ }, settingsManager.settings.animations ? 1000 : 0)
} else
if (!this.clicked) {
this.clicked = true;
this.el.nativeElement.classList.add("confirm");
} else {
this.el.nativeElement.classList.add("flipped");
- this.change.emit(true);
+ setTimeout(() => {
+ this.change.emit(true);
+ }, settingsManager.settings.animations ? 1000 : 0)
this.clicked = false;
this.el.nativeElement.classList.remove("confirm");
}
diff --git a/src/app/ui/helper/label.ts b/src/app/ui/helper/label.ts
index 4621c269b..2621379e8 100644
--- a/src/app/ui/helper/label.ts
+++ b/src/app/ui/helper/label.ts
@@ -298,7 +298,7 @@ export const applyValueCalc = function (value: string, relative: boolean): strin
export class GhsLabelDirective implements OnInit, OnDestroy, OnChanges {
@Input('ghs-label') value!: string | number;
- @Input('ghs-label-args') args: string[] = [];
+ @Input('ghs-label-args') args: (string | number | boolean)[] = [];
@Input('ghs-label-args-replace') argLabel: boolean = true;
@Input('ghs-label-empty') empty: boolean = true;
@Input('ghs-label-attribute') attribute: string = "";
@@ -353,7 +353,7 @@ export class GhsLabelDirective implements OnInit, OnDestroy, OnChanges {
}
apply(): void {
- let args = this.args || [];
+ let args: string[] = this.args.map((arg) => '' + arg) || [];
if (this.argLabel) {
args = args.map((arg) => applyPlaceholder(settingsManager.getLabel(arg, [], false, this.empty), [], this.relative, this.style));
}
diff --git a/src/app/ui/helper/tooltip/tooltip.ts b/src/app/ui/helper/tooltip/tooltip.ts
index 281c5d18d..c1652f0ca 100644
--- a/src/app/ui/helper/tooltip/tooltip.ts
+++ b/src/app/ui/helper/tooltip/tooltip.ts
@@ -36,7 +36,7 @@ export class GhsTooltipComponent {
export class GhsTooltipDirective implements OnInit, OnDestroy {
@Input('ghs-tooltip') value = '';
- @Input('ghs-label-args') args: string[] = [];
+ @Input('ghs-label-args') args: (string | number | boolean)[] = [];
@Input('ghs-label-args-replace') argLabel: boolean = true;
@Input('style') style: 'gh' | 'fh' | false = false;
@Input() relative: boolean = false;
@@ -83,7 +83,7 @@ export class GhsTooltipDirective implements OnInit, OnDestroy {
const tooltipRef: ComponentRef
= this.overlayRef.attach(new ComponentPortal(GhsTooltipComponent));
tooltipRef.instance.value = this.value;
- tooltipRef.instance.args = this.args;
+ tooltipRef.instance.args = this.args.map((arg) => '' + arg);
tooltipRef.instance.argLabel = this.argLabel;
tooltipRef.instance.style = this.style;
tooltipRef.instance.relative = this.relative;
diff --git a/src/app/ui/main.html b/src/app/ui/main.html
index f8e26a43e..d81e9d9df 100644
--- a/src/app/ui/main.html
+++ b/src/app/ui/main.html
@@ -15,7 +15,7 @@
+ [ghs-label-args]="[gameManager.stateManager.connectionTries]">
@@ -145,7 +145,7 @@
diff --git a/src/assets/artwork/pets/fh-01.png b/src/assets/artwork/pets/fh-01.png
new file mode 100644
index 000000000..07dfb889e
Binary files /dev/null and b/src/assets/artwork/pets/fh-01.png differ
diff --git a/src/assets/artwork/pets/fh-02.png b/src/assets/artwork/pets/fh-02.png
new file mode 100644
index 000000000..ff6ce9c86
Binary files /dev/null and b/src/assets/artwork/pets/fh-02.png differ
diff --git a/src/assets/artwork/pets/fh-03.png b/src/assets/artwork/pets/fh-03.png
new file mode 100644
index 000000000..e2696d937
Binary files /dev/null and b/src/assets/artwork/pets/fh-03.png differ
diff --git a/src/assets/artwork/pets/fh-04.png b/src/assets/artwork/pets/fh-04.png
new file mode 100644
index 000000000..61fe840ea
Binary files /dev/null and b/src/assets/artwork/pets/fh-04.png differ
diff --git a/src/assets/artwork/pets/fh-05.png b/src/assets/artwork/pets/fh-05.png
new file mode 100644
index 000000000..63391fe1b
Binary files /dev/null and b/src/assets/artwork/pets/fh-05.png differ
diff --git a/src/assets/artwork/pets/fh-06.png b/src/assets/artwork/pets/fh-06.png
new file mode 100644
index 000000000..5a6a206d5
Binary files /dev/null and b/src/assets/artwork/pets/fh-06.png differ
diff --git a/src/assets/artwork/pets/fh-07.png b/src/assets/artwork/pets/fh-07.png
new file mode 100644
index 000000000..412c0d780
Binary files /dev/null and b/src/assets/artwork/pets/fh-07.png differ
diff --git a/src/assets/artwork/pets/fh-08.png b/src/assets/artwork/pets/fh-08.png
new file mode 100644
index 000000000..4155dabf7
Binary files /dev/null and b/src/assets/artwork/pets/fh-08.png differ
diff --git a/src/assets/artwork/pets/fh-09.png b/src/assets/artwork/pets/fh-09.png
new file mode 100644
index 000000000..b9cb266f9
Binary files /dev/null and b/src/assets/artwork/pets/fh-09.png differ
diff --git a/src/assets/artwork/pets/fh-10.png b/src/assets/artwork/pets/fh-10.png
new file mode 100644
index 000000000..2f0c824c5
Binary files /dev/null and b/src/assets/artwork/pets/fh-10.png differ
diff --git a/src/assets/artwork/pets/fh-11.png b/src/assets/artwork/pets/fh-11.png
new file mode 100644
index 000000000..4bc0ce9cc
Binary files /dev/null and b/src/assets/artwork/pets/fh-11.png differ
diff --git a/src/assets/artwork/pets/fh-12.png b/src/assets/artwork/pets/fh-12.png
new file mode 100644
index 000000000..bd677b1cc
Binary files /dev/null and b/src/assets/artwork/pets/fh-12.png differ
diff --git a/src/assets/images/fh/buildings/garden.png b/src/assets/images/fh/buildings/garden.png
new file mode 100644
index 000000000..44e9c0d9d
Binary files /dev/null and b/src/assets/images/fh/buildings/garden.png differ
diff --git a/src/assets/images/fh/pets/pets-card-back.png b/src/assets/images/fh/pets/pets-card-back.png
new file mode 100644
index 000000000..518a9883c
Binary files /dev/null and b/src/assets/images/fh/pets/pets-card-back.png differ
diff --git a/src/assets/images/fh/pets/pets-card-front-mask.png b/src/assets/images/fh/pets/pets-card-front-mask.png
new file mode 100644
index 000000000..2aa711540
Binary files /dev/null and b/src/assets/images/fh/pets/pets-card-front-mask.png differ
diff --git a/src/assets/images/fh/pets/pets-card-front.png b/src/assets/images/fh/pets/pets-card-front.png
new file mode 100644
index 000000000..3943dcfc7
Binary files /dev/null and b/src/assets/images/fh/pets/pets-card-front.png differ
diff --git a/src/assets/locales/en.json b/src/assets/locales/en.json
index a1e48b5a3..15eff2153 100644
--- a/src/assets/locales/en.json
+++ b/src/assets/locales/en.json
@@ -1496,6 +1496,7 @@
"overlaySticker": "Place map overlay sticker {0} on map in location {0} ({1}).",
"partyAchievements": "Party Achievements",
"perks": "Gain {0} perk each",
+ "pet": "Add %data.pets.{1}-{0}% (Pet {0}) to the Stables. This can exceed the capacity of the Stables.",
"prosperity": "{0} prosperity",
"reputation": "{0} reputation",
"randomItems": "Each character gains one random item ({0}-{1})",
@@ -2166,10 +2167,18 @@
".": "Apply Challenges",
"hint": "Automatically apply (if possible) active challenge cards."
},
+ "fhGarden": {
+ ".": "Support for Garden",
+ "hint": "Plant and Harvest Herbs (Building 24 Garden)"
+ },
"fhGhItems": {
".": "Add Gloomhaven Items",
"hint": "Add Items from Gloomhaven and Forgotten Circles to available supply as stated out in the rules. (Only on enabled character sheets or character items)"
},
+ "fhPets": {
+ ".": "Support for Pets",
+ "hint": "Catch and manage Pets (Building 88 Stables)"
+ },
"fhRules": "Frosthaven Rules",
"fhSecondEdition": {
".": "2nd Edition",
@@ -2554,6 +2563,22 @@
}
},
"buildBuilding": "Build '%data.buildings.{1}%' ({0})",
+ "buildings": {
+ "garden": {},
+ "stables": {
+ "pets": {
+ "add": "Add pet %data.pets.{0}-{1}% to Stables",
+ "catch": "Catch pet from {1} standee {2} of {0}",
+ "remove": "Remove pet %data.pets.{0}-{1}% from Stables",
+ "restore": "Restore pet %data.pets.{0}-{1}% card",
+ "play": "Play pet %data.pets.{0}-{1}% card",
+ "setActive": "Take pet %data.pets.{0}-{1}% card to scenario",
+ "setInactive": "Remove pet %data.pets.{0}-{1}% card from scenario",
+ "setName": "Name pet %data.pets.{0}-{1}% '{2}'",
+ "unsetName": "Remove name from pet %data.pets.{0}-{1}%"
+ }
+ }
+ },
"buyItem": "Buy Item {1} (%data.edition.{2}%) for {0}",
"cancelScenario": "Cancel Scenario #{0} {1} ({2})",
"changeBuildingState": "State of building '%data.buildings.{1}%' ({0}) to %party.campaign.sheet.buildings.state.{2}%",
+ [ghs-label-args]="[lootDeckCard]">
@@ -790,7 +799,7 @@
@@ -810,7 +819,7 @@
+ [ghs-label-args]="[lootDeckCard]">
@@ -799,7 +808,7 @@
+ [ghs-label-args]="[townGuardAm.value, townGuardAm.valueType]">
-
@@ -849,7 +858,7 @@
+ [ghs-label-args]="[(gameManager.game.party.weeks + 1)]">
+ [ghs-label-args]="[character.title || '%data.character.' + character.name + '%', ('' + treasures[treasureIndex]).startsWith('G') || +treasures[treasureIndex] >= 0 ? treasures[treasureIndex] : '\'???\'']">
diff --git a/src/app/ui/header/header.html b/src/app/ui/header/header.html index b150ff2e6..0e12de88f 100644 --- a/src/app/ui/header/header.html +++ b/src/app/ui/header/header.html @@ -72,12 +72,17 @@
+
![]()
-
@@ -59,13 +59,13 @@
+
+
+ ((value.clockOut || new Date().getTime()) - value.clockIn) / 1000).reduce((a, b) => a + b, 0) : 0;
diff --git a/src/app/ui/header/menu/campaign/campaign.html b/src/app/ui/header/menu/campaign/campaign.html
index 12caf073b..8a552a02a 100644
--- a/src/app/ui/header/menu/campaign/campaign.html
+++ b/src/app/ui/header/menu/campaign/campaign.html
@@ -137,7 +137,7 @@
diff --git a/src/app/ui/header/menu/datamanagement/datamanagement.html b/src/app/ui/header/menu/datamanagement/datamanagement.html
index da9a6ef40..e60cc8119 100644
--- a/src/app/ui/header/menu/datamanagement/datamanagement.html
+++ b/src/app/ui/header/menu/datamanagement/datamanagement.html
@@ -286,7 +286,7 @@
diff --git a/src/app/ui/header/menu/menu.html b/src/app/ui/header/menu/menu.html
index 98210c93b..3a7b6b452 100644
--- a/src/app/ui/header/menu/menu.html
+++ b/src/app/ui/header/menu/menu.html
@@ -3,7 +3,7 @@
+
@@ -235,7 +238,8 @@
diff --git a/src/app/ui/header/menu/undo/dialog.html b/src/app/ui/header/menu/undo/dialog.html
index 24bf3f6bc..c351b84ab 100644
--- a/src/app/ui/header/menu/undo/dialog.html
+++ b/src/app/ui/header/menu/undo/dialog.html
@@ -30,7 +30,7 @@
+ [disabled]="!gameManager.fhRules() || !gameManager.trialsManager.trialsEnabled && !gameManager.trialsManager.favorsEnabled"
+ [requires]="['fhTrials']" [labelSuffix]="gameManager.trialsManager.favorsAvailable ? 'favors' : ''">
-
@@ -50,7 +50,7 @@
-
+
-
-
{
+ this.change.emit(false);
+ }, settingsManager.settings.animations ? 1000 : 0)
} else
if (!this.clicked) {
this.clicked = true;
this.el.nativeElement.classList.add("confirm");
} else {
this.el.nativeElement.classList.add("flipped");
- this.change.emit(true);
+ setTimeout(() => {
+ this.change.emit(true);
+ }, settingsManager.settings.animations ? 1000 : 0)
this.clicked = false;
this.el.nativeElement.classList.remove("confirm");
}
diff --git a/src/app/ui/helper/label.ts b/src/app/ui/helper/label.ts
index 4621c269b..2621379e8 100644
--- a/src/app/ui/helper/label.ts
+++ b/src/app/ui/helper/label.ts
@@ -298,7 +298,7 @@ export const applyValueCalc = function (value: string, relative: boolean): strin
export class GhsLabelDirective implements OnInit, OnDestroy, OnChanges {
@Input('ghs-label') value!: string | number;
- @Input('ghs-label-args') args: string[] = [];
+ @Input('ghs-label-args') args: (string | number | boolean)[] = [];
@Input('ghs-label-args-replace') argLabel: boolean = true;
@Input('ghs-label-empty') empty: boolean = true;
@Input('ghs-label-attribute') attribute: string = "";
@@ -353,7 +353,7 @@ export class GhsLabelDirective implements OnInit, OnDestroy, OnChanges {
}
apply(): void {
- let args = this.args || [];
+ let args: string[] = this.args.map((arg) => '' + arg) || [];
if (this.argLabel) {
args = args.map((arg) => applyPlaceholder(settingsManager.getLabel(arg, [], false, this.empty), [], this.relative, this.style));
}
diff --git a/src/app/ui/helper/tooltip/tooltip.ts b/src/app/ui/helper/tooltip/tooltip.ts
index 281c5d18d..c1652f0ca 100644
--- a/src/app/ui/helper/tooltip/tooltip.ts
+++ b/src/app/ui/helper/tooltip/tooltip.ts
@@ -36,7 +36,7 @@ export class GhsTooltipComponent {
export class GhsTooltipDirective implements OnInit, OnDestroy {
@Input('ghs-tooltip') value = '';
- @Input('ghs-label-args') args: string[] = [];
+ @Input('ghs-label-args') args: (string | number | boolean)[] = [];
@Input('ghs-label-args-replace') argLabel: boolean = true;
@Input('style') style: 'gh' | 'fh' | false = false;
@Input() relative: boolean = false;
@@ -83,7 +83,7 @@ export class GhsTooltipDirective implements OnInit, OnDestroy {
const tooltipRef: ComponentRef