From a0b7db1bf6eae8413d62116bf71f3a92c1c93431 Mon Sep 17 00:00:00 2001
From: youhavetrouble <youhavetrouble@youhavetrouble.me>
Date: Wed, 5 Apr 2023 22:56:52 +0200
Subject: [PATCH 1/8] popup window with adventurer details

---
 src/components/AdventurerDetails.vue | 91 ++++++++++++++++++++++++++++
 src/views/AdventurerView.vue         | 17 +++++-
 2 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100644 src/components/AdventurerDetails.vue

diff --git a/src/components/AdventurerDetails.vue b/src/components/AdventurerDetails.vue
new file mode 100644
index 0000000..377e8c7
--- /dev/null
+++ b/src/components/AdventurerDetails.vue
@@ -0,0 +1,91 @@
+<template>
+  <dialog ref="modal" class="adventurer-details" v-if="adventurer">
+
+      <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: {{ adventurer.getDPS().toPrecision(2) }}</p>
+      </div>
+
+  </dialog>
+</template>
+
+<script lang="ts">
+import type {Adventurer} from "@/classes/Adventurer";
+import {defineComponent, type PropType} from "vue";
+
+export default defineComponent({
+  name: "AdventurerDetails",
+  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;
+  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);
+  }
+  .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>
\ No newline at end of file
diff --git a/src/views/AdventurerView.vue b/src/views/AdventurerView.vue
index 1764b8d..761240a 100644
--- a/src/views/AdventurerView.vue
+++ b/src/views/AdventurerView.vue
@@ -1,5 +1,10 @@
 <template>
   <div class="adventurer-section">
+    <AdventurerDetails
+        :adventurer="selectedAdventurer"
+        v-if="selectedAdventurer !== null"
+
+    />
     <section class="recruit panel pinned-paper">
       <h1>Applying adventurers</h1>
       <div class="adventurers">
@@ -32,7 +37,12 @@
       <h1>Recruited adventurers ({{ Object.keys(adventurers).length }} /
         {{ guild.adventurerCapacity.getAdventurerCapacity() }})</h1>
       <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"/>
           <b>{{ adventurer.name }}</b>
         </div>
@@ -46,16 +56,17 @@ import type {PropType} from "vue";
 import {defineComponent} from "vue";
 import AdventurerTile from "@/components/AdventurerTile.vue";
 import type {Adventurer} from "@/classes/Adventurer";
-import {loadAdventurersForHire} from "@/GameData";
 import type {Guild} from "@/classes/Guild";
+import AdventurerDetails from "@/components/AdventurerDetails.vue";
 
 export default defineComponent({
   name: "RecruitView",
-  components: {AdventurerTile},
+  components: {AdventurerDetails, AdventurerTile},
   data: () => {
     return {
       currentlyForHire: null as Adventurer | null,
       adventurersForHire: [] as Array<Adventurer>,
+      selectedAdventurer: null as Adventurer | null,
     }
   },
   props: {

From 4f2d7422848a83339dbfa9d4a19162dc8f00e710 Mon Sep 17 00:00:00 2001
From: youhavetrouble <youhavetrouble@youhavetrouble.me>
Date: Fri, 7 Apr 2023 20:45:08 +0200
Subject: [PATCH 2/8] fix lack of gold formatting on guild upgrade button on
 game load

---
 src/classes/Guild.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/classes/Guild.ts b/src/classes/Guild.ts
index eeaab3d..d1a7fe2 100644
--- a/src/classes/Guild.ts
+++ b/src/classes/Guild.ts
@@ -12,7 +12,8 @@ export class Guild {
     constructor(level: number, gold: number, upgrades: {[index:string]: GuildUpgrade} = {}) {
         this.gold = gold;
         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.adventurerCapacity = upgrades.adventurerCapacity as AdventurerCapacityUpgrade ?? new AdventurerCapacityUpgrade();

From 19d3dd551588de19d7526528802b271f58ab5014 Mon Sep 17 00:00:00 2001
From: youhavetrouble <youhavetrouble@youhavetrouble.me>
Date: Fri, 7 Apr 2023 22:22:26 +0200
Subject: [PATCH 3/8] exit button for adventurer details popup

---
 src/components/AdventurerDetails.vue | 64 ++++++++++++++++++++++------
 src/views/AdventurerView.vue         |  4 +-
 2 files changed, 53 insertions(+), 15 deletions(-)

diff --git a/src/components/AdventurerDetails.vue b/src/components/AdventurerDetails.vue
index 377e8c7..e2ba99c 100644
--- a/src/components/AdventurerDetails.vue
+++ b/src/components/AdventurerDetails.vue
@@ -1,17 +1,18 @@
 <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>
+    <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: {{ adventurer.getDPS().toPrecision(2) }}</p>
-      </div>
+      <p>Exp: {{ adventurer.exp }} / {{ adventurer.getNextLevelExpRequirement() }}</p>
+      <p>DPS: {{ adventurer.getDPS().toPrecision(2) }}</p>
+    </div>
 
   </dialog>
 </template>
@@ -24,16 +25,16 @@ export default defineComponent({
   name: "AdventurerDetails",
   props: {
     adventurer: {
-      type: Object as PropType<Adventurer|null>,
+      type: Object as PropType<Adventurer | null>,
       default() {
-        return null as Adventurer|null;
+        return null as Adventurer | null;
       },
       required: true,
     },
   },
   mounted() {
-      const refs = this.$refs as any;
-      refs.modal.showModal();
+    const refs = this.$refs as any;
+    refs.modal.showModal();
   },
 
 });
@@ -42,6 +43,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 .adventurer-details {
   display: flex;
+  position: absolute;
   flex-direction: column;
   justify-content: center;
   align-items: center;
@@ -52,19 +54,51 @@ export default defineComponent({
   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;
+
+    &: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;
@@ -72,6 +106,7 @@ export default defineComponent({
     font-weight: bold;
     width: 100%;
   }
+
   .adventurer-data {
     display: flex;
     flex-direction: row;
@@ -80,6 +115,7 @@ export default defineComponent({
     flex-wrap: wrap;
     font-size: 1.2rem;
     width: 100%;
+
     & > * {
       margin: 0;
       width: calc(50% - 1rem);
diff --git a/src/views/AdventurerView.vue b/src/views/AdventurerView.vue
index 761240a..7504b90 100644
--- a/src/views/AdventurerView.vue
+++ b/src/views/AdventurerView.vue
@@ -3,6 +3,7 @@
     <AdventurerDetails
         :adventurer="selectedAdventurer"
         v-if="selectedAdventurer !== null"
+        @closeButtonClicked="selectedAdventurer = null"
 
     />
     <section class="recruit panel pinned-paper">
@@ -85,7 +86,7 @@ export default defineComponent({
       required: true,
     },
     adventurerForHire: {
-      type: Object as PropType<Adventurer|null>,
+      type: Object as PropType<Adventurer | null>,
       default() {
         return null;
       }
@@ -148,6 +149,7 @@ export default defineComponent({
       flex-direction: column;
       gap: 0.25rem;
       font-size: 1.1rem;
+      cursor: pointer;
 
       .entry {
         height: 7rem;

From b213cae62b8886304ee43b8689ec6342b2771c5d Mon Sep 17 00:00:00 2001
From: youhavetrouble <youhavetrouble@youhavetrouble.me>
Date: Fri, 7 Apr 2023 22:23:16 +0200
Subject: [PATCH 4/8] fix the game not properly saving/loading adventurers for
 hire

---
 src/App.vue     | 178 ++++++++++++++++++++++++------------------------
 src/GameData.ts | 178 +++++++++++++++++++++++-------------------------
 2 files changed, 173 insertions(+), 183 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2df9708..0cec817 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -10,15 +10,15 @@ import {RouterLink, RouterView} from 'vue-router'</script>
       <RouterLink :to="{name: 'technical'}"><img class="icon" src="/img/icons/cog.svg" alt="Technical"></RouterLink>
     </nav>
   </header>
-    <RouterView
-        :guild="guild"
-        :adventurers="adventurers"
-        :quests="missives"
-        :adventurerForHire="adventurerForHire"
-        @finalizeQuest="finalizeQuest($event)"
-        @wipeSave="resetSave()"
-        @recruitActionTaken="recruitAction($event)"
-    />
+  <RouterView
+      :guild="guild"
+      :adventurers="adventurers"
+      :quests="missives"
+      :adventurerForHire="adventurerForHire"
+      @finalizeQuest="finalizeQuest($event)"
+      @wipeSave="resetSave()"
+      @recruitActionTaken="recruitAction($event)"
+  />
 </template>
 
 <script lang="ts">
@@ -37,16 +37,16 @@ export default defineComponent({
   data: () => ({
     guild: new Guild(1, 500),
     lastQuestGot: {
-      S: null as null|number,
-      A: null as null|number,
-      B: null as null|number,
-      C: null as null|number,
-      D: null as null|number,
-      E: null as null|number,
-      F: null as null|number,
-    } as { [key: string]: null|number },
-    lastRecruitHandled: null as null|number,
-    adventurerForHire: null as Adventurer|null,
+      S: null as null | number,
+      A: null as null | number,
+      B: null as null | number,
+      C: null as null | number,
+      D: null as null | number,
+      E: null as null | number,
+      F: null as null | number,
+    } as { [key: string]: null | number },
+    lastRecruitHandled: null as null | number,
+    adventurerForHire: null as Adventurer | null,
     adventurersDatabase: {} as Array<Adventurer>,
     adventurers: {} as { [key: string]: Adventurer },
     quests: {} as { [key: string]: { [key: string]: Quest } },
@@ -81,14 +81,20 @@ export default defineComponent({
 
     },
     async checkForNewRecruit(currentTimestamp: number) {
-      if (this.lastRecruitHandled === null) {
+
+      if (this.lastRecruitHandled == null) {
         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);
       }
     },
-    recruitAction(adventurer: Adventurer|null): void {
+    recruitAction(adventurer: Adventurer | null): void {
       this.lastRecruitHandled = Number(new Date());
       this.adventurerForHire = null;
       if (adventurer === null) return;
@@ -128,68 +134,62 @@ export default defineComponent({
       this.missives[rank][newId] = quest;
     },
     loadGame() {
-       const saveData = loadGame();
-       if (saveData === null) return;
+      const saveData = loadGame();
+      if (saveData === null) return;
 
-       this.lastQuestGot = saveData.lastQuestGot;
+      this.lastQuestGot = saveData.lastQuestGot;
 
-       const guildUpgrades = {} as { [key: string]: GuildUpgrade };
-       if (saveData.guild.adventurerCapacity) {
-         guildUpgrades.adventurerCapacity = new AdventurerCapacityUpgrade(saveData.guild.adventurerCapacity.level);
-       }
-
-       this.guild = new Guild(saveData.guild.level, saveData.guild.gold, guildUpgrades);
-
-       const adventurers = {} as { [key: string]: Adventurer };
-
-       for (const id in saveData.adventurers) {
-         const data = saveData.adventurers[id];
-         try {
-           const adventurer = new Adventurer(
-               data.id,
-               data.name,
-               data.portrait,
-               data.attackExponent ?? 1.1,
-               data.level ?? 1,
-               data.exp ?? 0
-           );
-           adventurer.busy = data.busy;
-           adventurers[data.id] = adventurer;
-         } catch (e) {}
-       }
-       this.adventurers = adventurers;
-
-
-
-       const missives = {} as { [key: string]: { [key: string]: Quest } };
-
-       for (const id in saveData.missives) {
-         const missiveRank = {} as { [key: string]: Quest }
-         for (const questId in saveData.missives[id]) {
-           const data = saveData.missives[id][questId];
-           const quest = new Quest(questId, getFromString(data.rank), data.title, data.text, data.maxProgress, data.expReward, data.goldReward);
-           quest.progressPoints = data.progressPoints;
-           if (data.adventurers.length > 0) {
-             quest.adventurers.push(this.adventurers[data.adventurers[0].id])
-           }
-           missiveRank[questId] = quest;
-         }
-         missives[id] = missiveRank;
-       }
-
-       this.missives = missives;
-
-       this.lastRecruitHandled = saveData.lastRecruitAction ?? 0;
-
-      if (Object.keys(this.adventurers).length <= 0) {
-        this.adventurerForHire = this.adventurersDatabase[0];
-        return;
+      const guildUpgrades = {} as { [key: string]: GuildUpgrade };
+      if (saveData.guild.adventurerCapacity) {
+        guildUpgrades.adventurerCapacity = new AdventurerCapacityUpgrade(saveData.guild.adventurerCapacity.level);
       }
 
-      if (saveData.currentlyForHireId !== null) {
+      this.guild = new Guild(saveData.guild.level, saveData.guild.gold, guildUpgrades);
+
+      const adventurers = {} as { [key: string]: Adventurer };
+
+      for (const id in saveData.adventurers) {
+        const data = saveData.adventurers[id];
+        try {
+          const adventurer = new Adventurer(
+            data.id,
+            data.name,
+            data.portrait,
+            data.attackExponent ?? 1.1,
+            data.level ?? 1,
+            data.exp ?? 0
+          );
+          adventurer.busy = data.busy;
+          adventurers[data.id] = adventurer;
+        } catch (e) {
+        }
+      }
+      this.adventurers = adventurers;
+
+      const missives = {} as { [key: string]: { [key: string]: Quest } };
+
+      for (const id in saveData.missives) {
+        const missiveRank = {} as { [key: string]: Quest }
+        for (const questId in saveData.missives[id]) {
+          const data = saveData.missives[id][questId];
+          const quest = new Quest(questId, getFromString(data.rank), data.title, data.text, data.maxProgress, data.expReward, data.goldReward);
+          quest.progressPoints = data.progressPoints;
+          if (data.adventurers.length > 0) {
+            quest.adventurers.push(this.adventurers[data.adventurers[0].id])
+          }
+          missiveRank[questId] = quest;
+        }
+        missives[id] = missiveRank;
+      }
+
+      this.missives = missives;
+
+      this.lastRecruitHandled = saveData.lastRecruitAction ?? 0;
+
+      if (saveData.adventurerForHireId != null) {
         for (const id in this.adventurersDatabase) {
           const adventurer = this.adventurersDatabase[id];
-          if (adventurer.id === saveData.currentlyForHireId) {
+          if (adventurer.id === saveData.adventurerForHireId) {
             this.adventurerForHire = adventurer;
             return;
           }
@@ -203,21 +203,20 @@ export default defineComponent({
     }
   },
   async mounted() {
-    this.loadGame();
     this.quests = await loadAvailableQuests();
     this.adventurersDatabase = await loadAdventurersForHire(Object.keys(this.adventurers));
+    this.loadGame();
 
     setInterval(() => {
-      saveGame(new GameData(
-          this.guild,
-          this.adventurers,
-          this.missives,
-          this.lastQuestGot,
-          this.lastRecruitHandled,
-          this.adventurerForHire?.id ?? null
-          )
-      );
-    }, 10*1000)
+      saveGame(new GameData({
+        adventurers: this.adventurers,
+        guild: this.guild,
+        missives: this.missives,
+        lastQuestGot: this.lastQuestGot,
+        lastRecruitAction: this.lastRecruitHandled,
+        adventurerForHireId: this.adventurerForHire?.id ?? null,
+      }));
+    }, 10 * 1000)
 
     setInterval(() => {
       this.updateMissives();
@@ -349,6 +348,7 @@ nav {
     font-size: 2rem;
     color: #fff;
     text-decoration: none;
+
     &.router-link-active {
       text-decoration: underline;
     }
diff --git a/src/GameData.ts b/src/GameData.ts
index d325940..221536e 100644
--- a/src/GameData.ts
+++ b/src/GameData.ts
@@ -1,30 +1,26 @@
-import type {Guild} from "@/classes/Guild";
+import {Guild} from "@/classes/Guild";
 import {Adventurer} from "@/classes/Adventurer";
 import {Quest} from "@/classes/Quest";
 import {getFromString, QuestRank} from "@/classes/QuestRank";
 
 export class GameData {
-    guild: Guild;
-    adventurers: { [key: string]: Adventurer };
-    missives: { [key: string]: { [key: string]: Quest } };
-    lastQuestGot: { [key: string]: null | number };
-    lastRecruitAction: null | number;
-    currentlyForHireId: string|null;
+  guild: Guild;
+  adventurers: { [key: string]: Adventurer };
+  missives: { [key: string]: { [key: string]: Quest } };
+  lastQuestGot: { [key: string]: null | number };
+  lastRecruitAction: null | number;
+  adventurerForHireId: string | null;
 
-    constructor(
-        guild: Guild, adventurers: { [key: string]: Adventurer },
-        missives: { [key: string]: { [key: string]: Quest } },
-        lastQuestGot: { [key: string]: null | number },
-        lastRecruitAction: null | number,
-        currentlyForHireId: string|null = null
-    ) {
-        this.guild = guild;
-        this.adventurers = adventurers;
-        this.missives = missives;
-        this.lastQuestGot = lastQuestGot;
-        this.lastRecruitAction = lastRecruitAction;
-        this.currentlyForHireId = currentlyForHireId;
-    }
+  constructor(
+    data: any,
+  ) {
+    this.guild = data.guild ?? new Guild(1, 0);
+    this.adventurers = data.adventurers ?? {} as { [key: string]: Adventurer };
+    this.missives = data.missives ?? {} as { [key: string]: { [key: string]: Quest } };
+    this.lastQuestGot = data.lastQuestGot ?? {} as { [key: string]: null | number };
+    this.lastRecruitAction = data.lastRecruitAction ?? null;
+    this.adventurerForHireId = data.adventurerForHireId ?? null;
+  }
 }
 
 
@@ -32,91 +28,85 @@ export class GameData {
  * Save the game to local storage
  */
 export function saveGame(
-    data: GameData
+  data: GameData
 ): void {
-    console.debug("Saving game...");
-    window.localStorage.setItem("savedGame", JSON.stringify({
-        guild: data.guild,
-        adventurers: data.adventurers,
-        missives: data.missives,
-        lastQuestGot: data.lastQuestGot,
-        lastRecruitAction: data.lastRecruitAction,
-        adventurerForHireId: data.currentlyForHireId,
-    }));
+  console.debug("Saving game...");
+  window.localStorage.setItem("savedGame", JSON.stringify({
+    guild: data.guild,
+    adventurers: data.adventurers,
+    missives: data.missives,
+    lastQuestGot: data.lastQuestGot,
+    lastRecruitAction: data.lastRecruitAction,
+    adventurerForHireId: data.adventurerForHireId,
+  }));
 }
 
 export function loadGame(): GameData | null {
-    const savedGame = window.localStorage.getItem("savedGame");
-    if (!savedGame) return null;
-    console.debug("Loading game...");
-    const parsedGame = JSON.parse(savedGame);
-    return new GameData(
-        parsedGame.guild,
-        parsedGame.adventurers,
-        parsedGame.missives,
-        parsedGame.lastQuestGot,
-        parsedGame.lastRecruitAction
-    );
+  const savedGame = window.localStorage.getItem("savedGame");
+  if (!savedGame) return null;
+  const parsedGame = JSON.parse(savedGame);
+  console.debug("Loading game...");
+  return new GameData(parsedGame);
 }
 
 export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: string]: Quest } }> {
-    const quests = {
-        S: {} as { [key: string]: Quest },
-        A: {} as { [key: string]: Quest },
-        B: {} as { [key: string]: Quest },
-        C: {} as { [key: string]: Quest },
-        D: {} as { [key: string]: Quest },
-        E: {} as { [key: string]: Quest },
-        F: {} as { [key: string]: Quest },
-    } as { [key: string]: { [key: string]: Quest } };
+  const quests = {
+    S: {} as { [key: string]: Quest },
+    A: {} as { [key: string]: Quest },
+    B: {} as { [key: string]: Quest },
+    C: {} as { [key: string]: Quest },
+    D: {} as { [key: string]: Quest },
+    E: {} as { [key: string]: Quest },
+    F: {} as { [key: string]: Quest },
+  } as { [key: string]: { [key: string]: Quest } };
 
-    for (const rank in quests) {
-        const response = await fetch(`data/quests/Rank${rank}.json`);
-        if (response.status !== 200) {
-            console.error("Failed to load quests");
-            alert("Failed to load quests. Please try refreshing the page.");
-            return quests;
-        }
-        const questData = await response.json();
-
-        let id = 0;
-        for (const quest of questData) {
-            id++;
-            quests[rank.toString()][id] = new Quest(
-                id.toString(),
-                getFromString(rank as QuestRank),
-                quest.title,
-                quest.text,
-                1,
-                0,
-                0
-            );
-        }
+  for (const rank in quests) {
+    const response = await fetch(`data/quests/Rank${rank}.json`);
+    if (response.status !== 200) {
+      console.error("Failed to load quests");
+      alert("Failed to load quests. Please try refreshing the page.");
+      return quests;
     }
-    return quests;
+    const questData = await response.json();
+
+    let id = 0;
+    for (const quest of questData) {
+      id++;
+      quests[rank.toString()][id] = new Quest(
+        id.toString(),
+        getFromString(rank as QuestRank),
+        quest.title,
+        quest.text,
+        1,
+        0,
+        0
+      );
+    }
+  }
+  return quests;
 }
 
 export async function loadAdventurersForHire(currentAdventurerIds: Array<string> = []): Promise<Array<Adventurer>> {
-    const response = await fetch("data/adventurers.json");
-    if (response.status !== 200) {
-        console.error("Failed to load adventurers");
-        alert("Failed to load adventurers. Please try refreshing the page.");
-        return [];
-    }
-    const adventurerData = await response.json();
+  const response = await fetch("data/adventurers.json");
+  if (response.status !== 200) {
+    console.error("Failed to load adventurers");
+    alert("Failed to load adventurers. Please try refreshing the page.");
+    return [];
+  }
+  const adventurerData = await response.json();
 
-    const adventurers = [] as Array<Adventurer>;
-    for (const adventurer of adventurerData) {
-        if (currentAdventurerIds.includes(adventurer.id)) continue;
-        adventurers.push(new Adventurer(
-            adventurer.id,
-            adventurer.name,
-            adventurer.portrait,
-            adventurer.attackExponent,
-            adventurer.level,
-            adventurer.exp,
-        ));
-    }
+  const adventurers = [] as Array<Adventurer>;
+  for (const adventurer of adventurerData) {
+    if (currentAdventurerIds.includes(adventurer.id)) continue;
+    adventurers.push(new Adventurer(
+      adventurer.id,
+      adventurer.name,
+      adventurer.portrait,
+      adventurer.attackExponent,
+      adventurer.level,
+      adventurer.exp,
+    ));
+  }
 
-    return adventurers;
+  return adventurers;
 }

From a185bc2153d76805178e75e70f2ade150f4599be Mon Sep 17 00:00:00 2001
From: youhavetrouble <youhavetrouble@youhavetrouble.me>
Date: Sun, 9 Apr 2023 13:59:19 +0200
Subject: [PATCH 5/8] prestige feature

---
 src/components/AdventurerDetails.vue | 14 ++++++++++++++
 src/views/AdventurerView.vue         | 14 ++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/components/AdventurerDetails.vue b/src/components/AdventurerDetails.vue
index e2ba99c..d4eba6f 100644
--- a/src/components/AdventurerDetails.vue
+++ b/src/components/AdventurerDetails.vue
@@ -13,6 +13,19 @@
       <p>Exp: {{ adventurer.exp }} / {{ adventurer.getNextLevelExpRequirement() }}</p>
       <p>DPS: {{ adventurer.getDPS().toPrecision(2) }}</p>
     </div>
+    <div class="adventurer-upgrades">
+      <button
+          :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>
@@ -73,6 +86,7 @@ export default defineComponent({
     background: transparent;
     border: none;
     font-family: 'EB Garamond', serif;
+    transition: color 0.05s linear;
 
     &:hover {
       color: #ff0000;
diff --git a/src/views/AdventurerView.vue b/src/views/AdventurerView.vue
index 7504b90..0eb5b8b 100644
--- a/src/views/AdventurerView.vue
+++ b/src/views/AdventurerView.vue
@@ -35,8 +35,10 @@
       </div>
     </section>
     <section class="collection panel pinned-paper">
-      <h1>Recruited adventurers ({{ Object.keys(adventurers).length }} /
-        {{ guild.adventurerCapacity.getAdventurerCapacity() }})</h1>
+      <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="adventurer-tile"
@@ -134,6 +136,14 @@ export default defineComponent({
     margin: 0;
   }
 
+  .collection {
+    small {
+      font-size: 1rem;
+      display: block;
+      margin-bottom: 0.5rem;
+    }
+  }
+
   .adventurers {
     display: flex;
     flex-direction: row;

From 61ff80b69f90671adfaaec6f1d3b8abedd5de8e3 Mon Sep 17 00:00:00 2001
From: youhavetrouble <youhavetrouble@youhavetrouble.me>
Date: Sun, 9 Apr 2023 15:35:56 +0200
Subject: [PATCH 6/8] style buttons and fix up number formatting

---
 src/App.vue                          |  3 ++-
 src/assets/main.scss                 | 32 ++++++++++++++++++++++------
 src/classes/Guild.ts                 |  3 ++-
 src/classes/NumberMagic.ts           | 16 +++++++++++---
 src/components/AdventurerDetails.vue |  5 ++++-
 src/components/UpgradesList.vue      |  5 +++--
 src/views/HomeView.vue               | 10 ++++++---
 7 files changed, 57 insertions(+), 17 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 0cec817..c5efbe4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -157,7 +157,8 @@ export default defineComponent({
             data.portrait,
             data.attackExponent ?? 1.1,
             data.level ?? 1,
-            data.exp ?? 0
+            data.exp ?? 0,
+            data.prestige ?? 0,
           );
           adventurer.busy = data.busy;
           adventurers[data.id] = adventurer;
diff --git a/src/assets/main.scss b/src/assets/main.scss
index be85da0..47f0f35 100644
--- a/src/assets/main.scss
+++ b/src/assets/main.scss
@@ -1,8 +1,3 @@
-
-:root {
-
-}
-
 body {
   margin: 0;
   padding: 0 0 10rem;
@@ -61,4 +56,29 @@ body {
     filter: drop-shadow(-0.15rem 0.2rem 0.1rem rgba(0, 0, 0, 0.25));
     border-image: url("/img/borders/metal_corner.png") 30 round;
   }
-}
\ No newline at end of file
+}
+
+.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);
+  }
+}
diff --git a/src/classes/Guild.ts b/src/classes/Guild.ts
index d1a7fe2..8d5b189 100644
--- a/src/classes/Guild.ts
+++ b/src/classes/Guild.ts
@@ -1,6 +1,7 @@
 import type {GuildUpgrade} from "@/classes/GuildUpgrade";
 import {AdventurerCapacityUpgrade} from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
-import formatGold from "@/classes/NumberMagic";
+import {formatGold} from "@/classes/NumberMagic";
+
 
 export class Guild {
     gold: number;
diff --git a/src/classes/NumberMagic.ts b/src/classes/NumberMagic.ts
index 6f7673e..fe9d2f6 100644
--- a/src/classes/NumberMagic.ts
+++ b/src/classes/NumberMagic.ts
@@ -1,10 +1,20 @@
-const formatter = new Intl.NumberFormat('en-US', {
+const goldFormatter = new Intl.NumberFormat('en-US', {
     maximumFractionDigits: 3,
     // @ts-ignore - typescript doesn't know about this option for some godforsaken reason
     notation: "compact",
     useGrouping: true,
 });
 
-export default function formatGold(number: number): string {
-    return formatter.format(number);
+const damageFormatter = new Intl.NumberFormat('en-US', {
+    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);
 }
\ No newline at end of file
diff --git a/src/components/AdventurerDetails.vue b/src/components/AdventurerDetails.vue
index d4eba6f..9a9c3e1 100644
--- a/src/components/AdventurerDetails.vue
+++ b/src/components/AdventurerDetails.vue
@@ -11,10 +11,11 @@
       <p>Prestige level: {{ adventurer.prestige }}</p>
 
       <p>Exp: {{ adventurer.exp }} / {{ adventurer.getNextLevelExpRequirement() }}</p>
-      <p>DPS: {{ adventurer.getDPS().toPrecision(2) }}</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="() => {
@@ -33,9 +34,11 @@
 <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>,
diff --git a/src/components/UpgradesList.vue b/src/components/UpgradesList.vue
index d23003e..dc03c94 100644
--- a/src/components/UpgradesList.vue
+++ b/src/components/UpgradesList.vue
@@ -4,6 +4,7 @@
     <div class="upgrade">
       <span>Adventurer capacity (level {{ guild.adventurerCapacity.level }})</span>
       <button
+          class="button metal"
           v-if="guild.adventurerCapacity.nextLevelCost"
           :disabled="guild.gold < guild.adventurerCapacity.nextLevelCost"
           @click="upgradeAdventurerCapacity()"
@@ -17,7 +18,7 @@
 <script lang="ts">
 import {Guild} from "@/classes/Guild";
 import {defineComponent, type PropType} from "vue";
-import formatGold from "../classes/NumberMagic";
+import {formatGold} from "@/classes/NumberMagic";
 
 export default defineComponent({
   name: "UpgradesList",
@@ -67,7 +68,7 @@ export default defineComponent({
     width: min(25rem, 100%);
     justify-content: center;
     align-items: center;
-    gap: 1rem;
+    gap: 0.2rem;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 299058a..ab355e9 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -17,8 +17,12 @@
       </section>
       <section class="upgrade">
         <p>Guild level: {{ guild.level }}</p>
-        <button :disabled="guild.upgradeCost ? guild.gold < guild.upgradeCost : true" @click="guild.upgrade()">
-          <span>Upgrade guild level</span><br>
+        <button
+            class="button metal"
+            :disabled="guild.upgradeCost ? guild.gold < guild.upgradeCost : true"
+            @click="guild.upgrade()"
+        >
+          <span>Upgrade guild level </span>
           <span>({{ guild.displayUpgradeCost }})</span>
         </button>
       </section>
@@ -40,7 +44,7 @@ import {Guild} from "@/classes/Guild";
 
 import {version} from "../../package.json"
 import UpgradesList from "@/components/UpgradesList.vue";
-import formatGold from "../classes/NumberMagic";
+import {formatGold} from "@/classes/NumberMagic";
 
 export default defineComponent({
   name: "GuildView",

From 2dad283de9d160b1650159597d4f0e7c7bb9d424 Mon Sep 17 00:00:00 2001
From: youhavetrouble <youhavetrouble@youhavetrouble.me>
Date: Sun, 9 Apr 2023 16:22:42 +0200
Subject: [PATCH 7/8] fix already recruited adventurers showing up again

---
 src/App.vue     | 13 +++++++++++--
 src/GameData.ts | 17 ++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index c5efbe4..d4151e8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -27,7 +27,14 @@ import {Adventurer} from "@/classes/Adventurer";
 import {getQuestWithRewards, Quest} from "@/classes/Quest";
 import {Guild} from "@/classes/Guild";
 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 {AdventurerCapacityUpgrade} from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
 import {getNewAdventurerForHire} from "@/classes/Recruitment";
@@ -205,9 +212,11 @@ export default defineComponent({
   },
   async mounted() {
     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(() => {
       saveGame(new GameData({
         adventurers: this.adventurers,
diff --git a/src/GameData.ts b/src/GameData.ts
index 221536e..ee3108e 100644
--- a/src/GameData.ts
+++ b/src/GameData.ts
@@ -86,7 +86,7 @@ export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: st
   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");
   if (response.status !== 200) {
     console.error("Failed to load adventurers");
@@ -95,9 +95,8 @@ export async function loadAdventurersForHire(currentAdventurerIds: Array<string>
   }
   const adventurerData = await response.json();
 
-  const adventurers = [] as Array<Adventurer>;
+  const adventurers: Array<Adventurer> = [];
   for (const adventurer of adventurerData) {
-    if (currentAdventurerIds.includes(adventurer.id)) continue;
     adventurers.push(new Adventurer(
       adventurer.id,
       adventurer.name,
@@ -110,3 +109,15 @@ export async function loadAdventurersForHire(currentAdventurerIds: Array<string>
 
   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;
+}

From 19c4a3f7acd4faf18c559dbbc2b326c49c30352d Mon Sep 17 00:00:00 2001
From: youhavetrouble <youhavetrouble@youhavetrouble.me>
Date: Sun, 9 Apr 2023 23:55:34 +0200
Subject: [PATCH 8/8] adjust adventurer exp scaling from linear to exponential

---
 src/classes/Adventurer.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/classes/Adventurer.ts b/src/classes/Adventurer.ts
index b57a6a1..2dcb9cc 100644
--- a/src/classes/Adventurer.ts
+++ b/src/classes/Adventurer.ts
@@ -44,12 +44,13 @@ export class Adventurer {
     }
 
     canPrestigeUp(): boolean {
+        if (this.busy) return false;
         if (this.level < getMaxLevelForPrestige(this.prestige)) return false;
         return this.prestige < 5
     }
 
     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)));
     }
 
     /**