Set the default client language to English

bin/locale.cfg

@@ -1 +1 @@
-10022 1250 ro
+10002 1252 en

bin/pack/locale_cz/locale/cz/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Zb
 LOGIN_CONNECT_FAILURE	Chyba při spojení se serverem.
 LOGIN_CONNECT_SUCCESS	Byl jsi připojen na server.
 LOGIN_CONNETING	Budeš připojen na server...
-LOGIN_FAILURE_ALREAY	Tvé konto je už připojeno.
+LOGIN_FAILURE_ALREADY	Tvé konto je už pøipojeno.
-LOGIN_FAILURE_BE_SAME_KEY	Problém s přihlášením
 LOGIN_FAILURE_BLOCK_ID	Konto je zablokováno.
 LOGIN_FAILURE_BLOCK_LOGIN	Prosím, zvolte si některý z jiných serverů!
-LOGIN_FAILURE_NOBILL	Konto nemá k dispozici žádnou hrací dobu.
 LOGIN_FAILURE_NOT_AVAIL	Konto není k dispozici.
-LOGIN_FAILURE_NOT_EXIST_ID	Konto neexistuje nebo je chybné heslo.
 LOGIN_FAILURE_REPAIR_ID	Právě se znovu zřizují předměty pro toto konto.
 LOGIN_FAILURE_SAMELOGIN	Někdo se připojil na tvůj účet.
 LOGIN_FAILURE_SHUTDOWN	Server zatím není přístupný.
 LOGIN_FAILURE_TOO_MANY_USER	Nemohl jsi navázat spojení, protože právě hraje příliš mnoho hráčů.
 LOGIN_FAILURE_UNKNOWN	Z neznámých důvodů jsi se nemohl přihlásit.
 LOGIN_FAILURE_WEB_BLOCK	Byl jsi na webové stránce zablokován. Prosím zkontroluj si e-maily.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Zadal jsi špatné číslo.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Chybné jméno nebo heslo.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Zadal jsi třikrát špatné číslo. Tvoje připojení bude přerušeno.
-LOGIN_FAILURE_WRONG_PASSWORD	Chybné jméno nebo heslo.
 LOGIN_INPUT_ID	Zadej ID.
 LOGIN_INPUT_PASSWORD	Zadej heslo.
 LOGIN_PROCESSING	Přihlášení probíhá...

bin/pack/locale_de/locale/de/locale_game.txt

@@ -236,21 +236,16 @@ LEFT_TIME	Verbl. Zeit
 LOGIN_CONNECT_FAILURE	Fehler beim Verbinden mit dem Server.
 LOGIN_CONNECT_SUCCESS	Verbindung zum Server hergestellt.
 LOGIN_CONNETING	Du wirst mit dem Server verbunden...
-LOGIN_FAILURE_ALREAY	Dein Konto ist bereits verbunden.
+LOGIN_FAILURE_ALREADY	Dein Konto ist bereits verbunden.
-LOGIN_FAILURE_BE_SAME_KEY	Anmeldeproblem
 LOGIN_FAILURE_BLOCK_ID	Das Konto ist gesperrt.
 LOGIN_FAILURE_BLOCK_LOGIN	Bitte wähle einen anderen Server!
-LOGIN_FAILURE_NOBILL	Das Konto verfügt über keine Spielzeit.
 LOGIN_FAILURE_NOT_AVAIL	Das Konto ist nicht verfügbar.
-LOGIN_FAILURE_NOT_EXIST_ID	Accountname oder Passwort falsch.
 LOGIN_FAILURE_REPAIR_ID	Für das Konto werden gerade Gegenstände wiederhergestellt.
 LOGIN_FAILURE_SHUTDOWN	Der Server ist noch nicht offen.
 LOGIN_FAILURE_TOO_MANY_USER	Du konntest keine Verbindung herstellen, da es zu viele Spieler gibt.
 LOGIN_FAILURE_UNKNOWN	Du konntest dich aus unbekannten Gründen nicht anmelden.
 LOGIN_FAILURE_WEB_BLOCK	Du wurdest auf der Webseite geblockt. Bitte überprüfe deine E-Mails.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Du hast eine falsche Nr. eingegeben.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Accountname oder Passwort falsch.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Du hast dreimal eine falsche Nr. eingegeben. Deine Verbindung wird beendet.
-LOGIN_FAILURE_WRONG_PASSWORD	Accountname oder Passwort falsch.
 LOGIN_INPUT_ID	Gib die ID ein.
 LOGIN_INPUT_PASSWORD	Gib das Kennwort ein.
 LOGIN_PROCESSING	Anmeldevorgang läuft...

bin/pack/locale_dk/locale/dk/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Resterende tid
 LOGIN_CONNECT_FAILURE	En fejl opstod ved forbindelsen til serveren.	
 LOGIN_CONNECT_SUCCESS	Du er forbundet til serveren.
 LOGIN_CONNETING	Forbinder til Serveren...
-LOGIN_FAILURE_ALREAY	Din account er allerede forbundet.	
+LOGIN_FAILURE_ALREADY	Din account er allerede forbundet.	
-LOGIN_FAILURE_BE_SAME_KEY	Registrerings problem.	
 LOGIN_FAILURE_BLOCK_ID	Din account er spærret.	
 LOGIN_FAILURE_BLOCK_LOGIN	Vælg venligst en anden servere.
-LOGIN_FAILURE_NOBILL	Denne konto har ingen spilletid tilovers.
 LOGIN_FAILURE_NOT_AVAIL	Denne konto er ikke tilgængeligt.
-LOGIN_FAILURE_NOT_EXIST_ID	Forkert brugernavn eller password.
 LOGIN_FAILURE_REPAIR_ID	For denne konto bliver der gendannet nogle genstande.
 LOGIN_FAILURE_SAMELOGIN	En person har forbundet sig til din konto.
 LOGIN_FAILURE_SHUTDOWN	Denne server er ikke åben.
 LOGIN_FAILURE_TOO_MANY_USER	Du kan ikke få forbindelse med serveren, da der er for mange spillere online.
 LOGIN_FAILURE_UNKNOWN	Du kunne ikke logge på. Årsagen er ukendt.
 LOGIN_FAILURE_WEB_BLOCK	Du blev blokeret på websiden. Tjek venligst din e-mail.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Du har indtastet et forkert nr.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Forkert brugernavn eller password.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Du har 3 gange i træk indtastet et forkert nr. - din forbindelse blev afbrudt.
-LOGIN_FAILURE_WRONG_PASSWORD	Forkert brugernavn eller password.
 LOGIN_INPUT_ID	Angiv ID.
 LOGIN_INPUT_PASSWORD	Angiv kodeordet.
 LOGIN_PROCESSING	Registreringen med serveren er i gang...

bin/pack/locale_en/locale/en/locale_game.txt

@@ -236,21 +236,16 @@ LEFT_TIME	Time Remaining
 LOGIN_CONNECT_FAILURE	Error while connecting to the server.	
 LOGIN_CONNECT_SUCCESS	You have been connected to the server.
 LOGIN_CONNETING	You will be connected to the server...
-LOGIN_FAILURE_ALREAY	Your account is already connected.	
+LOGIN_FAILURE_ALREADY	Your account is already connected.	
-LOGIN_FAILURE_BE_SAME_KEY	Registration problem.	
 LOGIN_FAILURE_BLOCK_ID	Your account is banned.	
 LOGIN_FAILURE_BLOCK_LOGIN	Please choose one of the other servers!
-LOGIN_FAILURE_NOBILL	Your account had no play time.	
 LOGIN_FAILURE_NOT_AVAIL	Your account cannot be used.	
-LOGIN_FAILURE_NOT_EXIST_ID	Account name or password incorrect.
 LOGIN_FAILURE_REPAIR_ID	Items have been restored for this account.	
 LOGIN_FAILURE_SHUTDOWN	The server is not open yet.	
 LOGIN_FAILURE_TOO_MANY_USER	You could not connect because too many players are online.	
 LOGIN_FAILURE_UNKNOWN	You could not register for unknown reasons.	
 LOGIN_FAILURE_WEB_BLOCK	You have been blocked at the website. Please check your EMails.	
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	You entered a wrong number.	
+LOGIN_FAILURE_WRONG_CREDENTIALS	Account name or password incorrect.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	You entered a wrong number three times. /n Your connection will be disabled.	
-LOGIN_FAILURE_WRONG_PASSWORD	Account name or password incorrect.
 LOGIN_INPUT_ID	Enter the ID.	
 LOGIN_INPUT_PASSWORD	Enter the password.	
 LOGIN_PROCESSING	Logging in...

bin/pack/locale_es/locale/es/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Tiempo restante
 LOGIN_CONNECT_FAILURE	Error al conectar al servidor.
 LOGIN_CONNECT_SUCCESS	Has sido conectado al servidor.
 LOGIN_CONNETING	Estás siendo conectado al servidor...
-LOGIN_FAILURE_ALREAY	Tu cuenta ya está conectada.
+LOGIN_FAILURE_ALREADY	Tu cuenta ya está conectada.
-LOGIN_FAILURE_BE_SAME_KEY	Problema de registro.
 LOGIN_FAILURE_BLOCK_ID	Tu cuenta está baneada.
 LOGIN_FAILURE_BLOCK_LOGIN	¡Por favor, elige uno de los otros servidores!
-LOGIN_FAILURE_NOBILL	Tu cuenta no tiene horas de juego.
 LOGIN_FAILURE_NOT_AVAIL	Tu cuenta no puede ser usada.
-LOGIN_FAILURE_NOT_EXIST_ID	Nombre de cuenta o contraseńa incorrectos.
 LOGIN_FAILURE_REPAIR_ID	Han sido restablecidos objetos para esta cuenta.
 LOGIN_FAILURE_SAMELOGIN	Alguien se ha conectado con tu cuenta.
 LOGIN_FAILURE_SHUTDOWN	Este servidor aún no está abierto.
 LOGIN_FAILURE_TOO_MANY_USER	No puedes conectar porque hay demasiados jugadores conectados.
 LOGIN_FAILURE_UNKNOWN	No te puedes registrar por razones desconocidas.
 LOGIN_FAILURE_WEB_BLOCK	Has sido bloqueado del sitio web. Por favor comprueba tus EMails.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Has introducido un número incorrecto.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Nombre de cuenta o contraseńa incorrectos
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Has introducido un número incorrecto tres veces. /n Tu conexión será deshabilitada.
-LOGIN_FAILURE_WRONG_PASSWORD	Nombre de cuenta o contraseńa incorrectos
 LOGIN_INPUT_ID	Introduce el ID.
 LOGIN_INPUT_PASSWORD	Introduce la contraseña.
 LOGIN_PROCESSING	Registro en curso...

bin/pack/locale_fr/locale/fr/locale_game.txt

@@ -236,21 +236,16 @@ LEFT_TIME	Temps restant
 LOGIN_CONNECT_FAILURE	Erreur lors de la connection au serveur
 LOGIN_CONNECT_SUCCESS	Connexion au serveur en cours.
 LOGIN_CONNETING	Connexion au serveur en cours.
-LOGIN_FAILURE_ALREAY	Votre compte est déjà connecté.
+LOGIN_FAILURE_ALREADY	Votre compte est déjà connecté.
-LOGIN_FAILURE_BE_SAME_KEY	Problème
 LOGIN_FAILURE_BLOCK_ID	Votre compte est banni
 LOGIN_FAILURE_BLOCK_LOGIN	Veuillez choisir un autre serveur !
-LOGIN_FAILURE_NOBILL	Votre compte n'a pas de temps de jeu.
 LOGIN_FAILURE_NOT_AVAIL	Votre compte ne peut pas être utilisé.
-LOGIN_FAILURE_NOT_EXIST_ID	Compte ou mot de passe incorrect
 LOGIN_FAILURE_REPAIR_ID	Sur ce compte, les objets ont été restaurés
 LOGIN_FAILURE_SHUTDOWN	Le serveur n'est pour le moment pas ouvert
 LOGIN_FAILURE_TOO_MANY_USER	Vous ne pouvez pas vous connecter car trop de joueurs sont actuellement en ligne.
 LOGIN_FAILURE_UNKNOWN	Vous ne pouvez pas vous enregistrer vous des raisons inconnues.
 LOGIN_FAILURE_WEB_BLOCK	Vous avez été bloqué sur ce site. Veuillez consulter vos mails.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Vous avez entré un mauvais numéro.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Compte ou mot de passe incorrect
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Vous avez entré un mauvais numéro trois fois. La connexion va être perdue.
-LOGIN_FAILURE_WRONG_PASSWORD	Compte ou mot de passe incorrect
 LOGIN_INPUT_ID	Entrez le nom du compte
 LOGIN_INPUT_PASSWORD	Entrez le mot de passe
 LOGIN_PROCESSING	Connexion au compte en cours

bin/pack/locale_gr/locale/gr/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME
 LOGIN_CONNECT_FAILURE	Σφάλμα κατά τη σύνδεση.
 LOGIN_CONNECT_SUCCESS	Συνδέθηκες με τον σέρβερ.
 LOGIN_CONNETING	Σύνδεση με σέρβερ...
-LOGIN_FAILURE_ALREAY	Ï ëïãáñéáóìüò åßíáé Þäç óõíäåäåìÝíïò.
+LOGIN_FAILURE_ALREADY	Ï ëïãáñéáóìüò åßíáé Þäç óõíäåäåìÝíïò.
-LOGIN_FAILURE_BE_SAME_KEY	Ðñüâëçìá åããñáöÞò.
 LOGIN_FAILURE_BLOCK_ID	Ο λογαριασμός σου είναι τιμωρημένος.
 LOGIN_FAILURE_BLOCK_LOGIN	Παρακαλώ διαλέξτε έναν άλλο σέρβερ.
-LOGIN_FAILURE_NOBILL	Ï ëïãáñéáóìüò óïõ äåí åß÷å ÷ñüíï ðáé÷íéäéïý.
 LOGIN_FAILURE_NOT_AVAIL	Ο λογαριασμός σου δε μπορεί να χρησιμοποιηθεί.
-LOGIN_FAILURE_NOT_EXIST_ID	ËÜèïò ëïãáñéáóìüò Þ êùäéêüò.
 LOGIN_FAILURE_REPAIR_ID	Αποκαταστάθηκαν αντικείμενα για αυτόν το λογαριασμό.
 LOGIN_FAILURE_SAMELOGIN	Κάποιος συνδέθηκε με τον λογαριασμό σου.
 LOGIN_FAILURE_SHUTDOWN	Ο server δεν έχει ανοίξει ακόμη.
 LOGIN_FAILURE_TOO_MANY_USER	Δε μπορείς να συνδεθείς γιατί είναι πάρα πολλοί παίκτες συνδεδεμένοι.
 LOGIN_FAILURE_UNKNOWN	Δε μπόρεσες να εγγραφείς για άγνωστη αιτία.
 LOGIN_FAILURE_WEB_BLOCK	Έχετε αποκελιστεί από την Ιστοσελίδα. Παρακαλώ δείτε τα E-mail σας
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	ÅéóÞãáãåò ëÜèïò áñéèìü.
+LOGIN_FAILURE_WRONG_CREDENTIALS	ËÜèïò ëïãáñéáóìüò Þ êùäéêüò.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	ÅéóÞãáãåò ëÜèïò áñéèìü ôñåéò öïñÝò. /n Ç óýíäåóÞ óïõ èá ôåèåß åêôüò ëåéôïõñãßáò.
-LOGIN_FAILURE_WRONG_PASSWORD	ËÜèïò ëïãáñéáóìüò Þ êùäéêüò.
 LOGIN_INPUT_ID	Εισήγαγε την ID.
 LOGIN_INPUT_PASSWORD	Εισήγαγε το συνθηματικό.
 LOGIN_PROCESSING	Γίνεται εγγραφή...

bin/pack/locale_hu/locale/hu/locale_game.txt

@@ -236,21 +236,16 @@ LEFT_TIME	Marad
 LOGIN_CONNECT_FAILURE	Hiba a szerver kapcsolatban.
 LOGIN_CONNECT_SUCCESS	A szerver kapcsolat létrejött.
 LOGIN_CONNETING	Kapcsolódás a szerverhez...
-LOGIN_FAILURE_ALREAY	A számlád már csatlakoztatva van.
+LOGIN_FAILURE_ALREADY	A számlád már csatlakoztatva van.
-LOGIN_FAILURE_BE_SAME_KEY	Bejelentkezési probléma
 LOGIN_FAILURE_BLOCK_ID	Az előfizetői számla le van tiltva.
 LOGIN_FAILURE_BLOCK_LOGIN	Kérlek válassz egyet a többi szerver közül!
-LOGIN_FAILURE_NOBILL	Elõfizetõi számládnak nincs már játékideje
 LOGIN_FAILURE_NOT_AVAIL	Az előfizetői számla nem elérhető.
-LOGIN_FAILURE_NOT_EXIST_ID	Hibás Felhasználónév vagy Jelszó.
 LOGIN_FAILURE_REPAIR_ID	Az előfizetői számlára éppen tárgyak helyreállítása van folyamatban.
 LOGIN_FAILURE_SHUTDOWN	A szerver még nem nyílt meg.
 LOGIN_FAILURE_TOO_MANY_USER	Nem csatlakozhatsz, mert túl sokan játszanak.
 LOGIN_FAILURE_UNKNOWN	Ismeretlen okból nem tudsz bejelentkezni.
 LOGIN_FAILURE_WEB_BLOCK	Le lettél tiltva a web oldalon. Ellenőrizd leveleidet.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Rossz számot adtál meg.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Hibás Felhasználónév vagy Jelszó.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Háromszor adtál meg helytelen számot. A kapcsolat lezáródik.
-LOGIN_FAILURE_WRONG_PASSWORD	Hibás Felhasználónév vagy Jelszó.
 LOGIN_INPUT_ID	Add meg az ID-t.
 LOGIN_INPUT_PASSWORD	Add meg a jelszót.
 LOGIN_PROCESSING	Bejelentkezés folyamatban...

bin/pack/locale_it/locale/it/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Tempo rimanente
 LOGIN_CONNECT_FAILURE	Errore di collegamento con il server.
 LOGIN_CONNECT_SUCCESS	Sei stato collegato al server.
 LOGIN_CONNETING	Stai per essere collegato al server.
-LOGIN_FAILURE_ALREAY	Il tuo account è già collegato.
+LOGIN_FAILURE_ALREADY	Il tuo account è già collegato.
-LOGIN_FAILURE_BE_SAME_KEY	Problema d'iscrizione
 LOGIN_FAILURE_BLOCK_ID	Il tuo account è bloccato.
 LOGIN_FAILURE_BLOCK_LOGIN	Sei pregato di scegliere un altro server!
-LOGIN_FAILURE_NOBILL	Il tuo account non ha tempo di gioco.
 LOGIN_FAILURE_NOT_AVAIL	L'account non è disponibile.
-LOGIN_FAILURE_NOT_EXIST_ID	Nome account o password errati.
 LOGIN_FAILURE_REPAIR_ID	Vengono rigenerati oggetti per l'account.
 LOGIN_FAILURE_SAMELOGIN	Qualcuno si è collegato al tuo account.
 LOGIN_FAILURE_SHUTDOWN	Il server non è ancora aperto.
 LOGIN_FAILURE_TOO_MANY_USER	Non sei riuscito a connetterti perchè ci sono troppi giocatori
 LOGIN_FAILURE_UNKNOWN	Non sei riuscito a connetterti per ragioni sconosciute.
 LOGIN_FAILURE_WEB_BLOCK	È stato bloccato sulla pagina web. Per favore controlli la sua e-mail
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Hai inserito un numero sbagliato.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Nome account o password errati.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Hai inserito per tre volte un numero sbagliato. La connessione è stata conclusa.
-LOGIN_FAILURE_WRONG_PASSWORD	Nome account o password errati.
 LOGIN_INPUT_ID	Inserisci l'ID.
 LOGIN_INPUT_PASSWORD	Inserisci la password.
 LOGIN_PROCESSING	È in corso il login.

bin/pack/locale_nl/locale/nl/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Overgebleven Tijd
 LOGIN_CONNECT_FAILURE	Fout bij de server verbinding.	
 LOGIN_CONNECT_SUCCESS	Je  bent verbonden met de server
 LOGIN_CONNETING	Je wordt verbonden met de server...
-LOGIN_FAILURE_ALREAY	Je account is al verbonden.	
+LOGIN_FAILURE_ALREADY	Je account is al verbonden.	
-LOGIN_FAILURE_BE_SAME_KEY	Registratie probleem.	
 LOGIN_FAILURE_BLOCK_ID	Je account is geband.	
 LOGIN_FAILURE_BLOCK_LOGIN	kies een van de andere servers!
-LOGIN_FAILURE_NOBILL	Je account heeft geen speeltijd.	
 LOGIN_FAILURE_NOT_AVAIL	Je account kan niet worden gebruikt.	
-LOGIN_FAILURE_NOT_EXIST_ID	Account naam of wachtwoord is incorrect
 LOGIN_FAILURE_REPAIR_ID	Voorwerpen zijn hersteld voor dit account.	
 LOGIN_FAILURE_SAMELOGIN	Iemand heeft zich met jouw account verbonden.
 LOGIN_FAILURE_SHUTDOWN	De server is nog niet open.	
 LOGIN_FAILURE_TOO_MANY_USER	Je kan niet verbonden worden want er zijn teveel spelers online.	
 LOGIN_FAILURE_UNKNOWN	Je kon niet registreren voor onbekende redenen.	
 LOGIN_FAILURE_WEB_BLOCK	Je bent geblokkerd bij de website. Controleer je e-mails alstublieft.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Je hebt een verkeerd nummer ingevoerd.	
+LOGIN_FAILURE_WRONG_CREDENTIALS	Account naam of wachtwoord is incorrect.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Je hebt drie keer een verkeerd nummer ingevoerd. /n Je verbinding wordt verbroken.	
-LOGIN_FAILURE_WRONG_PASSWORD	Account naam of wachtwoord is incorrect.
 LOGIN_INPUT_ID	Voer ID in.	
 LOGIN_INPUT_PASSWORD	Voer wachtwoord in.	
 LOGIN_PROCESSING	Login proces is gestart.

bin/pack/locale_pl/locale/pl/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Pozosta
 LOGIN_CONNECT_FAILURE	Błąd podczas łączenia się z serwerem.
 LOGIN_CONNECT_SUCCESS	Zostałeś połączony z serwerem.
 LOGIN_CONNETING	Zostaniesz połączony z serwerem...
-LOGIN_FAILURE_ALREAY	Twoje konto jest już połączone.
+LOGIN_FAILURE_ALREADY	Twoje konto jest ju¿ po³¹czone.
-LOGIN_FAILURE_BE_SAME_KEY	Problem z rejestracją.
 LOGIN_FAILURE_BLOCK_ID	Twoje konto jest zablokowane.
 LOGIN_FAILURE_BLOCK_LOGIN	Serwer Zamknięty - proszę wybrać inny!
-LOGIN_FAILURE_NOBILL	Twoje konto nie ma czasu gry.
 LOGIN_FAILURE_NOT_AVAIL	Twoje konto nie może być użyte.
-LOGIN_FAILURE_NOT_EXIST_ID	Nieprawidłowa nazwa konta lub hasło.
 LOGIN_FAILURE_REPAIR_ID	Przedmioty zostały przywrócone dla tego konta.
 LOGIN_FAILURE_SAMELOGIN	Ktoś połączył się z Twoim kontem.
 LOGIN_FAILURE_SHUTDOWN	Serwer nie jest jeszcze otwarty.
 LOGIN_FAILURE_TOO_MANY_USER	Nie możesz się połączyć, ponieważ za dużo graczy jest online.
 LOGIN_FAILURE_UNKNOWN	Nie możesz się zarejestrować z nieznanych powodów.
 LOGIN_FAILURE_WEB_BLOCK	Twoje konto zostało zablokowane na stronie www. Proszę sprawdzić swoją pocztę e-mail.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Wpisałeś nieprawidłowy numer.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Nieprawid³owa nazwa konta lub has³o.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Wybrałeś zły numer trzy razy. /n Twoje połączenie zostanie zerwane.
-LOGIN_FAILURE_WRONG_PASSWORD	Nieprawidłowa nazwa konta lub hasło.
 LOGIN_INPUT_ID	Podaj swoje ID.
 LOGIN_INPUT_PASSWORD	Wpisz swoje hasło.
 LOGIN_PROCESSING	Logowanie...

bin/pack/locale_pt/locale/pt/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Tempo Restante
 LOGIN_CONNECT_FAILURE	Ocorreu um erro enquanto te ligavas ao Servidor.
 LOGIN_CONNECT_SUCCESS	Estás ligado ao Servidor.
 LOGIN_CONNETING	Vais ser ligado ao Servidor...
-LOGIN_FAILURE_ALREAY	A tua conta já está ligada.
+LOGIN_FAILURE_ALREADY	A tua conta já está ligada.
-LOGIN_FAILURE_BE_SAME_KEY	Problema de registo.
 LOGIN_FAILURE_BLOCK_ID	A tua conta está bloqueada.
 LOGIN_FAILURE_BLOCK_LOGIN	Por favor escolhe um dos outros Servidores!
-LOGIN_FAILURE_NOBILL	A tua conta não tinha tempo de jogo.
 LOGIN_FAILURE_NOT_AVAIL	A tua conta não pode ser usada.
-LOGIN_FAILURE_NOT_EXIST_ID	O nome da conta ou a palavra-passe está/ão incorrecta(s).
 LOGIN_FAILURE_REPAIR_ID	Foram restaurados Itens a esta conta.
 LOGIN_FAILURE_SAMELOGIN	Alguém se ligou à tua conta.
 LOGIN_FAILURE_SHUTDOWN	O Servidor ainda não está aberto.
 LOGIN_FAILURE_TOO_MANY_USER	Não te podes ligar ao Servidor porque estão muitos jogadores ligados.
 LOGIN_FAILURE_UNKNOWN	Não te foi possível registar por razões desconhecidas.
 LOGIN_FAILURE_WEB_BLOCK	Foste bloqueado no site, por favor verifica os teus E-mails.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Inseriste um número errado.
+LOGIN_FAILURE_WRONG_CREDENTIALS	O nome da conta ou a palavra-passe está/ão incorrecta(s).
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Inseriste um número errado três vezes. /n A tua ligação vai ser anulada.
-LOGIN_FAILURE_WRONG_PASSWORD	O nome da conta ou a palavra-passe está/ão incorrecta(s).
 LOGIN_INPUT_ID	Insere o ID.
 LOGIN_INPUT_PASSWORD	Insere a palavra-passe.
 LOGIN_PROCESSING	Processo de Login em progresso...

bin/pack/locale_ro/locale/ro/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Timp r
 LOGIN_CONNECT_FAILURE	Eroare la conectarea la server.
 LOGIN_CONNECT_SUCCESS	Ai fost conectat la server.
 LOGIN_CONNETING	Vei fi conectat la server...
-LOGIN_FAILURE_ALREAY	Contul tău este deja conectat.
+LOGIN_FAILURE_ALREADY	Contul tău este deja conectat.
-LOGIN_FAILURE_BE_SAME_KEY	Problemă la login
 LOGIN_FAILURE_BLOCK_ID	Contul este blocat.
 LOGIN_FAILURE_BLOCK_LOGIN	Alege alt server!
-LOGIN_FAILURE_NOBILL	Contul nu deţine timp de joc.
 LOGIN_FAILURE_NOT_AVAIL	Contul este inaccesibil.
-LOGIN_FAILURE_NOT_EXIST_ID	Nume contului sau parola sunt greşite.
 LOGIN_FAILURE_REPAIR_ID	Pentru acest cont sunt refăcute obiectele.
 LOGIN_FAILURE_SAMELOGIN	Cineva s-a conectat la contul tau.
 LOGIN_FAILURE_SHUTDOWN	Serverul nu este încă deschis.
 LOGIN_FAILURE_TOO_MANY_USER	Conectarea nu s-a realizat pentru ca există prea mulţi jucători.
 LOGIN_FAILURE_UNKNOWN	Login a eşuat din motive necunoscute.
 LOGIN_FAILURE_WEB_BLOCK	Ai fost blocat pe website. Verifică-ţi mailurile.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Ai introdus un număr greşit.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Nume sau parola greşită.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Ai introdus de 3 ori un număr greşit. Conectarea va fi închisă.
-LOGIN_FAILURE_WRONG_PASSWORD	Nume sau parola greşită.
 LOGIN_INPUT_ID	Introdu ID-ul.
 LOGIN_INPUT_PASSWORD	Introdu parola.
 LOGIN_PROCESSING	Conectarea rulează ...

bin/pack/locale_ru/locale/ru/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME
 LOGIN_CONNECT_FAILURE	Ошибка при соединении с сервером.
 LOGIN_CONNECT_SUCCESS	Вы соединены с сервером.
 LOGIN_CONNETING	Происходит соединение с сервером...
-LOGIN_FAILURE_ALREAY	Ваша учётная запись  уже соединена.
+LOGIN_FAILURE_ALREADY	Ваша учётная запись  уже соединена.
-LOGIN_FAILURE_BE_SAME_KEY	Проблема с регистрацией
 LOGIN_FAILURE_BLOCK_ID	Учетная запись заблокирована.
 LOGIN_FAILURE_BLOCK_LOGIN	Выберите другой сервер!
-LOGIN_FAILURE_NOBILL	В вашей учётной записи нет игрового времени.
 LOGIN_FAILURE_NOT_AVAIL	Учётная запись недоступна.
-LOGIN_FAILURE_NOT_EXIST_ID	Неверное имя или пароль.
 LOGIN_FAILURE_REPAIR_ID	Предметы для данного учётной записи  сейчас восстанавливаются.
 LOGIN_FAILURE_SAMELOGIN	Кто-то зашел на ваш аккаунт.
 LOGIN_FAILURE_SHUTDOWN	Сервер пока ещё закрыт.
 LOGIN_FAILURE_TOO_MANY_USER	В соединении отказано. Сервер переполнен.
 LOGIN_FAILURE_UNKNOWN	Регистрация  не состоялась по неизвестным причинам.
 LOGIN_FAILURE_WEB_BLOCK	Вас заблокировали на сайте. Пожалуйста проверьте  свой Email.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Введён неверный номер.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Неправильное имя или пароль.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	Неверный номер введён трижды. Связь будет прервана.
-LOGIN_FAILURE_WRONG_PASSWORD	Неправильное имя или пароль.
 LOGIN_INPUT_ID	Введите номер идентификации.
 LOGIN_INPUT_PASSWORD	Введите пароль.
 LOGIN_PROCESSING	Происходит регистрация...

bin/pack/locale_tr/locale/tr/locale_game.txt

@@ -265,22 +265,17 @@ LEFT_TIME	Kalan S
 LOGIN_CONNECT_FAILURE	Sunucuya bağlanırken hata
 LOGIN_CONNECT_SUCCESS	Sunucuya bağlandın.
 LOGIN_CONNETING	Sunucuya bağlanıyorsun...
-LOGIN_FAILURE_ALREAY	Hesap zaten bağlı.
+LOGIN_FAILURE_ALREADY	Hesap zaten baðlý.
-LOGIN_FAILURE_BE_SAME_KEY	Kayıt problemi
 LOGIN_FAILURE_BLOCK_ID	Hesabınız engellendi!
 LOGIN_FAILURE_BLOCK_LOGIN	Lütfen başka server seç!
-LOGIN_FAILURE_NOBILL	Hesabınızın oyun süresi yok.
 LOGIN_FAILURE_NOT_AVAIL	Hesabınız kullanılamaz.
-LOGIN_FAILURE_NOT_EXIST_ID	Hesap ismi veya şifre yanlış.
 LOGIN_FAILURE_REPAIR_ID	Bu hesap için, nesneler yüklendi.
 LOGIN_FAILURE_SAMELOGIN	Biri senin hesabınla giriş yaptı.
 LOGIN_FAILURE_SHUTDOWN	Sunucu henüz açılmadı.
 LOGIN_FAILURE_TOO_MANY_USER	Çok fazla kullanıcı bağlı olduğu için bağlanamazsınız.
 LOGIN_FAILURE_UNKNOWN	Bilinmeyen bir nedenle kaydolamadınız.
 LOGIN_FAILURE_WEB_BLOCK	Web sitesine erişiminiz engellendi. Lütfen E-Postanızı kontrol ediniz.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER	Yanlış numara girdiniz.
+LOGIN_FAILURE_WRONG_CREDENTIALS	Hesap ismi veya þifre yanlýþ.
-LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE	3 kere yanlış numara girdiniz. Bağlantınız kesildi.
-LOGIN_FAILURE_WRONG_PASSWORD	Hesap ismi veya şifre yanlış.
 LOGIN_INPUT_ID	ID nizi yazın.
 LOGIN_INPUT_PASSWORD	Şifreyi gir.
 LOGIN_PROCESSING	Giriş işlemi yapılıyor...

bin/pack/root/game.py

@@ -683,13 +683,6 @@ class GameWindow(ui.ScriptWindow):
 	def RefreshGuildGradePage(self):
 		self.interface.RefreshGuildGradePage()
 
-	def RefreshMobile(self):
-		if self.interface:
-			self.interface.RefreshMobile()
-
-	def OnMobileAuthority(self):
-		self.interface.OnMobileAuthority()
-
 	def OnBlockMode(self, mode):
 		self.interface.OnBlockMode(mode)
 

bin/pack/root/interfacemodule.py

@@ -610,12 +610,6 @@ class Interface(object):
 		self.wndMessenger.ClearGuildMember()
 		self.wndGuild.DeleteGuild()
 
-	def RefreshMobile(self):
-		self.dlgSystem.RefreshMobile()
-
-	def OnMobileAuthority(self):
-		self.dlgSystem.OnMobileAuthority()
-
 	def OnBlockMode(self, mode):
 		self.dlgSystem.OnBlockMode(mode)
 

bin/pack/root/intrologin.py

@@ -203,27 +203,19 @@ class LoginWindow(ui.ScriptWindow):
 		self.loginFailureMsgDict={
 			#"DEFAULT" : localeInfo.LOGIN_FAILURE_UNKNOWN,
 
-			"ALREADY"	: localeInfo.LOGIN_FAILURE_ALREAY,
+			"ALREADY"	: localeInfo.LOGIN_FAILURE_ALREADY,
-			"NOID"		: localeInfo.LOGIN_FAILURE_NOT_EXIST_ID,
+			"WRONGCRD"	: localeInfo.LOGIN_FAILURE_WRONG_CREDENTIALS,
-			"WRONGPWD"	: localeInfo.LOGIN_FAILURE_WRONG_PASSWORD,
 			"FULL"		: localeInfo.LOGIN_FAILURE_TOO_MANY_USER,
 			"SHUTDOWN"	: localeInfo.LOGIN_FAILURE_SHUTDOWN,
 			"REPAIR"	: localeInfo.LOGIN_FAILURE_REPAIR_ID,
 			"BLOCK"		: localeInfo.LOGIN_FAILURE_BLOCK_ID,
-			"WRONGMAT"	: localeInfo.LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER,
-			"QUIT"		: localeInfo.LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE,
-			"BESAMEKEY"	: localeInfo.LOGIN_FAILURE_BE_SAME_KEY,
 			"NOTAVAIL"	: localeInfo.LOGIN_FAILURE_NOT_AVAIL,
-			"NOBILL"	: localeInfo.LOGIN_FAILURE_NOBILL,
 			"BLKLOGIN"	: localeInfo.LOGIN_FAILURE_BLOCK_LOGIN,
 			"WEBBLK"	: localeInfo.LOGIN_FAILURE_WEB_BLOCK,
-			"BADSCLID"	: localeInfo.LOGIN_FAILURE_WRONG_SOCIALID,
-			"AGELIMIT"	: localeInfo.LOGIN_FAILURE_SHUTDOWN_TIME,
 		}
 
 		self.loginFailureFuncDict = {
-			"WRONGPWD"	: self.__DisconnectAndInputPassword,
+			"WRONGCRD"	: self.__DisconnectAndInputPassword,
-			"WRONGMAT"	: self.__DisconnectAndInputMatrix,
 			"QUIT"		: app.Exit,
 		}
 
@@ -238,9 +230,7 @@ class LoginWindow(ui.ScriptWindow):
 		
 		if app.loggined:
 			self.loginFailureFuncDict = {
-			"WRONGPWD"	: app.Exit,
+                "WRONGCRD"	: app.Exit,
-			"WRONGMAT"	: app.Exit,
-			"QUIT"		: app.Exit,
 			}
 
 		if musicInfo.loginMusic != "":
@@ -491,20 +481,6 @@ class LoginWindow(ui.ScriptWindow):
 		self.SetPasswordEditLineFocus()
 		net.Disconnect()
 
-	def __DisconnectAndInputMatrix(self):
-		if self.connectingDialog:
-			self.connectingDialog.Close()
-		self.connectingDialog = None
-
-		self.stream.popupWindow.Close()
-		self.matrixInputChanceCount -= 1
-
-		if self.matrixInputChanceCount <= 0:
-			self.__OnCloseInputDialog()
-
-		elif self.inputDialog:
-			self.inputDialog.Show()
-
 	def __LoadScript(self, fileName):
 		import dbg
 		try:
@@ -985,7 +961,6 @@ class LoginWindow(ui.ScriptWindow):
 
 	def OnExit(self):
 		self.stream.popupWindow.Close()
-		self.stream.popupWindow.Open(localeInfo.LOGIN_FAILURE_WRONG_MATRIX_CARD_NUMBER_TRIPLE, app.Exit, localeInfo.UI_OK)
 
 	def OnUpdate(self):
 		ServerStateChecker.Update()

bin/pack/root/introselect.py

@@ -350,7 +350,6 @@ class SelectCharacterWindow(ui.Window):
 	def SameLoginDisconnect(self):
 		self.stream.popupWindow.Close()
 		self.stream.popupWindow.Open(localeInfo.LOGIN_FAILURE_SAMELOGIN, self.ExitSelect, localeInfo.UI_OK)
-        #self.stream.popupWindow.Open(localeInfo.LOGIN_FAILURE_ALREAY, app.Exit, localeInfo.UI_OK)
         
 	def MakeCharacter(self, index, id, name, race, form, hair):
 		if 0 == id:

bin/pack/root/localeinfo.py

@@ -46,9 +46,7 @@ __IS_ARABIC		= "locale/ae" == app.GetLocalePath()
 __IS_CIBN10		= "locale/cibn10" == app.GetLocalePath()
 __IS_WE_KOREA	= "locale/we_korea" == app.GetLocalePath()
 __IS_TAIWAN		= "locale/taiwan" == app.GetLocalePath()
-__IS_JAPAN		= "locale/japan" == app.GetLocalePath()	
+__IS_JAPAN		= "locale/japan" == app.GetLocalePath()
-LOGIN_FAILURE_WRONG_SOCIALID = "ASDF"
-LOGIN_FAILURE_SHUTDOWN_TIME = "ASDF"
 
 if __IS_CANADA:
 	__IS_EUROPE = True

bin/pack/root/uigameoption.py

@@ -14,11 +14,6 @@ import interfaceModule #
 blockMode = 0
 viewChatMode = 0
 
-MOBILE = False
-
-if localeInfo.IsYMIR():
-	MOBILE = True
-
 
 class OptionDialog(ui.ScriptWindow):
 
@@ -87,22 +82,13 @@ class OptionDialog(ui.ScriptWindow):
 			self.showsalesTextButtonList.append(GetObject("salestext_on_button"))
 			self.showsalesTextButtonList.append(GetObject("salestext_off_button"))
 
-			global MOBILE
-			if MOBILE:
-				self.inputMobileButton = GetObject("input_mobile_button")
-				self.deleteMobileButton = GetObject("delete_mobile_button")
-
 
 		except:
 			import exception
 			exception.Abort("OptionDialog.__Load_BindObject")
 
 	def __Load(self):
-		global MOBILE
+		self.__Load_LoadScript("uiscript/gameoptiondialog.py")
-		if MOBILE:
-			self.__Load_LoadScript("uiscript/gameoptiondialog_formobile.py")
-		else:
-			self.__Load_LoadScript("uiscript/gameoptiondialog.py")
 
 		self.__Load_BindObject()
 
@@ -151,11 +137,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.__ClickRadioButton(self.viewTargetBoardButtonList, constInfo.GET_VIEW_OTHER_EMPIRE_PLAYER_TARGET_BOARD())
 		self.__SetPeacePKMode()
 
-		#global MOBILE
-		if MOBILE:
-			self.inputMobileButton.SetEvent(ui.__mem_func__(self.__OnChangeMobilePhoneNumber))
-			self.deleteMobileButton.SetEvent(ui.__mem_func__(self.__OnDeleteMobilePhoneNumber))
-
 	def __ClickRadioButton(self, buttonList, buttonIndex):
 		try:
 			selButton=buttonList[buttonIndex]
@@ -334,67 +315,6 @@ class OptionDialog(ui.ScriptWindow):
 	def OnChangePKMode(self):
 		self.__RefreshPVPButtonList()
 
-	def __OnChangeMobilePhoneNumber(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		import uiCommon
-		inputDialog = uiCommon.InputDialog()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE)
-		inputDialog.SetMaxLength(13)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
-	def __OnDeleteMobilePhoneNumber(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		import uiCommon
-		questionDialog = uiCommon.QuestionDialog()
-		questionDialog.SetText(localeInfo.MESSENGER_DO_YOU_DELETE_PHONE_NUMBER)
-		questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnDeleteMobile))
-		questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseQuestionDialog))
-		questionDialog.Open()
-		self.questionDialog = questionDialog
-
-	def OnInputMobilePhoneNumber(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		text = self.inputDialog.GetText()
-
-		if not text:
-			return
-
-		text.replace('-', '')
-		net.SendChatPacket("/mobile " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnInputMobileAuthorityCode(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		text = self.inputDialog.GetText()
-		net.SendChatPacket("/mobile_auth " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnDeleteMobile(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		net.SendChatPacket("/mobile")
-		self.OnCloseQuestionDialog()
-		return True
-
 	def OnCloseInputDialog(self):
 		self.inputDialog.Close()
 		self.inputDialog = None
@@ -409,34 +329,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.Close()
 		return True
 
-	def RefreshMobile(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		if player.HasMobilePhoneNumber():
-			self.inputMobileButton.Hide()
-			self.deleteMobileButton.Show()
-		else:
-			self.inputMobileButton.Show()
-			self.deleteMobileButton.Hide()
-
-	def OnMobileAuthority(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		import uiCommon
-		inputDialog = uiCommon.InputDialogWithDescription()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_TITLE)
-		inputDialog.SetDescription(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_DESCRIPTION)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileAuthorityCode))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.SetMaxLength(4)
-		inputDialog.SetBoardWidth(310)
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
 	def RefreshBlock(self):
 		global blockMode
 		for i in xrange(len(self.blockButtonList)):
@@ -483,7 +375,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.RefreshBlock()
 
 	def Show(self):
-		self.RefreshMobile()
 		self.RefreshBlock()
 		ui.ScriptWindow.Show(self)
 

bin/pack/root/uimessenger.py

@@ -71,15 +71,9 @@ class MessengerItem(ui.Window):
 	def IsOnline(self):
 		return False
 
-	def IsMobile(self):
-		return False
-
 	def OnWhisper(self):
 		pass
 
-	def OnMobileMessage(self):
-		pass
-
 	# Remove
 	def CanRemove(self):
 		return False
@@ -123,17 +117,16 @@ class MessengerMemberItem(MessengerItem):
 
 	STATE_OFFLINE = 0
 	STATE_ONLINE = 1
-	STATE_MOBILE = 2
 
-	IMAGE_FILE_NAME = {	"ONLINE" : "d:/ymir work/ui/game/windows/messenger_list_online.sub",
+	IMAGE_FILE_NAME = {
-						"OFFLINE" : "d:/ymir work/ui/game/windows/messenger_list_offline.sub",
+		"ONLINE" : "d:/ymir work/ui/game/windows/messenger_list_online.sub",
-						"MOBILE" : "d:/ymir work/ui/game/windows/messenger_list_mobile.sub", }
+		"OFFLINE" : "d:/ymir work/ui/game/windows/messenger_list_offline.sub",
+	}
 
 	def __init__(self, getParentEvent):
 		MessengerItem.__init__(self, getParentEvent)
 		self.key = None
 		self.state = self.STATE_OFFLINE
-		self.mobileFlag = False
 		self.Offline()
 
 	def GetStepWidth(self):
@@ -151,30 +144,13 @@ class MessengerMemberItem(MessengerItem):
 
 		return False
 
-	def IsMobile(self):
-		if self.STATE_MOBILE == self.state:
-			return True
-
-		return False
-
 	def Online(self):
 		self.image.LoadImage(self.IMAGE_FILE_NAME["ONLINE"])
 		self.state = self.STATE_ONLINE
 
 	def Offline(self):
-		if self.mobileFlag:
+		self.image.LoadImage(self.IMAGE_FILE_NAME["OFFLINE"])
-			self.image.LoadImage(self.IMAGE_FILE_NAME["MOBILE"])
+		self.state = self.STATE_OFFLINE
-			self.state = self.STATE_MOBILE
-
-		else:
-			self.image.LoadImage(self.IMAGE_FILE_NAME["OFFLINE"])
-			self.state = self.STATE_OFFLINE
-
-	def SetMobile(self, flag):
-		self.mobileFlag = flag
-
-		if not self.IsOnline():
-			self.Offline()
 
 	def CanWhisper(self):
 		if self.IsOnline():
@@ -186,15 +162,6 @@ class MessengerMemberItem(MessengerItem):
 		if self.IsOnline():
 			self.getParentEvent().whisperButtonEvent(self.GetName())
 
-	def OnMobileMessage(self):
-		if not uiGameOption.MOBILE:
-			return
-
-		if not self.IsMobile():
-			return
-
-		self.getParentEvent().SendMobileMessage(self.GetName())
-
 	def Select(self):
 		MessengerItem.Select(self)
 
@@ -370,7 +337,6 @@ class MessengerWindow(ui.ScriptWindow):
 
 		self.showingPageSize = 0
 		self.startLine = 0
-		self.hasMobilePhoneNumber = True
 
 		self.isLoaded = 0
 
@@ -396,7 +362,6 @@ class MessengerWindow(ui.ScriptWindow):
 			self.board = self.GetChild("board")
 			self.scrollBar = self.GetChild("ScrollBar")
 			self.whisperButton = self.GetChild("WhisperButton")
-			self.mobileButton = self.GetChild("MobileButton")
 			self.removeButton = self.GetChild("RemoveButton")
 			self.addFriendButton = self.GetChild("AddFriendButton")
 			self.guildButton = self.GetChild("GuildButton")
@@ -407,22 +372,11 @@ class MessengerWindow(ui.ScriptWindow):
 		self.board.SetCloseEvent(ui.__mem_func__(self.Close))
 		self.scrollBar.SetScrollEvent(ui.__mem_func__(self.OnScroll))
 		self.whisperButton.SetEvent(ui.__mem_func__(self.OnPressWhisperButton))
-		self.mobileButton.SetEvent(ui.__mem_func__(self.OnPressMobileButton))
 		self.removeButton.SetEvent(ui.__mem_func__(self.OnPressRemoveButton))
 		self.addFriendButton.SetEvent(ui.__mem_func__(self.OnPressAddFriendButton))
 		self.guildButton.SetEvent(ui.__mem_func__(self.OnPressGuildButton))
 
-		if not uiGameOption.MOBILE: #constInfo.SEND_MOBILE_PHONE_MESSAGE_ENABLE:
-			self.mobileButton.Hide()
-			width = self.GetWidth()
-			height = self.GetHeight()
-			self.addFriendButton.SetPosition(-60, 30)
-			self.whisperButton.SetPosition(-20, 30)
-			self.removeButton.SetPosition(20, 30)
-			self.guildButton.SetPosition(60, 30)
-
 		self.whisperButton.Disable()
-		self.mobileButton.Disable()
 		self.removeButton.Disable()
 
 		resizeButton = self.ResizeButton()
@@ -450,11 +404,9 @@ class MessengerWindow(ui.ScriptWindow):
 		self.friendNameBoard = None
 		self.questionDialog = None
 		self.popupDialog = None
-		self.inputDialog = None
 		self.familyGroup = None
 
 		self.whisperButton = None
-		self.mobileButton = None
 		self.removeButton = None
 
 	def OnCloseQuestionDialog(self):
@@ -543,84 +495,6 @@ class MessengerWindow(ui.ScriptWindow):
 	def SetGuildButtonEvent(self, event):
 		self.guildButtonEvent=event
 
-	def SendMobileMessage(self, name):
-		if not uiGameOption.MOBILE:
-			return
-
-		if not self.hasMobilePhoneNumber:
-			questionDialog = uiCommon.QuestionDialog2()
-			questionDialog.SetText1(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_1)
-			questionDialog.SetText2(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_2)
-			questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnAcceptInputMobilePhoneNumber))
-			questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCancelInputMobilePhoneNumber))
-			questionDialog.SetWidth(400)
-			questionDialog.Open()
-			self.questionDialog = questionDialog
-			return
-
-		## Input Sending Mobile Message
-		inputDialog = uiCommon.InputDialog()
-		inputDialog.SetTitle(localeInfo.MESSENGER_SEND_MOBILE_MESSAGE_TITLE)
-		inputDialog.SetMaxLength(50)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileMessage))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.name = name
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
-	def OnAcceptInputMobilePhoneNumber(self):
-		if not uiGameOption.MOBILE:
-			return
-
-		## Input Mobile Phone Number
-		inputDialog = uiCommon.InputDialog()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE)
-		inputDialog.SetMaxLength(13)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-		self.OnCancelInputMobilePhoneNumber()
-
-	def OnCancelInputMobilePhoneNumber(self):
-		if not uiGameOption.MOBILE:
-			return
-		self.questionDialog.Close()
-		self.questionDialog = None
-		return True
-
-	def OnInputMobilePhoneNumber(self):
-		if not uiGameOption.MOBILE:
-			return
-
-		text = self.inputDialog.GetText()
-
-		if not text:
-			return
-
-		text.replace('-', '')
-		net.SendChatPacket("/mobile " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnInputMobileMessage(self):
-		if not uiGameOption.MOBILE:
-			return
-
-		text = self.inputDialog.GetText()
-
-		if not text:
-			return
-
-		net.SendMobileMessagePacket(self.inputDialog.name, text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnCloseInputDialog(self):
-		self.inputDialog.Close()
-		self.inputDialog = None
-		return True
-
 	def OnPressGuildButton(self):
 		self.guildButtonEvent()
 
@@ -649,10 +523,6 @@ class MessengerWindow(ui.ScriptWindow):
 		if self.selectedItem:
 			self.selectedItem.OnWhisper()
 
-	def OnPressMobileButton(self):
-		if self.selectedItem:
-			self.selectedItem.OnMobileMessage()
-
 	def OnPressRemoveButton(self):
 		if self.selectedItem:
 			if self.selectedItem.CanRemove():
@@ -702,11 +572,6 @@ class MessengerWindow(ui.ScriptWindow):
 			else:
 				self.whisperButton.Disable()
 
-			if self.selectedItem.IsMobile():
-				self.mobileButton.Enable()
-			else:
-				self.mobileButton.Disable()
-
 			if self.selectedItem.CanRemove():
 				self.removeButton.Enable()
 			else:
@@ -720,9 +585,6 @@ class MessengerWindow(ui.ScriptWindow):
 		if self.selectedItem.IsOnline():
 			self.OnPressWhisperButton()
 
-		elif self.selectedItem.IsMobile():
-			self.OnPressMobileButton()
-
 	def GetSelf(self):
 		return self
 
@@ -796,14 +658,6 @@ class MessengerWindow(ui.ScriptWindow):
 		member.Offline()
 		self.OnRefreshList()
 
-	def OnMobile(self, groupIndex, key, mobileFlag):
-		group = self.groupList[groupIndex]
-		member = group.FindMember(key)
-		if not member:
-			return
-		member.SetMobile(mobileFlag)
-		self.OnRefreshList()
-
 	def OnAddLover(self, name, lovePoint):
 		if not self.familyGroup:
 			self.__AddFamilyGroup()

bin/pack/root/uioption.py

@@ -9,11 +9,6 @@ import constInfo
 import chrmgr
 import player
 
-MOBILE = False
-
-if localeInfo.IsYMIR():
-	MOBILE = True
-	
 blockMode = 0
 
 class OptionDialog(ui.ScriptWindow):
@@ -45,15 +40,9 @@ class OptionDialog(ui.ScriptWindow):
 		print " -------------------------------------- DESTROY OPTION DIALOG"
 		
 	def __LoadDialog(self):
-		global NO_MOBILE
-
 		try:
 			pyScriptLoader = ui.PythonScriptLoader()
-
+			pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog.py")
-			if MOBILE:
-				pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog_formobile.py")
-			else:
-				pyScriptLoader.LoadScriptFile(self, "uiscript/optiondialog.py")
 				
 		except:
 			import exception
@@ -82,10 +71,6 @@ class OptionDialog(ui.ScriptWindow):
 			self.blockButtonList.append(GetObject("block_guild_button"))
 			self.blockButtonList.append(GetObject("block_whisper_button"))
 			self.blockButtonList.append(GetObject("block_friend_button"))
-
-			if MOBILE:
-				self.inputMobileButton = GetObject("input_mobile_button")
-				self.deleteMobileButton = GetObject("delete_mobile_button")
 				
 		except:
 			import exception
@@ -134,10 +119,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.__ClickRadioButton(self.viewTargetBoardButtonList, constInfo.GET_VIEW_OTHER_EMPIRE_PLAYER_TARGET_BOARD())
 		self.__SetPeacePKMode()
 
-		if MOBILE:
-			self.inputMobileButton.SetEvent(ui.__mem_func__(self.__OnChangeMobilePhoneNumber))
-			self.deleteMobileButton.SetEvent(ui.__mem_func__(self.__OnDeleteMobilePhoneNumber))
-
 	def __ClickRadioButton(self, buttonList, buttonIndex):
 		try:
 			selButton=buttonList[buttonIndex]
@@ -294,53 +275,6 @@ class OptionDialog(ui.ScriptWindow):
 		snd.SetSoundVolumef(pos)
 		systemSetting.SetSoundVolumef(pos)
 
-	def __OnChangeMobilePhoneNumber(self):
-
-		import uiCommon
-		inputDialog = uiCommon.InputDialog()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE)
-		inputDialog.SetMaxLength(13)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobilePhoneNumber))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
-	def __OnDeleteMobilePhoneNumber(self):
-		import uiCommon
-		questionDialog = uiCommon.QuestionDialog()
-		questionDialog.SetText(localeInfo.MESSENGER_DO_YOU_DELETE_PHONE_NUMBER)
-		questionDialog.SetAcceptEvent(ui.__mem_func__(self.OnDeleteMobile))
-		questionDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseQuestionDialog))
-		questionDialog.Open()
-		self.questionDialog = questionDialog
-
-	def OnInputMobilePhoneNumber(self):
-		text = self.inputDialog.GetText()
-
-		if not text:
-			return
-
-		text.replace('-', '')
-		net.SendChatPacket("/mobile " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnInputMobileAuthorityCode(self):
-		text = self.inputDialog.GetText()
-		net.SendChatPacket("/mobile_auth " + text)
-		self.OnCloseInputDialog()
-		return True
-
-	def OnDeleteMobile(self):
-		net.SendChatPacket("/mobile")
-		self.OnCloseQuestionDialog()
-		return True
-
-	def OnCloseInputDialog(self):
-		self.inputDialog.Close()
-		self.inputDialog = None
-		return True
-
 	def OnCloseQuestionDialog(self):
 		self.questionDialog.Close()
 		self.questionDialog = None
@@ -350,30 +284,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.Close()
 		return True
 
-	def RefreshMobile(self):
-		global MOBILE
-		if not MOBILE:
-			return
-
-		if player.HasMobilePhoneNumber():
-			self.inputMobileButton.Hide()
-			self.deleteMobileButton.Show()
-		else:
-			self.inputMobileButton.Show()
-			self.deleteMobileButton.Hide()
-
-	def OnMobileAuthority(self):
-		import uiCommon
-		inputDialog = uiCommon.InputDialogWithDescription()
-		inputDialog.SetTitle(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_TITLE)
-		inputDialog.SetDescription(localeInfo.MESSENGER_INPUT_MOBILE_AUTHORITY_DESCRIPTION)
-		inputDialog.SetAcceptEvent(ui.__mem_func__(self.OnInputMobileAuthorityCode))
-		inputDialog.SetCancelEvent(ui.__mem_func__(self.OnCloseInputDialog))
-		inputDialog.SetMaxLength(4)
-		inputDialog.SetBoardWidth(310)
-		inputDialog.Open()
-		self.inputDialog = inputDialog
-
 	def RefreshBlock(self):
 		global blockMode
 		for i in xrange(len(self.blockButtonList)):
@@ -388,7 +298,6 @@ class OptionDialog(ui.ScriptWindow):
 		self.RefreshBlock()
 
 	def Show(self):
-		self.RefreshMobile()
 		self.RefreshBlock()
 		ui.ScriptWindow.Show(self)
 

bin/pack/root/uisystem.py

@@ -136,16 +136,6 @@ class SystemDialog(ui.ScriptWindow):
 		self.Hide()
 		return True
 
-	def RefreshMobile(self):
-		if self.gameOptionDlg:
-			self.gameOptionDlg.RefreshMobile()
-		#self.optionDialog.RefreshMobile()
-
-	def OnMobileAuthority(self):
-		if self.gameOptionDlg:
-			self.gameOptionDlg.OnMobileAuthority()
-		#self.optionDialog.OnMobileAuthority()
-
 	def OnBlockMode(self, mode):
 		uiGameOption.blockMode = mode
 		if self.gameOptionDlg:

bin/pack/uiscript/uiscript/gameoptiondialog_formobile.py

@@ -1,479 +0,0 @@
-import uiScriptLocale
-
-ROOT_PATH = "d:/ymir work/ui/public/"
-
-TEMPORARY_X = +13
-BUTTON_TEMPORARY_X = 5
-PVP_X = -10
-
-LINE_LABEL_X 	= 30
-LINE_DATA_X 	= 90
-LINE_STEP	= 0
-SMALL_BUTTON_WIDTH 	= 45
-MIDDLE_BUTTON_WIDTH 	= 65
-
-window = {
-	"name" : "GameOptionDialog",
-	"style" : ("movable", "float",),
-
-	"x" : 0,
-	"y" : 0,
-
-	"width" : 300,
-	"height" : (258+25),
-
-	"children" :
-	(
-		{
-			"name" : "board",
-			"type" : "board",
-
-			"x" : 0,
-			"y" : 0,
-
-			"width" : 300,
-			"height" : 25*12+8,
-
-			"children" :
-			(
-				## Title
-				{
-					"name" : "titlebar",
-					"type" : "titlebar",
-					"style" : ("attach",),
-
-					"x" : 8,
-					"y" : 8,
-
-					"width" : 284,
-					"color" : "gray",
-
-					"children" :
-					(
-						{ "name":"titlename", "type":"text", "x":0, "y":3, 
-						"text" : uiScriptLocale.GAMEOPTION_TITLE, 
-						"horizontal_align":"center", "text_horizontal_align":"center" },
-					),
-				},
-
-				## À̸§»ö
-				{
-					"name" : "name_color",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 40+2,
-
-					"text" : uiScriptLocale.OPTION_NAME_COLOR,
-				},
-				{
-					"name" : "name_color_normal",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0,
-					"y" : 40,
-
-					"text" : uiScriptLocale.OPTION_NAME_COLOR_NORMAL,
-
-					"default_image" : ROOT_PATH + "Middle_Button_01.sub",
-					"over_image" : ROOT_PATH + "Middle_Button_02.sub",
-					"down_image" : ROOT_PATH + "Middle_Button_03.sub",
-				},
-				{
-					"name" : "name_color_empire",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1,
-					"y" : 40,
-
-					"text" : uiScriptLocale.OPTION_NAME_COLOR_EMPIRE,
-
-					"default_image" : ROOT_PATH + "Middle_Button_01.sub",
-					"over_image" : ROOT_PATH + "Middle_Button_02.sub",
-					"down_image" : ROOT_PATH + "Middle_Button_03.sub",
-				},
-
-				## Ÿ°Ùâ
-				{
-					"name" : "target_board",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 65+2,
-
-					"text" : uiScriptLocale.OPTION_TARGET_BOARD,
-				},
-				{
-					"name" : "target_board_no_view",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0,
-					"y" : 65,
-
-					"text" : uiScriptLocale.OPTION_TARGET_BOARD_NO_VIEW,
-
-					"default_image" : ROOT_PATH + "Middle_Button_01.sub",
-					"over_image" : ROOT_PATH + "Middle_Button_02.sub",
-					"down_image" : ROOT_PATH + "Middle_Button_03.sub",
-				},
-				{
-					"name" : "target_board_view",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1,
-					"y" : 65,
-
-					"text" : uiScriptLocale.OPTION_TARGET_BOARD_VIEW,
-
-					"default_image" : ROOT_PATH + "Middle_Button_01.sub",
-					"over_image" : ROOT_PATH + "Middle_Button_02.sub",
-					"down_image" : ROOT_PATH + "Middle_Button_03.sub",
-				},
-
-				
-				## PvP Mode
-				{
-					"name" : "pvp_mode",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 90+2,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE,
-				},
-				{
-					"name" : "pvp_peace",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*0,
-					"y" : 90,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE_PEACE,
-					"tooltip_text" : uiScriptLocale.OPTION_PVPMODE_PEACE_TOOLTIP,
-
-					"default_image" : ROOT_PATH + "small_Button_01.sub",
-					"over_image" : ROOT_PATH + "small_Button_02.sub",
-					"down_image" : ROOT_PATH + "small_Button_03.sub",
-				},
-				{
-					"name" : "pvp_revenge",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*1,
-					"y" : 90,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE_REVENGE,
-					"tooltip_text" : uiScriptLocale.OPTION_PVPMODE_REVENGE_TOOLTIP,
-
-					"default_image" : ROOT_PATH + "small_Button_01.sub",
-					"over_image" : ROOT_PATH + "small_Button_02.sub",
-					"down_image" : ROOT_PATH + "small_Button_03.sub",
-				},
-				{
-					"name" : "pvp_guild",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*2,
-					"y" : 90,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE_GUILD,
-					"tooltip_text" : uiScriptLocale.OPTION_PVPMODE_GUILD_TOOLTIP,
-
-					"default_image" : ROOT_PATH + "small_Button_01.sub",
-					"over_image" : ROOT_PATH + "small_Button_02.sub",
-					"down_image" : ROOT_PATH + "small_Button_03.sub",
-				},
-				{
-					"name" : "pvp_free",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+SMALL_BUTTON_WIDTH*3,
-					"y" : 90,
-
-					"text" : uiScriptLocale.OPTION_PVPMODE_FREE,
-					"tooltip_text" : uiScriptLocale.OPTION_PVPMODE_FREE_TOOLTIP,
-
-					"default_image" : ROOT_PATH + "small_Button_01.sub",
-					"over_image" : ROOT_PATH + "small_Button_02.sub",
-					"down_image" : ROOT_PATH + "small_Button_03.sub",
-				},
-
-				## Block
-				{
-					"name" : "block",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 115+2,
-
-					"text" : uiScriptLocale.OPTION_BLOCK,
-				},
-				{
-					"name" : "block_exchange_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0,
-					"y" : 115,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_EXCHANGE,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_party_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1,
-					"y" : 115,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_PARTY,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_guild_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*2,
-					"y" : 115,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_GUILD,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_whisper_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*0,
-					"y" : 140,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_WHISPER,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_friend_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*1,
-					"y" : 140,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_FRIEND,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "block_party_request_button",
-					"type" : "toggle_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH*2,
-					"y" : 140,
-
-					"text" : uiScriptLocale.OPTION_BLOCK_PARTY_REQUEST,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-
-				## Chat
-				{
-					"name" : "chat",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 165+2,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT,
-				},
-				{
-					"name" : "view_chat_on_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X,
-					"y" : 165,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT_ON,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "view_chat_off_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH,
-					"y" : 165,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT_OFF,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-
-				## Always Show Name
-				{
-					"name" : "always_show_name",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 190+2,
-
-					"text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME,
-				},
-				{
-					"name" : "always_show_name_on_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X,
-					"y" : 190,
-
-					"text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME_ON,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "always_show_name_off_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH,
-					"y" : 190,
-
-					"text" : uiScriptLocale.OPTION_ALWAYS_SHOW_NAME_OFF,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-
-				## Mobile
-				{
-					"name" : "mobile",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 215+2,
-
-					"text" : uiScriptLocale.OPTION_MOBILE,
-				},
-				{
-					"name" : "input_mobile_button",
-					"type" : "button",
-
-					"x" : LINE_DATA_X,
-					"y" : 215,
-
-					"text" : uiScriptLocale.OPTION_INPUT_MOBILE_BUTTON,
-
-					"default_image" : ROOT_PATH + "Large_Button_01.sub",
-					"over_image" : ROOT_PATH + "Large_Button_02.sub",
-					"down_image" : ROOT_PATH + "Large_Button_03.sub",
-				},
-				{
-					"name" : "delete_mobile_button",
-					"type" : "button",
-
-					"x" : 90,
-					"y" : 215,
-
-					"text" : uiScriptLocale.OPTION_DELETE_MOBILE_BUTTON,
-
-					"default_image" : ROOT_PATH + "Large_Button_01.sub",
-					"over_image" : ROOT_PATH + "Large_Button_02.sub",
-					"down_image" : ROOT_PATH + "Large_Button_03.sub",
-				},
-
-				## Effect On/Off
-				{
-					"name" : "effect_on_off",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 240+2,
-
-					"text" : uiScriptLocale.OPTION_EFFECT,
-				},
-				{
-					"name" : "show_damage_on_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X,
-					"y" : 240,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT_ON,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "show_damage_off_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH,
-					"y" : 240,
-
-					"text" : uiScriptLocale.OPTION_VIEW_CHAT_OFF,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				
-			## ÆǸŹ®±¸
-				
-				{
-					"name" : "salestext_on_off",
-					"type" : "text",
-
-					"x" : LINE_LABEL_X,
-					"y" : 265+2,
-
-					"text" : uiScriptLocale.OPTION_SALESTEXT,
-				},
-				{
-					"name" : "salestext_on_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X,
-					"y" : 265,
-
-					"text" : uiScriptLocale.OPTION_SALESTEXT_VIEW_ON,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},
-				{
-					"name" : "salestext_off_button",
-					"type" : "radio_button",
-
-					"x" : LINE_DATA_X+MIDDLE_BUTTON_WIDTH,
-					"y" : 265,
-
-					"text" : uiScriptLocale.OPTION_SALESTEXT_VIEW_OFF,
-
-					"default_image" : ROOT_PATH + "middle_button_01.sub",
-					"over_image" : ROOT_PATH + "middle_button_02.sub",
-					"down_image" : ROOT_PATH + "middle_button_03.sub",
-				},				
-
-			),
-		},
-	),
-}

bin/pack/uiscript/uiscript/messengerwindow.py

@@ -1,7 +1,7 @@
 import uiScriptLocale
 
 BUTTON_START_X_POS = -60
-BUTTON_X_STEP = 30
+BUTTON_X_STEP = 40
 
 window = {
 	"name" : "MessengerWindow",
@@ -73,28 +73,11 @@ window = {
 			"down_image" : "d:/ymir work/ui/game/windows/messenger_whisper_03.sub",
 			"disable_image" : "d:/ymir work/ui/game/windows/messenger_whisper_04.sub",
 		},
-		{
-			"name" : "MobileButton",
-			"type" : "button",
-
-			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*2,
-			"y" : 30,
-			"horizontal_align" : "center",
-			"vertical_align" : "bottom",
-			"tooltip_text" : uiScriptLocale.MESSENGER_MOBILE,
-			"tooltip_x" : 0,
-			"tooltip_y" : 35,
-
-			"default_image" : "d:/ymir work/ui/game/windows/messenger_mobile_01.sub",
-			"over_image" : "d:/ymir work/ui/game/windows/messenger_mobile_02.sub",
-			"down_image" : "d:/ymir work/ui/game/windows/messenger_mobile_03.sub",
-			"disable_image" : "d:/ymir work/ui/game/windows/messenger_mobile_04.sub",
-		},
 		{
 			"name" : "RemoveButton",
 			"type" : "button",
 
-			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*3,
+			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*2,
 			"y" : 30,
 			"horizontal_align" : "center",
 			"vertical_align" : "bottom",
@@ -111,7 +94,7 @@ window = {
 			"name" : "GuildButton",
 			"type" : "button",
 
-			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*4,
+			"x" : BUTTON_START_X_POS + BUTTON_X_STEP*3,
 			"y" : 30,
 			"horizontal_align" : "center",
 			"vertical_align" : "bottom",

src/UserInterface/AbstractPlayer.h

@@ -54,7 +54,6 @@ class IAbstractPlayer : public TAbstractSingleton<IAbstractPlayer>
 		virtual void	NotifyChangePKMode() = 0;
 				
 		virtual void	SetObserverMode(bool isEnable) = 0;
-		virtual void	SetMobileFlag(BOOL bFlag) = 0;
 		virtual void	SetComboSkillFlag(BOOL bFlag) = 0;
 
 		virtual void	StartEmotionProcess() = 0;

src/UserInterface/Packet.h

@@ -807,7 +807,6 @@ enum
 	MESSENGER_SUBHEADER_GC_LOGIN,
 	MESSENGER_SUBHEADER_GC_LOGOUT,
 	MESSENGER_SUBHEADER_GC_INVITE,
-	MESSENGER_SUBHEADER_GC_MOBILE,
 };
 
 typedef struct packet_messenger
@@ -827,7 +826,6 @@ enum
 {
 	MESSENGER_CONNECTED_STATE_OFFLINE,
 	MESSENGER_CONNECTED_STATE_ONLINE,
-	MESSENGER_CONNECTED_STATE_MOBILE,
 };
 
 typedef struct packet_messenger_list_online

src/UserInterface/PythonMessenger.cpp

@@ -22,14 +22,6 @@ void CPythonMessenger::OnFriendLogout(const char * c_szKey)
 		PyCallClassMemberFunc(m_poMessengerHandler, "OnLogout", Py_BuildValue("(is)", MESSENGER_GRUOP_INDEX_FRIEND, c_szKey));
 }
 
-void CPythonMessenger::SetMobile(const char * c_szKey, BYTE byState)
-{
-	m_FriendNameMap.insert(c_szKey);
-
-	if (m_poMessengerHandler)
-		PyCallClassMemberFunc(m_poMessengerHandler, "OnMobile", Py_BuildValue("(isi)", MESSENGER_GRUOP_INDEX_FRIEND, c_szKey, byState));
-}
-
 BOOL CPythonMessenger::IsFriendByKey(const char * c_szKey)
 {
 	return m_FriendNameMap.end() != m_FriendNameMap.find(c_szKey);

src/UserInterface/PythonMessenger.h

@@ -22,7 +22,6 @@ class CPythonMessenger : public CSingleton<CPythonMessenger>
 		void RemoveFriend(const char * c_szKey);
 		void OnFriendLogin(const char * c_szKey);
 		void OnFriendLogout(const char * c_szKey);
-		void SetMobile(const char * c_szKey, BYTE byState);
 		BOOL IsFriendByKey(const char * c_szKey);
 		BOOL IsFriendByName(const char * c_szName);
 

src/UserInterface/PythonNetworkStream.h

@@ -309,7 +309,6 @@ class CPythonNetworkStream : public CNetworkStream, public CSingleton<CPythonNet
 		bool SendC2CPacket(DWORD dwSize, void * pData);
 		bool SendChatPacket(const char * c_szChat, BYTE byType = CHAT_TYPE_TALKING);
 		bool SendWhisperPacket(const char * name, const char * c_szChat);
-		bool SendMobileMessagePacket(const char * name, const char * c_szChat);
 		bool SendMessengerAddByVIDPacket(DWORD vid);
 		bool SendMessengerAddByNamePacket(const char * c_szName);
 		bool SendMessengerRemovePacket(const char * c_szKey, const char * c_szName);

src/UserInterface/PythonNetworkStreamCommand.cpp

@@ -399,20 +399,6 @@ void CPythonNetworkStream::ServerCommand(char * c_szCommand)
 		IAbstractPlayer& rPlayer=IAbstractPlayer::GetSingleton();
 		rPlayer.StopStaminaConsume(dwCurrentStamina);
 	}
-	else if (!strcmpi(szCmd, "sms"))
-	{
-		IAbstractPlayer& rPlayer=IAbstractPlayer::GetSingleton();
-		rPlayer.SetMobileFlag(TRUE);
-	}
-	else if (!strcmpi(szCmd, "nosms"))
-	{
-		IAbstractPlayer& rPlayer=IAbstractPlayer::GetSingleton();
-		rPlayer.SetMobileFlag(FALSE);
-	}
-	else if (!strcmpi(szCmd, "mobile_auth"))
-	{
-		PyCallClassMemberFunc(m_apoPhaseWnd[PHASE_WINDOW_GAME], "OnMobileAuthority", Py_BuildValue("()"));
-	}
 	else if (!strcmpi(szCmd, "messenger_auth"))
 	{
 		const std::string & c_rstrName = TokenVector[1].c_str();

src/UserInterface/PythonNetworkStreamModule.cpp

@@ -536,21 +536,6 @@ PyObject* netSendWhisperPacket(PyObject* poSelf, PyObject* poArgs)
 	return Py_BuildNone();
 }
 
-PyObject* netSendMobileMessagePacket(PyObject* poSelf, PyObject* poArgs)
-{
-	char* szName;
-	char* szLine;
-	if (!PyTuple_GetString(poArgs, 0, &szName))
-		return Py_BuildException();
-
-	if (!PyTuple_GetString(poArgs, 1, &szLine))
-		return Py_BuildException();
-
-	CPythonNetworkStream& rkNetStream=CPythonNetworkStream::Instance();
-	rkNetStream.SendMobileMessagePacket(szName, szLine);
-	return Py_BuildNone();
-}
-
 PyObject* netSendCharacterPositionPacket(PyObject* poSelf, PyObject* poArgs)
 {
 	int iPosition;
@@ -1789,7 +1774,6 @@ void initnet()
 		{ "SendChatPacket",						netSendChatPacket,						METH_VARARGS },
 		{ "SendEmoticon",						netSendEmoticon,						METH_VARARGS },
 		{ "SendWhisperPacket",					netSendWhisperPacket,					METH_VARARGS },
-		{ "SendMobileMessagePacket",			netSendMobileMessagePacket,				METH_VARARGS },
 
 		{ "SendCharacterPositionPacket",		netSendCharacterPositionPacket,			METH_VARARGS },
 

src/UserInterface/PythonNetworkStreamPhaseGame.cpp

@@ -1446,24 +1446,6 @@ bool CPythonNetworkStream::SendWhisperPacket(const char * name, const char * c_s
 	return SendSequence();
 }
 
-bool CPythonNetworkStream::SendMobileMessagePacket(const char * name, const char * c_szChat)
-{
-	int iTextLen = strlen(c_szChat) + 1;
-	TPacketCGSMS SMSPacket;
-	SMSPacket.bHeader = HEADER_CG_SMS;
-	SMSPacket.wSize = sizeof(SMSPacket) + iTextLen;
-
-	strncpy(SMSPacket.szNameTo, name, sizeof(SMSPacket.szNameTo) - 1);
-
-	if (!Send(sizeof(SMSPacket), &SMSPacket))
-		return false;
-
-	if (!Send(iTextLen, c_szChat))
-		return false;
-
-	return SendSequence();
-}
-
 bool CPythonNetworkStream::RecvPointChange()
 {
 	TPacketGCPointChange PointChange;
@@ -2756,9 +2738,6 @@ bool CPythonNetworkStream::RecvMessenger()
 				else
 					CPythonMessenger::Instance().OnFriendLogout(char_name);
 
-				if (on.connected & MESSENGER_CONNECTED_STATE_MOBILE)
-					CPythonMessenger::Instance().SetMobile(char_name, TRUE);
-
 				iSize -= sizeof(TPacketGCMessengerListOffline);
 				iSize -= on.length;
 			}
@@ -2789,21 +2768,6 @@ bool CPythonNetworkStream::RecvMessenger()
 			CPythonMessenger::Instance().OnFriendLogout(char_name);
 			break;
 		}
-
-		case MESSENGER_SUBHEADER_GC_MOBILE:
-		{
-			BYTE byState; // 모바일 번호가 없어졌는지 플래그
-			BYTE byLength;
-			if (!Recv(sizeof(byState), &byState))
-				return false;
-			if (!Recv(sizeof(byLength), &byLength))
-				return false;
-			if (!Recv(byLength, char_name))
-				return false;
-			char_name[byLength] = 0;
-			CPythonMessenger::Instance().SetMobile(char_name, byState);
-			break;
-		}
 	}
 	return true;
 }

src/UserInterface/PythonPlayer.cpp

@@ -1542,17 +1542,6 @@ DWORD CPythonPlayer::GetPKMode()
 	return pInstance->GetPKMode();
 }
 
-void CPythonPlayer::SetMobileFlag(BOOL bFlag)
-{
-	m_bMobileFlag = bFlag;
-	PyCallClassMemberFunc(m_ppyGameWindow, "RefreshMobile", Py_BuildValue("()"));
-}
-
-BOOL CPythonPlayer::HasMobilePhoneNumber()
-{
-	return m_bMobileFlag;
-}
-
 void CPythonPlayer::SetGameWindow(PyObject * ppyObject)
 {
 	m_ppyGameWindow = ppyObject;
@@ -1600,8 +1589,6 @@ void CPythonPlayer::ClearSkillDict()
 	m_fConsumeStaminaPerSec = 0.0f;
 	m_fCurrentStamina = 0.0f;
 
-	m_bMobileFlag = FALSE;
-
 	__ClearAutoAttackTargetActorID();
 }
 
@@ -1673,8 +1660,6 @@ void CPythonPlayer::Clear()
 
 	m_inGuildAreaID = 0xffffffff;
 
-	m_bMobileFlag = FALSE;
-
 	__ClearAutoAttackTargetActorID();
 }
 

src/UserInterface/PythonPlayer.h

@@ -400,11 +400,6 @@ class CPythonPlayer : public CSingleton<CPythonPlayer>, public IAbstractPlayer
 		DWORD	GetPKMode();
 
 
-		// Mobile
-		void	SetMobileFlag(BOOL bFlag);
-		BOOL	HasMobilePhoneNumber();
-
-
 		// Combo
 		void	SetComboSkillFlag(BOOL bFlag);
 
@@ -648,9 +643,6 @@ class CPythonPlayer : public CSingleton<CPythonPlayer>, public IAbstractPlayer
 		// Guild
 		DWORD					m_inGuildAreaID;
 
-		// Mobile
-		BOOL					m_bMobileFlag;
-
 		// System
 		BOOL					m_sysIsCoolTime;
 		BOOL					m_sysIsLevelLimit;

src/UserInterface/PythonPlayerModule.cpp

@@ -1875,11 +1875,6 @@ PyObject * playerGetPKMode(PyObject* poSelf, PyObject* poArgs)
 	return Py_BuildValue("i", CPythonPlayer::Instance().GetPKMode());
 }
 
-PyObject * playerHasMobilePhoneNumber(PyObject* poSelf, PyObject* poArgs)
-{
-	return Py_BuildValue("i", CPythonPlayer::Instance().HasMobilePhoneNumber());
-}
-
 PyObject * playerSetWeaponAttackBonusFlag(PyObject* poSelf, PyObject* poArgs)
 {
 	int iFlag;
@@ -2313,9 +2308,6 @@ void initPlayer()
 		// PK Mode
 		{ "GetPKMode",					playerGetPKMode,					METH_VARARGS },
 
-		// Mobile
-		{ "HasMobilePhoneNumber",		playerHasMobilePhoneNumber,			METH_VARARGS },
-
 		// Emotion
 		{ "RegisterEmotionIcon",		playerRegisterEmotionIcon,			METH_VARARGS },
 		{ "GetEmotionIconImage",		playerGetEmotionIconImage,			METH_VARARGS },