From 41235b4afa9d65c424a1b5e31edff5013b77c22e Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Mon, 31 May 2021 11:24:00 +0200 Subject: [PATCH] Increased lands_for_hell() to 40 in casual --- content.cpp | 2 +- landlock.cpp | 4 ++++ language-cz.cpp | 4 ++-- language-de.cpp | 2 +- language-pl.cpp | 4 ++-- language-ru.cpp | 4 ++-- language-tr.cpp | 4 ++-- menus.cpp | 2 +- quit.cpp | 2 +- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/content.cpp b/content.cpp index 675f7fc9..dc4d137e 100644 --- a/content.cpp +++ b/content.cpp @@ -1131,7 +1131,7 @@ LAND( 0xC00000, "Hell", laHell, ZERO, itHell, RESERVED, "A land filled with demons and molten sulphur. Abandon all hope ye who enter here!" ) NATIVE((m == moLesser || m == moGreater) ? 2 : 0) - REQ(NUMBER(orbsUnlocked(), 9, XLAT("Finished lands required: %1 (collect %2 treasure)\n", "9", its(R10)))) + REQ(NUMBER(orbsUnlocked(), lands_for_hell(), XLAT("Finished lands required: %1 (collect %2 treasure)\n", "9", its(R10)))) LAND( 0x00FF00, "Cocytus", laCocytus, ZERO | LF_ICY, itSapphire, RESERVED, cocytushelp diff --git a/landlock.cpp b/landlock.cpp index 74b0470b..b47fb7bb 100644 --- a/landlock.cpp +++ b/landlock.cpp @@ -166,6 +166,10 @@ EX bool landUnlockedRPM(eLand n) { return false; } +EX int lands_for_hell() { + return casual ? 40 : 9; + } + EX int variant_unlock_value() { return inv::on ? 75 : 30; } diff --git a/language-cz.cpp b/language-cz.cpp index 133b3277..5dd90535 100644 --- a/language-cz.cpp +++ b/language-cz.cpp @@ -369,7 +369,7 @@ S("Enemies killed: %1", "Zabitých netvorů: %1") S("Orbs of Yendor found: %1", "Nalezených Yendorských sfér: %1") S("Collect %1 $$$ to access more worlds", "Další kraje zpřístupníš sesbíráním %1 $$$") // S("Collect %1 $$$ to access R'Lyeh and Dry Forest", "R'Lyeh a Suchý hvozd zpřístupníš sesbíráním %1 $$$") -S("Collect at least %1 treasures in each of 9 types to access Hell", "Peklo zpřístupníš sesbíráním %1 pokladů od každého z 9 typů") +S("Collect at least %1 treasures in each of %2 types to access Hell", "Peklo zpřístupníš sesbíráním %1 pokladů od každého z %2 typů") S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "Yendorské sféry zpřístupníš sesbíráním nejméně %1 Čertových kvítek") S("Hyperstone Quest: collect at least %3 %1 in %the2", "Hyperkamový úkol: sesbírej nejméně %3 pokladů %abl2") S("Hyperstone Quest completed!", "Hyperkamový úkol splněn!") @@ -2548,7 +2548,7 @@ S("Variants of %the1 are available in the Random Pattern Mode after " S(" kills: %1", " zabito nepřátel: %1") S(" $$$: %1", " $$$: %1") S(" Hyperstone: %1/%2", " Hyperkamy: %1/%2") -S(" Hell: %1/9", " Peklo: %1/9") +S(" Hell: %1/%2", " Peklo: %1/%2") // improved editor // --------------- diff --git a/language-de.cpp b/language-de.cpp index 08407857..14f89671 100644 --- a/language-de.cpp +++ b/language-de.cpp @@ -351,7 +351,7 @@ S("Your score: %1", "Punkte: %1") S("Enemies killed: %1", "Getötete Gegner: %1") S("Orbs of Yendor found: %1", "Orbs von Yendor gefunden: %1") S("Collect %1 $$$ to access more worlds", "Sammle %1 $$$ um mehr Länder betreten zu können") -S("Collect at least %1 treasures in each of 9 types to access Hell", "Sammle 9 verschiedene Schätze mindestens %1x um Zugang zur Hölle zu erhalten") +S("Collect at least %1 treasures in each of %2 types to access Hell", "Sammle %2 verschiedene Schätze mindestens %1x um Zugang zur Hölle zu erhalten") S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "Sammle mindestens %1 Dämonenblümchen um die Orbs von Yendor zu finden") S("Hyperstone Quest: collect at least %3 %1 in %the2", "Hyperstein-Herausforderung: Sammle %3 %P1 %a2") S("Hyperstone Quest completed!", "Hyperstein-Herausforderung abgeschlossen!") diff --git a/language-pl.cpp b/language-pl.cpp index 8b457771..20527e96 100644 --- a/language-pl.cpp +++ b/language-pl.cpp @@ -340,7 +340,7 @@ S("Your score: %1", "Twój wynik: %1") S("Enemies killed: %1", "Potwory pokonane: %1") S("Orbs of Yendor found: %1", "Znalezione Sfery Yendoru: %1") S("Collect %1 $$$ to access more worlds", "Znajdź %1 $$$, by iść do nowych krain") -S("Collect at least %1 treasures in each of 9 types to access Hell", "Znajdź po %1 skarbów w 9 typach, by się dostać do Piekła") +S("Collect at least %1 treasures in each of 9 types to access Hell", "Znajdź po %1 skarbów w %2 typach, by się dostać do Piekła") S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "Znajdź %1 Czarciego Ziela, by znaleźć Sfery Yendoru") S("Hyperstone Quest: collect at least %3 %1 in %the2", "Misja alternatywna: znajdź co najmniej %3 skarbów %abl2") S("Hyperstone Quest completed!", "Misja alternatywna zakończona!") @@ -2519,7 +2519,7 @@ S("Variants of %the1 are available in the Random Pattern Mode after " S(" kills: %1", " zabicia: %1") S(" $$$: %1", " $$$: %1") S(" Hyperstone: %1/%2", " Hiperkamienie: %1/%2") -S(" Hell: %1/9", " Piekło: %1/9") +S(" Hell: %1/%2", " Piekło: %1/%2") // improved editor diff --git a/language-ru.cpp b/language-ru.cpp index 2dc25f68..09019578 100644 --- a/language-ru.cpp +++ b/language-ru.cpp @@ -342,7 +342,7 @@ S("Your score: %1", "Ваш счёт: %1") S("Enemies killed: %1", "Врагов убито: %1") S("Orbs of Yendor found: %1", "Собрано сфер Йендора: %1") S("Collect %1 $$$ to access more worlds", "Соберите %1 $$$, чтобы открыть новые земли") -S("Collect at least %1 treasures in each of 9 types to access Hell", "Соберите хотя бы по %1 сокровищ 9 разных типов, чтобы попасть в Ад") +S("Collect at least %1 treasures in each of 9 types to access Hell", "Соберите хотя бы по %1 сокровищ %2 разных типов, чтобы попасть в Ад") S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "Соберите %1 адских ромашек, чтобы найти сферу Йендора") S("Hyperstone Quest: collect at least %3 %1 in %the2", "Миссия Гиперкамня: соберите %3 драгоценностей в %abl2") S("Hyperstone Quest completed!", "Миссия Гиперкамня закончена!") @@ -2527,7 +2527,7 @@ S("Variants of %the1 are available in the Random Pattern Mode after " S(" kills: %1", " убийств: %1") S(" $$$: %1", " $$$: %1") S(" Hyperstone: %1/%2", " Гиперкамней: %1/%2") -S(" Hell: %1/9", " Ад: %1/9") +S(" Hell: %1/%2", " Ад: %1/%2") // improved editor // --------------- diff --git a/language-tr.cpp b/language-tr.cpp index 620f3b87..84fd7893 100644 --- a/language-tr.cpp +++ b/language-tr.cpp @@ -322,7 +322,7 @@ S("Enemies killed: %1", "Öldürülen Düşmanlar: %1") S("Orbs of Yendor found: %1", "Bulunan Yendor Küresi sayısı: %1") S("Collect %1 $$$ to access more worlds", "%1 $$$ toplayarak başka dünyalara eriş") // S("Collect %1 $$$ to access R'Lyeh and Dry Forest", "60 $$$ toplayarak R'Lyeh ve Kara Ormana eriş.") -S("Collect at least %1 treasures in each of 9 types to access Hell", "9 hazine çeşidinin hepsinden %1'ar tane toplayarak Cehenneme erişebilirsin.") +S("Collect at least %1 treasures in each of 9 types to access Hell", "%2 hazine çeşidinin hepsinden %1'ar tane toplayarak Cehenneme erişebilirsin.") S("Collect at least %1 Demon Daisies to find the Orbs of Yendor", "%1 Şeytan Papatyası toplayarak Yendorun Kürelerini bulabilirsin.") S("Hyperstone Quest: collect at least %3 %1 in %the2", "Aşkıntaş Görevi: %2'de en az %3 hazine topla.") S("Hyperstone Quest completed!", "Aşkıntaş görevi tamamlandı.") @@ -2401,7 +2401,7 @@ S("Variants of %the1 are available in the Random Pattern Mode after " S(" kills: %1", " leşler: %1") S(" $$$: %1", " $$$: %1") S(" Hyperstone: %1/%2", " Aşkıntaş: %1/%2") -S(" Hell: %1/9", " Cehennem: %1/9") +S(" Hell: %1/%2", " Cehennem: %1/%2") // improved editor // --------------- diff --git a/menus.cpp b/menus.cpp index 2b7cbbe9..a08ffd9f 100644 --- a/menus.cpp +++ b/menus.cpp @@ -38,7 +38,7 @@ EX void showOverview() { mouseovers += XLAT(" Hyperstone: %1/%2", its(i1), its(i2)); } else - mouseovers += XLAT(" Hell: %1/9", its(orbsUnlocked())); + mouseovers += XLAT(" Hell: %1/%2", its(orbsUnlocked()), its(lands_for_hell())); } bool pages; diff --git a/quit.cpp b/quit.cpp index b5b230da..fc7236ef 100644 --- a/quit.cpp +++ b/quit.cpp @@ -390,7 +390,7 @@ EX void showMission() { else if(gold() < R60) dialog::addInfo(XLAT("Collect %1 $$$ to access even more lands", its(R60))); else if(!landUnlocked(laHell)) - dialog::addInfo(XLAT("Collect at least %1 treasures in each of 9 types to access Hell", its(R10))); + dialog::addInfo(XLAT("Collect at least %1 treasures in each of %2 types to access Hell", its(R10), its(lands_for_hell()))); else if(items[itHell] < R10) dialog::addInfo(XLAT("Collect at least %1 Demon Daisies to find the Orbs of Yendor", its(R10))); else if(isize(yendor::yi) == 0)