summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-01-08 11:45:58 +0000
committerJesusaves <cpntb1@ymail.com>2020-01-08 11:45:58 +0000
commitc867ddd1bbd7a9d8f7f47991cea6d26d612ae612 (patch)
tree42c7951956439b841cceee47be7db1ab559ae772
parent86f35863610b87fef7c414bf9a4685f3e3823ffc (diff)
parentf308fd40179045f526dcce60cf20a16f0d10cb87 (diff)
downloadserverdata-c867ddd1bbd7a9d8f7f47991cea6d26d612ae612.tar.gz
serverdata-c867ddd1bbd7a9d8f7f47991cea6d26d612ae612.tar.bz2
serverdata-c867ddd1bbd7a9d8f7f47991cea6d26d612ae612.tar.xz
serverdata-c867ddd1bbd7a9d8f7f47991cea6d26d612ae612.zip
Merge branch 'balancefix' into 'master'
Meta dialogue fixes See merge request evol/serverdata!215
-rw-r--r--npc/000-0/sailors.txt4
-rw-r--r--npc/000-2-0/julia.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index f412c19c..76870170 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -35,7 +35,7 @@ OnTouch:
setcamnpc "Sailors", 0, -32;
mesn "Human Voice";
- mesq lg("Why Frenchy? It's a Russian!");
+ mesq lg("I think he's from the East...");
next;
setcamnpc "Sailors", 144, -80;
@@ -45,7 +45,7 @@ OnTouch:
setcamnpc;
mesn "Raijin Voice";
- mesq lg("You stupid, she's English, look at the shape of her head.", "You stupid, he's English, look at the shape of his head.");
+ mesq lg("You think she's from the East? As in... Ancea?", "You think he's from the East? As in... Ancea?");
next;
mesq l("Hey you! Can you hear us? Are you okay?");
next;
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 1fde8713..24635648 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -289,7 +289,7 @@ OnTouch:
next;
mesq lg("I'm glad to see you're okay.");
next;
- mesq lg("Could I ask you what your native language is? A sailor told me you're Russian, but another one told me you're French... I'm a bit lost. I will register you on the ship passenger list just after that.");
+ mesq lg("Could I ask you what your native language is? A sailor told me you're from Ancea, but another one told me you're from Aemil because of the logo that... never mind. I'm a bit lost, if you could tell me what language you speak I will register you on the ship passenger list just after that.");
next;
chooseLang;
mainMenu;