Compare commits

..

18 Commits

Author SHA1 Message Date
YouHaveTrouble 6625a5b9de move title styles to global file 2023-06-20 20:06:54 +02:00
YouHaveTrouble cf69b92934 bump version 2023-06-20 19:58:31 +02:00
YouHaveTrouble 005cde4a01 remove debug 2023-06-20 19:57:34 +02:00
YouHaveTrouble 1b94d676e7 minor fixes 2023-06-20 19:56:36 +02:00
YouHaveTrouble 7cda820a99 add metadata 2023-06-20 19:56:28 +02:00
YouHaveTrouble 7281fdab60 dynamically load home view 2023-06-20 19:39:13 +02:00
YouHaveTrouble 3b9441b555 improve loading process 2023-06-20 19:37:27 +02:00
YouHaveTrouble c2abfd6dfd add loading screen to hide loading assets and not yet loaded gamestate 2023-06-20 19:18:50 +02:00
YouHaveTrouble f05c393600 new favicon 2023-06-20 19:18:09 +02:00
YouHaveTrouble 23b6f4b4f8 update packages and fix breaking changes 2023-06-20 18:12:20 +02:00
YouHaveTrouble d5195aa157 bump version 2023-05-12 21:52:06 +02:00
YouHaveTrouble 15072fe2c8 fix up ts errors 2023-05-12 21:52:00 +02:00
YouHaveTrouble ba4a6cb2a2 add quest auto-finish upgrade 2023-05-12 21:47:23 +02:00
YouHaveTrouble 4847d22f7e cancel update and save tasks on main component unload 2023-05-12 19:58:47 +02:00
YouHaveTrouble 2c053cc3eb increased cost of adventurer capacity upgrade 2023-05-12 19:13:48 +02:00
YouHaveTrouble c55e0c8bb6 added quest gold modifier upgrade 2023-05-12 18:41:40 +02:00
YouHaveTrouble 29aafedcfa fix max guild level being displayed on level 7 when upgraded to it 2023-05-12 18:25:45 +02:00
YouHaveTrouble 8070c855a0 drastically reduce price and scaling of exp modifier upgrade 2023-05-12 18:24:59 +02:00
20 changed files with 869 additions and 652 deletions
+20 -8
View File
@@ -1,18 +1,30 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Guild Master - Adventurer's guild management game</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=EB+Garamond&display=swap" rel="stylesheet">
<meta charset="UTF-8">
<link rel="icon" href="/favicon.ico">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Guild Master - Adventurer's guild management game</title>
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<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>
<body>
<div id="app"></div>
<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>
<script type="module" src="/src/main.ts"></script>
</body>
+537 -571
View File
File diff suppressed because it is too large Load Diff
+12 -12
View File
@@ -1,6 +1,6 @@
{
"name": "adventurers-guild",
"version": "0.6.0",
"version": "0.8.0",
"private": true,
"scripts": {
"dev": "vite",
@@ -11,19 +11,19 @@
},
"dependencies": {
"@vueuse/components": "^9.13.0",
"sass": "^1.59.3",
"vue": "^3.2.45",
"vue-router": "^4.1.6"
"sass": "^1.63.4",
"vue": "^3.3.4",
"vue-router": "^4.2.2"
},
"devDependencies": {
"@types/node": "^18.11.12",
"@vitejs/plugin-vue": "^4.0.0",
"@vue/tsconfig": "^0.1.3",
"eslint": "^8.36.0",
"eslint-plugin-vue": "^9.9.0",
"@types/node": "^18.16.18",
"@vitejs/plugin-vue": "^4.2.3",
"@vue/tsconfig": "^0.4.0",
"eslint": "^8.43.0",
"eslint-plugin-vue": "^9.15.0",
"npm-run-all": "^4.1.5",
"typescript": "~4.7.4",
"vite": "^4.0.0",
"vue-tsc": "^1.0.12"
"typescript": "~5.1.3",
"vite": "4.3.9",
"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

+125 -16
View File
@@ -1,7 +1,23 @@
<script setup lang="ts">
import {RouterLink, RouterView} from 'vue-router'</script>
import {RouterLink, RouterView} from 'vue-router'
import {version} from "../package.json"
</script>
<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>
<nav>
<RouterLink :to="{name: 'guild'}">Guild</RouterLink>
@@ -39,11 +55,16 @@ import type {GuildUpgrade} from "@/classes/GuildUpgrade";
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: () => ({
loading: true as boolean,
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,
@@ -78,7 +99,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();
@@ -154,6 +181,12 @@ export default defineComponent({
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);
@@ -163,13 +196,13 @@ export default defineComponent({
const data = saveData.adventurers[id];
try {
const adventurer = new Adventurer(
data.id,
data.name,
data.portrait,
data.attackExponent ?? 1.1,
data.level ?? 1,
data.exp ?? 0,
data.prestige ?? 0,
data.id,
data.name,
data.portrait,
data.attackExponent ?? 1.1,
data.level ?? 1,
data.exp ?? 0,
data.prestige ?? 0,
);
adventurer.busy = data.busy;
adventurers[data.id] = adventurer;
@@ -215,13 +248,24 @@ export default defineComponent({
}
},
async mounted() {
this.quests = await loadAvailableQuests();
this.adventurersDatabase = await loadAdventurersForHire();
this.loadGame();
console.debug("Loading game data")
const promises = await Promise.all([
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);
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({
adventurers: this.adventurers,
guild: this.guild,
@@ -230,9 +274,10 @@ export default defineComponent({
lastRecruitAction: this.lastRecruitHandled,
adventurerForHireId: this.adventurerForHire?.id ?? null,
}));
}, 10 * 1000)
}, 10 * 1000));
setInterval(() => {
this.gameTickTask = Number(setInterval(() => {
this.updateMissives();
const now = Number(new Date());
@@ -320,8 +365,12 @@ export default defineComponent({
}
}
}, 250);
}, 250));
},
beforeUnmount() {
if (this.gameSaveTask) clearInterval(this.gameSaveTask);
if (this.gameTickTask) clearInterval(this.gameTickTask);
}
})
</script>
@@ -370,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>
+30
View File
@@ -82,3 +82,33 @@ body {
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;
}
}
+9 -2
View File
@@ -2,7 +2,10 @@ import type {GuildUpgrade} from "@/classes/GuildUpgrade";
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;
@@ -11,6 +14,8 @@ export class Guild {
upgradeCost: number|null = null;
adventurerCapacity: AdventurerCapacityUpgrade;
expModifier: QuestExpUpgrade;
goldModifier: QuestGoldUpgrade;
autoFinishQuestsUpgrade: AutoFinishQuestsUpgrade;
constructor(level: number, gold: number, upgrades: {[index:string]: GuildUpgrade} = {}) {
this.gold = gold;
@@ -21,6 +26,8 @@ export class Guild {
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();
}
@@ -30,7 +37,7 @@ 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 {
@@ -46,7 +53,7 @@ export class Guild {
}
isMaxLevel(): boolean {
return this.level >= 8;
return this.level >= MAX_LEVEL;
}
}
+7
View File
@@ -0,0 +1,7 @@
export default interface MaxLevellable {
maxLevel: number;
isMaxLevel(): boolean;
}
+2 -1
View File
@@ -11,7 +11,8 @@ const damageFormatter = new Intl.NumberFormat('en-US', {
notation: "compact",
});
export function formatGold(number: number): string {
export function formatGold(number: number | null): string {
if (number === null) return "";
return goldFormatter.format(number);
}
@@ -14,8 +14,8 @@ export default 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];
}
}
}
+2 -2
View File
@@ -14,8 +14,8 @@ export default class QuestExpUpgrade extends GuildUpgrade {
}
getCostForLevel(level: number): number {
const scalingFactor = Math.pow(1.15, level - 1);
return Math.floor(4000000 * scalingFactor * Math.pow(level, 1.1));
const scalingFactor = Math.pow(1.05, level - 1);
return Math.floor(2500000 * scalingFactor * Math.pow(level, 1.01));
}
getModifier(): number {
@@ -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);
}
}
+40
View File
@@ -13,6 +13,19 @@
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>
@@ -25,6 +38,18 @@
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>
</template>
@@ -53,6 +78,14 @@ export default defineComponent({
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;
@@ -60,6 +93,13 @@ export default defineComponent({
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>
+1 -1
View File
@@ -2,7 +2,7 @@ import { createApp } from 'vue'
import App from './App.vue'
import router from './router'
import './assets/main.scss'
import '@/assets/main.scss'
const app = createApp(App)
+4 -5
View File
@@ -1,5 +1,4 @@
import {createRouter, createWebHashHistory} from 'vue-router'
import HomeView from '../views/HomeView.vue'
const router = createRouter({
history: createWebHashHistory(import.meta.env.BASE_URL),
@@ -7,22 +6,22 @@ const router = createRouter({
{
path: '/',
name: 'guild',
component: HomeView
component: () => import('@/views/HomeView.vue')
},
{
path: '/quests',
name: 'quests',
component: () => import('../views/QuestView.vue')
component: () => import('@/views/QuestView.vue')
},
{
path: '/adventurers',
name: 'adventurers',
component: () => import('../views/AdventurerView.vue')
component: () => import('@/views/AdventurerView.vue')
},
{
path: '/technical',
name: 'technical',
component: () => import('../views/TechnicalView.vue')
component: () => import('@/views/TechnicalView.vue')
}
]
})
-30
View File
@@ -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 {
text-align: center;
+1 -1
View File
@@ -1,5 +1,5 @@
{
"extends": "@vue/tsconfig/tsconfig.node.json",
"extends": "@vue/tsconfig/tsconfig.json",
"include": ["vite.config.*", "vitest.config.*", "cypress.config.*", "playwright.config.*"],
"compilerOptions": {
"composite": true,
+1 -1
View File
@@ -1,5 +1,5 @@
{
"extends": "@vue/tsconfig/tsconfig.web.json",
"extends": "@vue/tsconfig/tsconfig.json",
"include": ["env.d.ts", "src/**/*", "src/**/*.vue"],
"compilerOptions": {
"baseUrl": ".",