mirror of
https://github.com/YouHaveTrouble/GuildMaster.git
synced 2026-05-12 06:26:59 +00:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| aaf0eb6546 | |||
| c14a135c94 | |||
| 40d5a876b8 |
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "adventurers-guild",
|
"name": "adventurers-guild",
|
||||||
"version": "0.5.0",
|
"version": "0.6.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
+6
-2
@@ -36,8 +36,9 @@ 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";
|
||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: "GuildView",
|
name: "GuildView",
|
||||||
@@ -132,7 +133,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 +151,9 @@ 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);
|
||||||
|
}
|
||||||
|
|
||||||
this.guild = new Guild(saveData.guild.level, saveData.guild.gold, guildUpgrades);
|
this.guild = new Guild(saveData.guild.level, saveData.guild.gold, guildUpgrades);
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
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";
|
||||||
|
|
||||||
|
|
||||||
export class Guild {
|
export class Guild {
|
||||||
@@ -9,6 +10,7 @@ export class Guild {
|
|||||||
displayUpgradeCost: number|string;
|
displayUpgradeCost: number|string;
|
||||||
upgradeCost: number|null = null;
|
upgradeCost: number|null = null;
|
||||||
adventurerCapacity: AdventurerCapacityUpgrade;
|
adventurerCapacity: AdventurerCapacityUpgrade;
|
||||||
|
expModifier: QuestExpUpgrade;
|
||||||
|
|
||||||
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 +20,7 @@ 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();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,7 +46,7 @@ export class Guild {
|
|||||||
}
|
}
|
||||||
|
|
||||||
isMaxLevel(): boolean {
|
isMaxLevel(): boolean {
|
||||||
return this.level >= 7;
|
return this.level >= 8;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,5 +56,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}
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
@@ -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.15, level - 1);
|
||||||
|
return Math.floor(4000000 * scalingFactor * Math.pow(level, 1.1));
|
||||||
|
}
|
||||||
|
|
||||||
|
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,18 @@
|
|||||||
Upgrade ({{ formatGold(guild.adventurerCapacity.nextLevelCost) }} gold)
|
Upgrade ({{ formatGold(guild.adventurerCapacity.nextLevelCost) }} gold)
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</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>
|
||||||
</section>
|
</section>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -39,7 +52,14 @@ 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();
|
||||||
}
|
},
|
||||||
|
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();
|
||||||
|
},
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
@@ -63,12 +83,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>
|
||||||
Reference in New Issue
Block a user