From 671a27e4a4f38406019b370cb9db87a1d9835a5a Mon Sep 17 00:00:00 2001
From: Exynox <exynox@old-metin2.com>
Date: Sat, 9 Dec 2023 20:46:45 +0200
Subject: [PATCH] Set default language to English, simplified serverinfo,
 updated gitignore

---
 bin/.gitignore              |  3 +++
 bin/locale.2cfg             |  1 -
 bin/locale_ro.cfg           |  1 +
 bin/pack/root/serverinfo.py | 35 ++++++++++++-----------------------
 4 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 bin/locale.2cfg
 create mode 100644 bin/locale_ro.cfg

diff --git a/bin/.gitignore b/bin/.gitignore
index 05b275ae..12acc70c 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -14,5 +14,8 @@ syserr.txt
 pack/*.eix
 pack/*.epk
 
+# Guild images
+mark/
+
 # Screenshots
 screenshot/
diff --git a/bin/locale.2cfg b/bin/locale.2cfg
deleted file mode 100644
index 0722646d..00000000
--- a/bin/locale.2cfg
+++ /dev/null
@@ -1 +0,0 @@
-10002 1252 en
diff --git a/bin/locale_ro.cfg b/bin/locale_ro.cfg
new file mode 100644
index 00000000..1033fef5
--- /dev/null
+++ b/bin/locale_ro.cfg
@@ -0,0 +1 @@
+10022 1250 ro
diff --git a/bin/pack/root/serverinfo.py b/bin/pack/root/serverinfo.py
index b585ab55..11c64106 100644
--- a/bin/pack/root/serverinfo.py
+++ b/bin/pack/root/serverinfo.py
@@ -1,7 +1,5 @@
 SERVER_NAME			= "Metin2"
-SERVER_NAME_TEST	= "Test"
-SERVER_IP			= "192.168.0.150"
-SERVER_IP_TEST		= "172.26.105.128"
+SERVER_IP			= "127.0.0.1"
 CH1_NAME			= "CH1"
 CH2_NAME			= "CH2"
 CH3_NAME			= "CH3"
@@ -23,37 +21,28 @@ STATE_DICT = {
 }
 
 SERVER01_CHANNEL_DICT = {
-	1:{"key":11,"name":CH1_NAME,"ip":SERVER_IP,"tcp_port":PORT_1,"udp_port":PORT_1,"state":STATE_NONE,},
-	2:{"key":12,"name":CH2_NAME,"ip":SERVER_IP,"tcp_port":PORT_2,"udp_port":PORT_2,"state":STATE_NONE,},
-	3:{"key":13,"name":CH3_NAME,"ip":SERVER_IP,"tcp_port":PORT_3,"udp_port":PORT_3,"state":STATE_NONE,},
-	4:{"key":14,"name":CH4_NAME,"ip":SERVER_IP,"tcp_port":PORT_4,"udp_port":PORT_4,"state":STATE_NONE,},
-}
-
-SERVER02_CHANNEL_DICT = {
-	1:{"key":21,"name":CH1_NAME,"ip":SERVER_IP_TEST,"tcp_port":PORT_1,"udp_port":PORT_1,"state":STATE_NONE,},
-	2:{"key":22,"name":CH2_NAME,"ip":SERVER_IP_TEST,"tcp_port":PORT_2,"udp_port":PORT_2,"state":STATE_NONE,},
+	1: {"key": 11, "name": CH1_NAME, "ip": SERVER_IP, "tcp_port": PORT_1, "udp_port": PORT_1, "state": STATE_NONE},
+	2: {"key": 12, "name": CH2_NAME, "ip": SERVER_IP, "tcp_port": PORT_2, "udp_port": PORT_2, "state": STATE_NONE},
+	3: {"key": 13, "name": CH3_NAME, "ip": SERVER_IP, "tcp_port": PORT_3, "udp_port": PORT_3, "state": STATE_NONE},
+	4: {"key": 14, "name": CH4_NAME, "ip": SERVER_IP, "tcp_port": PORT_4, "udp_port": PORT_4, "state": STATE_NONE},
 }
 
 REGION_NAME_DICT = {
-	0 : "",		
+	0: "",
 }
 
 REGION_AUTH_SERVER_DICT = {
-	0 : {
-		1 : { "ip":SERVER_IP, "port":PORT_AUTH, },
-		2 : { "ip":SERVER_IP_TEST, "port":PORT_AUTH, },
-
-	}		
+	0: {
+		1: {"ip": SERVER_IP, "port": PORT_AUTH},
+	}
 }
 
 REGION_DICT = {
-	0 : {
-		1 : { "name" :SERVER_NAME, "channel" : SERVER01_CHANNEL_DICT, },						
-		2 : { "name" :SERVER_NAME_TEST, "channel" : SERVER02_CHANNEL_DICT, },						
+	0: {
+		1: {"name": SERVER_NAME, "channel": SERVER01_CHANNEL_DICT},
 	},
 }
 
 MARKADDR_DICT = {
-	10 : { "ip" : SERVER_IP, "tcp_port" : PORT_MARK, "mark" : "10.tga", "symbol_path" : "10", },
-	20 : { "ip" : SERVER_IP_TEST, "tcp_port" : PORT_MARK, "mark" : "20.tga", "symbol_path" : "20", },
+	10: {"ip": SERVER_IP, "tcp_port": PORT_MARK, "mark": "10.tga", "symbol_path": "10"},
 }
\ No newline at end of file