mirror of
https://github.com/YouHaveTrouble/GuildMaster.git
synced 2026-05-12 06:26:59 +00:00
fix the game not properly saving/loading adventurers for hire
This commit is contained in:
+89
-89
@@ -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;
|
||||
}
|
||||
|
||||
+84
-94
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user