Compare commits
36 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d5195aa157 | |||
| 15072fe2c8 | |||
| ba4a6cb2a2 | |||
| 4847d22f7e | |||
| 2c053cc3eb | |||
| c55e0c8bb6 | |||
| 29aafedcfa | |||
| 8070c855a0 | |||
| aaf0eb6546 | |||
| c14a135c94 | |||
| 40d5a876b8 | |||
| 3b47ed1bed | |||
| fdc5d370de | |||
| 19c4a3f7ac | |||
| 2dad283de9 | |||
| 61ff80b69f | |||
| a185bc2153 | |||
| b213cae62b | |||
| 19d3dd5515 | |||
| 4f2d742284 | |||
| a0b7db1bf6 | |||
| c569a1110c | |||
| 56407505ea | |||
| 5e4a78530a | |||
| 7be4d2b9ca | |||
| eb4b0fba00 | |||
| 3f22b4511d | |||
| 6f777332a4 | |||
| 101ea0ffb5 | |||
| af11324fb7 | |||
| 6903774f97 | |||
| 1a9d2d0d9f | |||
| 359abd3ab4 | |||
| 1a3a493df4 | |||
| 0890efd1ec | |||
| 5b4278cf30 |
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "adventurers-guild",
|
||||
"version": "0.1.0",
|
||||
"version": "0.7.0",
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
|
After Width: | Height: | Size: 406 KiB |
|
After Width: | Height: | Size: 470 KiB |
|
After Width: | Height: | Size: 86 KiB |
|
After Width: | Height: | Size: 75 KiB |
|
After Width: | Height: | Size: 92 KiB |
|
After Width: | Height: | Size: 20 KiB |
|
After Width: | Height: | Size: 474 KiB |
|
After Width: | Height: | Size: 130 KiB |
@@ -14,10 +14,10 @@ import {RouterLink, RouterView} from 'vue-router'</script>
|
||||
:guild="guild"
|
||||
:adventurers="adventurers"
|
||||
:quests="missives"
|
||||
:lastRecruitTime="lastRecruitHandled"
|
||||
:adventurerForHire="adventurerForHire"
|
||||
@finalizeQuest="finalizeQuest($event)"
|
||||
@wipeSave="resetSave()"
|
||||
@recruitActionTaken="lastRecruitHandled = Number(new Date())"
|
||||
@recruitActionTaken="recruitAction($event)"
|
||||
/>
|
||||
</template>
|
||||
|
||||
@@ -27,14 +27,27 @@ import {Adventurer} from "@/classes/Adventurer";
|
||||
import {getQuestWithRewards, Quest} from "@/classes/Quest";
|
||||
import {Guild} from "@/classes/Guild";
|
||||
import {getFromString, QuestRank} from "@/classes/QuestRank";
|
||||
import {GameData, loadAvailableQuests, loadGame, saveGame} from "@/GameData";
|
||||
import {
|
||||
GameData,
|
||||
loadAdventurersForHire,
|
||||
loadAvailableQuests,
|
||||
loadGame,
|
||||
removeAlreadyHiredAdventurers,
|
||||
saveGame
|
||||
} from "@/GameData";
|
||||
import type {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||
import {AdventurerCapacityUpgrade} from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
|
||||
import AdventurerCapacityUpgrade from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
|
||||
import {getNewAdventurerForHire} from "@/classes/Recruitment";
|
||||
import QuestExpUpgrade from "@/classes/guildUpgrades/QuestExpUpgrade";
|
||||
import QuestGoldUpgrade from "@/classes/guildUpgrades/QuestGoldUpgrade";
|
||||
import AutoFinishQuestsUpgrade from "@/classes/guildUpgrades/AutoFinishQuestsUpgrade";
|
||||
|
||||
export default defineComponent({
|
||||
name: "GuildView",
|
||||
data: () => ({
|
||||
guild: new Guild(1, 500),
|
||||
gameTickTask: null as null | number,
|
||||
gameSaveTask: null as null | number,
|
||||
lastQuestGot: {
|
||||
S: null as null | number,
|
||||
A: null as null | number,
|
||||
@@ -45,6 +58,8 @@ export default defineComponent({
|
||||
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 } },
|
||||
missives: {
|
||||
@@ -67,7 +82,13 @@ export default defineComponent({
|
||||
missive.progressPoints = 0;
|
||||
continue;
|
||||
}
|
||||
if (missive.progressPoints >= missive.maxProgress) continue;
|
||||
if (missive.progressPoints >= missive.maxProgress) {
|
||||
if (this.guild.autoFinishQuestsUpgrade.getRanksToAutoFinishQuestsIn().includes(rank)) {
|
||||
this.finalizeQuest(missive);
|
||||
continue;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
for (const adventurerId in missive.adventurers) {
|
||||
const adventurer = missive.adventurers[adventurerId];
|
||||
const attack = adventurer.getAttack();
|
||||
@@ -77,6 +98,34 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
},
|
||||
async checkForNewRecruit(currentTimestamp: number) {
|
||||
|
||||
if (this.lastRecruitHandled == null) {
|
||||
this.lastRecruitHandled = 0;
|
||||
}
|
||||
|
||||
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 {
|
||||
this.lastRecruitHandled = Number(new Date());
|
||||
this.adventurerForHire = null;
|
||||
if (adventurer === null) return;
|
||||
|
||||
this.adventurers[adventurer.id] = adventurer;
|
||||
for (const id in this.adventurersDatabase) {
|
||||
const databaseAdventurer = this.adventurersDatabase[id];
|
||||
if (databaseAdventurer.id === adventurer.id) {
|
||||
this.adventurersDatabase.splice(Number(id), 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
},
|
||||
finalizeQuest(missive: Quest) {
|
||||
missive.progressPoints = 0;
|
||||
this.guild.gold += missive.goldReward;
|
||||
@@ -94,7 +143,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 getQuestWithRewards(questsForRank[randomIdString]);
|
||||
return getQuestWithRewards(questsForRank[randomIdString], this.guild.expModifier.getModifier());
|
||||
},
|
||||
createMissive(questToAdd: Quest, rank: QuestRank) {
|
||||
const quest = JSON.parse(JSON.stringify(questToAdd));
|
||||
@@ -112,6 +161,15 @@ export default defineComponent({
|
||||
if (saveData.guild.adventurerCapacity) {
|
||||
guildUpgrades.adventurerCapacity = new AdventurerCapacityUpgrade(saveData.guild.adventurerCapacity.level);
|
||||
}
|
||||
if (saveData.guild.expModifier) {
|
||||
guildUpgrades.expModifier = new QuestExpUpgrade(saveData.guild.expModifier.level);
|
||||
}
|
||||
if (saveData.guild.goldModifier) {
|
||||
guildUpgrades.goldModifier = new QuestGoldUpgrade(saveData.guild.goldModifier.level);
|
||||
}
|
||||
if (saveData.guild.autoFinishQuestsUpgrade) {
|
||||
guildUpgrades.autoFinishQuestsUpgrade = new AutoFinishQuestsUpgrade(saveData.guild.autoFinishQuestsUpgrade.level);
|
||||
}
|
||||
|
||||
this.guild = new Guild(saveData.guild.level, saveData.guild.gold, guildUpgrades);
|
||||
|
||||
@@ -126,11 +184,13 @@ export default defineComponent({
|
||||
data.portrait,
|
||||
data.attackExponent ?? 1.1,
|
||||
data.level ?? 1,
|
||||
data.exp ?? 0
|
||||
data.exp ?? 0,
|
||||
data.prestige ?? 0,
|
||||
);
|
||||
adventurer.busy = data.busy;
|
||||
adventurers[data.id] = adventurer;
|
||||
} catch (e) {}
|
||||
} catch (e) {
|
||||
}
|
||||
}
|
||||
this.adventurers = adventurers;
|
||||
|
||||
@@ -153,6 +213,16 @@ export default defineComponent({
|
||||
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.adventurerForHireId) {
|
||||
this.adventurerForHire = adventurer;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
resetSave() {
|
||||
if (!confirm("You are about to wipe your save file. Are you sure?")) return;
|
||||
@@ -161,25 +231,30 @@ export default defineComponent({
|
||||
}
|
||||
},
|
||||
async mounted() {
|
||||
this.loadGame();
|
||||
this.quests = await loadAvailableQuests();
|
||||
this.adventurersDatabase = await loadAdventurersForHire();
|
||||
this.loadGame();
|
||||
|
||||
setInterval(() => {
|
||||
saveGame(new GameData(
|
||||
this.guild,
|
||||
this.adventurers,
|
||||
this.missives,
|
||||
this.lastQuestGot,
|
||||
this.lastRecruitHandled
|
||||
)
|
||||
);
|
||||
this.adventurersDatabase = removeAlreadyHiredAdventurers(this.adventurersDatabase, this.adventurers);
|
||||
|
||||
this.gameSaveTask = setInterval(() => {
|
||||
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.gameTickTask = setInterval(() => {
|
||||
this.updateMissives();
|
||||
|
||||
const now = Number(new Date());
|
||||
|
||||
this.checkForNewRecruit(now);
|
||||
|
||||
for (const id in this.lastQuestGot) {
|
||||
const lastTime = this.lastQuestGot[getFromString(id as QuestRank)];
|
||||
if (lastTime === null) this.lastQuestGot[getFromString(id as QuestRank)] = 0;
|
||||
@@ -263,6 +338,10 @@ export default defineComponent({
|
||||
|
||||
}, 250);
|
||||
|
||||
},
|
||||
beforeUnmount() {
|
||||
if (this.gameSaveTask) clearInterval(this.gameSaveTask);
|
||||
if (this.gameTickTask) clearInterval(this.gameTickTask);
|
||||
}
|
||||
})
|
||||
</script>
|
||||
@@ -303,6 +382,7 @@ nav {
|
||||
font-size: 2rem;
|
||||
color: #fff;
|
||||
text-decoration: none;
|
||||
|
||||
&.router-link-active {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
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";
|
||||
@@ -9,13 +9,17 @@ export class GameData {
|
||||
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) {
|
||||
this.guild = guild;
|
||||
this.adventurers = adventurers;
|
||||
this.missives = missives;
|
||||
this.lastQuestGot = lastQuestGot;
|
||||
this.lastRecruitAction = lastRecruitAction;
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,21 +37,16 @@ export function saveGame(
|
||||
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
|
||||
);
|
||||
console.debug("Loading game...");
|
||||
return new GameData(parsedGame);
|
||||
}
|
||||
|
||||
export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: string]: Quest } }> {
|
||||
@@ -87,7 +86,7 @@ export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: st
|
||||
return quests;
|
||||
}
|
||||
|
||||
export async function loadAdventurersForHire(currentAdventurerIds: Array<string> = []): Promise<Array<Adventurer>> {
|
||||
export async function loadAdventurersForHire(): Promise<Array<Adventurer>> {
|
||||
const response = await fetch("data/adventurers.json");
|
||||
if (response.status !== 200) {
|
||||
console.error("Failed to load adventurers");
|
||||
@@ -96,9 +95,8 @@ export async function loadAdventurersForHire(currentAdventurerIds: Array<string>
|
||||
}
|
||||
const adventurerData = await response.json();
|
||||
|
||||
const adventurers = [] as Array<Adventurer>;
|
||||
const adventurers: Array<Adventurer> = [];
|
||||
for (const adventurer of adventurerData) {
|
||||
if (currentAdventurerIds.includes(adventurer.id)) continue;
|
||||
adventurers.push(new Adventurer(
|
||||
adventurer.id,
|
||||
adventurer.name,
|
||||
@@ -111,3 +109,15 @@ export async function loadAdventurersForHire(currentAdventurerIds: Array<string>
|
||||
|
||||
return adventurers;
|
||||
}
|
||||
|
||||
export function removeAlreadyHiredAdventurers(
|
||||
adventurers: Array<Adventurer>,
|
||||
adventurersHired: { [key: string]: Adventurer }
|
||||
): Array<Adventurer> {
|
||||
const adventurersForHire: Array<Adventurer> = [];
|
||||
for (const adventurer of adventurers) {
|
||||
if (adventurersHired[adventurer.id]) continue;
|
||||
adventurersForHire.push(adventurer);
|
||||
}
|
||||
return adventurersForHire;
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
|
||||
:root {
|
||||
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0 0 10rem;
|
||||
min-height: calc(100vh - 10rem);
|
||||
font-family: 'EB Garamond', serif;
|
||||
overflow-y: scroll;
|
||||
user-select: none;
|
||||
background-size: 30%;
|
||||
background: rgba(87, 50, 20, 0.75) url("/img/background/panels/plaster.png") repeat;
|
||||
background-blend-mode: darken;
|
||||
}
|
||||
|
||||
#app {
|
||||
width: 100%;
|
||||
}
|
||||
@@ -0,0 +1,84 @@
|
||||
body {
|
||||
margin: 0;
|
||||
padding: 0 0 10rem;
|
||||
min-height: calc(100vh - 10rem);
|
||||
font-family: 'EB Garamond', serif;
|
||||
overflow-y: scroll;
|
||||
user-select: none;
|
||||
background-size: 25rem;
|
||||
background-color: rgba(87, 50, 20, 0.45);
|
||||
background-image: url("/img/background/wood/cut_wood_background.png");
|
||||
background-blend-mode: darken;
|
||||
background-repeat: repeat;
|
||||
}
|
||||
|
||||
#app {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.panel {
|
||||
&.pinned-paper {
|
||||
background-image: url("/img/quests/backgrounds/paper.png");
|
||||
position: relative;
|
||||
filter: drop-shadow(-0.15rem 0.2rem 0.1rem rgba(0, 0, 0, 0.25));
|
||||
|
||||
.nail {
|
||||
position: absolute;
|
||||
width: 2rem;
|
||||
height: 2rem;
|
||||
filter: drop-shadow(-0.15rem 0.2rem 0.1rem rgba(0, 0, 0, 0.5));
|
||||
|
||||
&.small {
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
}
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
&.top-left {
|
||||
top: 1rem;
|
||||
left: 1rem;
|
||||
}
|
||||
|
||||
&.top-right {
|
||||
top: 1rem;
|
||||
right: 1rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.note-paper {
|
||||
background-image: url("/img/background/paper/small_tile_paper.png");
|
||||
position: relative;
|
||||
filter: drop-shadow(-0.15rem 0.2rem 0.1rem rgba(0, 0, 0, 0.25));
|
||||
border-image: url("/img/borders/metal_corner.png") 30 round;
|
||||
}
|
||||
}
|
||||
|
||||
.button {
|
||||
padding: 0.5rem 1rem;
|
||||
font-size: 1.2rem;
|
||||
font-family: 'EB Garamond', serif;
|
||||
font-weight: bold;
|
||||
cursor: pointer;
|
||||
border: 2px solid rgb(0, 0, 0);
|
||||
transition: filter 0.05s linear;
|
||||
white-space: nowrap;
|
||||
&.metal {
|
||||
background-image: url("/img/borders/metal_strip.png");
|
||||
background-size: contain;
|
||||
background-blend-mode: darken;
|
||||
background-repeat: repeat;
|
||||
color: #dcdcdc;
|
||||
}
|
||||
&:disabled {
|
||||
opacity: 0.55;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
&:hover:not(:disabled) {
|
||||
filter: brightness(1.2);
|
||||
}
|
||||
}
|
||||
@@ -44,12 +44,13 @@ export class Adventurer {
|
||||
}
|
||||
|
||||
canPrestigeUp(): boolean {
|
||||
if (this.busy) return false;
|
||||
if (this.level < getMaxLevelForPrestige(this.prestige)) return false;
|
||||
return this.prestige < 5
|
||||
}
|
||||
|
||||
getNextLevelExpRequirement(): number {
|
||||
return this.level * 3;
|
||||
return Math.max(1, Math.floor((3 * Math.pow(1.2, this.level - 1)) * Math.pow(1.025, this.level - 1)));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
import type {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||
import {AdventurerCapacityUpgrade} from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
|
||||
import AdventurerCapacityUpgrade from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
|
||||
import {formatGold} from "@/classes/NumberMagic";
|
||||
import QuestExpUpgrade from "@/classes/guildUpgrades/QuestExpUpgrade";
|
||||
import QuestGoldUpgrade from "@/classes/guildUpgrades/QuestGoldUpgrade";
|
||||
import AutoFinishQuestsUpgrade from "@/classes/guildUpgrades/AutoFinishQuestsUpgrade";
|
||||
|
||||
const MAX_LEVEL: number = 8;
|
||||
|
||||
export class Guild {
|
||||
gold: number;
|
||||
@@ -7,14 +13,21 @@ export class Guild {
|
||||
displayUpgradeCost: number|string;
|
||||
upgradeCost: number|null = null;
|
||||
adventurerCapacity: AdventurerCapacityUpgrade;
|
||||
expModifier: QuestExpUpgrade;
|
||||
goldModifier: QuestGoldUpgrade;
|
||||
autoFinishQuestsUpgrade: AutoFinishQuestsUpgrade;
|
||||
|
||||
constructor(level: number, gold: number, upgrades: {[index:string]: GuildUpgrade} = {}) {
|
||||
this.gold = gold;
|
||||
this.level = level;
|
||||
this.displayUpgradeCost = this.getUpgradeCost() ?? "Max level";
|
||||
const rawDisplayUpgradeCost = this.getUpgradeCost();
|
||||
this.displayUpgradeCost = rawDisplayUpgradeCost ? formatGold(rawDisplayUpgradeCost) : "Max level";
|
||||
this.upgradeCost = this.getUpgradeCost();
|
||||
|
||||
this.adventurerCapacity = upgrades.adventurerCapacity as AdventurerCapacityUpgrade ?? new AdventurerCapacityUpgrade();
|
||||
this.expModifier = upgrades.expModifier as QuestExpUpgrade ?? new QuestExpUpgrade();
|
||||
this.goldModifier = upgrades.goldModifier as QuestGoldUpgrade ?? new QuestGoldUpgrade();
|
||||
this.autoFinishQuestsUpgrade = upgrades.autoFinishQuestsUpgrade as AutoFinishQuestsUpgrade ?? new AutoFinishQuestsUpgrade();
|
||||
|
||||
}
|
||||
|
||||
@@ -24,13 +37,13 @@ export class Guild {
|
||||
if (this.gold < cost) return;
|
||||
this.gold -= cost;
|
||||
this.level += 1;
|
||||
if (this.level >= 7) {
|
||||
if (this.level >= MAX_LEVEL) {
|
||||
this.displayUpgradeCost = "Max level";
|
||||
this.upgradeCost = null;
|
||||
} else {
|
||||
const newCost = this.getUpgradeCost();
|
||||
if (newCost === null) return;
|
||||
this.displayUpgradeCost = newCost;
|
||||
this.displayUpgradeCost = formatGold(newCost);
|
||||
this.upgradeCost = newCost;
|
||||
}
|
||||
}
|
||||
@@ -40,7 +53,7 @@ export class Guild {
|
||||
}
|
||||
|
||||
isMaxLevel(): boolean {
|
||||
return this.level >= 7;
|
||||
return this.level >= MAX_LEVEL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -50,5 +63,6 @@ const upgradeCosts = {
|
||||
"3": 5000,
|
||||
"4": 10000,
|
||||
"5": 25000,
|
||||
"6": 50000,
|
||||
"6": 100000,
|
||||
"7": 750000,
|
||||
} as {[index:string]: number}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
export default interface MaxLevellable {
|
||||
|
||||
maxLevel: number;
|
||||
|
||||
isMaxLevel(): boolean;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
const goldFormatter = new Intl.NumberFormat('en-US', {
|
||||
maximumFractionDigits: 3,
|
||||
// @ts-ignore - typescript doesn't know about this option for some godforsaken reason
|
||||
notation: "compact",
|
||||
useGrouping: true,
|
||||
});
|
||||
|
||||
const damageFormatter = new Intl.NumberFormat('en-US', {
|
||||
maximumFractionDigits: 2,
|
||||
// @ts-ignore - typescript doesn't know about this option for some godforsaken reason
|
||||
notation: "compact",
|
||||
});
|
||||
|
||||
export function formatGold(number: number | null): string {
|
||||
if (number === null) return "";
|
||||
return goldFormatter.format(number);
|
||||
}
|
||||
|
||||
export function formatDamage(number: number): string {
|
||||
return damageFormatter.format(number);
|
||||
}
|
||||
@@ -33,8 +33,9 @@ export class Quest {
|
||||
/**
|
||||
* Generate rewards for a quest and return it
|
||||
* @param quest
|
||||
* @param expModifier - multiplification modifier for the exp reward
|
||||
*/
|
||||
export function getQuestWithRewards(quest: Quest) {
|
||||
export function getQuestWithRewards(quest: Quest, expModifier: number = 1) {
|
||||
|
||||
let maxProgress = 1;
|
||||
|
||||
@@ -70,7 +71,7 @@ export function getQuestWithRewards(quest: Quest) {
|
||||
}
|
||||
|
||||
let goldReward = Math.floor(maxProgress/6);
|
||||
let expReward = Math.floor(Math.floor(maxProgress/120) - maxProgress/1000);
|
||||
let expReward = Math.floor((Math.floor(maxProgress/120) - maxProgress/1000) * expModifier);
|
||||
|
||||
// add some randomness to the rewards
|
||||
goldReward = Math.floor(randomNumberBetween(goldReward * 0.95, goldReward * 1.1));
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
import type {Adventurer} from "@/classes/Adventurer";
|
||||
|
||||
|
||||
/**
|
||||
* Get a random adventurer from the pool
|
||||
* @param adventurerPool
|
||||
* @returns {Adventurer|null} null if the pool is empty
|
||||
*/
|
||||
export function getNewAdventurerForHire(adventurerPool: Array<Adventurer>): Adventurer|null {
|
||||
if (adventurerPool.length <= 0) return null;
|
||||
const randomId = adventurerPool.length * Math.random() << 0;
|
||||
return adventurerPool[randomId];
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
import {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||
|
||||
export class AdventurerCapacityUpgrade extends GuildUpgrade {
|
||||
export default class AdventurerCapacityUpgrade extends GuildUpgrade {
|
||||
constructor(level: number = 1) {
|
||||
super();
|
||||
this.level = level;
|
||||
@@ -14,8 +14,8 @@ export class AdventurerCapacityUpgrade extends GuildUpgrade {
|
||||
}
|
||||
|
||||
getCostForLevel(level: number): number {
|
||||
const scalingFactor = Math.pow(1.25, level - 1);
|
||||
return Math.floor(1500 * scalingFactor * Math.pow(level, 1.25));
|
||||
const scalingFactor = Math.pow(1.35, level - 1);
|
||||
return Math.floor(1500 * scalingFactor * Math.pow(level, 1.35));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
import {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||
import type MaxLevellable from "@/classes/MaxLevellable";
|
||||
import {QuestRank} from "@/classes/QuestRank";
|
||||
|
||||
export default class AutoFinishQuestsUpgrade extends GuildUpgrade implements MaxLevellable {
|
||||
|
||||
maxLevel: number;
|
||||
|
||||
constructor(level: number = 1) {
|
||||
super();
|
||||
this.level = level;
|
||||
this.nextLevelCost = this.getCostForLevel(this.level);
|
||||
this.guildLevelRequirement = 7;
|
||||
this.maxLevel = 8;
|
||||
}
|
||||
|
||||
upgrade(): void {
|
||||
this.level += 1;
|
||||
this.nextLevelCost = this.getCostForLevel(this.level);
|
||||
}
|
||||
|
||||
getCostForLevel(level: number): number {
|
||||
const scalingFactor = Math.pow(4.2, level - 1);
|
||||
return Math.floor(25000 * scalingFactor * Math.pow(level, 1.05));
|
||||
}
|
||||
|
||||
isMaxLevel(): boolean {
|
||||
return this.level >= this.maxLevel;
|
||||
}
|
||||
|
||||
getRanksToAutoFinishQuestsIn(): Array<QuestRank> {
|
||||
switch (this.level) {
|
||||
case 1:
|
||||
default:
|
||||
return [];
|
||||
case 2:
|
||||
return [QuestRank.F];
|
||||
case 3:
|
||||
return [QuestRank.F, QuestRank.E];
|
||||
case 4:
|
||||
return [QuestRank.F, QuestRank.E, QuestRank.D];
|
||||
case 5:
|
||||
return [QuestRank.F, QuestRank.E, QuestRank.D, QuestRank.C];
|
||||
case 6:
|
||||
return [QuestRank.F, QuestRank.E, QuestRank.D, QuestRank.C, QuestRank.B];
|
||||
case 7:
|
||||
return [QuestRank.F, QuestRank.E, QuestRank.D, QuestRank.C, QuestRank.B, QuestRank.A];
|
||||
case 8:
|
||||
return [QuestRank.F, QuestRank.E, QuestRank.D, QuestRank.C, QuestRank.B, QuestRank.A, QuestRank.S];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
import {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||
|
||||
export default class QuestExpUpgrade extends GuildUpgrade {
|
||||
constructor(level: number = 1) {
|
||||
super();
|
||||
this.level = level;
|
||||
this.nextLevelCost = this.getCostForLevel(this.level);
|
||||
this.guildLevelRequirement = 8;
|
||||
}
|
||||
|
||||
upgrade(): void {
|
||||
this.level += 1;
|
||||
this.nextLevelCost = this.getCostForLevel(this.level);
|
||||
}
|
||||
|
||||
getCostForLevel(level: number): number {
|
||||
const scalingFactor = Math.pow(1.05, level - 1);
|
||||
return Math.floor(2500000 * scalingFactor * Math.pow(level, 1.01));
|
||||
}
|
||||
|
||||
getModifier(): number {
|
||||
return 1 + (this.level * 0.1);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
import {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||
|
||||
export default class QuestGoldUpgrade extends GuildUpgrade {
|
||||
constructor(level: number = 1) {
|
||||
super();
|
||||
this.level = level;
|
||||
this.nextLevelCost = this.getCostForLevel(this.level);
|
||||
this.guildLevelRequirement = 8;
|
||||
}
|
||||
|
||||
upgrade(): void {
|
||||
this.level += 1;
|
||||
this.nextLevelCost = this.getCostForLevel(this.level);
|
||||
}
|
||||
|
||||
getCostForLevel(level: number): number {
|
||||
const scalingFactor = Math.pow(1.05, level - 1);
|
||||
return Math.floor(2500000 * scalingFactor * Math.pow(level, 1.01));
|
||||
}
|
||||
|
||||
getModifier(): number {
|
||||
return 1 + (this.level * 0.1);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,144 @@
|
||||
<template>
|
||||
<dialog ref="modal" class="adventurer-details" v-if="adventurer">
|
||||
<button class="close" @click="$emit('closeButtonClicked')">✗</button>
|
||||
|
||||
<div class="adventurer-portrait">
|
||||
<img :src="adventurer.portrait" alt="" draggable="false"/>
|
||||
</div>
|
||||
<span class="name">{{ adventurer.name }}</span>
|
||||
<div class="adventurer-data">
|
||||
<p>Level: {{ adventurer.level }} / {{ adventurer.getMaxLevel() }}</p>
|
||||
<p>Prestige level: {{ adventurer.prestige }}</p>
|
||||
|
||||
<p>Exp: {{ adventurer.exp }} / {{ adventurer.getNextLevelExpRequirement() }}</p>
|
||||
<p>DPS: {{ formatDamage(adventurer.getDPS()) }}</p>
|
||||
</div>
|
||||
<div class="adventurer-upgrades">
|
||||
<button
|
||||
class="button metal"
|
||||
:disabled="!adventurer.canPrestigeUp()"
|
||||
:title="!adventurer.canPrestigeUp() ? 'Adventurer needs to be at max level to prestige up' : ''"
|
||||
@click="() => {
|
||||
if (adventurer === null) return;
|
||||
if (!adventurer.canPrestigeUp()) return;
|
||||
adventurer.prestigeUp();
|
||||
}"
|
||||
>
|
||||
Prestige up
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</dialog>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import type {Adventurer} from "@/classes/Adventurer";
|
||||
import {defineComponent, type PropType} from "vue";
|
||||
import {formatDamage} from "../classes/NumberMagic";
|
||||
|
||||
export default defineComponent({
|
||||
name: "AdventurerDetails",
|
||||
methods: {formatDamage},
|
||||
props: {
|
||||
adventurer: {
|
||||
type: Object as PropType<Adventurer | null>,
|
||||
default() {
|
||||
return null as Adventurer | null;
|
||||
},
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
const refs = this.$refs as any;
|
||||
refs.modal.showModal();
|
||||
},
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.adventurer-details {
|
||||
display: flex;
|
||||
position: absolute;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
min-height: 10rem;
|
||||
max-width: 45rem;
|
||||
background-image: url("/img/background/paper/small_tile_paper.png");
|
||||
background-position: center;
|
||||
background-size: cover;
|
||||
user-select: none;
|
||||
|
||||
&::backdrop {
|
||||
background-color: rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
.close {
|
||||
position: absolute;
|
||||
top: 0.25rem;
|
||||
right: 0.5rem;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-size: 3rem;
|
||||
margin: 0;
|
||||
cursor: pointer;
|
||||
color: #ab0707;
|
||||
background: transparent;
|
||||
border: none;
|
||||
font-family: 'EB Garamond', serif;
|
||||
transition: color 0.05s linear;
|
||||
|
||||
&:hover {
|
||||
color: #ff0000;
|
||||
}
|
||||
|
||||
&:focus {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 2px solid #ff0000;
|
||||
}
|
||||
}
|
||||
|
||||
.adventurer-portrait {
|
||||
width: 100%;
|
||||
max-width: 15rem;
|
||||
aspect-ratio: 1/1;
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
object-fit: cover;
|
||||
}
|
||||
}
|
||||
|
||||
.name {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
font-size: 2rem;
|
||||
font-weight: bold;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.adventurer-data {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
font-size: 1.2rem;
|
||||
width: 100%;
|
||||
|
||||
& > * {
|
||||
margin: 0;
|
||||
width: calc(50% - 1rem);
|
||||
text-align: center;
|
||||
padding-inline: 0.5rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -26,6 +26,7 @@ export default defineComponent({
|
||||
default() {
|
||||
return {} as { [key: string]: Adventurer };
|
||||
},
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
|
||||
@@ -39,6 +40,7 @@ export default defineComponent({
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
.slot {
|
||||
padding: 0;
|
||||
width: 5rem;
|
||||
|
||||
@@ -65,12 +65,10 @@ export default defineComponent({
|
||||
default() {
|
||||
return {} as {[key: string]: Adventurer};
|
||||
},
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
methods: {
|
||||
print(a:string) {
|
||||
console.log(a);
|
||||
},
|
||||
closeSelect() {
|
||||
this.selection = false;
|
||||
}
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
:title="adventurer.name + (adventurer.busy ? ' (busy)' : '')"
|
||||
>
|
||||
<img :src="adventurer.portrait" :alt="adventurer.name" draggable="false">
|
||||
<div class="level" :title="adventurer.isMaxLevel() ? 'Max level' : ''">{{adventurer.level}}<span v-if="adventurer.isMaxLevel()">⇪</span></div>
|
||||
<div class="level" :title="adventurer.isMaxLevel() ? 'Max level' : ''">{{ adventurer.level }}<span
|
||||
v-if="adventurer.isMaxLevel()">⇪</span></div>
|
||||
<div class="exp"></div>
|
||||
</article>
|
||||
</template>
|
||||
@@ -22,6 +23,7 @@ export default defineComponent({
|
||||
default() {
|
||||
return {} as Adventurer;
|
||||
},
|
||||
required: true,
|
||||
}
|
||||
},
|
||||
data: () => ({
|
||||
@@ -51,6 +53,7 @@ export default defineComponent({
|
||||
line-height: 1;
|
||||
color: rgba(0, 0, 0, 0.75);
|
||||
position: relative;
|
||||
|
||||
.level {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
@@ -62,6 +65,7 @@ export default defineComponent({
|
||||
padding: 0.1rem;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.exp {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
@@ -71,6 +75,7 @@ export default defineComponent({
|
||||
background-color: rgba(203, 33, 213, 0.75);
|
||||
transition: width 1s linear;
|
||||
}
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
|
||||
@@ -1,8 +1,15 @@
|
||||
<template>
|
||||
<div class="changelog">
|
||||
<div class="changelog panel pinned-paper">
|
||||
<div class="nail top-left">
|
||||
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
|
||||
</div>
|
||||
<div class="nail top-right">
|
||||
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
|
||||
</div>
|
||||
<h1>Changelog</h1>
|
||||
<div class="changelog-entry" v-for="release in releases">
|
||||
<h2>Version {{ release.name }}</h2>
|
||||
<hr>
|
||||
<h2><span>Version {{ release.name }}</span><small class="date">{{ timeFormat.format(release.createdAt) }}</small></h2>
|
||||
<pre>{{ release.body }}</pre>
|
||||
</div>
|
||||
</div>
|
||||
@@ -15,7 +22,12 @@ import {defineComponent} from "vue";
|
||||
export default defineComponent({
|
||||
name: "ChangelogComponent",
|
||||
data: () => ({
|
||||
releases: [] as Array<any>,
|
||||
timeFormat: Intl.DateTimeFormat(Intl.DateTimeFormat().resolvedOptions().locale, {
|
||||
year: "numeric",
|
||||
month: "numeric",
|
||||
day: "numeric",
|
||||
}),
|
||||
releases: [] as Array<{body: string, name: string, createdAt: Date}>,
|
||||
lastPage: 1,
|
||||
}),
|
||||
methods: {
|
||||
@@ -33,6 +45,7 @@ export default defineComponent({
|
||||
const version = {} as any;
|
||||
version.body = release.body.trim();
|
||||
version.name = release.name;
|
||||
version.createdAt = new Date(release.published_at);
|
||||
if (release.body.length === 0) continue;
|
||||
this.releases.push(version);
|
||||
}
|
||||
@@ -47,29 +60,53 @@ export default defineComponent({
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.changelog {
|
||||
padding: 3rem;
|
||||
padding-block: 3rem;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
max-width: 45rem;
|
||||
width: 100%;
|
||||
|
||||
h1 {
|
||||
font-size: 3rem;
|
||||
line-height: 1;
|
||||
margin: 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.changelog-entry {
|
||||
width: 100%;
|
||||
|
||||
h2 {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-start;
|
||||
align-items: flex-end;
|
||||
margin: 0;
|
||||
padding-inline: 1rem;
|
||||
gap: 0.5rem;
|
||||
}
|
||||
|
||||
.date {
|
||||
color: rgba(0,0,0, 0.6);
|
||||
font-size: 1rem;
|
||||
}
|
||||
|
||||
hr {
|
||||
border: 0;
|
||||
width: calc(100% - 2rem);
|
||||
border-bottom: 1px solid black;
|
||||
}
|
||||
|
||||
pre {
|
||||
line-height: 1.2;
|
||||
margin: 0;
|
||||
white-space: pre-wrap;
|
||||
font-family: 'EB Garamond', serif;
|
||||
padding-inline: 1rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -61,12 +61,14 @@ export default defineComponent({
|
||||
default() {
|
||||
return {} as Quest;
|
||||
},
|
||||
required: true,
|
||||
},
|
||||
adventurers: {
|
||||
type: Object as PropType<{ [key: string]: Adventurer }>,
|
||||
default() {
|
||||
return {} as { [key: string]: Adventurer };
|
||||
},
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
data: () => {
|
||||
@@ -126,6 +128,7 @@ export default defineComponent({
|
||||
height: 100%;
|
||||
z-index: -5;
|
||||
overflow: hidden;
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
@@ -137,6 +140,7 @@ export default defineComponent({
|
||||
font-size: 1.5rem;
|
||||
line-height: 1;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 1.15rem;
|
||||
margin: 0;
|
||||
@@ -148,6 +152,7 @@ export default defineComponent({
|
||||
margin: 0.5rem auto;
|
||||
position: relative;
|
||||
height: 1.25rem;
|
||||
|
||||
.progress {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
@@ -158,6 +163,7 @@ export default defineComponent({
|
||||
background-color: rgba(0, 128, 0, 0.65);
|
||||
transition: width 250ms linear;
|
||||
}
|
||||
|
||||
.percentage {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
@@ -221,6 +227,7 @@ export default defineComponent({
|
||||
background-size: contain;
|
||||
opacity: 1;
|
||||
z-index: -4;
|
||||
|
||||
img {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
@@ -241,6 +248,7 @@ export default defineComponent({
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
img {
|
||||
width: 45%;
|
||||
height: 35%;
|
||||
|
||||
@@ -3,12 +3,51 @@
|
||||
<h2>Upgrades</h2>
|
||||
<div class="upgrade">
|
||||
<span>Adventurer capacity (level {{ guild.adventurerCapacity.level }})</span>
|
||||
<small>Increases the maximum amount of recruited adventurers</small>
|
||||
<button
|
||||
class="button metal"
|
||||
v-if="guild.adventurerCapacity.nextLevelCost"
|
||||
:disabled="guild.gold < guild.adventurerCapacity.nextLevelCost"
|
||||
@click="upgradeAdventurerCapacity()"
|
||||
>
|
||||
Upgrade ({{guild.adventurerCapacity.nextLevelCost.toFixed(0)}} gold)
|
||||
Upgrade ({{ formatGold(guild.adventurerCapacity.nextLevelCost) }} gold)
|
||||
</button>
|
||||
</div>
|
||||
<div class="upgrade" v-if="guild.level >= guild.autoFinishQuestsUpgrade.guildLevelRequirement">
|
||||
<span>Auto-finish quests (level {{ guild.autoFinishQuestsUpgrade.level - 1 }})</span>
|
||||
<small>Automatically finish quests when they are completed.</small>
|
||||
<button
|
||||
class="button metal"
|
||||
v-if="guild.autoFinishQuestsUpgrade.nextLevelCost"
|
||||
:disabled="guild.gold < guild.autoFinishQuestsUpgrade.nextLevelCost || guild.autoFinishQuestsUpgrade.isMaxLevel()"
|
||||
@click="upgradeAutoFinishQuests()"
|
||||
>
|
||||
<span v-if="!guild.autoFinishQuestsUpgrade.isMaxLevel()">Upgrade ({{ formatGold(guild.autoFinishQuestsUpgrade.nextLevelCost) }} gold)</span>
|
||||
<span v-else>Max level</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="upgrade" v-if="guild.level >= guild.expModifier.guildLevelRequirement">
|
||||
<span>Quest exp modifier (level {{ guild.expModifier.level }})</span>
|
||||
<small>Increases exp from newly offered quests by 10% per level</small>
|
||||
<button
|
||||
class="button metal"
|
||||
v-if="guild.expModifier.nextLevelCost"
|
||||
:disabled="guild.gold < guild.expModifier.nextLevelCost"
|
||||
@click="upgradeQuestExpModifier()"
|
||||
>
|
||||
Upgrade ({{ formatGold(guild.expModifier.nextLevelCost) }} gold)
|
||||
</button>
|
||||
</div>
|
||||
<div class="upgrade" v-if="guild.level >= guild.goldModifier.guildLevelRequirement">
|
||||
<span>Quest gold modifier (level {{ guild.goldModifier.level }})</span>
|
||||
<small>Increases gold from newly offered quests by 10% per level</small>
|
||||
<button
|
||||
class="button metal"
|
||||
v-if="guild.goldModifier.nextLevelCost"
|
||||
:disabled="guild.gold < guild.goldModifier.nextLevelCost"
|
||||
@click="upgradeQuestGoldModifier()"
|
||||
>
|
||||
Upgrade ({{ formatGold(guild.goldModifier.nextLevelCost) }} gold)
|
||||
</button>
|
||||
</div>
|
||||
</section>
|
||||
@@ -17,6 +56,7 @@
|
||||
<script lang="ts">
|
||||
import {Guild} from "@/classes/Guild";
|
||||
import {defineComponent, type PropType} from "vue";
|
||||
import {formatGold} from "@/classes/NumberMagic";
|
||||
|
||||
export default defineComponent({
|
||||
name: "UpgradesList",
|
||||
@@ -25,17 +65,41 @@ export default defineComponent({
|
||||
type: Object as PropType<Guild>,
|
||||
default() {
|
||||
return new Guild(1, 0) as Guild;
|
||||
}
|
||||
},
|
||||
required: true,
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
formatGold,
|
||||
upgradeAdventurerCapacity(): void {
|
||||
if (!this.guild.adventurerCapacity) return;
|
||||
if (!this.guild.adventurerCapacity.nextLevelCost) return;
|
||||
if (this.guild.gold < this.guild.adventurerCapacity.nextLevelCost) return;
|
||||
this.guild.gold -= this.guild.adventurerCapacity.nextLevelCost;
|
||||
this.guild.adventurerCapacity.upgrade();
|
||||
}
|
||||
},
|
||||
upgradeAutoFinishQuests(): void {
|
||||
if (!this.guild.autoFinishQuestsUpgrade) return;
|
||||
if (this.guild.autoFinishQuestsUpgrade.isMaxLevel()) return;
|
||||
if (!this.guild.autoFinishQuestsUpgrade.nextLevelCost) return;
|
||||
if (this.guild.gold < this.guild.autoFinishQuestsUpgrade.nextLevelCost) return;
|
||||
this.guild.gold -= this.guild.autoFinishQuestsUpgrade.nextLevelCost;
|
||||
this.guild.autoFinishQuestsUpgrade.upgrade();
|
||||
},
|
||||
upgradeQuestExpModifier(): void {
|
||||
if (!this.guild.expModifier) return;
|
||||
if (!this.guild.expModifier.nextLevelCost) return;
|
||||
if (this.guild.gold < this.guild.expModifier.nextLevelCost) return;
|
||||
this.guild.gold -= this.guild.expModifier.nextLevelCost;
|
||||
this.guild.expModifier.upgrade();
|
||||
},
|
||||
upgradeQuestGoldModifier(): void {
|
||||
if (!this.guild.goldModifier) return;
|
||||
if (!this.guild.goldModifier.nextLevelCost) return;
|
||||
if (this.guild.gold < this.guild.goldModifier.nextLevelCost) return;
|
||||
this.guild.gold -= this.guild.goldModifier.nextLevelCost;
|
||||
this.guild.goldModifier.upgrade();
|
||||
},
|
||||
}
|
||||
});
|
||||
</script>
|
||||
@@ -47,22 +111,27 @@ export default defineComponent({
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
|
||||
h2 {
|
||||
font-size: 1.75rem;
|
||||
margin: 2rem 0 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.upgrade {
|
||||
text-align: center;
|
||||
font-size: 1.25rem;
|
||||
font-weight: bold;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
flex-wrap: wrap;
|
||||
flex-direction: column;
|
||||
width: min(25rem, 100%);
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
gap: 0.2rem;
|
||||
small {
|
||||
font-weight: normal;
|
||||
line-height: 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -2,7 +2,7 @@ import { createApp } from 'vue'
|
||||
import App from './App.vue'
|
||||
import router from './router'
|
||||
|
||||
import './assets/main.css'
|
||||
import './assets/main.scss'
|
||||
|
||||
const app = createApp(App)
|
||||
|
||||
|
||||
@@ -1,14 +1,20 @@
|
||||
<template>
|
||||
<div class="adventurer-section">
|
||||
<section class="recruit">
|
||||
<AdventurerDetails
|
||||
:adventurer="selectedAdventurer"
|
||||
v-if="selectedAdventurer !== null"
|
||||
@closeButtonClicked="selectedAdventurer = null"
|
||||
|
||||
/>
|
||||
<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()}"
|
||||
>
|
||||
✔
|
||||
@@ -28,10 +34,18 @@
|
||||
|
||||
</div>
|
||||
</section>
|
||||
<section class="collection">
|
||||
<h1>Recruited adventurers ({{ Object.keys(adventurers).length }} / {{ guild.adventurerCapacity.getAdventurerCapacity() }})</h1>
|
||||
<section class="collection panel pinned-paper">
|
||||
<h1>
|
||||
Recruited adventurers ({{ Object.keys(adventurers).length }} / {{ guild.adventurerCapacity.getAdventurerCapacity() }})
|
||||
</h1>
|
||||
<small>Click an adventurer to see details about them</small>
|
||||
<div class="adventurers">
|
||||
<div class="adventurer-tile" v-for="adventurer in adventurers" :key="adventurer.id">
|
||||
<div
|
||||
class="adventurer-tile"
|
||||
v-for="adventurer in adventurers"
|
||||
:key="adventurer.id"
|
||||
@click="selectedAdventurer = adventurer"
|
||||
>
|
||||
<AdventurerTile class="entry" :adventurer="adventurer"/>
|
||||
<b>{{ adventurer.name }}</b>
|
||||
</div>
|
||||
@@ -45,16 +59,17 @@ import type {PropType} from "vue";
|
||||
import {defineComponent} from "vue";
|
||||
import AdventurerTile from "@/components/AdventurerTile.vue";
|
||||
import type {Adventurer} from "@/classes/Adventurer";
|
||||
import { loadAdventurersForHire } from "@/GameData";
|
||||
import type {Guild} from "@/classes/Guild";
|
||||
import AdventurerDetails from "@/components/AdventurerDetails.vue";
|
||||
|
||||
export default defineComponent({
|
||||
name: "RecruitView",
|
||||
components: {AdventurerTile},
|
||||
components: {AdventurerDetails, AdventurerTile},
|
||||
data: () => {
|
||||
return {
|
||||
currentlyForHire: null as Adventurer | null,
|
||||
adventurersForHire: [] as Array<Adventurer>,
|
||||
selectedAdventurer: null as Adventurer | null,
|
||||
}
|
||||
},
|
||||
props: {
|
||||
@@ -63,83 +78,34 @@ export default defineComponent({
|
||||
default() {
|
||||
return {} as Guild
|
||||
},
|
||||
required: true,
|
||||
},
|
||||
adventurers: {
|
||||
type: Object as PropType<{ [key: string]: Adventurer }>,
|
||||
default() {
|
||||
return {} as { [key: string]: Adventurer };
|
||||
},
|
||||
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"]
|
||||
|
||||
@@ -148,22 +114,36 @@ export default defineComponent({
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.adventurer-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
section {
|
||||
max-width: 1280px;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
padding-block: 1rem;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-content: center;
|
||||
flex-direction: column;
|
||||
gap: 1rem;
|
||||
width: 100%;
|
||||
|
||||
section {
|
||||
text-align: center;
|
||||
padding: 1rem;
|
||||
width: calc(100% - 2rem);
|
||||
max-width: 45rem;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 2rem;
|
||||
font-weight: bold;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.collection {
|
||||
small {
|
||||
font-size: 1rem;
|
||||
display: block;
|
||||
margin-bottom: 0.5rem;
|
||||
}
|
||||
}
|
||||
|
||||
.adventurers {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
@@ -171,6 +151,7 @@ export default defineComponent({
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
gap: 1rem;
|
||||
|
||||
.adventurer-tile {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@@ -178,10 +159,13 @@ export default defineComponent({
|
||||
flex-direction: column;
|
||||
gap: 0.25rem;
|
||||
font-size: 1.1rem;
|
||||
cursor: pointer;
|
||||
|
||||
.entry {
|
||||
height: 7rem;
|
||||
width: 7rem;
|
||||
}
|
||||
|
||||
b {
|
||||
line-height: 1;
|
||||
text-align: center;
|
||||
@@ -192,6 +176,7 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.decision {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
@@ -199,17 +184,21 @@ export default defineComponent({
|
||||
align-items: center;
|
||||
font-size: 2rem;
|
||||
gap: 1rem;
|
||||
|
||||
span {
|
||||
cursor: pointer;
|
||||
|
||||
&:hover {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
&.disabled {
|
||||
color: rgba(0, 0, 0, 0.5);
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.hire-tile {
|
||||
width: 8rem;
|
||||
height: 8rem;
|
||||
|
||||
@@ -1,17 +1,28 @@
|
||||
<template>
|
||||
<main>
|
||||
<section class="title">
|
||||
<section class="title panel note-paper">
|
||||
<h1>Guild Master</h1>
|
||||
<h3>Adventurer's guild management game</h3>
|
||||
<small>v{{ version }}</small>
|
||||
</section>
|
||||
<section class="upgrades panel pinned-paper">
|
||||
<div class="nail top-left">
|
||||
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
|
||||
</div>
|
||||
<div class="nail top-right">
|
||||
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
|
||||
</div>
|
||||
<section class="coffer">
|
||||
<p>Coffer: {{guild.gold}} gold</p>
|
||||
<p>Coffer: {{ formatGold(guild.gold) }} gold</p>
|
||||
</section>
|
||||
<section class="upgrade">
|
||||
<p>Guild level: {{ guild.level }}</p>
|
||||
<button :disabled="guild.upgradeCost ? guild.gold < guild.upgradeCost : true" @click="guild.upgrade()">
|
||||
<span>Upgrade guild level</span><br>
|
||||
<button
|
||||
class="button metal"
|
||||
:disabled="guild.upgradeCost ? guild.gold < guild.upgradeCost : true"
|
||||
@click="guild.upgrade()"
|
||||
>
|
||||
<span>Upgrade guild level </span>
|
||||
<span>({{ guild.displayUpgradeCost }})</span>
|
||||
</button>
|
||||
</section>
|
||||
@@ -21,6 +32,8 @@
|
||||
<section class="upgrade">
|
||||
<span class="wipe-save" @click="$emit('wipeSave')">Wipe your save data</span>
|
||||
</section>
|
||||
</section>
|
||||
|
||||
</main>
|
||||
</template>
|
||||
|
||||
@@ -31,9 +44,11 @@ import {Guild} from "@/classes/Guild";
|
||||
|
||||
import {version} from "../../package.json"
|
||||
import UpgradesList from "@/components/UpgradesList.vue";
|
||||
import {formatGold} from "@/classes/NumberMagic";
|
||||
|
||||
export default defineComponent({
|
||||
name: "GuildView",
|
||||
methods: {formatGold},
|
||||
components: {UpgradesList},
|
||||
data: () => {
|
||||
return {
|
||||
@@ -44,46 +59,69 @@ export default defineComponent({
|
||||
guild: {
|
||||
type: Object as PropType<Guild>,
|
||||
default: () => new Guild(1, 0) as Guild,
|
||||
required: true,
|
||||
},
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
main {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding-block: 1rem;
|
||||
gap: 1rem;
|
||||
|
||||
.upgrades {
|
||||
max-width: 45rem;
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.title {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
padding: 2.5rem;
|
||||
padding-block: 2.5rem;
|
||||
text-align: center;
|
||||
|
||||
width: 100%;
|
||||
max-width: 45rem;
|
||||
gap: 0.5rem;
|
||||
|
||||
h1 {
|
||||
font-size: 4rem;
|
||||
line-height: 0.75;
|
||||
|
||||
white-space: pre-wrap;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
h3 {
|
||||
margin: 0;
|
||||
line-height: 0.9;
|
||||
}
|
||||
|
||||
small {
|
||||
font-size: 0.9rem;
|
||||
font-weight: bold;
|
||||
line-height: 0.25;
|
||||
}
|
||||
}
|
||||
|
||||
.coffer {
|
||||
text-align: center;
|
||||
|
||||
p {
|
||||
font-size: 1.5rem;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
.upgrade {
|
||||
text-align: center;
|
||||
|
||||
.wipe-save {
|
||||
display: inline-flex;
|
||||
font-weight: bold;
|
||||
@@ -91,6 +129,7 @@ export default defineComponent({
|
||||
color: #d52121;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0;
|
||||
font-size: 1.5rem;
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<template>
|
||||
<section>
|
||||
<div class="guild" v-if="guild.level >= 7 && Object.keys(quests.S).length > 0">
|
||||
<h1>Rank S Quests</h1>
|
||||
<section class="missives">
|
||||
@@ -83,7 +84,7 @@
|
||||
/>
|
||||
</section>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
@@ -103,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>,
|
||||
|
||||
@@ -1,12 +1,24 @@
|
||||
<template>
|
||||
<section class="technical-view">
|
||||
<h1>Socials</h1>
|
||||
<div class="socials">
|
||||
<a class="link" href="https://discord.gg/j8KK5dGBps"><img class="icon" src="/img/icons/discord.svg" alt="Discord" />Discord</a>
|
||||
<a class="link" href="https://github.com/YouHaveTrouble/GuildMaster"><img class="icon" src="/img/icons/github.svg" alt="GitHub" />GitHub</a>
|
||||
|
||||
<div class="socials panel pinned-paper">
|
||||
<div class="nail top-left small">
|
||||
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
|
||||
</div>
|
||||
<div class="nail top-right small">
|
||||
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
|
||||
</div>
|
||||
<h1>Socials</h1>
|
||||
<div class="links">
|
||||
<a class="link" href="https://discord.gg/j8KK5dGBps">
|
||||
<img class="icon" src="/img/icons/discord.svg" alt="Discord"/>
|
||||
Discord
|
||||
</a>
|
||||
<a class="link" href="https://github.com/YouHaveTrouble/GuildMaster">
|
||||
<img class="icon" src="/img/icons/github.svg" alt="GitHub"/>
|
||||
GitHub
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ChangelogComponent/>
|
||||
|
||||
</section>
|
||||
@@ -31,18 +43,28 @@ export default defineComponent({
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
padding-block: 1rem;
|
||||
|
||||
h1 {
|
||||
font-size: 3rem;
|
||||
line-height: 1;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.socials {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
padding: 1rem;
|
||||
|
||||
.links {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 1rem;
|
||||
}
|
||||
|
||||
.link {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
@@ -55,6 +77,10 @@ export default defineComponent({
|
||||
color: #000;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.icon {
|
||||
width: 2rem;
|
||||
height: 2rem;
|
||||
|
||||