mirror of
https://github.com/YouHaveTrouble/DiscipleOfLand.git
synced 2026-05-12 06:26:56 +00:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c828496d1a | |||
| 9e5580836c | |||
| ea74bbea90 | |||
| bc0e866956 | |||
| 6beca6a8ea | |||
| fe8e7eb098 | |||
| 98008ca288 | |||
| 1db76089bc | |||
| 001a8bab3b | |||
| 56b053fc7f | |||
| f2fb0571cc | |||
| e61bc9480a | |||
| d445b59422 |
@@ -13,6 +13,11 @@
|
|||||||
<meta property="twitter:description" content="Track timed gathering nodes in Final Fantasy XIV.">
|
<meta property="twitter:description" content="Track timed gathering nodes in Final Fantasy XIV.">
|
||||||
<meta property="og-url" content="https://dol.yht.one">
|
<meta property="og-url" content="https://dol.yht.one">
|
||||||
<meta property="twitter:url" content="https://dol.yht.one">
|
<meta property="twitter:url" content="https://dol.yht.one">
|
||||||
|
<script
|
||||||
|
async
|
||||||
|
src="https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js?client=ca-pub-8262480617556085"
|
||||||
|
crossorigin="anonymous"
|
||||||
|
></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<noscript>
|
<noscript>
|
||||||
|
|||||||
Generated
+582
-194
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "discipleofland",
|
"name": "discipleofland",
|
||||||
"version": "0.0.9",
|
"version": "0.1.1",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
"@vue/eslint-config-typescript": "^12.0.0",
|
"@vue/eslint-config-typescript": "^12.0.0",
|
||||||
"eslint": "^8.51.0",
|
"eslint": "^8.51.0",
|
||||||
"eslint-plugin-vue": "^9.17.0",
|
"eslint-plugin-vue": "^9.17.0",
|
||||||
"vite": "^5.3.3",
|
"vite": "^5.4.18",
|
||||||
"vue-eslint-parser": "^9.3.2",
|
"vue-eslint-parser": "^9.3.2",
|
||||||
"vite-plugin-eslint": "^1.8.1"
|
"vite-plugin-eslint": "^1.8.1"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -249,7 +249,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"job": "botanist",
|
"job": "miner",
|
||||||
"type": "unspoiled",
|
"type": "unspoiled",
|
||||||
"position": {
|
"position": {
|
||||||
"zone": "kozamauka",
|
"zone": "kozamauka",
|
||||||
|
|||||||
+1
-1
@@ -91,7 +91,7 @@ export default defineComponent({
|
|||||||
this.eorzeaTime = new EorzeaTime();
|
this.eorzeaTime = new EorzeaTime();
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
this.eorzeaTime = new EorzeaTime();
|
this.eorzeaTime = new EorzeaTime();
|
||||||
}, 500);
|
}, 1000);
|
||||||
|
|
||||||
const itemData: Response | null = await fetch("/data/items.json")
|
const itemData: Response | null = await fetch("/data/items.json")
|
||||||
.catch((): null => {
|
.catch((): null => {
|
||||||
|
|||||||
@@ -2,12 +2,28 @@
|
|||||||
<article
|
<article
|
||||||
class="node"
|
class="node"
|
||||||
:class="{active: gatheringNode.isActive(eorzeaTime)}"
|
:class="{active: gatheringNode.isActive(eorzeaTime)}"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="!gatheringNode.isActive(eorzeaTime)"
|
||||||
>
|
>
|
||||||
<div class="timer">
|
<div class="timer">
|
||||||
{{
|
{{
|
||||||
gatheringNode.isActive(eorzeaTime) ? 'Active' : prettyTimer(gatheringNode.getSecondsToNextActiveTime(eorzeaTime))
|
prettyTimer(secondsToNextActiveTime)
|
||||||
}}
|
}}
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
v-else
|
||||||
|
>
|
||||||
|
<div class="timer">
|
||||||
|
Active
|
||||||
|
<div class="countdown">
|
||||||
|
{{
|
||||||
|
prettyTimer(secondsToNextInactiveTime)
|
||||||
|
}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="job">
|
<div class="job">
|
||||||
<div class="icon">
|
<div class="icon">
|
||||||
<img
|
<img
|
||||||
@@ -29,7 +45,9 @@
|
|||||||
<div class="info">
|
<div class="info">
|
||||||
<span>{{ zones[gatheringNode.nearestAetheryte.position.zone]?.name?.en }}</span>
|
<span>{{ zones[gatheringNode.nearestAetheryte.position.zone]?.name?.en }}</span>
|
||||||
<span>{{ gatheringNode.nearestAetheryte.name.en }}</span>
|
<span>{{ gatheringNode.nearestAetheryte.name.en }}</span>
|
||||||
<span>{{ gatheringNode.nearestAetheryte.position.x.toFixed(1) }}, {{ gatheringNode.nearestAetheryte.position.y.toFixed(1) }}</span>
|
<span>{{
|
||||||
|
gatheringNode.nearestAetheryte.position.x.toFixed(1)
|
||||||
|
}}, {{ gatheringNode.nearestAetheryte.position.y.toFixed(1) }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="items">
|
<div class="items">
|
||||||
@@ -51,6 +69,12 @@ import Zone from "@/entities/Zone";
|
|||||||
|
|
||||||
export default defineComponent({
|
export default defineComponent({
|
||||||
name: "GatheringNode",
|
name: "GatheringNode",
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
secondsToNextInactiveTime: 0 as number,
|
||||||
|
secondsToNextActiveTime: 0 as number,
|
||||||
|
};
|
||||||
|
},
|
||||||
props: {
|
props: {
|
||||||
gatheringNode: {
|
gatheringNode: {
|
||||||
type: Object as PropType<Node>,
|
type: Object as PropType<Node>,
|
||||||
@@ -65,22 +89,42 @@ export default defineComponent({
|
|||||||
required: true
|
required: true
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
watch: {
|
||||||
|
eorzeaTime: {
|
||||||
|
handler() {
|
||||||
|
this.calculateTimers()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
methods: {
|
methods: {
|
||||||
prettyTimer(seconds: number): string {
|
prettyTimer(seconds: number): string {
|
||||||
const minutes = Math.floor(seconds / 60);
|
const minutes = Math.floor(seconds / 60);
|
||||||
const remainingSeconds = seconds % 60;
|
const remainingSeconds = seconds % 60;
|
||||||
return `${minutes}:${remainingSeconds < 10 ? '0' : ''}${remainingSeconds}`;
|
return `${minutes}:${remainingSeconds < 10 ? '0' : ''}${remainingSeconds}`;
|
||||||
|
},
|
||||||
|
calculateTimers() {
|
||||||
|
this.secondsToNextInactiveTime = this.gatheringNode.getSecondsToNextInactiveTime(this.eorzeaTime);
|
||||||
|
this.secondsToNextActiveTime = this.gatheringNode.getSecondsToNextActiveTime(this.eorzeaTime);
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
mounted() {
|
||||||
|
this.calculateTimers();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style scoped lang="scss">
|
<style scoped lang="scss">
|
||||||
|
|
||||||
@keyframes pulsing {
|
@keyframes pulsing {
|
||||||
0% {background-color: rgba(255,255,255, 0.05);}
|
0% {
|
||||||
50% {background-color: rgba(255,255,255, 0.075);}
|
background-color: rgba(255, 255, 255, 0.05);
|
||||||
100% {background-color: rgba(255,255,255, 0.05);}
|
}
|
||||||
|
50% {
|
||||||
|
background-color: rgba(255, 255, 255, 0.075);
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
background-color: rgba(255, 255, 255, 0.05);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.node {
|
.node {
|
||||||
@@ -93,6 +137,7 @@ export default defineComponent({
|
|||||||
border: 1px solid #fff;
|
border: 1px solid #fff;
|
||||||
padding: 0.5rem;
|
padding: 0.5rem;
|
||||||
border-radius: 0.25rem;
|
border-radius: 0.25rem;
|
||||||
|
content-visibility: auto;
|
||||||
|
|
||||||
&.active {
|
&.active {
|
||||||
animation: infinite pulsing 6s;
|
animation: infinite pulsing 6s;
|
||||||
@@ -102,6 +147,8 @@ export default defineComponent({
|
|||||||
min-width: 7rem;
|
min-width: 7rem;
|
||||||
font-size: 2rem;
|
font-size: 2rem;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
height: 100%;
|
||||||
|
flex-direction: column;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,9 +49,7 @@ export default defineComponent(
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
eorzeaTime: {
|
eorzeaTime: {
|
||||||
handler(newValue, oldValue) {
|
handler() {
|
||||||
if (oldValue === undefined) return;
|
|
||||||
if (newValue?.getMinutes() === oldValue?.getMinutes()) return;
|
|
||||||
this.sortListByTime();
|
this.sortListByTime();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,22 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="github-logo" aria-label="Github logo" title="GitHub">
|
<div
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128">
|
class="github-logo"
|
||||||
|
aria-label="Github logo"
|
||||||
|
title="GitHub"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
viewBox="0 0 128 128"
|
||||||
|
>
|
||||||
<g :fill="color">
|
<g :fill="color">
|
||||||
<path fill-rule="evenodd" clip-rule="evenodd"
|
|
||||||
d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"/>
|
|
||||||
<path
|
<path
|
||||||
d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"/>
|
fill-rule="evenodd"
|
||||||
|
clip-rule="evenodd"
|
||||||
|
d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"
|
||||||
|
/>
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -47,6 +47,15 @@ export default class Node {
|
|||||||
return countdown;
|
return countdown;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getCountdownToInactive(eorzeaTime: EorzeaTime): number {
|
||||||
|
let countdown: number = Infinity;
|
||||||
|
for (const timeRange of this.times) {
|
||||||
|
const endTimeFrame: number = timeRange.getEndTimeFrame(eorzeaTime);
|
||||||
|
if (endTimeFrame < countdown) countdown = endTimeFrame;
|
||||||
|
}
|
||||||
|
return countdown;
|
||||||
|
}
|
||||||
|
|
||||||
getNextActiveTime(eorzeaTime: EorzeaTime): EorzeaTime {
|
getNextActiveTime(eorzeaTime: EorzeaTime): EorzeaTime {
|
||||||
let countdownTimeStamp: number = Infinity;
|
let countdownTimeStamp: number = Infinity;
|
||||||
for (const timeRange of this.times) {
|
for (const timeRange of this.times) {
|
||||||
@@ -56,8 +65,21 @@ export default class Node {
|
|||||||
return EorzeaTime.fromEorzeaTime(new Date(this.getCountdownToActive(eorzeaTime)));
|
return EorzeaTime.fromEorzeaTime(new Date(this.getCountdownToActive(eorzeaTime)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getNextInactiveTime(eorzeaTime: EorzeaTime): EorzeaTime {
|
||||||
|
let countdownTimeStamp: number = Infinity;
|
||||||
|
for (const timeRange of this.times) {
|
||||||
|
const endTimeFrame: number = timeRange.getEndTimeFrame(eorzeaTime);
|
||||||
|
if (endTimeFrame < countdownTimeStamp) countdownTimeStamp = endTimeFrame;
|
||||||
|
}
|
||||||
|
return EorzeaTime.fromEorzeaTime(new Date(this.getCountdownToInactive(eorzeaTime)));
|
||||||
|
}
|
||||||
|
|
||||||
getSecondsToNextActiveTime(eorzeaTime: EorzeaTime): number {
|
getSecondsToNextActiveTime(eorzeaTime: EorzeaTime): number {
|
||||||
return Math.floor((this.getNextActiveTime(eorzeaTime).realDate.getTime() - eorzeaTime.realDate.getTime()) / 1000);
|
return Math.floor((this.getNextActiveTime(eorzeaTime).realDate.getTime() - eorzeaTime.realDate.getTime()) / 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getSecondsToNextInactiveTime(eorzeaTime: EorzeaTime): number {
|
||||||
|
return Math.floor((this.getNextInactiveTime(eorzeaTime).realDate.getTime() - eorzeaTime.realDate.getTime()) / 1000);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ export default class TimeRange {
|
|||||||
public isWithinTimeFrame(hour: number, minute: number): boolean {
|
public isWithinTimeFrame(hour: number, minute: number): boolean {
|
||||||
return (
|
return (
|
||||||
this.from[0] < hour || this.from[0] == hour && this.from[1] <= minute)
|
this.from[0] < hour || this.from[0] == hour && this.from[1] <= minute)
|
||||||
&& (hour < this.to[0] || hour == this.to[0] && minute <= this.to[1]
|
&& (hour < this.to[0] || hour == this.to[0] && minute < this.to[1]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,4 +29,17 @@ export default class TimeRange {
|
|||||||
return targetDate.getTime();
|
return targetDate.getTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the timestamp when the current time range will end
|
||||||
|
* @param eorzeaTimeFrom
|
||||||
|
*/
|
||||||
|
public getEndTimeFrame(eorzeaTimeFrom: EorzeaTime): number {
|
||||||
|
const targetDate = new Date(eorzeaTimeFrom.eorzeaDate.getTime());
|
||||||
|
targetDate.setUTCHours(this.to[0], 0, 0, 0);
|
||||||
|
if (eorzeaTimeFrom.getHours() >= this.to[0]) {
|
||||||
|
targetDate.setUTCHours(this.to[0] + 24);
|
||||||
|
}
|
||||||
|
return targetDate.getTime();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user