From 2a8f0be2575c0310f6e1be861794828135bcc8de Mon Sep 17 00:00:00 2001 From: yairm210 Date: Sat, 28 Sep 2024 22:13:05 +0300 Subject: [PATCH] 4.13.12 --- android/assets/jsons/translations/Afrikaans.properties | 4 ++++ android/assets/jsons/translations/Bangla.properties | 4 ++++ .../assets/jsons/translations/Belarusian.properties | 4 ++++ android/assets/jsons/translations/Bosnian.properties | 4 ++++ .../jsons/translations/Brazilian_Portuguese.properties | 4 ++++ android/assets/jsons/translations/Bulgarian.properties | 4 ++++ android/assets/jsons/translations/Catalan.properties | 4 ++++ android/assets/jsons/translations/Czech.properties | 4 ++++ android/assets/jsons/translations/Dutch.properties | 4 ++++ android/assets/jsons/translations/English.properties | 4 ++++ android/assets/jsons/translations/Filipino.properties | 4 ++++ android/assets/jsons/translations/Finnish.properties | 4 ++++ android/assets/jsons/translations/French.properties | 7 ++++--- android/assets/jsons/translations/Galician.properties | 4 ++++ android/assets/jsons/translations/German.properties | 4 ++++ android/assets/jsons/translations/Greek.properties | 4 ++++ android/assets/jsons/translations/Hungarian.properties | 4 ++++ .../assets/jsons/translations/Indonesian.properties | 4 ++++ android/assets/jsons/translations/Italian.properties | 5 +++++ android/assets/jsons/translations/Japanese.properties | 4 ++++ android/assets/jsons/translations/Korean.properties | 4 ++++ android/assets/jsons/translations/Latin.properties | 4 ++++ .../assets/jsons/translations/Lithuanian.properties | 4 ++++ android/assets/jsons/translations/Malay.properties | 4 ++++ android/assets/jsons/translations/Norwegian.properties | 4 ++++ .../translations/Persian_(Pinglish-DIN).properties | 4 ++++ .../translations/Persian_(Pinglish-UN).properties | 4 ++++ android/assets/jsons/translations/Polish.properties | 4 ++++ .../assets/jsons/translations/Portuguese.properties | 4 ++++ android/assets/jsons/translations/Romanian.properties | 4 ++++ android/assets/jsons/translations/Russian.properties | 4 ++++ android/assets/jsons/translations/Rusyn.properties | 4 ++++ .../jsons/translations/Simplified_Chinese.properties | 4 ++++ android/assets/jsons/translations/Spanish.properties | 4 ++++ android/assets/jsons/translations/Swedish.properties | 4 ++++ android/assets/jsons/translations/Thai.properties | 4 ++++ .../jsons/translations/Traditional_Chinese.properties | 4 ++++ android/assets/jsons/translations/Turkish.properties | 4 ++++ android/assets/jsons/translations/Ukrainian.properties | 4 ++++ .../assets/jsons/translations/Vietnamese.properties | 4 ++++ android/assets/jsons/translations/Zulu.properties | 4 ++++ changelog.md | 6 +++--- .../worldscreen/unit/actions/UnitActionModifiers.kt | 3 +-- docs/Modders/uniques.md | 10 ++++++++++ fastlane/metadata/android/en-US/changelogs/1054.txt | 8 +++----- 45 files changed, 182 insertions(+), 13 deletions(-) diff --git a/android/assets/jsons/translations/Afrikaans.properties b/android/assets/jsons/translations/Afrikaans.properties index 13f218200113b..d042860c33dec 100644 --- a/android/assets/jsons/translations/Afrikaans.properties +++ b/android/assets/jsons/translations/Afrikaans.properties @@ -4250,6 +4250,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Bangla.properties b/android/assets/jsons/translations/Bangla.properties index 8e54e2769d7f3..695c9bbf4ed77 100644 --- a/android/assets/jsons/translations/Bangla.properties +++ b/android/assets/jsons/translations/Bangla.properties @@ -3863,6 +3863,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Belarusian.properties b/android/assets/jsons/translations/Belarusian.properties index aeb86d7e70d49..69dc4e87156bd 100644 --- a/android/assets/jsons/translations/Belarusian.properties +++ b/android/assets/jsons/translations/Belarusian.properties @@ -3909,6 +3909,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Bosnian.properties b/android/assets/jsons/translations/Bosnian.properties index 22bbd57642d8f..465cb29baad09 100644 --- a/android/assets/jsons/translations/Bosnian.properties +++ b/android/assets/jsons/translations/Bosnian.properties @@ -4484,6 +4484,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Brazilian_Portuguese.properties b/android/assets/jsons/translations/Brazilian_Portuguese.properties index ce036615bb22b..3ca1264137456 100644 --- a/android/assets/jsons/translations/Brazilian_Portuguese.properties +++ b/android/assets/jsons/translations/Brazilian_Portuguese.properties @@ -2507,6 +2507,10 @@ upon being defeated = ao ser derrotado upon being promoted = ao ser promovido upon gaining the [promotion] promotion = ao ganhar a promoção [promotion] upon losing the [promotion] promotion = ao perder a promoção [promotion] + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = ao perder pelo menos [amount] de HP em um único ataque upon ending a turn in a [tileFilter] tile = ao terminar um turno em um painel [tileFilter] upon discovering a [tileFilter] tile = ao descobrir um painel [tileFilter] diff --git a/android/assets/jsons/translations/Bulgarian.properties b/android/assets/jsons/translations/Bulgarian.properties index 97ce1bf8290c7..acafd56d14d42 100644 --- a/android/assets/jsons/translations/Bulgarian.properties +++ b/android/assets/jsons/translations/Bulgarian.properties @@ -3547,6 +3547,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Catalan.properties b/android/assets/jsons/translations/Catalan.properties index 55b5da249ad47..11fe58f986963 100644 --- a/android/assets/jsons/translations/Catalan.properties +++ b/android/assets/jsons/translations/Catalan.properties @@ -2504,6 +2504,10 @@ upon being promoted = quan la unitat rep un ascens upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = quan perd com a mínim [amount] PV en un sol atac upon ending a turn in a [tileFilter] tile = quan acaba el torn en una casella de tipus [tileFilter] upon discovering a [tileFilter] tile = quan es descobreix una casella [tileFilter] diff --git a/android/assets/jsons/translations/Czech.properties b/android/assets/jsons/translations/Czech.properties index 9c8d8d9ae52e6..de542f8e49b27 100644 --- a/android/assets/jsons/translations/Czech.properties +++ b/android/assets/jsons/translations/Czech.properties @@ -2965,6 +2965,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index aa5b180620e13..21d95e8d94f2e 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -2654,6 +2654,10 @@ upon being promoted = na gepromoveerd te worden upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = na minstens [amount] HP te verliezen in een enkele aanval upon ending a turn in a [tileFilter] tile = na het beindigen van een beurt in een [tileFilter] tegel upon discovering a [tileFilter] tile = na het ontdekken van een [tileFilter] tegel diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 0dfbc37c49dd4..f803174fa12c1 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -4676,6 +4676,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Filipino.properties b/android/assets/jsons/translations/Filipino.properties index 7bdb319d5a83f..02c42e48dc153 100644 --- a/android/assets/jsons/translations/Filipino.properties +++ b/android/assets/jsons/translations/Filipino.properties @@ -2700,6 +2700,10 @@ upon being promoted = kapag tumaas ang ranggo upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = kapag nabawasan ng hindi bababa ng [amount] HP sa isang pagatake upon ending a turn in a [tileFilter] tile = kapag nagtapaos ang turno sa isang [tileFilter] na tile # Requires translation! diff --git a/android/assets/jsons/translations/Finnish.properties b/android/assets/jsons/translations/Finnish.properties index 936525e1e3c4d..172b25e180aae 100644 --- a/android/assets/jsons/translations/Finnish.properties +++ b/android/assets/jsons/translations/Finnish.properties @@ -3704,6 +3704,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index 7ebcbe18039e0..bb89edd5618e2 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -2297,7 +2297,6 @@ for all movement = pour tous les mouvements requires [amount] movement = nécessite [amount] mouvement(s) costs [stats] stats = coûte des points de [stats] costs [amount] [stockpiledResource] = coûte [amount] [stockpiledResource] - # Requires translation! removing the [promotion] promotion/status = supprimant la promotion/statut [promotion] once = une fois [amount] times = [amount] fois @@ -2500,10 +2499,12 @@ upon defeating a [mapUnitFilter] unit = en vainquant une unité [mapUnitFilter] upon expending a [mapUnitFilter] unit = en consommant une unité [mapUnitFilter] upon being defeated = en étant vaincu(e) upon being promoted = en étant promu(e) - # Requires translation! upon gaining the [promotion] promotion = en obtenant la promotion [promotion] - # Requires translation! upon losing the [promotion] promotion = en perdant la promotion [promotion] + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = en perdant au moins [amount] PV en une seule attaque upon ending a turn in a [tileFilter] tile = en terminant un tour sur une case [tileFilter] upon discovering a [tileFilter] tile = en découvrant une case [tileFilter] diff --git a/android/assets/jsons/translations/Galician.properties b/android/assets/jsons/translations/Galician.properties index 132071d77154a..881790999a56e 100644 --- a/android/assets/jsons/translations/Galician.properties +++ b/android/assets/jsons/translations/Galician.properties @@ -2545,6 +2545,10 @@ upon being promoted = ao ser promovida upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = ao perder polo menos [amount] HP nun só ataque upon ending a turn in a [tileFilter] tile = ao terminar a quenda nunha cela [tileFilter] upon discovering a [tileFilter] tile = ao descubrir unha cela [tileFilter] diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index 252b31cdf357b..05553882c57a2 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -2501,6 +2501,10 @@ upon being defeated = bei einer Niederlage upon being promoted = bei der Beförderung upon gaining the [promotion] promotion = bei Erhalt der [promotion] Beförderung upon losing the [promotion] promotion = bei Verlust der [promotion] Beförderung + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = bei Verlust von mindestens [amount] LP in einem einzigen Angriff upon ending a turn in a [tileFilter] tile = bei Beendigung einer Runde auf einem [tileFilter] Feld upon discovering a [tileFilter] tile = bei Entdeckung eines [tileFilter] Feldes diff --git a/android/assets/jsons/translations/Greek.properties b/android/assets/jsons/translations/Greek.properties index 787205c2517e9..bc4a6b3a50206 100644 --- a/android/assets/jsons/translations/Greek.properties +++ b/android/assets/jsons/translations/Greek.properties @@ -4290,6 +4290,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Hungarian.properties b/android/assets/jsons/translations/Hungarian.properties index f45640dc58a43..b5f6167ff3c3a 100644 --- a/android/assets/jsons/translations/Hungarian.properties +++ b/android/assets/jsons/translations/Hungarian.properties @@ -2563,6 +2563,10 @@ upon being promoted = előléptetéskor upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = egyetlen támadásban legalább [amount] ÉP elvesztésekor upon ending a turn in a [tileFilter] tile = a kör [tileFilter] mezőn való befejezésekor upon discovering a [tileFilter] tile = egy [tileFilter] mező felfedezésekor diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index aefdfaf8aef12..86cad6bc7d213 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -2504,6 +2504,10 @@ upon being promoted = saat dipromosikan upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = saat kehilangan setidaknya [amount] HP dalam satu serangan upon ending a turn in a [tileFilter] tile = saat mengakhiri giliran di ubin [tileFilter] upon discovering a [tileFilter] tile = saat menemukan ubin [tileFilter] diff --git a/android/assets/jsons/translations/Italian.properties b/android/assets/jsons/translations/Italian.properties index 262778114c66f..958d52a6cfc78 100644 --- a/android/assets/jsons/translations/Italian.properties +++ b/android/assets/jsons/translations/Italian.properties @@ -2507,6 +2507,10 @@ upon being defeated = quando vieni sconfitto in battaglia upon being promoted = quando promuovi un'unità upon gaining the [promotion] promotion = quando ottieni la promozione [promotion] upon losing the [promotion] promotion = quando perdi la promozione [promotion] + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = quando perdi almeno [amount] HP in un unico attacco upon ending a turn in a [tileFilter] tile = quando finisci un turno su una casella [tileFilter] upon discovering a [tileFilter] tile = quando scopri una casella [tileFilter] @@ -3042,6 +3046,7 @@ Windmill = Mulino a vento Kremlin = Cremlino 'The Kremlin is constantly changing the rules of the game to suit its purposes. We are not playing chess, we're playing roulette.' - Garry Kasparov = 'Il Cremlino cambia di continuo le regole del gioco per adattarle ai suoi scopi. Non stiamo giocando a scacchi, stiamo giocando alla roulette.' - Garry Kasparov + Museum = Museo The Louvre = Il Louvre diff --git a/android/assets/jsons/translations/Japanese.properties b/android/assets/jsons/translations/Japanese.properties index aff634f194f00..2d4a7c61ea03a 100644 --- a/android/assets/jsons/translations/Japanese.properties +++ b/android/assets/jsons/translations/Japanese.properties @@ -2773,6 +2773,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Korean.properties b/android/assets/jsons/translations/Korean.properties index 3106f679a20ce..5717665e93b90 100644 --- a/android/assets/jsons/translations/Korean.properties +++ b/android/assets/jsons/translations/Korean.properties @@ -2610,6 +2610,10 @@ upon being promoted = 승급 시 upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = 공격 1회에 [amount] HP 이상의 피해를 입을 시 upon ending a turn in a [tileFilter] tile = [tileFilter] 타일에서 턴을 마칠 시 upon discovering a [tileFilter] tile = [tileFilter] 타일 발견 시 diff --git a/android/assets/jsons/translations/Latin.properties b/android/assets/jsons/translations/Latin.properties index 407745bb50fb2..4816f2ab14003 100644 --- a/android/assets/jsons/translations/Latin.properties +++ b/android/assets/jsons/translations/Latin.properties @@ -3152,6 +3152,10 @@ upon being promoted = quandocumque promota sit upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = quandocumque in una oppugnatione amittit sanitatem non pauciorem quam [amount] upon ending a turn in a [tileFilter] tile = quandocumque passus perficitur si est in tegula quæ est [tileFilter] upon discovering a [tileFilter] tile = quandocumque invenias tegulam quæ sit [tileFilter] diff --git a/android/assets/jsons/translations/Lithuanian.properties b/android/assets/jsons/translations/Lithuanian.properties index 1f30aeda2cb70..e1f2788face05 100644 --- a/android/assets/jsons/translations/Lithuanian.properties +++ b/android/assets/jsons/translations/Lithuanian.properties @@ -2992,6 +2992,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Malay.properties b/android/assets/jsons/translations/Malay.properties index 37e243172a496..bf6251072567c 100644 --- a/android/assets/jsons/translations/Malay.properties +++ b/android/assets/jsons/translations/Malay.properties @@ -3624,6 +3624,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Norwegian.properties b/android/assets/jsons/translations/Norwegian.properties index 65a4b91de3a5c..63800829f7fa5 100644 --- a/android/assets/jsons/translations/Norwegian.properties +++ b/android/assets/jsons/translations/Norwegian.properties @@ -3160,6 +3160,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties index 2f6b3a6cafd01..2eb2fea19ce31 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-DIN).properties @@ -4074,6 +4074,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties index a2d5376c9fa1d..b5b9ad632bd56 100644 --- a/android/assets/jsons/translations/Persian_(Pinglish-UN).properties +++ b/android/assets/jsons/translations/Persian_(Pinglish-UN).properties @@ -3644,6 +3644,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Polish.properties b/android/assets/jsons/translations/Polish.properties index 5c912658e715a..6c146d1622448 100644 --- a/android/assets/jsons/translations/Polish.properties +++ b/android/assets/jsons/translations/Polish.properties @@ -2512,6 +2512,10 @@ upon being promoted = po byciu awansowanym upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = po straceniu przynajmniej [amount] PŻ w pojedynczym ataku upon ending a turn in a [tileFilter] tile = po zakończeniu tury na polu [tileFilter] upon discovering a [tileFilter] tile = po odkryciu pola [tileFilter] diff --git a/android/assets/jsons/translations/Portuguese.properties b/android/assets/jsons/translations/Portuguese.properties index f9268be53a513..9e54a78b367f6 100644 --- a/android/assets/jsons/translations/Portuguese.properties +++ b/android/assets/jsons/translations/Portuguese.properties @@ -2580,6 +2580,10 @@ upon being promoted = ao ser promovido upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = ao perder pelo menos [amount] HP num único ataque upon ending a turn in a [tileFilter] tile = ao terminar um turno num bloco [tileFilter] upon discovering a [tileFilter] tile = ao descobrir um bloco [tileFilter] diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 9a87580c0f15d..c8af55e5bfd98 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -2950,6 +2950,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Russian.properties b/android/assets/jsons/translations/Russian.properties index aa99931b868b6..678b806fb4137 100644 --- a/android/assets/jsons/translations/Russian.properties +++ b/android/assets/jsons/translations/Russian.properties @@ -2537,6 +2537,10 @@ upon being promoted = при повышении upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = при потере как минимум [amount] ОЗ за одну атаку upon ending a turn in a [tileFilter] tile = при окончании хода на [tileFilter] upon discovering a [tileFilter] tile = при нахождении клетки [tileFilter] diff --git a/android/assets/jsons/translations/Rusyn.properties b/android/assets/jsons/translations/Rusyn.properties index 5779f6f996594..5f39dea8fd0e6 100644 --- a/android/assets/jsons/translations/Rusyn.properties +++ b/android/assets/jsons/translations/Rusyn.properties @@ -3979,6 +3979,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Simplified_Chinese.properties b/android/assets/jsons/translations/Simplified_Chinese.properties index a05e50f63cacb..00f0d19e53396 100644 --- a/android/assets/jsons/translations/Simplified_Chinese.properties +++ b/android/assets/jsons/translations/Simplified_Chinese.properties @@ -2504,6 +2504,10 @@ upon being promoted = 被晋升时 upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = 单次战斗中丢失至少[amount]HP时 upon ending a turn in a [tileFilter] tile = 在[tileFilter]地块上结束回合时 upon discovering a [tileFilter] tile = 当发现[tileFilter]地块后 diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index 4b4d681b86d22..f5e7b3158195a 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -2504,6 +2504,10 @@ upon being promoted = al ser promovida upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = al perder por lo menos [amount] HP en un solo ataque upon ending a turn in a [tileFilter] tile = al terminar turno en una casilla de [tileFilter] upon discovering a [tileFilter] tile = al descubrir una casilla de [tileFilter] diff --git a/android/assets/jsons/translations/Swedish.properties b/android/assets/jsons/translations/Swedish.properties index 7870f0faabf84..129c15247c446 100644 --- a/android/assets/jsons/translations/Swedish.properties +++ b/android/assets/jsons/translations/Swedish.properties @@ -3006,6 +3006,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Thai.properties b/android/assets/jsons/translations/Thai.properties index 5a6ec1d97dfed..5cb580b6a2a24 100644 --- a/android/assets/jsons/translations/Thai.properties +++ b/android/assets/jsons/translations/Thai.properties @@ -4524,6 +4524,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/android/assets/jsons/translations/Traditional_Chinese.properties b/android/assets/jsons/translations/Traditional_Chinese.properties index c3f6c7fa9bf6a..8fb21bc540125 100644 --- a/android/assets/jsons/translations/Traditional_Chinese.properties +++ b/android/assets/jsons/translations/Traditional_Chinese.properties @@ -2578,6 +2578,10 @@ upon being promoted = 被晉升時 upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = 每當在單次戰鬥中失去至少 [amount] HP時 upon ending a turn in a [tileFilter] tile = 每當在[tileFilter]地塊上結束回合時 upon discovering a [tileFilter] tile = 每當發現[tileFilter]地塊時 diff --git a/android/assets/jsons/translations/Turkish.properties b/android/assets/jsons/translations/Turkish.properties index 8faa989603426..e0a1bd6ab48ac 100644 --- a/android/assets/jsons/translations/Turkish.properties +++ b/android/assets/jsons/translations/Turkish.properties @@ -2586,6 +2586,10 @@ upon being promoted = terfi edildiğinde upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = tek bir saldırıda en az [amount] can kaybedildiğinde upon ending a turn in a [tileFilter] tile = bir tur [tileFilter] karosunda sonlandığında upon discovering a [tileFilter] tile = bir [tileFilter] karosu keşfedildiğinde diff --git a/android/assets/jsons/translations/Ukrainian.properties b/android/assets/jsons/translations/Ukrainian.properties index 5121457166ed3..7147eeb6e8938 100644 --- a/android/assets/jsons/translations/Ukrainian.properties +++ b/android/assets/jsons/translations/Ukrainian.properties @@ -2517,6 +2517,10 @@ upon being promoted = при підвищенні upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = при втраті принаймні [amount] ОЗ за одну атаку upon ending a turn in a [tileFilter] tile = при закінченні ходу в клітинках типу [tileFilter] upon discovering a [tileFilter] tile = при знаходженні клітинки типу [tileFilter] diff --git a/android/assets/jsons/translations/Vietnamese.properties b/android/assets/jsons/translations/Vietnamese.properties index 34db23459fec4..390cdb012bd21 100644 --- a/android/assets/jsons/translations/Vietnamese.properties +++ b/android/assets/jsons/translations/Vietnamese.properties @@ -2511,6 +2511,10 @@ upon being promoted = khi được thăng cấp upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = + # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = upon losing at least [amount] HP in a single attack = khi mất ít nhất [amount] HP trong một đòn tấn công upon ending a turn in a [tileFilter] tile = khi kết thúc lượt trên ô [tileFilter] upon discovering a [tileFilter] tile = khi khám phá ô [tileFilter] diff --git a/android/assets/jsons/translations/Zulu.properties b/android/assets/jsons/translations/Zulu.properties index 793301e311db5..7a5c9d92e7eab 100644 --- a/android/assets/jsons/translations/Zulu.properties +++ b/android/assets/jsons/translations/Zulu.properties @@ -4128,6 +4128,10 @@ upon gaining the [promotion] promotion = # Requires translation! upon losing the [promotion] promotion = # Requires translation! +upon gaining the [promotion] status = + # Requires translation! +upon losing the [promotion] status = + # Requires translation! upon losing at least [amount] HP in a single attack = # Requires translation! upon ending a turn in a [tileFilter] tile = diff --git a/changelog.md b/changelog.md index df15964d7fa50..8eec32a531dbe 100644 --- a/changelog.md +++ b/changelog.md @@ -1,10 +1,10 @@ ## 4.13.12 -Resolved - Cannot have 2 research agreements at once due to counteroffers +Cannot have 2 research agreements at once due to counteroffers -Resolved - added "upon losing/gaining the [promotion] status" unit triggers +Modding: Added "upon losing/gaining the [promotion] status" unit triggers -chore: Added unit.removeStatus helper function +Mod branch parsing (downloading from user input url) can now handle branch names containing "/" Fixed "Top" edge tiles not showing - kudos @legacymtgsalvationuser69544 diff --git a/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionModifiers.kt b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionModifiers.kt index 2dcb713a36c80..161f091bef218 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionModifiers.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/unit/actions/UnitActionModifiers.kt @@ -74,7 +74,7 @@ object UnitActionModifiers { return true } - /**Checks if this Action Unique can be executed, based on action modifiers + /** Checks if this Action Unique can be executed, based on action modifiers * @param unit: The specific unit executing the Action * @param actionUnique: Unique that defines the Action * @return Boolean @@ -120,7 +120,6 @@ object UnitActionModifiers { UniqueType.UnitActionRemovingPromotion -> { val promotionName = conditional.params[0] // if has a status, remove that instead - the promotion is 'safe' - val unitStatus = if (unit.statuses.any { it.name == promotionName }) { unit.removeStatus(promotionName) } else { // check for real promotion diff --git a/docs/Modders/uniques.md b/docs/Modders/uniques.md index 4d685b7e3a62c..abd36a157b0f3 100644 --- a/docs/Modders/uniques.md +++ b/docs/Modders/uniques.md @@ -3272,6 +3272,16 @@ If your mod renames Coast or Lakes, do not use this with one of these as paramet Applicable to: UnitTriggerCondition +??? example "<upon gaining the [promotion] status>" + Example: "<upon gaining the [Shock I] status>" + + Applicable to: UnitTriggerCondition + +??? example "<upon losing the [promotion] status>" + Example: "<upon losing the [Shock I] status>" + + Applicable to: UnitTriggerCondition + ??? example "<upon losing at least [amount] HP in a single attack>" Example: "<upon losing at least [3] HP in a single attack>" diff --git a/fastlane/metadata/android/en-US/changelogs/1054.txt b/fastlane/metadata/android/en-US/changelogs/1054.txt index 24d2b95333aa4..1512704ab02f9 100644 --- a/fastlane/metadata/android/en-US/changelogs/1054.txt +++ b/fastlane/metadata/android/en-US/changelogs/1054.txt @@ -1,9 +1,7 @@ +Cannot have 2 research agreements at once due to counteroffers +Modding: Added "upon losing/gaining the [promotion] status" unit triggers -Resolved - Cannot have 2 research agreements at once due to counteroffers - -Resolved - added "upon losing/gaining the [promotion] status" unit triggers - -chore: Added unit.removeStatus helper function +Mod branch parsing (downloading from user input url) can now handle branch names containing "/" Fixed "Top" edge tiles not showing - kudos @legacymtgsalvationuser69544 \ No newline at end of file