new experimental quest view

src/GameData.ts

@@ -6,7 +6,7 @@ import {getFromString, QuestRank} from "@/classes/QuestRank";
 export class GameData {
   guild: Guild;
   adventurers: { [key: string]: Adventurer };
-  missives: { [key: string]: { [key: string]: Quest } };
+  missives: Array<Quest>;
   lastQuestGot: { [key: string]: null | number };
   lastRecruitAction: null | number;
   adventurerForHireId: string | null;
@@ -16,7 +16,7 @@ export class GameData {
   ) {
     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.missives = data.missives ?? [] as Array<Quest>;
     this.lastQuestGot = data.lastQuestGot ?? {} as { [key: string]: null | number };
     this.lastRecruitAction = data.lastRecruitAction ?? null;
     this.adventurerForHireId = data.adventurerForHireId ?? null;

src/classes/Quest.ts

@@ -7,12 +7,22 @@ export class Quest {
     title:  string;
     text: string;
     adventurers: Array<Adventurer>;
+    maxAdventurers: number;
     progressPoints: number;
     maxProgress: number;
     expReward: number;
     goldReward: number;
 
-    constructor(id: string, rank: QuestRank, title: string, text: string, maxProgress: number, expReward: number, goldReward: number) {
+    constructor(
+      id: string,
+      rank: QuestRank,
+      title: string,
+      text: string,
+      maxProgress: number,
+      expReward: number,
+      goldReward: number,
+      maxAdventurers: number = 1
+    ) {
         this.id = id;
         this.rank = rank;
         this.title = title;
@@ -22,6 +32,7 @@ export class Quest {
         this.goldReward = goldReward;
         this.progressPoints = 0;
         this.adventurers = [];
+        this.maxAdventurers = maxAdventurers;
     }
 
     getPercentProgress(): number {

src/components/QuestGroup.vue

@@ -59,27 +59,31 @@ h1 {
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
-  justify-content: start;
+  justify-content: flex-start;
-  align-items: stretch;
   gap: 1rem;
   padding-block: 0.5rem;
-  padding-inline: 40%;
+  padding-inline: 5rem;
   overflow-x: auto;
   scroll-snap-type: x mandatory;
-  width: max-content;
+  width: 100vw;
   max-width: 100%;
 }
 
 @media(min-width: 800px) {
   .missives-wrapper {
     padding-inline: 1rem;
+    max-width: 100vw;
+    overflow-x: hidden;
   }
 
   .missives {
-    justify-content: center;
+    display: grid;
-    flex-wrap: wrap;
-    overflow-x: inherit;
     padding-inline: 0;
+    max-width: 1200px;
+    grid-template-columns: repeat(auto-fill, minmax(14rem, 1fr));
+    grid-auto-rows: auto;
+    gap: 1rem;
+
   }
 }
 </style>

src/components/QuestMissive.vue

@@ -12,6 +12,7 @@
     <div class="drink-stain" v-if="drinkStain.exists">
       <DrinkStain/>
     </div>
+    <div class="rank">{{missive.rank}}</div>
     <h2>{{ missive.title }}</h2>
     <p>{{ missive.text }}</p>
     <div class="slots">
@@ -36,7 +37,7 @@
     </div>
     <div class="progressWrap">
       <span class="progress"></span>
-      <span class="percentage">{{ progressPercentage }}</span>
+      <span class="percentage">{{ `${progressPercentage.toFixed(2)}%` }}</span>
     </div>
     <h3>Rewards</h3>
     <div class="rewards">
@@ -58,6 +59,11 @@ import Parchment from "@/components/misc/Parchment.vue";
 export default defineComponent({
   name: "QuestMissive",
   components: {Parchment, WaterStain, DrinkStain, AdventurerComponent},
+  computed: {
+    progressPercentageValue(): string {
+      return `${this.missive.progressPoints / this.missive.maxProgress * 100}%`;
+    },
+  },
   props: {
     missive: {
       type: Object as PropType<Quest | any>,
@@ -73,7 +79,7 @@ export default defineComponent({
   },
   data: () => {
     return {
-      progressPercentage: "0%",
+      progressPercentage: 0,
       stain: false,
       drinkStain: {
         exists: false,
@@ -85,8 +91,7 @@ export default defineComponent({
   methods: {
     updateProgress() {
       if (this.missive === undefined) return;
-      const progress = (this.missive.progressPoints / this.missive.maxProgress * 100).toFixed(2);
+      this.progressPercentage = this.missive.progressPoints / this.missive.maxProgress * 100;
-      this.progressPercentage = `${progress}%`;
     },
     randomNumber(min: number, max: number) {
       return Math.random() * (max - min) + min;
@@ -102,7 +107,7 @@ export default defineComponent({
     }
   },
   watch: {
-    missive: {
+    "missive.progressPoints": {
       handler() {
         this.updateProgress();
       },
@@ -121,6 +126,7 @@ export default defineComponent({
   padding: 0.5rem;
   position: relative;
   scroll-snap-align: center;
+  margin: 0 auto;
 
   .parchment {
     position: absolute;
@@ -161,7 +167,7 @@ export default defineComponent({
       left: 0;
       height: 100%;
       display: block;
-      width: v-bind(progressPercentage);
+      width: v-bind(progressPercentageValue);
       background-color: rgba(0, 128, 0, 0.65);
       transition: width 250ms linear;
     }
@@ -178,6 +184,16 @@ export default defineComponent({
     }
   }
 
+  .rank {
+    position: absolute;
+    top: -0.5rem;
+    left: 0.25rem;
+    font-size: 3rem;
+    font-weight: bold;
+    color: #ab0707;
+    z-index: -1;
+  }
+
   .rewards {
     display: flex;
     flex-direction: row;

src/views/QuestView.vue

@@ -1,55 +1,18 @@
 <template>
   <section>
     <QuestGroup
-        v-if="guild.level >= 7 && Object.keys(quests.S).length > 0"
         :adventurers="adventurers"
-        :quests="quests.S"
+        :quests="quests.filter(quest => quest.progressPoints < quest.maxProgress)"
         :finalizeQuest="finalizeQuest"
-        label="Rank S Quests"
+        label="Quests"
+        v-show="quests.filter(quest => quest.progressPoints < quest.maxProgress).length > 0"
     />
     <QuestGroup
-        v-if="guild.level >= 6 && Object.keys(quests.A).length > 0"
+      :finalize-quest="finalizeQuest"
-        :adventurers="adventurers"
+      :adventurers="adventurers"
-        :quests="quests.A"
+      :quests="quests.filter(quest => quest.progressPoints >= quest.maxProgress)"
-        :finalizeQuest="finalizeQuest"
+      label="Completed Quests"
-        label="Rank A Quests"
+      v-show="quests.filter(quest => quest.progressPoints >= quest.maxProgress).length > 0"
-    />
-    <QuestGroup
-        v-if="guild.level >= 5 && Object.keys(quests.B).length > 0"
-        :adventurers="adventurers"
-        :quests="quests.B"
-        :finalizeQuest="finalizeQuest"
-        label="Rank B Quests"
-    />
-
-    <QuestGroup
-        v-if="guild.level >= 4 && Object.keys(quests.C).length > 0"
-        :adventurers="adventurers"
-        :quests="quests.C"
-        :finalizeQuest="finalizeQuest"
-        label="Rank C Quests"
-    />
-
-    <QuestGroup
-        v-if="guild.level >= 3 && Object.keys(quests.D).length > 0"
-        :adventurers="adventurers"
-        :quests="quests.D"
-        :finalizeQuest="finalizeQuest"
-        label="Rank D Quests"
-    />
-    <QuestGroup
-        v-if="guild.level >= 2 && Object.keys(quests.E).length > 0"
-        :adventurers="adventurers"
-        :quests="quests.E"
-        :finalizeQuest="finalizeQuest"
-        label="Rank E Quests"
-    />
-    <QuestGroup
-        v-if="Object.keys(quests.F).length > 0"
-        :adventurers="adventurers"
-        :quests="quests.F"
-        :finalizeQuest="finalizeQuest"
-        label="Rank F Quests"
     />
   </section>
 </template>
@@ -76,7 +39,7 @@ export default defineComponent({
       required: true,
     },
     quests: {
-      type: Object as PropType<{ [key: string]: Quest }>,
+      type: Object as PropType<Array<Quest>>,
       required: true,
     },
     lastRecruitTime: {
@@ -98,13 +61,19 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-.guild {
+section {
   display: flex;
   flex-direction: column;
-  justify-content: center;
+  justify-content: flex-start;
   align-items: center;
   width: 100%;
   padding-bottom: 0.5rem;
 }
 
+@media(min-width: 800px) {
+  section {
+    flex-direction: column-reverse;
+  }
+}
+
 </style>