Skip to content

Commit 9f799bd

Browse files
Discard research plan: Always show notice to gain CrypCoin from supplement space (#31)
and not only when actually the plan from the first column is chosen
1 parent adcdb9f commit 9f799bd

5 files changed

Lines changed: 5 additions & 14 deletions

File tree

src/components/turn/action/DiscardResearchPlan.vue

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<span v-html="t('turnBot.action.discardResearchPlan.discardSpecial')"></span>
55
</template>
66
<template v-else>
7-
<span v-if="isFirstCol" v-html="t('turnBot.action.discardResearchPlan.discardFirstCol',{plan:plan})"></span>
8-
<span v-else v-html="t('turnBot.action.discardResearchPlan.discard',{plan:plan})"></span>
7+
<span v-html="t('turnBot.action.discardResearchPlan.discard',{plan:plan})"></span>
98
<div class="selection">
109
<AppIcon type="selection" name="research-plan-selection" class="matrix"/>
1110
<table>
@@ -76,10 +75,6 @@ export default defineComponent({
7675
return ''
7776
}
7877
},
79-
isFirstCol() : boolean {
80-
const row = this.action.researchPlanRow ?? []
81-
return row.length > 0 && row[0].includes(this.slot)
82-
},
8378
isSpecialPlan() : boolean {
8479
return this.action.researchPlanSelection == ResearchPlanSelection.SPECIAL_RESEARCH
8580
}

src/locales/ca.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@
8787
}
8888
},
8989
"discardResearchPlan": {
90-
"discard": "Luna descarta un <b>pla de recerca {plan}</b>:",
91-
"discardFirstCol": "Luna descarta un <b>pla de recerca {plan}</b>; també guanya qualsevol CrypCoin de l'espai suplementari:",
90+
"discard": "Luna descarta un <b>pla de recerca {plan}</b>; també guanya qualsevol CrypCoin de l'espai suplementari:",
9291
"discardSpecial": "Luna descarta <b>l'últim pla especial d'investigació capgirat</b>.",
9392
"help": {
9493
"title": "Descarta pla de recerca",

src/locales/de.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@
9393
}
9494
},
9595
"discardResearchPlan": {
96-
"discard": "Luna entfernt den <b>{plan}-Forschungsplan</b>:",
97-
"discardFirstCol": "Luna entfernt den <b>{plan}-Forschungsplan</b>; liegen auf dem Zuschussfeld noch CrypCoin, erhält sie diese:",
96+
"discard": "Luna entfernt den <b>{plan}-Forschungsplan</b>; liegen auf dem Zuschussfeld noch CrypCoin, erhält sie diese:",
9897
"discardSpecial": "Luna entfernt den <b>neuesten offenen Sonder-Forschungsplan</b>.",
9998
"help": {
10099
"title": "Forschungsplan entfernen",

src/locales/en.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,7 @@
9393
}
9494
},
9595
"discardResearchPlan": {
96-
"discard": "Luna discards a <b>{plan}-research plan</b>:",
97-
"discardFirstCol": "Luna discards a <b>{plan}-research plan</b>; she also gains any CrypCoin on the supplement space:",
96+
"discard": "Luna discards a <b>{plan}-research plan</b>; she also gains any CrypCoin on the supplement space:",
9897
"discardSpecial": "Luna discards the <b>latest face-up special research plan</b>.",
9998
"help": {
10099
"title": "Discard Research Plan",

src/locales/fr.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@
8787
}
8888
},
8989
"discardResearchPlan": {
90-
"discard": "Luna défausse un <b>{plan}-plan de recherche</b>:",
91-
"discardFirstCol": "Luna défausse un <b>{plan}-plan de recherche</b>; Luna gagne le CrypCoin sur la case de prime",
90+
"discard": "Luna défausse un <b>{plan}-plan de recherche</b>; Luna gagne le CrypCoin sur la case de prime",
9291
"discardSpecial": "Luna défausse le <b>dernier plan de recherche spécial apparu </b>.",
9392
"help": {
9493
"title": "Défausse un jeton de recherche",

0 commit comments

Comments
 (0)