Better look for the eyes

Better look for the eyes
This commit is contained in:
2023-03-31 21:46:57 +02:00
committed by GitHub
21 changed files with 296 additions and 137 deletions
Binary file not shown.

After

Width:  |  Height:  |  Size: 406 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

-20
View File
@@ -1,20 +0,0 @@
:root {
}
body {
margin: 0;
padding: 0 0 10rem;
min-height: calc(100vh - 10rem);
font-family: 'EB Garamond', serif;
overflow-y: scroll;
user-select: none;
background-size: 30%;
background: rgba(87, 50, 20, 0.75) url("/img/background/panels/plaster.png") repeat;
background-blend-mode: darken;
}
#app {
width: 100%;
}
+64
View File
@@ -0,0 +1,64 @@
:root {
}
body {
margin: 0;
padding: 0 0 10rem;
min-height: calc(100vh - 10rem);
font-family: 'EB Garamond', serif;
overflow-y: scroll;
user-select: none;
background-size: 25rem;
background-color: rgba(87, 50, 20, 0.45);
background-image: url("/img/background/wood/cut_wood_background.png");
background-blend-mode: darken;
background-repeat: repeat;
}
#app {
width: 100%;
}
.panel {
&.pinned-paper {
background-image: url("/img/quests/backgrounds/paper.png");
position: relative;
filter: drop-shadow(-0.15rem 0.2rem 0.1rem rgba(0, 0, 0, 0.25));
.nail {
position: absolute;
width: 2rem;
height: 2rem;
filter: drop-shadow(-0.15rem 0.2rem 0.1rem rgba(0, 0, 0, 0.5));
&.small {
width: 1rem;
height: 1rem;
}
img {
width: 100%;
height: 100%;
}
&.top-left {
top: 1rem;
left: 1rem;
}
&.top-right {
top: 1rem;
right: 1rem;
}
}
}
&.note-paper {
background-image: url("/img/background/paper/small_tile_paper.png");
position: relative;
filter: drop-shadow(-0.15rem 0.2rem 0.1rem rgba(0, 0, 0, 0.25));
border-image: url("/img/borders/metal_corner.png") 30 round;
}
}
+2
View File
@@ -26,6 +26,7 @@ export default defineComponent({
default() { default() {
return {} as { [key: string]: Adventurer }; return {} as { [key: string]: Adventurer };
}, },
required: true,
}, },
}, },
@@ -39,6 +40,7 @@ export default defineComponent({
flex-wrap: wrap; flex-wrap: wrap;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.slot { .slot {
padding: 0; padding: 0;
width: 5rem; width: 5rem;
+1 -3
View File
@@ -65,12 +65,10 @@ export default defineComponent({
default() { default() {
return {} as {[key: string]: Adventurer}; return {} as {[key: string]: Adventurer};
}, },
required: true,
}, },
}, },
methods: { methods: {
print(a:string) {
console.log(a);
},
closeSelect() { closeSelect() {
this.selection = false; this.selection = false;
} }
+6 -1
View File
@@ -4,7 +4,8 @@
:title="adventurer.name + (adventurer.busy ? ' (busy)' : '')" :title="adventurer.name + (adventurer.busy ? ' (busy)' : '')"
> >
<img :src="adventurer.portrait" :alt="adventurer.name" draggable="false"> <img :src="adventurer.portrait" :alt="adventurer.name" draggable="false">
<div class="level" :title="adventurer.isMaxLevel() ? 'Max level' : ''">{{adventurer.level}}<span v-if="adventurer.isMaxLevel()"></span></div> <div class="level" :title="adventurer.isMaxLevel() ? 'Max level' : ''">{{ adventurer.level }}<span
v-if="adventurer.isMaxLevel()"></span></div>
<div class="exp"></div> <div class="exp"></div>
</article> </article>
</template> </template>
@@ -22,6 +23,7 @@ export default defineComponent({
default() { default() {
return {} as Adventurer; return {} as Adventurer;
}, },
required: true,
} }
}, },
data: () => ({ data: () => ({
@@ -51,6 +53,7 @@ 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;
.level { .level {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -62,6 +65,7 @@ export default defineComponent({
padding: 0.1rem; padding: 0.1rem;
color: #fff; color: #fff;
} }
.exp { .exp {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@@ -71,6 +75,7 @@ export default defineComponent({
background-color: rgba(203, 33, 213, 0.75); background-color: rgba(203, 33, 213, 0.75);
transition: width 1s linear; transition: width 1s linear;
} }
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
+22 -2
View File
@@ -1,7 +1,14 @@
<template> <template>
<div class="changelog"> <div class="changelog panel pinned-paper">
<div class="nail top-left">
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
</div>
<div class="nail top-right">
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
</div>
<h1>Changelog</h1> <h1>Changelog</h1>
<div class="changelog-entry" v-for="release in releases"> <div class="changelog-entry" v-for="release in releases">
<hr>
<h2>Version {{ release.name }}</h2> <h2>Version {{ release.name }}</h2>
<pre>{{ release.body }}</pre> <pre>{{ release.body }}</pre>
</div> </div>
@@ -47,29 +54,42 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.changelog { .changelog {
padding: 3rem; padding-block: 3rem;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
gap: 1rem; gap: 1rem;
max-width: 45rem; max-width: 45rem;
width: 100%;
h1 { h1 {
font-size: 3rem; font-size: 3rem;
line-height: 1; line-height: 1;
margin: 0; margin: 0;
text-align: center; text-align: center;
} }
.changelog-entry { .changelog-entry {
width: 100%; width: 100%;
h2 { h2 {
margin: 0; margin: 0;
padding-inline: 1rem;
} }
hr {
border: 0;
width: calc(100% - 2rem);
border-bottom: 1px solid black;
}
pre { pre {
line-height: 1.2; line-height: 1.2;
margin: 0; margin: 0;
white-space: pre-wrap; white-space: pre-wrap;
font-family: 'EB Garamond', serif; font-family: 'EB Garamond', serif;
padding-inline: 1rem;
} }
} }
} }
+8
View File
@@ -61,12 +61,14 @@ export default defineComponent({
default() { default() {
return {} as Quest; return {} as Quest;
}, },
required: true,
}, },
adventurers: { adventurers: {
type: Object as PropType<{ [key: string]: Adventurer }>, type: Object as PropType<{ [key: string]: Adventurer }>,
default() { default() {
return {} as { [key: string]: Adventurer }; return {} as { [key: string]: Adventurer };
}, },
required: true,
}, },
}, },
data: () => { data: () => {
@@ -126,6 +128,7 @@ export default defineComponent({
height: 100%; height: 100%;
z-index: -5; z-index: -5;
overflow: hidden; overflow: hidden;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -137,6 +140,7 @@ export default defineComponent({
font-size: 1.5rem; font-size: 1.5rem;
line-height: 1; line-height: 1;
} }
h3 { h3 {
font-size: 1.15rem; font-size: 1.15rem;
margin: 0; margin: 0;
@@ -148,6 +152,7 @@ export default defineComponent({
margin: 0.5rem auto; margin: 0.5rem auto;
position: relative; position: relative;
height: 1.25rem; height: 1.25rem;
.progress { .progress {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -158,6 +163,7 @@ export default defineComponent({
background-color: rgba(0, 128, 0, 0.65); background-color: rgba(0, 128, 0, 0.65);
transition: width 250ms linear; transition: width 250ms linear;
} }
.percentage { .percentage {
position: absolute; position: absolute;
top: 0; top: 0;
@@ -221,6 +227,7 @@ export default defineComponent({
background-size: contain; background-size: contain;
opacity: 1; opacity: 1;
z-index: -4; z-index: -4;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
@@ -241,6 +248,7 @@ export default defineComponent({
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
img { img {
width: 45%; width: 45%;
height: 35%; height: 35%;
+4 -1
View File
@@ -25,7 +25,8 @@ export default defineComponent({
type: Object as PropType<Guild>, type: Object as PropType<Guild>,
default() { default() {
return new Guild(1, 0) as Guild; return new Guild(1, 0) as Guild;
} },
required: true,
} }
}, },
methods: { methods: {
@@ -47,11 +48,13 @@ export default defineComponent({
justify-content: center; justify-content: center;
align-items: center; align-items: center;
gap: 1rem; gap: 1rem;
h2 { h2 {
font-size: 1.75rem; font-size: 1.75rem;
margin: 2rem 0 0; margin: 2rem 0 0;
padding: 0; padding: 0;
} }
.upgrade { .upgrade {
text-align: center; text-align: center;
font-size: 1.25rem; font-size: 1.25rem;
+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.css' import './assets/main.scss'
const app = createApp(App) const app = createApp(App)
+29 -12
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="adventurer-section"> <div class="adventurer-section">
<section class="recruit"> <section class="recruit panel pinned-paper">
<h1>Applying adventurers</h1> <h1>Applying adventurers</h1>
<div class="adventurers"> <div class="adventurers">
<div v-if="currentlyForHire"> <div v-if="currentlyForHire">
@@ -28,8 +28,9 @@
</div> </div>
</section> </section>
<section class="collection"> <section class="collection panel pinned-paper">
<h1>Recruited adventurers ({{ Object.keys(adventurers).length }} / {{ guild.adventurerCapacity.getAdventurerCapacity() }})</h1> <h1>Recruited adventurers ({{ Object.keys(adventurers).length }} /
{{ guild.adventurerCapacity.getAdventurerCapacity() }})</h1>
<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">
<AdventurerTile class="entry" :adventurer="adventurer"/> <AdventurerTile class="entry" :adventurer="adventurer"/>
@@ -63,12 +64,14 @@ export default defineComponent({
default() { default() {
return {} as Guild return {} as Guild
}, },
required: true,
}, },
adventurers: { adventurers: {
type: Object as PropType<{ [key: string]: Adventurer }>, type: Object as PropType<{ [key: string]: Adventurer }>,
default() { default() {
return {} as { [key: string]: Adventurer }; return {} as { [key: string]: Adventurer };
}, },
required: true,
}, },
lastRecruitTime: { lastRecruitTime: {
type: Number as PropType<number>, type: Number as PropType<number>,
@@ -148,22 +151,28 @@ export default defineComponent({
<style lang="scss" scoped> <style lang="scss" scoped>
.adventurer-section { .adventurer-section {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
width: 100%;
section {
max-width: 1280px;
width: 100%;
text-align: center;
padding-block: 1rem; padding-block: 1rem;
display: flex;
justify-content: center;
align-content: center;
flex-direction: column;
gap: 1rem;
width: 100%;
section {
text-align: center;
padding: 1rem;
width: calc(100% - 2rem);
max-width: 45rem;
margin: 0 auto;
} }
h1 { h1 {
font-size: 2rem; font-size: 2rem;
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
} }
.adventurers { .adventurers {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@@ -171,6 +180,7 @@ export default defineComponent({
align-items: center; align-items: center;
flex-wrap: wrap; flex-wrap: wrap;
gap: 1rem; gap: 1rem;
.adventurer-tile { .adventurer-tile {
display: flex; display: flex;
justify-content: center; justify-content: center;
@@ -178,10 +188,12 @@ export default defineComponent({
flex-direction: column; flex-direction: column;
gap: 0.25rem; gap: 0.25rem;
font-size: 1.1rem; font-size: 1.1rem;
.entry { .entry {
height: 7rem; height: 7rem;
width: 7rem; width: 7rem;
} }
b { b {
line-height: 1; line-height: 1;
text-align: center; text-align: center;
@@ -192,6 +204,7 @@ export default defineComponent({
} }
} }
} }
.decision { .decision {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@@ -199,17 +212,21 @@ export default defineComponent({
align-items: center; align-items: center;
font-size: 2rem; font-size: 2rem;
gap: 1rem; gap: 1rem;
span { span {
cursor: pointer; cursor: pointer;
&:hover { &:hover {
color: #fff; color: #fff;
} }
&.disabled { &.disabled {
color: rgba(0, 0, 0, 0.5); color: rgba(0, 0, 0, 0.5);
cursor: default; cursor: default;
} }
} }
} }
.hire-tile { .hire-tile {
width: 8rem; width: 8rem;
height: 8rem; height: 8rem;
+37 -4
View File
@@ -1,10 +1,17 @@
<template> <template>
<main> <main>
<section class="title"> <section class="title panel note-paper">
<h1>Guild Master</h1> <h1>Guild Master</h1>
<h3>Adventurer's guild management game</h3> <h3>Adventurer's guild management game</h3>
<small>v{{ version }}</small> <small>v{{ version }}</small>
</section> </section>
<section class="upgrades panel pinned-paper">
<div class="nail top-left">
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
</div>
<div class="nail top-right">
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
</div>
<section class="coffer"> <section class="coffer">
<p>Coffer: {{ guild.gold }} gold</p> <p>Coffer: {{ guild.gold }} gold</p>
</section> </section>
@@ -21,6 +28,8 @@
<section class="upgrade"> <section class="upgrade">
<span class="wipe-save" @click="$emit('wipeSave')">Wipe your save data</span> <span class="wipe-save" @click="$emit('wipeSave')">Wipe your save data</span>
</section> </section>
</section>
</main> </main>
</template> </template>
@@ -44,46 +53,69 @@ export default defineComponent({
guild: { guild: {
type: Object as PropType<Guild>, type: Object as PropType<Guild>,
default: () => new Guild(1, 0) as Guild, default: () => new Guild(1, 0) as Guild,
required: true,
}, },
} }
}); });
</script> </script>
<style lang="scss"> <style lang="scss">
main {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding-block: 1rem;
gap: 1rem;
.upgrades {
max-width: 45rem;
width: 100%;
}
}
.title { .title {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
padding: 2.5rem; padding-block: 2.5rem;
text-align: center; text-align: center;
width: 100%;
max-width: 45rem;
gap: 0.5rem; gap: 0.5rem;
h1 { h1 {
font-size: 4rem; font-size: 4rem;
line-height: 0.75; line-height: 0.75;
white-space: pre-wrap;
margin: 0; margin: 0;
} }
h3 { h3 {
margin: 0; margin: 0;
line-height: 0.9; line-height: 0.9;
} }
small { small {
font-size: 0.9rem; font-size: 0.9rem;
font-weight: bold; font-weight: bold;
line-height: 0.25; line-height: 0.25;
} }
} }
.coffer { .coffer {
text-align: center; text-align: center;
p { p {
font-size: 1.5rem; font-size: 1.5rem;
font-weight: bold; font-weight: bold;
} }
} }
.upgrade { .upgrade {
text-align: center; text-align: center;
.wipe-save { .wipe-save {
display: inline-flex; display: inline-flex;
font-weight: bold; font-weight: bold;
@@ -91,6 +123,7 @@ export default defineComponent({
color: #d52121; color: #d52121;
cursor: pointer; cursor: pointer;
} }
p { p {
margin: 0; margin: 0;
font-size: 1.5rem; font-size: 1.5rem;
+3
View File
@@ -103,18 +103,21 @@ export default defineComponent({
default() { default() {
return new Guild(1, 0); return new Guild(1, 0);
}, },
required: true,
}, },
adventurers: { adventurers: {
type: Object as PropType<{ [key: string]: Adventurer }>, type: Object as PropType<{ [key: string]: Adventurer }>,
default() { default() {
return {} as { [key: string]: Adventurer }; return {} as { [key: string]: Adventurer };
}, },
required: true,
}, },
quests: { quests: {
type: Object as PropType<{ [key: string]: Quest }>, type: Object as PropType<{ [key: string]: Quest }>,
default() { default() {
return {} as { [key: string]: Quest }; return {} as { [key: string]: Quest };
}, },
required: true,
}, },
lastRecruitTime: { lastRecruitTime: {
type: Number as PropType<number>, type: Number as PropType<number>,
+33 -7
View File
@@ -1,12 +1,24 @@
<template> <template>
<section class="technical-view"> <section class="technical-view">
<h1>Socials</h1> <div class="socials panel pinned-paper">
<div class="socials"> <div class="nail top-left small">
<a class="link" href="https://discord.gg/j8KK5dGBps"><img class="icon" src="/img/icons/discord.svg" alt="Discord" />Discord</a> <img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
<a class="link" href="https://github.com/YouHaveTrouble/GuildMaster"><img class="icon" src="/img/icons/github.svg" alt="GitHub" />GitHub</a> </div>
<div class="nail top-right small">
<img src="/img/quests/overlays/nail.png" alt="" draggable="false"/>
</div>
<h1>Socials</h1>
<div class="links">
<a class="link" href="https://discord.gg/j8KK5dGBps">
<img class="icon" src="/img/icons/discord.svg" alt="Discord"/>
Discord
</a>
<a class="link" href="https://github.com/YouHaveTrouble/GuildMaster">
<img class="icon" src="/img/icons/github.svg" alt="GitHub"/>
GitHub
</a>
</div>
</div> </div>
<ChangelogComponent/> <ChangelogComponent/>
</section> </section>
@@ -31,18 +43,28 @@ export default defineComponent({
align-items: center; align-items: center;
gap: 1rem; gap: 1rem;
padding-block: 1rem; padding-block: 1rem;
h1 { h1 {
font-size: 3rem; font-size: 3rem;
line-height: 1; line-height: 1;
margin: 0; margin: 0;
} }
.socials { .socials {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
gap: 1rem;
padding: 1rem;
.links {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
gap: 1rem; gap: 1rem;
}
.link { .link {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
@@ -55,6 +77,10 @@ export default defineComponent({
color: #000; color: #000;
font-weight: bold; font-weight: bold;
} }
}
}
.icon { .icon {
width: 2rem; width: 2rem;
height: 2rem; height: 2rem;