From 526799b8a71f7f034ca936dd5ff6a54b546c63a7 Mon Sep 17 00:00:00 2001
From: rtw1x1 <off.tw1x1@gmail.com>
Date: Sat, 27 Dec 2025 21:27:28 +0000
Subject: [PATCH] Update intrologin.py

---
 assets/root/intrologin.py | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/assets/root/intrologin.py b/assets/root/intrologin.py
index cede6527..a8cf80ab 100644
--- a/assets/root/intrologin.py
+++ b/assets/root/intrologin.py
@@ -245,13 +245,13 @@ class LoginWindow(ui.ScriptWindow):
 
 		print "---------------------------------------------------------------------------- CLOSE LOGIN WINDOW "
 		#
-		# selectMusicÀÌ ¾øÀ¸¸é BGMÀÌ ²÷±â¹Ç·Î µÎ°³ ´Ù üũÇÑ´Ù. 
+		# Check both since BGM stops if selectMusic is not set. 
 		#
 		if musicInfo.loginMusic != "" and musicInfo.selectMusic != "":
 			snd.FadeOutMusic("BGM/"+musicInfo.loginMusic)
 
-		## NOTE : idEditLine¿Í pwdEditLineÀº À̺¥Æ®°¡ ¼­·Î ¿¬°á µÇ¾îÀ־
-		##        Event¸¦ °­Á¦·Î ÃʱâÈ­ ÇØÁÖ¾î¾ß¸¸ ÇÕ´Ï´Ù - [levites]
+		## NOTE : idEditLine and pwdEditLine have interconnected events
+		##        Events must be forcibly initialized - [levites]
 		self.idEditLine.SetTabEvent(0)
 		self.idEditLine.SetReturnEvent(0)
 		self.pwdEditLine.SetReturnEvent(0)
@@ -382,7 +382,7 @@ class LoginWindow(ui.ScriptWindow):
 			loginFailureMsg = localeInfo.LOGIN_FAILURE_UNKNOWN  + error
 
 
-		#0000685: [M2EU] ¾ÆÀ̵ð/ºñ¹Ð¹øÈ£ À¯Ãß °¡´É ¹ö±× ¼öÁ¤: ¹«Á¶°Ç Æнº¿öµå·Î Æ÷Ä¿½º°¡ °¡°Ô ¸¸µç´Ù
+		#0000685: [M2EU] ID/password guessing bug fix: always set focus to password field
 		loginFailureFunc=self.loginFailureFuncDict.get(error, self.SetPasswordEditLineFocus)
 
 		if app.loggined:
@@ -579,18 +579,18 @@ class LoginWindow(ui.ScriptWindow):
 			execfile(loginInfoFileName, loginInfo)
 		except IOError:
 			print(\
-				"ÀÚµ¿ ·Î±×ÀÎÀ» ÇϽ÷Á¸é" + loginInfoFileName + "ÆÄÀÏÀ» ÀÛ¼ºÇØÁÖ¼¼¿ä\n"\
+				"For automatic login, please create" + loginInfoFileName + "file\n"\
 				"\n"\
-				"³»¿ë:\n"\
+				"Contents:\n"\
 				"================================================================\n"\
-				"addr=ÁÖ¼Ò\n"\
-				"port=Æ÷Æ®\n"\
-				"id=¾ÆÀ̵ð\n"\
-				"pwd=ºñ¹Ð¹øÈ£\n"\
-				"slot=ij¸¯ÅÍ ¼±Åà À妽º (¾ø°Å³ª -1À̸é ÀÚµ¿ ¼±Åà ¾ÈÇÔ)\n"\
-				"autoLogin=ÀÚµ¿ Á¢¼Ó ¿©ºÎ\n"
-				"autoSelect=ÀÚµ¿ Á¢¼Ó ¿©ºÎ\n"
-				"locale=(ymir) LC_Ymir ÀÏ°æ¿ì ymir·Î ÀÛµ¿. ÁöÁ¤ÇÏÁö ¾ÊÀ¸¸é korea·Î ÀÛµ¿\n"
+				"addr=address\n"\
+				"port=port number\n"\
+				"id=user ID\n"\
+				"pwd=password\n"\
+				"slot=character selection index (if absent or -1, no auto-selection)\n"\
+				"autoLogin=enable auto login\n"
+				"autoSelect=enable auto select\n"
+				"locale=(ymir) works as ymir for LC_Ymir. Works as korea if not specified\n"
 			);
 
 		id=loginInfo.get("id", "")
@@ -634,7 +634,7 @@ class LoginWindow(ui.ScriptWindow):
 			self.Connect(id, pwd)
 			
 			print "=================================================================================="
-			print "ÀÚµ¿ ·Î±×ÀÎ: %s - %s:%d %s" % (loginInfoFileName, addr, port, id)
+			print "Auto login: %s - %s:%d %s" % (loginInfoFileName, addr, port, id)
 			print "=================================================================================="
 
 		
@@ -718,7 +718,7 @@ class LoginWindow(ui.ScriptWindow):
 		if channelIndex >= 0:
 			self.channelList.SelectItem(channelIndex)
 
-		## Show/Hide Äڵ忡 ¹®Á¦°¡ À־ Àӽà - [levites]
+		## Temporary fix for Show/Hide code issue - [levites]
 		self.serverBoard.SetPosition(self.xServerBoard, self.yServerBoard)
 		self.serverBoard.Show()
 		self.connectBoard.Hide()
@@ -930,7 +930,6 @@ class LoginWindow(ui.ScriptWindow):
 			self.PopupNotifyMessage(localeInfo.CHANNEL_SELECT_CHANNEL)
 			return
 
-		# »óÅ°¡ FULL °ú °°À¸¸é ÁøÀÔ ±ÝÁö
 		if state == serverInfo.STATE_DICT[3]: 
 			self.PopupNotifyMessage(localeInfo.CHANNEL_NOTIFY_FULL)
 			return
@@ -953,7 +952,7 @@ class LoginWindow(ui.ScriptWindow):
 			tcp_port = serverInfo.REGION_DICT[regionID][serverID]["channel"][channelID]["tcp_port"]
 		except:
 			import exception
-			exception.Abort("LoginWindow.__OnClickSelectServerButton - ¼­¹ö ¼±Åà ½ÇÆÐ")
+			exception.Abort("LoginWindow.__OnClickSelectServerButton - server selection failed")
 
 		try:
 			account_ip = serverInfo.REGION_AUTH_SERVER_DICT[regionID][serverID]["ip"]
@@ -973,7 +972,7 @@ class LoginWindow(ui.ScriptWindow):
 
 		except:
 			import exception
-			exception.Abort("LoginWindow.__OnClickSelectServerButton - ¸¶Å© Á¤º¸ ¾øÀ½")
+			exception.Abort("LoginWindow.__OnClickSelectServerButton - mark information missing")
 			
 		self.stream.SetConnectInfo(ip, tcp_port, account_ip, account_port)
 		self.__OpenLoginBoard()