mirror of
https://github.com/YouHaveTrouble/GuildMaster.git
synced 2026-05-12 06:26:59 +00:00
Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 6625a5b9de | |||
| cf69b92934 | |||
| 005cde4a01 | |||
| 1b94d676e7 | |||
| 7cda820a99 | |||
| 7281fdab60 | |||
| 3b9441b555 | |||
| c2abfd6dfd | |||
| f05c393600 | |||
| 23b6f4b4f8 | |||
| d5195aa157 | |||
| 15072fe2c8 | |||
| ba4a6cb2a2 | |||
| 4847d22f7e | |||
| 2c053cc3eb | |||
| c55e0c8bb6 | |||
| 29aafedcfa | |||
| 8070c855a0 | |||
| aaf0eb6546 | |||
| c14a135c94 | |||
| 40d5a876b8 |
+20
-8
@@ -1,18 +1,30 @@
|
|||||||
<!DOCTYPE html>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<link rel="icon" href="/favicon.ico">
|
<link rel="icon" href="/favicon.ico">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Guild Master - Adventurer's guild management game</title>
|
<title>Guild Master - Adventurer's guild management game</title>
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com">
|
<link rel="preconnect" href="https://fonts.googleapis.com">
|
||||||
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
||||||
<link href="https://fonts.googleapis.com/css2?family=EB+Garamond&display=swap" rel="stylesheet">
|
<link href="https://fonts.googleapis.com/css2?family=EB+Garamond&display=swap" rel="stylesheet">
|
||||||
|
|
||||||
|
<meta name="description"
|
||||||
|
content="Guild Master is a browser game where you manage your own adventurer's guild!"/>
|
||||||
|
<meta property="twitter:title" content="Guild Master - Adventurer's guild management game"/>
|
||||||
|
<meta property="twitter:image" content="https://guildmaster.yht.one/img/compass_rose.png"/>
|
||||||
|
<meta property="twitter:description"
|
||||||
|
content="Guild Master is a browser game where you manage your own adventurer's guild!"/>
|
||||||
|
<meta property="og:title" content="Guild Master - Adventurer's guild management game"/>
|
||||||
|
<meta property="og:url" content="https://guildmaster.yht.one/"/>
|
||||||
|
<meta property="og:description"
|
||||||
|
content="Guild Master is a browser game where you manage your own adventurer's guild!"/>
|
||||||
|
<meta property="og:image" content="https://guildmaster.yht.one/img/compass_rose.png"/>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
<noscript>
|
<noscript>
|
||||||
This is a javascript game. You need to enable javascript for it to work.
|
This is a javascript game. You need to enable javascript for it to work.
|
||||||
</noscript>
|
</noscript>
|
||||||
<script type="module" src="/src/main.ts"></script>
|
<script type="module" src="/src/main.ts"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
Generated
+537
-571
File diff suppressed because it is too large
Load Diff
+12
-12
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "adventurers-guild",
|
"name": "adventurers-guild",
|
||||||
"version": "0.5.0",
|
"version": "0.8.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
@@ -11,19 +11,19 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vueuse/components": "^9.13.0",
|
"@vueuse/components": "^9.13.0",
|
||||||
"sass": "^1.59.3",
|
"sass": "^1.63.4",
|
||||||
"vue": "^3.2.45",
|
"vue": "^3.3.4",
|
||||||
"vue-router": "^4.1.6"
|
"vue-router": "^4.2.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "^18.11.12",
|
"@types/node": "^18.16.18",
|
||||||
"@vitejs/plugin-vue": "^4.0.0",
|
"@vitejs/plugin-vue": "^4.2.3",
|
||||||
"@vue/tsconfig": "^0.1.3",
|
"@vue/tsconfig": "^0.4.0",
|
||||||
"eslint": "^8.36.0",
|
"eslint": "^8.43.0",
|
||||||
"eslint-plugin-vue": "^9.9.0",
|
"eslint-plugin-vue": "^9.15.0",
|
||||||
"npm-run-all": "^4.1.5",
|
"npm-run-all": "^4.1.5",
|
||||||
"typescript": "~4.7.4",
|
"typescript": "~5.1.3",
|
||||||
"vite": "^4.0.0",
|
"vite": "4.3.9",
|
||||||
"vue-tsc": "^1.0.12"
|
"vue-tsc": "^1.8.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 14 KiB |
|
Before Width: | Height: | Size: 92 KiB After Width: | Height: | Size: 92 KiB |
+131
-18
@@ -1,7 +1,23 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {RouterLink, RouterView} from 'vue-router'</script>
|
import {RouterLink, RouterView} from 'vue-router'
|
||||||
|
import {version} from "../package.json"
|
||||||
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
<section class="loading-screen" :class="{disabled: !loading}">
|
||||||
|
<div class="title panel note-paper">
|
||||||
|
<h1>Guild Master</h1>
|
||||||
|
<h3>Adventurer's guild management game</h3>
|
||||||
|
<small>v{{ version }}</small>
|
||||||
|
<div class="lds-ring">
|
||||||
|
<div></div>
|
||||||
|
<div></div>
|
||||||
|
<div></div>
|
||||||
|
<div></div>
|
||||||
|
</div>
|
||||||
|
<h3>Loading assets...</h3>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
<header>
|
<header>
|
||||||
<nav>
|
<nav>
|
||||||
<RouterLink :to="{name: 'guild'}">Guild</RouterLink>
|
<RouterLink :to="{name: 'guild'}">Guild</RouterLink>
|
||||||
@@ -36,13 +52,19 @@ import {
|
|||||||
saveGame
|
saveGame
|
||||||
} from "@/GameData";
|
} from "@/GameData";
|
||||||
import type {GuildUpgrade} from "@/classes/GuildUpgrade";
|
import type {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||||
import {AdventurerCapacityUpgrade} from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
|
import AdventurerCapacityUpgrade from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
|
||||||
import {getNewAdventurerForHire} from "@/classes/Recruitment";
|
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({
|
export default defineComponent({
|
||||||
name: "GuildView",
|
name: "GuildView",
|
||||||
data: () => ({
|
data: () => ({
|
||||||
|
loading: true as boolean,
|
||||||
guild: new Guild(1, 500),
|
guild: new Guild(1, 500),
|
||||||
|
gameTickTask: null as null | number,
|
||||||
|
gameSaveTask: null as null | number,
|
||||||
lastQuestGot: {
|
lastQuestGot: {
|
||||||
S: null as null | number,
|
S: null as null | number,
|
||||||
A: null as null | number,
|
A: null as null | number,
|
||||||
@@ -77,7 +99,13 @@ export default defineComponent({
|
|||||||
missive.progressPoints = 0;
|
missive.progressPoints = 0;
|
||||||
continue;
|
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) {
|
for (const adventurerId in missive.adventurers) {
|
||||||
const adventurer = missive.adventurers[adventurerId];
|
const adventurer = missive.adventurers[adventurerId];
|
||||||
const attack = adventurer.getAttack();
|
const attack = adventurer.getAttack();
|
||||||
@@ -132,7 +160,7 @@ export default defineComponent({
|
|||||||
const questsForRank = this.quests[rank] as { [key: string]: Quest };
|
const questsForRank = this.quests[rank] as { [key: string]: Quest };
|
||||||
const randomId = keys.length * Math.random() << 0;
|
const randomId = keys.length * Math.random() << 0;
|
||||||
const randomIdString = keys[randomId] as string;
|
const randomIdString = keys[randomId] as string;
|
||||||
return getQuestWithRewards(questsForRank[randomIdString]);
|
return getQuestWithRewards(questsForRank[randomIdString], this.guild.expModifier.getModifier());
|
||||||
},
|
},
|
||||||
createMissive(questToAdd: Quest, rank: QuestRank) {
|
createMissive(questToAdd: Quest, rank: QuestRank) {
|
||||||
const quest = JSON.parse(JSON.stringify(questToAdd));
|
const quest = JSON.parse(JSON.stringify(questToAdd));
|
||||||
@@ -150,6 +178,15 @@ export default defineComponent({
|
|||||||
if (saveData.guild.adventurerCapacity) {
|
if (saveData.guild.adventurerCapacity) {
|
||||||
guildUpgrades.adventurerCapacity = new AdventurerCapacityUpgrade(saveData.guild.adventurerCapacity.level);
|
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);
|
this.guild = new Guild(saveData.guild.level, saveData.guild.gold, guildUpgrades);
|
||||||
|
|
||||||
@@ -159,13 +196,13 @@ export default defineComponent({
|
|||||||
const data = saveData.adventurers[id];
|
const data = saveData.adventurers[id];
|
||||||
try {
|
try {
|
||||||
const adventurer = new Adventurer(
|
const adventurer = new Adventurer(
|
||||||
data.id,
|
data.id,
|
||||||
data.name,
|
data.name,
|
||||||
data.portrait,
|
data.portrait,
|
||||||
data.attackExponent ?? 1.1,
|
data.attackExponent ?? 1.1,
|
||||||
data.level ?? 1,
|
data.level ?? 1,
|
||||||
data.exp ?? 0,
|
data.exp ?? 0,
|
||||||
data.prestige ?? 0,
|
data.prestige ?? 0,
|
||||||
);
|
);
|
||||||
adventurer.busy = data.busy;
|
adventurer.busy = data.busy;
|
||||||
adventurers[data.id] = adventurer;
|
adventurers[data.id] = adventurer;
|
||||||
@@ -211,13 +248,24 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
async mounted() {
|
async mounted() {
|
||||||
this.quests = await loadAvailableQuests();
|
console.debug("Loading game data")
|
||||||
this.adventurersDatabase = await loadAdventurersForHire();
|
const promises = await Promise.all([
|
||||||
this.loadGame();
|
loadAvailableQuests(),
|
||||||
|
loadAdventurersForHire(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
this.quests = promises[0] as { [key: string]: { [key: string]: Quest } };
|
||||||
|
this.adventurersDatabase = promises[1] as Array<Adventurer>;
|
||||||
|
console.debug("Game data loaded!")
|
||||||
|
this.loadGame();
|
||||||
this.adventurersDatabase = removeAlreadyHiredAdventurers(this.adventurersDatabase, this.adventurers);
|
this.adventurersDatabase = removeAlreadyHiredAdventurers(this.adventurersDatabase, this.adventurers);
|
||||||
|
|
||||||
setInterval(() => {
|
// Wait a second to make sure at least most images load in behind the loader
|
||||||
|
setTimeout(() => {
|
||||||
|
this.loading = false;
|
||||||
|
}, 1000);
|
||||||
|
|
||||||
|
this.gameSaveTask = Number(setInterval(() => {
|
||||||
saveGame(new GameData({
|
saveGame(new GameData({
|
||||||
adventurers: this.adventurers,
|
adventurers: this.adventurers,
|
||||||
guild: this.guild,
|
guild: this.guild,
|
||||||
@@ -226,9 +274,10 @@ export default defineComponent({
|
|||||||
lastRecruitAction: this.lastRecruitHandled,
|
lastRecruitAction: this.lastRecruitHandled,
|
||||||
adventurerForHireId: this.adventurerForHire?.id ?? null,
|
adventurerForHireId: this.adventurerForHire?.id ?? null,
|
||||||
}));
|
}));
|
||||||
}, 10 * 1000)
|
}, 10 * 1000));
|
||||||
|
|
||||||
setInterval(() => {
|
|
||||||
|
this.gameTickTask = Number(setInterval(() => {
|
||||||
this.updateMissives();
|
this.updateMissives();
|
||||||
|
|
||||||
const now = Number(new Date());
|
const now = Number(new Date());
|
||||||
@@ -316,8 +365,12 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}, 250);
|
}, 250));
|
||||||
|
|
||||||
|
},
|
||||||
|
beforeUnmount() {
|
||||||
|
if (this.gameSaveTask) clearInterval(this.gameSaveTask);
|
||||||
|
if (this.gameTickTask) clearInterval(this.gameTickTask);
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
@@ -366,4 +419,64 @@ nav {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.loading-screen {
|
||||||
|
position: fixed;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100vw;
|
||||||
|
height: 100vh;
|
||||||
|
z-index: 5;
|
||||||
|
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;
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
transition: opacity 0.25s linear;
|
||||||
|
|
||||||
|
&.disabled {
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.lds-ring {
|
||||||
|
display: inline-block;
|
||||||
|
position: relative;
|
||||||
|
width: 80px;
|
||||||
|
height: 80px;
|
||||||
|
}
|
||||||
|
.lds-ring div {
|
||||||
|
box-sizing: border-box;
|
||||||
|
display: block;
|
||||||
|
position: absolute;
|
||||||
|
width: 64px;
|
||||||
|
height: 64px;
|
||||||
|
margin: 8px;
|
||||||
|
border: 8px solid;
|
||||||
|
border-radius: 50%;
|
||||||
|
animation: lds-ring 1.2s cubic-bezier(0.5, 0, 0.5, 1) infinite;
|
||||||
|
border-color: #000 transparent transparent transparent;
|
||||||
|
}
|
||||||
|
.lds-ring div:nth-child(1) {
|
||||||
|
animation-delay: -0.45s;
|
||||||
|
}
|
||||||
|
.lds-ring div:nth-child(2) {
|
||||||
|
animation-delay: -0.3s;
|
||||||
|
}
|
||||||
|
.lds-ring div:nth-child(3) {
|
||||||
|
animation-delay: -0.15s;
|
||||||
|
}
|
||||||
|
@keyframes lds-ring {
|
||||||
|
0% {
|
||||||
|
transform: rotate(0deg);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
transform: rotate(360deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -82,3 +82,33 @@ body {
|
|||||||
filter: brightness(1.2);
|
filter: brightness(1.2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.title {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+15
-4
@@ -1,7 +1,11 @@
|
|||||||
import type {GuildUpgrade} from "@/classes/GuildUpgrade";
|
import type {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||||
import {AdventurerCapacityUpgrade} from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
|
import AdventurerCapacityUpgrade from "@/classes/guildUpgrades/AdventurerCapacityUpgrade";
|
||||||
import {formatGold} from "@/classes/NumberMagic";
|
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 {
|
export class Guild {
|
||||||
gold: number;
|
gold: number;
|
||||||
@@ -9,6 +13,9 @@ export class Guild {
|
|||||||
displayUpgradeCost: number|string;
|
displayUpgradeCost: number|string;
|
||||||
upgradeCost: number|null = null;
|
upgradeCost: number|null = null;
|
||||||
adventurerCapacity: AdventurerCapacityUpgrade;
|
adventurerCapacity: AdventurerCapacityUpgrade;
|
||||||
|
expModifier: QuestExpUpgrade;
|
||||||
|
goldModifier: QuestGoldUpgrade;
|
||||||
|
autoFinishQuestsUpgrade: AutoFinishQuestsUpgrade;
|
||||||
|
|
||||||
constructor(level: number, gold: number, upgrades: {[index:string]: GuildUpgrade} = {}) {
|
constructor(level: number, gold: number, upgrades: {[index:string]: GuildUpgrade} = {}) {
|
||||||
this.gold = gold;
|
this.gold = gold;
|
||||||
@@ -18,6 +25,9 @@ export class Guild {
|
|||||||
this.upgradeCost = this.getUpgradeCost();
|
this.upgradeCost = this.getUpgradeCost();
|
||||||
|
|
||||||
this.adventurerCapacity = upgrades.adventurerCapacity as AdventurerCapacityUpgrade ?? new AdventurerCapacityUpgrade();
|
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();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -27,7 +37,7 @@ export class Guild {
|
|||||||
if (this.gold < cost) return;
|
if (this.gold < cost) return;
|
||||||
this.gold -= cost;
|
this.gold -= cost;
|
||||||
this.level += 1;
|
this.level += 1;
|
||||||
if (this.level >= 7) {
|
if (this.level >= MAX_LEVEL) {
|
||||||
this.displayUpgradeCost = "Max level";
|
this.displayUpgradeCost = "Max level";
|
||||||
this.upgradeCost = null;
|
this.upgradeCost = null;
|
||||||
} else {
|
} else {
|
||||||
@@ -43,7 +53,7 @@ export class Guild {
|
|||||||
}
|
}
|
||||||
|
|
||||||
isMaxLevel(): boolean {
|
isMaxLevel(): boolean {
|
||||||
return this.level >= 7;
|
return this.level >= MAX_LEVEL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,5 +63,6 @@ const upgradeCosts = {
|
|||||||
"3": 5000,
|
"3": 5000,
|
||||||
"4": 10000,
|
"4": 10000,
|
||||||
"5": 25000,
|
"5": 25000,
|
||||||
"6": 50000,
|
"6": 100000,
|
||||||
|
"7": 750000,
|
||||||
} as {[index:string]: number}
|
} as {[index:string]: number}
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
export default interface MaxLevellable {
|
||||||
|
|
||||||
|
maxLevel: number;
|
||||||
|
|
||||||
|
isMaxLevel(): boolean;
|
||||||
|
|
||||||
|
}
|
||||||
@@ -11,7 +11,8 @@ const damageFormatter = new Intl.NumberFormat('en-US', {
|
|||||||
notation: "compact",
|
notation: "compact",
|
||||||
});
|
});
|
||||||
|
|
||||||
export function formatGold(number: number): string {
|
export function formatGold(number: number | null): string {
|
||||||
|
if (number === null) return "";
|
||||||
return goldFormatter.format(number);
|
return goldFormatter.format(number);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,8 +33,9 @@ export class Quest {
|
|||||||
/**
|
/**
|
||||||
* Generate rewards for a quest and return it
|
* Generate rewards for a quest and return it
|
||||||
* @param quest
|
* @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;
|
let maxProgress = 1;
|
||||||
|
|
||||||
@@ -70,7 +71,7 @@ export function getQuestWithRewards(quest: Quest) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let goldReward = Math.floor(maxProgress/6);
|
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
|
// add some randomness to the rewards
|
||||||
goldReward = Math.floor(randomNumberBetween(goldReward * 0.95, goldReward * 1.1));
|
goldReward = Math.floor(randomNumberBetween(goldReward * 0.95, goldReward * 1.1));
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import {GuildUpgrade} from "@/classes/GuildUpgrade";
|
import {GuildUpgrade} from "@/classes/GuildUpgrade";
|
||||||
|
|
||||||
export class AdventurerCapacityUpgrade extends GuildUpgrade {
|
export default class AdventurerCapacityUpgrade extends GuildUpgrade {
|
||||||
constructor(level: number = 1) {
|
constructor(level: number = 1) {
|
||||||
super();
|
super();
|
||||||
this.level = level;
|
this.level = level;
|
||||||
@@ -14,8 +14,8 @@ export class AdventurerCapacityUpgrade extends GuildUpgrade {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getCostForLevel(level: number): number {
|
getCostForLevel(level: number): number {
|
||||||
const scalingFactor = Math.pow(1.25, level - 1);
|
const scalingFactor = Math.pow(1.35, level - 1);
|
||||||
return Math.floor(1500 * scalingFactor * Math.pow(level, 1.25));
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
<h1>Changelog</h1>
|
<h1>Changelog</h1>
|
||||||
<div class="changelog-entry" v-for="release in releases">
|
<div class="changelog-entry" v-for="release in releases">
|
||||||
<hr>
|
<hr>
|
||||||
<h2>Version {{ release.name }}</h2>
|
<h2><span>Version {{ release.name }}</span><small class="date">{{ timeFormat.format(release.createdAt) }}</small></h2>
|
||||||
<pre>{{ release.body }}</pre>
|
<pre>{{ release.body }}</pre>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -22,7 +22,12 @@ import {defineComponent} from "vue";
|
|||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: "ChangelogComponent",
|
name: "ChangelogComponent",
|
||||||
data: () => ({
|
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,
|
lastPage: 1,
|
||||||
}),
|
}),
|
||||||
methods: {
|
methods: {
|
||||||
@@ -40,6 +45,7 @@ export default defineComponent({
|
|||||||
const version = {} as any;
|
const version = {} as any;
|
||||||
version.body = release.body.trim();
|
version.body = release.body.trim();
|
||||||
version.name = release.name;
|
version.name = release.name;
|
||||||
|
version.createdAt = new Date(release.published_at);
|
||||||
if (release.body.length === 0) continue;
|
if (release.body.length === 0) continue;
|
||||||
this.releases.push(version);
|
this.releases.push(version);
|
||||||
}
|
}
|
||||||
@@ -74,8 +80,19 @@ export default defineComponent({
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
h2 {
|
h2 {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: flex-end;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding-inline: 1rem;
|
padding-inline: 1rem;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.date {
|
||||||
|
color: rgba(0,0,0, 0.6);
|
||||||
|
font-size: 1rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
hr {
|
hr {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
<h2>Upgrades</h2>
|
<h2>Upgrades</h2>
|
||||||
<div class="upgrade">
|
<div class="upgrade">
|
||||||
<span>Adventurer capacity (level {{ guild.adventurerCapacity.level }})</span>
|
<span>Adventurer capacity (level {{ guild.adventurerCapacity.level }})</span>
|
||||||
|
<small>Increases the maximum amount of recruited adventurers</small>
|
||||||
<button
|
<button
|
||||||
class="button metal"
|
class="button metal"
|
||||||
v-if="guild.adventurerCapacity.nextLevelCost"
|
v-if="guild.adventurerCapacity.nextLevelCost"
|
||||||
@@ -12,6 +13,43 @@
|
|||||||
Upgrade ({{ formatGold(guild.adventurerCapacity.nextLevelCost) }} gold)
|
Upgrade ({{ formatGold(guild.adventurerCapacity.nextLevelCost) }} gold)
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</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>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -39,7 +77,29 @@ export default defineComponent({
|
|||||||
if (this.guild.gold < this.guild.adventurerCapacity.nextLevelCost) return;
|
if (this.guild.gold < this.guild.adventurerCapacity.nextLevelCost) return;
|
||||||
this.guild.gold -= this.guild.adventurerCapacity.nextLevelCost;
|
this.guild.gold -= this.guild.adventurerCapacity.nextLevelCost;
|
||||||
this.guild.adventurerCapacity.upgrade();
|
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>
|
</script>
|
||||||
@@ -63,12 +123,15 @@ export default defineComponent({
|
|||||||
font-size: 1.25rem;
|
font-size: 1.25rem;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: column;
|
||||||
flex-wrap: wrap;
|
|
||||||
width: min(25rem, 100%);
|
width: min(25rem, 100%);
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.2rem;
|
gap: 0.2rem;
|
||||||
|
small {
|
||||||
|
font-weight: normal;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
+1
-1
@@ -2,7 +2,7 @@ import { createApp } from 'vue'
|
|||||||
import App from './App.vue'
|
import App from './App.vue'
|
||||||
import router from './router'
|
import router from './router'
|
||||||
|
|
||||||
import './assets/main.scss'
|
import '@/assets/main.scss'
|
||||||
|
|
||||||
const app = createApp(App)
|
const app = createApp(App)
|
||||||
|
|
||||||
|
|||||||
+4
-5
@@ -1,5 +1,4 @@
|
|||||||
import {createRouter, createWebHashHistory} from 'vue-router'
|
import {createRouter, createWebHashHistory} from 'vue-router'
|
||||||
import HomeView from '../views/HomeView.vue'
|
|
||||||
|
|
||||||
const router = createRouter({
|
const router = createRouter({
|
||||||
history: createWebHashHistory(import.meta.env.BASE_URL),
|
history: createWebHashHistory(import.meta.env.BASE_URL),
|
||||||
@@ -7,22 +6,22 @@ const router = createRouter({
|
|||||||
{
|
{
|
||||||
path: '/',
|
path: '/',
|
||||||
name: 'guild',
|
name: 'guild',
|
||||||
component: HomeView
|
component: () => import('@/views/HomeView.vue')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/quests',
|
path: '/quests',
|
||||||
name: 'quests',
|
name: 'quests',
|
||||||
component: () => import('../views/QuestView.vue')
|
component: () => import('@/views/QuestView.vue')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/adventurers',
|
path: '/adventurers',
|
||||||
name: 'adventurers',
|
name: 'adventurers',
|
||||||
component: () => import('../views/AdventurerView.vue')
|
component: () => import('@/views/AdventurerView.vue')
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/technical',
|
path: '/technical',
|
||||||
name: 'technical',
|
name: 'technical',
|
||||||
component: () => import('../views/TechnicalView.vue')
|
component: () => import('@/views/TechnicalView.vue')
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -80,36 +80,6 @@ main {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.title {
|
|
||||||
display: flex;
|
|
||||||
flex-direction: column;
|
|
||||||
justify-content: center;
|
|
||||||
align-items: center;
|
|
||||||
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 {
|
.coffer {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"extends": "@vue/tsconfig/tsconfig.node.json",
|
"extends": "@vue/tsconfig/tsconfig.json",
|
||||||
"include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "playwright.config.*"],
|
"include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "playwright.config.*"],
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"composite": true,
|
"composite": true,
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"extends": "@vue/tsconfig/tsconfig.web.json",
|
"extends": "@vue/tsconfig/tsconfig.json",
|
||||||
"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
|
"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"baseUrl": ".",
|
"baseUrl": ".",
|
||||||
|
|||||||
Reference in New Issue
Block a user