From c71eeda11ff95407a52ef710db4951dd62b2977a Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Sat, 25 Mar 2023 14:42:17 +0100
Subject: [PATCH] hook in data sources for adventurers and quests,
 programatically generate quest rewards, change damage math,

---
 {src/assets => public}/data/adventurers.json  | 12 ++--
 {src/assets => public}/data/quests/RankA.json |  0
 {src/assets => public}/data/quests/RankB.json |  0
 {src/assets => public}/data/quests/RankC.json |  0
 {src/assets => public}/data/quests/RankD.json |  0
 {src/assets => public}/data/quests/RankE.json |  0
 {src/assets => public}/data/quests/RankF.json |  0
 {src/assets => public}/data/quests/RankS.json |  0
 src/App.vue                                   | 29 +++++---
 src/GameData.ts                               | 71 +++++++++++++++++--
 src/classes/Adventurer.ts                     | 14 +++-
 src/classes/Quest.ts                          | 55 +++++++++++++-
 src/views/AdventurerView.vue                  | 14 ++--
 13 files changed, 163 insertions(+), 32 deletions(-)
 rename {src/assets => public}/data/adventurers.json (80%)
 rename {src/assets => public}/data/quests/RankA.json (100%)
 rename {src/assets => public}/data/quests/RankB.json (100%)
 rename {src/assets => public}/data/quests/RankC.json (100%)
 rename {src/assets => public}/data/quests/RankD.json (100%)
 rename {src/assets => public}/data/quests/RankE.json (100%)
 rename {src/assets => public}/data/quests/RankF.json (100%)
 rename {src/assets => public}/data/quests/RankS.json (100%)

diff --git a/src/assets/data/adventurers.json b/public/data/adventurers.json
similarity index 80%
rename from src/assets/data/adventurers.json
rename to public/data/adventurers.json
index 2fb5e74..ca59c22 100644
--- a/src/assets/data/adventurers.json
+++ b/public/data/adventurers.json
@@ -3,36 +3,36 @@
     "id": "rincewind-diskworld",
     "name": "Rincewind",
     "portrait": "/img/adventurers/rincewind.png",
-    "attackPerLevel": 1.7
+    "attackExponent": 1.09
   },
   {
     "id": "fran-sword-isekai",
     "name": "Fran",
     "portrait": "/img/adventurers/fran.png",
-    "attackPerLevel": 2.2
+    "attackExponent": 1.115
   },
   {
     "id": "kazuma-konosuba",
     "name": "Kazuma",
     "portrait": "/img/adventurers/kazuma.png",
-    "attackPerLevel": 1.8
+    "attackExponent": 1.1
   },
   {
     "id": "rein-beast-tamer",
     "name": "Rein",
     "portrait": "/img/adventurers/rein.png",
-    "attackPerLevel": 1.9
+    "attackExponent": 1.1
   },
   {
     "id": "momon-overlord",
     "name": "Momon",
     "portrait": "/img/adventurers/momon.png",
-    "attackPerLevel": 2.1
+    "attackExponent": 1.11
   },
   {
     "id": "goblin-slayer",
     "name": "Goblin Slayer",
     "portrait": "/img/adventurers/goblin-slayer.png",
-    "attackPerLevel": 2
+    "attackExponent": 1.1
   }
 ]
\ No newline at end of file
diff --git a/src/assets/data/quests/RankA.json b/public/data/quests/RankA.json
similarity index 100%
rename from src/assets/data/quests/RankA.json
rename to public/data/quests/RankA.json
diff --git a/src/assets/data/quests/RankB.json b/public/data/quests/RankB.json
similarity index 100%
rename from src/assets/data/quests/RankB.json
rename to public/data/quests/RankB.json
diff --git a/src/assets/data/quests/RankC.json b/public/data/quests/RankC.json
similarity index 100%
rename from src/assets/data/quests/RankC.json
rename to public/data/quests/RankC.json
diff --git a/src/assets/data/quests/RankD.json b/public/data/quests/RankD.json
similarity index 100%
rename from src/assets/data/quests/RankD.json
rename to public/data/quests/RankD.json
diff --git a/src/assets/data/quests/RankE.json b/public/data/quests/RankE.json
similarity index 100%
rename from src/assets/data/quests/RankE.json
rename to public/data/quests/RankE.json
diff --git a/src/assets/data/quests/RankF.json b/public/data/quests/RankF.json
similarity index 100%
rename from src/assets/data/quests/RankF.json
rename to public/data/quests/RankF.json
diff --git a/src/assets/data/quests/RankS.json b/public/data/quests/RankS.json
similarity index 100%
rename from src/assets/data/quests/RankS.json
rename to public/data/quests/RankS.json
diff --git a/src/App.vue b/src/App.vue
index 8f3e3dd..393b93d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,10 +24,10 @@ import {RouterLink, RouterView} from 'vue-router'</script>
 <script lang="ts">
 import {defineComponent} from "vue";
 import {Adventurer} from "@/classes/Adventurer";
-import {Quest} from "@/classes/Quest";
+import {getQuestWithRewards, Quest} from "@/classes/Quest";
 import {Guild} from "@/classes/Guild";
 import {getFromString, QuestRank} from "@/classes/QuestRank";
-import {GameData, loadGame, saveGame} from "@/GameData";
+import {GameData, loadAvailableQuests, loadGame, saveGame} from "@/GameData";
 
 export default defineComponent({
   name: "GuildView",
@@ -56,8 +56,7 @@ export default defineComponent({
       F: null as null|number,
     } as { [key: string]: null|number },
     lastRecruitHandled: null as null|number,
-    adventurers: {
-    } as { [key: string]: Adventurer },
+    adventurers: {} as { [key: string]: Adventurer },
     quests: {
       F: {
         "1": new Quest("1", QuestRank.F, "Frog Frenzy", "Kill 10 demon frogs.", 120, 1, 25),
@@ -118,7 +117,7 @@ export default defineComponent({
           }
           for (const adventurerId in missive.adventurers) {
             const adventurer = missive.adventurers[adventurerId];
-            const attack = adventurer.attackPerLevel * adventurer.level;
+            const attack = adventurer.getAttack();
             missive.progressPoints = Math.min(missive.progressPoints + attack, missive.maxProgress);
           }
         }
@@ -142,7 +141,7 @@ export default defineComponent({
       const questsForRank = this.quests[rank] as { [key: string]: Quest };
       const randomId = keys.length * Math.random() << 0;
       const randomIdString = keys[randomId] as string;
-      return questsForRank[randomIdString];
+      return getQuestWithRewards(questsForRank[randomIdString]);
     },
     createMissive(questToAdd: Quest, rank: QuestRank) {
       const quest = JSON.parse(JSON.stringify(questToAdd));
@@ -162,9 +161,18 @@ export default defineComponent({
 
        for (const id in saveData.adventurers) {
          const data = saveData.adventurers[id];
-         const adventurer = new Adventurer(data.id, data.name, data.portrait, data.attackPerLevel, data.level, data.exp);
-         adventurer.busy = data.busy;
-         adventurers[data.id] = adventurer;
+         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;
 
@@ -194,8 +202,9 @@ export default defineComponent({
       window.location.reload();
     }
   },
-  mounted() {
+  async mounted() {
     this.loadGame();
+    this.quests = await loadAvailableQuests();
 
     setInterval(() => {
       saveGame(new GameData(
diff --git a/src/GameData.ts b/src/GameData.ts
index ef79ab5..382e451 100644
--- a/src/GameData.ts
+++ b/src/GameData.ts
@@ -1,6 +1,7 @@
 import type {Guild} from "@/classes/Guild";
-import type {Adventurer} from "@/classes/Adventurer";
-import type {Quest} from "@/classes/Quest";
+import {Adventurer} from "@/classes/Adventurer";
+import {Quest} from "@/classes/Quest";
+import {getFromString, QuestRank} from "@/classes/QuestRank";
 
 export class GameData {
     guild: Guild;
@@ -47,7 +48,69 @@ export function loadGame(): GameData | null {
         parsedGame.lastQuestGot,
         parsedGame.lastRecruitAction
     );
-
-
 }
 
+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 } };
+
+    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
+            );
+        }
+    }
+
+    console.log(quests);
+
+    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 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;
+}
\ No newline at end of file
diff --git a/src/classes/Adventurer.ts b/src/classes/Adventurer.ts
index b9458d4..aec026f 100644
--- a/src/classes/Adventurer.ts
+++ b/src/classes/Adventurer.ts
@@ -4,21 +4,21 @@ export class Adventurer {
     portrait: string;
     level: number;
     exp: number;
-    attackPerLevel: number;
+    attackExponent: number;
     busy: boolean;
 
     constructor(
         id: string,
         name: string,
         portrait: string,
-        attackPerLevel: number,
+        attackExponent: number,
         level: number = 1,
         exp: number = 0
     ) {
         this.id = id;
         this.name = name;
         this.portrait = portrait;
-        this.attackPerLevel = attackPerLevel;
+        this.attackExponent = attackExponent;
         this.level = level;
         this.exp = exp;
         this.busy = false;
@@ -44,4 +44,12 @@ export class Adventurer {
         return (this.exp / this.getNextLevelExpRequirement()) * 100;
     }
 
+    getAttack(): number {
+        return Math.floor(2 * this.level ^ this.attackExponent);
+    }
+
+    getDPS(): number {
+        return this.getAttack() * 4;
+    }
+
 }
diff --git a/src/classes/Quest.ts b/src/classes/Quest.ts
index 25e7a73..e37c2c4 100644
--- a/src/classes/Quest.ts
+++ b/src/classes/Quest.ts
@@ -1,5 +1,5 @@
 import type {Adventurer} from "@/classes/Adventurer";
-import type {QuestRank} from "@/classes/QuestRank";
+import {QuestRank} from "@/classes/QuestRank";
 
 export class Quest {
     id: string;
@@ -29,3 +29,56 @@ export class Quest {
     }
 
 }
+
+/**
+ * Generate rewards for a quest and return it
+ * @param quest
+ */
+export function getQuestWithRewards(quest: Quest) {
+
+    let maxProgress = 1;
+
+    switch (quest.rank) {
+        case QuestRank.S:
+            // at level 30 adventurers have ~2353 dps, this will take 30 seconds on level 30
+            maxProgress = 70590
+            break;
+        case QuestRank.A:
+            // at level 25 adventurers have ~1122 dps, this will take 15 seconds on level 25
+            maxProgress = 16800
+            break;
+        case QuestRank.B:
+            // at level 20 adventurers have ~564 dps, this will take 15 seconds on level 20
+            maxProgress = 8460;
+            break;
+        case QuestRank.C:
+            // at level 15 adventurers have ~256 dps, this will take 15 seconds on level 15
+            maxProgress = 3840;
+            break;
+        case QuestRank.D:
+            // at level 10 adventurers have ~103 dps, this will take 15 seconds on level 10
+            maxProgress = 1545;
+            break;
+        case QuestRank.E:
+            // at level 5 adventurers have ~45 dps, this will take 15 seconds on level 5
+            maxProgress = 675;
+            break;
+        case QuestRank.F:
+            // at level 1 adventurers have ~8 dps, this will take 15 seconds on level 1
+            maxProgress = 120;
+            break;
+    }
+
+    let goldReward = Math.floor(maxProgress/6);
+    let expReward = Math.floor(Math.floor(maxProgress/120) - maxProgress/1000);
+
+    // add some randomness to the rewards
+    goldReward = Math.floor(randomNumberBetween(goldReward * 0.95, goldReward * 1.1));
+    expReward = Math.max(1, Math.floor(randomNumberBetween(expReward * 0.95, expReward * 1.1)));
+
+    return new Quest(quest.id, quest.rank, quest.title, quest.text, maxProgress, expReward, goldReward);
+}
+
+function randomNumberBetween(min: number, max: number) {
+    return Math.random() * (max - min) + min;
+}
\ No newline at end of file
diff --git a/src/views/AdventurerView.vue b/src/views/AdventurerView.vue
index 175dcb7..4fbc085 100644
--- a/src/views/AdventurerView.vue
+++ b/src/views/AdventurerView.vue
@@ -44,6 +44,7 @@ import type {PropType} from "vue";
 import {defineComponent} from "vue";
 import AdventurerTile from "@/components/AdventurerTile.vue";
 import {Adventurer} from "@/classes/Adventurer";
+import { loadAdventurersForHire } from "@/GameData";
 
 export default defineComponent({
   name: "RecruitView",
@@ -51,13 +52,7 @@ export default defineComponent({
   data: () => {
     return {
       currentlyForHire: null as Adventurer|null,
-      adventurersForHire: [
-        new Adventurer("rincewind-diskworld", "Rincewind", "/img/adventurers/rincewind.png", 2),
-        new Adventurer("fran-sword-isekai", "Fran", "/img/adventurers/fran.png", 3),
-        new Adventurer("kazuma-konosuba", "Kazuma", "/img/adventurers/kazuma.png", 2),
-        new Adventurer("rein-beast-tamer", "Rein", "/img/adventurers/rein.png", 2),
-        new Adventurer("momon-overlord", "Momon", "/img/adventurers/momon.png", 2),
-      ] as Array<Adventurer>,
+      adventurersForHire: [] as Array<Adventurer>,
     }
   },
   props: {
@@ -109,7 +104,10 @@ export default defineComponent({
       window.localStorage.removeItem("currentlyForHire");
     }
   },
-  mounted() {
+  async mounted() {
+
+    this.adventurersForHire = await loadAdventurersForHire();
+
     if (Object.keys(this.adventurers).length <= 0) {
       this.currentlyForHire = this.adventurersForHire[0];
       window.localStorage.setItem("currentlyForHire", this.adventurersForHire[0].id);