diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04c462b89..4293b064f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,14 @@ jobs: - name: ShellCheck uses: ludeeus/action-shellcheck@master -# - name: Run tests -# run: ./extra/tests.sh + - name: Fallout tests + uses: BGforgeNet/fallout-tests@main + with: + scripts_h: scripts_src/headers/scripts.h + scripts_lst: data/scripts/scripts.lst + scripts_dir: scripts_src + dialog_dir: data/text/english/dialog + worldmap_path: false - name: Install wine uses: devopsx/gha-ubuntu-i386-fix@master diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 991a1c0ca..6b001f6f1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -13,8 +13,14 @@ jobs: - name: ShellCheck uses: ludeeus/action-shellcheck@master - - name: Run tests - run: ./extra/tests.sh + - name: Fallout tests + uses: BGforgeNet/fallout-tests@main + with: + scripts_h: scripts_src/headers/scripts.h + scripts_lst: data/scripts/scripts.lst + scripts_dir: scripts_src + dialog_dir: data/text/english/dialog + worldmap_path: false - name: Poify/Unpoify test uses: BGforgeNet/msg2po@master diff --git a/data/data/worldmap.txt b/data/data/worldmap.txt index dae2500bf..bda005a05 100644 --- a/data/data/worldmap.txt +++ b/data/data/worldmap.txt @@ -365,8 +365,9 @@ position=huddle, spacing:2 [Encounter: ARRO_Nomads] type_00=ratio:50%, pid:16777424, Item:49, Item:284, Item:7, Item:(0-10)41, Script:622 ; Male Nomad w/ Antidote, Meat Jerky, and Spear type_01=ratio:50%, pid:16777426, Item:273, Item:4, Item:(0-10)41, Script:622 ; Female Nomad w/ Healing Powder and Knife -type_02=pid:16777226, If (Rand(10%)), Script:477 ; Male Orphan -type_03=pid:16777226, If (Rand(15%)), Script:477 ; Female Orphan +type_02=pid:16777268, If (Rand(10%)), Script:1129 ; Male Orphan +type_03=pid:16777269, If (Rand(15%)), Script:1129 ; Female Orphan +team_num=129 ; TEAM_RND_NOMAD position=cone, spacing:2 [Encounter: ARROK_Molerats] @@ -412,10 +413,11 @@ type_01=ratio:33%, pid:16777283, Item:21(wielded), Script:623 ; Strong Peasant type_02=ratio:15%, pid:16777279, Item:320, Script:623 ; Weak Peasant Male w/ Sharpened Pole type_03=ratio:15%, pid:16777280, Item:4, Script:623 ; Weak Peasant Female w/ Knife type_04=ratio:4%, pid:16777270, Script:623 ; Male Loser - killap - adult male proto, so why child script? -type_05=pid:16777269, Script:1129 ; Female Child -type_06=pid:16777268, Script:1129 ; Male Child - killap - no longer uses adult proto with child script +type_05=pid:16777269, Script:1129 ; Female Child +type_06=pid:16777268, Script:1129 ; Male Child - killap - no longer uses adult proto with child script type_07=Dead, pid:16777298 ; Dead Dog position=Surrounding, Spacing:6, Distance:7 +team_num=131 ; TEAM_RND_HOMELESS [Encounter: KLA_Farmers] type_00=ratio:67%, pid:16777281, Item:9, Item:(0-3)71, Item:(0-10)41, Script:493 ; Average Peasant Male w/ 10mm SMG and Fruit @@ -423,12 +425,7 @@ type_01=ratio:25%, pid:16777282, Item:299, Item:(1-2)71, Item:(0-10)41, Script:4 type_02=ratio:4%, pid:16777269, Item:71, Script:785 ; Female Child w/ Fruit type_03=ratio:4%, pid:16777268, Script:785 ; Male Child -killap - no longer uses adult proto with child script type_04=Dead, pid:16777298 ; Dead Dog -;position=Surrounding -;position=straight_line, spacing:1 -;position=straight_line, spacing:2 -;position=double_line, spacing:1 -;position=wedge, spacing:2 -;position=cone, spacing:2 +team_num=183 ; TEAM_RND_FARMER position=huddle, spacing:1 [Encounter: KLA_Golden_Geckos] @@ -500,19 +497,13 @@ type_01=Dead, pid:16777221 position=Surrounding, Spacing:3 [Encounter: DEN_Slavers] -type_00=ratio:20%, pid:16777433, Item:18(wielded), Item:(0-10)41, Item:40, Script:508 ; Male Slaver w/ Desert Eagle and Stimpak +type_00=ratio:20%, pid:16777433, Item:18(wielded), Item:(0-10)41, Item:40, Script:508 ; Male Slaver w/ Desert Eagle and Stimpak type_01=ratio:20%, pid:16777434, Item:9(wielded), Item:(0-10)41, Item:40, Script:508 ; Female Slaver w/ Springer Rifle and Stimpak type_02=ratio:20%, pid:16777233, Script:628 ; Cute Female Slave type_03=ratio:20%, pid:16777238, Script:628 ; Strong Male Slave type_04=ratio:10%, pid:16777243, Script:628 ; Generic Female Slave type_05=ratio:10%, pid:16777244, Script:628 ; Generic Male Slave -;position=Surrounding -;position=straight_line, spacing:1 -;position=straight_line, spacing:2 -;position=double_line, spacing:1 position=wedge, spacing:2 -;position=cone, spacing:2 -;position=huddle, spacing:1 [Encounter: DEN_Slave_Run] type_00=ratio:50%, pid:16777433, Item:5(wielded), Item:(0-10)41, Script:627 ; Male Slaver w/ Club @@ -2851,9 +2842,9 @@ enc_08=Chance:15%,Enc:(2-4) Bounty_Hunter_Low AMBUSH Player, If(Global(0) < -500 enc_09=Chance:15%,Enc:(2-4) Bounty_Hunter_Low_Mid AMBUSH Player, If(Global(0) < -500) And If(Player(Level) > 6) And If(Player(Level) < 13) enc_10=Chance:15%,Enc:(2-4) Bounty_Hunter_High_Mid AMBUSH Player, If(Global(0) < -500) And If(Player(Level) > 12) And If(Player(Level) < 19) enc_11=Chance:15%,Enc:(2-5) Bounty_Hunter_High AMBUSH Player, If(Global(0) < -500) And If(Player(Level) > 18) -enc_11=Chance:10%,Enc:(4-7) Morton_Brother, If(Global(386) > 0) And If(Global(386) < 6) -enc_12=Chance:5%,Counter:1,Special,Map:Special Bridge Encounter,Enc:Special1, If(Player(Level) > 9) And If(Global(605) < 1) -enc_13=Chance:3%,Counter:1,Special,Map:Special Holy Encounter 2,Enc:Special1, If(Global(614) > 0) And If(Global(606) < 1) +enc_12=Chance:10%,Enc:(4-7) Morton_Brother, If(Global(386) > 0) And If(Global(386) < 6) +enc_13=Chance:5%,Counter:1,Special,Map:Special Bridge Encounter,Enc:Special1, If(Player(Level) > 9) And If(Global(605) < 1) +enc_14=Chance:3%,Counter:1,Special,Map:Special Holy Encounter 2,Enc:Special1, If(Global(614) > 0) And If(Global(606) < 1) [Encounter Table 69] lookup_name=Wild6_D ; Area between New Reno and NCR diff --git a/data/scripts/scripts.lst b/data/scripts/scripts.lst index 26163b2d3..901fdecfe 100644 --- a/data/scripts/scripts.lst +++ b/data/scripts/scripts.lst @@ -625,7 +625,7 @@ ECBandit.int ; Random Encounter Bandit # local_vars=0 ECRobber.int ; Random Encounter Robber # local_vars=0 ECHiwymn.int ; Random Encounter Highwaymen # local_vars=0 ECSlvRun.int ; Random Encounter Slavers on a Slave Run # local_vars=0 -ECSlave.int ; Random Encounter Slaves # local_vars=0 +ECSlave.int ; Random Encounter Slaves # local_vars=7 ECRavPty.int ; Random Encounter Rave Party # local_vars=10 ECMantis.int ; Random Encounter Mantis # local_vars=0 ECBrahmn.int ; Random Encounter Brahmin # local_vars=0 @@ -679,7 +679,7 @@ RCHakes.int ; Hakeswill from Redding # local_vars=12 REDDown.int ; Redding Downtown map script # local_vars=0 BHRndDst.int ; Broken Hills Caravan Desert Map # local_vars=4 BHRndMtn.int ; Broken Hills Caravan Mountain Map # local_vars=4 -RCLou.int ; Lou from Redding # local_vars=13 +RCLou.int ; Lou from Redding # local_vars=14 ECArthur.int ; Arthur Leader of the special encounter knights# local_vars=8 ECRobin.int ; Robin one of the knights with Arthur # local_vars=8 ECBedemi.int ; Bedemir one of the knights with Arthur # local_vars=8 @@ -713,7 +713,7 @@ NiJulBox.int ; New Reno Jules Shop Inventory Box # local_vars=2 niEldBox.int ; New Reno Eldridge Shop Box # local_vars=2 niEldBx2.int ; New Reno Eldridge Shop Box (For Made Men) # local_vars=2 RndHoly2.int ; Map script for Holy Knights 2 # local_vars=0 -ECVorRat.int ; Vorpal Rat for Holy Knights 2 # local_vars=0 +ECVorRat.int ; Vorpal Rat for Holy Knights 2 # local_vars=8 ECpdog.int ; Paraih dog he joins your party. # local_vars=12 Ccdrill.int ; Drill Seargant in Colusa/Nevarro # local_vars=17 Ccguard.int ; Guard in Colusa/Nevarro # local_vars=12 diff --git a/data/text/czech/dialog/ahhakun.msg b/data/text/czech/dialog/ahhakun.msg index 59bbaa363..6b2d2a331 100644 --- a/data/text/czech/dialog/ahhakun.msg +++ b/data/text/czech/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{A potom?} {290}{hak122}{Příliš mnoho let a příliš mnoho zranění, Vyvolený. Teď mě musíš poslouchat.} {291}{}{Tak dobře.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/czech/dialog/ecnomchf.msg b/data/text/czech/dialog/ecnomchf.msg index aa18271a8..9dbec6adc 100644 --- a/data/text/czech/dialog/ecnomchf.msg +++ b/data/text/czech/dialog/ecnomchf.msg @@ -21,3 +21,8 @@ {120}{}{Zmiz!} {121}{}{Nech nás na pokoji.} {122}{}{Jsme mírumilovný kmen.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/czech/dialog/fcgunmer.msg b/data/text/czech/dialog/fcgunmer.msg index fb9682fc2..fc8fc4394 100644 --- a/data/text/czech/dialog/fcgunmer.msg +++ b/data/text/czech/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{Na nic dalšího si momentálně nevzpomínám. Měj se.} {150}{}{Hezký den.} {151}{}{Jsi zloděj, vrah a ničema. Obávám se, že tě budu muset zabít.} +{152}{}{Čekat...} diff --git a/data/text/czech/dialog/wsterm2a.msg b/data/text/czech/dialog/wsterm2a.msg index 8938bc909..12c595ca2 100644 --- a/data/text/czech/dialog/wsterm2a.msg +++ b/data/text/czech/dialog/wsterm2a.msg @@ -43,6 +43,7 @@ {145}{}{Konec.} {146}{}{Ukončení diagnostického programu.} {147}{}{[Více]} +{200}{}{Počítač je v diagnostickém režimu. Prosím vyčkejte, dokud proces neskončí.} {300}{}{ - ID: } {301}{}{ Poslední přístup: } {303}{}{Desátník Dixon} diff --git a/data/text/czech/dialog/wsterm2c.msg b/data/text/czech/dialog/wsterm2c.msg index 0fc45f50f..797a425f7 100644 --- a/data/text/czech/dialog/wsterm2c.msg +++ b/data/text/czech/dialog/wsterm2c.msg @@ -20,3 +20,4 @@ {119}{}{Konec.} {120}{}{Automatický Opravný systém je již mimo provoz.} {121}{}{Tento terminál nelze použít. Někdo rozbil klávesnici.} +{200}{}{ nedokáže přečíst text na monitoru.} diff --git a/data/text/czech/dialog/zcslave.msg b/data/text/czech/dialog/zcslave.msg new file mode 100644 index 000000000..6408675ba --- /dev/null +++ b/data/text/czech/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{Vidíš nebohé, zubožené tělo.} +{101}{}{Stále vidíš nebohé a zubožené tělo.} +{150}{}{Ať se díváš sebelíp, opravdu nevidíš nic jiného než nebohé zubožené tělo. Proč na něj pořád zíráš?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/english/dialog/ahhakun.msg b/data/text/english/dialog/ahhakun.msg index f5badfb6e..c7687fa5e 100644 --- a/data/text/english/dialog/ahhakun.msg +++ b/data/text/english/dialog/ahhakun.msg @@ -190,3 +190,6 @@ {289}{}{And then?} {290}{hak122}{Too many seasons and too many wounds, Chosen. Instead, you must listen.} {291}{}{All right.} + +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/english/dialog/ecnomchf.msg b/data/text/english/dialog/ecnomchf.msg index b0ecabf20..c88cf41ef 100644 --- a/data/text/english/dialog/ecnomchf.msg +++ b/data/text/english/dialog/ecnomchf.msg @@ -23,3 +23,9 @@ {120}{}{Be gone!} {121}{}{Leave us.} {122}{}{We are a peaceful tribe.} + +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/english/dialog/fcgunmer.msg b/data/text/english/dialog/fcgunmer.msg index 13523f4b5..7f4e63e69 100644 --- a/data/text/english/dialog/fcgunmer.msg +++ b/data/text/english/dialog/fcgunmer.msg @@ -50,4 +50,4 @@ {149}{}{That is all I can think of at the moment. Good day.} {150}{}{Good day.} {151}{}{You are a thief, a murderer, and a villain. I'm afraid I must kill you.} - +{152}{}{Wait...} diff --git a/data/text/english/dialog/wsterm2a.msg b/data/text/english/dialog/wsterm2a.msg index c847faacc..083662090 100644 --- a/data/text/english/dialog/wsterm2a.msg +++ b/data/text/english/dialog/wsterm2a.msg @@ -93,3 +93,4 @@ {145}{}{Exit} {146}{}{Exiting Diagnostic Program.} {147}{}{[MORE]} +{200}{}{Computer in diagnostic mode. Please wait until diagnostic routine is finished.} diff --git a/data/text/english/dialog/wsterm2c.msg b/data/text/english/dialog/wsterm2c.msg index 04c972bdc..33e091ebc 100644 --- a/data/text/english/dialog/wsterm2c.msg +++ b/data/text/english/dialog/wsterm2c.msg @@ -23,4 +23,6 @@ the floor. So much for using this terminal.]} {119}{}{Exit} {120}{}{You already shut down the automated repair system.} -{121}{}{I can't access the terminal. Someone broke the keyboard.} \ No newline at end of file +{121}{}{I can't access the terminal. Someone broke the keyboard.} + +{200}{}{ is unable to read what's on the monitor.} diff --git a/data/text/english/dialog/zcslave.msg b/data/text/english/dialog/zcslave.msg index e69de29bb..4445ffecd 100644 --- a/data/text/english/dialog/zcslave.msg +++ b/data/text/english/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{You see a miserable wretch of human being.} +{101}{}{You still see a miserable wretch of a human being.} +{150}{}{You see a really, really miserable wretch of a human being. Why are you staring?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/french/dialog/ahhakun.msg b/data/text/french/dialog/ahhakun.msg index ccf9fb5b2..78c1c803f 100644 --- a/data/text/french/dialog/ahhakun.msg +++ b/data/text/french/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{Et ensuite ?} {290}{hak122}{Trop de saisons et trop de blessures, Etre Elu. Tu devrais plutôt écouter.} {291}{}{D'accord.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/french/dialog/ecnomchf.msg b/data/text/french/dialog/ecnomchf.msg index d5e410809..ea731b3e2 100644 --- a/data/text/french/dialog/ecnomchf.msg +++ b/data/text/french/dialog/ecnomchf.msg @@ -21,3 +21,8 @@ {120}{}{Hors d'ici !} {121}{}{Laisse-nous !} {122}{}{Notre tribu est pacifique.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/french/dialog/fcgunmer.msg b/data/text/french/dialog/fcgunmer.msg index 04627f993..7e470747d 100644 --- a/data/text/french/dialog/fcgunmer.msg +++ b/data/text/french/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{C'est tout ce que je vois pour le moment. Au revoir.} {150}{}{Au revoir.} {151}{}{Enfant de démon ! Je regrette mais je dois te tuer !} +{152}{}{Attends...} diff --git a/data/text/french/dialog/wsterm2a.msg b/data/text/french/dialog/wsterm2a.msg index 1b10890fa..cbd0fe697 100644 --- a/data/text/french/dialog/wsterm2a.msg +++ b/data/text/french/dialog/wsterm2a.msg @@ -40,6 +40,7 @@ {145}{}{[Quitter]} {146}{}{Quitter le programme de diagnostics.} {147}{}{[Plus]} +{200}{}{L'ordinateur est en mode diagnostic. Veuillez patienter jusqu'à la fin de la routine de diagnostic.} {300}{}{ - IDENTITE confirmée} {301}{}{Dernier accès enregistré il y a : } {303}{}{Caporal Dixon} diff --git a/data/text/french/dialog/wsterm2c.msg b/data/text/french/dialog/wsterm2c.msg index 1430d47dc..fdfb0ae6d 100644 --- a/data/text/french/dialog/wsterm2c.msg +++ b/data/text/french/dialog/wsterm2c.msg @@ -20,3 +20,4 @@ {119}{}{[Quitter]} {120}{}{Tu as déjà arrêté le système de réparation automatique.} {121}{}{Je ne peux pas accéder au terminal. Quelqu'un a cassé le clavier.} +{200}{}{ est incapable de lire ce qu'affiche le moniteur.} diff --git a/data/text/french/dialog/zcslave.msg b/data/text/french/dialog/zcslave.msg new file mode 100644 index 000000000..0a0a21707 --- /dev/null +++ b/data/text/french/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{Tu vois un pauvre misérable.} +{101}{}{Tu vois encore un être humain misérable.} +{150}{}{Tu vois un pauvre être humain vraiment très très misérable. Qu'as-tu à le regarder comme ça ?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/german/dialog/ahhakun.msg b/data/text/german/dialog/ahhakun.msg index 8605d3897..fea95a3c6 100644 --- a/data/text/german/dialog/ahhakun.msg +++ b/data/text/german/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{Und dann?} {290}{hak122}{Zu viele Jahre und zu viele Wunden, Auserwähltes Wesen. Hör mir statt dessen lieber zu.} {291}{}{Also gut.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/german/dialog/ecnomchf.msg b/data/text/german/dialog/ecnomchf.msg index 7a4ea1a29..c0490d195 100644 --- a/data/text/german/dialog/ecnomchf.msg +++ b/data/text/german/dialog/ecnomchf.msg @@ -23,3 +23,8 @@ {120}{}{Verschwinde!} {121}{}{Hau ab.} {122}{}{Wir sind ein friedlicher Stamm.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/german/dialog/fcgunmer.msg b/data/text/german/dialog/fcgunmer.msg index 1d26375b2..7b54b1c9e 100644 --- a/data/text/german/dialog/fcgunmer.msg +++ b/data/text/german/dialog/fcgunmer.msg @@ -60,3 +60,4 @@ {149}{}{Das ist alles, was mir im Augenblick einfällt. Auf Wiedersehen.} {150}{}{Auf Wiedersehen.} {151}{}{Du bist ein Dieb, ein Mörder und ein Schurke. Ich fürchte, ich werde dich töten müssen.} +{152}{}{Moment...} diff --git a/data/text/german/dialog/wsterm2a.msg b/data/text/german/dialog/wsterm2a.msg index 9ed90e509..1a033398f 100644 --- a/data/text/german/dialog/wsterm2a.msg +++ b/data/text/german/dialog/wsterm2a.msg @@ -64,6 +64,8 @@ {145}{}{Beenden} {146}{}{Diagnoseprogramm wird beendet.} {147}{}{[Mehr]} +{200}{}{Computer befindet sich im Diagnosemodus. Bitte warten, bis die Diagnoseroutine + abgeschlossen ist.} {300}{}{ - ID bestätigt: } {301}{}{ Letzter Zugriff: } diff --git a/data/text/german/dialog/wsterm2c.msg b/data/text/german/dialog/wsterm2c.msg index 1fd89b3e3..11a2c052f 100644 --- a/data/text/german/dialog/wsterm2c.msg +++ b/data/text/german/dialog/wsterm2c.msg @@ -26,3 +26,4 @@ {119}{}{Beenden} {120}{}{Du hast das automatische Reparatursystem bereits heruntergefahren.} {121}{}{Ich komme nicht an dieses Terminal ran. Jemand hat die Tastatur ruiniert.} +{200}{}{ kann nicht lesen, was auf dem Monitor steht.} diff --git a/data/text/german/dialog/zcslave.msg b/data/text/german/dialog/zcslave.msg new file mode 100644 index 000000000..735f4fc3e --- /dev/null +++ b/data/text/german/dialog/zcslave.msg @@ -0,0 +1,5 @@ +{100}{}{Du siehst ein bedauernswertes menschliches Geschöpf.} +{101}{}{Du siehst immer noch ein bedauernswertes menschliches Geschöpf.} +{150}{}{Du siehst ein absolut und vollkommen bedauernswertes menschliches Geschöpf. Warum glotzt + du so?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/hungarian/dialog/ahhakun.msg b/data/text/hungarian/dialog/ahhakun.msg index 765e4b233..46b228c90 100644 --- a/data/text/hungarian/dialog/ahhakun.msg +++ b/data/text/hungarian/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{Aztán?} {290}{hak122}{Túl sok év és túl sok seb, Kiválasztott. Inkább figyelj!} {291}{}{Értem.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/hungarian/dialog/ecnomchf.msg b/data/text/hungarian/dialog/ecnomchf.msg index aff7e17de..85c354905 100644 --- a/data/text/hungarian/dialog/ecnomchf.msg +++ b/data/text/hungarian/dialog/ecnomchf.msg @@ -21,3 +21,8 @@ {120}{}{Hordd el magad!} {121}{}{Hagyj minket!} {122}{}{Mi békés törzs vagyunk.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/hungarian/dialog/fcgunmer.msg b/data/text/hungarian/dialog/fcgunmer.msg index 0f9e21e70..bb9417de9 100644 --- a/data/text/hungarian/dialog/fcgunmer.msg +++ b/data/text/hungarian/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{Jelen pillanatban más nem jut eszembe. Szép napot!} {150}{}{Jó napot.} {151}{}{Tolvaj, gyilkos, bűnöző vagy. Attól tartok, meg kell, hogy öljelek.} +{152}{}{Folytasd!} diff --git a/data/text/hungarian/dialog/wsterm2a.msg b/data/text/hungarian/dialog/wsterm2a.msg index 3d4a16ebd..3b10416f8 100644 --- a/data/text/hungarian/dialog/wsterm2a.msg +++ b/data/text/hungarian/dialog/wsterm2a.msg @@ -71,6 +71,7 @@ {145}{}{Befejezés} {146}{}{Diagnosztikai Program befejezése.} {147}{}{[TOVÁBBI LEHETŐSÉG]} +{200}{}{A Számítógép Diagnosztikai Módban van. Kérem, várjon, amíg a Diagnosztikai Program futása befejeződik!} {300}{}{ - ID Confirmed: } {301}{}{ Terminal Last Accessed: } diff --git a/data/text/hungarian/dialog/wsterm2c.msg b/data/text/hungarian/dialog/wsterm2c.msg index 79ef911cc..7bac1d3f1 100644 --- a/data/text/hungarian/dialog/wsterm2c.msg +++ b/data/text/hungarian/dialog/wsterm2c.msg @@ -22,3 +22,4 @@ {119}{}{Befejezés} {120}{}{Már kikapcsoltad az automata javító rendszert.} {121}{}{Nem tudok hozzáférni a terminálhoz. Valaki összetörte a billentyűzetet.} +{200}{}{ képtelen elolvasni, mi van a képernyőn.} diff --git a/data/text/hungarian/dialog/zcslave.msg b/data/text/hungarian/dialog/zcslave.msg new file mode 100644 index 000000000..be544c656 --- /dev/null +++ b/data/text/hungarian/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{Egy szerencsétlen emberi roncsot látsz.} +{101}{}{Még mindig egy szerencsétlen emberi roncsot nézel.} +{150}{}{Ez egy nagyon-nagyon szerencsétlen emberi roncs. Miért bámulod?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/italian/dialog/ahhakun.msg b/data/text/italian/dialog/ahhakun.msg index ab41d93c5..6d75fd9a9 100644 --- a/data/text/italian/dialog/ahhakun.msg +++ b/data/text/italian/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{E poi?} {290}{hak122}{Troppe stagioni e troppe ferite, Prescelto. Piuttosto, tu devi ascoltare.} {291}{}{Okay.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/italian/dialog/ecnomchf.msg b/data/text/italian/dialog/ecnomchf.msg index 98feb8047..7e344c2be 100644 --- a/data/text/italian/dialog/ecnomchf.msg +++ b/data/text/italian/dialog/ecnomchf.msg @@ -21,3 +21,8 @@ {120}{}{Vattene!} {121}{}{Lasciaci.} {122}{}{Siamo una tribu' pacifica.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/italian/dialog/fcgunmer.msg b/data/text/italian/dialog/fcgunmer.msg index 995705770..153b3526d 100644 --- a/data/text/italian/dialog/fcgunmer.msg +++ b/data/text/italian/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{Questo e' tutto quello che mi viene in mente, al momento. Buona giornata.} {150}{}{Buona giornata.} {151}{}{Sei un ladro, un assassino e una canaglia. Temo di essere costretto ad ucciderti.} +{152}{}{Aspetta...} diff --git a/data/text/italian/dialog/wsterm2a.msg b/data/text/italian/dialog/wsterm2a.msg index 85393838e..895e0c1c1 100644 --- a/data/text/italian/dialog/wsterm2a.msg +++ b/data/text/italian/dialog/wsterm2a.msg @@ -40,6 +40,7 @@ {145}{}{Esci} {146}{}{Uscita dal programma diagnostico in corso.} {147}{}{[AVANTI]} +{200}{}{Il computer e' in modalita' diagnostica. Attendere il completamento della sequenza diagnostica.} {300}{}{ - Identita' confermata: } {301}{}{ Ultimo accesso al terminale: } diff --git a/data/text/italian/dialog/wsterm2c.msg b/data/text/italian/dialog/wsterm2c.msg index a4b7c03c0..9e0fd80c1 100644 --- a/data/text/italian/dialog/wsterm2c.msg +++ b/data/text/italian/dialog/wsterm2c.msg @@ -20,3 +20,4 @@ {119}{}{Esci} {120}{}{Hai gia' disattivato il sistema di riparazione automatizzata.} {121}{}{Non posso accedere al terminale. Qualcuno ha rotto la tastiera.} +{200}{}{ non e' in grado di leggere quello che c'e' sul monitor.} diff --git a/data/text/italian/dialog/zcslave.msg b/data/text/italian/dialog/zcslave.msg new file mode 100644 index 000000000..b22034897 --- /dev/null +++ b/data/text/italian/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{Vedi un essere umano miserabile e disgraziato.} +{101}{}{Vedi comunque un essere umano miserabile e disgraziato.} +{150}{}{Vedi un essere umano davvero, davvero miserabile e disgraziato. Perche' lo guardi?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/po/czech.po b/data/text/po/czech.po index 8b4f9b15c..8cddfb951 100644 --- a/data/text/po/czech.po +++ b/data/text/po/czech.po @@ -7360,6 +7360,16 @@ msgid "" msgstr "" "Příliš mnoho let a příliš mnoho zranění, Vyvolený. Teď mě musíš poslouchat." +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Musíš si pospíšit, Vyvolený." + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Vidíš obyčejnou vázu." @@ -36345,6 +36355,43 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Jak se opovažuješ zneužít mé pohostinnosti!" +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"Á, poutník. Vítej v mém skromném stanu. Spočiň ve stínu a ulev si od " +"nekonečného vedra." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Děkuju. S povděkem přijímám nabídku stínu." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "Jaká škoda. Odpočiň si tedy a vítej v našem táboře." + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Tady to máš. Ještě něco?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "Žádný případ. Já teď jít." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Vidíš nomádského šamana." @@ -41612,9 +41659,9 @@ msgstr "" "navštívit naši pobočku v New California Republic. Určitě se ti to vyplatí. A" " teď když mě omluvíš..." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Čekat..." @@ -174602,15 +174649,15 @@ msgstr "Jóó, jsem v pohodě. JÓÓ, JSEM V POHODĚ, jóó." msgid "Sure, dude, take it all." msgstr "Jasně, kámo, vem si to všechno." -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Vidíš nebohé, zubožené tělo." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Stále vidíš nebohé a zubožené tělo." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -200489,7 +200536,7 @@ msgstr "" "bezpečnostní odstavení vzdáleného terminálu Přístup k " "tomuto terminálu byl UKONČEN" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -201017,6 +201064,12 @@ msgstr "Automatický Opravný systém je již mimo provoz." msgid "I can't access the terminal. Someone broke the keyboard." msgstr "Tento terminál nelze použít. Někdo rozbil klávesnici." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " nedokáže přečíst text na monitoru." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Zdá se, že na tomto počítači je přimontována kamera." @@ -201129,11 +201182,6 @@ msgstr "" "Pokračovat do kontrolní místnosti pro další analýzu -Konec " "přenosu-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " nedokáže přečíst text na monitoru." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -202982,6 +203030,12 @@ msgstr "Vidíš radškorpiona." msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "Všichni radškorpioni jsou už mrtví." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Stále vidíš nebohé a zubožené tělo." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/english.pot b/data/text/po/english.pot index 5d5ff0210..8b4a416c4 100644 --- a/data/text/po/english.pot +++ b/data/text/po/english.pot @@ -6516,6 +6516,14 @@ msgid "" "Too many seasons and too many wounds, Chosen. Instead, you must listen." msgstr "" +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +msgid "You must now pay for your sins, Chosen One." +msgstr "" + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "" @@ -33271,6 +33279,29 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "" +#: dialog/ecnomchf.msg:200 +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" + +#: dialog/ecnomchf.msg:201 +msgid "Thank you; I graciously accept your offer." +msgstr "" + +#: dialog/ecnomchf.msg:202 +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "" + +#: dialog/ecnomchf.msg:203 +msgid "I do hope you found what you needed. Anything else?" +msgstr "" + +#: dialog/ecnomchf.msg:204 +msgid "Not today. I must be going." +msgstr "" + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "" @@ -38136,9 +38167,9 @@ msgid "" " rewarding. Now, if you'll excuse me..." msgstr "" -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "" @@ -155813,15 +155844,15 @@ msgstr "" msgid "Sure, dude, take it all." msgstr "" -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "" -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "" -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -178655,7 +178686,7 @@ msgid "" " User Access to this Terminal is TERMINATED" msgstr "" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -179081,6 +179112,12 @@ msgstr "" msgid "I can't access the terminal. Someone broke the keyboard." msgstr "" +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr "" + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "" @@ -179167,11 +179204,6 @@ msgid "" " -End Transmission-" msgstr "" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr "" - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -180747,6 +180779,10 @@ msgstr "" msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "" +#: dialog/zcslave.msg:151 +msgid "Yes, still a really miserable wretch of a human being." +msgstr "" + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/french.po b/data/text/po/french.po index a158e0137..f3b94a670 100644 --- a/data/text/po/french.po +++ b/data/text/po/french.po @@ -7523,6 +7523,16 @@ msgid "" msgstr "" "Trop de saisons et trop de blessures, Etre Elu. Tu devrais plutôt écouter." +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Tu dois te dépêcher, Etre Elu !" + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Tu vois un vase ordinaire." @@ -37021,6 +37031,43 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Comment oses-tu violer notre hospitalité ?!" +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"Je te souhaite la bienvenue dans mon humble tente. Viens à l'ombre t'abriter" +" de la chaleur infinie de la terre." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Merci, j'accepte ta proposition bien volontiers." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "Quel dommage... Alors repose-toi et sois ici chez toi." + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Voilà. Autre chose ?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "Pas d'accord. Moi partir." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Tu vois un chaman nomade." @@ -42394,9 +42441,9 @@ msgstr "" "devrais te rendre à notre bureau en République de Nouvelle Californie. Ca " "serait intéressant pour toi. Maintenant, excuse-moi, mais je dois partir." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Attends..." @@ -179755,15 +179802,15 @@ msgstr "Ouais, j'vais bien, OUAIS J'VAIS BIEN ouais." msgid "Sure, dude, take it all." msgstr "Bien sûr mon pote. Prends tout !" -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Tu vois un pauvre misérable." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Tu vois encore un être humain misérable." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -206617,7 +206664,7 @@ msgstr "" "verrouillage de sécurité du terminal distant L'accès " "utilisateur à ce terminal est TERMINE" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -207158,6 +207205,12 @@ msgstr "Tu as déjà arrêté le système de réparation automatique." msgid "I can't access the terminal. Someone broke the keyboard." msgstr "Je ne peux pas accéder au terminal. Quelqu'un a cassé le clavier." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " est incapable de lire ce qu'affiche le moniteur." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Cet ordinateur semble être équipé d'une caméra." @@ -207273,11 +207326,6 @@ msgstr "" "salle de contrôle pour poursuivre l'analyse. -Fin de " "transmission-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " est incapable de lire ce qu'affiche le moniteur." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -209158,6 +209206,12 @@ msgstr "Tu vois un radscorpion." msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "Tu as tué tous les radscorpions qui menaçaient les Brahmines." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Tu vois encore un être humain misérable." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/german.po b/data/text/po/german.po index 2b3fc0aa5..d318744d2 100644 --- a/data/text/po/german.po +++ b/data/text/po/german.po @@ -7611,6 +7611,16 @@ msgstr "" "Zu viele Jahre und zu viele Wunden, Auserwähltes Wesen. Hör mir statt dessen" " lieber zu." +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Du musst dich beeilen, Auserwähltes Wesen." + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Du siehst eine einfache Vase." @@ -37120,6 +37130,43 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Wie kannst du es wagen unsere Gastfreundschaft so zu verletzen." +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"Ah, ein Reisender. Seid in meinem bescheidenem Zelt willkommen. Schatte dich" +" vor der nie Enden Hitze des Landes." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Danke; wohlwollend nehme ich euren angebotenen Schatten an." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "Wie Schade. Dann Ruhe dich aus und sei willkommen in meinem Lager." + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Bitte schön. Sonst noch was?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "Nix gut. Ich gehn." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Ein Nomaden-Schamane." @@ -42500,9 +42547,9 @@ msgstr "" " von einst. Schau doch irgendwann mal in unserem Büro in der New California Republic\n" " vorbei. Vielleicht bringt es dir etwas. Wenn du mich jetzt entschuldigst, ich muss weg." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Moment..." @@ -180255,15 +180302,15 @@ msgstr "Yeah, mir geht's so gut, YEAH, SO GUT, SO GUT, yeah." msgid "Sure, dude, take it all." msgstr "Klar, Kumpel, greif dir alles." -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Du siehst ein bedauernswertes menschliches Geschöpf." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Du siehst immer noch ein bedauernswertes menschliches Geschöpf." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -207034,7 +207081,7 @@ msgstr "" "Unbefugter Zugriff. \n" " Sicherheitssperre für Fernterminal wird eingerichtet. Benutzerzugriff auf dieses Terminal GESPERRT!" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -207583,6 +207630,12 @@ msgid "I can't access the terminal. Someone broke the keyboard." msgstr "" "Ich komme nicht an dieses Terminal ran. Jemand hat die Tastatur ruiniert." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " kann nicht lesen, was auf dem Monitor steht." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Anscheinend ist an diesem Computer eine Kamera angebracht." @@ -207686,11 +207739,6 @@ msgstr "" "Definition: Freund Nomen - Jemand, der nicht feindlich\n" " gesonnen ist. Zur weiteren Analyse in Steuerungsraum begeben. -Übertragung abgeschlossen-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " kann nicht lesen, was auf dem Monitor steht." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -209523,6 +209571,12 @@ msgstr "Du siehst einen Skorpion." msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "Du hast alle Radskorpione, die die Brahmin bedroht haben, getötet." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Du siehst immer noch ein bedauernswertes menschliches Geschöpf." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/hungarian.po b/data/text/po/hungarian.po index d8c7fbfbf..18616b82c 100644 --- a/data/text/po/hungarian.po +++ b/data/text/po/hungarian.po @@ -7403,6 +7403,16 @@ msgid "" "Too many seasons and too many wounds, Chosen. Instead, you must listen." msgstr "Túl sok év és túl sok seb, Kiválasztott. Inkább figyelj!" +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Sietned kell, Kiválasztott!" + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Egy vázát látsz." @@ -36466,6 +36476,43 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Hogy merészeled így megsérteni a vendégszeretetünket!?" +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"Ah, egy utazó. Légy üdvözölve szerény sátramban. Légy vendégem egy kis " +"árnyékra a pusztaság szüntelen forróságában." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Köszönöm, szívesen elfogadom a felajánlott árnyékot." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "Milyen kár. Akkor pihenj meg, és légy üdvözölve a táborunkban!" + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Egészségedre! Esetleg... még egy italt?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "Nem-nem. Én menni innen." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Egy nomád sámánt látsz." @@ -41759,9 +41806,9 @@ msgstr "" "meg az Új Kaliforniai Köztársaságban lévő irodánkat! Tetszeni fog. Most " "pedig, ha megbocsátasz..." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Folytasd!" @@ -178885,15 +178932,15 @@ msgstr "Igen, jól vagyok. IGEN, JÓL VAGYOK, igen." msgid "Sure, dude, take it all." msgstr "Persze, haver, vigyél csak mindent..." -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Egy szerencsétlen emberi roncsot látsz." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Még mindig egy szerencsétlen emberi roncsot nézel." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -205448,7 +205495,7 @@ msgstr "" " Biztonsági Kizárás elindítása a terminálon\n" " Felhasználói hozzáférés ehhez a terminálhoz MEGTAGADVA" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -206009,6 +206056,12 @@ msgid "I can't access the terminal. Someone broke the keyboard." msgstr "" "Nem tudok hozzáférni a terminálhoz. Valaki összetörte a billentyűzetet." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " képtelen elolvasni, mi van a képernyőn." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Úgy látszik, ehhez a számítógéphez egy kamera van csatlakoztatva." @@ -206131,11 +206184,6 @@ msgstr "" " \n" " -Átvitel Vége-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " képtelen elolvasni, mi van a képernyőn." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -208036,6 +208084,12 @@ msgstr "Egy radskorpiót látsz." msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "Megölted a brahminokat fenyegető összes radskorpiót." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Még mindig egy szerencsétlen emberi roncsot nézel." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/italian.po b/data/text/po/italian.po index 5d2abddae..27a9e6593 100644 --- a/data/text/po/italian.po +++ b/data/text/po/italian.po @@ -7447,6 +7447,16 @@ msgid "" msgstr "" "Troppe stagioni e troppe ferite, Prescelto. Piuttosto, tu devi ascoltare." +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Devi sbrigarti, Prescelto." + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Vedi un semplice vaso." @@ -37129,6 +37139,44 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Come osi violare la nostra ospitalita'?" +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"Ah, un viaggiatore. Siate benvenuto nella mia umile tenda. Prendetevi un po'" +" d'ombra, fugace rifugio dall'infinito calore della terra." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Grazie; accetto con piacere la vostra offerta." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "" +"Che peccato. Allora riposatevi e siate il benvenuto nel mio accampamento." + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Ecco a te. Nient'altro?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "No. Me andare via." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Vedi uno sciamano nomade." @@ -42534,9 +42582,9 @@ msgstr "" " California Republic. Potresti trovarlo interessante. Adesso, se vuoi " "scusarmi..." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Aspetta..." @@ -181394,15 +181442,15 @@ msgstr "Yeah, sto bene. YEAH, STOBENE, yeah." msgid "Sure, dude, take it all." msgstr "Certo, amico, prendi tutto." -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Vedi un essere umano miserabile e disgraziato." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Vedi comunque un essere umano miserabile e disgraziato." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -208355,7 +208403,7 @@ msgstr "" "blocco di sicurezza del terminale remoto in corso... L'accesso " "dell'utente a questo terminale e' stato TERMINATO" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -208900,6 +208948,12 @@ msgstr "Hai gia' disattivato il sistema di riparazione automatizzata." msgid "I can't access the terminal. Someone broke the keyboard." msgstr "Non posso accedere al terminale. Qualcuno ha rotto la tastiera." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " non e' in grado di leggere quello che c'e' sul monitor." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Questo computer pare abbia una telecamera montata su di esso." @@ -209012,11 +209066,6 @@ msgstr "" "Uno che non e' ostile. Procedere nella sala di " "controllo per ulteriori analisi. -Fine Transmissione-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " non e' in grado di leggere quello che c'e' sul monitor." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -210874,6 +210923,12 @@ msgstr "Vedi uno scorpione." msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "Hai ucciso tutti i radscorpioni che minacciavano i brahmin." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Vedi comunque un essere umano miserabile e disgraziato." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/polish.po b/data/text/po/polish.po index c9fa95a45..82a39efb8 100644 --- a/data/text/po/polish.po +++ b/data/text/po/polish.po @@ -7432,6 +7432,16 @@ msgid "" msgstr "" "Zbyt wiele lat i zbyt wiele ran, Dziecko. Zamiast tego musisz posłuchać." +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Musisz się pośpieszyć, Dziecko Przeznaczenia." + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Widzisz prosty dzban." @@ -36606,6 +36616,43 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Jak śmiesz odrzucać naszą gościnność." +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"Oh, podróżnik. Bądź pozdrowiony, w moim skromnym namiocie. Skryj się w jego " +"cieniu przed palącym słońcem pustkowi." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Dzięki ci; z wdzięcznością przyjmuje twoją ofertę cienia." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "To niefortunne. Więc rozgość się i odpocznij w moim obozie." + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Proszę bardzo. Coś jeszcze?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "Ni. Ja iść." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Widzisz szamana nomadów." @@ -41864,9 +41911,9 @@ msgstr "" " do naszej siedziby w Republice Nowej Kalifornii. Myślę, że ci się opłaci. A" " teraz, jeśli mi wybaczysz..." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Czekaj..." @@ -176670,15 +176717,15 @@ msgstr "Taak, wszystko w porządku. TAAK, W PORZĄDKU, taak." msgid "Sure, dude, take it all." msgstr "Pewnie, koleś, weź wszystko." -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Widzisz żałosny wrak ludzkiej istoty." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Wciąż widzisz żałosny wrak ludzkiej istoty." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -202874,7 +202921,7 @@ msgstr "" " Uruchamiam Blokadę Bezpieczeństwa Terminala... \n" " Dostęp do tego terminala został ODCIĘTY" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -203422,6 +203469,12 @@ msgstr "Zautomatyzowana Stacja Napraw jest już wyłączona." msgid "I can't access the terminal. Someone broke the keyboard." msgstr "Nie mogę skorzystać z tego terminala. Ktoś zepsuł klawiaturę." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " nie może odczytać tego, co wyświetla monitor." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Na tym komputerze zamontowano kamerę." @@ -203540,11 +203593,6 @@ msgstr "" " Przejdź do sterowni w celu dalszej analizy \n" " -Koniec Transmisji-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " nie może odczytać tego, co wyświetla monitor." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -205388,6 +205436,12 @@ msgstr "Widzisz skorpiona." msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "Udało ci się zabić wszystkie skorpiony, jakie zagrażały braminom." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Wciąż widzisz żałosny wrak ludzkiej istoty." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/portuguese.po b/data/text/po/portuguese.po index 447df56ff..ea6296762 100644 --- a/data/text/po/portuguese.po +++ b/data/text/po/portuguese.po @@ -7478,6 +7478,16 @@ msgid "" msgstr "" "Muitas estações e muitas feridas, Escolhido. Em vez disso, você deve ouvir." +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Você deve se apressar, Escolhido." + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Você vê um vaso simples." @@ -36772,6 +36782,43 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Como você se atreve a violar a nossa hospitalidade." +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"Ah, um viajante. Seja bem-vindo a minha humilde tenda. Tire a máscara do " +"infinito calor da terra." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Obrigado; Aceito graciosamente a sua oferta de sombra." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "Que pena. Então descanse e seja bem vindo no meu acampamento." + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Não que você vá. Mais alguma coisa?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "Nunca. Eu ir em bora." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Você vê um nômade xamã." @@ -42079,9 +42126,9 @@ msgstr "" "Califórnia algum dia. Você pode achar gratificante. Agora, se você me " "desculpe ..." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Aguarde..." @@ -175600,15 +175647,15 @@ msgstr "Sim, estou bem. SIM, ESTOU BEM, sim." msgid "Sure, dude, take it all." msgstr "Claro, cara, pegue tudo." -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Você vê um pobre coitado." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Você ainda vê um pobre coitado." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -201774,7 +201821,7 @@ msgstr "" " Iniciando bloqueio de segurança do terminal remoto\n" " O acesso do usuário a este terminal foi TERMINADO" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -202312,6 +202359,12 @@ msgstr "Você já desligou o sistema de reparo automatizado." msgid "I can't access the terminal. Someone broke the keyboard." msgstr "Não consigo acessar o terminal. Alguém quebrou o teclado." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " é incapaz de ler o que está no monitor." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Este computador parece ter uma câmera montada nele." @@ -202430,11 +202483,6 @@ msgstr "" " Prossiga para a sala de controle para uma análise mais profunda.\n" " -Encerrar transmissão-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " é incapaz de ler o que está no monitor." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -204247,6 +204295,12 @@ msgstr "Você vê um escorpião." msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "Você matou todos os radscorpions que ameaçavam o brahmin." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Você ainda vê um pobre coitado." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/russian.po b/data/text/po/russian.po index e2cb4ed24..144808c92 100644 --- a/data/text/po/russian.po +++ b/data/text/po/russian.po @@ -7348,6 +7348,16 @@ msgid "" "Too many seasons and too many wounds, Chosen. Instead, you must listen." msgstr "Слишком много лет и слишком много ран, Избранный. Слушай внимательно." +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Поторопись, Избранный." + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Вы видите простую вазу." @@ -36420,6 +36430,43 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Как могли вы опоганить наше гостеприимство!" +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"А, странник. Добро пожаловать в мой скромный шатер. Отдохните в тени от " +"бесконечного жара земли." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Спасибо; я с благодарностью войду под ваш кров." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "Как неудачно. Что ж, тогда отдыхайте, добро пожаловать в наш лагерь." + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Пожалуйста. Что-нибудь еще?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "Неа. Моя пошел." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Кочевник." @@ -41693,9 +41740,9 @@ msgstr "" "своего уровня. Пожалуй, вам стоит заглянуть в наше отделение в Новой " "Калифорнийской Республике. Не пожалеете. А теперь прошу меня извинить..." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Постойте..." @@ -176374,15 +176421,15 @@ msgstr "Да-а, я в порядке. Да-а, Я В ПОРЯДКЕ, да-а." msgid "Sure, dude, take it all." msgstr "Конечно, приятель, забирай." -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Вы видите жалкую пародию на человеческое существо." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Вы по-прежнему видите жалкую пародию на человеческое существо." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -202504,7 +202551,7 @@ msgstr "" " Запуск блокировки удаленного терминала\n" " Доступ пользователей к этому терминалу запрещен" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -203040,6 +203087,12 @@ msgstr "Вы уже отключили автоматическую систем msgid "I can't access the terminal. Someone broke the keyboard." msgstr "У меня нет доступа к терминалу. Кто-то сломал клавиатуру." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " не может прочесть то, что написано на мониторе." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Похоже, к этому компьютеру подключена камера." @@ -203157,11 +203210,6 @@ msgstr "" " Направить в центр управления для дальнейшего анализа.\n" " -Конец передачи-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " не может прочесть то, что написано на мониторе." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -204978,6 +205026,12 @@ msgstr "Вы видите скорпиона." msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "Вы убили всех радскорпионов, которые нападали на браминов." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Вы по-прежнему видите жалкую пародию на человеческое существо." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/spanish.po b/data/text/po/spanish.po index c4851756c..939feba3e 100644 --- a/data/text/po/spanish.po +++ b/data/text/po/spanish.po @@ -7460,6 +7460,16 @@ msgstr "" "Demasiadas estaciones y demasiadas heridas, Elegido. En vez de eso, debes " "escuchar." +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "You must hurry, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Debes darte prisa, Elegido." + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "Ves un simple jarrón." @@ -36746,6 +36756,43 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "Cómo te atreves a violar nuestra hospitalidad." +#: dialog/ecnomchf.msg:200 +#, fuzzy +#| msgid "" +#| "Ah, a traveler. Be welcome to my humble tent. Take shade from the unending " +#| "heat of the land." +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" +"Ah, un viajero. Sé bienvenido a mi humilde tienda. Ven a la sombra y " +"cobíjate del interminable calor de la tierra." + +#: dialog/ecnomchf.msg:201 +#, fuzzy +#| msgid "Thank you; I graciously accept your offer of shade." +msgid "Thank you; I graciously accept your offer." +msgstr "Gracias; acepto con gentileza tu oferta de cobijo." + +#: dialog/ecnomchf.msg:202 +#, fuzzy +#| msgid "How unfortunate. Then rest and be welcome in my camp." +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "Qué desgraciado. Entonces descansa y sé bienvenido a mi campamento." + +#: dialog/ecnomchf.msg:203 +#, fuzzy +#| msgid "There you go. Anything else?" +msgid "I do hope you found what you needed. Anything else?" +msgstr "Aquí está. ¿Algo más?" + +#: dialog/ecnomchf.msg:204 +#, fuzzy +#| msgid "No way. Me be going." +msgid "Not today. I must be going." +msgstr "No quiero. Marcho ya." + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "Ves a un cháman nómada." @@ -42048,9 +42095,9 @@ msgstr "" "Deberías visitar alguna vez nuestra oficina en la República de Nueva " "California. Podría resultarte gratificante. Ahora, si me perdonas..." -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "Esperas..." @@ -177017,15 +177064,15 @@ msgstr "Sí, estoy bien. SÍ, ESTOY BIEN, sí." msgid "Sure, dude, take it all." msgstr "Claro, amigo, quédatelo todo." -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "Ves a un pobre diablo." -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "Sigues viendo a un pobre diablo." -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -203337,7 +203384,7 @@ msgstr "" "Acceso no autorizado -- Iniciando bloqueo de seguridad de terminal remota" " -- Acceso de usuario a este terminal TERMINADO" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -203876,6 +203923,12 @@ msgstr "Ya has detenido el sistema de reparación automática." msgid "I can't access the terminal. Someone broke the keyboard." msgstr "No puedo acceder al terminal. Alguien rompió el teclado." +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr " es incapaz de leer lo que pone en el monitor." + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "Esta computadora parece tener una cámara montada en ella." @@ -203987,11 +204040,6 @@ msgstr "" " Prosiga a la sala de mando para análisis adicional.\n" " -Fin de la Transmisión-" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr " es incapaz de leer lo que pone en el monitor." - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -205791,6 +205839,12 @@ msgstr "" "Has matado a todos los escorpiones rad que estaban amenazando a los " "brahmines." +#: dialog/zcslave.msg:151 +#, fuzzy +#| msgid "You still see a miserable wretch of a human being." +msgid "Yes, still a really miserable wretch of a human being." +msgstr "Sigues viendo a un pobre diablo." + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/po/sv.po b/data/text/po/sv.po index 36409e182..bd65c2c0a 100644 --- a/data/text/po/sv.po +++ b/data/text/po/sv.po @@ -6617,6 +6617,16 @@ msgid "" "Too many seasons and too many wounds, Chosen. Instead, you must listen." msgstr "" +#: dialog/ahhakun.msg:300 +msgid "Those who steal carry a great burden. Remember this, Chosen One." +msgstr "" + +#: dialog/ahhakun.msg:301 +#, fuzzy +#| msgid "Our life is in your hands, Chosen One." +msgid "You must now pay for your sins, Chosen One." +msgstr "Vårt liv ligger i dina händer, Utvalde." + #: dialog/aichest.msg:100 dialog/aivase.msg:100 msgid "You see a simple vase." msgstr "" @@ -33389,6 +33399,29 @@ msgstr "" msgid "How dare you violate our hospitality." msgstr "" +#: dialog/ecnomchf.msg:200 +msgid "" +"Ah, a traveler. I am sorry that we have no tent from which you may take " +"shade from the unending heat of the land. Do rest a moment, so that we may " +"talk." +msgstr "" + +#: dialog/ecnomchf.msg:201 +msgid "Thank you; I graciously accept your offer." +msgstr "" + +#: dialog/ecnomchf.msg:202 +msgid "How unfortunate. Rest a moment then; you are welcome among us." +msgstr "" + +#: dialog/ecnomchf.msg:203 +msgid "I do hope you found what you needed. Anything else?" +msgstr "" + +#: dialog/ecnomchf.msg:204 +msgid "Not today. I must be going." +msgstr "" + #: dialog/ecnomsha.msg:100 msgid "You see a nomad shaman." msgstr "" @@ -38254,9 +38287,9 @@ msgid "" " rewarding. Now, if you'll excuse me..." msgstr "" -#: dialog/fcdjosh.msg:134 dialog/fcnluke.msg:139 dialog/gcskeetr.msg:651 -#: dialog/nceldrid.msg:401 dialog/vicencom.msg:201 dialog/vicencom.msg:204 -#: dialog/vicencom.msg:216 +#: dialog/fcdjosh.msg:134 dialog/fcgunmer.msg:152 dialog/fcnluke.msg:139 +#: dialog/gcskeetr.msg:651 dialog/nceldrid.msg:401 dialog/vicencom.msg:201 +#: dialog/vicencom.msg:204 dialog/vicencom.msg:216 msgid "Wait..." msgstr "" @@ -155976,15 +156009,15 @@ msgstr "" msgid "Sure, dude, take it all." msgstr "" -#: dialog/scslaves.msg:100 +#: dialog/scslaves.msg:100 dialog/zcslave.msg:100 msgid "You see a miserable wretch of human being." msgstr "" -#: dialog/scslaves.msg:101 +#: dialog/scslaves.msg:101 dialog/zcslave.msg:101 msgid "You still see a miserable wretch of a human being." msgstr "" -#: dialog/scslaves.msg:102 +#: dialog/scslaves.msg:102 dialog/zcslave.msg:150 msgid "" "You see a really, really miserable wretch of a human being. Why are you " "staring?" @@ -178818,7 +178851,7 @@ msgid "" " User Access to this Terminal is TERMINATED" msgstr "" -#: dialog/wsterm1b.msg:200 dialog/wsterm2b.msg:400 +#: dialog/wsterm1b.msg:200 dialog/wsterm2a.msg:200 dialog/wsterm2b.msg:400 msgid "" "Computer in diagnostic mode. Please wait until diagnostic routine is " "finished." @@ -179271,6 +179304,12 @@ msgstr "" msgid "I can't access the terminal. Someone broke the keyboard." msgstr "" +#: dialog/wsterm2c.msg:200 dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 +#: dialog/wsterm3c.msg:200 dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 +#: dialog/wsterm4c.msg:300 +msgid " is unable to read what's on the monitor." +msgstr "" + #: dialog/wsterm3a.msg:101 msgid "This computer seems to have a camera mounted on it." msgstr "" @@ -179357,11 +179396,6 @@ msgid "" " -End Transmission-" msgstr "" -#: dialog/wsterm3a.msg:200 dialog/wsterm3b.msg:250 dialog/wsterm3c.msg:200 -#: dialog/wsterm4a.msg:200 dialog/wsterm4b.msg:200 dialog/wsterm4c.msg:300 -msgid " is unable to read what's on the monitor." -msgstr "" - #: dialog/wsterm3b.msg:101 msgid "" "This terminal appears to be of a more advanced design than the others you've" @@ -180937,6 +180971,10 @@ msgstr "" msgid "You've killed all the radscorpions that were threatening the brahmin." msgstr "" +#: dialog/zcslave.msg:151 +msgid "Yes, still a really miserable wretch of a human being." +msgstr "" + #: dialog/zi8ball.msg:231 msgid "" "Scott Everts sighs a lot when he sees how many inventory items are in the " diff --git a/data/text/polish/dialog/ahhakun.msg b/data/text/polish/dialog/ahhakun.msg index bad0eccbe..5f521d094 100644 --- a/data/text/polish/dialog/ahhakun.msg +++ b/data/text/polish/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{I co?} {290}{hak122}{Zbyt wiele lat i zbyt wiele ran, Dziecko. Zamiast tego musisz posłuchać.} {291}{}{Dobrze.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/polish/dialog/ecnomchf.msg b/data/text/polish/dialog/ecnomchf.msg index a6ccfa65a..891fa1d41 100644 --- a/data/text/polish/dialog/ecnomchf.msg +++ b/data/text/polish/dialog/ecnomchf.msg @@ -21,3 +21,8 @@ {120}{}{Odejdź stąd!} {121}{}{Zostaw nas.} {122}{}{Jesteśmy pokojowym plemieniem.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/polish/dialog/fcgunmer.msg b/data/text/polish/dialog/fcgunmer.msg index 3e40a09a2..ab71c6317 100644 --- a/data/text/polish/dialog/fcgunmer.msg +++ b/data/text/polish/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{To wszystko, co w tej chwili przychodzi mi do głowy. Do widzenia.} {150}{}{Do widzenia.} {151}{}{Na takich jak ty mówi się złodzieje, mordercy i łajdacy. Obawiam się, że muszę cię zabić.} +{152}{}{Czekaj...} diff --git a/data/text/polish/dialog/wsterm2a.msg b/data/text/polish/dialog/wsterm2a.msg index 89600579e..0319fae23 100644 --- a/data/text/polish/dialog/wsterm2a.msg +++ b/data/text/polish/dialog/wsterm2a.msg @@ -71,6 +71,7 @@ {145}{}{Wyjdź.} {146}{}{Zamykanie Programu Diagnostycznego.} {147}{}{[KONTYNUUJ]} +{200}{}{Komputer znajduje się w trybie diagnostycznym. Proszę zaczekać, aż procedura diagnostyczna zostanie ukończona.} {300}{}{ Tożsamość Potwierdzona: } {301}{}{ diff --git a/data/text/polish/dialog/wsterm2c.msg b/data/text/polish/dialog/wsterm2c.msg index 712d05fed..064fbf372 100644 --- a/data/text/polish/dialog/wsterm2c.msg +++ b/data/text/polish/dialog/wsterm2c.msg @@ -22,3 +22,4 @@ {119}{}{Wyjdź.} {120}{}{Zautomatyzowana Stacja Napraw jest już wyłączona.} {121}{}{Nie mogę skorzystać z tego terminala. Ktoś zepsuł klawiaturę.} +{200}{}{ nie może odczytać tego, co wyświetla monitor.} diff --git a/data/text/polish/dialog/zcslave.msg b/data/text/polish/dialog/zcslave.msg new file mode 100644 index 000000000..323a9dc10 --- /dev/null +++ b/data/text/polish/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{Widzisz żałosny wrak ludzkiej istoty.} +{101}{}{Wciąż widzisz żałosny wrak ludzkiej istoty.} +{150}{}{Widzisz naprawdę, ale to naprawdę żałosny wrak ludzkiej istoty. Czemu się tak gapisz?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/portuguese/dialog/ahhakun.msg b/data/text/portuguese/dialog/ahhakun.msg index b19e052e3..eda6f6b73 100644 --- a/data/text/portuguese/dialog/ahhakun.msg +++ b/data/text/portuguese/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{E então?} {290}{hak122}{Muitas estações e muitas feridas, Escolhido. Em vez disso, você deve ouvir.} {291}{}{Tudo certo.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/portuguese/dialog/ecnomchf.msg b/data/text/portuguese/dialog/ecnomchf.msg index d5749bcd0..b6a428495 100644 --- a/data/text/portuguese/dialog/ecnomchf.msg +++ b/data/text/portuguese/dialog/ecnomchf.msg @@ -23,3 +23,8 @@ {120}{}{Sai!} {121}{}{Deixe-nos.} {122}{}{Somos uma tribo pacífica.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/portuguese/dialog/fcgunmer.msg b/data/text/portuguese/dialog/fcgunmer.msg index 29ce74e2e..2918a650a 100644 --- a/data/text/portuguese/dialog/fcgunmer.msg +++ b/data/text/portuguese/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{Isso é tudo que consigo lembrar no momento. Passar bem.} {150}{}{Bom dia.} {151}{}{Você é um ladrão, um assassino, e um canalha. Acho que eu tenho que te matar.} +{152}{}{Aguarde...} diff --git a/data/text/portuguese/dialog/wsterm2a.msg b/data/text/portuguese/dialog/wsterm2a.msg index 4d200db48..ea288891a 100644 --- a/data/text/portuguese/dialog/wsterm2a.msg +++ b/data/text/portuguese/dialog/wsterm2a.msg @@ -72,6 +72,7 @@ {145}{}{Sair} {146}{}{Sair do programa de diagnóstico.} {147}{}{[MAIS]} +{200}{}{Computador em modo de diagnóstico. Aguarde até que a rotina de diagnóstico seja concluída.} {300}{}{ - ID confirmada: } {301}{}{ Último Acesso ao Terminal: } diff --git a/data/text/portuguese/dialog/wsterm2c.msg b/data/text/portuguese/dialog/wsterm2c.msg index be89aaaeb..75a24bb0f 100644 --- a/data/text/portuguese/dialog/wsterm2c.msg +++ b/data/text/portuguese/dialog/wsterm2c.msg @@ -24,3 +24,4 @@ {119}{}{Sair} {120}{}{Você já desligou o sistema de reparo automatizado.} {121}{}{Não consigo acessar o terminal. Alguém quebrou o teclado.} +{200}{}{ é incapaz de ler o que está no monitor.} diff --git a/data/text/portuguese/dialog/zcslave.msg b/data/text/portuguese/dialog/zcslave.msg new file mode 100644 index 000000000..b77fe5677 --- /dev/null +++ b/data/text/portuguese/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{Você vê um pobre coitado.} +{101}{}{Você ainda vê um pobre coitado.} +{150}{}{Você vê um ser humano realmente miserável. Por que você está olhando?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/russian/dialog/ahhakun.msg b/data/text/russian/dialog/ahhakun.msg index 90df654d8..9323b2893 100644 --- a/data/text/russian/dialog/ahhakun.msg +++ b/data/text/russian/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{А потом?} {290}{hak122}{Слишком много лет и слишком много ран, Избранный. Слушай внимательно.} {291}{}{Ясно.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/russian/dialog/ecnomchf.msg b/data/text/russian/dialog/ecnomchf.msg index 96319aa74..65b05abac 100644 --- a/data/text/russian/dialog/ecnomchf.msg +++ b/data/text/russian/dialog/ecnomchf.msg @@ -21,3 +21,8 @@ {120}{}{Убирайтесь!} {121}{}{Покиньте нас.} {122}{}{Мы мирное племя.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/russian/dialog/fcgunmer.msg b/data/text/russian/dialog/fcgunmer.msg index 470381a33..d10bc3566 100644 --- a/data/text/russian/dialog/fcgunmer.msg +++ b/data/text/russian/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{Пожалуй, это все. Удачи.} {150}{}{Доброго вам дня.} {151}{}{Ты вор, убийца и негодяй. Боюсь, мне придется тебя убить.} +{152}{}{Постойте...} diff --git a/data/text/russian/dialog/wsterm2a.msg b/data/text/russian/dialog/wsterm2a.msg index 2165c9d63..a8774ca83 100644 --- a/data/text/russian/dialog/wsterm2a.msg +++ b/data/text/russian/dialog/wsterm2a.msg @@ -70,6 +70,7 @@ {145}{}{Выйти} {146}{}{Выход из программы диагностики.} {147}{}{[ДАЛЬШЕ]} +{200}{}{Компьютер в режиме диагностики. Пожалуйста, дождитесь завершения процесса диагностирования.} {300}{}{ - Идентификация подтверждена} {301}{}{ Последний доступ: } diff --git a/data/text/russian/dialog/wsterm2c.msg b/data/text/russian/dialog/wsterm2c.msg index 6e0a8f52f..bfd90c959 100644 --- a/data/text/russian/dialog/wsterm2c.msg +++ b/data/text/russian/dialog/wsterm2c.msg @@ -22,3 +22,4 @@ {119}{}{Выйти} {120}{}{Вы уже отключили автоматическую систему ремонта.} {121}{}{У меня нет доступа к терминалу. Кто-то сломал клавиатуру.} +{200}{}{ не может прочесть то, что написано на мониторе.} diff --git a/data/text/russian/dialog/zcslave.msg b/data/text/russian/dialog/zcslave.msg new file mode 100644 index 000000000..8995aedfb --- /dev/null +++ b/data/text/russian/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{Вы видите жалкую пародию на человеческое существо.} +{101}{}{Вы по-прежнему видите жалкую пародию на человеческое существо.} +{150}{}{Вы видите очень, очень жалкую пародию на человеческое существо. Было бы на что смотреть.} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/spanish/dialog/ahhakun.msg b/data/text/spanish/dialog/ahhakun.msg index 491d72f2f..a3594ac85 100644 --- a/data/text/spanish/dialog/ahhakun.msg +++ b/data/text/spanish/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{¿Y entonces?} {290}{hak122}{Demasiadas estaciones y demasiadas heridas, Elegido. En vez de eso, debes escuchar.} {291}{}{De acuerdo.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/spanish/dialog/ecnomchf.msg b/data/text/spanish/dialog/ecnomchf.msg index 257ca3154..6aadcfd76 100644 --- a/data/text/spanish/dialog/ecnomchf.msg +++ b/data/text/spanish/dialog/ecnomchf.msg @@ -21,3 +21,8 @@ {120}{}{¡Márchate!} {121}{}{Déjanos.} {122}{}{Somos una tribu pacífica.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/spanish/dialog/fcgunmer.msg b/data/text/spanish/dialog/fcgunmer.msg index f6db2d52a..9c4128230 100644 --- a/data/text/spanish/dialog/fcgunmer.msg +++ b/data/text/spanish/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{Eso es todo lo que se me ocurre en este momento. Buenos días.} {150}{}{Buenos días.} {151}{}{Eres un ladrón, un asesino, y un villano. Me temo que debo matarte.} +{152}{}{Esperas...} diff --git a/data/text/spanish/dialog/wsterm2a.msg b/data/text/spanish/dialog/wsterm2a.msg index ef4fc40f7..49e807bfd 100644 --- a/data/text/spanish/dialog/wsterm2a.msg +++ b/data/text/spanish/dialog/wsterm2a.msg @@ -72,6 +72,7 @@ {145}{}{Salir.} {146}{}{Saliendo de programa de diagnóstico.} {147}{}{[MÁS]} +{200}{}{Ordenador en modo diagnóstico. Por favor, espere hasta que la rutina de diagnóstico haya finalizado.} {300}{}{ - ID Confirmada: } {301}{}{ -- Último acceso al terminal: } diff --git a/data/text/spanish/dialog/wsterm2c.msg b/data/text/spanish/dialog/wsterm2c.msg index e5b13f195..a677d91be 100644 --- a/data/text/spanish/dialog/wsterm2c.msg +++ b/data/text/spanish/dialog/wsterm2c.msg @@ -21,3 +21,4 @@ {119}{}{Salir.} {120}{}{Ya has detenido el sistema de reparación automática.} {121}{}{No puedo acceder al terminal. Alguien rompió el teclado.} +{200}{}{ es incapaz de leer lo que pone en el monitor.} diff --git a/data/text/spanish/dialog/zcslave.msg b/data/text/spanish/dialog/zcslave.msg new file mode 100644 index 000000000..a0bba4755 --- /dev/null +++ b/data/text/spanish/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{Ves a un pobre diablo.} +{101}{}{Sigues viendo a un pobre diablo.} +{150}{}{Ves a un verdaderamente pobre diablo. ¿Por qué estás mirando?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/data/text/spanish/dialog_female/ahhakun.msg b/data/text/spanish/dialog_female/ahhakun.msg index 469818be3..390bd99e6 100644 --- a/data/text/spanish/dialog_female/ahhakun.msg +++ b/data/text/spanish/dialog_female/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{¿Y entonces?} {290}{hak122}{Demasiadas estaciones y demasiadas heridas, Elegida. En vez de eso, debes escuchar.} {291}{}{De acuerdo.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/spanish/dialog_female/ecnomchf.msg b/data/text/spanish/dialog_female/ecnomchf.msg index 02b5408b8..b4a7eef0a 100644 --- a/data/text/spanish/dialog_female/ecnomchf.msg +++ b/data/text/spanish/dialog_female/ecnomchf.msg @@ -21,3 +21,8 @@ {120}{}{¡Márchate!} {121}{}{Déjanos.} {122}{}{Somos una tribu pacífica.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/spanish/dialog_female/fcgunmer.msg b/data/text/spanish/dialog_female/fcgunmer.msg index 561d583c4..dfce8ea42 100644 --- a/data/text/spanish/dialog_female/fcgunmer.msg +++ b/data/text/spanish/dialog_female/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{Eso es todo lo que se me ocurre en este momento. Buenos días.} {150}{}{Buenos días.} {151}{}{Eres una ladrona, una asesina, y una villana. Me temo que debo matarte.} +{152}{}{Esperas...} diff --git a/data/text/swedish/dialog/ahhakun.msg b/data/text/swedish/dialog/ahhakun.msg index f8ec2bf05..af2a9d218 100644 --- a/data/text/swedish/dialog/ahhakun.msg +++ b/data/text/swedish/dialog/ahhakun.msg @@ -190,3 +190,5 @@ {289}{}{And then?} {290}{hak122}{Too many seasons and too many wounds, Chosen. Instead, you must listen.} {291}{}{All right.} +{300}{}{Those who steal carry a great burden. Remember this, Chosen One.} +{301}{}{You must now pay for your sins, Chosen One.} diff --git a/data/text/swedish/dialog/ecnomchf.msg b/data/text/swedish/dialog/ecnomchf.msg index 5507b2da4..79ac67378 100644 --- a/data/text/swedish/dialog/ecnomchf.msg +++ b/data/text/swedish/dialog/ecnomchf.msg @@ -23,3 +23,8 @@ {120}{}{Be gone!} {121}{}{Leave us.} {122}{}{We are a peaceful tribe.} +{200}{}{Ah, a traveler. I am sorry that we have no tent from which you may take shade from the unending heat of the land. Do rest a moment, so that we may talk.} +{201}{}{Thank you; I graciously accept your offer.} +{202}{}{How unfortunate. Rest a moment then; you are welcome among us.} +{203}{}{I do hope you found what you needed. Anything else?} +{204}{}{Not today. I must be going.} diff --git a/data/text/swedish/dialog/fcgunmer.msg b/data/text/swedish/dialog/fcgunmer.msg index aaca1956a..17ba90ef6 100644 --- a/data/text/swedish/dialog/fcgunmer.msg +++ b/data/text/swedish/dialog/fcgunmer.msg @@ -50,3 +50,4 @@ {149}{}{That is all I can think of at the moment. Good day.} {150}{}{Good day.} {151}{}{You are a thief, a murderer, and a villain. I'm afraid I must kill you.} +{152}{}{Wait...} diff --git a/data/text/swedish/dialog/wsterm2a.msg b/data/text/swedish/dialog/wsterm2a.msg index c5a9ab3c8..2812189cc 100644 --- a/data/text/swedish/dialog/wsterm2a.msg +++ b/data/text/swedish/dialog/wsterm2a.msg @@ -72,6 +72,7 @@ {145}{}{Exit} {146}{}{Exiting Diagnostic Program.} {147}{}{[MER]} +{200}{}{Computer in diagnostic mode. Please wait until diagnostic routine is finished.} {300}{}{ - ID Confirmed: } {301}{}{ Terminal Last Accessed: } diff --git a/data/text/swedish/dialog/wsterm2c.msg b/data/text/swedish/dialog/wsterm2c.msg index 5765f7f09..2d4ddbca6 100644 --- a/data/text/swedish/dialog/wsterm2c.msg +++ b/data/text/swedish/dialog/wsterm2c.msg @@ -24,3 +24,4 @@ {119}{}{Exit} {120}{}{You already shut down the automated repair system.} {121}{}{I can't access the terminal. Someone broke the keyboard.} +{200}{}{ is unable to read what's on the monitor.} diff --git a/data/text/swedish/dialog/zcslave.msg b/data/text/swedish/dialog/zcslave.msg new file mode 100644 index 000000000..c2e030506 --- /dev/null +++ b/data/text/swedish/dialog/zcslave.msg @@ -0,0 +1,4 @@ +{100}{}{You see a miserable wretch of human being.} +{101}{}{You still see a miserable wretch of a human being.} +{150}{}{You see a really, really miserable wretch of a human being. Why are you staring?} +{151}{}{Yes, still a really miserable wretch of a human being.} diff --git a/extra/tests.sh b/extra/tests.sh deleted file mode 100755 index 7e33408d9..000000000 --- a/extra/tests.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -xeu -o pipefail - -./extra/tests/scripts-lst.py scripts_src/headers/scripts.h data/scripts/scripts.lst -./extra/tests/lvars.py data/scripts/scripts.lst scripts_src -./extra/tests/dialogs.py diff --git a/extra/tests/dialogs.py b/extra/tests/dialogs.py deleted file mode 100755 index be9fb1a22..000000000 --- a/extra/tests/dialogs.py +++ /dev/null @@ -1,88 +0,0 @@ -#!/usr/bin/env python3 -# coding: utf-8 - -# finds inconsistencies between ssl and msg - -import os -from glob import glob -import re - -script_paths = [ - y for x in os.walk("scripts_src/") for y in glob(os.path.join(x[0], "*.ssl")) -] - -message_count = 0 -g_dialog_path = "data/text/english/dialog/generic.msg" -g_dialog_messages = [] -with open(g_dialog_path, encoding="cp1252") as fdialog: - for line in fdialog: - g_dialog_messages.extend(re.findall(r"\{([0-9]{3,5})\}", line)) - -for script_path in script_paths: - script_messages = [] - g_script_messages = [] - with open(script_path) as fscript: - script_text = fscript.read() - lines = re.sub(r"/\*.+?\*/", "", script_text, flags=re.DOTALL).split("\n") - for line in lines: - if line.lstrip().startswith("//"): - continue - script_messages.extend( - re.findall( - r"[^_]+(?:display_mstr|floater|dude_floater|Reply|GOption|GLowOption|NOption|NLowOption|BOption|BLowOption|GMessage|NMessage|BMessage) *\( *([0-9]{3,5}) *[,\)]", - line, - ) - ) - script_messages.extend(re.findall(r"[^_]+mstr *\( *([0-9]{3,5}) *\)", line)) - m = re.search( - r"[^_]+(?:floater_rand|Reply_Rand) *\( *([0-9]{3,5}) *, *([0-9]{3,5})", - line, - ) - if m: - script_messages.extend( - [str(i) for i in range(int(m.group(1)), int(m.group(2)) + 1)] - ) - g_script_messages.extend( - re.findall(r"[^_]+g_mstr *\( *([0-9]{3,5}) *\)", line) - ) - script_messages = list(dict.fromkeys(script_messages)) - g_script_messages = list(dict.fromkeys(g_script_messages)) - - m = re.search(r"#define NAME +SCRIPT_([A-Z0-9_]+)", script_text) - if not m: - m = re.search(".+/(.+)\.ssl", script_path) - dialog_path = "data/text/english/dialog/" + m.group(1).lower() + ".msg" - dialog_messages = [] - try: - with open(dialog_path, encoding="cp1252") as fdialog: - for line in fdialog: - dialog_messages.extend(re.findall(r"\{([0-9]{3,5})\}", line)) - except IOError: - continue - script_only = [item for item in script_messages if item not in dialog_messages] - if script_only: - print( - "Messages in " - + script_path - + " that missed in " - + dialog_path - + ": " - + " ".join(script_only) - ) - message_count += len(script_messages) - - g_script_only = [ - item for item in g_script_messages if item not in g_dialog_messages - ] - if g_script_only: - print( - "Generic messages in " - + script_path - + " that missed in " - + g_dialog_path - + ": " - + " ".join(g_script_only) - ) - message_count += len(g_script_messages) - -print("Messages tested: " + str(message_count)) diff --git a/extra/tests/lvars.py b/extra/tests/lvars.py deleted file mode 100755 index 01feffb83..000000000 --- a/extra/tests/lvars.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python3 -# coding: utf-8 - -# checks if there are enough lvars allowed in scripts.lst - -import sys -import re -import os - -scripts_lst = sys.argv[1] -scripts_dir = sys.argv[2] - -lvars = {} - -with open(scripts_lst) as f: - linenum = 0 - for line in f: - linenum += 1 - match = re.match(r"^(\w+)\.int.*local_vars=(\d+)", line) - name = match[1].lower() - num_lvars = int(match[2]) - if not name in lvars: # scripts.lst uses first entry - lvars[name] = num_lvars - - -def get_max_lvar(fpath): - max_lvar = 0 - with open(fpath) as f: - for line in f: - match = re.match(r"^#define\s+LVAR_\w+\s+\((\d+)\)\s+.*", line) - if match: - cur_lvar = int(match[1]) - if cur_lvar > max_lvar: - max_lvar = cur_lvar - return max_lvar - - -for dir_name, subdir_list, file_list in os.walk(scripts_dir, topdown=False): - for file_name in file_list: - if file_name.endswith(".ssl"): - path = os.path.join(dir_name, file_name) - max_lvar = get_max_lvar(path) - script_name = os.path.splitext(file_name) - if script_name in lvars and lvars[script_name] < max_lvar: - print( - "Script {} has {} LVARs defined, but scripts.lst only allows {}.".format( - script_name, max_lvar, lvars[script_name] - ) - ) - sys.exit(1) diff --git a/extra/tests/requirements.txt b/extra/tests/requirements.txt deleted file mode 100644 index 6c042a374..000000000 --- a/extra/tests/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -black>=22.10.0 diff --git a/extra/tests/scripts-lst.py b/extra/tests/scripts-lst.py deleted file mode 100755 index a86ba0748..000000000 --- a/extra/tests/scripts-lst.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python3 -# coding: utf-8 - -import sys -import re - -scripts_h = sys.argv[1] -scripts_lst = sys.argv[2] - -h_by_num = {} # num > name -h_by_name = {} # name > num -lst_by_num = {} # linenum > name -lst_by_name = {} # name > linenum -warning = False - -with open(scripts_h) as f: - for line in f: - match = re.match(r"^#define\s+SCRIPT_(\w+)\s+\((\d+)\)\s+.*", line) - if match: - h_by_num[int(match[2])] = match[1] - h_by_name[match[1]] = int(match[2]) - -with open(scripts_lst) as f: - linenum = 0 - for line in f: - linenum += 1 - scr = line.split(".", maxsplit=1)[0].upper() - lst_by_num[linenum] = scr - lst_by_name[scr] = linenum - -# search dupes in scripts.lst -lst_names = [lst_by_num[x] for x in lst_by_num] -lst_duped_names = sorted(set([x for x in lst_names if lst_names.count(x) > 1])) -lst_duped_names = [x for x in lst_duped_names if x != "RESERVED"] -for n in lst_duped_names: - duped_lines = [x for x in lst_by_num if lst_by_num[x] == n] - dupes_str = ", ".join([str(x) for x in duped_lines]) - print("Dupe: {} is defined on lines {} in scripts.lst".format(n, dupes_str)) - warning = True - -# search mismatched names and missing scripts.h defines -for i in range(1, len(lst_by_num)): - try: - if lst_by_num[i] != h_by_num[i]: - print( - "Mismatch: scripts.lst {}, scripts.h {}".format( - lst_by_num[i], h_by_num[i] - ) - ) - warning = True - except: - if (lst_by_num[i] not in h_by_name) and (lst_by_num[i] != "RESERVED"): - print( - "Missing: script {}.int, line number {} in scripts.lst is absent from scripts.h".format( - lst_by_num[i], i - ) - ) - warning = True - -if warning: - sys.exit(1) diff --git a/scripts_src/generic/ziwoddor.ssl b/scripts_src/generic/ziwoddor.ssl index 9eb830212..20318e52c 100644 --- a/scripts_src/generic/ziwoddor.ssl +++ b/scripts_src/generic/ziwoddor.ssl @@ -517,21 +517,21 @@ on your lockpick and traps skills and perception to notice things. *************************************************************************************/ procedure Look_Traps_And_Locks begin - variable Perception_Check; + variable Perception_Roll; variable Traps_Check; variable Locks_Check; - Perception_Check = roll_vs_stat(dude_obj, STAT_pe, 0); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, 0); Traps_Check:=roll_vs_skill(dude_obj,SKILL_TRAPS,0); Locks_Check:=roll_vs_skill(dude_obj,SKILL_LOCKPICK,0); - if (is_success(Perception_Check)) then begin + if (is_success(Perception_Roll)) then begin /*************************************************************************************************/ /* Critical Success of a Perception Check (Start)*/ - if (is_critical(Perception_Check)) then begin + if (is_critical(Perception_Roll)) then begin if (is_success(Traps_Check)) then begin set_local_var(LVAR_Found_Trap,1); // player has found the trap @@ -735,7 +735,7 @@ procedure Look_Traps_And_Locks begin /* Critical Failure of a Perception Check (Start)*/ - else if (is_critical(Perception_Check)) then begin + else if (is_critical(Perception_Roll)) then begin if (is_success(Traps_Check)) then begin set_local_var(LVAR_Found_Trap,1); // player has found the trap @@ -942,14 +942,14 @@ traps skill and perception to notice the trap. **********************************************************************************/ procedure Look_Traps begin - variable Perception_Check; + variable Perception_Roll; variable Traps_Check; - Perception_Check = roll_vs_stat(dude_obj, STAT_pe, 0); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, 0); Traps_Check:=roll_vs_skill(dude_obj,SKILL_TRAPS,0); - if (is_success(Perception_Check)) then begin - if (is_critical(Perception_Check)) then begin + if (is_success(Perception_Roll)) then begin + if (is_critical(Perception_Roll)) then begin if (is_success(Traps_Check)) then begin if (is_critical(Traps_Check)) then begin display_msg(mstr(104)); @@ -990,7 +990,7 @@ procedure Look_Traps begin end // Regular Success (Stat_pe) end - else if (is_critical(Perception_Check)) then begin + else if (is_critical(Perception_Roll)) then begin if (is_success(Traps_Check)) then begin if (is_critical(Traps_Check)) then begin display_msg(mstr(136)); @@ -1039,14 +1039,14 @@ lockpick skill and perception to notice the lock. *********************************************************************************/ procedure Look_Locks begin - variable Perception_Check; + variable Perception_Roll; variable Locks_Check; - Perception_Check = roll_vs_stat(dude_obj, STAT_pe, 0); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, 0); Locks_Check:=roll_vs_skill(dude_obj,SKILL_LOCKPICK,0); - if (is_success(Perception_Check)) then begin - if (is_critical(Perception_Check)) then begin + if (is_success(Perception_Roll)) then begin + if (is_critical(Perception_Roll)) then begin if (is_success(Locks_Check)) then begin if (is_critical(Locks_Check)) then begin display_msg(mstr(114)); @@ -1087,7 +1087,7 @@ procedure Look_Locks begin end // Regular Success (Stat_pe) end - else if (is_critical(Perception_Check)) then begin + else if (is_critical(Perception_Roll)) then begin if (is_success(Locks_Check)) then begin if (is_critical(Locks_Check)) then begin display_msg(mstr(146)); diff --git a/scripts_src/headers/command.h b/scripts_src/headers/command.h index 7f7b2732b..406ebe3fb 100644 --- a/scripts_src/headers/command.h +++ b/scripts_src/headers/command.h @@ -488,10 +488,10 @@ variable step_tile; * @ret {int} */ procedure roll_vs_stat(variable who, variable stat, variable mod) begin - variable rnd = random(1,100); - variable stat_check = do_check(who, stat, mod); + variable rnd = random(1, 100); + variable success = is_success(do_check(who, stat, mod)); // success - if stat_check then begin + if success then begin // critical if (rnd + (get_critter_stat(who, STAT_lu) - 5)) > 95 then return ROLL_CRITICAL_SUCCESS; else return ROLL_SUCCESS; diff --git a/scripts_src/headers/doors_containers.h b/scripts_src/headers/doors_containers.h index 3de9ddaa9..98663ce73 100644 --- a/scripts_src/headers/doors_containers.h +++ b/scripts_src/headers/doors_containers.h @@ -602,14 +602,14 @@ lockpick skill and perception to notice the lock. *********************************************************************************/ #ifndef custom_Look_Locks procedure Look_Locks begin - variable Perception_Check; + variable Perception_Roll; variable Locks_Check; - Perception_Check = roll_vs_stat(dude_obj, STAT_pe, 0); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, 0); Locks_Check:=roll_vs_skill(dude_obj,SKILL_LOCKPICK,0); - if (is_success(Perception_Check)) then begin - if is_critical(Perception_Check) then begin + if (is_success(Perception_Roll)) then begin + if is_critical(Perception_Roll) then begin if (is_success(Locks_Check)) then begin if (is_critical(Locks_Check)) then begin display_msg(my_mstr(114)); @@ -650,7 +650,7 @@ lockpick skill and perception to notice the lock. end // Regular Success (Stat_pe) end - else if is_critical(Perception_Check) then begin + else if is_critical(Perception_Roll) then begin if (is_success(Locks_Check)) then begin if (is_critical(Locks_Check)) then begin display_msg(my_mstr(146)); @@ -698,14 +698,14 @@ traps skill and perception to notice the trap. **********************************************************************************/ #ifndef custom_Look_Traps procedure Look_Traps begin - variable Perception_Check; + variable Perception_Roll; variable Traps_Check; - Perception_Check = roll_vs_stat(dude_obj, STAT_pe, 0); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, 0); Traps_Check:=roll_vs_skill(dude_obj,SKILL_TRAPS,0); - if (is_success(Perception_Check)) then begin - if is_critical(Perception_Check) then begin + if (is_success(Perception_Roll)) then begin + if is_critical(Perception_Roll) then begin if (is_success(Traps_Check)) then begin if (is_critical(Traps_Check)) then begin display_msg(my_mstr(104)); @@ -746,7 +746,7 @@ traps skill and perception to notice the trap. end // Regular Success (Stat_pe) end - else if is_critical(Perception_Check) then begin + else if is_critical(Perception_Roll) then begin if (is_success(Traps_Check)) then begin if (is_critical(Traps_Check)) then begin display_msg(my_mstr(136)); @@ -795,21 +795,21 @@ on your lockpick and traps skills and perception to notice things. *************************************************************************************/ #ifndef custom_Look_Traps_And_Locks procedure Look_Traps_And_Locks begin - variable Perception_Check; + variable Perception_Roll; variable Traps_Check; variable Locks_Check; - Perception_Check = roll_vs_stat(dude_obj, STAT_pe, 0); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, 0); Traps_Check:=roll_vs_skill(dude_obj,SKILL_TRAPS,0); Locks_Check:=roll_vs_skill(dude_obj,SKILL_LOCKPICK,0); - if (is_success(Perception_Check)) then begin + if (is_success(Perception_Roll)) then begin /*************************************************************************************************/ /* Critical Success of a Perception Check (Start)*/ - if is_critical(Perception_Check) then begin + if is_critical(Perception_Roll) then begin if (is_success(Traps_Check)) then begin set_local_var(LVAR_Found_Trap,1); // player has found the trap @@ -1013,7 +1013,7 @@ on your lockpick and traps skills and perception to notice things. /* Critical Failure of a Perception Check (Start)*/ - else if is_critical(Perception_Check) then begin + else if is_critical(Perception_Roll) then begin if (is_success(Traps_Check)) then begin set_local_var(LVAR_Found_Trap,1); // player has found the trap diff --git a/scripts_src/headers/scripts.h b/scripts_src/headers/scripts.h index aca6f24f5..12b6503dd 100644 --- a/scripts_src/headers/scripts.h +++ b/scripts_src/headers/scripts.h @@ -275,7 +275,7 @@ #define SCRIPT_ECRAIDER (256) // ECRaider.int ; Random Encounter Raider #define SCRIPT_ECPEASNT (257) // ECPeasnt.int ; Random Encounter Peasant #define SCRIPT_ECMRCHNT (258) // ECMrchnt.int ; Random Encounter Merchant -#define SCRIPT_ECGUARD (259) // ECGuard.int ; Random Encounter Gaurd +#define SCRIPT_ECGUARD (259) // ECGuard.int ; Random Encounter Guard #define SCRIPT_SCRAWPAT (260) // SCRawpat.int ; Rawhide patrons at NCR Entrance #define SCRIPT_WTELFLR2 (261) // WTElFlr2.int ; Electric Floor on Level 2 Sierra Base #define SCRIPT_WTPLTRP0 (262) // WTPlTrp0.int ; Plasma Trap for Sierra Base(-30) @@ -786,7 +786,7 @@ #define SCRIPT_ECCRAZY (767) // ECCrazy.int ; Crazies from Random Encounter #define SCRIPT_ECCLMJMP (768) // ECClmJmp.int ; Random Encounter Claim Jumpers #define SCRIPT_ECCANBAL (769) // ECCanbal.int ; Random Encounter Cannibals -#define SCRIPT_ECNOMSHA (770) // ECNomsha.int ; Random Encounter Nomad Shamon +#define SCRIPT_ECNOMSHA (770) // ECNomsha.int ; Random Encounter Nomad Shaman #define SCRIPT_ECMARADR (771) // ECMaradr.int ; Random Encounter Marauder #define SCRIPT_ECROGUE (772) // ECRogue.int ; Random Encounter Rogue #define SCRIPT_ECHERMIT (773) // ECHermit.int ; Random Encounter Hermit @@ -905,7 +905,7 @@ #define SCRIPT_SSEMIEN1 (886) // SSEmiEn1.int ; Ncr emitters for ncr entrance on map 1 #define SCRIPT_QIBSTDR1 (887) // QIBstDr1.int ; Blast Door for Reactor Off to remain closed #define SCRIPT_QIBSTDR2 (888) // QIBstDr2.int ; Blast Door for Reactor On to remain closed -#define SCRIPT_VIDARBOX (889) // VIDarBox.int ; Vault City Darrow Shop Box +#define SCRIPT_VIDARBOX (889) // VIDarBox.int ; Vault City Darrow Shop Box #define SCRIPT_HSCRLDR (890) // HSCrlDr.int ; Jail cell door for Broken Hills #define SCRIPT_ECTLKMUT (891) // ecTlkMut.int ; Military Base Conversation Mutants #define SCRIPT_FCCHEMST (892) // FCChemst.int ; Chemist in San Francisco diff --git a/scripts_src/klamath/kcmaida.ssl b/scripts_src/klamath/kcmaida.ssl index aba7cc5bf..4d6e30076 100644 --- a/scripts_src/klamath/kcmaida.ssl +++ b/scripts_src/klamath/kcmaida.ssl @@ -349,7 +349,7 @@ procedure Node912 begin end procedure Node920 begin - NMessage(890); + NMessage(234); call Node009; end diff --git a/scripts_src/main/nhmyron.ssl b/scripts_src/main/nhmyron.ssl index 4079f1cd3..0a668eaf5 100644 --- a/scripts_src/main/nhmyron.ssl +++ b/scripts_src/main/nhmyron.ssl @@ -68,7 +68,6 @@ procedure Node021; procedure Node022; procedure Node023; procedure Node024; -procedure Node024a; procedure Node025; procedure Node026; procedure Node101; @@ -934,9 +933,6 @@ end procedure Node024 begin floater_rand(590, 595); end -procedure Node024a begin - floater_rand(596, 599); -end procedure Node025 begin floater(600); end diff --git a/scripts_src/navarro/cimine.ssl b/scripts_src/navarro/cimine.ssl index 3a7fb5692..dd3ff2046 100644 --- a/scripts_src/navarro/cimine.ssl +++ b/scripts_src/navarro/cimine.ssl @@ -236,14 +236,14 @@ procedure description_p_proc begin script_overrides; - if (local_var(LVAR_Got_Perception_Roll) == 0) then begin - set_local_var(LVAR_Got_Perception_Roll,1); - Perception_Roll:=do_check(dude_obj,STAT_pe,PERCEPTION_BONUS); - set_local_var(LVAR_Extended_Look,Perception_Roll); + if local_var(LVAR_Got_Perception_Roll) == 0 then begin + set_local_var(LVAR_Got_Perception_Roll, 1); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, PERCEPTION_BONUS); + set_local_var(LVAR_Extended_Look, Perception_Roll); end - if (is_critical(local_var(LVAR_Extended_Look))) then begin - if (is_success(local_var(LVAR_Extended_Look))) then + if is_critical(local_var(LVAR_Extended_Look)) then begin + if is_success(local_var(LVAR_Extended_Look)) then display_msg(mstr(100)); else display_msg(mstr(106)); diff --git a/scripts_src/raiders/iimine.ssl b/scripts_src/raiders/iimine.ssl index 71d29f836..33c2b4a81 100644 --- a/scripts_src/raiders/iimine.ssl +++ b/scripts_src/raiders/iimine.ssl @@ -99,13 +99,13 @@ procedure spatial_p_proc begin Detection_Roll = roll_vs_stat(source_obj, STAT_pe, Range_Mod); - if (is_success(Detection_Roll)) then begin + if is_success(Detection_Roll) then begin set_local_var(LVAR_Trap_Found,1); reg_anim_clear(source_obj); Trap:=create_object_sid(ART_TRAP_VISIBLE,self_tile,self_elevation,CUR_SCRIPT); - if (is_critical(Detection_Roll)) then begin + if is_critical(Detection_Roll) then begin if (source_obj == dude_obj) then display_msg(mstr(100)); else if ((proto_data(obj_pid(source_obj),cr_body_type) == CR_BODY_BIPED) and (obj_can_see_obj(source_obj,dude_obj))) then @@ -239,13 +239,13 @@ procedure description_p_proc begin script_overrides; if (local_var(LVAR_Got_Perception_Roll) == 0) then begin - set_local_var(LVAR_Got_Perception_Roll,1); - Perception_Roll:=do_check(dude_obj,STAT_pe,PERCEPTION_BONUS); - set_local_var(LVAR_Extended_Look,Perception_Roll); + set_local_var(LVAR_Got_Perception_Roll, 1); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, PERCEPTION_BONUS); + set_local_var(LVAR_Extended_Look, Perception_Roll); end - if (is_critical(local_var(LVAR_Extended_Look))) then begin - if (is_success(local_var(LVAR_Extended_Look))) then + if is_critical(local_var(LVAR_Extended_Look)) then begin + if is_success(local_var(LVAR_Extended_Look)) then display_msg(mstr(100)); else display_msg(mstr(106)); diff --git a/scripts_src/raiders/iipit.ssl b/scripts_src/raiders/iipit.ssl index d41091204..654bb998b 100644 --- a/scripts_src/raiders/iipit.ssl +++ b/scripts_src/raiders/iipit.ssl @@ -74,13 +74,13 @@ procedure spatial_p_proc begin Detection_Roll = roll_vs_stat(source_obj, STAT_pe, Range_Mod); - if (is_success(Detection_Roll)) then begin + if is_success(Detection_Roll) then begin set_local_var(LVAR_Trap_Found,1); reg_anim_clear(source_obj); Trap:=create_object_sid(ART_TRAP_VISIBLE,self_tile,self_elevation,CUR_SCRIPT); - if (is_critical(Detection_Roll)) then begin + if is_critical(Detection_Roll) then begin if (source_obj == dude_obj) then display_msg(mstr(101)); else if ((proto_data(obj_pid(source_obj),cr_body_type) == CR_BODY_BIPED) and (obj_can_see_obj(source_obj,dude_obj))) then @@ -110,7 +110,7 @@ procedure spatial_p_proc begin end Trap:=create_object(ART_TRAP_VISIBLE,self_tile,self_elevation); - display_msg( message_str( SCRIPT_IIPIT, 100 ) ); + display_msg( message_str( SCRIPT_IIPIT, 100 ) ); critter_dmg(source_obj,random(MIN_DMG,MAX_DMG),(DMG_normal_dam BWOR DMG_BYPASS_ARMOR BWOR DMG_NOANIMATE)); set_local_var(LVAR_Trap_Found,1); // Dump player in pits @@ -131,13 +131,13 @@ procedure description_p_proc begin script_overrides; if (local_var(LVAR_Got_Perception_Roll) == 0) then begin - set_local_var(LVAR_Got_Perception_Roll,1); - Perception_Roll:=do_check(dude_obj,STAT_pe,PERCEPTION_BONUS); - set_local_var(LVAR_Extended_Look,Perception_Roll); + set_local_var(LVAR_Got_Perception_Roll, 1); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, PERCEPTION_BONUS); + set_local_var(LVAR_Extended_Look, Perception_Roll); end - if (is_critical(local_var(LVAR_Extended_Look))) then begin - if (is_success(local_var(LVAR_Extended_Look))) then + if is_critical(local_var(LVAR_Extended_Look)) then begin + if is_success(local_var(LVAR_Extended_Look)) then display_msg(mstr(101)); else display_msg(mstr(101)); diff --git a/scripts_src/rndenctr/ecslave.ssl b/scripts_src/rndenctr/ecslave.ssl index fac1a6843..e6358ee10 100644 --- a/scripts_src/rndenctr/ecslave.ssl +++ b/scripts_src/rndenctr/ecslave.ssl @@ -2,8 +2,8 @@ Copyright 1998-2003 Interplay Entertainment Corp. All rights reserved. */ -/* Random Encounter scripts. These will be filled in more once they - have been designed. +/* + Random Encounter slave. Usually with slavers around. */ @@ -14,13 +14,50 @@ #include "../headers/command.h" +#define LVAR_Hostile (5) +#define LVAR_Personal_Enemy (6) + procedure start; procedure talk_p_proc; +procedure slaves_attacked; procedure start begin set_self_team(TEAM_RND_SLAVE); + set_self_ai(AI_SLAVE); end procedure talk_p_proc begin - floater(random(100,104)); + floater(random(100, 104)); +end + +procedure critter_p_proc begin + if (local_var(LVAR_Hostile) == 2) and self_can_see_dude then begin + call slaves_attacked; + set_local_var(LVAR_Hostile, 1); + attack(dude_obj); + end +end + +// slavers protect their merchandise +procedure slaves_attacked begin + variable who; + foreach who in list_as_array(LIST_CRITTERS) begin + if get_team(who) == TEAM_RND_SLAVER then set_team(who, TEAM_RND_SLAVE); + end +end + +procedure damage_p_proc begin + if source_obj == dude_obj then begin + set_local_var(LVAR_Personal_Enemy, 1); + end +end + +procedure pickup_p_proc begin + if source_obj == dude_obj then begin + set_local_var(LVAR_Hostile, 2); + end +end + +procedure destroy_p_proc begin + inc_good_critter end diff --git a/scripts_src/sierra/wtlndmin.ssl b/scripts_src/sierra/wtlndmin.ssl index 6ba7c45c6..c44fe20ab 100644 --- a/scripts_src/sierra/wtlndmin.ssl +++ b/scripts_src/sierra/wtlndmin.ssl @@ -223,13 +223,13 @@ procedure Trap_Detection begin Detection_Roll = roll_vs_stat(source_obj, STAT_pe, Range_Mod); - if (is_success(Detection_Roll)) then begin + if is_success(Detection_Roll) then begin set_local_var(LVAR_Trap_Found,1); reg_anim_clear(source_obj); Trap:=create_object_sid(ART_TRAP_VISIBLE,self_tile,self_elevation,CUR_SCRIPT); - if (is_critical(Detection_Roll)) then begin + if is_critical(Detection_Roll) then begin if (source_obj == dude_obj) then display_msg(mstr(100)); else if ((proto_data(obj_pid(source_obj),cr_body_type) == CR_BODY_BIPED) and (obj_can_see_obj(source_obj,dude_obj))) then diff --git a/scripts_src/template/spear_trap.ssl b/scripts_src/template/spear_trap.ssl index 87dad26df..376e30f0c 100644 --- a/scripts_src/template/spear_trap.ssl +++ b/scripts_src/template/spear_trap.ssl @@ -203,9 +203,9 @@ procedure description_p_proc begin script_overrides; if (local_var(LVAR_Got_Perception_Roll) == 0) then begin - set_local_var(LVAR_Got_Perception_Roll,1); - Perception_Roll:=do_check(dude_obj,STAT_pe,PERCEPTION_BONUS); - set_local_var(LVAR_Extended_Look,Perception_Roll); + set_local_var(LVAR_Got_Perception_Roll, 1); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, PERCEPTION_BONUS); + set_local_var(LVAR_Extended_Look, Perception_Roll); end if (is_critical(local_var(LVAR_Extended_Look))) then begin @@ -231,11 +231,11 @@ procedure timed_event_p_proc begin end procedure Check_Hit begin - variable Agility_Roll; + variable Agility_Check; - Agility_Roll:=do_check(source_obj,STAT_ag,AGILITY_BONUS); + Agility_Check = do_check(source_obj, STAT_ag, AGILITY_BONUS); - if (is_success(Agility_Roll)) then begin + if is_success(Agility_Check) then begin if (source_obj == dude_obj) then display_msg(mstr(104)); else diff --git a/scripts_src/template/sprtrp0.ssl b/scripts_src/template/sprtrp0.ssl index 4e2a10bb1..222849bc8 100644 --- a/scripts_src/template/sprtrp0.ssl +++ b/scripts_src/template/sprtrp0.ssl @@ -96,13 +96,13 @@ procedure spatial_p_proc begin Detection_Roll = roll_vs_stat(source_obj, STAT_pe, Range_Mod); - if (is_success(Detection_Roll)) then begin + if is_success(Detection_Roll) then begin set_local_var(LVAR_Trap_Found,1); reg_anim_clear(source_obj); Trap:=create_object_sid(ART_TRAP_VISIBLE,self_tile,self_elevation,CUR_SCRIPT); - if (is_critical(Detection_Roll)) then begin + if is_critical(Detection_Roll) then begin if (source_obj == dude_obj) then display_msg(mstr(100)); else if ((proto_data(obj_pid(source_obj),cr_body_type) == CR_BODY_BIPED) and (obj_can_see_obj(source_obj,dude_obj))) then @@ -218,13 +218,13 @@ procedure description_p_proc begin script_overrides; if (local_var(LVAR_Got_Perception_Roll) == 0) then begin - set_local_var(LVAR_Got_Perception_Roll,1); - Perception_Roll:=do_check(dude_obj,STAT_pe,PERCEPTION_BONUS); - set_local_var(LVAR_Extended_Look,Perception_Roll); + set_local_var(LVAR_Got_Perception_Roll, 1); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, PERCEPTION_BONUS); + set_local_var(LVAR_Extended_Look, Perception_Roll); end - if (is_critical(local_var(LVAR_Extended_Look))) then begin - if (is_success(local_var(LVAR_Extended_Look))) then + if is_critical(local_var(LVAR_Extended_Look)) then begin + if is_success(local_var(LVAR_Extended_Look)) then display_msg(mstr(100)); else display_msg(mstr(106)); @@ -246,11 +246,11 @@ procedure timed_event_p_proc begin end procedure Check_Hit begin - variable Agility_Roll; + variable Agility_Check; - Agility_Roll:=do_check(source_obj,STAT_ag,AGILITY_BONUS); + Agility_Check= do_check(source_obj, STAT_ag, AGILITY_BONUS); - if (is_success(Agility_Roll)) then begin + if is_success(Agility_Check) then begin if (source_obj == dude_obj) then display_msg(mstr(104)); else diff --git a/scripts_src/template/wtpltrp.ssl b/scripts_src/template/wtpltrp.ssl index 7f3e53fa1..74defe535 100644 --- a/scripts_src/template/wtpltrp.ssl +++ b/scripts_src/template/wtpltrp.ssl @@ -212,13 +212,13 @@ procedure description_p_proc begin script_overrides; if (local_var(LVAR_Got_Perception_Roll) == 0) then begin - set_local_var(LVAR_Got_Perception_Roll,1); - Perception_Roll:=do_check(dude_obj,STAT_pe,PERCEPTION_BONUS); - set_local_var(LVAR_Extended_Look,Perception_Roll); + set_local_var(LVAR_Got_Perception_Roll, 1); + Perception_Roll = roll_vs_stat(dude_obj, STAT_pe, PERCEPTION_BONUS); + set_local_var(LVAR_Extended_Look, Perception_Roll); end - if (is_critical(local_var(LVAR_Extended_Look))) then begin - if (is_success(local_var(LVAR_Extended_Look))) then + if is_critical(local_var(LVAR_Extended_Look)) then begin + if is_success(local_var(LVAR_Extended_Look)) then display_msg(mstr(100)); else display_msg(mstr(106)); @@ -240,11 +240,11 @@ procedure timed_event_p_proc begin end procedure Check_Hit begin - variable Agility_Roll; + variable Agility_Check; - Agility_Roll:=do_check(source_obj,STAT_ag,AGILITY_BONUS); + Agility_Check = do_check(source_obj, STAT_ag, AGILITY_BONUS); - if (is_success(Agility_Roll)) then begin + if is_success(Agility_Check) then begin if (source_obj == dude_obj) then display_msg(mstr(104)); else