Skip to content

Commit

Permalink
fix(L10n): add description that Blaze Away exhausts (#207)
Browse files Browse the repository at this point in the history
* fix(L10n): add description that `Blaze Away` exhausts

* chore: ignore L10n symlink when searching

* refactor: remove unused variable
  • Loading branch information
scarf005 committed May 1, 2023
1 parent 97c8c63 commit 4fe751e
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 19 deletions.
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
"[jsonc]": {
"editor.defaultFormatter": "denoland.vscode-deno"
},
"search.exclude": {
"localization/": true,
"src/main/resources/localization/schemas": true
},
"conventionalCommits.scopes": [
"github",
"README",
Expand Down
5 changes: 2 additions & 3 deletions src/main/kotlin/marisa/cards/BlazeAway.kt
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ class BlazeAway : CustomCard(

with(lastCard) {
MarisaContinued.logger.info(
"""BlazeAway: card :$cardID;
|baseD: $baseDamage; Damage: $damage; baseB :$baseBlock ; B: $block ;
"""BlazeAway: card :$cardID;
|baseD: $baseDamage; Damage: $damage; baseB :$baseBlock ; B: $block ;
|baseM: $baseMagicNumber ; M : $magicNumber ; C : $cost ; CFT: $costForTurn""".trimMargin()
)
}
Expand All @@ -71,7 +71,6 @@ class BlazeAway : CustomCard(
private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
val NAME = cardStrings.NAME
val DESCRIPTION = cardStrings.DESCRIPTION
val DESCRIPTION_UPG = cardStrings.UPGRADE_DESCRIPTION

private data class Description(val opening: String, val closing: String, val none: String) {
fun render(last: AbstractCard?) = last?.let { "$opening${it.name}$closing" } ?: none
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/localization/ENG/cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,7 @@
},
"BlazeAway": {
"NAME": "Blaze Away",
"DESCRIPTION": "Play the last Attack you played this turn !M! time(s).",
"UPGRADE_DESCRIPTION": "Add 2 copies of the last Attack you played this turn to your hand. NL They cost 0 this turn.",
"DESCRIPTION": "Play the last Attack you played this turn !M! time(s). NL Exhaust.",
"EXTENDED_DESCRIPTION": [
" NL (Last Attack : ",
" ).",
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/localization/FRA/cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@
},
"BlazeAway": {
"NAME": "Flambée",
"DESCRIPTION": "Ajoutez une copie de la dernière Attaque jouée ce tour dans votre main. NL Elle coûte 0 ce tour. ",
"UPGRADE_DESCRIPTION": "Ajoutez 2 copies de la dernière Attaque jouée ce tour dans votre main. NL Elle coûte 0 ce tour.",
"DESCRIPTION": "Ajoutez une copie de la dernière Attaque jouée ce tour dans votre main. NL Elle coûte 0 ce tour. NL Épuisement.",
"EXTENDED_DESCRIPTION": [
" NL (Dernière attaque : ",
" ).",
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/localization/JPN/cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@
},
"BlazeAway": {
"NAME": "ブレイズアウェイ",
"DESCRIPTION": "このターン中、最後にプレイした アタック を !M! 回 プレイする。",
"UPGRADE_DESCRIPTION": "このターン中、最後にプレイした アタック の複製 2 枚を手札に加える。 NL このターンそのカードのコストは 0 。",
"DESCRIPTION": "このターン中、最後にプレイした アタック を !M! 回 プレイする。 NL 廃棄",
"EXTENDED_DESCRIPTION": [
" NL (最後に使用した アタック : ",
" )。",
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/localization/KOR/cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
},
"BlazeAway": {
"NAME": "블레이즈 어웨이",
"DESCRIPTION": "이번 턴에 마지막으로 사용한 공격 카드를 !M! 회 사용합니다.",
"DESCRIPTION": "이번 턴에 마지막으로 사용한 공격 카드를 !M! 회 사용합니다. NL 소멸.",
"EXTENDED_DESCRIPTION": [
" NL (사용할 카드 : ",
" )",
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/localization/ZHS/cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@
},
"BlazeAway": {
"NAME": "连续发射",
"DESCRIPTION": "打出本回合最后使用过的攻击卡的 !M! 次。",
"UPGRADE_DESCRIPTION": "将你本回合最后使用过的攻击卡的两张复制加入手牌。使其本回合内费用变为0。",
"DESCRIPTION": "打出本回合最后使用过的攻击卡的 !M! 次。 NL 消耗 。",
"EXTENDED_DESCRIPTION": [
" NL (最后使用的攻击卡 : ",
" )。",
Expand Down
3 changes: 1 addition & 2 deletions src/main/resources/localization/ZHT/cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,7 @@
},
"BlazeAway": {
"NAME": "連續發射",
"DESCRIPTION": "打出本回合最後打出的攻擊牌 !M! 次。",
"UPGRADE_DESCRIPTION": "複製 2 張本回合最後打出的攻擊牌到手牌,該牌在本回合耗能變為0。",
"DESCRIPTION": "打出本回合最後打出的攻擊牌 !M! 次。 NL 消耗",
"EXTENDED_DESCRIPTION": [
" NL (最後打出的攻擊牌: ",
"",
Expand Down
4 changes: 0 additions & 4 deletions src/main/resources/localization/schemas/cards.json
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,6 @@
"DESCRIPTION": {
"type": "string"
},
"UPGRADE_DESCRIPTION": {
"type": "string"
},
"EXTENDED_DESCRIPTION": {
"type": "array",
"minItems": 3,
Expand All @@ -677,7 +674,6 @@
"required": [
"NAME",
"DESCRIPTION",
"UPGRADE_DESCRIPTION",
"EXTENDED_DESCRIPTION"
],
"additionalProperties": false
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/localization/schemas/cards.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ export const schema = z.object({
"BlazeAway": z.object({
"NAME": z.string(),
"DESCRIPTION": z.string(),
"UPGRADE_DESCRIPTION": z.string(),
"EXTENDED_DESCRIPTION": z.tuple([z.string(), z.string(), z.string()]),
}).strict(),
"MaximisePower": z.object({
Expand Down

0 comments on commit 4fe751e

Please sign in to comment.