Merge remote-tracking branch 'origin/master'

src/views/AdventurerView.vue

@@ -3,12 +3,12 @@
     <section class="recruit panel pinned-paper">
       <h1>Applying adventurers</h1>
       <div class="adventurers">
-        <div v-if="currentlyForHire">
-          <adventurer-tile class="hire-tile" :adventurer="currentlyForHire"/>
+        <div v-if="adventurerForHire">
+          <adventurer-tile class="hire-tile" :adventurer="adventurerForHire"/>
           <div class="decision">
           <span
               title="Hire"
-              @click="hireAdventurer(currentlyForHire)"
+              @click="hireAdventurer()"
               :class="{disabled: Object.keys(adventurers).length >= guild.adventurerCapacity.getAdventurerCapacity()}"
           >
             ✔
@@ -73,76 +73,25 @@ export default defineComponent({
       },
       required: true,
     },
-    lastRecruitTime: {
-      type: Number as PropType<number>,
+    adventurerForHire: {
+      type: Object as PropType<Adventurer|null>,
       default() {
-        return 0;
+        return null;
       }
     },
   },
   methods: {
-    getRandomAdventurer(): Adventurer | null {
-      if (this.adventurersForHire.length <= 0) return null;
-      const randomId = this.adventurersForHire.length * Math.random() << 0;
-      return this.adventurersForHire[randomId];
-    },
-    getNewAdventurerForHire(): void {
-      const adventurer = this.getRandomAdventurer();
-      if (adventurer === null) {
-        this.currentlyForHire = null;
-        return;
-      }
-
-      if (this.adventurers[adventurer.id] != null) {
-        this.currentlyForHire = null;
-        return;
-      }
-
-      this.currentlyForHire = adventurer;
-      window.localStorage.setItem("currentlyForHire", adventurer.id);
-
-    },
-    hireAdventurer(adventurer: Adventurer | any): void {
+    hireAdventurer(): void {
       if (Object.keys(this.adventurers).length >= this.guild.adventurerCapacity.getAdventurerCapacity()) return;
-      this.adventurers[adventurer.id] = adventurer;
-      this.currentlyForHire = null;
-      window.localStorage.removeItem("currentlyForHire");
-      this.$emit("recruitActionTaken", adventurer);
+      this.$emit("recruitActionTaken", this.adventurerForHire);
     },
     dismissAdventurer() {
       if (Object.keys(this.adventurers).length <= 0) return;
-      this.currentlyForHire = null;
       this.$emit("recruitActionTaken", null);
-      window.localStorage.removeItem("currentlyForHire");
     }
   },
   async mounted() {
 
-    this.adventurersForHire = await loadAdventurersForHire(Object.keys(this.adventurers));
-
-    if (Object.keys(this.adventurers).length <= 0) {
-      this.currentlyForHire = this.adventurersForHire[0];
-      window.localStorage.setItem("currentlyForHire", this.adventurersForHire[0].id);
-      return;
-    }
-
-    const savedCurrentForHire = window.localStorage.getItem("currentlyForHire");
-    if (savedCurrentForHire !== null) {
-      for (const id in this.adventurersForHire) {
-        const adventurer = this.adventurersForHire[id];
-        if (adventurer.id === savedCurrentForHire) {
-          this.currentlyForHire = adventurer;
-          return;
-        }
-      }
-    }
-
-    const now = Number(new Date());
-
-    if (now - this.lastRecruitTime >= 1000 * 60 * 30 && this.currentlyForHire === null) {
-      this.getNewAdventurerForHire();
-    }
-
   },
   emits: ["recruitActionTaken"]
 

src/views/QuestView.vue

@@ -1,89 +1,90 @@
 <template>
-  <div class="guild" v-if="guild.level >= 7 && Object.keys(quests.S).length > 0">
-    <h1>Rank S Quests</h1>
-    <section class="missives">
-      <QuestMissive
-          v-for="(missive, key, index) in quests.S"
-          :key="key"
-          :adventurers="adventurers"
-          :missive="missive"
-          @click="finalizeQuest(missive)"
-      />
-    </section>
-  </div>
-  <div class="guild" v-if="guild.level >= 6 && Object.keys(quests.A).length > 0">
-    <h1>Rank A Quests</h1>
-    <section class="missives">
-      <QuestMissive
-          v-for="(missive, key, index) in quests.A"
-          :key="key"
-          :adventurers="adventurers"
-          :missive="missive"
-          @click="finalizeQuest(missive)"
-      />
-    </section>
-  </div>
-  <div class="guild" v-if="guild.level >= 5 && Object.keys(quests.B).length > 0">
-    <h1>Rank B Quests</h1>
-    <section class="missives">
-      <QuestMissive
-          v-for="(missive, key, index) in quests.B"
-          :key="key"
-          :adventurers="adventurers"
-          :missive="missive"
-          @click="finalizeQuest(missive)"
-      />
-    </section>
-  </div>
-  <div class="guild" v-if="guild.level >= 4 && Object.keys(quests.C).length > 0">
-    <h1>Rank C Quests</h1>
-    <section class="missives">
-      <QuestMissive
-          v-for="(missive, key, index) in quests.C"
-          :key="key"
-          :adventurers="adventurers"
-          :missive="missive"
-          @click="finalizeQuest(missive)"
-      />
-    </section>
-  </div>
-  <div class="guild" v-if="guild.level >= 3 && Object.keys(quests.D).length > 0">
-    <h1>Rank D Quests</h1>
-    <section class="missives">
-      <QuestMissive
-          v-for="(missive, key, index) in quests.D"
-          :key="key"
-          :adventurers="adventurers"
-          :missive="missive"
-          @click="finalizeQuest((missive))"
-      />
-    </section>
-  </div>
-  <div class="guild" v-if="guild.level >= 2 && Object.keys(quests.E).length > 0">
-    <h1>Rank E Quests</h1>
-    <section class="missives">
-      <QuestMissive
-          v-for="(missive, key, index) in quests.E"
-          :key="key"
-          :adventurers="adventurers"
-          :missive="missive"
-          @click="finalizeQuest(missive)"
-      />
-    </section>
-  </div>
-  <div class="guild" v-if="Object.keys(quests.F).length > 0">
-    <h1>Rank F Quests</h1>
-    <section class="missives">
-      <QuestMissive
-          v-for="(missive, key, index) in quests.F"
-          :key="key"
-          :adventurers="adventurers"
-          :missive="missive"
-          @click="finalizeQuest(missive)"
-      />
-    </section>
-  </div>
-
+  <section>
+    <div class="guild" v-if="guild.level >= 7 && Object.keys(quests.S).length > 0">
+      <h1>Rank S Quests</h1>
+      <section class="missives">
+        <QuestMissive
+            v-for="(missive, key, index) in quests.S"
+            :key="key"
+            :adventurers="adventurers"
+            :missive="missive"
+            @click="finalizeQuest(missive)"
+        />
+      </section>
+    </div>
+    <div class="guild" v-if="guild.level >= 6 && Object.keys(quests.A).length > 0">
+      <h1>Rank A Quests</h1>
+      <section class="missives">
+        <QuestMissive
+            v-for="(missive, key, index) in quests.A"
+            :key="key"
+            :adventurers="adventurers"
+            :missive="missive"
+            @click="finalizeQuest(missive)"
+        />
+      </section>
+    </div>
+    <div class="guild" v-if="guild.level >= 5 && Object.keys(quests.B).length > 0">
+      <h1>Rank B Quests</h1>
+      <section class="missives">
+        <QuestMissive
+            v-for="(missive, key, index) in quests.B"
+            :key="key"
+            :adventurers="adventurers"
+            :missive="missive"
+            @click="finalizeQuest(missive)"
+        />
+      </section>
+    </div>
+    <div class="guild" v-if="guild.level >= 4 && Object.keys(quests.C).length > 0">
+      <h1>Rank C Quests</h1>
+      <section class="missives">
+        <QuestMissive
+            v-for="(missive, key, index) in quests.C"
+            :key="key"
+            :adventurers="adventurers"
+            :missive="missive"
+            @click="finalizeQuest(missive)"
+        />
+      </section>
+    </div>
+    <div class="guild" v-if="guild.level >= 3 && Object.keys(quests.D).length > 0">
+      <h1>Rank D Quests</h1>
+      <section class="missives">
+        <QuestMissive
+            v-for="(missive, key, index) in quests.D"
+            :key="key"
+            :adventurers="adventurers"
+            :missive="missive"
+            @click="finalizeQuest((missive))"
+        />
+      </section>
+    </div>
+    <div class="guild" v-if="guild.level >= 2 && Object.keys(quests.E).length > 0">
+      <h1>Rank E Quests</h1>
+      <section class="missives">
+        <QuestMissive
+            v-for="(missive, key, index) in quests.E"
+            :key="key"
+            :adventurers="adventurers"
+            :missive="missive"
+            @click="finalizeQuest(missive)"
+        />
+      </section>
+    </div>
+    <div class="guild" v-if="Object.keys(quests.F).length > 0">
+      <h1>Rank F Quests</h1>
+      <section class="missives">
+        <QuestMissive
+            v-for="(missive, key, index) in quests.F"
+            :key="key"
+            :adventurers="adventurers"
+            :missive="missive"
+            @click="finalizeQuest(missive)"
+        />
+      </section>
+    </div>
+  </section>
 </template>
 
 <script lang="ts">