Compare commits

...

13 Commits

15 changed files with 513 additions and 224 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "adventurers-guild", "name": "adventurers-guild",
"version": "0.4.0", "version": "0.6.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
+41 -27
View File
@@ -27,10 +27,18 @@ import {Adventurer} from "@/classes/Adventurer";
import {getQuestWithRewards, Quest} from "@/classes/Quest"; import {getQuestWithRewards, Quest} from "@/classes/Quest";
import {Guild} from "@/classes/Guild"; import {Guild} from "@/classes/Guild";
import {getFromString, QuestRank} from "@/classes/QuestRank"; import {getFromString, QuestRank} from "@/classes/QuestRank";
import {GameData, loadAdventurersForHire, loadAvailableQuests, loadGame, saveGame} from "@/GameData"; import {
GameData,
loadAdventurersForHire,
loadAvailableQuests,
loadGame,
removeAlreadyHiredAdventurers,
saveGame
} from "@/GameData";
import type {GuildUpgrade} from "@/classes/GuildUpgrade"; import type {GuildUpgrade} from "@/classes/GuildUpgrade";
import {AdventurerCapacityUpgrade} from "@/classes/guildUpgrades/AdventurerCapacityUpgrade"; import AdventurerCapacityUpgrade from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
import {getNewAdventurerForHire} from "@/classes/Recruitment"; import {getNewAdventurerForHire} from "@/classes/Recruitment";
import QuestExpUpgrade from "@/classes/guildUpgrades/QuestExpUpgrade";
export default defineComponent({ export default defineComponent({
name: "GuildView", name: "GuildView",
@@ -81,10 +89,16 @@ export default defineComponent({
}, },
async checkForNewRecruit(currentTimestamp: number) { async checkForNewRecruit(currentTimestamp: number) {
if (this.lastRecruitHandled === null) {
if (this.lastRecruitHandled == null) {
this.lastRecruitHandled = 0; this.lastRecruitHandled = 0;
} }
if (currentTimestamp - this.lastRecruitHandled >= 1000 * 60 * 30 && this.adventurerForHire === null) {
if (Object.keys(this.adventurers).length <= 0) {
this.adventurerForHire = this.adventurersDatabase[0];
}
if (currentTimestamp - this.lastRecruitHandled >= 1000 * 60 * 30 && this.adventurerForHire == null) {
this.adventurerForHire = getNewAdventurerForHire(this.adventurersDatabase); this.adventurerForHire = getNewAdventurerForHire(this.adventurersDatabase);
} }
}, },
@@ -119,7 +133,7 @@ export default defineComponent({
const questsForRank = this.quests[rank] as { [key: string]: Quest }; const questsForRank = this.quests[rank] as { [key: string]: Quest };
const randomId = keys.length * Math.random() << 0; const randomId = keys.length * Math.random() << 0;
const randomIdString = keys[randomId] as string; const randomIdString = keys[randomId] as string;
return getQuestWithRewards(questsForRank[randomIdString]); return getQuestWithRewards(questsForRank[randomIdString], this.guild.expModifier.getModifier());
}, },
createMissive(questToAdd: Quest, rank: QuestRank) { createMissive(questToAdd: Quest, rank: QuestRank) {
const quest = JSON.parse(JSON.stringify(questToAdd)); const quest = JSON.parse(JSON.stringify(questToAdd));
@@ -137,6 +151,9 @@ export default defineComponent({
if (saveData.guild.adventurerCapacity) { if (saveData.guild.adventurerCapacity) {
guildUpgrades.adventurerCapacity = new AdventurerCapacityUpgrade(saveData.guild.adventurerCapacity.level); guildUpgrades.adventurerCapacity = new AdventurerCapacityUpgrade(saveData.guild.adventurerCapacity.level);
} }
if (saveData.guild.expModifier) {
guildUpgrades.expModifier = new QuestExpUpgrade(saveData.guild.expModifier.level);
}
this.guild = new Guild(saveData.guild.level, saveData.guild.gold, guildUpgrades); this.guild = new Guild(saveData.guild.level, saveData.guild.gold, guildUpgrades);
@@ -151,16 +168,16 @@ export default defineComponent({
data.portrait, data.portrait,
data.attackExponent ?? 1.1, data.attackExponent ?? 1.1,
data.level ?? 1, data.level ?? 1,
data.exp ?? 0 data.exp ?? 0,
data.prestige ?? 0,
); );
adventurer.busy = data.busy; adventurer.busy = data.busy;
adventurers[data.id] = adventurer; adventurers[data.id] = adventurer;
} catch (e) {} } catch (e) {
}
} }
this.adventurers = adventurers; this.adventurers = adventurers;
const missives = {} as { [key: string]: { [key: string]: Quest } }; const missives = {} as { [key: string]: { [key: string]: Quest } };
for (const id in saveData.missives) { for (const id in saveData.missives) {
@@ -181,15 +198,10 @@ export default defineComponent({
this.lastRecruitHandled = saveData.lastRecruitAction ?? 0; this.lastRecruitHandled = saveData.lastRecruitAction ?? 0;
if (Object.keys(this.adventurers).length <= 0) { if (saveData.adventurerForHireId != null) {
this.adventurerForHire = this.adventurersDatabase[0];
return;
}
if (saveData.currentlyForHireId !== null) {
for (const id in this.adventurersDatabase) { for (const id in this.adventurersDatabase) {
const adventurer = this.adventurersDatabase[id]; const adventurer = this.adventurersDatabase[id];
if (adventurer.id === saveData.currentlyForHireId) { if (adventurer.id === saveData.adventurerForHireId) {
this.adventurerForHire = adventurer; this.adventurerForHire = adventurer;
return; return;
} }
@@ -203,20 +215,21 @@ export default defineComponent({
} }
}, },
async mounted() { async mounted() {
this.loadGame();
this.quests = await loadAvailableQuests(); this.quests = await loadAvailableQuests();
this.adventurersDatabase = await loadAdventurersForHire(Object.keys(this.adventurers)); this.adventurersDatabase = await loadAdventurersForHire();
this.loadGame();
this.adventurersDatabase = removeAlreadyHiredAdventurers(this.adventurersDatabase, this.adventurers);
setInterval(() => { setInterval(() => {
saveGame(new GameData( saveGame(new GameData({
this.guild, adventurers: this.adventurers,
this.adventurers, guild: this.guild,
this.missives, missives: this.missives,
this.lastQuestGot, lastQuestGot: this.lastQuestGot,
this.lastRecruitHandled, lastRecruitAction: this.lastRecruitHandled,
this.adventurerForHire?.id ?? null adventurerForHireId: this.adventurerForHire?.id ?? null,
) }));
);
}, 10 * 1000) }, 10 * 1000)
setInterval(() => { setInterval(() => {
@@ -349,6 +362,7 @@ nav {
font-size: 2rem; font-size: 2rem;
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
&.router-link-active { &.router-link-active {
text-decoration: underline; text-decoration: underline;
} }
+26 -25
View File
@@ -1,4 +1,4 @@
import type {Guild} from "@/classes/Guild"; import {Guild} from "@/classes/Guild";
import {Adventurer} from "@/classes/Adventurer"; import {Adventurer} from "@/classes/Adventurer";
import {Quest} from "@/classes/Quest"; import {Quest} from "@/classes/Quest";
import {getFromString, QuestRank} from "@/classes/QuestRank"; import {getFromString, QuestRank} from "@/classes/QuestRank";
@@ -9,21 +9,17 @@ export class GameData {
missives: { [key: string]: { [key: string]: Quest } }; missives: { [key: string]: { [key: string]: Quest } };
lastQuestGot: { [key: string]: null | number }; lastQuestGot: { [key: string]: null | number };
lastRecruitAction: null | number; lastRecruitAction: null | number;
currentlyForHireId: string|null; adventurerForHireId: string | null;
constructor( constructor(
guild: Guild, adventurers: { [key: string]: Adventurer }, data: any,
missives: { [key: string]: { [key: string]: Quest } },
lastQuestGot: { [key: string]: null | number },
lastRecruitAction: null | number,
currentlyForHireId: string|null = null
) { ) {
this.guild = guild; this.guild = data.guild ?? new Guild(1, 0);
this.adventurers = adventurers; this.adventurers = data.adventurers ?? {} as { [key: string]: Adventurer };
this.missives = missives; this.missives = data.missives ?? {} as { [key: string]: { [key: string]: Quest } };
this.lastQuestGot = lastQuestGot; this.lastQuestGot = data.lastQuestGot ?? {} as { [key: string]: null | number };
this.lastRecruitAction = lastRecruitAction; this.lastRecruitAction = data.lastRecruitAction ?? null;
this.currentlyForHireId = currentlyForHireId; this.adventurerForHireId = data.adventurerForHireId ?? null;
} }
} }
@@ -41,22 +37,16 @@ export function saveGame(
missives: data.missives, missives: data.missives,
lastQuestGot: data.lastQuestGot, lastQuestGot: data.lastQuestGot,
lastRecruitAction: data.lastRecruitAction, lastRecruitAction: data.lastRecruitAction,
adventurerForHireId: data.currentlyForHireId, adventurerForHireId: data.adventurerForHireId,
})); }));
} }
export function loadGame(): GameData | null { export function loadGame(): GameData | null {
const savedGame = window.localStorage.getItem("savedGame"); const savedGame = window.localStorage.getItem("savedGame");
if (!savedGame) return null; if (!savedGame) return null;
console.debug("Loading game...");
const parsedGame = JSON.parse(savedGame); const parsedGame = JSON.parse(savedGame);
return new GameData( console.debug("Loading game...");
parsedGame.guild, return new GameData(parsedGame);
parsedGame.adventurers,
parsedGame.missives,
parsedGame.lastQuestGot,
parsedGame.lastRecruitAction
);
} }
export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: string]: Quest } }> { export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: string]: Quest } }> {
@@ -96,7 +86,7 @@ export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: st
return quests; return quests;
} }
export async function loadAdventurersForHire(currentAdventurerIds: Array<string> = []): Promise<Array<Adventurer>> { export async function loadAdventurersForHire(): Promise<Array<Adventurer>> {
const response = await fetch("data/adventurers.json"); const response = await fetch("data/adventurers.json");
if (response.status !== 200) { if (response.status !== 200) {
console.error("Failed to load adventurers"); console.error("Failed to load adventurers");
@@ -105,9 +95,8 @@ export async function loadAdventurersForHire(currentAdventurerIds: Array<string>
} }
const adventurerData = await response.json(); const adventurerData = await response.json();
const adventurers = [] as Array<Adventurer>; const adventurers: Array<Adventurer> = [];
for (const adventurer of adventurerData) { for (const adventurer of adventurerData) {
if (currentAdventurerIds.includes(adventurer.id)) continue;
adventurers.push(new Adventurer( adventurers.push(new Adventurer(
adventurer.id, adventurer.id,
adventurer.name, adventurer.name,
@@ -120,3 +109,15 @@ export async function loadAdventurersForHire(currentAdventurerIds: Array<string>
return adventurers; return adventurers;
} }
export function removeAlreadyHiredAdventurers(
adventurers: Array<Adventurer>,
adventurersHired: { [key: string]: Adventurer }
): Array<Adventurer> {
const adventurersForHire: Array<Adventurer> = [];
for (const adventurer of adventurers) {
if (adventurersHired[adventurer.id]) continue;
adventurersForHire.push(adventurer);
}
return adventurersForHire;
}
+25 -5
View File
@@ -1,8 +1,3 @@
:root {
}
body { body {
margin: 0; margin: 0;
padding: 0 0 10rem; padding: 0 0 10rem;
@@ -62,3 +57,28 @@ body {
border-image: url("/img/borders/metal_corner.png") 30 round; border-image: url("/img/borders/metal_corner.png") 30 round;
} }
} }
.button {
padding: 0.5rem 1rem;
font-size: 1.2rem;
font-family: 'EB Garamond', serif;
font-weight: bold;
cursor: pointer;
border: 2px solid rgb(0, 0, 0);
transition: filter 0.05s linear;
white-space: nowrap;
&.metal {
background-image: url("/img/borders/metal_strip.png");
background-size: contain;
background-blend-mode: darken;
background-repeat: repeat;
color: #dcdcdc;
}
&:disabled {
opacity: 0.55;
cursor: not-allowed;
}
&:hover:not(:disabled) {
filter: brightness(1.2);
}
}
+2 -1
View File
@@ -44,12 +44,13 @@ export class Adventurer {
} }
canPrestigeUp(): boolean { canPrestigeUp(): boolean {
if (this.busy) return false;
if (this.level < getMaxLevelForPrestige(this.prestige)) return false; if (this.level < getMaxLevelForPrestige(this.prestige)) return false;
return this.prestige < 5 return this.prestige < 5
} }
getNextLevelExpRequirement(): number { getNextLevelExpRequirement(): number {
return this.level * 3; return Math.max(1, Math.floor((3 * Math.pow(1.2, this.level - 1)) * Math.pow(1.025, this.level - 1)));
} }
/** /**
+11 -5
View File
@@ -1,6 +1,8 @@
import type {GuildUpgrade} from "@/classes/GuildUpgrade"; import type {GuildUpgrade} from "@/classes/GuildUpgrade";
import {AdventurerCapacityUpgrade} from "@/classes/guildUpgrades/AdventurerCapacityUpgrade"; import AdventurerCapacityUpgrade from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
import formatGold from "@/classes/NumberMagic"; import {formatGold} from "@/classes/NumberMagic";
import QuestExpUpgrade from "@/classes/guildUpgrades/QuestExpUpgrade";
export class Guild { export class Guild {
gold: number; gold: number;
@@ -8,14 +10,17 @@ export class Guild {
displayUpgradeCost: number|string; displayUpgradeCost: number|string;
upgradeCost: number|null = null; upgradeCost: number|null = null;
adventurerCapacity: AdventurerCapacityUpgrade; adventurerCapacity: AdventurerCapacityUpgrade;
expModifier: QuestExpUpgrade;
constructor(level: number, gold: number, upgrades: {[index:string]: GuildUpgrade} = {}) { constructor(level: number, gold: number, upgrades: {[index:string]: GuildUpgrade} = {}) {
this.gold = gold; this.gold = gold;
this.level = level; this.level = level;
this.displayUpgradeCost = this.getUpgradeCost() ?? "Max level"; const rawDisplayUpgradeCost = this.getUpgradeCost();
this.displayUpgradeCost = rawDisplayUpgradeCost ? formatGold(rawDisplayUpgradeCost) : "Max level";
this.upgradeCost = this.getUpgradeCost(); this.upgradeCost = this.getUpgradeCost();
this.adventurerCapacity = upgrades.adventurerCapacity as AdventurerCapacityUpgrade ?? new AdventurerCapacityUpgrade(); this.adventurerCapacity = upgrades.adventurerCapacity as AdventurerCapacityUpgrade ?? new AdventurerCapacityUpgrade();
this.expModifier = upgrades.expModifier as QuestExpUpgrade ?? new QuestExpUpgrade();
} }
@@ -41,7 +46,7 @@ export class Guild {
} }
isMaxLevel(): boolean { isMaxLevel(): boolean {
return this.level >= 7; return this.level >= 8;
} }
} }
@@ -51,5 +56,6 @@ const upgradeCosts = {
"3": 5000, "3": 5000,
"4": 10000, "4": 10000,
"5": 25000, "5": 25000,
"6": 50000, "6": 100000,
"7": 750000,
} as {[index:string]: number} } as {[index:string]: number}
+13 -3
View File
@@ -1,10 +1,20 @@
const formatter = new Intl.NumberFormat('en-US', { const goldFormatter = new Intl.NumberFormat('en-US', {
maximumFractionDigits: 3, maximumFractionDigits: 3,
// @ts-ignore - typescript doesn't know about this option for some godforsaken reason // @ts-ignore - typescript doesn't know about this option for some godforsaken reason
notation: "compact", notation: "compact",
useGrouping: true, useGrouping: true,
}); });
export default function formatGold(number: number): string { const damageFormatter = new Intl.NumberFormat('en-US', {
return formatter.format(number); maximumFractionDigits: 2,
// @ts-ignore - typescript doesn't know about this option for some godforsaken reason
notation: "compact",
});
export function formatGold(number: number): string {
return goldFormatter.format(number);
}
export function formatDamage(number: number): string {
return damageFormatter.format(number);
} }
+3 -2
View File
@@ -33,8 +33,9 @@ export class Quest {
/** /**
* Generate rewards for a quest and return it * Generate rewards for a quest and return it
* @param quest * @param quest
* @param expModifier - multiplification modifier for the exp reward
*/ */
export function getQuestWithRewards(quest: Quest) { export function getQuestWithRewards(quest: Quest, expModifier: number = 1) {
let maxProgress = 1; let maxProgress = 1;
@@ -70,7 +71,7 @@ export function getQuestWithRewards(quest: Quest) {
} }
let goldReward = Math.floor(maxProgress/6); let goldReward = Math.floor(maxProgress/6);
let expReward = Math.floor(Math.floor(maxProgress/120) - maxProgress/1000); let expReward = Math.floor((Math.floor(maxProgress/120) - maxProgress/1000) * expModifier);
// add some randomness to the rewards // add some randomness to the rewards
goldReward = Math.floor(randomNumberBetween(goldReward * 0.95, goldReward * 1.1)); goldReward = Math.floor(randomNumberBetween(goldReward * 0.95, goldReward * 1.1));
@@ -1,6 +1,6 @@
import {GuildUpgrade} from "@/classes/GuildUpgrade"; import {GuildUpgrade} from "@/classes/GuildUpgrade";
export class AdventurerCapacityUpgrade extends GuildUpgrade { export default class AdventurerCapacityUpgrade extends GuildUpgrade {
constructor(level: number = 1) { constructor(level: number = 1) {
super(); super();
this.level = level; this.level = level;
@@ -0,0 +1,24 @@
import {GuildUpgrade} from "@/classes/GuildUpgrade";
export default class QuestExpUpgrade extends GuildUpgrade {
constructor(level: number = 1) {
super();
this.level = level;
this.nextLevelCost = this.getCostForLevel(this.level);
this.guildLevelRequirement = 8;
}
upgrade(): void {
this.level += 1;
this.nextLevelCost = this.getCostForLevel(this.level);
}
getCostForLevel(level: number): number {
const scalingFactor = Math.pow(1.15, level - 1);
return Math.floor(4000000 * scalingFactor * Math.pow(level, 1.1));
}
getModifier(): number {
return 1 + (this.level * 0.1);
}
}
+144
View File
@@ -0,0 +1,144 @@
<template>
<dialog ref="modal" class="adventurer-details" v-if="adventurer">
<button class="close" @click="$emit('closeButtonClicked')"></button>
<div class="adventurer-portrait">
<img :src="adventurer.portrait" alt="" draggable="false"/>
</div>
<span class="name">{{ adventurer.name }}</span>
<div class="adventurer-data">
<p>Level: {{ adventurer.level }} / {{ adventurer.getMaxLevel() }}</p>
<p>Prestige level: {{ adventurer.prestige }}</p>
<p>Exp: {{ adventurer.exp }} / {{ adventurer.getNextLevelExpRequirement() }}</p>
<p>DPS: {{ formatDamage(adventurer.getDPS()) }}</p>
</div>
<div class="adventurer-upgrades">
<button
class="button metal"
:disabled="!adventurer.canPrestigeUp()"
:title="!adventurer.canPrestigeUp() ? 'Adventurer needs to be at max level to prestige up' : ''"
@click="() => {
if (adventurer === null) return;
if (!adventurer.canPrestigeUp()) return;
adventurer.prestigeUp();
}"
>
Prestige up
</button>
</div>
</dialog>
</template>
<script lang="ts">
import type {Adventurer} from "@/classes/Adventurer";
import {defineComponent, type PropType} from "vue";
import {formatDamage} from "../classes/NumberMagic";
export default defineComponent({
name: "AdventurerDetails",
methods: {formatDamage},
props: {
adventurer: {
type: Object as PropType<Adventurer | null>,
default() {
return null as Adventurer | null;
},
required: true,
},
},
mounted() {
const refs = this.$refs as any;
refs.modal.showModal();
},
});
</script>
<style lang="scss" scoped>
.adventurer-details {
display: flex;
position: absolute;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
min-height: 10rem;
max-width: 45rem;
background-image: url("/img/background/paper/small_tile_paper.png");
background-position: center;
background-size: cover;
user-select: none;
&::backdrop {
background-color: rgba(0, 0, 0, 0.5);
}
.close {
position: absolute;
top: 0.25rem;
right: 0.5rem;
display: flex;
justify-content: center;
align-items: center;
font-size: 3rem;
margin: 0;
cursor: pointer;
color: #ab0707;
background: transparent;
border: none;
font-family: 'EB Garamond', serif;
transition: color 0.05s linear;
&:hover {
color: #ff0000;
}
&:focus {
outline: none;
}
&:focus-visible {
outline: 2px solid #ff0000;
}
}
.adventurer-portrait {
width: 100%;
max-width: 15rem;
aspect-ratio: 1/1;
img {
width: 100%;
height: 100%;
object-fit: cover;
}
}
.name {
display: flex;
justify-content: center;
font-size: 2rem;
font-weight: bold;
width: 100%;
}
.adventurer-data {
display: flex;
flex-direction: row;
justify-content: center;
align-items: center;
flex-wrap: wrap;
font-size: 1.2rem;
width: 100%;
& > * {
margin: 0;
width: calc(50% - 1rem);
text-align: center;
padding-inline: 0.5rem;
}
}
}
</style>
+19 -2
View File
@@ -9,7 +9,7 @@
<h1>Changelog</h1> <h1>Changelog</h1>
<div class="changelog-entry" v-for="release in releases"> <div class="changelog-entry" v-for="release in releases">
<hr> <hr>
<h2>Version {{ release.name }}</h2> <h2><span>Version {{ release.name }}</span><small class="date">{{ timeFormat.format(release.createdAt) }}</small></h2>
<pre>{{ release.body }}</pre> <pre>{{ release.body }}</pre>
</div> </div>
</div> </div>
@@ -22,7 +22,12 @@ import {defineComponent} from "vue";
export default defineComponent({ export default defineComponent({
name: "ChangelogComponent", name: "ChangelogComponent",
data: () => ({ data: () => ({
releases: [] as Array<any>, timeFormat: Intl.DateTimeFormat(Intl.DateTimeFormat().resolvedOptions().locale, {
year: "numeric",
month: "numeric",
day: "numeric",
}),
releases: [] as Array<{body: string, name: string, createdAt: Date}>,
lastPage: 1, lastPage: 1,
}), }),
methods: { methods: {
@@ -40,6 +45,7 @@ export default defineComponent({
const version = {} as any; const version = {} as any;
version.body = release.body.trim(); version.body = release.body.trim();
version.name = release.name; version.name = release.name;
version.createdAt = new Date(release.published_at);
if (release.body.length === 0) continue; if (release.body.length === 0) continue;
this.releases.push(version); this.releases.push(version);
} }
@@ -74,8 +80,19 @@ export default defineComponent({
width: 100%; width: 100%;
h2 { h2 {
display: flex;
flex-direction: row;
flex-wrap: wrap;
justify-content: flex-start;
align-items: flex-end;
margin: 0; margin: 0;
padding-inline: 1rem; padding-inline: 1rem;
gap: 0.5rem;
}
.date {
color: rgba(0,0,0, 0.6);
font-size: 1rem;
} }
hr { hr {
+29 -5
View File
@@ -3,7 +3,9 @@
<h2>Upgrades</h2> <h2>Upgrades</h2>
<div class="upgrade"> <div class="upgrade">
<span>Adventurer capacity (level {{ guild.adventurerCapacity.level }})</span> <span>Adventurer capacity (level {{ guild.adventurerCapacity.level }})</span>
<small>Increases the maximum amount of recruited adventurers</small>
<button <button
class="button metal"
v-if="guild.adventurerCapacity.nextLevelCost" v-if="guild.adventurerCapacity.nextLevelCost"
:disabled="guild.gold < guild.adventurerCapacity.nextLevelCost" :disabled="guild.gold < guild.adventurerCapacity.nextLevelCost"
@click="upgradeAdventurerCapacity()" @click="upgradeAdventurerCapacity()"
@@ -11,13 +13,25 @@
Upgrade ({{ formatGold(guild.adventurerCapacity.nextLevelCost) }} gold) Upgrade ({{ formatGold(guild.adventurerCapacity.nextLevelCost) }} gold)
</button> </button>
</div> </div>
<div class="upgrade" v-if="guild.level >= guild.expModifier.guildLevelRequirement">
<span>Quest exp modifier (level {{ guild.expModifier.level }})</span>
<small>Increases exp from newly offered quests by 10% per level</small>
<button
class="button metal"
v-if="guild.expModifier.nextLevelCost"
:disabled="guild.gold < guild.expModifier.nextLevelCost"
@click="upgradeQuestExpModifier()"
>
Upgrade ({{ formatGold(guild.expModifier.nextLevelCost) }} gold)
</button>
</div>
</section> </section>
</template> </template>
<script lang="ts"> <script lang="ts">
import {Guild} from "@/classes/Guild"; import {Guild} from "@/classes/Guild";
import {defineComponent, type PropType} from "vue"; import {defineComponent, type PropType} from "vue";
import formatGold from "../classes/NumberMagic"; import {formatGold} from "@/classes/NumberMagic";
export default defineComponent({ export default defineComponent({
name: "UpgradesList", name: "UpgradesList",
@@ -38,7 +52,14 @@ export default defineComponent({
if (this.guild.gold < this.guild.adventurerCapacity.nextLevelCost) return; if (this.guild.gold < this.guild.adventurerCapacity.nextLevelCost) return;
this.guild.gold -= this.guild.adventurerCapacity.nextLevelCost; this.guild.gold -= this.guild.adventurerCapacity.nextLevelCost;
this.guild.adventurerCapacity.upgrade(); this.guild.adventurerCapacity.upgrade();
} },
upgradeQuestExpModifier(): void {
if (!this.guild.expModifier) return;
if (!this.guild.expModifier.nextLevelCost) return;
if (this.guild.gold < this.guild.expModifier.nextLevelCost) return;
this.guild.gold -= this.guild.expModifier.nextLevelCost;
this.guild.expModifier.upgrade();
},
} }
}); });
</script> </script>
@@ -62,12 +83,15 @@ export default defineComponent({
font-size: 1.25rem; font-size: 1.25rem;
font-weight: bold; font-weight: bold;
display: flex; display: flex;
flex-direction: row; flex-direction: column;
flex-wrap: wrap;
width: min(25rem, 100%); width: min(25rem, 100%);
justify-content: center; justify-content: center;
align-items: center; align-items: center;
gap: 1rem; gap: 0.2rem;
small {
font-weight: normal;
line-height: 1;
}
} }
} }
</style> </style>
+28 -5
View File
@@ -1,5 +1,11 @@
<template> <template>
<div class="adventurer-section"> <div class="adventurer-section">
<AdventurerDetails
:adventurer="selectedAdventurer"
v-if="selectedAdventurer !== null"
@closeButtonClicked="selectedAdventurer = null"
/>
<section class="recruit panel pinned-paper"> <section class="recruit panel pinned-paper">
<h1>Applying adventurers</h1> <h1>Applying adventurers</h1>
<div class="adventurers"> <div class="adventurers">
@@ -29,10 +35,17 @@
</div> </div>
</section> </section>
<section class="collection panel pinned-paper"> <section class="collection panel pinned-paper">
<h1>Recruited adventurers ({{ Object.keys(adventurers).length }} / <h1>
{{ guild.adventurerCapacity.getAdventurerCapacity() }})</h1> Recruited adventurers ({{ Object.keys(adventurers).length }} / {{ guild.adventurerCapacity.getAdventurerCapacity() }})
</h1>
<small>Click an adventurer to see details about them</small>
<div class="adventurers"> <div class="adventurers">
<div class="adventurer-tile" v-for="adventurer in adventurers" :key="adventurer.id"> <div
class="adventurer-tile"
v-for="adventurer in adventurers"
:key="adventurer.id"
@click="selectedAdventurer = adventurer"
>
<AdventurerTile class="entry" :adventurer="adventurer"/> <AdventurerTile class="entry" :adventurer="adventurer"/>
<b>{{ adventurer.name }}</b> <b>{{ adventurer.name }}</b>
</div> </div>
@@ -46,16 +59,17 @@ import type {PropType} from "vue";
import {defineComponent} from "vue"; import {defineComponent} from "vue";
import AdventurerTile from "@/components/AdventurerTile.vue"; import AdventurerTile from "@/components/AdventurerTile.vue";
import type {Adventurer} from "@/classes/Adventurer"; import type {Adventurer} from "@/classes/Adventurer";
import {loadAdventurersForHire} from "@/GameData";
import type {Guild} from "@/classes/Guild"; import type {Guild} from "@/classes/Guild";
import AdventurerDetails from "@/components/AdventurerDetails.vue";
export default defineComponent({ export default defineComponent({
name: "RecruitView", name: "RecruitView",
components: {AdventurerTile}, components: {AdventurerDetails, AdventurerTile},
data: () => { data: () => {
return { return {
currentlyForHire: null as Adventurer | null, currentlyForHire: null as Adventurer | null,
adventurersForHire: [] as Array<Adventurer>, adventurersForHire: [] as Array<Adventurer>,
selectedAdventurer: null as Adventurer | null,
} }
}, },
props: { props: {
@@ -122,6 +136,14 @@ export default defineComponent({
margin: 0; margin: 0;
} }
.collection {
small {
font-size: 1rem;
display: block;
margin-bottom: 0.5rem;
}
}
.adventurers { .adventurers {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@@ -137,6 +159,7 @@ export default defineComponent({
flex-direction: column; flex-direction: column;
gap: 0.25rem; gap: 0.25rem;
font-size: 1.1rem; font-size: 1.1rem;
cursor: pointer;
.entry { .entry {
height: 7rem; height: 7rem;
+7 -3
View File
@@ -17,8 +17,12 @@
</section> </section>
<section class="upgrade"> <section class="upgrade">
<p>Guild level: {{ guild.level }}</p> <p>Guild level: {{ guild.level }}</p>
<button :disabled="guild.upgradeCost ? guild.gold < guild.upgradeCost : true" @click="guild.upgrade()"> <button
<span>Upgrade guild level</span><br> class="button metal"
:disabled="guild.upgradeCost ? guild.gold < guild.upgradeCost : true"
@click="guild.upgrade()"
>
<span>Upgrade guild level </span>
<span>({{ guild.displayUpgradeCost }})</span> <span>({{ guild.displayUpgradeCost }})</span>
</button> </button>
</section> </section>
@@ -40,7 +44,7 @@ import {Guild} from "@/classes/Guild";
import {version} from "../../package.json" import {version} from "../../package.json"
import UpgradesList from "@/components/UpgradesList.vue"; import UpgradesList from "@/components/UpgradesList.vue";
import formatGold from "../classes/NumberMagic"; import {formatGold} from "@/classes/NumberMagic";
export default defineComponent({ export default defineComponent({
name: "GuildView", name: "GuildView",