Compare commits

..

72 Commits

Author SHA1 Message Date
YouHaveTrouble 2a38461a47 move icon svgs to components, so they can load along everything else 2023-09-16 15:58:54 +02:00
YouHaveTrouble 52c340be26 bump version 2023-09-16 15:39:23 +02:00
YouHaveTrouble f2c5304643 don't load paths dynamically to allow offline play 2023-09-16 15:26:36 +02:00
YouHaveTrouble b6aefde9da add / to the path 2023-09-16 14:29:29 +02:00
YouHaveTrouble f31a0013a9 Merge pull request #11 from xYundy/fix-quest-button-on-ios
Fix select button color for iOS Safari
2023-09-15 12:04:09 +02:00
Wojciech 'xYundy' Zięciak e4af877358 Add missing empty line at EOF 2023-09-15 12:03:48 +02:00
YouHaveTrouble d162771749 Merge pull request #10 from xYundy/public-testing
Add script which allow to test app on external devices
2023-09-15 12:03:15 +02:00
YouHaveTrouble f53644119a Merge pull request #9 from xYundy/pwa-mobile-icon
Add PWA icons and manifest
2023-09-15 12:02:21 +02:00
Wojciech 'xYundy' Zięciak 34999a27b7 add PWA icons and manifest 2023-09-15 11:59:11 +02:00
Wojciech 'xYundy' Zięciak 6e23f9a7b4 Fix select button color for iOS Safar 2023-09-15 11:55:27 +02:00
Wojciech 'xYundy' Zięciak d852f6fd96 Add script which allow to test app on ext. devices 2023-09-15 11:47:43 +02:00
YouHaveTrouble 0e0c133f6f swap meta image 2023-09-07 19:06:29 +02:00
YouHaveTrouble 8a6b581981 bump version 2023-09-07 18:39:53 +02:00
YouHaveTrouble 5497717605 have enough portraits for now 2023-09-07 18:38:11 +02:00
YouHaveTrouble 85fa53b16e add gradient background for adventurer portraits 2023-09-07 18:23:36 +02:00
YouHaveTrouble 9feab73fd2 small tool to automatically merge data and portraits into one file 2023-09-07 18:23:17 +02:00
YouHaveTrouble ed7c9e66ec add new adventurers and their assets 2023-09-07 18:22:22 +02:00
YouHaveTrouble 82350c6c42 new loading screen 2023-08-28 19:33:44 +02:00
YouHaveTrouble 0b7489b21f add new assets 2023-08-28 19:33:29 +02:00
YouHaveTrouble 21fb2c5f72 update depends 2023-08-20 17:20:29 +02:00
YouHaveTrouble 20e7af41ae bump version 2023-07-26 00:24:44 +02:00
YouHaveTrouble 17a091bec8 stop changelog from bumping the page when loading 2023-07-26 00:18:57 +02:00
YouHaveTrouble 13cb2c5a55 don't save possibly heavy adventurer portraits and load them from global data 2023-07-26 00:01:24 +02:00
YouHaveTrouble 28fe055f32 cleanup 2023-07-23 22:38:59 +02:00
YouHaveTrouble b35de64cea move most assets to components and use base64 versions of them 2023-07-23 22:24:43 +02:00
YouHaveTrouble 1e7eb5c750 move adventurer portraits to the data to make sure they load along with everything else 2023-07-23 17:27:20 +02:00
YouHaveTrouble 1b1695bf1f bump version 2023-07-03 23:52:34 +02:00
YouHaveTrouble f524ce5e2e make a and s rank quests appear more often 2023-07-03 23:51:25 +02:00
YouHaveTrouble d14ef20fb1 rebalance adventurer capacity cost 2023-07-03 23:25:27 +02:00
YouHaveTrouble 83070b632b update depends 2023-07-03 23:25:16 +02:00
YouHaveTrouble 2723801c9c update depends 2023-07-03 22:51:40 +02:00
YouHaveTrouble 5d1ce0a262 make gold update actually work 2023-07-03 22:38:50 +02:00
YouHaveTrouble 74ebac9862 rebalance upgrades 2023-07-03 22:38:38 +02:00
YouHaveTrouble 2a5b162605 bump version 2023-06-26 19:44:57 +02:00
YouHaveTrouble d6e897c289 save data export and import 2023-06-26 19:44:32 +02:00
YouHaveTrouble a2b8b40464 download news once per hour 2023-06-26 18:02:38 +02:00
YouHaveTrouble bdaa3bc029 news 2023-06-26 17:43:12 +02:00
YouHaveTrouble 816c1fb0e7 make adventurer choice closeable by clicking on the slot again 2023-06-26 17:12:46 +02:00
YouHaveTrouble acdd8f6964 prevent phones from turning off display when the game's running 2023-06-26 16:03:39 +02:00
YouHaveTrouble 5fa8f2cf15 tooltip on technical menu 2023-06-26 15:54:14 +02:00
YouHaveTrouble 5a818fb142 prototype tooltips 2023-06-22 14:18:08 +02:00
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
YouHaveTrouble aaf0eb6546 bump version 2023-04-23 15:24:59 +02:00
YouHaveTrouble c14a135c94 display release date of an update next to its title 2023-04-23 15:22:59 +02:00
YouHaveTrouble 40d5a876b8 add quest exp modifier upgrade 2023-04-23 15:22:40 +02:00
YouHaveTrouble 3b47ed1bed bump version 2023-04-09 23:58:14 +02:00
YouHaveTrouble fdc5d370de Merge pull request #8 from YouHaveTrouble/adventurer-details
Adventurer details
2023-04-09 23:57:37 +02:00
YouHaveTrouble 19c4a3f7ac adjust adventurer exp scaling from linear to exponential 2023-04-09 23:55:34 +02:00
YouHaveTrouble 2dad283de9 fix already recruited adventurers showing up again 2023-04-09 16:22:42 +02:00
YouHaveTrouble 61ff80b69f style buttons and fix up number formatting 2023-04-09 15:35:56 +02:00
YouHaveTrouble a185bc2153 prestige feature 2023-04-09 13:59:19 +02:00
YouHaveTrouble b213cae62b fix the game not properly saving/loading adventurers for hire 2023-04-07 22:23:16 +02:00
YouHaveTrouble 19d3dd5515 exit button for adventurer details popup 2023-04-07 22:22:26 +02:00
YouHaveTrouble 4f2d742284 fix lack of gold formatting on guild upgrade button on game load 2023-04-07 20:45:08 +02:00
YouHaveTrouble a0b7db1bf6 popup window with adventurer details 2023-04-05 22:56:52 +02:00
105 changed files with 2446 additions and 1213 deletions
+21
View File
@@ -0,0 +1,21 @@
/**
* This file is used to import the character portraits to base64 from raw assets
*/
const fs = require('fs');
const characterData = require('./rawAssets/data/adventurers.json');
for (const character of characterData) {
try {
const base64 = base64_encode(`./rawAssets/img/portraits/${character.id}.png`);
character.portrait = "data:image/png;base64,"+base64;
} catch (e) {
console.error(`Error: Didn't find portrait for ${character.id}`);
}
}
fs.writeFileSync('./public/data/adventurers.json', JSON.stringify(characterData, null, 2), "utf-8");
function base64_encode(file) {
return fs.readFileSync(file, "base64");
}
+20 -8
View File
@@ -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">
<link rel="manifest" href="/manifest.json" />
<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/app-icons/icon.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/app-icons/icon.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>
+1
View File
@@ -0,0 +1 @@
Looking for artists for assets for this game! Need backgrounds and icons! Join discord for more info!
+791 -822
View File
File diff suppressed because it is too large Load Diff
+15 -13
View File
@@ -1,29 +1,31 @@
{ {
"name": "adventurers-guild", "name": "adventurers-guild",
"version": "0.4.0", "version": "0.13.0",
"private": true, "private": true,
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
"dev-public": "vite --host",
"build": "run-p type-check build-only && cp -r CNAME dist/CNAME", "build": "run-p type-check build-only && cp -r CNAME dist/CNAME",
"preview": "vite preview", "preview": "vite preview",
"build-only": "vite build", "build-only": "vite build",
"type-check": "vue-tsc --noEmit" "type-check": "vue-tsc --noEmit",
"gen-character-data": "node characterDataGenerator.js"
}, },
"dependencies": { "dependencies": {
"@vueuse/components": "^9.13.0", "@vueuse/components": "^9.13.0",
"sass": "^1.59.3", "sass": "^1.66.1",
"vue": "^3.2.45", "vue": "^3.3.4",
"vue-router": "^4.1.6" "vue-router": "^4.2.4"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^18.11.12", "@types/node": "^18.17.6",
"@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue": "^4.3.1",
"@vue/tsconfig": "^0.1.3", "@vue/tsconfig": "^0.4.0",
"eslint": "^8.36.0", "eslint": "^8.47.0",
"eslint-plugin-vue": "^9.9.0", "eslint-plugin-vue": "^9.17.0",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"typescript": "~4.7.4", "typescript": "~5.1.6",
"vite": "^4.0.0", "vite": "4.4.9",
"vue-tsc": "^1.0.12" "vue-tsc": "^1.8.3"
} }
} }
File diff suppressed because one or more lines are too long
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 230 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 304 KiB

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 KiB

+59
View File
@@ -0,0 +1,59 @@
{
"name": "Guild Master - Adventurer's guild management game",
"short_name": "Guild Master",
"theme_color": "#3C2114",
"background_color": "#d9c8b3",
"display": "standalone",
"scope": "./",
"start_url": "./",
"icons": [
{
"src": "img/app-icons/icon-72x72.png",
"sizes": "72x72",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "img/app-icons/icon-96x96.png",
"sizes": "96x96",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "img/app-icons/icon-128x128.png",
"sizes": "128x128",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "img/app-icons/icon-144x144.png",
"sizes": "144x144",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "img/app-icons/icon-152x152.png",
"sizes": "152x152",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "img/app-icons/icon-192x192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "img/app-icons/icon-384x384.png",
"sizes": "384x384",
"type": "image/png",
"purpose": "maskable any"
},
{
"src": "img/app-icons/icon.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable any"
}
]
}
+102
View File
@@ -0,0 +1,102 @@
[
{
"id": "aldek",
"name": "Aldek",
"attackExponent": 1.1
},
{
"id": "aria",
"name": "Aria",
"attackExponent": 1.1
},
{
"id": "burnett",
"name": "Burnett",
"attackExponent": 1.1
},
{
"id": "charlotte",
"name": "Charlotte",
"attackExponent": 1.1
},
{
"id": "ella",
"name": "Ella",
"attackExponent": 1.1
},
{
"id": "elyza",
"name": "Elyza",
"attackExponent": 1.1
},
{
"id": "emille",
"name": "Emille",
"attackExponent": 1.1
},
{
"id": "garret",
"name": "Garret",
"attackExponent": 1.1
},
{
"id": "gryza",
"name": "Gryza",
"attackExponent": 1.1
},
{
"id": "lestat",
"name": "Lestat",
"attackExponent": 1.1
},
{
"id": "lydia",
"name": "Lydia",
"attackExponent": 1.1
},
{
"id": "noor",
"name": "Noor",
"attackExponent": 1.1
},
{
"id": "noron",
"name": "Noron",
"attackExponent": 1.1
},
{
"id": "oola",
"name": "Oola",
"attackExponent": 1.1
},
{
"id": "owen",
"name": "Owen",
"attackExponent": 1.1
},
{
"id": "ryslette",
"name": "Ryslette",
"attackExponent": 1.1
},
{
"id": "sally",
"name": "Sally",
"attackExponent": 1.1
},
{
"id": "tovu",
"name": "Tovu",
"attackExponent": 1.1
},
{
"id": "wrydio",
"name": "Wrydio",
"attackExponent": 1.1
},
{
"id": "xarya",
"name": "Xarya",
"attackExponent": 1.1
}
]

Before

Width:  |  Height:  |  Size: 4.9 MiB

After

Width:  |  Height:  |  Size: 4.9 MiB

Before

Width:  |  Height:  |  Size: 5.6 MiB

After

Width:  |  Height:  |  Size: 5.6 MiB

Before

Width:  |  Height:  |  Size: 5.3 MiB

After

Width:  |  Height:  |  Size: 5.3 MiB

Before

Width:  |  Height:  |  Size: 4.9 MiB

After

Width:  |  Height:  |  Size: 4.9 MiB

Before

Width:  |  Height:  |  Size: 406 KiB

After

Width:  |  Height:  |  Size: 406 KiB

Before

Width:  |  Height:  |  Size: 470 KiB

After

Width:  |  Height:  |  Size: 470 KiB

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Before

Width:  |  Height:  |  Size: 99 KiB

After

Width:  |  Height:  |  Size: 99 KiB

+40
View File
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg fill="#000000" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
width="800px" height="800px" viewBox="0 0 569.613 569.614"
xml:space="preserve">
<g>
<g>
<path d="M371.49,563.638l113.052-65.854c5.26-3.063,9.088-8.094,10.64-13.975c1.555-5.888,0.701-12.148-2.359-17.405
l-30.769-52.807c4.789-6.524,9.083-13.115,12.972-19.918c3.893-6.799,7.405-13.84,10.606-21.275l61.114-0.221
c6.086-0.021,11.915-2.464,16.202-6.781c4.287-4.32,6.687-10.165,6.665-16.255l-0.48-130.833
c-0.024-6.089-2.464-11.919-6.784-16.206c-4.299-4.269-10.113-6.662-16.166-6.662c-0.03,0-0.062,0-0.089,0l-61.182,0.242
c-6.444-14.462-14.428-28.14-23.871-40.913l30.417-53.143c6.294-11.001,2.481-25.025-8.52-31.316L369.403,5.335
c-5.281-3.023-11.545-3.822-17.424-2.231c-5.872,1.598-10.872,5.462-13.892,10.747L307.665,67
c-15.766-1.662-31.653-1.613-47.363,0.144l-30.796-52.892c-3.063-5.263-8.094-9.091-13.975-10.646
c-5.884-1.551-12.148-0.704-17.408,2.359L85.068,71.823c-10.949,6.38-14.657,20.429-8.28,31.38l30.765,52.831
c-4.761,6.484-9.048,13.076-12.953,19.899c-3.904,6.824-7.417,13.855-10.6,21.255l-61.139,0.235
C10.187,197.472-0.046,207.785,0,220.456L0.48,351.29c0.024,6.086,2.463,11.919,6.784,16.206
c4.299,4.269,10.11,6.661,16.166,6.661c0.028,0,0.058,0,0.086,0l61.203-0.229c6.432,14.452,14.413,28.131,23.868,40.915
l-30.413,53.141c-3.023,5.284-3.825,11.548-2.231,17.423c1.597,5.872,5.462,10.872,10.747,13.896l113.535,64.977
c3.596,2.056,7.513,3.032,11.38,3.032c7.962,0,15.701-4.146,19.942-11.552l30.417-53.149c15.799,1.671,31.684,1.619,47.348-0.144
l30.799,52.89c3.066,5.26,8.094,9.088,13.978,10.643C359.967,567.552,366.23,566.705,371.49,563.638z M341.129,465.911
c-4.902-8.418-14.599-12.815-24.137-10.994c-20.588,3.935-42.174,3.999-63.128,0.202c-9.572-1.735-19.184,2.741-24.015,11.181
l-26.748,46.745l-73.694-42.18l26.75-46.741c4.832-8.439,3.819-19.006-2.521-26.371c-13.978-16.239-24.685-34.594-31.818-54.554
c-3.265-9.131-11.918-15.227-21.61-15.227c-0.027,0-0.058,0-0.085,0l-53.825,0.199l-0.315-84.937l53.819-0.205
c9.722-0.04,18.366-6.197,21.576-15.374c3.69-10.557,7.962-20.019,13.06-28.917c5.101-8.914,11.089-17.387,18.311-25.897
c6.294-7.417,7.225-17.993,2.334-26.396l-27.081-46.509l73.385-42.754l27.078,46.497c4.893,8.4,14.544,12.821,24.095,11.004
c20.716-3.911,42.317-3.978,63.189-0.19c9.557,1.753,19.189-2.742,24.019-11.178l26.753-46.744l73.697,42.179l-26.753,46.742
c-4.826,8.437-3.816,19,2.521,26.368c13.956,16.221,24.669,34.587,31.842,54.59c3.271,9.119,11.919,15.202,21.604,15.202
c0.031,0,0.062,0,0.092,0l53.789-0.214l0.315,84.927l-53.783,0.192c-9.712,0.037-18.351,6.182-21.569,15.347
c-3.746,10.654-8.023,20.131-13.082,28.975c-5.064,8.847-11.067,17.338-18.356,25.958c-6.271,7.418-7.194,17.978-2.305,26.368
l27.078,46.472l-73.391,42.749L341.129,465.911z"/>
<path d="M392.531,346.458c16.472-28.773,20.746-62.24,12.047-94.232s-29.342-58.685-58.115-75.151
c-18.761-10.74-40.05-16.417-61.562-16.417c-44.446,0-85.762,23.944-107.822,62.485c-33.994,59.404-13.327,135.39,46.071,169.386
c18.764,10.737,40.052,16.411,61.564,16.411C329.158,408.943,370.475,385.001,392.531,346.458z M352.696,323.658
c-13.902,24.293-39.955,39.385-67.985,39.385c-13.528,0-26.934-3.58-38.764-10.349c-37.433-21.426-50.456-69.312-29.033-106.751
c13.905-24.291,39.958-39.385,67.987-39.385c13.528,0,26.932,3.58,38.762,10.355c18.136,10.379,31.142,27.197,36.628,47.359
C365.771,284.435,363.075,305.524,352.696,323.658z"/>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.6 KiB

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

Before

Width:  |  Height:  |  Size: 660 B

After

Width:  |  Height:  |  Size: 660 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 731 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 MiB

Before

Width:  |  Height:  |  Size: 1018 KiB

After

Width:  |  Height:  |  Size: 1018 KiB

Before

Width:  |  Height:  |  Size: 947 KiB

After

Width:  |  Height:  |  Size: 947 KiB

Before

Width:  |  Height:  |  Size: 68 KiB

After

Width:  |  Height:  |  Size: 68 KiB

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Before

Width:  |  Height:  |  Size: 474 KiB

After

Width:  |  Height:  |  Size: 474 KiB

Before

Width:  |  Height:  |  Size: 130 KiB

After

Width:  |  Height:  |  Size: 130 KiB

Before

Width:  |  Height:  |  Size: 200 KiB

After

Width:  |  Height:  |  Size: 200 KiB

+294 -115
View File
File diff suppressed because one or more lines are too long
+105 -96
View File
@@ -1,30 +1,26 @@
import type {Guild} from "@/classes/Guild"; import {Guild} from "@/classes/Guild";
import {Adventurer} from "@/classes/Adventurer"; import {Adventurer} from "@/classes/Adventurer";
import {Quest} from "@/classes/Quest"; import {Quest} from "@/classes/Quest";
import {getFromString, QuestRank} from "@/classes/QuestRank"; import {getFromString, QuestRank} from "@/classes/QuestRank";
export class GameData { export class GameData {
guild: Guild; guild: Guild;
adventurers: { [key: string]: Adventurer }; adventurers: { [key: string]: Adventurer };
missives: { [key: string]: { [key: string]: Quest } }; missives: { [key: string]: { [key: string]: Quest } };
lastQuestGot: { [key: string]: null | number }; lastQuestGot: { [key: string]: null | number };
lastRecruitAction: null | number; lastRecruitAction: null | number;
currentlyForHireId: string|null; adventurerForHireId: string | null;
constructor( constructor(
guild: Guild, adventurers: { [key: string]: Adventurer }, data: any,
missives: { [key: string]: { [key: string]: Quest } }, ) {
lastQuestGot: { [key: string]: null | number }, this.guild = data.guild ?? new Guild(1, 0);
lastRecruitAction: null | number, this.adventurers = data.adventurers ?? {} as { [key: string]: Adventurer };
currentlyForHireId: string|null = null this.missives = data.missives ?? {} as { [key: string]: { [key: string]: Quest } };
) { this.lastQuestGot = data.lastQuestGot ?? {} as { [key: string]: null | number };
this.guild = guild; this.lastRecruitAction = data.lastRecruitAction ?? null;
this.adventurers = adventurers; this.adventurerForHireId = data.adventurerForHireId ?? null;
this.missives = missives; }
this.lastQuestGot = lastQuestGot;
this.lastRecruitAction = lastRecruitAction;
this.currentlyForHireId = currentlyForHireId;
}
} }
@@ -32,91 +28,104 @@ export class GameData {
* Save the game to local storage * Save the game to local storage
*/ */
export function saveGame( export function saveGame(
data: GameData data: GameData
): void { ): void {
console.debug("Saving game..."); console.debug("Saving game...");
window.localStorage.setItem("savedGame", JSON.stringify({
guild: data.guild, const adventurers = {} as { [key: string]: any };
adventurers: data.adventurers, for (const adventurerId in data.adventurers) {
missives: data.missives, const adventurer: {[key: string]: any} = JSON.parse(JSON.stringify(data.adventurers[adventurerId]));
lastQuestGot: data.lastQuestGot, delete adventurer.portrait;
lastRecruitAction: data.lastRecruitAction, adventurers[adventurerId] = adventurer;
adventurerForHireId: data.currentlyForHireId, }
}));
window.localStorage.setItem("savedGame", JSON.stringify({
guild: data.guild,
adventurers: adventurers,
missives: data.missives,
lastQuestGot: data.lastQuestGot,
lastRecruitAction: data.lastRecruitAction,
adventurerForHireId: data.adventurerForHireId,
}));
} }
export function loadGame(): GameData | null { export function loadGame(): GameData | null {
const savedGame = window.localStorage.getItem("savedGame"); const savedGame = window.localStorage.getItem("savedGame");
if (!savedGame) return null; if (!savedGame) return null;
console.debug("Loading game..."); const parsedGame = JSON.parse(savedGame);
const parsedGame = JSON.parse(savedGame); console.debug("Loading game...");
return new GameData( return new GameData(parsedGame);
parsedGame.guild,
parsedGame.adventurers,
parsedGame.missives,
parsedGame.lastQuestGot,
parsedGame.lastRecruitAction
);
} }
export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: string]: Quest } }> { export async function loadAvailableQuests(): Promise<{ [key: string]: { [key: string]: Quest } }> {
const quests = { const quests = {
S: {} as { [key: string]: Quest }, S: {} as { [key: string]: Quest },
A: {} as { [key: string]: Quest }, A: {} as { [key: string]: Quest },
B: {} as { [key: string]: Quest }, B: {} as { [key: string]: Quest },
C: {} as { [key: string]: Quest }, C: {} as { [key: string]: Quest },
D: {} as { [key: string]: Quest }, D: {} as { [key: string]: Quest },
E: {} as { [key: string]: Quest }, E: {} as { [key: string]: Quest },
F: {} as { [key: string]: Quest }, F: {} as { [key: string]: Quest },
} as { [key: string]: { [key: string]: Quest } }; } as { [key: string]: { [key: string]: Quest } };
for (const rank in quests) { for (const rank in quests) {
const response = await fetch(`data/quests/Rank${rank}.json`); const response = await fetch(`data/quests/Rank${rank}.json`);
if (response.status !== 200) {
console.error("Failed to load quests");
alert("Failed to load quests. Please try refreshing the page.");
return quests;
}
const questData = await response.json();
let id = 0;
for (const quest of questData) {
id++;
quests[rank.toString()][id] = new Quest(
id.toString(),
getFromString(rank as QuestRank),
quest.title,
quest.text,
1,
0,
0
);
}
}
return quests;
}
export async function loadAdventurersForHire(currentAdventurerIds: Array<string> = []): Promise<Array<Adventurer>> {
const response = await fetch("data/adventurers.json");
if (response.status !== 200) { if (response.status !== 200) {
console.error("Failed to load adventurers"); console.error("Failed to load quests");
alert("Failed to load adventurers. Please try refreshing the page."); alert("Failed to load quests. Please try refreshing the page.");
return []; return quests;
} }
const adventurerData = await response.json(); const questData = await response.json();
const adventurers = [] as Array<Adventurer>; let id = 0;
for (const adventurer of adventurerData) { for (const quest of questData) {
if (currentAdventurerIds.includes(adventurer.id)) continue; id++;
adventurers.push(new Adventurer( quests[rank.toString()][id] = new Quest(
adventurer.id, id.toString(),
adventurer.name, getFromString(rank as QuestRank),
adventurer.portrait, quest.title,
adventurer.attackExponent, quest.text,
adventurer.level, 1,
adventurer.exp, 0,
)); 0
);
} }
}
return adventurers; return quests;
}
export async function loadAdventurersForHire(): Promise<Array<Adventurer>> {
const response = await fetch("data/adventurers.json");
if (response.status !== 200) {
console.error("Failed to load adventurers");
alert("Failed to load adventurers. Please try refreshing the page.");
return [];
}
const adventurerData = await response.json();
const adventurers: Array<Adventurer> = [];
for (const adventurer of adventurerData) {
adventurers.push(new Adventurer(
adventurer.id,
adventurer.name,
adventurer.portrait,
adventurer.attackExponent,
adventurer.level,
adventurer.exp,
));
}
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;
} }
+114 -10
View File
File diff suppressed because one or more lines are too long
+2 -1
View File
@@ -44,12 +44,13 @@ export class Adventurer {
} }
canPrestigeUp(): boolean { canPrestigeUp(): boolean {
if (this.busy) return false;
if (this.level < getMaxLevelForPrestige(this.prestige)) return false; if (this.level < getMaxLevelForPrestige(this.prestige)) return false;
return this.prestige < 5 return this.prestige < 5
} }
getNextLevelExpRequirement(): number { 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)));
} }
/** /**
+19 -6
View File
@@ -1,6 +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;
@@ -8,14 +13,21 @@ 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;
this.level = level; 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.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();
} }
@@ -25,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 {
@@ -41,7 +53,7 @@ export class Guild {
} }
isMaxLevel(): boolean { isMaxLevel(): boolean {
return this.level >= 7; return this.level >= MAX_LEVEL;
} }
} }
@@ -51,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}
+7
View File
@@ -0,0 +1,7 @@
export default interface MaxLevellable {
maxLevel: number;
isMaxLevel(): boolean;
}
+14 -3
View File
@@ -1,10 +1,21 @@
const formatter = new Intl.NumberFormat('en-US', { const goldFormatter = new Intl.NumberFormat('en-US', {
maximumFractionDigits: 3, maximumFractionDigits: 3,
// @ts-ignore - typescript doesn't know about this option for some godforsaken reason // @ts-ignore - typescript doesn't know about this option for some godforsaken reason
notation: "compact", notation: "compact",
useGrouping: true, useGrouping: true,
}); });
export default function formatGold(number: number): string { const damageFormatter = new Intl.NumberFormat('en-US', {
return formatter.format(number); 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);
} }
+5 -3
View File
@@ -33,8 +33,10 @@ 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
* @param goldModifier - multiplification modifier for the gold reward
*/ */
export function getQuestWithRewards(quest: Quest) { export function getQuestWithRewards(quest: Quest, expModifier: number = 1, goldModifier: number = 1) {
let maxProgress = 1; let maxProgress = 1;
@@ -69,8 +71,8 @@ export function getQuestWithRewards(quest: Quest) {
break; break;
} }
let goldReward = Math.floor(maxProgress/6); let goldReward = Math.floor(maxProgress/6 * goldModifier);
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); if (level === 1) return 1500;
return Math.floor(1500 * scalingFactor * Math.pow(level, 1.25)); return Math.floor(1500 * (level * 4));
} }
/** /**
@@ -0,0 +1,70 @@
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 {
switch (level) {
case 1:
return 25000;
case 2:
return 50000;
case 3:
return 75000;
case 4:
return 150000;
case 5:
return 275000;
case 6:
return 750000;
case 7:
return 1500000;
case 8:
return 2500000;
default:
return 0;
}
}
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 {
if (level === 1) return 1000000;
return Math.floor(1000000 * (level * 1.05));
}
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 {
if (level === 1) return 1000000;
return Math.floor(1000000 * (level * 1.05));
}
getModifier(): number {
return 1 + (this.level * 0.1);
}
}
File diff suppressed because one or more lines are too long
-1
View File
@@ -26,7 +26,6 @@ export default defineComponent({
default() { default() {
return {} as { [key: string]: Adventurer }; return {} as { [key: string]: Adventurer };
}, },
required: true,
}, },
}, },
+5 -3
View File
@@ -65,12 +65,13 @@ export default defineComponent({
default() { default() {
return {} as {[key: string]: Adventurer}; return {} as {[key: string]: Adventurer};
}, },
required: true,
}, },
}, },
methods: { methods: {
closeSelect() { closeSelect() {
this.selection = false; setTimeout(() => {
this.selection = false;
}, 0);
} }
} }
}) })
@@ -130,5 +131,6 @@ export default defineComponent({
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 4.5rem; font-size: 4.5rem;
color: #000;
} }
</style> </style>
+2 -3
View File
@@ -20,9 +20,6 @@ export default defineComponent({
props: { props: {
adventurer: { adventurer: {
type: Object as PropType<Adventurer>, type: Object as PropType<Adventurer>,
default() {
return {} as Adventurer;
},
required: true, required: true,
} }
}, },
@@ -53,6 +50,8 @@ export default defineComponent({
line-height: 1; line-height: 1;
color: rgba(0, 0, 0, 0.75); color: rgba(0, 0, 0, 0.75);
position: relative; position: relative;
background: rgb(2,0,36);
background: radial-gradient(circle, rgba(2,0,36,1) 0%, rgb(69, 69, 84) 57%, rgb(85, 112, 117) 100%);
.level { .level {
position: absolute; position: absolute;
+7 -7
View File
@@ -4,13 +4,13 @@
:class="{done: missive.maxProgress <= missive.progressPoints}" :class="{done: missive.maxProgress <= missive.progressPoints}"
> >
<div class="parchment"> <div class="parchment">
<img src="/img/quests/backgrounds/dirty_paper.png" alt="parchment"> <Parchment/>
</div> </div>
<div class="stain" v-if="stain"> <div class="stain" v-if="stain">
<img src="/img/quests/overlays/water_stain.png" alt="stain"> <WaterStain/>
</div> </div>
<div class="drink-stain" v-if="drinkStain.exists"> <div class="drink-stain" v-if="drinkStain.exists">
<img src="/img/quests/overlays/drink_stain.png" alt="stain"> <DrinkStain/>
</div> </div>
<h2>{{ missive.title }}</h2> <h2>{{ missive.title }}</h2>
<p>{{ missive.text }}</p> <p>{{ missive.text }}</p>
@@ -51,16 +51,16 @@ import type {Quest} from "@/classes/Quest";
import AdventurerComponent from "@/components/AdventurerMiniComponent.vue"; import AdventurerComponent from "@/components/AdventurerMiniComponent.vue";
import type {Adventurer} from "@/classes/Adventurer"; import type {Adventurer} from "@/classes/Adventurer";
import {defineComponent, type PropType} from "vue"; import {defineComponent, type PropType} from "vue";
import DrinkStain from "@/components/misc/DrinkStain.vue";
import WaterStain from "@/components/misc/WaterStain.vue";
import Parchment from "@/components/misc/Parchment.vue";
export default defineComponent({ export default defineComponent({
name: "QuestMissive", name: "QuestMissive",
components: {AdventurerComponent}, components: {Parchment, WaterStain, DrinkStain, AdventurerComponent},
props: { props: {
missive: { missive: {
type: Object as PropType<Quest | any>, type: Object as PropType<Quest | any>,
default() {
return {} as Quest;
},
required: true, required: true,
}, },
adventurers: { adventurers: {
+69 -8
View File
@@ -3,7 +3,9 @@
<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"
v-if="guild.adventurerCapacity.nextLevelCost" v-if="guild.adventurerCapacity.nextLevelCost"
:disabled="guild.gold < guild.adventurerCapacity.nextLevelCost" :disabled="guild.gold < guild.adventurerCapacity.nextLevelCost"
@click="upgradeAdventurerCapacity()" @click="upgradeAdventurerCapacity()"
@@ -11,22 +13,56 @@
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 - 1 }})</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 - 1 }})</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>
<script lang="ts"> <script lang="ts">
import {Guild} from "@/classes/Guild"; import {Guild} from "@/classes/Guild";
import {defineComponent, type PropType} from "vue"; import {defineComponent, type PropType} from "vue";
import formatGold from "../classes/NumberMagic"; import {formatGold} from "@/classes/NumberMagic";
export default defineComponent({ export default defineComponent({
name: "UpgradesList", name: "UpgradesList",
props: { props: {
guild: { guild: {
type: Object as PropType<Guild>, type: Object as PropType<Guild>,
default() {
return new Guild(1, 0) as Guild;
},
required: true, required: true,
} }
}, },
@@ -38,7 +74,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>
@@ -62,12 +120,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: 1rem; gap: 0.2rem;
small {
font-weight: normal;
line-height: 1;
}
} }
} }
</style> </style>
+35
View File
@@ -0,0 +1,35 @@
<script lang="ts">
import {defineComponent} from 'vue'
export default defineComponent({
name: "DiscordLogo",
props: {
width: {
type: String,
default: "2rem",
},
height: {
type: String,
default: "2rem",
},
},
})
</script>
<template>
<svg
:width="width"
:height="height"
role="img"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<title>Discord</title>
<path d="M20.317 4.3698a19.7913 19.7913 0 00-4.8851-1.5152.0741.0741 0 00-.0785.0371c-.211.3753-.4447.8648-.6083 1.2495-1.8447-.2762-3.68-.2762-5.4868 0-.1636-.3933-.4058-.8742-.6177-1.2495a.077.077 0 00-.0785-.037 19.7363 19.7363 0 00-4.8852 1.515.0699.0699 0 00-.0321.0277C.5334 9.0458-.319 13.5799.0992 18.0578a.0824.0824 0 00.0312.0561c2.0528 1.5076 4.0413 2.4228 5.9929 3.0294a.0777.0777 0 00.0842-.0276c.4616-.6304.8731-1.2952 1.226-1.9942a.076.076 0 00-.0416-.1057c-.6528-.2476-1.2743-.5495-1.8722-.8923a.077.077 0 01-.0076-.1277c.1258-.0943.2517-.1923.3718-.2914a.0743.0743 0 01.0776-.0105c3.9278 1.7933 8.18 1.7933 12.0614 0a.0739.0739 0 01.0785.0095c.1202.099.246.1981.3728.2924a.077.077 0 01-.0066.1276 12.2986 12.2986 0 01-1.873.8914.0766.0766 0 00-.0407.1067c.3604.698.7719 1.3628 1.225 1.9932a.076.076 0 00.0842.0286c1.961-.6067 3.9495-1.5219 6.0023-3.0294a.077.077 0 00.0313-.0552c.5004-5.177-.8382-9.6739-3.5485-13.6604a.061.061 0 00-.0312-.0286zM8.02 15.3312c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9555-2.4189 2.157-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.9555 2.4189-2.1569 2.4189zm7.9748 0c-1.1825 0-2.1569-1.0857-2.1569-2.419 0-1.3332.9554-2.4189 2.1569-2.4189 1.2108 0 2.1757 1.0952 2.1568 2.419 0 1.3332-.946 2.4189-2.1568 2.4189Z"/>
</svg>
</template>
<style scoped lang="scss">
svg {
}
</style>
File diff suppressed because one or more lines are too long
+33
View File
@@ -0,0 +1,33 @@
<script lang="ts">
import {defineComponent} from 'vue'
export default defineComponent({
name: "GithubLogo",
props: {
width: {
type: String,
default: "2rem",
},
height: {
type: String,
default: "2rem",
},
},
})
</script>
<template>
<svg
:width="width"
:height="height"
viewBox="0 0 24 24"
xmlns="http://www.w3.org/2000/svg"
>
<rect width="24" height="24" fill="none"/>
<path d="M12,2A10,10,0,0,0,8.84,21.5c.5.08.66-.23.66-.5V19.31C6.73,19.91,6.14,18,6.14,18A2.69,2.69,0,0,0,5,16.5c-.91-.62.07-.6.07-.6a2.1,2.1,0,0,1,1.53,1,2.15,2.15,0,0,0,2.91.83,2.16,2.16,0,0,1,.63-1.34C8,16.17,5.62,15.31,5.62,11.5a3.87,3.87,0,0,1,1-2.71,3.58,3.58,0,0,1,.1-2.64s.84-.27,2.75,1a9.63,9.63,0,0,1,5,0c1.91-1.29,2.75-1,2.75-1a3.58,3.58,0,0,1,.1,2.64,3.87,3.87,0,0,1,1,2.71c0,3.82-2.34,4.66-4.57,4.91a2.39,2.39,0,0,1,.69,1.85V21c0,.27.16.59.67.5A10,10,0,0,0,12,2Z"/>
</svg>
</template>
<style scoped lang="scss">
</style>
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,28 +1,37 @@
<template> <template>
<div class="changelog panel pinned-paper"> <div class="changelog panel pinned-paper">
<div class="nail top-left"> <div class="nail top-left">
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/> <Nail/>
</div> </div>
<div class="nail top-right"> <div class="nail top-right">
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/> <Nail/>
</div> </div>
<h1>Changelog</h1> <h1>Changelog</h1>
<div class="changelog-entry" v-for="release in releases"> <div class="changelog-list">
<hr> <div class="changelog-entry" v-for="release in releases">
<h2>Version {{ release.name }}</h2> <hr>
<pre>{{ release.body }}</pre> <h2><span>Version {{ release.name }}</span><small class="date">{{ timeFormat.format(release.createdAt) }}</small></h2>
<pre>{{ release.body }}</pre>
</div>
</div> </div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import {defineComponent} from "vue"; import {defineComponent} from "vue";
import Nail from "@/components/misc/Nail.vue";
export default defineComponent({ export default defineComponent({
name: "ChangelogComponent", name: "ChangelogComponent",
components: {Nail},
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: {
@@ -35,11 +44,11 @@ export default defineComponent({
if (result === null) return; if (result === null) return;
const json = await result.json(); const json = await result.json();
for (const release of json) { for (const release of json) {
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);
} }
@@ -47,7 +56,6 @@ export default defineComponent({
}, },
async mounted() { async mounted() {
this.getReleases(1); this.getReleases(1);
} }
}); });
</script> </script>
@@ -57,11 +65,14 @@ export default defineComponent({
padding-block: 3rem; padding-block: 3rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: flex-start;
align-items: center; align-items: center;
gap: 1rem; gap: 1rem;
max-width: 45rem; max-width: 45rem;
min-height: 30rem;
max-height: 30rem;
width: 100%; width: 100%;
overflow-y: auto;
h1 { h1 {
font-size: 3rem; font-size: 3rem;
@@ -70,12 +81,33 @@ export default defineComponent({
text-align: center; text-align: center;
} }
.changelog-list {
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
gap: 1rem;
width: 100%;
overflow-y: auto;
}
.changelog-entry { .changelog-entry {
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 {
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -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)
+10 -6
View File
@@ -1,5 +1,9 @@
import {createRouter, createWebHashHistory} from 'vue-router' import {createRouter, createWebHashHistory} from 'vue-router'
import HomeView from '../views/HomeView.vue'
import HomeView from '@/views/HomeView.vue';
import QuestView from "@/views/QuestView.vue";
import AdventurerView from "@/views/AdventurerView.vue";
import TechnicalView from "@/views/TechnicalView.vue";
const router = createRouter({ const router = createRouter({
history: createWebHashHistory(import.meta.env.BASE_URL), history: createWebHashHistory(import.meta.env.BASE_URL),
@@ -7,23 +11,23 @@ const router = createRouter({
{ {
path: '/', path: '/',
name: 'guild', name: 'guild',
component: HomeView component: HomeView,
}, },
{ {
path: '/quests', path: '/quests',
name: 'quests', name: 'quests',
component: () => import('../views/QuestView.vue') component: QuestView,
}, },
{ {
path: '/adventurers', path: '/adventurers',
name: 'adventurers', name: 'adventurers',
component: () => import('../views/AdventurerView.vue') component: AdventurerView,
}, },
{ {
path: '/technical', path: '/technical',
name: 'technical', name: 'technical',
component: () => import('../views/TechnicalView.vue') component: TechnicalView,
} },
] ]
}) })
+29 -12
View File
@@ -1,5 +1,11 @@
<template> <template>
<div class="adventurer-section"> <div class="adventurer-section">
<AdventurerDetails
:adventurer="selectedAdventurer"
v-if="selectedAdventurer !== null"
@closeButtonClicked="selectedAdventurer = null"
/>
<section class="recruit panel pinned-paper"> <section class="recruit panel pinned-paper">
<h1>Applying adventurers</h1> <h1>Applying adventurers</h1>
<div class="adventurers"> <div class="adventurers">
@@ -29,10 +35,17 @@
</div> </div>
</section> </section>
<section class="collection panel pinned-paper"> <section class="collection panel pinned-paper">
<h1>Recruited adventurers ({{ Object.keys(adventurers).length }} / <h1>
{{ guild.adventurerCapacity.getAdventurerCapacity() }})</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="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"/> <AdventurerTile class="entry" :adventurer="adventurer"/>
<b>{{ adventurer.name }}</b> <b>{{ adventurer.name }}</b>
</div> </div>
@@ -46,35 +59,30 @@ import type {PropType} from "vue";
import {defineComponent} from "vue"; import {defineComponent} from "vue";
import AdventurerTile from "@/components/AdventurerTile.vue"; import AdventurerTile from "@/components/AdventurerTile.vue";
import type {Adventurer} from "@/classes/Adventurer"; import type {Adventurer} from "@/classes/Adventurer";
import {loadAdventurersForHire} from "@/GameData";
import type {Guild} from "@/classes/Guild"; import type {Guild} from "@/classes/Guild";
import AdventurerDetails from "@/components/AdventurerDetails.vue";
export default defineComponent({ export default defineComponent({
name: "RecruitView", name: "RecruitView",
components: {AdventurerTile}, components: {AdventurerDetails, AdventurerTile},
data: () => { data: () => {
return { return {
currentlyForHire: null as Adventurer | null, currentlyForHire: null as Adventurer | null,
adventurersForHire: [] as Array<Adventurer>, adventurersForHire: [] as Array<Adventurer>,
selectedAdventurer: null as Adventurer | null,
} }
}, },
props: { props: {
guild: { guild: {
type: Object as PropType<Guild>, type: Object as PropType<Guild>,
default() {
return {} as Guild
},
required: true, required: true,
}, },
adventurers: { adventurers: {
type: Object as PropType<{ [key: string]: Adventurer }>, type: Object as PropType<{ [key: string]: Adventurer }>,
default() {
return {} as { [key: string]: Adventurer };
},
required: true, required: true,
}, },
adventurerForHire: { adventurerForHire: {
type: Object as PropType<Adventurer|null>, type: Object as PropType<Adventurer | null>,
default() { default() {
return null; return null;
} }
@@ -122,6 +130,14 @@ export default defineComponent({
margin: 0; margin: 0;
} }
.collection {
small {
font-size: 1rem;
display: block;
margin-bottom: 0.5rem;
}
}
.adventurers { .adventurers {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@@ -137,6 +153,7 @@ export default defineComponent({
flex-direction: column; flex-direction: column;
gap: 0.25rem; gap: 0.25rem;
font-size: 1.1rem; font-size: 1.1rem;
cursor: pointer;
.entry { .entry {
height: 7rem; height: 7rem;

Some files were not shown because too many files have changed in this diff Show More