From 0fa1a7db0d199f0a142ae67c3cec863e57e80c56 Mon Sep 17 00:00:00 2001 From: Arthur O'Dwyer Date: Fri, 8 May 2020 11:13:16 -0400 Subject: [PATCH] Replace "%The1 is confused!" with "Surprisingly, the%1 does not kill you!" > The current message implies that I've done something clever > to the sandworm in-universe; but in the code, it's apparent > that this is basically an assertion-failure and the whole game > is in a bad state *out-of-universe.* Fixes #95. --- attack.cpp | 3 +-- language-cz.cpp | 2 +- language-de.cpp | 2 +- language-pl.cpp | 2 +- language-ptbr.cpp | 2 +- language-ru.cpp | 2 +- language-tr.cpp | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/attack.cpp b/attack.cpp index b6c53509a..d0b5e47b9 100644 --- a/attack.cpp +++ b/attack.cpp @@ -1185,8 +1185,7 @@ EX void killThePlayer(eMonster m, int id, flagtype flags) { items[itOrbSafety] = 0; } else { -// printf("confused!\n"); - addMessage(XLAT("%The1 is confused!", m)); + addMessage(XLAT("Surprisingly, %the1 does not kill you!")); } } diff --git a/language-cz.cpp b/language-cz.cpp index af3c38a4c..7cf2b66e9 100644 --- a/language-cz.cpp +++ b/language-cz.cpp @@ -200,7 +200,7 @@ S("Stab them by walking around them.", "Probodni ho tím, že ho obejdeš.") S("You feel more experienced in demon fighting!", "Cítíš se zkušenější v boji proti pekelným démonům!") S("Cthulhu withdraws his tentacle!", "Cthulhu stahuje své chapadlo!") S("The sandworm explodes in a cloud of Spice!", "Písečný červ vybuchl v oblaku Koření!") -S("%The1 is confused!", "%1 je zmaten%ý1.") +S("Surprisingly, %the1 does not kill you!", "%1 je zmaten%ý1.") //TODO UPDATE S("%The1 raises some undead!", "%1 probudil nemrtvé!") S("%The1 throws fire at you!", "%1 po tobě vystřelil oheň!") S("%The1 shows you two fingers.", "%1 ti ukáza%l1 dva prsty.") diff --git a/language-de.cpp b/language-de.cpp index 98290d9cd..630c2129d 100644 --- a/language-de.cpp +++ b/language-de.cpp @@ -196,7 +196,7 @@ S("Stab them by walking around them.", "Erstich sie, indem du um sie herumgehst. S("You feel more experienced in demon fighting!", "Du fühlst dich erfahrener im Kampf gegen Dämonen!") S("Cthulhu withdraws his tentacle!", "Cthulhu zieht seinen Tentakel zurück!") S("The sandworm explodes in a cloud of Spice!", "Der Sandwurm explodiert in einer Wolke aus Spice") -S("%The1 is confused!", "%Der1 %1 ist verwirrt.") +S("Surprisingly, %the1 does not kill you!", "%Der1 %1 ist verwirrt.") //TODO UPDATE S("%The1 raises some undead!", "%Der1 %1 beschwört die Toten!") S("%The1 throws fire at you!", "%Der1 %1 wirft Feuer nach dir!") S("%The1 shows you two fingers.", "%Der1 %1 zeigt dir zwei Finger.") diff --git a/language-pl.cpp b/language-pl.cpp index 29359ffb7..6e78d7d73 100644 --- a/language-pl.cpp +++ b/language-pl.cpp @@ -185,7 +185,7 @@ S("Stab them by walking around them.", "Przejdź wokół, by dźgnąć.") S("You feel more experienced in demon fighting!", "Jesteś bardziej doświadczony w walce z demonami!") S("Cthulhu withdraws his tentacle!", "Cthulhu chowa swoją mackę!") S("The sandworm explodes in a cloud of Spice!", "Czerw eksplodował! Chmura Przyprawy!") -S("%The1 is confused!", "%1 jest zmieszan%ya1.") +S("Surprisingly, %the1 does not kill you!", "%1 jest zmieszan%ya1.") //TODO UPDATE S("%The1 raises some undead!", "%1 ożywia nieumarłych!") S("%The1 throws fire at you!", "%1 rzuca w Ciebie ogniem!") S("%The1 shows you two fingers.", "%1 pokaza%ł1 Ci dwa palce.") diff --git a/language-ptbr.cpp b/language-ptbr.cpp index 9122c1906..9f85a8431 100644 --- a/language-ptbr.cpp +++ b/language-ptbr.cpp @@ -188,7 +188,7 @@ S("Stab them by walking around them.", "Apunhale-os andando em volta deles.") S("You feel more experienced in demon fighting!", "Você se sente mais experiente matando demônios!") S("Cthulhu withdraws his tentacle!", "Cthulhu retira seu tentáculo!") S("The sandworm explodes in a cloud of Spice!", "A minhoca de areia explode numa nuvem de Especiarias!") -S("%The1 is confused!", "%na1 está confuso!") +S("Surprisingly, %the1 does not kill you!", "%na1 está confuso!") //TODO UPDATE S("%The1 raises some undead!", "%na1 levanta os mortos!") S("%The1 throws fire at you!", "%na1 joga fogo em você!") S("%The1 shows you two fingers.", "%na1 lhe mostra dois dedos.") diff --git a/language-ru.cpp b/language-ru.cpp index 89f707bed..c3cdf89a0 100644 --- a/language-ru.cpp +++ b/language-ru.cpp @@ -186,7 +186,7 @@ S("Stab them by walking around them.", "Нападите на него сбок S("You feel more experienced in demon fighting!", "Теперь Вы более опытны в борьбе с демонами!") S("Cthulhu withdraws his tentacle!", "Ктулху забирает свой щупальце!") S("The sandworm explodes in a cloud of Spice!", "Червь взорвался и стал облаком пряностей") -S("%The1 is confused!", "%1 в замешательстве") +S("Surprisingly, %the1 does not kill you!", "%1 в замешательстве") //TODO UPDATE S("%The1 raises some undead!", "%1 восстал из мёртвых!") S("%The1 throws fire at you!", "%1 бросил в Вас огнём!") S("%The1 shows you two fingers.", "%1 показал%E1 Вам два пальца.") diff --git a/language-tr.cpp b/language-tr.cpp index e69e1ec95..efd463df5 100644 --- a/language-tr.cpp +++ b/language-tr.cpp @@ -161,7 +161,7 @@ S("Stab them by walking around them.", "Etrafında yürüyerek bıçaklayın.") S("You feel more experienced in demon fighting!", "Şeytanlarla savaşmada daha deneyimli hissediyorsun!") S("Cthulhu withdraws his tentacle!", "Cthulhu dokungacını çekti!") S("The sandworm explodes in a cloud of Spice!", "Kumkurdu patladı ve etrafa baharat saçtı!") -S("%The1 is confused!", "%1 sersemledi.") +S("Surprisingly, %the1 does not kill you!", "%1 sersemledi.") //TODO UPDATE S("%The1 raises some undead!", "%1 ölü çağırdı!") S("%The1 throws fire at you!", "%1 sana ateş attı!") S("%The1 shows you two fingers.", "%1 sana iki parmağını gösterdi.")