diff --git a/src/components/panels/EventsPanel.vue b/src/components/panels/EventsPanel.vue index 19eedbe1..6662d593 100644 --- a/src/components/panels/EventsPanel.vue +++ b/src/components/panels/EventsPanel.vue @@ -45,9 +45,7 @@ {{ item }} - - {{ reward.credits }}{{ $t('currency.credAbbr') }} - + {{ reward.credits }}{{ $t('currency.credAbbr') }}
diff --git a/src/components/panels/SentientOutpostsPanel.vue b/src/components/panels/SentientOutpostsPanel.vue index 401ca307..db05f5f9 100644 --- a/src/components/panels/SentientOutpostsPanel.vue +++ b/src/components/panels/SentientOutpostsPanel.vue @@ -10,15 +10,19 @@ {{ $t('sentientoutpost.warn') }} + + + {{ $t('sentientoutpost.tooltip1') }} + {{ $t('sentientoutpost.tooltip2') }} + - + - {{ $t('sentientoutpost.prediction') }} + {{ $t('sentientoutpost.none') }} - @@ -29,51 +33,20 @@ import TimeBadge from '@/components/TimeBadge.vue'; import HubPanelWrap from '@/components/HubPanelWrap'; import HubImg from '@/components/HubImg.vue'; -import moment from 'moment'; - import sentient from '@/assets/img/factions/sentient.svg'; export default { name: 'SentientOutpostsPanel', props: ['sentientOutposts'], + watch: { + mission: function () { + this.active = new Date().getTime(); + }, + }, computed: { headertext() { return this.$t('sentientoutpost.header'); }, - curr() { - const defStart = new Date(this.$props.sentientOutposts.activation).getTime(); - const defEnd = new Date(this.$props.sentientOutposts.expiry).getTime(); - const predStart = new Date(this.$props.sentientOutposts.previous.activation).getTime(); - const predEnd = new Date(this.$props.sentientOutposts.previous.expiry).getTime(); - if (defStart < predStart) { - return { - activation: moment(defStart).toISOString(), - expiry: moment(defEnd).toISOString(), - }; - } else { - return { - activation: moment(predStart).toISOString(), - expiry: moment(predEnd).toISOString(), - }; - } - }, - predNext() { - const defStart = new Date(this.$props.sentientOutposts.activation).getTime(); - const defEnd = new Date(this.$props.sentientOutposts.expiry).getTime(); - const predStart = new Date(this.$props.sentientOutposts.previous.activation).getTime(); - const predEnd = new Date(this.$props.sentientOutposts.previous.expiry).getTime(); - if (defStart > predStart) { - return { - activation: moment(defStart).toISOString(), - expiry: moment(defEnd).toISOString(), - }; - } else { - return { - activation: moment(predStart).toISOString(), - expiry: moment(predEnd).toISOString(), - }; - } - }, }, data() { return { @@ -85,6 +58,7 @@ export default { width: '25px', height: '25px', }, + mission: this.$props.sentientOutposts.mission.node, }; }, components: { diff --git a/src/lang/de.json b/src/lang/de.json index 1ba1a8ea..3c8e4e6c 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "Dieser Teil befindet sich aufgrund des aktuellen Updates in der aktiven Entwicklung.", - "tooltip2": "Geschätzter Zyklus beträgt 30 Minuten aktive Zeit und 3 Stunden inaktive Zeit.", + "tooltip2": "Geschätzter Zyklus beträgt 30 Minuten aktive Zeit.", "header": "Anomalien (Beta)", "outpostsL": "Außenposten", "none": "Keine aktuellen Anomalien", diff --git a/src/lang/en.json b/src/lang/en.json index b90c7a56..60eb4e7b 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "This component is in active development because of the recent update.", - "tooltip2": "Estimated cycle is 30 minutes of active time and 3 hours of inactive time.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "Anomalies (Beta)", "outpostsL": "Outposts", "none": "No Current Anomalies", diff --git a/src/lang/es.json b/src/lang/es.json index 21925be8..6d789cfe 100644 --- a/src/lang/es.json +++ b/src/lang/es.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "Este componente está desarrollándose por una actualización reciente.", - "tooltip2": "El ciclo estimado es de 30 minutos de tiempo activo y 3 horas de tiempo inactivo.", + "tooltip2": "El ciclo estimado es de 30 minutos de tiempo activo", "header": "Anomalías (beta)", "outpostsL": "Avanzada", "none": "No hay anomalías actualmente", diff --git a/src/lang/fr.json b/src/lang/fr.json index b90c7a56..60eb4e7b 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "This component is in active development because of the recent update.", - "tooltip2": "Estimated cycle is 30 minutes of active time and 3 hours of inactive time.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "Anomalies (Beta)", "outpostsL": "Outposts", "none": "No Current Anomalies", diff --git a/src/lang/it.json b/src/lang/it.json index b90c7a56..60eb4e7b 100644 --- a/src/lang/it.json +++ b/src/lang/it.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "This component is in active development because of the recent update.", - "tooltip2": "Estimated cycle is 30 minutes of active time and 3 hours of inactive time.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "Anomalies (Beta)", "outpostsL": "Outposts", "none": "No Current Anomalies", diff --git a/src/lang/ko.json b/src/lang/ko.json index 3d974f3c..ca18b075 100644 --- a/src/lang/ko.json +++ b/src/lang/ko.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "이 부분은 최근 업데이트 때문에 개발 중에 있습니다.", - "tooltip2": "예상 주기는 30분의 활성화 시간과 3시간의 비활성화 시간입니다.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "이상 현상 (베타)", "outpostsL": "전초기지", "none": "현재 이상 현상 없음", diff --git a/src/lang/pl.json b/src/lang/pl.json index b90c7a56..60eb4e7b 100644 --- a/src/lang/pl.json +++ b/src/lang/pl.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "This component is in active development because of the recent update.", - "tooltip2": "Estimated cycle is 30 minutes of active time and 3 hours of inactive time.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "Anomalies (Beta)", "outpostsL": "Outposts", "none": "No Current Anomalies", diff --git a/src/lang/pt.json b/src/lang/pt.json index b90c7a56..60eb4e7b 100644 --- a/src/lang/pt.json +++ b/src/lang/pt.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "This component is in active development because of the recent update.", - "tooltip2": "Estimated cycle is 30 minutes of active time and 3 hours of inactive time.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "Anomalies (Beta)", "outpostsL": "Outposts", "none": "No Current Anomalies", diff --git a/src/lang/ru.json b/src/lang/ru.json index b90c7a56..60eb4e7b 100644 --- a/src/lang/ru.json +++ b/src/lang/ru.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "This component is in active development because of the recent update.", - "tooltip2": "Estimated cycle is 30 minutes of active time and 3 hours of inactive time.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "Anomalies (Beta)", "outpostsL": "Outposts", "none": "No Current Anomalies", diff --git a/src/lang/tr.json b/src/lang/tr.json index b90c7a56..60eb4e7b 100644 --- a/src/lang/tr.json +++ b/src/lang/tr.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "This component is in active development because of the recent update.", - "tooltip2": "Estimated cycle is 30 minutes of active time and 3 hours of inactive time.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "Anomalies (Beta)", "outpostsL": "Outposts", "none": "No Current Anomalies", diff --git a/src/lang/zh.json b/src/lang/zh.json index b90c7a56..60eb4e7b 100644 --- a/src/lang/zh.json +++ b/src/lang/zh.json @@ -124,7 +124,7 @@ }, "sentientoutpost": { "tooltip1": "This component is in active development because of the recent update.", - "tooltip2": "Estimated cycle is 30 minutes of active time and 3 hours of inactive time.", + "tooltip2": "Estimated cycle is 30 minutes of active time on each node.", "header": "Anomalies (Beta)", "outpostsL": "Outposts", "none": "No Current Anomalies",