summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-02-16 15:02:13 -0300
committerJesusaves <cpntb1@ymail.com>2020-02-16 15:02:13 -0300
commit65b6af61e511f0782d49e96daae27872331ed7fe (patch)
tree09f2a13838eea804272787a2c3bd47a671007a69 /npc
parentc7646d6ede8d7ab2dbb2beb9b09b9c049874f8a0 (diff)
downloadserverdata-65b6af61e511f0782d49e96daae27872331ed7fe.tar.gz
serverdata-65b6af61e511f0782d49e96daae27872331ed7fe.tar.bz2
serverdata-65b6af61e511f0782d49e96daae27872331ed7fe.tar.xz
serverdata-65b6af61e511f0782d49e96daae27872331ed7fe.zip
Remove Russian and reorder languages.
New order is: EN/BR/FR/DE/ES
Diffstat (limited to 'npc')
-rw-r--r--npc/functions/asklanguage.txt31
-rw-r--r--npc/functions/clientversion.txt25
2 files changed, 37 insertions, 19 deletions
diff --git a/npc/functions/asklanguage.txt b/npc/functions/asklanguage.txt
index 523cb54c6..3782e5316 100644
--- a/npc/functions/asklanguage.txt
+++ b/npc/functions/asklanguage.txt
@@ -7,43 +7,38 @@
function script asklanguage {
- .@nb_language = 8;
-
- switch (getarg(0, 0))
+ switch (getarg(0, LANG_IN_SHIP))
{
case LANG_ON_SEA:
setarray .@messages$[0], "I hear you... (English)", // English
- "Je vous entends... (Français)", // French
- "Да я вас слышу... (Русский)", // Russian
- "Te oigo... (Español)", // Spanish
"Eu te ouço... (Português)", // Portuguese
- "Ich höre euch... (Deutsch)"; // German
+ "Je vous entends... (Français)", // French
+ "Ich höre euch... (Deutsch)", // German
+ "Te oigo... (Español)"; // Spanish
break;
case LANG_IN_SHIP:
setarray .@messages$[0], "I speak English.", // English
- "Je parle français.", // French
- "Я говорю на русском.", // Russian
- "Hablo Español.", // Spanish
"Eu falo Português.", // Portuguese
- "Ich spreche Deutsch."; // German
+ "Je parle français.", // French
+ "Ich spreche Deutsch.", // German
+ "Hablo Español."; // Spanish
break;
default:
return;
}
setarray .@flags$[0], "flags/en",
- "flags/fr",
- "flags/ru",
- "flags/es",
"flags/pt_BR",
- "flags/de";
+ "flags/fr",
+ "flags/de",
+ "flags/es";
.@menustr$ = "";
.@separator$ = ":";
- for (.@i = 0; .@i <= .@nb_language; .@i++)
+ for (.@i = 0; .@i <= MAX_LANG; .@i++)
{
- if (.@i == .@nb_language) {
+ if (.@i == MAX_LANG) {
.@separator$ = "";
}
.@menustr$ = .@menustr$ + .@flags$[.@i] + "|" + .@messages$[.@i] + .@separator$;
@@ -53,7 +48,7 @@ function script asklanguage {
.@lang = @menu - 1;
- if (.@lang >= 0 || .@lang <= .@nb_language) {
+ if (.@lang >= 0 || .@lang <= MAX_LANG) {
Lang = .@lang;
}
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index b674ac833..662647b86 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -756,7 +756,30 @@ function script clientupdater {
dispbottom l("Lt. Paul unclaimed rewards REDEEMED.");
}
}
- // TODO: Remove lang > MAX_LANG
+ if (UPDATE < 1581875670) {
+ UPDATE=1581875670;
+ switch (Lang) {
+ case 0:
+ break;
+ case 1: // Old French
+ Lang=LANG_FR; break;
+ case 3: // Old Spanish
+ Lang=LANG_ES; break;
+ case 4: // Old Portuguese
+ Lang=LANG_PTBR; break;
+ case 5: // Old German
+ Lang=LANG_DE; break;
+ default:
+ Lang=99; break;
+ }
+
+ if (Lang > MAX_LANG) {
+ .@dg=1;
+ Lang=0;
+ asklanguage();
+ mes l("Ok, done.");
+ }
+ }
// :// End of Regular Update System
////////////////////////////////////