Merge branch 'master' of https://github.com/YouHaveTrouble/adventurers-guild-game into unfrick-the-savefile

# Conflicts:
#	src/views/AdventurerView.vue
This commit is contained in:
2023-03-31 22:25:16 +02:00
22 changed files with 300 additions and 134 deletions
+5 -2
View File
@@ -104,18 +104,21 @@ export default defineComponent({
default() {
return new Guild(1, 0);
},
required: true,
},
adventurers: {
type: Object as PropType<{ [key: string]: Adventurer }>,
default() {
return {} as { [key: string]: Adventurer };
},
required: true,
},
quests: {
type: Object as PropType<{ [key: string]: Quest }>,
default() {
return {} as { [key: string]: Quest };
},
required: true,
},
lastRecruitTime: {
type: Number as PropType<number>,
@@ -124,10 +127,10 @@ export default defineComponent({
}
},
},
emits: [ 'finalizeQuest', 'wipeSave', 'recruitActionTaken'],
emits: ['finalizeQuest', 'wipeSave', 'recruitActionTaken'],
methods: {
// This is a workaround for vue not reporting Quest as Quest in v-for
finalizeQuest(quest: any|Quest): void {
finalizeQuest(quest: any | Quest): void {
if (quest.progressPoints < quest.maxProgress) return;
this.$emit('finalizeQuest', quest)
},