Minor translation fixes, added all map translationsfor party updates, translated all mob names for Flame and Snow dungeon to all locales, fixed realtime countdowns and tooltip element centering, applied use of toolTip for affect icons

2026-02-09 04:08:53 +02:00
parent 659e0e2dde
commit 90c18b81b7
40 changed files with 1977 additions and 109 deletions
--- a/assets/locale/locale/ae/locale_game.txt
+++ b/assets/locale/locale/ae/locale_game.txt
@@ -261,6 +261,13 @@ GUILD_TILE_GRADE	إدارة الحقوق
 GUILD_TILE_INFO	معلومات الرابطة
 GUILD_TILE_MEMBER	الأعضاء
 GUILD_TILE_SKILL	مهارات الروابط
+GUILD_VILLAGE_01	ميريانغ
+GUILD_VILLAGE_02	سونغبا
+GUILD_VILLAGE_03	دايامي
+GUILD_WAR1	منطقة حرب الرابطة
+GUILD_WAR2	منطقة حرب الرابطة
+GUILD_WAR3	منطقة حرب الرابطة
+GUILD_WAR4	منطقة حرب الرابطة
 GUILD_WAR_LIMIT_30MIN	الوقت: 30 دقيقة
 GUILD_WAR_REWARD_POTION	مكافأة: سيحصل الفائز على جرع
 GUILD_WAR_USE_BATTLE_MAP	المكان: ساحة الحرب للرابطة
@@ -330,26 +337,77 @@ MALL_PASSWORD_TITLE	كلمة السّر
 MAP_A1	منطقة يونغان
 MAP_A2	وادي سوينغريونغ
 MAP_A2_1	
+MAP_A2_1	
 MAP_A3	منطقة يايانغ
 MAP_AG	جونغرانغ
 MAP_B1	منطقة جوان
 MAP_B2	وادي إمجي
 MAP_B3	إقليم بوكيونغ
+MAP_BATTLE_FIELD	منطقة المعركة
 MAP_BAY	خليج نيفريت
+MAP_BAYBLACKSAND	خليج نيفريت
 MAP_BG	واريونغ
 MAP_C1	منطقة بيونغمو
 MAP_C2	وادي بانغسان
 MAP_C3	منطقة باكرا
 MAP_CAPE	رأس نار التنين
+MAP_CAPEDRAGONHEAD	رأس نار التنين
 MAP_CG	إمها
+MAP_CZ_DUNGEON	معبد زودياك
 MAP_DAWN	جرف غواتاما
+MAP_DAWNMISTWOOD	جرف غواتاما
+MAP_DAWNMIST_DUNGEON_01	غابة مسحورة
 MAP_DESERT	صحراء يونغبي
+MAP_DEVILCATACOMB	سرداب الموت
+MAP_DEVILTOWER1	برج الشياطين
+MAP_DUEL	ساحة تداريب القتال
+MAP_E	منطقة الليكانر
+MAP_EMPIREWAR01	معركة الحصن
+MAP_EMPIREWAR02	معركة الحصن
+MAP_EMPIREWAR03	معركة الحصن
 MAP_FLAME	دويومهوان
 MAP_MILGYO_A	
+MAP_GUILD_01	جونغرانغ
+MAP_GUILD_02	واريونغ
+MAP_GUILD_03	إمها
+MAP_HOLYPLACE_DESERT	معركة الإمبراطورية-أرض الصحراء
+MAP_HOLYPLACE_FLAME	معركة الإمبراطورية-أرض النار
+MAP_HOLYPLACE_ICE	معركة الإمبراطورية الأرض الجليدية
+MAP_MILGYO	معبد هوانغ
+MAP_MILGYO_A	
+MAP_MONKEY_DUNGEON	هاسون دونغ
+MAP_MONKEY_DUNGEON2	جانغسون دونغ
+MAP_MONKEY_DUNGEON3	سانغسون دونغ
+MAP_MONKEY_DUNGEON_11	هاسون دونغ
+MAP_MONKEY_DUNGEON_12	هاسون دونغ
+MAP_MONKEY_DUNGEON_13	هاسون دونغ
+MAP_MT_THUNDER	جبال الرعد
+MAP_MT_TH_DUNGEON_01	معبد الآشاو
 MAP_NUSLUCK	أرض العمالقة
 MAP_N_DESERT_02	
 MAP_N_FLAME_02	
 MAP_N_SNOWM_02	
+MAP_NUSLUCK01	أرض العمالقة
+MAP_N_DESERT_01	صحراء يونغبي
+MAP_N_DESERT_02	
+MAP_N_FLAME_01	أرض النار
+MAP_N_FLAME_02	
+MAP_N_FLAME_DRAGON	كهف ميلي
+MAP_N_FLAME_DUNGEON_01	قلعة التنين الأحمر
+MAP_N_SNOWM_01	جبل سوهان
+MAP_N_SNOWM_02	
+MAP_N_SNOW_DUNGEON_01	بُرج النمير
+MAP_N_THREEWAY	وادي سوينغريونغ
+MAP_OXEVENT	مسابقة OX
+MAP_PATHWAY_DESERT_01	معركة الإمبراطورية-أرض الصحراء
+MAP_PATHWAY_DESERT_02	معركة الإمبراطورية-أرض الصحراء
+MAP_PATHWAY_DESERT_03	معركة الإمبراطورية-أرض الصحراء
+MAP_PATHWAY_FLAME_01	معركة الإمبراطورية-أرض النار
+MAP_PATHWAY_FLAME_02	معركة الإمبراطورية-أرض النار
+MAP_PATHWAY_FLAME_03	معركة الإمبراطورية-أرض النار
+MAP_PATHWAY_ICE_01	معركة الإمبراطورية-الأرض الجليدية
+MAP_PATHWAY_ICE_02	ساحة اللعب
+MAP_PATHWAY_ICE_03	معركة الإمبراطورية-الأرض الجليدية
 MAP_SKELTOWER	برج غومسان
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
@@ -357,13 +415,51 @@ MAP_SKIPIA_DUNGEON_013
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_01	كهف اللعنة
+MAP_SKIPIA_DUNGEON_011	
+MAP_SKIPIA_DUNGEON_012	
+MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	كهف اللعنة 2
+MAP_SKIPIA_DUNGEON_021	
+MAP_SKIPIA_DUNGEON_022	
+MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS	معبد التنين
+MAP_SKIPIA_DUNGEON_BOSS_1	برج العناكب المحصن 1
+MAP_SKIPIA_DUNGEON_BOSS_2	برج العناكب المحصن 2
+MAP_SKIPIA_DUNGEON_BOSS_3	برج العناكب المحصن 3
 MAP_SNOW	جبل سوهان
 MAP_SPIDER	كواهلو دونغ
+MAP_SPIDERDUNGEON	برج العناكب المحصن 1
+MAP_SPIDERDUNGEON_02	برج العناكب المحصن 2
+MAP_SPIDERDUNGEON_02_1	برج العناكب المحصن 2
+MAP_SPIDERDUNGEON_03	برج العناكب المحصن 3
+MAP_SUNGZI	معركة الإمبراطورية
+MAP_SUNGZI_DESERT_01	معركة الإمبراطورية-أرض الصحراء
+MAP_SUNGZI_DESERT_HILL_01	معركة الإمبراطورية-أرض الصحراء
+MAP_SUNGZI_DESERT_HILL_02	معركة الإمبراطورية-أرض الصحراء
+MAP_SUNGZI_DESERT_HILL_03	معركة الإمبراطورية-أرض الصحراء
+MAP_SUNGZI_FLAME_HILL_01	معركة الإمبراطورية-أرض النار
+MAP_SUNGZI_FLAME_HILL_02	معركة الإمبراطورية-أرض النار
+MAP_SUNGZI_FLAME_HILL_03	معركة الإمبراطورية-أرض النار
+MAP_SUNGZI_SNOW	معركة الإمبراطورية-الأرض الجليدية
+MAP_SUNGZI_SNOW_PASS01	معركة الإمبراطورية-الأرض الجليدية
+MAP_SUNGZI_SNOW_PASS02	معركة الإمبراطورية-الأرض الجليدية
+MAP_SUNGZI_SNOW_PASS03	معركة الإمبراطورية-الأرض الجليدية
+MAP_T1	منطقة حرب الرابطة
+MAP_T2	منطقة حرب الرابطة
+MAP_T3	منطقة حرب الرابطة
+MAP_T4	منطقة حرب الرابطة
 MAP_TEMPLE	معبد هوانغ
 MAP_THUNDER	جبال الرعد
 MAP_TREE	لونغسام (غابة الأشباح)
 MAP_TRENT_A	
+MAP_TRENT	غابة الأشباح
+MAP_TRENT02	الغابة الحمراء
+MAP_TRENT02_A	الغابة الحمراء
+MAP_TRENT_A	
+MAP_WEDDING_01	خريطة الزواج
 MAP_WL	ميدان الأفاعي
+MAP_WL_01	ميدان الأفاعي
 MESSENGER_ADD_FRIEND	إضافة صديق
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	لقد اتخذك %s صديقاً له.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	موافق؟
--- a/assets/locale/locale/ae/ui/characterwindow.py
+++ b/assets/locale/locale/ae/ui/characterwindow.py
@@ -230,7 +230,7 @@ window = {
 								{
 									"name" : "Guild_Name",
 									"type":"text",
-									"text":"길드 이름",
+									"text":"길드 이름",
 									"x":0,
 									"y":0,
 									"r":1.0,
@@ -255,7 +255,7 @@ window = {
 								{
 									"name" : "Character_Name",
 									"type":"text",
-									"text":"캐릭터 이름",
+									"text":"캐릭터 이름",
 									"x":0,
 									"y":0,
 									"r":1.0,
@@ -307,16 +307,16 @@ window = {
 						{ "name" : "Face_Image", "type" : "image", "x" : 11, "y" : 11, "image" : "d:/ymir work/ui/game/windows/face_warrior.sub" },
 						{ "name" : "Face_Slot", "type" : "image", "x" : 7, "y" : 7, "image" : FACE_SLOT_FILE, },

-						## 기본 능력
+						## 기본 능력
 						{
 							"name":"Status_Standard", "type":"window", "x":3, "y":100, "width":200, "height":250,
 							"children" :
 							(
-								## 기본 능력 제목
+								## 기본 능력 제목
 								{ "name":"Character_Bar_01", "type":"horizontalbar", "x":12, "y":8, "width":223, },
 								{ "name":"Character_Bar_01_Text", "type" : "image", "x" : 13, "y" : 9, "image" : LOCALE_PATH+"label_std.sub", },
 								
-								## 능력 수련 수치
+								## 능력 수련 수치
 								{ 
 									"name":"Status_Plus_Label", 
 									"type":"image", 
@@ -329,7 +329,7 @@ window = {
 									),
 								},

-								## 기본 능력 아이템 리스트
+								## 기본 능력 아이템 리스트
 								{"name":"Status_Standard_ItemList1", "type" : "image", "x":17, "y":31, "image" : LOCALE_PATH+"label_std_item1.sub", },
 								{"name":"Status_Standard_ItemList2", "type" : "image", "x":100, "y":30, "image" : LOCALE_PATH+"label_std_item2.sub", },

@@ -420,21 +420,21 @@ window = {
 							),
 						},
 						
-						## 부가 능력
+						## 부가 능력
 						{ 
 							"name":"Status_Extent", "type":"window", "x":3, "y":221, "width":200, "height":50, 
 							"children" :
 							(

-								## 부가 능력 제목
+								## 부가 능력 제목
 								{ "name":"Status_Extent_Bar", "type":"horizontalbar", "x":12, "y":6, "width":223, },
 								{ "name":"Status_Extent_Label", "type" : "image", "x" : 13, "y" : 8, "image" : LOCALE_PATH+"label_ext.sub", },

-								## 기본 능력 아이템 리스트
+								## 기본 능력 아이템 리스트
 								{"name":"Status_Extent_ItemList1", "type" : "image", "x":11, "y":31, "image" : LOCALE_PATH+"label_ext_item1.sub", },
 								{"name":"Status_Extent_ItemList2", "type" : "image", "x":128, "y":32, "image" : LOCALE_PATH+"label_ext_item2.sub", },

-								## MSPD - 이동 속도
+								## MSPD - 이동 속도
 								{
 									"name":"MOV_Label", "type":"window", "x":66, "y":33, "width":50, "height":20, 
 									"children" :
@@ -444,7 +444,7 @@ window = {
 									)
 								},

-								## ASPD - 공격 속도
+								## ASPD - 공격 속도
 								{
 									"name":"ASPD_Label", "type":"window", "x":66, "y":33+23, "width":50, "height":20, 
 									"children" :
@@ -454,7 +454,7 @@ window = {
 									)
 								},

-								## CSPD - 주문 속도
+								## CSPD - 주문 속도
 								{
 									"name":"CSPD_Label", "type":"window", "x":66, "y":33+23*2, "width":50, "height":20, 
 									"children" :
@@ -464,7 +464,7 @@ window = {
 									)
 								},

-								## MATT - 마법 공격력
+								## MATT - 마법 공격력
 								{
 									"name":"MATT_Label", "type":"window", "x":183, "y":33, "width":50, "height":20, 
 									"children" :
@@ -474,7 +474,7 @@ window = {
 									)
 								},

-								## MDEF - 마법 방어력
+								## MDEF - 마법 방어력
 								{
 									"name":"MDEF_Label", "type":"window", "x":183, "y":33+23, "width":50, "height":20, 
 									"children" :
@@ -484,7 +484,7 @@ window = {
 									)
 								},

-								## 회피율
+								## 회피율
 								{
 									"name":"ER_Label", "type":"window", "x":183, "y":33+23*2, "width":50, "height":20, 
 									"children" :
@@ -697,7 +697,7 @@ window = {

 					"children" :
 					(
-						## 기본 액션 제목
+						## 기본 액션 제목
 						{ "name":"Action_Bar", "type":"horizontalbar", "x":12, "y":11, "width":223, },
 						{ "name":"Action_Bar_Text", "type":"text", "x":15, "y":13, "text":uiScriptLocale.CHARACTER_NORMAL_ACTION },

@@ -717,7 +717,7 @@ window = {
 							"image" : ICON_SLOT_FILE,
 						},

-						## 상호 액션 제목
+						## 상호 액션 제목
 						{ "name":"Reaction_Bar", "type":"horizontalbar", "x":12, "y":8+150, "width":223, },
 						{ "name":"Reaction_Bar_Text", "type":"text", "x":15, "y":10+150, "text":uiScriptLocale.CHARACTER_MUTUAL_ACTION },

@@ -775,25 +775,25 @@ window = {
 							"horizontal_align" : "right",
 						},

-						{ "name" : "Quest_Name_00", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 14 },
-						{ "name" : "Quest_LastTime_00", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 30 },
-						{ "name" : "Quest_LastCount_00", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 46 },
+						{ "name" : "Quest_Name_00", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 14 },
+						{ "name" : "Quest_LastTime_00", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 30 },
+						{ "name" : "Quest_LastCount_00", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 46 },

-						{ "name" : "Quest_Name_01", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 74 },
-						{ "name" : "Quest_LastTime_01", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 90 },
-						{ "name" : "Quest_LastCount_01", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 106 },
+						{ "name" : "Quest_Name_01", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 74 },
+						{ "name" : "Quest_LastTime_01", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 90 },
+						{ "name" : "Quest_LastCount_01", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 106 },

-						{ "name" : "Quest_Name_02", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 134 },
-						{ "name" : "Quest_LastTime_02", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 150 },
-						{ "name" : "Quest_LastCount_02", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 166 },
+						{ "name" : "Quest_Name_02", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 134 },
+						{ "name" : "Quest_LastTime_02", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 150 },
+						{ "name" : "Quest_LastCount_02", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 166 },

-						{ "name" : "Quest_Name_03", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 194 },
-						{ "name" : "Quest_LastTime_03", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 210 },
-						{ "name" : "Quest_LastCount_03", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 226 },
+						{ "name" : "Quest_Name_03", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 194 },
+						{ "name" : "Quest_LastTime_03", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 210 },
+						{ "name" : "Quest_LastCount_03", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 226 },

-						{ "name" : "Quest_Name_04", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 254 },
-						{ "name" : "Quest_LastTime_04", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 270 },
-						{ "name" : "Quest_LastCount_04", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 286 },
+						{ "name" : "Quest_Name_04", "type" : "text", "text" : "이름입니다", "x" : 60, "y" : 254 },
+						{ "name" : "Quest_LastTime_04", "type" : "text", "text" : "남은 시간 입니다", "x" : 60, "y" : 270 },
+						{ "name" : "Quest_LastCount_04", "type" : "text", "text" : "남은 개수 입니다", "x" : 60, "y" : 286 },

 					),
 				},
--- a/assets/locale/locale/ae/ui/energybar.py
+++ b/assets/locale/locale/ae/ui/energybar.py
@@ -14,7 +14,7 @@ window = {

 	"children" :
 	(
-		# ±â·?
+		# ±â·?
 		{
 			"name" : "EnergyGauge_Board",
 			"type" : "image",
--- a/assets/locale/locale/ae/ui/inventorywindow.py
+++ b/assets/locale/locale/ae/ui/inventorywindow.py
@@ -6,7 +6,7 @@ EQUIPMENT_START_INDEX = 90
 window = {
 	"name" : "InventoryWindow",

-	## 600 - (width + 오른쪽으로 부터 띄우기 24 px)
+	## 600 - (width + 오른쪽으로 부터 띄우기 24 px)
 	"x" : SCREEN_WIDTH - 176,
 	"y" : SCREEN_HEIGHT - 37 - 565,

@@ -85,11 +85,11 @@ window = {
 										{"index":EQUIPMENT_START_INDEX+8, "x":75, "y":145, "width":32, "height":32},
 										{"index":EQUIPMENT_START_INDEX+9, "x":114, "y":2, "width":32, "height":32},
 										{"index":EQUIPMENT_START_INDEX+10, "x":75, "y":35, "width":32, "height":32},
-										## 새 반지1
+										## 새 반지1
 										# {"index":item.EQUIPMENT_RING1, "x":2, "y":106, "width":32, "height":32},
-										## 새 반지2
+										## 새 반지2
 										# {"index":item.EQUIPMENT_RING2, "x":75, "y":106, "width":32, "height":32},
-										## 새 벨트
+										## 새 벨트
 										{"index":item.EQUIPMENT_BELT, "x":39, "y":106, "width":32, "height":32},
 									),
 						},
--- a/assets/locale/locale/ae/ui/taskbar.py
+++ b/assets/locale/locale/ae/ui/taskbar.py
@@ -107,7 +107,7 @@ window = {
 					)
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "HPGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -153,7 +153,7 @@ window = {
 					),
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "SPGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -199,7 +199,7 @@ window = {
 					),
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "STGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -380,8 +380,8 @@ window = {
 			"children" :
 			(
 				{
-					# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
-					# ExpandButton으로 바뀐 것이다.
+					# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
+					# ExpandButton으로 바뀐 것이다.
 					"name" : "ExpandButton",
 					"type" : "button",

--- a/assets/locale/locale/ae/ui/taskbar_easter.py
+++ b/assets/locale/locale/ae/ui/taskbar_easter.py
@@ -95,7 +95,7 @@ window = {
 					)
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "HPGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -141,7 +141,7 @@ window = {
 					),
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "SPGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -187,7 +187,7 @@ window = {
 					),
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "STGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -368,8 +368,8 @@ window = {
 			"children" :
 			(
 				{
-					# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
-					# ExpandButton으로 바뀐 것이다.
+					# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
+					# ExpandButton으로 바뀐 것이다.
 					"name" : "ExpandButton",
 					"type" : "button",

--- a/assets/locale/locale/ae/ui/taskbar_haloween.py
+++ b/assets/locale/locale/ae/ui/taskbar_haloween.py
@@ -107,7 +107,7 @@ window = {
 					)
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "HPGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -153,7 +153,7 @@ window = {
 					),
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "SPGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -199,7 +199,7 @@ window = {
 					),
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "STGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -380,8 +380,8 @@ window = {
 			"children" :
 			(
 				{
-					# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
-					# ExpandButton으로 바뀐 것이다.
+					# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
+					# ExpandButton으로 바뀐 것이다.
 					"name" : "ExpandButton",
 					"type" : "button",

--- a/assets/locale/locale/ae/ui/taskbar_valentine.py
+++ b/assets/locale/locale/ae/ui/taskbar_valentine.py
@@ -107,7 +107,7 @@ window = {
 					)
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "HPGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -153,7 +153,7 @@ window = {
 					),
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "SPGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -199,7 +199,7 @@ window = {
 					),
 				},
 				{
-					## 툴팁을 띄우기 위한 윈도우
+					## 툴팁을 띄우기 위한 윈도우
 					"name" : "STGauge_Board",
 					"type" : "window",
 					"style" : ("ltr", ),
@@ -380,8 +380,8 @@ window = {
 			"children" :
 			(
 				{
-					# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
-					# ExpandButton으로 바뀐 것이다.
+					# ExpandButton은 기존에 ChatButton이었으나, ChatButton의 효용성이 적다 판단하여
+					# ExpandButton으로 바뀐 것이다.
 					"name" : "ExpandButton",
 					"type" : "button",

--- a/assets/locale/locale/br/locale_game.txt
+++ b/assets/locale/locale/br/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Títulos e Permissões
 GUILD_TILE_INFO	Informações da Guilda
 GUILD_TILE_MEMBER	Membros da Guilda
 GUILD_TILE_SKILL	Skills da Guilda
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Área de Guerras de Guilds
+GUILD_WAR2	Área de Guerras de Guilds
+GUILD_WAR3	Área de Guerras de Guilds
+GUILD_WAR4	Área de Guerras de Guilds
 GUILD_WAR_LIMIT_30MIN	Tempo: 30 minutos	
 GUILD_WAR_REWARD_POTION	Recompensa: o vencedor recebe poções.	
 GUILD_WAR_USE_BATTLE_MAP	Ocorre na Arena de Guerra.
@@ -249,35 +256,112 @@ MAP_AG	Forte Jurang
 MAP_B1	Centro Chonjoyon
 MAP_B2	Vale de Fugus
 MAP_B3	Vila Bokujong
+MAP_BATTLE_FIELD	Zona de Combate
 MAP_BAY	Enseada de Jades
+MAP_BAYBLACKSAND	Baía de Nephrite
 MAP_BG	Forte Waryon
 MAP_C1	Centro Jinnoyon
 MAP_C2	Montanha Cenran
 MAP_C3	Vila Bakura
 MAP_CAPE	Península do Dragão
+MAP_CAPEDRAGONHEAD	Cabo Fogo de Dragão
 MAP_CG	Forte Imura
+MAP_CZ_DUNGEON	Templo do Zodíaco
 MAP_DAWN	Penhasco da Alvorada
+MAP_DAWNMISTWOOD	Falésia de Gautama
+MAP_DAWNMIST_DUNGEON_01	Floresta Encantada
 MAP_DESERT	Deserto Yonbi
+MAP_DEVILCATACOMB	Catacumbas do Demónio
+MAP_DEVILTOWER1	Torre Demoníaca
+MAP_DUEL	Arena de Lutas de Treino
+MAP_E	Colónia
+MAP_EMPIREWAR01	Batalha do Castelo
+MAP_EMPIREWAR02	Batalha do Castelo
+MAP_EMPIREWAR03	Batalha do Castelo
 MAP_FLAME	Campo Doyama
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	Guerra dos Reinos - Terra do Deserto
+MAP_HOLYPLACE_FLAME	Guerra dos Reinos - Terra do Fogo
+MAP_HOLYPLACE_ICE	Guerra dos Reinos - Terra do Gelo
+MAP_MILGYO	Templo Hwang
 MAP_MILGYO_A	Templo Miokio
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MT_THUNDER	Montanhas do Trovão
+MAP_MT_TH_DUNGEON_01	Templo dos Ochao
 MAP_NUSLUCK	Sawang
+MAP_NUSLUCK01	Terra dos Gigantes
+MAP_N_DESERT_01	Deserto Yongbi
 MAP_N_DESERT_02	Deserto de Yongbi
+MAP_N_FLAME_01	Terra do Fogo
 MAP_N_FLAME_02	Campo Doyama
+MAP_N_FLAME_DRAGON	Covil de Meley
+MAP_N_FLAME_DUNGEON_01	Forte do Dragão Vermelho
+MAP_N_SNOWM_01	Montanha Sohan
 MAP_N_SNOWM_02	Montanha Sohan
+MAP_N_SNOW_DUNGEON_01	Torre de Vigia de Nemere
+MAP_N_THREEWAY	Vale Seungryong
+MAP_OXEVENT	Concurso OX
+MAP_PATHWAY_DESERT_01	Guerra dos Reinos - Terra do Deserto
+MAP_PATHWAY_DESERT_02	Guerra dos Reinos - Terra do Deserto
+MAP_PATHWAY_DESERT_03	Guerra dos Reinos - Terra do Deserto
+MAP_PATHWAY_FLAME_01	Guerra dos Reinos - Terra do Fogo
+MAP_PATHWAY_FLAME_02	Guerra dos Reinos - Terra do Fogo
+MAP_PATHWAY_FLAME_03	Guerra dos Reinos - Terra do Fogo
+MAP_PATHWAY_ICE_01	Guerra dos Reinos - Terra do Gelo
+MAP_PATHWAY_ICE_02	Terra do Jogo
+MAP_PATHWAY_ICE_03	Guerra dos Reinos - Terra do Gelo
 MAP_SKELTOWER	Torre Demoníaca
+MAP_SKIPIA_DUNGEON_01	Gruta das Almas
 MAP_SKIPIA_DUNGEON_011	Gruta Chun1(Shinso)
 MAP_SKIPIA_DUNGEON_012	Gruta Chun1(Chunjo)
 MAP_SKIPIA_DUNGEON_013	Gruta Chun1(Jinno)
+MAP_SKIPIA_DUNGEON_02	Gruta das Almas
 MAP_SKIPIA_DUNGEON_021	Gruta Chun2(Shinso)
 MAP_SKIPIA_DUNGEON_022	Gruta Chun2(Chunjo)
 MAP_SKIPIA_DUNGEON_023	Gruta Chun2(Jinno)
+MAP_SKIPIA_DUNGEON_BOSS	Templo do Dragão
+MAP_SKIPIA_DUNGEON_BOSS_1	Caverna das Aranhas 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Caverna das Aranhas 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Caverna das Aranhas 3
 MAP_SNOW	Montanha Sohan
 MAP_SPIDER	Caverna Sombria
+MAP_SPIDERDUNGEON	Caverna das Aranhas 1
+MAP_SPIDERDUNGEON_02	Caverna das Aranhas 2
+MAP_SPIDERDUNGEON_02_1	Caverna das Aranhas 2
+MAP_SPIDERDUNGEON_03	Caverna das Aranhas 3
+MAP_SUNGZI	Guerra dos Reinos
+MAP_SUNGZI_DESERT_01	Guerra dos Reinos - Terra do Deserto
+MAP_SUNGZI_DESERT_HILL_01	Guerra dos Reinos - Terra do Deserto
+MAP_SUNGZI_DESERT_HILL_02	Guerra dos Reinos - Terra do Deserto
+MAP_SUNGZI_DESERT_HILL_03	Guerra dos Reinos - Terra do Deserto
+MAP_SUNGZI_FLAME_HILL_01	Guerra dos Reinos - Terra do Fogo
+MAP_SUNGZI_FLAME_HILL_02	Guerra dos Reinos - Terra do Fogo
+MAP_SUNGZI_FLAME_HILL_03	Guerra dos Reinos - Terra do Fogo
+MAP_SUNGZI_SNOW	Guerra dos Reinos - Terra do Gelo
+MAP_SUNGZI_SNOW_PASS01	Guerra dos Reinos - Terra do Gelo
+MAP_SUNGZI_SNOW_PASS02	Guerra dos Reinos - Terra do Gelo
+MAP_SUNGZI_SNOW_PASS03	Guerra dos Reinos - Terra do Gelo
+MAP_T1	Área de Guerras de Guilds
+MAP_T2	Área de Guerras de Guilds
+MAP_T3	Área de Guerras de Guilds
+MAP_T4	Área de Guerras de Guilds
 MAP_TEMPLE	Templo Miokio
 MAP_THUNDER	Montanhas Trovão
 MAP_TREE	Floresta Gwimok
+MAP_TRENT	Floresta Fantasma
+MAP_TRENT02	Bosque Rubro
+MAP_TRENT02_A	Bosque Rubro
 MAP_TRENT_A	Floresta Gwimok
+MAP_WEDDING_01	Mapa de Casamento
 MAP_WL	Deserto Sawan
+MAP_WL_01	Planície Seca
 MESSENGER_ADD_FRIEND	Adicionar contato
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s quer adicionar você como contato	
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Você aceita?	
--- a/assets/locale/locale/cz/locale_game.txt
+++ b/assets/locale/locale/cz/locale_game.txt
@@ -179,6 +179,13 @@ GUILD_TILE_INFO	Informace o cechu
 GUILD_TILE_MEMBER	Členové cechu
 GUILD_TILE_SKILL	Schopnosti  cechu
 GUILD_WAR_LIMIT_30MIN	Čas: 30 minut
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Oblast cechovních válek
+GUILD_WAR2	Oblast cechovních válek
+GUILD_WAR3	Oblast cechovních válek
+GUILD_WAR4	Oblast cechovních válek
 GUILD_WAR_REWARD_POTION	Odměna: Vítěz obdrží elixíry
 GUILD_WAR_USE_BATTLE_MAP	Lokalita: dějiště cechovní války
 GUILD_WAR_USE_NORMAL_MAP	Lokalita: normální mapa
@@ -250,35 +257,112 @@ MAP_B1	Oblast Joan
 MAP_B2	Údolí Imjů
 MAP_B3	Oblast Bokjung
 MAP_BAY	Nefritový záliv
+MAP_BATTLE_FIELD	Bitevní zóna
 MAP_BG	Waryong
+MAP_BAYBLACKSAND	Nefritový záliv
 MAP_C1	Oblast Pyungmoo
 MAP_C2	Údolí Bangsanů
 MAP_C3	Oblast Bakra
 MAP_CAPE	Záliv dračího ohně
 MAP_CG	Imha
+MAP_CAPEDRAGONHEAD	Záliv dračího ohně
 MAP_DAWN	Útes Gautama
+MAP_CZ_DUNGEON	Chrám Zvěrokruhu
 MAP_DESERT	Poušť Yongbi
+MAP_DAWNMISTWOOD	Útes Gautama
+MAP_DAWNMIST_DUNGEON_01	Zakletý les
 MAP_FLAME	Doyyumhwan
+MAP_DEVILCATACOMB	Ďáblova katakomba
+MAP_DEVILTOWER1	Věž démonů
+MAP_DUEL	Oblast tréninkových bojů
+MAP_E	Kolonie
+MAP_EMPIREWAR01	Bitva na hradě
+MAP_EMPIREWAR02	Bitva na hradě
+MAP_EMPIREWAR03	Bitva na hradě
 MAP_MILGYO_A	
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	Bitva království - Pouštní země
+MAP_HOLYPLACE_FLAME	Bitva království - Ohnivá země
+MAP_HOLYPLACE_ICE	Bitva království - Ledová země
+MAP_MILGYO	Chrám Hwang
 MAP_NUSLUCK	Země obrů
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MT_THUNDER	Bouřné hory
+MAP_MT_TH_DUNGEON_01	Chrám Ochao
 MAP_N_DESERT_02	
+MAP_NUSLUCK01	Země obrů
+MAP_N_DESERT_01	Poušť Yongbi
 MAP_N_FLAME_02	
+MAP_N_FLAME_01	Ohnivá země
 MAP_N_SNOWM_02	
+MAP_N_FLAME_DRAGON	Doupě Meley
+MAP_N_FLAME_DUNGEON_01	Pevnost Červeného draka
+MAP_N_SNOWM_01	Hora Sohan
 MAP_SKELTOWER	Věž Gumsan
+MAP_N_SNOW_DUNGEON_01	Nemerova strážní věž
+MAP_N_THREEWAY	Údolí Seungryong
+MAP_OXEVENT	Soutež OX
+MAP_PATHWAY_DESERT_01	Bitva království - Pouštní země
+MAP_PATHWAY_DESERT_02	Bitva království - Pouštní země
+MAP_PATHWAY_DESERT_03	Bitva království - Pouštní země
+MAP_PATHWAY_FLAME_01	Bitva království - Ohnivá země
+MAP_PATHWAY_FLAME_02	Bitva království - Ohnivá země
+MAP_PATHWAY_FLAME_03	Bitva království - Ohnivá země
+MAP_PATHWAY_ICE_01	Bitva království - Ledová země
+MAP_PATHWAY_ICE_02	Země her
+MAP_PATHWAY_ICE_03	Bitva království - Ledová země
 MAP_SKIPIA_DUNGEON_011	
+MAP_SKIPIA_DUNGEON_01	Jeskyně vyhnanství
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
 MAP_SKIPIA_DUNGEON_021	
+MAP_SKIPIA_DUNGEON_02	Jeskyně vyhnanství 2
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
 MAP_SNOW	Hora Sohan
+MAP_SKIPIA_DUNGEON_BOSS	Dračí chrám
+MAP_SKIPIA_DUNGEON_BOSS_1	Pavoučí bludiště 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Pavoučí bludiště 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Pavoučí bludiště 3
 MAP_SPIDER	Kuahlo Dong
 MAP_TEMPLE	Chrám Hwang
+MAP_SPIDERDUNGEON	Pavoučí bludiště 1
+MAP_SPIDERDUNGEON_02	Pavoučí bludiště 2
+MAP_SPIDERDUNGEON_02_1	Pavoučí bludiště 2
+MAP_SPIDERDUNGEON_03	Pavoučí bludiště 3
+MAP_SUNGZI	Bitva království
+MAP_SUNGZI_DESERT_01	Bitva království - Pouštní země
+MAP_SUNGZI_DESERT_HILL_01	Bitva království - Pouštní země
+MAP_SUNGZI_DESERT_HILL_02	Bitva království - Pouštní země
+MAP_SUNGZI_DESERT_HILL_03	Bitva království - Pouštní země
+MAP_SUNGZI_FLAME_HILL_01	Bitva království - Ohnivá země
+MAP_SUNGZI_FLAME_HILL_02	Bitva království - Ohnivá země
+MAP_SUNGZI_FLAME_HILL_03	Bitva království - Ohnivá země
+MAP_SUNGZI_SNOW	Bitva království - Ledová země
+MAP_SUNGZI_SNOW_PASS01	Bitva království - Ledová země
+MAP_SUNGZI_SNOW_PASS02	Bitva království - Ledová země
+MAP_SUNGZI_SNOW_PASS03	Bitva království - Ledová země
+MAP_T1	Oblast cechovních válek
+MAP_T2	Oblast cechovních válek
+MAP_T3	Oblast cechovních válek
+MAP_T4	Oblast cechovních válek
 MAP_THUNDER	Bouřné hory
 MAP_TREE	Lungsam
 MAP_TRENT_A	
+MAP_TRENT	Les duchů
+MAP_TRENT02	Červený les
+MAP_TRENT02_A	Červený les
 MAP_WL	Hadí pole
+MAP_WEDDING_01	Svatební oblast
 MESSENGER_ADD_FRIEND	Přidat přítele
+MAP_WL_01	Hadí pole
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s tě přijímal za přítele.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Akceptovat?
 MESSENGER_DO_YOU_DELETE	Smazat?
--- a/assets/locale/locale/cz/mob_proto
+++ b/assets/locale/locale/cz/mob_proto
--- a/assets/locale/locale/de/locale_game.txt
+++ b/assets/locale/locale/de/locale_game.txt
@@ -185,6 +185,13 @@ GUILD_WAR_WIN_CHECK_SCORE	Die Gilde mit den meisten Siegen gewinnt den Krieg.
 GUILD_WAR_WIN_TAKE_AWAY_FLAG1	Erobere die Flagge des Gegners
 GUILD_WAR_WIN_TAKE_AWAY_FLAG2	und bringe sie zu deiner Basis.
 GUILD_WAR_WIN_WIPE_OUT_GUILD	Besiege alle Gegner, um zu gewinnen.
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Gildenkrieg-Gelände
+GUILD_WAR2	Gildenkrieg-Gelände
+GUILD_WAR3	Gildenkrieg-Gelände
+GUILD_WAR4	Gildenkrieg-Gelände
 GUILD_WITHDRAW	Rückzug
 GUILD_YOU_DO_NOT_JOIN	Du gehörst keiner Gilde an.
 HORSE_HEALTH0	Tot
@@ -241,29 +248,118 @@ MALL_CANNOT_INSERT	Du kannst den Gegenstand nicht platzieren.
 MALL_PASSWORD_TITLE	Kennwort
 MAP_A1	Gebiet Yongan
 MAP_A2	Tal von Seungryong
+MAP_A2_1	None7
 MAP_A3	Gebiet Jayang
 MAP_AG	Jungrang
 MAP_B1	Gebiet Joan
 MAP_B2	Tal von Imji
 MAP_B3	Gebiet Bokjung
+MAP_BATTLE_FIELD	Kampfzone
 MAP_BAY	Nephritbucht
+MAP_BAYBLACKSAND	Nephritbucht
 MAP_BG	Waryong
 MAP_C1	Gebiet Pyungmoo
 MAP_C2	Tal von Bangsan
 MAP_C3	Gebiet Bakra
 MAP_CAPE	Kap des Drachenfeuers
+MAP_CAPEDRAGONHEAD	Kap des Drachenfeuers
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Zodiak-Tempel
 MAP_DAWN	Gautamakliff
+MAP_DAWNMISTWOOD	Gautamakliff
+MAP_DAWNMIST_DUNGEON_01	Verwunschener Wald
 MAP_DESERT	Yongbi-Wüste
+MAP_DEVILCATACOMB	Devil's Catacomb
+MAP_DEVILTOWER1	Dämonenturm
+MAP_DUEL	Arena für Übungskämpfe
+MAP_E	Kolonie
+MAP_EMPIREWAR01	Burgschlacht
+MAP_EMPIREWAR02	Burgschlacht
+MAP_EMPIREWAR03	Burgschlacht
 MAP_FLAME	Doyyumhwan
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	Reichsschlacht-Wüstenland
+MAP_HOLYPLACE_FLAME	Reichsschlacht-Feuerland
+MAP_HOLYPLACE_ICE	Reichsschlacht-Eisland
+MAP_MILGYO	Hwang-Tempel
+MAP_MILGYO_A	None8
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MT_THUNDER	Donnerberge
+MAP_MT_TH_DUNGEON_01	Tempel der Ochao
 MAP_NUSLUCK	Land d. Riesen
+MAP_NUSLUCK01	Land der Riesen
+MAP_N_DESERT_01	Yongbi-Wüste
+MAP_N_DESERT_02	None6
+MAP_N_FLAME_01	Feuerland
+MAP_N_FLAME_02	None5
+MAP_N_FLAME_DRAGON	Meleys Hort
+MAP_N_FLAME_DUNGEON_01	Rotdrachen-Festung
+MAP_N_SNOWM_01	Berg Sohan
+MAP_N_SNOWM_02	None4
+MAP_N_SNOW_DUNGEON_01	Nemeres Warte
+MAP_N_THREEWAY	Tal von Seungryong
+MAP_OXEVENT	OX-Wettbewerb
+MAP_PATHWAY_DESERT_01	Reichsschlacht-Wüstenland
+MAP_PATHWAY_DESERT_02	Reichsschlacht-Wüstenland
+MAP_PATHWAY_DESERT_03	Reichsschlacht-Wüstenland
+MAP_PATHWAY_FLAME_01	Reichsschlacht-Feuerland
+MAP_PATHWAY_FLAME_02	Reichsschlacht-Feuerland
+MAP_PATHWAY_FLAME_03	Reichsschlacht-Feuerland
+MAP_PATHWAY_ICE_01	Reichsschlacht-Eisland
+MAP_PATHWAY_ICE_02	Spiellatz
+MAP_PATHWAY_ICE_03	Reichsschlacht-Eisland
 MAP_SKELTOWER	Gumsan-Turm
+MAP_SKIPIA_DUNGEON_01	Grotte der Verbannung
+MAP_SKIPIA_DUNGEON_011	None10
+MAP_SKIPIA_DUNGEON_012	None12
+MAP_SKIPIA_DUNGEON_013	None14
+MAP_SKIPIA_DUNGEON_02	Grotte der Verbannung 2
+MAP_SKIPIA_DUNGEON_021	None11
+MAP_SKIPIA_DUNGEON_022	None13
+MAP_SKIPIA_DUNGEON_023	None15
+MAP_SKIPIA_DUNGEON_BOSS	Drachenraum
+MAP_SKIPIA_DUNGEON_BOSS_1	Spinnendungeon 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Spinnendungeon 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Spinnendungeon 3
 MAP_SNOW	Berg Sohan
 MAP_SPIDER	Kuahlo Dong
+MAP_SPIDERDUNGEON	Spinnendungeon 1
+MAP_SPIDERDUNGEON_02	Spinnendungeon 2
+MAP_SPIDERDUNGEON_02_1	Spinnendungeon 2
+MAP_SPIDERDUNGEON_03	Spinnendungeon 3
+MAP_SUNGZI	Reichsschlacht
+MAP_SUNGZI_DESERT_01	Reichsschlacht-Wüstenland
+MAP_SUNGZI_DESERT_HILL_01	Reichsschlacht-Wüstenland
+MAP_SUNGZI_DESERT_HILL_02	Reichsschlacht-Wüstenland
+MAP_SUNGZI_DESERT_HILL_03	Reichsschlacht-Wüstenland
+MAP_SUNGZI_FLAME_HILL_01	Reichsschlacht-Feuerland
+MAP_SUNGZI_FLAME_HILL_02	Reichsschlacht-Feuerland
+MAP_SUNGZI_FLAME_HILL_03	Reichsschlacht-Feuerland
+MAP_SUNGZI_SNOW	Reichsschlacht-Eisland
+MAP_SUNGZI_SNOW_PASS01	Reichsschlacht-Eisland
+MAP_SUNGZI_SNOW_PASS02	Reichsschlacht-Eisland
+MAP_SUNGZI_SNOW_PASS03	Reichsschlacht-Eisland
+MAP_T1	Gildenkrieg-Gelände
+MAP_T2	Gildenkrieg-Gelände
+MAP_T3	Gildenkrieg-Gelände
+MAP_T4	Gildenkrieg-Gelände
 MAP_TEMPLE	Hwang-Tempel
 MAP_THUNDER	Donnerberge
 MAP_TREE	Lungsam
+MAP_TRENT	Geisterwald
+MAP_TRENT02	Roter Wald
+MAP_TRENT02_A	Roter Wald
+MAP_TRENT_A	None9
+MAP_WEDDING_01	Hochzeitsmap
 MAP_WL	Schlangenfeld
+MAP_WL_01	Schlangenfeld
 MESSENGER_ADD_FRIEND	Freund hinzufügen
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s hat dich als Freund aufgenommen.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Annehmen?
@@ -279,6 +375,7 @@ MESSENGER_INPUT_MOBILE_PHONE_NUMBER_1	Gib die Handynr. für den SMS-Versand ein.
 MESSENGER_INPUT_MOBILE_PHONE_NUMBER_2	Möchtest du die Nummer jetzt eingeben?
 MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE	Handynummer eingeben
 MESSENGER_SEND_MOBILE_MESSAGE_TITLE	Nachricht senden.
+METIN_TEST	GM TEST
 MINIMAP	Minikarte öffnen
 MINIMAP_CANNOT_SEE	Minikarte kann nicht angezeigt werden.
 MINIMAP_CAN_NOT_SHOW_AREAMAP	Übersichtskarte kann nicht angezeigt werden.
@@ -311,7 +408,7 @@ PARTY_DO_YOU_JOIN	 hat dich in seine Gruppe eingeladen. Annehmen?
 PARTY_EXP_DISTRIBUTION_MODE	EXP-Verteilung
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL	levelabhängig
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL_TOOLTIP	Gruppenmitglieder höherer Level erhalten mehr EXP.
-PARTY_EXP_DISTRIBUTION_MODE_PARITY	gleichmäßig
+PARTY_EXP_DISTRIBUTION_MODE_PARITY	Gleichmäßig
 PARTY_EXP_DISTRIBUTION_MODE_PARITY_TOOLTIP	Alle Gruppenmitglieder erhalten gleich viele EXP.
 PARTY_HEAL_ALL_MEMBER	Alles wiederherstellen
 PARTY_INCREASE_AREA_150	Reichweite der Gruppe um Faktor 1,5 erhöht.	SNA
--- a/assets/locale/locale/dk/locale_game.txt
+++ b/assets/locale/locale/dk/locale_game.txt
@@ -179,6 +179,13 @@ GUILD_TILE_INFO	Ordensinformationer
 GUILD_TILE_MEMBER	Ordensmedlemmer
 GUILD_TILE_SKILL	Ordensfærdigheder
 GUILD_WAR_LIMIT_30MIN	Tid: 30 Minutter
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Ordenskrigs område
+GUILD_WAR2	Ordenskrigs område
+GUILD_WAR3	Ordenskrigs område
+GUILD_WAR4	Ordenskrigs område
 GUILD_WAR_REWARD_POTION	Belønning: Vinderen får eliksirer.
 GUILD_WAR_USE_BATTLE_MAP	Sted: Ordenskrig Arena
 GUILD_WAR_USE_NORMAL_MAP	Sted: Normal kort
@@ -250,35 +257,112 @@ MAP_B1	Område Joan
 MAP_B2	Imji dalen
 MAP_B3	Område Bokjung
 MAP_BAY	Nefrit bugten
+MAP_BATTLE_FIELD	Kamp Zone
 MAP_BG	Waryong
+MAP_BAYBLACKSAND	Nefrit bugten
 MAP_C1	Område Pyungmoo
 MAP_C2	Bangsan dalen
 MAP_C3	Område Bakra
 MAP_CAPE	Kap Drageild
 MAP_CG	Imha
+MAP_CAPEDRAGONHEAD	Kap Drageild
 MAP_DAWN	Gautama Klippe
+MAP_CZ_DUNGEON	Zodiac Tempel
 MAP_DESERT	Yongbi-ørken
+MAP_DAWNMISTWOOD	Gautama Klippe
+MAP_DAWNMIST_DUNGEON_01	Fortryllet skov
 MAP_FLAME	Doyyumhwan
+MAP_DEVILCATACOMB	Djævelens katakomb
+MAP_DEVILTOWER1	Dæmon tårn
+MAP_DUEL	Træningskamp område
+MAP_E	Koloni
+MAP_EMPIREWAR01	Slots-kamp
+MAP_EMPIREWAR02	Slots-kamp
+MAP_EMPIREWAR03	Slots-kamp
 MAP_MILGYO_A	
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	Ørkenland Nationskrig
+MAP_HOLYPLACE_FLAME	Ildland Nationskrig
+MAP_HOLYPLACE_ICE	Island Nationskrig
+MAP_MILGYO	Hwang Tempel
 MAP_NUSLUCK	Kæmpernes land
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MT_THUNDER	Tordenbjergene
+MAP_MT_TH_DUNGEON_01	Ochao Tempel
 MAP_N_DESERT_02	
+MAP_NUSLUCK01	Kæmpernes land
+MAP_N_DESERT_01	Yongbi-Ørken
 MAP_N_FLAME_02	
+MAP_N_FLAME_01	Ildland
 MAP_N_SNOWM_02	
+MAP_N_FLAME_DRAGON	Meleys Grotte
+MAP_N_FLAME_DUNGEON_01	Rød Drageborg
+MAP_N_SNOWM_01	Bjerget Sohan
 MAP_SKELTOWER	Gumsan-Tårn
+MAP_N_SNOW_DUNGEON_01	Nemeres vagttårn
+MAP_N_THREEWAY	Seungryong Dalen
+MAP_OXEVENT	OX turnering
+MAP_PATHWAY_DESERT_01	Ørkenland Nationskrig
+MAP_PATHWAY_DESERT_02	Ørkenland Nationskrig
+MAP_PATHWAY_DESERT_03	Ørkenland Nationskrig
+MAP_PATHWAY_FLAME_01	Ildland Nationskrig
+MAP_PATHWAY_FLAME_02	Ildland Nationskrig
+MAP_PATHWAY_FLAME_03	Ildland Nationskrig
+MAP_PATHWAY_ICE_01	Island Nationskrig
+MAP_PATHWAY_ICE_02	Legeplads
+MAP_PATHWAY_ICE_03	Island Nationskrig
 MAP_SKIPIA_DUNGEON_011	
+MAP_SKIPIA_DUNGEON_01	Forbandelsens grotte
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
 MAP_SKIPIA_DUNGEON_021	
+MAP_SKIPIA_DUNGEON_02	Forbandelsens grotte 2
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
 MAP_SNOW	Bjerget Sohan
+MAP_SKIPIA_DUNGEON_BOSS	Dragens tempel
+MAP_SKIPIA_DUNGEON_BOSS_1	Edderkoppe grotte 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Edderkoppe grotte 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Edderkoppe grotte 3
 MAP_SPIDER	Kuahlo Dong
 MAP_TEMPLE	Hwang-Tempel
+MAP_SPIDERDUNGEON	Edderkoppe grotte 1
+MAP_SPIDERDUNGEON_02	Edderkoppe-grotte 2
+MAP_SPIDERDUNGEON_02_1	Edderkoppe grotte 2
+MAP_SPIDERDUNGEON_03	Edderkoppe grotte 3
+MAP_SUNGZI	Nationskrig
+MAP_SUNGZI_DESERT_01	Ørkenland Nationskrig
+MAP_SUNGZI_DESERT_HILL_01	Ørkenland Nationskrig
+MAP_SUNGZI_DESERT_HILL_02	Ørkenland Nationskrig
+MAP_SUNGZI_DESERT_HILL_03	Ørkenland Nationskrig
+MAP_SUNGZI_FLAME_HILL_01	Ildland Nationskrig
+MAP_SUNGZI_FLAME_HILL_02	Ildland Nationskrig
+MAP_SUNGZI_FLAME_HILL_03	Ildland Nationskrig
+MAP_SUNGZI_SNOW	Island Nationskrig
+MAP_SUNGZI_SNOW_PASS01	Island Nationskrig
+MAP_SUNGZI_SNOW_PASS02	Island Nationskrig
+MAP_SUNGZI_SNOW_PASS03	Island Nationskrig
+MAP_T1	Ordenskrigs område
+MAP_T2	Ordenskrigs område
+MAP_T3	Ordenskrigs område
+MAP_T4	Ordenskrigs område
 MAP_THUNDER	Tordenbjergene
 MAP_TREE	Lungsam
 MAP_TRENT_A	
+MAP_TRENT	Åndeskov
+MAP_TRENT02	Rød skov
+MAP_TRENT02_A	Rød skov
 MAP_WL	Slangeområde
+MAP_WEDDING_01	Bryllups kort
 MESSENGER_ADD_FRIEND	Tilføj ven
+MAP_WL_01	Slangeområde
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s har accepteret dig som ven.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Accepter?
 MESSENGER_DO_YOU_DELETE	Slet?
--- a/assets/locale/locale/dk/mob_proto
+++ b/assets/locale/locale/dk/mob_proto
--- a/assets/locale/locale/en/locale_game.txt
+++ b/assets/locale/locale/en/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_INFO	Guild Information
 GUILD_TILE_MEMBER	Guild Members	
 GUILD_TILE_SKILL	Guild Skills	
 GUILD_WAR_LIMIT_30MIN	Time: 30 Minutes	
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Guild War Area
+GUILD_WAR2	Guild War Area
+GUILD_WAR3	Guild War Area
+GUILD_WAR4	Guild War Area
 GUILD_WAR_REWARD_POTION	Reward: The winner receives a Potion	
 GUILD_WAR_USE_BATTLE_MAP	Location: Guild War Arena
 GUILD_WAR_USE_NORMAL_MAP	Location: Normal Map
@@ -242,29 +249,118 @@ MALL_PASSWORD_TITLE	Password
 MAP_A1	Yongan Area
 MAP_A2	Valley of Seungryong	
 MAP_A3	Yayang Area
+MAP_A2_1	
 MAP_AG	Jungrang	
 MAP_B1	Joan Area	
 MAP_B2	Valley of Imji
 MAP_B3	Bokjung Area
 MAP_BAY	Nephrite Bay
+MAP_BATTLE_FIELD	Combat Zone
 MAP_BG	Waryong
+MAP_BAYBLACKSAND	Nephrite Bay
 MAP_C1	Pyungmoo Area
 MAP_C2	Valley of Bangsan
 MAP_C3	Bakra Area
 MAP_CAPE	Cape Dragon Fire
 MAP_CG	Imha
+MAP_CAPEDRAGONHEAD	Cape Dragon Fire
 MAP_DAWN	Gautama Cliff
+MAP_CZ_DUNGEON	Zodiac Temple
 MAP_DESERT	Yongbi Desert	
+MAP_DAWNMISTWOOD	Gautama Cliff
+MAP_DAWNMIST_DUNGEON_01	Enchanted Forest
 MAP_FLAME	Doyyumhwan
+MAP_DEVILCATACOMB	Devil's Catacomb
+MAP_DEVILTOWER1	Demon Tower
+MAP_DUEL	Training Fight Arena
+MAP_E	Colony
+MAP_EMPIREWAR01	Castle Battle
+MAP_EMPIREWAR02	Castle Battle
+MAP_EMPIREWAR03	Castle Battle
 MAP_NUSLUCK	Land of Giants
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	Desert Land Kingdom Battle
+MAP_HOLYPLACE_FLAME	Fireland Kingdom Battle
+MAP_HOLYPLACE_ICE	Ice Land Kingdom Battle
+MAP_MILGYO	Hwang Temple
+MAP_MILGYO_A	
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MT_THUNDER	Thunder Mountains
+MAP_MT_TH_DUNGEON_01	Temple of the Ochao
 MAP_SKELTOWER	Gumsan Tower
+MAP_NUSLUCK01	Land of Giants
+MAP_N_DESERT_01	Yongbi Desert
+MAP_N_DESERT_02	
+MAP_N_FLAME_01	Fireland
+MAP_N_FLAME_02	
+MAP_N_FLAME_DRAGON	Meley's Lair
+MAP_N_FLAME_DUNGEON_01	Red Dragon Fortress
+MAP_N_SNOWM_01	Mount Sohan
+MAP_N_SNOWM_02	
+MAP_N_SNOW_DUNGEON_01	Nemere's Watchtower
+MAP_N_THREEWAY	Valley of Seungryong
+MAP_OXEVENT	OX contest
+MAP_PATHWAY_DESERT_01	Desert Land Kingdom Battle
+MAP_PATHWAY_DESERT_02	Desert Land Kingdom Battle
+MAP_PATHWAY_DESERT_03	Desert Land Kingdom Battle
+MAP_PATHWAY_FLAME_01	Fireland Kingdom Battle
+MAP_PATHWAY_FLAME_02	Fireland Kingdom Battle
+MAP_PATHWAY_FLAME_03	Fireland Kingdom Battle
+MAP_PATHWAY_ICE_01	Ice Land Kingdom Battle
+MAP_PATHWAY_ICE_02	Gameland
+MAP_PATHWAY_ICE_03	Ice Land Kingdom Battle
 MAP_SNOW	Mount Sohan
+MAP_SKIPIA_DUNGEON_01	Grotto of Exile
+MAP_SKIPIA_DUNGEON_011	
+MAP_SKIPIA_DUNGEON_012	
+MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Grotto of Exile 2
+MAP_SKIPIA_DUNGEON_021	
+MAP_SKIPIA_DUNGEON_022	
+MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS	Dragon's Temple
+MAP_SKIPIA_DUNGEON_BOSS_1	Spider Dungeon 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Spider Dungeon 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Spider Dungeon 3
 MAP_SPIDER	Kuahlo Dong
 MAP_TEMPLE	Hwang Temple	
+MAP_SPIDERDUNGEON	Spider Dungeon 1
+MAP_SPIDERDUNGEON_02	Spider Dungeon 2
+MAP_SPIDERDUNGEON_02_1	Spider Dungeon 2
+MAP_SPIDERDUNGEON_03	Spider Dungeon 3
+MAP_SUNGZI	Kingdom Battle
+MAP_SUNGZI_DESERT_01	Desert Land Kingdom Battle
+MAP_SUNGZI_DESERT_HILL_01	Desert Land Kingdom Battle
+MAP_SUNGZI_DESERT_HILL_02	Desert Land Kingdom Battle
+MAP_SUNGZI_DESERT_HILL_03	Desert Land Kingdom Battle
+MAP_SUNGZI_FLAME_HILL_01	Fireland Kingdom Battle
+MAP_SUNGZI_FLAME_HILL_02	Fireland Kingdom Battle
+MAP_SUNGZI_FLAME_HILL_03	Fireland Kingdom Battle
+MAP_SUNGZI_SNOW	Ice Land Kingdom Battle
+MAP_SUNGZI_SNOW_PASS01	Ice Land Kingdom Battle
+MAP_SUNGZI_SNOW_PASS02	Ice Land Kingdom Battle
+MAP_SUNGZI_SNOW_PASS03	Ice Land Kingdom Battle
+MAP_T1	Guild War Area
+MAP_T2	Guild War Area
+MAP_T3	Guild War Area
+MAP_T4	Guild War Area
 MAP_THUNDER	Thunder Mountains
 MAP_TREE	Lungsam	
 MAP_WL	Snakefield
+MAP_TRENT	Ghost Forest
+MAP_TRENT02	Red Forest
+MAP_TRENT02_A	Red Forest
+MAP_TRENT_A	
+MAP_WEDDING_01	Wedding Map
 MESSENGER_ADD_FRIEND	Add Friend	
+MAP_WL_01	Snakefield
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s added you as a friend.	
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Accept?	
 MESSENGER_DO_YOU_DELETE	Delete?	
@@ -279,6 +375,7 @@ MESSENGER_INPUT_MOBILE_PHONE_NUMBER_1	Enter the cell phone number for the Text m
 MESSENGER_INPUT_MOBILE_PHONE_NUMBER_2	Do you want to enter the number now?	
 MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE	Enter cell phone number.	
 MESSENGER_SEND_MOBILE_MESSAGE_TITLE	Send message.	
+METIN_TEST	
 MINIMAP	Open Mini Map	
 MINIMAP_CANNOT_SEE	Mini Map cannot be seen.	
 MINIMAP_CAN_NOT_SHOW_AREAMAP	Large Map cannot be shown.
@@ -311,7 +408,7 @@ PARTY_DO_YOU_JOIN	 has invited you to join his group. Accept?
 PARTY_EXP_DISTRIBUTION_MODE	EXP Distribution	
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL	Level dependant
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL_TOOLTIP	Higher level group members receive more EXP.
-PARTY_EXP_DISTRIBUTION_MODE_PARITY	even
+PARTY_EXP_DISTRIBUTION_MODE_PARITY	Even
 PARTY_EXP_DISTRIBUTION_MODE_PARITY_TOOLTIP	All Group members receive the same EXP.	
 PARTY_HEAL_ALL_MEMBER	Restore everything.	
 PARTY_INCREASE_AREA_150	Range of the group heightened of the factor 1.5 .	SNA
--- a/assets/locale/locale/es/locale_game.txt
+++ b/assets/locale/locale/es/locale_game.txt
@@ -179,6 +179,13 @@ GUILD_TILE_INFO	Información de Gremio
 GUILD_TILE_MEMBER	Miembros del Gremio
 GUILD_TILE_SKILL	Habilidades del Gremio
 GUILD_WAR_LIMIT_30MIN	Tiempo: 30 minutos
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Terrenos de la Guerra de gremios
+GUILD_WAR2	Terrenos de la Guerra de gremios
+GUILD_WAR3	Terrenos de la Guerra de gremios
+GUILD_WAR4	Terrenos de la Guerra de gremios
 GUILD_WAR_REWARD_POTION	Recompensa: El ganador recibe una poción.
 GUILD_WAR_USE_BATTLE_MAP	Lugar: Arena de guerra de gremios
 GUILD_WAR_USE_NORMAL_MAP	Lugar: Mapa normal
@@ -250,35 +257,112 @@ MAP_B1	Área Joan
 MAP_B2	Valle de Imji
 MAP_B3	Área Bokjung
 MAP_BAY	Bahía de Nephrit
+MAP_BATTLE_FIELD	Zona de combate
 MAP_BG	Waryong
+MAP_BAYBLACKSAND	Bahía de Nephrit
 MAP_C1	Área Pyungmoo
 MAP_C2	Valle de Bangsan
 MAP_C3	Área Bakra
 MAP_CAPE	Cabo del Dragón de Fuego
 MAP_CG	Imha
+MAP_CAPEDRAGONHEAD	Cabo del Dragón de Fuego
 MAP_DAWN	Acantilado de Gautama
+MAP_CZ_DUNGEON	Templo del zodíaco
 MAP_DESERT	Desierto Yongbi
+MAP_DAWNMISTWOOD	Acantilado de Gautama
+MAP_DAWNMIST_DUNGEON_01	Bosque Encantado
 MAP_FLAME	Doyyumhwan
+MAP_DEVILCATACOMB	Catacumba del Diablo
+MAP_DEVILTOWER1	Torre Demoníaca
+MAP_DUEL	Arena para combates de entrenamiento
+MAP_E	Colonia
+MAP_EMPIREWAR01	Batalla por el castillo
+MAP_EMPIREWAR02	Batalla por el castillo
+MAP_EMPIREWAR03	Batalla por el castillo
 MAP_MILGYO_A	
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	Batalla de Reinos - Tierra del desierto
+MAP_HOLYPLACE_FLAME	Batalla de Reinos - Tierra de Fuego
+MAP_HOLYPLACE_ICE	Batalla de Reinos - Tierra de hielo
+MAP_MILGYO	Templo Hwang
 MAP_NUSLUCK	Tierra de Gigantes
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MT_THUNDER	Montañas Trueno
+MAP_MT_TH_DUNGEON_01	Templo de los Ochao
 MAP_N_DESERT_02	
+MAP_NUSLUCK01	Tierra de Gigantes
+MAP_N_DESERT_01	Desierto Yongbi
 MAP_N_FLAME_02	
+MAP_N_FLAME_01	Tierra de Fuego
 MAP_N_SNOWM_02	
+MAP_N_FLAME_DRAGON	Refugio de Meley
+MAP_N_FLAME_DUNGEON_01	Fortaleza del Dragón Rojo
+MAP_N_SNOWM_01	Monte Sohan
 MAP_SKELTOWER	Torre Gumsan
+MAP_N_SNOW_DUNGEON_01	Torre de vigilancia de Nemere
+MAP_N_THREEWAY	Valle de Seungryong
+MAP_OXEVENT	Competición OX
+MAP_PATHWAY_DESERT_01	Batalla de Reinos - Tierra del desierto
+MAP_PATHWAY_DESERT_02	Batalla de Reinos - Tierra del desierto
+MAP_PATHWAY_DESERT_03	Batalla de Reinos - Tierra del desierto
+MAP_PATHWAY_FLAME_01	Batalla de Reinos - Tierra de Fuego
+MAP_PATHWAY_FLAME_02	Batalla de Reinos - Tierra de Fuego
+MAP_PATHWAY_FLAME_03	Batalla de Reinos - Tierra de Fuego
+MAP_PATHWAY_ICE_01	Batalla de Reinos - Tierra de hielo
+MAP_PATHWAY_ICE_02	Parque
+MAP_PATHWAY_ICE_03	Batalla de Reinos - Tierra de hielo
 MAP_SKIPIA_DUNGEON_011	
+MAP_SKIPIA_DUNGEON_01	La Gruta del Exilio
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
 MAP_SKIPIA_DUNGEON_021	
+MAP_SKIPIA_DUNGEON_02	La Gruta del Exilio 2
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
 MAP_SNOW	Monte Sohan
+MAP_SKIPIA_DUNGEON_BOSS	Templo del Dragón
+MAP_SKIPIA_DUNGEON_BOSS_1	Mazmorra de Arañas 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Mazmorra de Arañas 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Mazmorra de Arañas 3
 MAP_SPIDER	Kuahlo Dong
 MAP_TEMPLE	Templo Hwang
+MAP_SPIDERDUNGEON	Mazmorra de Arañas 1
+MAP_SPIDERDUNGEON_02	Mazmorra de Arañas 2
+MAP_SPIDERDUNGEON_02_1	Mazmorra de Arañas 2
+MAP_SPIDERDUNGEON_03	Mazmorra de Arañas 3
+MAP_SUNGZI	Batalla de Reinos
+MAP_SUNGZI_DESERT_01	Batalla de Reinos - Tierra del desierto
+MAP_SUNGZI_DESERT_HILL_01	Batalla de Reinos - Tierra del desierto
+MAP_SUNGZI_DESERT_HILL_02	Batalla de Reinos - Tierra del desierto
+MAP_SUNGZI_DESERT_HILL_03	Batalla de Reinos - Tierra del desierto
+MAP_SUNGZI_FLAME_HILL_01	Batalla de Reinos - Tierra de Fuego
+MAP_SUNGZI_FLAME_HILL_02	Batalla de Reinos - Tierra de Fuego
+MAP_SUNGZI_FLAME_HILL_03	Batalla de Reinos - Tierra de Fuego
+MAP_SUNGZI_SNOW	Batalla de Reinos - Tierra de hielo
+MAP_SUNGZI_SNOW_PASS01	Batalla de Reinos - Tierra de hielo
+MAP_SUNGZI_SNOW_PASS02	Batalla de Reinos - Tierra de hielo
+MAP_SUNGZI_SNOW_PASS03	Batalla de Reinos - Tierra de hielo
+MAP_T1	Terrenos de la Guerra de gremios
+MAP_T2	Terrenos de la Guerra de gremios
+MAP_T3	Terrenos de la Guerra de gremios
+MAP_T4	Terrenos de la Guerra de gremios
 MAP_THUNDER	Montañas Trueno
 MAP_TREE	Lungsam
 MAP_TRENT_A	
+MAP_TRENT	Bosque Fantasma
+MAP_TRENT02	Bosque Rojo
+MAP_TRENT02_A	Bosque Rojo
 MAP_WL	Campo Serpiente
+MAP_WEDDING_01	Mapa de bodas
 MESSENGER_ADD_FRIEND	Añadir Amigo
+MAP_WL_01	Campo Serpiente
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s te añadió como amigo.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	¿Aceptar?
 MESSENGER_DO_YOU_DELETE	¿Borrar?
--- a/assets/locale/locale/es/mob_proto
+++ b/assets/locale/locale/es/mob_proto
--- a/assets/locale/locale/fr/locale_game.txt
+++ b/assets/locale/locale/fr/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_INFO	Informations sur la Guilde
 GUILD_TILE_MEMBER	Membres de la Guilde
 GUILD_TILE_SKILL	Compétence de Guilde
 GUILD_WAR_LIMIT_30MIN	Temps : 30 Minutes
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Terrain de guerre de guildes
+GUILD_WAR2	Terrain de guerre de guildes
+GUILD_WAR3	Terrain de guerre de guildes
+GUILD_WAR4	Terrain de guerre de guildes
 GUILD_WAR_REWARD_POTION	Récompense : le vainqueur reçoit une potion/
 GUILD_WAR_USE_BATTLE_MAP	Lieu : Arène de guerre des guildes
 GUILD_WAR_USE_NORMAL_MAP	Lieu : carte normale
@@ -242,29 +249,118 @@ MALL_PASSWORD_TITLE	Mot de passe
 MAP_A1	Région de Yongan
 MAP_A2	Vallée de Seungryong
 MAP_A3	Zone Jayan
+MAP_A2_1	
 MAP_AG	Jungrang
 MAP_B1	Zone Joan
 MAP_B2	Vallée d'Imji
 MAP_B3	Zone Bokjung
 MAP_BAY	Baie de Néphrite
+MAP_BATTLE_FIELD	Zone de combat
 MAP_BG	Waryong
+MAP_BAYBLACKSAND	Baie de Néphrite
 MAP_C1	Zone Pyungmoo
 MAP_C2	Vallée de Bangsan
 MAP_C3	Région de Bakra
 MAP_CAPE	Cap du Dragon de Feu
 MAP_CG	Imha
+MAP_CAPEDRAGONHEAD	Cap du Feu dragonesque
 MAP_DAWN	Falaise de Gautama
+MAP_CZ_DUNGEON	Temple du zodiaque
 MAP_DESERT	Désert de Yongbi
+MAP_DAWNMISTWOOD	Falaise de Gautama
+MAP_DAWNMIST_DUNGEON_01	Forêt enchantée
 MAP_FLAME	Doyyumhwan
+MAP_DEVILCATACOMB	Catacombes du diable
+MAP_DEVILTOWER1	Tour des démons
+MAP_DUEL	Arène d'entraînement
+MAP_E	Colonie
+MAP_EMPIREWAR01	Bataille pour le château
+MAP_EMPIREWAR02	Bataille pour le château
+MAP_EMPIREWAR03	Bataille pour le château
 MAP_NUSLUCK	Terre des Ogres
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	Bataille des empires : Terre du Désert
+MAP_HOLYPLACE_FLAME	Bataille des empires : Terre de Feu
+MAP_HOLYPLACE_ICE	Bataille des empires : Terre Glaciaire
+MAP_MILGYO	Temple de Hwang
+MAP_MILGYO_A	
+MAP_MONKEY_DUNGEON	Hasung Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasung Dong
+MAP_MONKEY_DUNGEON_12	Hasung Dong
+MAP_MONKEY_DUNGEON_13	Hasung Dong
+MAP_MT_THUNDER	Montagnes fulgurantes
+MAP_MT_TH_DUNGEON_01	Temple Ochao
 MAP_SKELTOWER	Tour de Gumsan
+MAP_NUSLUCK01	Terre des Ogres
+MAP_N_DESERT_01	Désert de Yongbi
+MAP_N_DESERT_02	
+MAP_N_FLAME_01	Terre de Feu
+MAP_N_FLAME_02	
+MAP_N_FLAME_DRAGON	Repaire de Meley
+MAP_N_FLAME_DUNGEON_01	Forteresse du dragon rouge
+MAP_N_SNOWM_01	Mont Sohan
+MAP_N_SNOWM_02	
+MAP_N_SNOW_DUNGEON_01	Observatoire de Nemere
+MAP_N_THREEWAY	Vallée de Seungryong
+MAP_OXEVENT	OX-contest
+MAP_PATHWAY_DESERT_01	Bataille des empires : Terre du Désert
+MAP_PATHWAY_DESERT_02	Bataille des empires : Terre du Désert
+MAP_PATHWAY_DESERT_03	Bataille des empires : Terre du Désert
+MAP_PATHWAY_FLAME_01	Bataille des empires : Terre de Feu
+MAP_PATHWAY_FLAME_02	Bataille des empires : Terre de Feu
+MAP_PATHWAY_FLAME_03	Bataille des empires : Terre de Feu
+MAP_PATHWAY_ICE_01	Bataille des empires : Terre Glaciaire
+MAP_PATHWAY_ICE_02	Aire de jeux
+MAP_PATHWAY_ICE_03	Bataille des empires : Terre Glaciaire
 MAP_SNOW	Mont Sohan
+MAP_SKIPIA_DUNGEON_01	Grotte de l'Exil
+MAP_SKIPIA_DUNGEON_011	
+MAP_SKIPIA_DUNGEON_012	
+MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Grotte de l'Exil 2
+MAP_SKIPIA_DUNGEON_021	
+MAP_SKIPIA_DUNGEON_022	
+MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS	Temple du dragon
+MAP_SKIPIA_DUNGEON_BOSS_1	Donjon des araignées 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Donjon des araignées 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Donjon des araignées 3
 MAP_SPIDER	Kuahlo Dong
 MAP_TEMPLE	Temple de Hwang
+MAP_SPIDERDUNGEON	Donjon des araignées 1
+MAP_SPIDERDUNGEON_02	Donjon des araignées 2
+MAP_SPIDERDUNGEON_02_1	Donjon des araignées 2
+MAP_SPIDERDUNGEON_03	Donjon des araignées 3
+MAP_SUNGZI	Bataille des empires
+MAP_SUNGZI_DESERT_01	Bataille des empires : Terre du Désert
+MAP_SUNGZI_DESERT_HILL_01	Bataille des empires : Terre du Désert
+MAP_SUNGZI_DESERT_HILL_02	Bataille des empires : Terre du Désert
+MAP_SUNGZI_DESERT_HILL_03	Bataille des empires : Terre du Désert
+MAP_SUNGZI_FLAME_HILL_01	Bataille des empires : Terre de Feu
+MAP_SUNGZI_FLAME_HILL_02	Bataille des empires : Terre de Feu
+MAP_SUNGZI_FLAME_HILL_03	Bataille des empires : Terre de Feu
+MAP_SUNGZI_SNOW	Bataille des empires : Terre Glaciaire
+MAP_SUNGZI_SNOW_PASS01	Bataille des empires : Terre Glaciaire
+MAP_SUNGZI_SNOW_PASS02	Bataille des empires : Terre Glaciaire
+MAP_SUNGZI_SNOW_PASS03	Bataille des empires : Terre Glaciaire
+MAP_T1	Terrain de guerre de guildes
+MAP_T2	Terrain de guerre de guildes
+MAP_T3	Terrain de guerre de guildes
+MAP_T4	Terrain de guerre de guildes
 MAP_THUNDER	Montagnes fulgurantes
 MAP_TREE	Lungsam
 MAP_WL	Grande Vallée
+MAP_TRENT	Bois enchanté
+MAP_TRENT02	Bois Rouge
+MAP_TRENT02_A	Bois Rouge
+MAP_TRENT_A	
+MAP_WEDDING_01	Carte de mariage
 MESSENGER_ADD_FRIEND	Ajouter un ami
+MAP_WL_01	Grande Vallée
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s vous a ajouté comme ami
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Accepter ?
 MESSENGER_DO_YOU_DELETE	Supprimer ?
@@ -280,6 +376,7 @@ MESSENGER_INPUT_MOBILE_PHONE_NUMBER_2	Souhaitez-vous entrer le numéro maintenan
 MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE	Entrez le numéro de téléphone portable
 MESSENGER_SEND_MOBILE_MESSAGE_TITLE	Envoyer un message
 MINIMAP	Ouvrir Mini-carte
+METIN_TEST	
 MINIMAP_CANNOT_SEE	La mini carte ne peut pas être affichée.
 MINIMAP_CAN_NOT_SHOW_AREAMAP	La carte générale ne peut pas être affichée.
 MINIMAP_DEC_SCALE	Zoom arrière
--- a/assets/locale/locale/gr/locale_game.txt
+++ b/assets/locale/locale/gr/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Διαχείριση δικαιωμάτων
 GUILD_TILE_INFO	Πληροφορίες Συντεχνίας
 GUILD_TILE_MEMBER	Μέλη Συντεχνίας
 GUILD_TILE_SKILL	Ικανότητα Συντεχνίας
+GUILD_WAR4	Περιοχή πολέμων συντεχνίας
+GUILD_WAR3	Περιοχή πολέμων συντεχνίας
+GUILD_WAR2	Περιοχή πολέμων συντεχνίας
+GUILD_WAR1	Περιοχή πολέμων συντεχνίας
+GUILD_VILLAGE_03	Daeyami
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_01	Miryang
 GUILD_WAR_LIMIT_30MIN	Χρόνος: 30 Λεπτά
 GUILD_WAR_REWARD_POTION	Ανταμοιβή: Ο νικητής κερδίζει ένα Φίλτρο
 GUILD_WAR_USE_BATTLE_MAP	Τόπος: Αρένα πολέμων συντεχνιών
@@ -249,35 +256,112 @@ MAP_AG	Jungrang
 MAP_B1	Περιοχή Joan
 MAP_B2	Κοιλάδα του Imji
 MAP_B3	Περιοχή Bokjung
+MAP_BATTLE_FIELD	Ζώνη μάχης
 MAP_BAY	Κόλπος Νεφρίτη
+MAP_BAYBLACKSAND	Κόλπος Νεφρίτη
 MAP_BG	Waryong
 MAP_C1	Περιοχή Pyungmoo
 MAP_C2	Κοιλάδα του Bangsan
 MAP_C3	Περιοχή Bakra
 MAP_CAPE	Ακρωτήρι της Δρακοφωτιάς
+MAP_CAPEDRAGONHEAD	Ακρωτήρι της Δρακοφωτιάς
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Ζωδιακός Ναός
 MAP_DAWN	Βράχος Γκαουτάμα
+MAP_DAWNMIST_DUNGEON_01	Μαγεμένο Δάσος
+MAP_DAWNMISTWOOD	Βράχος Γκαουτάμα
 MAP_DESERT	Έρημος Yongbi
+MAP_EMPIREWAR03	Μάχη κάστρων
+MAP_EMPIREWAR02	Μάχη κάστρων
+MAP_EMPIREWAR01	Μάχη κάστρων
+MAP_E	Αποικία
+MAP_DUEL	Αρένα για αγώνες κατάρτισης
+MAP_DEVILTOWER1	Δαιμονικός Πύργος
+MAP_DEVILCATACOMB	Κατακόμβη του Διαβόλου
 MAP_FLAME	Doyyumhwan
+MAP_MILGYO	Ναός Hwang
+MAP_HOLYPLACE_ICE	Μάχη των Βασιλείων - Γη των Πάγων
+MAP_HOLYPLACE_FLAME	Μάχη των Βασιλείων - Γη του Πυρός
+MAP_HOLYPLACE_DESERT	Μάχη των Βασιλείων - Έρημος
+MAP_GUILD_03	Imha
+MAP_GUILD_02	Waryong
+MAP_GUILD_01	Jungrang
 MAP_MILGYO_A	
+MAP_MT_TH_DUNGEON_01	Ναός των Οχάο
+MAP_MT_THUNDER	Βουνά Κεραυνού
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON2	Junsun Dong
+MAP_MONKEY_DUNGEON	Hasun Dong
 MAP_NUSLUCK	Χώρα Γιγάντων
+MAP_N_DESERT_01	Έρημος Yongbi
+MAP_NUSLUCK01	Η Χώρα των Γιγάντων
 MAP_N_DESERT_02	
+MAP_N_FLAME_01	Γη του Πυρός
 MAP_N_FLAME_02	
+MAP_N_SNOWM_01	Όρος Sohan
+MAP_N_FLAME_DUNGEON_01	Φρούριο των Κοκκινοδράκων
+MAP_N_FLAME_DRAGON	Φωλιά της Μέλεϊ
 MAP_N_SNOWM_02	
+MAP_PATHWAY_ICE_03	Μάχη των Βασιλείων - Γη των Πάγων
+MAP_PATHWAY_ICE_02	Παιχνιδοχώρα
+MAP_PATHWAY_ICE_01	Μάχη των Βασιλείων - Γη των Πάγων
+MAP_PATHWAY_FLAME_03	Μάχη των Βασιλείων - Γη του Πυρός
+MAP_PATHWAY_FLAME_02	Μάχη των Βασιλείων - Γη του Πυρός
+MAP_PATHWAY_FLAME_01	Μάχη των Βασιλείων - Γη του Πυρός
+MAP_PATHWAY_DESERT_03	Μάχη των Βασιλείων - Έρημος
+MAP_PATHWAY_DESERT_02	Μάχη των Βασιλείων - Έρημος
+MAP_PATHWAY_DESERT_01	Μάχη των Βασιλείων - Έρημος
+MAP_OXEVENT	Διαγωνισμός OX
+MAP_N_THREEWAY	Κοιλάδα του Seungryong
+MAP_N_SNOW_DUNGEON_01	Φυλάκιο του Nemere
 MAP_SKELTOWER	Πύργος Gumsan
+MAP_SKIPIA_DUNGEON_01	Σπηλιά της Εξορίας
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Σπηλιά της Εξορίας 2
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS_3	Αραχνοσπηλιά 3
+MAP_SKIPIA_DUNGEON_BOSS_2	Αραχνοσπηλιά 2
+MAP_SKIPIA_DUNGEON_BOSS_1	Αραχνοσπηλιά 1
+MAP_SKIPIA_DUNGEON_BOSS	Δωμάτιο Δράκου
 MAP_SNOW	Όρος Sohan
 MAP_SPIDER	Kuahlo Dong
+MAP_T4	Περιοχή πολέμων συντεχνίας
+MAP_T3	Περιοχή πολέμων συντεχνίας
+MAP_T2	Περιοχή πολέμων συντεχνίας
+MAP_T1	Περιοχή πολέμων συντεχνίας
+MAP_SUNGZI_SNOW_PASS03	Μάχη των Βασιλείων - Γη των Πάγων
+MAP_SUNGZI_SNOW_PASS02	Μάχη των Βασιλείων - Γη των Πάγων
+MAP_SUNGZI_SNOW_PASS01	Μάχη των Βασιλείων - Γη των Πάγων
+MAP_SUNGZI_SNOW	Μάχη των Βασιλείων - Γη των Πάγων
+MAP_SUNGZI_FLAME_HILL_03	Μάχη των Βασιλείων - Γη του Πυρός
+MAP_SUNGZI_FLAME_HILL_02	Μάχη των Βασιλείων - Γη του Πυρός
+MAP_SUNGZI_FLAME_HILL_01	Μάχη των Βασιλείων - Γη του Πυρός
+MAP_SUNGZI_DESERT_HILL_03	Μάχη των Βασιλείων - Έρημος
+MAP_SUNGZI_DESERT_HILL_02	Μάχη των Βασιλείων - Έρημος
+MAP_SUNGZI_DESERT_HILL_01	Μάχη των Βασιλείων - Έρημος
+MAP_SUNGZI_DESERT_01	Μάχη των Βασιλείων - Έρημος
+MAP_SUNGZI	Μάχη των Βασιλείων
+MAP_SPIDERDUNGEON_03	Αραχνοσπηλιά 3
+MAP_SPIDERDUNGEON_02_1	Αραχνοσπηλιά 2
+MAP_SPIDERDUNGEON_02	Αραχνοσπηλιά 2
+MAP_SPIDERDUNGEON	Αραχνοσπηλιά 1
 MAP_TEMPLE	Ναός του Hwang
 MAP_THUNDER	Βουνά Κεραυνού
 MAP_TREE	Lungsam
+MAP_TRENT02_A	Κόκκινο Δάσος
+MAP_TRENT02	Κόκκινο Δάσος
+MAP_TRENT	Δάσος των Φαντασμάτων
 MAP_TRENT_A	
+MAP_WEDDING_01	Χάρτης γάμου
 MAP_WL	Κοιλάδα των Φιδιών
+MAP_WL_01	Κοιλάδα φιδιών
 MESSENGER_ADD_FRIEND	Πρόσθεσε Φίλο
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	Ο %s σε πρόσθεσε ως φίλο.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Δέχεσαι;
@@ -683,7 +767,7 @@ TOOLTIP_RESIST_EARTH	Αντίσταση στη γη +%d	SA
 TOOLTIP_RESIST_ELEC	Αντίσταση Αστραπής %d%%	SA
 TOOLTIP_RESIST_FIRE	Αντίσταση Φωτιάς %d%%	SA
 TOOLTIP_RESIST_ICE	Αντίσταση στον πάγο +%d	SA
-TOOLTIP_RESIST_MAGIC	μαγική Αντίσταση %d%%	SA
+TOOLTIP_RESIST_MAGIC	Μαγική Αντίσταση %d%%	SA
 TOOLTIP_REST_USABLE_COUNT	Υπόλοιπο: %d
 TOOLTIP_SELLPRICE	Τιμή: %s
 TOOLTIP_SHAMAN	Σαμάνος
--- a/assets/locale/locale/gr/mob_proto
+++ b/assets/locale/locale/gr/mob_proto
--- a/assets/locale/locale/hu/locale_game.txt
+++ b/assets/locale/locale/hu/locale_game.txt
@@ -177,6 +177,13 @@ GUILD_TILE_GRADE	Jogok Kezelése
 GUILD_TILE_INFO	Céh információ
 GUILD_TILE_MEMBER	Céhtag
 GUILD_TILE_SKILL	Céh készség
+GUILD_WAR4	Céhháború terület
+GUILD_WAR3	Céhháború terület
+GUILD_WAR2	Céhháború terület
+GUILD_WAR1	Céhháború terület
+GUILD_VILLAGE_03	Daeyami
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_01	Miryang
 GUILD_WAR_LIMIT_30MIN	Idő: 30 perc
 GUILD_WAR_REWARD_POTION	Jutalom: a győztes italokat kap
 GUILD_WAR_USE_BATTLE_MAP	Helyszín: Céhháború Aréna
@@ -241,29 +248,118 @@ MALL_CANNOT_INSERT	Nem tudod elhelyezni a tárgyat.
 MALL_PASSWORD_TITLE	Jelszó
 MAP_A1	Yongan-terület
 MAP_A2	Seungryong-völgy
+MAP_A2_1	
 MAP_A3	Yayang Terület
 MAP_AG	Jungrang
 MAP_B1	Joan-terület
 MAP_B2	Imji Völgy
 MAP_B3	Bokjung-terület
+MAP_BATTLE_FIELD	Harci övezet
 MAP_BAY	Nefrit-öböl
+MAP_BAYBLACKSAND	Nefrit-öböl
 MAP_BG	Waryong
 MAP_C1	Pyungmoo-terület
 MAP_C2	Bangsan Völgy
 MAP_C3	Bakra-terület
 MAP_CAPE	Sárkánytűz-fok
+MAP_CAPEDRAGONHEAD	Sárkánytűz-fok
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Zodiákus templom
 MAP_DAWN	Gautama-szikla
+MAP_DAWNMIST_DUNGEON_01	Elvarázsolt erdő
+MAP_DAWNMISTWOOD	Gautama-szikla
 MAP_DESERT	Yongbi sivatag
+MAP_EMPIREWAR03	Kastélyharc
+MAP_EMPIREWAR02	Kastélyharc
+MAP_EMPIREWAR01	Kastélyharc
+MAP_E	Kolónia
+MAP_DUEL	Gyakorlóharc aréna
+MAP_DEVILTOWER1	Démon-torony
+MAP_DEVILCATACOMB	Az Ördög Katakombája
 MAP_FLAME	Doyyumhwan
+MAP_MT_TH_DUNGEON_01	Az Ochao temploma
+MAP_MT_THUNDER	Mennydörgés-hegység
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MILGYO_A	
+MAP_MILGYO	Hwang templom
+MAP_HOLYPLACE_ICE	Jégföld, birodalmi csata
+MAP_HOLYPLACE_FLAME	Tűzföld, birodalmi csata
+MAP_HOLYPLACE_DESERT	Sivatagi terület, birodalmi csata
+MAP_GUILD_03	Imha
+MAP_GUILD_02	Waryong
+MAP_GUILD_01	Jungrang
 MAP_NUSLUCK	Óriások Földje
+MAP_PATHWAY_ICE_03	Jégföld, birodalmi csata
+MAP_PATHWAY_ICE_02	Játéktér
+MAP_PATHWAY_ICE_01	Jégföld, birodalmi csata
+MAP_PATHWAY_FLAME_03	Tűzföld, birodalmi csata
+MAP_PATHWAY_FLAME_02	Tűzföld, birodalmi csata
+MAP_PATHWAY_FLAME_01	Tűzföld, birodalmi csata
+MAP_PATHWAY_DESERT_03	Sivatagi terület, birodalmi csata
+MAP_PATHWAY_DESERT_02	Sivatagi terület, birodalmi csata
+MAP_PATHWAY_DESERT_01	Sivatagi terület, birodalmi csata
+MAP_OXEVENT	OX-verseny
+MAP_N_THREEWAY	Seungryong-völgy
+MAP_N_SNOW_DUNGEON_01	Nemere őrtornya
+MAP_N_SNOWM_02	
+MAP_N_SNOWM_01	Sohan-hegy
+MAP_N_FLAME_DUNGEON_01	Vörös sárkány-erőd
+MAP_N_FLAME_DRAGON	Meley barlangja
+MAP_N_FLAME_02	
+MAP_N_FLAME_01	Tűzföld
+MAP_N_DESERT_02	
+MAP_N_DESERT_01	Yongbi sivatag
+MAP_NUSLUCK01	Óriások földje
 MAP_SKELTOWER	Gumsan torony
+MAP_SKIPIA_DUNGEON_BOSS_3	Pók kazamata 3
+MAP_SKIPIA_DUNGEON_BOSS_2	Pók kazamata 2
+MAP_SKIPIA_DUNGEON_BOSS_1	Pók kazamata 1
+MAP_SKIPIA_DUNGEON_BOSS	A Sárkány Temploma
+MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_022	
+MAP_SKIPIA_DUNGEON_021	
+MAP_SKIPIA_DUNGEON_02	A Száműzött barlangja 2
+MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_012	
+MAP_SKIPIA_DUNGEON_011	
+MAP_SKIPIA_DUNGEON_01	A Száműzött barlangja
 MAP_SNOW	Sohan-hegy
 MAP_SPIDER	Kuahlo Dong
+MAP_T4	Céhháború terület
+MAP_T3	Céhháború terület
+MAP_T2	Céhháború terület
+MAP_T1	Céhháború terület
+MAP_SUNGZI_SNOW_PASS03	Jégföld, birodalmi csata
+MAP_SUNGZI_SNOW_PASS02	Jégföld, birodalmi csata
+MAP_SUNGZI_SNOW_PASS01	Jégföld, birodalmi csata
+MAP_SUNGZI_SNOW	Jégföld, birodalmi csata
+MAP_SUNGZI_FLAME_HILL_03	Tűzföld, birodalmi csata
+MAP_SUNGZI_FLAME_HILL_02	Tűzföld, birodalmi csata
+MAP_SUNGZI_FLAME_HILL_01	Tűzföld, birodalmi csata
+MAP_SUNGZI_DESERT_HILL_03	Sivatagi terület, birodalmi csata
+MAP_SUNGZI_DESERT_HILL_02	Sivatagi terület, birodalmi csata
+MAP_SUNGZI_DESERT_HILL_01	Sivatagi terület, birodalmi csata
+MAP_SUNGZI_DESERT_01	Sivatagi terület, birodalmi csata
+MAP_SUNGZI	Birodalmi csata
+MAP_SPIDERDUNGEON_03	Pók kazamata 3
+MAP_SPIDERDUNGEON_02_1	Pók kazamata 2
+MAP_SPIDERDUNGEON_02	Pók kazamata 2
+MAP_SPIDERDUNGEON	Pók kazamata 1
 MAP_TEMPLE	Hwang templom
 MAP_THUNDER	Mennydörgés-hegység
 MAP_TREE	Lungsam
+MAP_WEDDING_01	Esküvői terület
+MAP_TRENT_A	
+MAP_TRENT02_A	Vörös Erdő
+MAP_TRENT02	Vörös Erdő
+MAP_TRENT	Szellem-erdő
 MAP_WL	Kígyórét
+MAP_WL_01	Kígyórét
 MESSENGER_ADD_FRIEND	Barát hozzáadása
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s felvett barátnak.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Elfogadod?
@@ -279,6 +375,7 @@ MESSENGER_INPUT_MOBILE_PHONE_NUMBER_1	Add meg a mobilszámot az sms küldéshez.
 MESSENGER_INPUT_MOBILE_PHONE_NUMBER_2	Szeretnéd megadni a számot most?
 MESSENGER_INPUT_MOBILE_PHONE_NUMBER_TITLE	Mobilszám megadás
 MESSENGER_SEND_MOBILE_MESSAGE_TITLE	Üzenet küldés
+METIN_TEST	
 MINIMAP	Nyitott Mini térkép
 MINIMAP_CANNOT_SEE	Nem jeleníthető meg a mini térkép.
 MINIMAP_CAN_NOT_SHOW_AREAMAP	Nem jeleníthető meg nagy térkép.
@@ -311,7 +408,7 @@ PARTY_DO_YOU_JOIN	 meghívott a csoportjába. Elfogadod?
 PARTY_EXP_DISTRIBUTION_MODE	EXP elosztás
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL	Szint függő
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL_TOOLTIP	A magasabb szintű csoporttagok több EXP-et kapnak.
-PARTY_EXP_DISTRIBUTION_MODE_PARITY	egyenletes
+PARTY_EXP_DISTRIBUTION_MODE_PARITY	Egyenletes
 PARTY_EXP_DISTRIBUTION_MODE_PARITY_TOOLTIP	Minden csoporttag azonos mennyiségű EXP-t kap.
 PARTY_HEAL_ALL_MEMBER	Mindent újratermelni
 PARTY_INCREASE_AREA_150	A csoport hatótávolsága másfélszeresére növelve.	SNA
--- a/assets/locale/locale/it/locale_game.txt
+++ b/assets/locale/locale/it/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Amministra diritti
 GUILD_TILE_INFO	Informazioni della Gilda
 GUILD_TILE_MEMBER	Membro della Gilda
 GUILD_TILE_SKILL	Abilità della Gilda
+GUILD_WAR4	Area della Guerra tra Gilde
+GUILD_WAR3	Area della Guerra tra Gilde
+GUILD_WAR2	Area della Guerra tra Gilde
+GUILD_WAR1	Area della Guerra tra Gilde
+GUILD_VILLAGE_03	Daeyami
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_01	Miryang
 GUILD_WAR_LIMIT_30MIN	Tempo: 30 minuti
 GUILD_WAR_REWARD_POTION	Ricompensa: Il vincitore riceve pozioni.
 GUILD_WAR_USE_BATTLE_MAP	Usa il campo di battaglia della Gilda
@@ -249,35 +256,112 @@ MAP_AG	Jungrang
 MAP_B1	Zona Joan
 MAP_B2	Valle di Imji
 MAP_B3	Zona Bokjung
+MAP_BATTLE_FIELD	Zona di combattimento
 MAP_BAY	Baia Nefrite
+MAP_BAYBLACKSAND	Baia Nefrite
 MAP_BG	Waryong
 MAP_C1	Zona Pyungmoo
 MAP_C2	Valle di Bangsan
 MAP_C3	Zona Bakra
 MAP_CAPE	Capo Fuoco del Drago
+MAP_CAPEDRAGONHEAD	Capo Fuoco del Drago
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Tempio dello Zodiaco
 MAP_DAWN	Falesia di Gautama
+MAP_DAWNMIST_DUNGEON_01	Foresta Incantata
+MAP_DAWNMISTWOOD	Falesia di Gautama
 MAP_DESERT	Deserto Yongbi
+MAP_EMPIREWAR03	Battaglia per il Castello
+MAP_EMPIREWAR02	Battaglia per il Castello
+MAP_EMPIREWAR01	Battaglia per il Castello
+MAP_E	Colonia
+MAP_DUEL	Arena Esercitazioni Belliche
+MAP_DEVILTOWER1	Torre dei Demoni
+MAP_DEVILCATACOMB	Catacomba del Diavolo
 MAP_FLAME	Doyyumhwan
+MAP_MILGYO	Tempio Hwang
+MAP_HOLYPLACE_ICE	Terra dei Ghiacci - Guerra dei Regni
+MAP_HOLYPLACE_FLAME	Terra di Fuoco - Guerra dei Regni
+MAP_HOLYPLACE_DESERT	Terra dei Deserti - Guerra dei Regni
+MAP_GUILD_03	Imha
+MAP_GUILD_02	Waryong
+MAP_GUILD_01	Jungrang
 MAP_MILGYO_A	
+MAP_MT_TH_DUNGEON_01	Tempio degli Ochao
+MAP_MT_THUNDER	Monti Tonanti
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON	Hasun Dong
 MAP_NUSLUCK	Terra Giganti
+MAP_N_DESERT_01	Deserto Yongbi
+MAP_NUSLUCK01	Terra dei Giganti
 MAP_N_DESERT_02	
+MAP_N_FLAME_01	Terra di Fuoco
 MAP_N_FLAME_02	
+MAP_N_SNOWM_01	Monte Sohan
+MAP_N_FLAME_DUNGEON_01	Fortezza del Drago Rosso
+MAP_N_FLAME_DRAGON	Rifugio di Meley
 MAP_N_SNOWM_02	
+MAP_PATHWAY_ICE_03	Terra dei Ghiacci - Guerra dei Regni
+MAP_PATHWAY_ICE_02	Spassolandia
+MAP_PATHWAY_ICE_01	Terra dei Ghiacci - Guerra dei Regni
+MAP_PATHWAY_FLAME_03	Terra di Fuoco - Guerra dei Regni
+MAP_PATHWAY_FLAME_02	Terra di Fuoco - Guerra dei Regni
+MAP_PATHWAY_FLAME_01	Terra di Fuoco - Guerra dei Regni
+MAP_PATHWAY_DESERT_03	Terra dei Deserti - Guerra dei Regni
+MAP_PATHWAY_DESERT_02	Terra dei Deserti - Guerra dei Regni
+MAP_PATHWAY_DESERT_01	Terra dei Deserti - Guerra dei Regni
+MAP_OXEVENT	Gara OX
+MAP_N_THREEWAY	Valle di Seungryong
+MAP_N_SNOW_DUNGEON_01	Torre di Vedetta di Nemere
 MAP_SKELTOWER	Torre di Gumsan
+MAP_SKIPIA_DUNGEON_01	Grotta dell'Esilio
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Grotta dell'Esilio 2
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS_3	Sotterraneo dei Ragni 3
+MAP_SKIPIA_DUNGEON_BOSS_2	Sotterraneo dei Ragni 2
+MAP_SKIPIA_DUNGEON_BOSS_1	Sotterraneo dei Ragni 1
+MAP_SKIPIA_DUNGEON_BOSS	Stanza del Drago
 MAP_SNOW	Monte Sohan
 MAP_SPIDER	Kuahlo Dong
+MAP_T4	Area della Guerra tra Gilde
+MAP_T3	Area della Guerra tra Gilde
+MAP_T2	Area della Guerra tra Gilde
+MAP_T1	Area della Guerra tra Gilde
+MAP_SUNGZI_SNOW_PASS03	Terra dei Ghiacci - Guerra dei Regni
+MAP_SUNGZI_SNOW_PASS02	Terra dei Ghiacci - Guerra dei Regni
+MAP_SUNGZI_SNOW_PASS01	Terra dei Ghiacci - Guerra dei Regni
+MAP_SUNGZI_SNOW	Terra dei Ghiacci - Guerra dei Regni
+MAP_SUNGZI_FLAME_HILL_03	Terra di Fuoco - Guerra dei Regni
+MAP_SUNGZI_FLAME_HILL_02	Terra di Fuoco - Guerra dei Regni
+MAP_SUNGZI_FLAME_HILL_01	Terra di Fuoco - Guerra dei Regni
+MAP_SUNGZI_DESERT_HILL_03	Terra dei Deserti - Guerra dei Regni
+MAP_SUNGZI_DESERT_HILL_02	Terra dei Deserti - Guerra dei Regni
+MAP_SUNGZI_DESERT_HILL_01	Terra dei Deserti - Guerra dei Regni
+MAP_SUNGZI_DESERT_01	Terra dei Deserti - Guerra dei Regni
+MAP_SUNGZI	Guerra dei Regni
+MAP_SPIDERDUNGEON_03	Sotterraneo dei Ragni 3
+MAP_SPIDERDUNGEON_02_1	Sotterraneo dei Ragni 2
+MAP_SPIDERDUNGEON_02	Sotterraneo dei Ragni 2
+MAP_SPIDERDUNGEON	Sotterraneo dei Ragni 1
 MAP_TEMPLE	Tempio Hwang
 MAP_THUNDER	Monti Tonanti
 MAP_TREE	Lungsam
+MAP_TRENT02_A	Bosco Rosso
+MAP_TRENT02	Bosco Rosso
+MAP_TRENT	Bosco Fantasma
 MAP_TRENT_A	
+MAP_WEDDING_01	Mappa dei Matrimoni
 MAP_WL	Campo Serpi
+MAP_WL_01	Campo Serpi
 MESSENGER_ADD_FRIEND	Aggiungi amico
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s vuole essere tuo amico.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Accetti?
--- a/assets/locale/locale/it/mob_proto
+++ b/assets/locale/locale/it/mob_proto
--- a/assets/locale/locale/nl/locale_game.txt
+++ b/assets/locale/locale/nl/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Rechten Beheer
 GUILD_TILE_INFO	Gilde Informatie	
 GUILD_TILE_MEMBER	Gilde Leden	
 GUILD_TILE_SKILL	Gilde Vaardigheden	
+GUILD_WAR4	Gilde Oorlog Gebied
+GUILD_WAR3	Gilde Oorlog Gebied
+GUILD_WAR2	Gilde Oorlog Gebied
+GUILD_WAR1	Gilde Oorlog Gebied
+GUILD_VILLAGE_03	Daeyami
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_01	Miryang
 GUILD_WAR_LIMIT_30MIN	Tijd: 30 Minuten	
 GUILD_WAR_REWARD_POTION	Prijs: De winnaar ontvangt een Brouwsel	
 GUILD_WAR_USE_BATTLE_MAP	Locatie: Gilde Oorlog Theater
@@ -249,35 +256,112 @@ MAP_AG	Jungrang
 MAP_B1	Joan Gebied	
 MAP_B2	Imji Vallei
 MAP_B3	Bokjung Gebied
+MAP_BATTLE_FIELD	Strijd Zone
 MAP_BAY	Baai van Nefriet
+MAP_BAYBLACKSAND	Baai van Nefriet
 MAP_BG	Waryong
 MAP_C1	Pyungmo Gebied
 MAP_C2	Bangsan Vallei
 MAP_C3	Bakra Gebied
 MAP_CAPE	Cape Drakenvuur
+MAP_CAPEDRAGONHEAD	Cape Drakenvuur
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Zodiac Tempel
 MAP_DAWN	Gautama Klif
+MAP_DAWNMIST_DUNGEON_01	Betoverde Woud
+MAP_DAWNMISTWOOD	Gautama Klif
 MAP_DESERT	Yongbi Woestijn	
+MAP_EMPIREWAR03	Kasteelgevecht
+MAP_EMPIREWAR02	Kasteelgevecht
+MAP_EMPIREWAR01	Kasteelgevecht
+MAP_E	Kolonie
+MAP_DUEL	Trainingsgevecht Gebied
+MAP_DEVILTOWER1	Demonen Toren
+MAP_DEVILCATACOMB	Duivelse Catacomben
 MAP_FLAME	Doyyumhwan
+MAP_MILGYO	Hwang Tempel
+MAP_HOLYPLACE_ICE	IJsland Koninkrijk Gevecht
+MAP_HOLYPLACE_FLAME	Vuurland Koninkrijk Gevecht
+MAP_HOLYPLACE_DESERT	Woestijnland Koninkrijk Gevecht
+MAP_GUILD_03	Imha
+MAP_GUILD_02	Waryong
+MAP_GUILD_01	Jungrang
 MAP_MILGYO_A	
+MAP_MT_TH_DUNGEON_01	Tempel van de Ochao
+MAP_MT_THUNDER	Donder Gebergte
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON	Hasun Dong
 MAP_NUSLUCK	Reuzen Land
+MAP_N_DESERT_01	Yongbi Woestijn
+MAP_NUSLUCK01	Reuzen Land
 MAP_N_DESERT_02	
+MAP_N_FLAME_01	Vuurland
 MAP_N_FLAME_02	
+MAP_N_SNOWM_01	Berg Sohan
+MAP_N_FLAME_DUNGEON_01	Rode Draken Fort
+MAP_N_FLAME_DRAGON	Meley's Hol
 MAP_N_SNOWM_02	
+MAP_PATHWAY_ICE_03	IJsland Koninkrijk Gevecht
+MAP_PATHWAY_ICE_02	Speelland
+MAP_PATHWAY_ICE_01	IJsland Koninkrijk Gevecht
+MAP_PATHWAY_FLAME_03	Vuurland Koninkrijk Gevecht
+MAP_PATHWAY_FLAME_02	Vuurland Koninkrijk Gevecht
+MAP_PATHWAY_FLAME_01	Vuurland Koninkrijk Gevecht
+MAP_PATHWAY_DESERT_03	Woestijnland Koninkrijk Gevecht
+MAP_PATHWAY_DESERT_02	Woestijnland Koninkrijk Gevecht
+MAP_PATHWAY_DESERT_01	Woestijnland Koninkrijk Gevecht
+MAP_OXEVENT	OX-wedstrijd
+MAP_N_THREEWAY	Vallei van Seungryong
+MAP_N_SNOW_DUNGEON_01	Nemeres Uitkijktoren
 MAP_SKELTOWER	Gumsan Toren
+MAP_SKIPIA_DUNGEON_01	Grot der Verbanning
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Grot der Verbanning 2
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS_3	Spinnenkerker 3
+MAP_SKIPIA_DUNGEON_BOSS_2	Spinnenkerker 2
+MAP_SKIPIA_DUNGEON_BOSS_1	Spinnenkerker 1
+MAP_SKIPIA_DUNGEON_BOSS	Drakentempel
 MAP_SNOW	Berg Sohan
 MAP_SPIDER	Kuahlo Dong
+MAP_T4	Gilde Oorlog Gebied
+MAP_T3	Gilde Oorlog Gebied
+MAP_T2	Gilde Oorlog Gebied
+MAP_T1	Gilde Oorlog Gebied
+MAP_SUNGZI_SNOW_PASS03	IJsland Koninkrijk Gevecht
+MAP_SUNGZI_SNOW_PASS02	IJsland Koninkrijk Gevecht
+MAP_SUNGZI_SNOW_PASS01	IJsland Koninkrijk Gevecht
+MAP_SUNGZI_SNOW	IJsland Koninkrijk Gevecht
+MAP_SUNGZI_FLAME_HILL_03	Vuurland Koninkrijk Gevecht
+MAP_SUNGZI_FLAME_HILL_02	Vuurland Koninkrijk Gevecht
+MAP_SUNGZI_FLAME_HILL_01	Vuurland Koninkrijk Gevecht
+MAP_SUNGZI_DESERT_HILL_03	Woestijnland Koninkrijk Gevecht
+MAP_SUNGZI_DESERT_HILL_02	Woestijnland Koninkrijk Gevecht
+MAP_SUNGZI_DESERT_HILL_01	Woestijnland Koninkrijk Gevecht
+MAP_SUNGZI_DESERT_01	Woestijnland Koninkrijk Gevecht
+MAP_SUNGZI	Koninkrijk Gevecht
+MAP_SPIDERDUNGEON_03	Spinnenkerker 3
+MAP_SPIDERDUNGEON_02_1	Spinnenkerker 2
+MAP_SPIDERDUNGEON_02	Spinnenkerker 2
+MAP_SPIDERDUNGEON	Spinnenkerker 1
 MAP_TEMPLE	Hwang Tempel	
 MAP_THUNDER	Donder Gebergte
 MAP_TREE	Lungsam	
+MAP_TRENT02_A	Rood Bos
+MAP_TRENT02	Rode Bos
+MAP_TRENT	Spoken Woud
 MAP_TRENT_A	
+MAP_WEDDING_01	Trouwkaart
 MAP_WL	Slangenveld
+MAP_WL_01	Slangenveld
 MESSENGER_ADD_FRIEND	Voeg Vriend toe	
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s heeft je als vriend toegevoegd.	
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Accepteren?	
--- a/assets/locale/locale/nl/mob_proto
+++ b/assets/locale/locale/nl/mob_proto
--- a/assets/locale/locale/pl/locale_game.txt
+++ b/assets/locale/locale/pl/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Zarządzanie Prawami
 GUILD_TILE_INFO	Informacje o Gildii
 GUILD_TILE_MEMBER	Członkowie Gildii
 GUILD_TILE_SKILL	Umiejętności Gildii
+GUILD_WAR4	Obszar Wojny Gildii
+GUILD_WAR3	Obszar Wojny Gildii
+GUILD_WAR2	Obszar Wojny Gildii
+GUILD_WAR1	Obszar Wojny Gildii
+GUILD_VILLAGE_03	Daeyami
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_01	Miryang
 GUILD_WAR_LIMIT_30MIN	Czas: 30 Minut
 GUILD_WAR_REWARD_POTION	Nagroda: Zwycięzca otrzymuje Miksturę
 GUILD_WAR_USE_BATTLE_MAP	Miejsce: Teatr Wojny Gildii
@@ -249,35 +256,112 @@ MAP_AG	Jungrang
 MAP_B1	Strefa Joan
 MAP_B2	Dolina Imji
 MAP_B3	Strefa Bokjung
+MAP_BATTLE_FIELD	Strefa Walki
 MAP_BAY	Nefrytowa Zatoka
+MAP_BAYBLACKSAND	Nefrytowa Zatoka
 MAP_BG	Waryong
 MAP_C1	Strefa Pyungmoo
 MAP_C2	Dolina Bangsan
 MAP_C3	Strefa Bakra
 MAP_CAPE	Przylądek Smoczego Ognia
+MAP_CAPEDRAGONHEAD	Przylądek Smoczego Ognia
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Świątynia Zodiaku
 MAP_DAWN	Klif Gautama
+MAP_DAWNMIST_DUNGEON_01	Zaklęty Las
+MAP_DAWNMISTWOOD	Klif Gautama
 MAP_DESERT	Pustynia Yongbi
+MAP_EMPIREWAR03	Walka o Zamek
+MAP_EMPIREWAR02	Walka o Zamek
+MAP_EMPIREWAR01	Walka o Zamek
+MAP_E	Kolonia
+MAP_DUEL	Arena Treningowa
+MAP_DEVILTOWER1	Wieża Demonów
+MAP_DEVILCATACOMB	Diabelskie Katakumby
 MAP_FLAME	Doyyumhwan
+MAP_MILGYO	Świątynia Hwang
+MAP_HOLYPLACE_ICE	Wojna Królestw - Lodowa Ziemia
+MAP_HOLYPLACE_FLAME	Wojna Królestw - Ognista Ziemia
+MAP_HOLYPLACE_DESERT	Wojna Królestw - Pustynna Kraina
+MAP_GUILD_03	Imha
+MAP_GUILD_02	Waryong
+MAP_GUILD_01	Jungrang
 MAP_MILGYO_A	
+MAP_MT_TH_DUNGEON_01	Świątynia Ochao
+MAP_MT_THUNDER	Gromiste Góry
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON	Hasun Dong
 MAP_NUSLUCK	Kraina Gigantów
+MAP_N_DESERT_01	Pustynia Yongbi
+MAP_NUSLUCK01	Kraina Gigantów
 MAP_N_DESERT_02	
+MAP_N_FLAME_01	Ognista Ziemia
 MAP_N_FLAME_02	
+MAP_N_SNOWM_01	Góra Sohan
+MAP_N_FLAME_DUNGEON_01	Twierdza Czerwonego Smoka
+MAP_N_FLAME_DRAGON	Schronienie Meley
 MAP_N_SNOWM_02	
+MAP_PATHWAY_ICE_03	Wojna Królestw - Lodowa Ziemia
+MAP_PATHWAY_ICE_02	Plac Zabaw
+MAP_PATHWAY_ICE_01	Wojna Królestw - Lodowa Ziemia
+MAP_PATHWAY_FLAME_03	Wojna Królestw - Ognista Ziemia
+MAP_PATHWAY_FLAME_02	Wojna Królestw - Ognista Ziemia
+MAP_PATHWAY_FLAME_01	Wojna Królestw - Ognista Ziemia
+MAP_PATHWAY_DESERT_03	Wojna Królestw - Pustynna Kraina
+MAP_PATHWAY_DESERT_02	Wojna Królestw - Pustynna Kraina
+MAP_PATHWAY_DESERT_01	Wojna Królestw - Pustynna Kraina
+MAP_OXEVENT	Konkurs OX
+MAP_N_THREEWAY	Dolina Seungryong
+MAP_N_SNOW_DUNGEON_01	Strażnica Nemere
 MAP_SKELTOWER	Wieża Gumsan
+MAP_SKIPIA_DUNGEON_01	Grota Wygnańców
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Grota Wygnańców
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS_3	Loch Pająków 3
+MAP_SKIPIA_DUNGEON_BOSS_2	Loch Pająków 2
+MAP_SKIPIA_DUNGEON_BOSS_1	Loch Pająków 1
+MAP_SKIPIA_DUNGEON_BOSS	Świątynia Smoka
 MAP_SNOW	Góra Sohan
 MAP_SPIDER	Kuahlo Dong
+MAP_T4	Obszar Wojny Gildii
+MAP_T3	Obszar Wojny Gildii
+MAP_T2	Obszar Wojny Gildii
+MAP_T1	Obszar Wojny Gildii
+MAP_SUNGZI_SNOW_PASS03	Wojna Królestw - Lodowa Ziemia
+MAP_SUNGZI_SNOW_PASS02	Wojna Królestw - Lodowa Ziemia
+MAP_SUNGZI_SNOW_PASS01	Wojna Królestw - Lodowa Ziemia
+MAP_SUNGZI_SNOW	Wojna Królestw - Lodowa Ziemia
+MAP_SUNGZI_FLAME_HILL_03	Wojna Królestw - Ognista Ziemia
+MAP_SUNGZI_FLAME_HILL_02	Wojna Królestw - Ognista Ziemia
+MAP_SUNGZI_FLAME_HILL_01	Wojna Królestw - Ognista Ziemia
+MAP_SUNGZI_DESERT_HILL_03	Wojna Królestw - Pustynny Kraj
+MAP_SUNGZI_DESERT_HILL_02	Wojna Królestw - Pustynny Kraj
+MAP_SUNGZI_DESERT_HILL_01	Wojna Królestw - Pustynny Kraj
+MAP_SUNGZI_DESERT_01	Wojna Królestw - Pustynny Kraj
+MAP_SUNGZI	Wojna Królestw
+MAP_SPIDERDUNGEON_03	Loch Pająków 3
+MAP_SPIDERDUNGEON_02_1	Loch Pająków 2
+MAP_SPIDERDUNGEON_02	Loch Pająków 2
+MAP_SPIDERDUNGEON	Loch Pająków 1
 MAP_TEMPLE	Świątynia Hwang
 MAP_THUNDER	Gromiste Góry
 MAP_TREE	Lungsam
+MAP_TRENT02_A	Czerwony Las
+MAP_TRENT02	Czerwony Las
+MAP_TRENT	Las Duchów
 MAP_TRENT_A	
+MAP_WEDDING_01	Mapa Wesela
 MAP_WL	Wężowe Pole
+MAP_WL_01	Wężowe Pole
 MESSENGER_ADD_FRIEND	Dodaj Przyjaciela
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s dodał Cię jako przyjaciela.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Zaakceptować?
@@ -326,7 +410,7 @@ PARTY_DO_YOU_JOIN	,  zaprasza Cię do swojej grupy. Czy chcesz przyjąć zaprosz
 PARTY_EXP_DISTRIBUTION_MODE	Podział DOŚ
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL	zależy od poziomu
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL_TOOLTIP	Członkowie grupy o wyższym poziomie otrzymują więcej PD.
-PARTY_EXP_DISTRIBUTION_MODE_PARITY	równo
+PARTY_EXP_DISTRIBUTION_MODE_PARITY	Równo
 PARTY_EXP_DISTRIBUTION_MODE_PARITY_TOOLTIP	Wszyscy otrzymują taką samą ilość PD.
 PARTY_HEAL_ALL_MEMBER	Odnów wszystko.
 PARTY_INCREASE_AREA_150	Zasięg grupy zwiększony o współczynnik 1,5.	SNA
--- a/assets/locale/locale/pl/mob_proto
+++ b/assets/locale/locale/pl/mob_proto
--- a/assets/locale/locale/pt/locale_game.txt
+++ b/assets/locale/locale/pt/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Administração de Permissões
 GUILD_TILE_INFO	Informação da Guild
 GUILD_TILE_MEMBER	Membros da Guild
 GUILD_TILE_SKILL	Habilidades de Guild
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Área de Guerras de Guilds
+GUILD_WAR2	Área de Guerras de Guilds
+GUILD_WAR3	Área de Guerras de Guilds
+GUILD_WAR4	Área de Guerras de Guilds
 GUILD_WAR_LIMIT_30MIN	Duração: 30 Minutos
 GUILD_WAR_REWARD_POTION	Recompensa: O vencedor recebe uma Poção.
 GUILD_WAR_USE_BATTLE_MAP	Localização: Arena de Guerra
@@ -244,26 +251,77 @@ MALL_PASSWORD_TITLE	Palavra-passe
 MAP_A1	Área Yongan
 MAP_A2	Vale de Seungryong
 MAP_A2_1	
+MAP_A2_1	
 MAP_A3	Área Yayang
 MAP_AG	Jungrang
 MAP_B1	Área Joan
 MAP_B2	Vale Imji
 MAP_B3	Área Bokjung
+MAP_BATTLE_FIELD	Zona de Combate
 MAP_BAY	Baía de Nephrite
+MAP_BAYBLACKSAND	Baía de Nephrite
 MAP_BG	Waryong
 MAP_C1	Área Pyungmoo
 MAP_C2	Vale Bangsan
 MAP_C3	Área Bakra
 MAP_CAPE	Cabo Fogo de Dragão
+MAP_CAPEDRAGONHEAD	Cabo Fogo de Dragão
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Templo do Zodíaco
 MAP_DAWN	Falésia de Gautama
+MAP_DAWNMISTWOOD	Falésia de Gautama
+MAP_DAWNMIST_DUNGEON_01	Floresta Encantada
 MAP_DESERT	Deserto de Yongbi
+MAP_DEVILCATACOMB	Catacumbas do Demónio
+MAP_DEVILTOWER1	Torre Demoníaca
+MAP_DUEL	Arena de Lutas de Treino
+MAP_E	Colónia
+MAP_EMPIREWAR01	Batalha do Castelo
+MAP_EMPIREWAR02	Batalha do Castelo
+MAP_EMPIREWAR03	Batalha do Castelo
 MAP_FLAME	Doyyumhwan
 MAP_MILGYO_A	
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	Guerra dos Reinos - Terra do Deserto
+MAP_HOLYPLACE_FLAME	Guerra dos Reinos - Terra do Fogo
+MAP_HOLYPLACE_ICE	Guerra dos Reinos - Terra do Gelo
+MAP_MILGYO	Templo Hwang
+MAP_MILGYO_A	
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MT_THUNDER	Montanhas do Trovão
+MAP_MT_TH_DUNGEON_01	Templo dos Ochao
 MAP_NUSLUCK	Jotunheim
 MAP_N_DESERT_02	
 MAP_N_FLAME_02	
 MAP_N_SNOWM_02	
+MAP_NUSLUCK01	Terra dos Gigantes
+MAP_N_DESERT_01	Deserto Yongbi
+MAP_N_DESERT_02	
+MAP_N_FLAME_01	Terra do Fogo
+MAP_N_FLAME_02	
+MAP_N_FLAME_DRAGON	Covil de Meley
+MAP_N_FLAME_DUNGEON_01	Forte do Dragão Vermelho
+MAP_N_SNOWM_01	Montanha Sohan
+MAP_N_SNOWM_02	
+MAP_N_SNOW_DUNGEON_01	Torre de Vigia de Nemere
+MAP_N_THREEWAY	Vale Seungryong
+MAP_OXEVENT	Concurso OX
+MAP_PATHWAY_DESERT_01	Guerra dos Reinos - Terra do Deserto
+MAP_PATHWAY_DESERT_02	Guerra dos Reinos - Terra do Deserto
+MAP_PATHWAY_DESERT_03	Guerra dos Reinos - Terra do Deserto
+MAP_PATHWAY_FLAME_01	Guerra dos Reinos - Terra do Fogo
+MAP_PATHWAY_FLAME_02	Guerra dos Reinos - Terra do Fogo
+MAP_PATHWAY_FLAME_03	Guerra dos Reinos - Terra do Fogo
+MAP_PATHWAY_ICE_01	Guerra dos Reinos - Terra do Gelo
+MAP_PATHWAY_ICE_02	Terra do Jogo
+MAP_PATHWAY_ICE_03	Guerra dos Reinos - Terra do Gelo
 MAP_SKELTOWER	Torre Gumsan
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
@@ -271,13 +329,51 @@ MAP_SKIPIA_DUNGEON_013
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_01	Gruta das Almas
+MAP_SKIPIA_DUNGEON_011	
+MAP_SKIPIA_DUNGEON_012	
+MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Gruta das Almas
+MAP_SKIPIA_DUNGEON_021	
+MAP_SKIPIA_DUNGEON_022	
+MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS	Templo do Dragão
+MAP_SKIPIA_DUNGEON_BOSS_1	Caverna das Aranhas 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Caverna das Aranhas 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Caverna das Aranhas 3
 MAP_SNOW	Montanha Sohan
 MAP_SPIDER	Kuahlo Dong
+MAP_SPIDERDUNGEON	Caverna das Aranhas 1
+MAP_SPIDERDUNGEON_02	Caverna das Aranhas 2
+MAP_SPIDERDUNGEON_02_1	Caverna das Aranhas 2
+MAP_SPIDERDUNGEON_03	Caverna das Aranhas 3
+MAP_SUNGZI	Guerra dos Reinos
+MAP_SUNGZI_DESERT_01	Guerra dos Reinos - Terra do Deserto
+MAP_SUNGZI_DESERT_HILL_01	Guerra dos Reinos - Terra do Deserto
+MAP_SUNGZI_DESERT_HILL_02	Guerra dos Reinos - Terra do Deserto
+MAP_SUNGZI_DESERT_HILL_03	Guerra dos Reinos - Terra do Deserto
+MAP_SUNGZI_FLAME_HILL_01	Guerra dos Reinos - Terra do Fogo
+MAP_SUNGZI_FLAME_HILL_02	Guerra dos Reinos - Terra do Fogo
+MAP_SUNGZI_FLAME_HILL_03	Guerra dos Reinos - Terra do Fogo
+MAP_SUNGZI_SNOW	Guerra dos Reinos - Terra do Gelo
+MAP_SUNGZI_SNOW_PASS01	Guerra dos Reinos - Terra do Gelo
+MAP_SUNGZI_SNOW_PASS02	Guerra dos Reinos - Terra do Gelo
+MAP_SUNGZI_SNOW_PASS03	Guerra dos Reinos - Terra do Gelo
+MAP_T1	Área de Guerras de Guilds
+MAP_T2	Área de Guerras de Guilds
+MAP_T3	Área de Guerras de Guilds
+MAP_T4	Área de Guerras de Guilds
 MAP_TEMPLE	Templo Hwang
 MAP_THUNDER	Montanhas do Trovão
 MAP_TREE	Lungsam
 MAP_TRENT_A	
+MAP_TRENT	Floresta Fantasma
+MAP_TRENT02	Bosque Rubro
+MAP_TRENT02_A	Bosque Rubro
+MAP_TRENT_A	
+MAP_WEDDING_01	Mapa de Casamento
 MAP_WL	Planície Seca
+MAP_WL_01	Planície Seca
 MESSENGER_ADD_FRIEND	Adicionar Amigo
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s adicionou-te como amigo.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Aceitar?
--- a/assets/locale/locale/pt/mob_proto
+++ b/assets/locale/locale/pt/mob_proto
--- a/assets/locale/locale/ro/locale_game.txt
+++ b/assets/locale/locale/ro/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Drepturi de Administrare
 GUILD_TILE_INFO	Informații breaslă
 GUILD_TILE_MEMBER	Membrii breslei
 GUILD_TILE_SKILL	Calificarea breslei
+GUILD_WAR4	Zona de Lupta Breasla
+GUILD_WAR3	Zona de Lupta Breasla
+GUILD_WAR2	Zona de Lupta Breasla
+GUILD_WAR1	Zona de Lupta Breasla
+GUILD_VILLAGE_03	Daeyami
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_01	Miryang
 GUILD_WAR_LIMIT_30MIN	Timp: 30 de minute
 GUILD_WAR_REWARD_POTION	Recompensă: Câștigătorul primește licori
 GUILD_WAR_USE_BATTLE_MAP	Locație: Câmpul de Luptă al Breslei
@@ -249,35 +256,112 @@ MAP_AG	Jungrang
 MAP_B1	Ținutul Joan
 MAP_B2	Valea Imji
 MAP_B3	Ținutul Bokjung
+MAP_BATTLE_FIELD	Zonă de Război
 MAP_BAY	Trecatoarea Nephrite
+MAP_BAYBLACKSAND	Trecatoarea Nephrite
 MAP_BG	Waryong
 MAP_C1	Ținutul Pyungmoo
 MAP_C2	Valea Bangsan
 MAP_C3	Ținutul Bakra
 MAP_CAPE	Peninsula Dragon de Foc
+MAP_CAPEDRAGONHEAD	Peninsula Dragon de Foc
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Templul Zodiac
 MAP_DAWN	Stancile Gautama
+MAP_DAWNMIST_DUNGEON_01	Pădurea Fermecată
+MAP_DAWNMISTWOOD	Stancile Gautama
 MAP_DESERT	Deșertul Yongbi
+MAP_EMPIREWAR03	Batalie Castel
+MAP_EMPIREWAR02	Batalie Castel
+MAP_EMPIREWAR01	Batalie Castel
+MAP_E	Colonie
+MAP_DUEL	Arena Antrenament de Lupta
+MAP_DEVILTOWER1	Turnul Demonilor
+MAP_DEVILCATACOMB	Catacomba Diavolului
 MAP_FLAME	Doyyumhwan
+MAP_MILGYO	Templul Hwang
+MAP_HOLYPLACE_ICE	Ţara Îngheţată Bătălia Regatelor
+MAP_HOLYPLACE_FLAME	Tara de Foc Batalia Regatului
+MAP_HOLYPLACE_DESERT	Desert Batalia Regatului
+MAP_GUILD_03	Imha
+MAP_GUILD_02	Waryong
+MAP_GUILD_01	Jungrang
 MAP_MILGYO_A	
+MAP_MT_TH_DUNGEON_01	Templul Ochao
+MAP_MT_THUNDER	Muntii Thunder
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON	Hasun Dong
 MAP_NUSLUCK	Taramul Gigantilor
+MAP_N_DESERT_01	Desertul Yongbi
+MAP_NUSLUCK01	Taramul Gigantilor
 MAP_N_DESERT_02	
+MAP_N_FLAME_01	Tara de Foc
 MAP_N_FLAME_02	
+MAP_N_SNOWM_01	Muntele Sohan
+MAP_N_FLAME_DUNGEON_01	Fortăreaţa Dragonului Roşu
+MAP_N_FLAME_DRAGON	Adăpostul lui Meley
 MAP_N_SNOWM_02	
+MAP_PATHWAY_ICE_03	Ţara Îngheţată Bătălia Regatelor
+MAP_PATHWAY_ICE_02	Taramul Jocului
+MAP_PATHWAY_ICE_01	Ţara Îngheţată Bătălia Regatelor
+MAP_PATHWAY_FLAME_03	Tara de Foc Batalia Regatului
+MAP_PATHWAY_FLAME_02	Tara de Foc Batalia Regatului
+MAP_PATHWAY_FLAME_01	Tara de Foc Batalia Regatului
+MAP_PATHWAY_DESERT_03	Desert Batalia Regatului
+MAP_PATHWAY_DESERT_02	Desert Batalia Regatului
+MAP_PATHWAY_DESERT_01	Desert Batalia Regatului
+MAP_OXEVENT	Concurs OX
+MAP_N_THREEWAY	Valea Seungryong
+MAP_N_SNOW_DUNGEON_01	Turnul lui Nemere
 MAP_SKELTOWER	Turnul Gumsan
+MAP_SKIPIA_DUNGEON_01	Grota Exilului
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Grota Exilului 2
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS_3	Temniţa Păianjenilor 3
+MAP_SKIPIA_DUNGEON_BOSS_2	Temniţa Păianjenilor 2
+MAP_SKIPIA_DUNGEON_BOSS_1	Temniţa Păianjenilor 1
+MAP_SKIPIA_DUNGEON_BOSS	Templul Dragonului
 MAP_SNOW	Muntele Sohan
 MAP_SPIDER	Kuahlo Dong
+MAP_T4	Zona de Lupta Breasla
+MAP_T3	Zona de Lupta Breasla
+MAP_T2	Zona de Lupta Breasla
+MAP_T1	Zona de Lupta Breasla
+MAP_SUNGZI_SNOW_PASS03	Ţara Îngheţată Bătălia Regatelor
+MAP_SUNGZI_SNOW_PASS02	Ţara Îngheţată Bătălia Regatelor
+MAP_SUNGZI_SNOW_PASS01	Ţara Îngheţată Bătălia Regatelor
+MAP_SUNGZI_SNOW	Ţara Îngheţată Bătălia Regatelor
+MAP_SUNGZI_FLAME_HILL_03	Tara de Foc Batalia Regatului
+MAP_SUNGZI_FLAME_HILL_02	Tara de Foc Batalia Regatului
+MAP_SUNGZI_FLAME_HILL_01	Tara de Foc Batalia Regatului
+MAP_SUNGZI_DESERT_HILL_03	Desert Batalia Regatului
+MAP_SUNGZI_DESERT_HILL_02	Desert Batalia Regatului
+MAP_SUNGZI_DESERT_HILL_01	Desert Batalia Regatului
+MAP_SUNGZI_DESERT_01	Desert Batalia Regatului
+MAP_SUNGZI	Batalia Regatului
+MAP_SPIDERDUNGEON_03	Temniţa Păianjenilor 3
+MAP_SPIDERDUNGEON_02_1	Temniţa Păianjenilor 2
+MAP_SPIDERDUNGEON_02	Temniţa Păianjenilor 2
+MAP_SPIDERDUNGEON	Temniţa Păianjenilor 1
 MAP_TEMPLE	Templul Hwang
 MAP_THUNDER	Muntii Thunder
 MAP_TREE	Lungsam
+MAP_TRENT02_A	Padurea Rosie
+MAP_TRENT02	Padurea Rosie
+MAP_TRENT	Padurea Fantoma
 MAP_TRENT_A	
+MAP_WEDDING_01	Harta Casatoriilor
 MAP_WL	Valea Serpilor
+MAP_WL_01	Valea Serpilor
 MESSENGER_ADD_FRIEND	Adaugă prieten
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s te-a acceptat ca prieten.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Accepți?
--- a/assets/locale/locale/ro/mob_proto
+++ b/assets/locale/locale/ro/mob_proto
--- a/assets/locale/locale/ru/locale_game.txt
+++ b/assets/locale/locale/ru/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Управление позицией
 GUILD_TILE_INFO	Гильдия-инфо
 GUILD_TILE_MEMBER	Члены гильдии
 GUILD_TILE_SKILL	Навыки гильдии
+GUILD_VILLAGE_01	Мирйанг
+GUILD_VILLAGE_02	Сонгпа
+GUILD_VILLAGE_03	Даэйами
+GUILD_WAR1	Территория войны гильдий
+GUILD_WAR2	Территория войны гильдий
+GUILD_WAR3	Территория войны гильдий
+GUILD_WAR4	Территория войны гильдий
 GUILD_WAR_LIMIT_30MIN	Время: 30 минут
 GUILD_WAR_REWARD_POTION	Награда: победитель получает зелье
 GUILD_WAR_USE_BATTLE_MAP	Местность: арена войны гильдий
@@ -249,35 +256,112 @@ MAP_AG	Юнгранг
 MAP_B1	Земля Йоан
 MAP_B2	Долина Имджи
 MAP_B3	Земля Бокъюнг
+MAP_BATTLE_FIELD	Поле боя
 MAP_BAY	Нефритовый залив
+MAP_BAYBLACKSAND	Нефритовый залив
 MAP_BG	Варйонг
 MAP_C1	Земля Пуингмо
 MAP_C2	Долина Бангзан
 MAP_C3	Земля Бакра
 MAP_CAPE	Мыс пламя дракона
+MAP_CAPEDRAGONHEAD	Мыс пламя дракона
 MAP_CG	Имха
+MAP_CZ_DUNGEON	Храм Зодиака
 MAP_DAWN	Утес Гаутама
+MAP_DAWNMISTWOOD	Утес Гаутама
+MAP_DAWNMIST_DUNGEON_01	Зачарованный лес
 MAP_DESERT	Пустыня Йонгби
+MAP_DEVILCATACOMB	Катакомбы дьявола
+MAP_DEVILTOWER1	Башня демонов
+MAP_DUEL	Арена для учебных боев
+MAP_E	Колония
+MAP_EMPIREWAR01	Битва Замков
+MAP_EMPIREWAR02	Битва Замков
+MAP_EMPIREWAR03	Битва Замков
 MAP_FLAME	Доюмхван
+MAP_GUILD_01	Юнгранг
+MAP_GUILD_02	Варйонг
+MAP_GUILD_03	Имха
+MAP_HOLYPLACE_DESERT	Битва Империй-Пустынные земли
+MAP_HOLYPLACE_FLAME	Битва Империй-Огненные земли
+MAP_HOLYPLACE_ICE	Битва Империй-Ледяные земли
+MAP_MILGYO	Храм Хванг
 MAP_MILGYO_A	
+MAP_MONKEY_DUNGEON	Хасун Донг
+MAP_MONKEY_DUNGEON2	Юнгсун Донг
+MAP_MONKEY_DUNGEON3	Сангсун Донг
+MAP_MONKEY_DUNGEON_11	Хасун Донг
+MAP_MONKEY_DUNGEON_12	Хасун Донг
+MAP_MONKEY_DUNGEON_13	Хасун Донг
+MAP_MT_THUNDER	Горы грома
+MAP_MT_TH_DUNGEON_01	Храм Окао
 MAP_NUSLUCK	Земля Громил
+MAP_NUSLUCK01	Земля Громил
+MAP_N_DESERT_01	Пустыня Йонгби
 MAP_N_DESERT_02	
+MAP_N_FLAME_01	Огненные земли
 MAP_N_FLAME_02	
+MAP_N_FLAME_DRAGON	Сокровищница Мелеи
+MAP_N_FLAME_DUNGEON_01	Крепость красного дракона
+MAP_N_SNOWM_01	Гора Сохан
 MAP_N_SNOWM_02	
+MAP_N_SNOW_DUNGEON_01	Башня Немера
+MAP_N_THREEWAY	Долина Сеунгрийонг
+MAP_OXEVENT	OX-соревнование
+MAP_PATHWAY_DESERT_01	Битва Империй-Пустынные земли
+MAP_PATHWAY_DESERT_02	Битва Империй-Пустынные земли
+MAP_PATHWAY_DESERT_03	Битва Империй-Пустынные земли
+MAP_PATHWAY_FLAME_01	Битва Империй-Огненные земли
+MAP_PATHWAY_FLAME_02	Битва Империй-Огненные земли
+MAP_PATHWAY_FLAME_03	Битва Империй-Огненные земли
+MAP_PATHWAY_ICE_01	Битва Империй-Ледяные земли
+MAP_PATHWAY_ICE_02	Страна Развлечений
+MAP_PATHWAY_ICE_03	Битва Империй-Ледяные земли
 MAP_SKELTOWER	Башня Гумсан
+MAP_SKIPIA_DUNGEON_01	Грот изгнанников
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Грот изгнанников 2
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS	Логово дракона
+MAP_SKIPIA_DUNGEON_BOSS_1	Подземелье пауков 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Подземелье пауков 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Подземелье пауков 3
 MAP_SNOW	Гора Сохан
 MAP_SPIDER	Куало Донг
+MAP_SPIDERDUNGEON	Подземелье пауков 1
+MAP_SPIDERDUNGEON_02	Подземелье пауков 2
+MAP_SPIDERDUNGEON_02_1	Подземелье пауков 2
+MAP_SPIDERDUNGEON_03	Подземелье пауков 3
+MAP_SUNGZI	Битва Империй
+MAP_SUNGZI_DESERT_01	Битва Империй-Пустынные земли
+MAP_SUNGZI_DESERT_HILL_01	Битва Империй-Пустынные земли
+MAP_SUNGZI_DESERT_HILL_02	Битва Империй-Пустынные земли
+MAP_SUNGZI_DESERT_HILL_03	Битва Империй-Пустынные земли
+MAP_SUNGZI_FLAME_HILL_01	Битва Империй-Огненные земли
+MAP_SUNGZI_FLAME_HILL_02	Битва Империй-Огненные земли
+MAP_SUNGZI_FLAME_HILL_03	Битва Империй-Огненные земли
+MAP_SUNGZI_SNOW	Битва Империй-Ледяные земли
+MAP_SUNGZI_SNOW_PASS01	Битва Империй-Ледяные земли
+MAP_SUNGZI_SNOW_PASS02	Битва Империй-Ледяные земли
+MAP_SUNGZI_SNOW_PASS03	Битва Империй-Ледяные земли
+MAP_T1	Территория войны гильдий
+MAP_T2	Территория войны гильдий
+MAP_T3	Территория войны гильдий
+MAP_T4	Территория войны гильдий
 MAP_TEMPLE	Храм Хванг
 MAP_THUNDER	Горы грома
 MAP_TREE	Лунгсам
+MAP_TRENT	Призрачный лес
+MAP_TRENT02	Красный лес
+MAP_TRENT02_A	Красный лес
 MAP_TRENT_A	
+MAP_WEDDING_01	Свадебная локация
 MAP_WL	Змеиное поле
+MAP_WL_01	Змеиное Поле
 MESSENGER_ADD_FRIEND	Добавить друга
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s принял вас в список друзей.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Принять?
@@ -326,7 +410,7 @@ PARTY_DO_YOU_JOIN	 пригласил вас в группу. Принять п
 PARTY_EXP_DISTRIBUTION_MODE	Распределение опыта
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL	В зависимости от уровня
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL_TOOLTIP	Участники группы с более высоким уровнем получают больше опыта.
-PARTY_EXP_DISTRIBUTION_MODE_PARITY	равномерно
+PARTY_EXP_DISTRIBUTION_MODE_PARITY	Равномерно
 PARTY_EXP_DISTRIBUTION_MODE_PARITY_TOOLTIP	Все участники группы получают одинаковое количество опыта.
 PARTY_HEAL_ALL_MEMBER	Восстановить всё
 PARTY_INCREASE_AREA_150	Диапазон группы увеличен в 1,5 раза.	SNA
--- a/assets/locale/locale/ru/mob_proto
+++ b/assets/locale/locale/ru/mob_proto
--- a/assets/locale/locale/tr/locale_game.txt
+++ b/assets/locale/locale/tr/locale_game.txt
@@ -178,6 +178,13 @@ GUILD_TILE_GRADE	Yönetici Pozisyonu
 GUILD_TILE_INFO	Lonca bilgileri
 GUILD_TILE_MEMBER	Lonca üyeleri
 GUILD_TILE_SKILL	Lonca becerisi
+GUILD_VILLAGE_01	Miryang
+GUILD_VILLAGE_02	Songpa
+GUILD_VILLAGE_03	Daeyami
+GUILD_WAR1	Lonca Savaşı Bölgesi
+GUILD_WAR2	Lonca Savaşı Bölgesi
+GUILD_WAR3	Lonca Savaşı Bölgesi
+GUILD_WAR4	Lonca Savaşı Bölgesi
 GUILD_WAR_LIMIT_30MIN	Zaman: 30 dakika
 GUILD_WAR_REWARD_POTION	Ödül: Yenen iksir kazanacak
 GUILD_WAR_USE_BATTLE_MAP	Yer: Lonca Savaşı Arenası
@@ -249,35 +256,112 @@ MAP_AG	Jungrang
 MAP_B1	Joan Bölgesi
 MAP_B2	Imji Vadisi
 MAP_B3	Bokjung Bölgesi
+MAP_BATTLE_FIELD	Savaş Bölgesi
 MAP_BAY	Nefrit Körfezi
+MAP_BAYBLACKSAND	Nefrit Körfezi
 MAP_BG	Waryong
 MAP_C1	Pyungmoo Bölgesi
 MAP_C2	Bangsan Vadisi
 MAP_C3	Bakra Bölgesi
 MAP_CAPE	Ejderha Ateşi Burnu
+MAP_CAPEDRAGONHEAD	Ejderha Ateşi Burnu
 MAP_CG	Imha
+MAP_CZ_DUNGEON	Zodyak Tapınağı
 MAP_DAWN	Gautama Uçurumu
+MAP_DAWNMISTWOOD	Gautama Uçurumu
+MAP_DAWNMIST_DUNGEON_01	Efsunlu Orman
 MAP_DESERT	Yongbi Çölü
+MAP_DEVILCATACOMB	Şeytan Katakombu
+MAP_DEVILTOWER1	Şeytan Kulesi
+MAP_DUEL	Eğitim Dövüşü Arenası
+MAP_E	Koloni
+MAP_EMPIREWAR01	Kale Savaşı
+MAP_EMPIREWAR02	Kale Savaşı
+MAP_EMPIREWAR03	Kale Savaşı
 MAP_FLAME	Doyyumhwan
+MAP_GUILD_01	Jungrang
+MAP_GUILD_02	Waryong
+MAP_GUILD_03	Imha
+MAP_HOLYPLACE_DESERT	İmparatorluk Savaşı - Çöl Diyarı
+MAP_HOLYPLACE_FLAME	İmparatorluk Savaşı - Ateş Diyarı
+MAP_HOLYPLACE_ICE	İmparatorluk Savaşı - Buz Dağı
+MAP_MILGYO	Hwang Tapınağı
 MAP_MILGYO_A	
+MAP_MONKEY_DUNGEON	Hasun Dong
+MAP_MONKEY_DUNGEON2	Jungsun Dong
+MAP_MONKEY_DUNGEON3	Sangsun Dong
+MAP_MONKEY_DUNGEON_11	Hasun Dong
+MAP_MONKEY_DUNGEON_12	Hasun Dong
+MAP_MONKEY_DUNGEON_13	Hasun Dong
+MAP_MT_THUNDER	Yıldırım Dağları
+MAP_MT_TH_DUNGEON_01	Ochao Tapınağı
 MAP_NUSLUCK	Devler Diyarı
+MAP_NUSLUCK01	Devler Diyarı
+MAP_N_DESERT_01	Yongbi Çölü
 MAP_N_DESERT_02	
+MAP_N_FLAME_01	Ateş Diyarı
 MAP_N_FLAME_02	
+MAP_N_FLAME_DRAGON	Meley'in İni
+MAP_N_FLAME_DUNGEON_01	Kırmızı Ejderha Kalesi
+MAP_N_SNOWM_01	Sohan Dağı
 MAP_N_SNOWM_02	
+MAP_N_SNOW_DUNGEON_01	Nemere Gözlemevi
+MAP_N_THREEWAY	Seungryong Vadisi
+MAP_OXEVENT	OX-yarışması
+MAP_PATHWAY_DESERT_01	İmparatorluk Savaşı - Çöl Diyarı
+MAP_PATHWAY_DESERT_02	İmparatorluk Savaşı - Çöl Diyarı
+MAP_PATHWAY_DESERT_03	İmparatorluk Savaşı - Çöl Diyarı
+MAP_PATHWAY_FLAME_01	İmparatorluk Savaşı - Ateş Diyarı
+MAP_PATHWAY_FLAME_02	İmparatorluk Savaşı - Ateş Diyarı
+MAP_PATHWAY_FLAME_03	İmparatorluk Savaşı - Ateş Diyarı
+MAP_PATHWAY_ICE_01	İmparatorluk Savaşı - Buz Dağı
+MAP_PATHWAY_ICE_02	Oyun Parkı
+MAP_PATHWAY_ICE_03	İmparatorluk Savaşı - Buz Dağı
 MAP_SKELTOWER	Gumsan Kulesi
+MAP_SKIPIA_DUNGEON_01	Sürgün Mağarası
 MAP_SKIPIA_DUNGEON_011	
 MAP_SKIPIA_DUNGEON_012	
 MAP_SKIPIA_DUNGEON_013	
+MAP_SKIPIA_DUNGEON_02	Sürgün Mağarası 2
 MAP_SKIPIA_DUNGEON_021	
 MAP_SKIPIA_DUNGEON_022	
 MAP_SKIPIA_DUNGEON_023	
+MAP_SKIPIA_DUNGEON_BOSS	Ejderha Tapınağı
+MAP_SKIPIA_DUNGEON_BOSS_1	Örümcek Zindanı 1
+MAP_SKIPIA_DUNGEON_BOSS_2	Örümcek Zindanı 2
+MAP_SKIPIA_DUNGEON_BOSS_3	Örümcek Zindanı 3
 MAP_SNOW	Sohan Dağı
 MAP_SPIDER	Kuahlo Dong
+MAP_SPIDERDUNGEON	Örümcek Zindanı 1
+MAP_SPIDERDUNGEON_02	Örümcek Zindanı 2
+MAP_SPIDERDUNGEON_02_1	Örümcek Zindanı 2
+MAP_SPIDERDUNGEON_03	Örümcek Zindanı 3
+MAP_SUNGZI	İmparatorluk Savaşı
+MAP_SUNGZI_DESERT_01	İmparatorluk Savaşı - Çöl Diyarı
+MAP_SUNGZI_DESERT_HILL_01	İmparatorluk Savaşı - Çöl Diyarı
+MAP_SUNGZI_DESERT_HILL_02	İmparatorluk Savaşı - Çöl Diyarı
+MAP_SUNGZI_DESERT_HILL_03	İmparatorluk Savaşı - Çöl Diyarı
+MAP_SUNGZI_FLAME_HILL_01	İmparatorluk Savaşı - Ateş Diyarı
+MAP_SUNGZI_FLAME_HILL_02	İmparatorluk Savaşı - Ateş Diyarı
+MAP_SUNGZI_FLAME_HILL_03	İmparatorluk Savaşı - Ateş Diyarı
+MAP_SUNGZI_SNOW	İmparatorluk Savaşı - Buz Dağı
+MAP_SUNGZI_SNOW_PASS01	İmparatorluk Savaşı - Buz Dağı
+MAP_SUNGZI_SNOW_PASS02	İmparatorluk Savaşı - Buz Dağı
+MAP_SUNGZI_SNOW_PASS03	İmparatorluk Savaşı - Buz Dağı
+MAP_T1	Lonca Savaşı Bölgesi
+MAP_T2	Lonca Savaşı Bölgesi
+MAP_T3	Lonca Savaşı Bölgesi
+MAP_T4	Lonca Savaşı Bölgesi
 MAP_TEMPLE	Hwang Tapınağı
 MAP_THUNDER	Yıldırım Dağları
 MAP_TREE	Lungsam
+MAP_TRENT	Hayalet Ormanı
+MAP_TRENT02	Kırmızı Orman
+MAP_TRENT02_A	Kızıl Orman
 MAP_TRENT_A	
+MAP_WEDDING_01	Düğün Köyü
 MAP_WL	Yılan Vadisi
+MAP_WL_01	Yılan Vadisi
 MESSENGER_ADD_FRIEND	Arkadaş ekle
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_1	%s seni arkadaş olarak ekledi.
 MESSENGER_DO_YOU_ACCEPT_ADD_FRIEND_2	Kabul et?
@@ -326,7 +410,7 @@ PARTY_DO_YOU_JOIN	 seni grubuna davet ediyor. Kabul etmek istiyor musun?
 PARTY_EXP_DISTRIBUTION_MODE	EXP paylaşımı
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL	seviyeye bağlı
 PARTY_EXP_DISTRIBUTION_MODE_LEVEL_TOOLTIP	Yüksek seviyeli grup üyeleri daha fazla EXP kazanıyor.
-PARTY_EXP_DISTRIBUTION_MODE_PARITY	eşit
+PARTY_EXP_DISTRIBUTION_MODE_PARITY	Eşit
 PARTY_EXP_DISTRIBUTION_MODE_PARITY_TOOLTIP	Tüm grup üyeleri aynı EXP i alır.
 PARTY_HEAL_ALL_MEMBER	Her şeyi yükle.
 PARTY_INCREASE_AREA_150	Grup kuruluş faktör aralığı 1,5.	SNA
--- a/assets/locale/locale/tr/mob_proto
+++ b/assets/locale/locale/tr/mob_proto
--- a/assets/root/constinfo.py
+++ b/assets/root/constinfo.py
@@ -11,16 +11,16 @@ FOG_LEVEL0 = 4800.0
 FOG_LEVEL1 = 9600.0
 FOG_LEVEL2 = 12800.0
 FOG_LEVEL = FOG_LEVEL0
-FOG_LEVEL_LIST=[FOG_LEVEL0, FOG_LEVEL1, FOG_LEVEL2]
+FOG_LEVEL_LIST = [FOG_LEVEL0, FOG_LEVEL1, FOG_LEVEL2]

 CAMERA_MAX_DISTANCE_SHORT = 2500.0
 CAMERA_MAX_DISTANCE_LONG = 3500.0
-CAMERA_MAX_DISTANCE_LIST=[CAMERA_MAX_DISTANCE_SHORT, CAMERA_MAX_DISTANCE_LONG]
+CAMERA_MAX_DISTANCE_LIST = [CAMERA_MAX_DISTANCE_SHORT, CAMERA_MAX_DISTANCE_LONG]
 CAMERA_MAX_DISTANCE = CAMERA_MAX_DISTANCE_SHORT

 CHRNAME_COLOR_INDEX = 0

-ENVIRONMENT_NIGHT="d:/ymir work/environment/moonlight04.msenv"
+ENVIRONMENT_NIGHT = "d:/ymir work/environment/moonlight04.msenv"

 # constant
 HIGH_PRICE = 500000
@@ -69,6 +69,13 @@ def SET_ITEM_QUESTION_DIALOG_STATUS(flag):
 import app
 import net

+# MR-10: Add accessorySocketTimeCache for real-time remaining time display of accessory sockets.
+# Cache for accessory/belt socket timers so they persist across UI reloads.
+if not hasattr(app, "_accessorySocketTimeCache"):
+	app._accessorySocketTimeCache = {}
+ACCESSORY_SOCKET_TIME_CACHE = app._accessorySocketTimeCache
+# MR-10: -- END OF -- Add accessorySocketTimeCache for real-time remaining time display of accessory sockets.
+
 ########################

 def SET_DEFAULT_FOG_LEVEL():
@@ -194,11 +201,12 @@ def GET_ACCESSORY_MATERIAL_VNUM(vnum, subType):
 		EAR_ITEM_VNUM_BASE = 17000
 		ret -= EAR_ITEM_VNUM_BASE

-	type = ret//20
+	type = ret // 20

-	if type<0 or type>=len(ACCESSORY_MATERIAL_LIST):
-		type = (ret-170) // 20
-		if type<0 or type>=len(ACCESSORY_MATERIAL_LIST):
+	if type < 0 or type >= len(ACCESSORY_MATERIAL_LIST):
+		type = (ret - 170) // 20
+
+		if type < 0 or type >= len(ACCESSORY_MATERIAL_LIST):
 			return 0

 	return ACCESSORY_MATERIAL_LIST[type]
--- a/assets/root/mousemodule.py
+++ b/assets/root/mousemodule.py
@@ -26,9 +26,14 @@ class CursorImage(object):
 		self.handle = 0
 		self.LoadImage(imageName)

+	# MR-10: Fix mouse destruction
 	def __del__(self):
-		if grpImage and self.handle:
-			grpImage.Delete(self.handle)
+		try:
+			if grpImage and self.handle and hasattr(grpImage, "Delete"):
+				grpImage.Delete(self.handle)
+		except:
+			pass
+	# MR-10: -- END OF -- Fix mouse destruction

 	def LoadImage(self, imageName):
 		try:
--- a/assets/root/uiaffectshower.py
+++ b/assets/root/uiaffectshower.py
@@ -231,19 +231,32 @@ class AutoPotionImage(ui.ExpandedImageBox):
 			self.LoadImage(fileName)
 		except:
 			import dbg
-			dbg.TraceError("AutoPotionImage.__Refresh(potionType=%d) - LoadError %s" % (self.potionType, fileName))
+			dbg.TraceError("AutoPotionImage.__Refresh(potionType = %d) - LoadError %s" % (self.potionType, fileName))

 		self.SetScale(0.7, 0.7)

 		self.toolTip.ClearToolTip()
-		
-		if player.AUTO_POTION_TYPE_HP == type:
+
+		# MR-10: Add toolTip support and real-time countdown for affects
+		itemName = None
+
+		if slotIndex >= 0:
+			itemVnum = player.GetItemIndex(slotIndex)
+
+			if itemVnum:
+				item.SelectItem(itemVnum)
+				itemName = item.GetItemName()
+
+		if itemName:
+			self.toolTip.SetTitle(itemName)
+		elif player.AUTO_POTION_TYPE_HP == self.potionType:
 			self.toolTip.SetTitle(localeInfo.TOOLTIP_AUTO_POTION_HP)
 		else:
 			self.toolTip.SetTitle(localeInfo.TOOLTIP_AUTO_POTION_SP)
-			
-		self.toolTip.AppendTextLine(localeInfo.TOOLTIP_AUTO_POTION_REST	% (amountPercent))
+
+		self.toolTip.AppendTextLine(localeInfo.TOOLTIP_AUTO_POTION_REST % (amountPercent))
 		self.toolTip.ResizeToolTip()
+		# MR-10: -- END OF -- Add toolTip support and real-time countdown for affects

 	def OnMouseOverIn(self):
 		self.toolTip.ShowToolTip()
@@ -259,11 +272,18 @@ class AffectImage(ui.ExpandedImageBox):
 		ui.ExpandedImageBox.__init__(self)

 		self.toolTipText = None
-		self.isSkillAffect = TRUE
+		# MR-10: Add toolTip support and real-time countdown for affects
+		self.toolTip = None
+		self.dsTimeCache = {}
+		self.isHover = False
+		# MR-10: -- END OF -- Add toolTip support and real-time countdown for affects
+		self.isSkillAffect = True
 		self.description = None
 		self.endTime = 0
 		self.affect = None
-		self.isClocked = TRUE
+		self.isClocked = True
+		self.autoPotionToolTipTitle = None
+		self.autoPotionToolTipLine = None

 	def SetAffect(self, affect):
 		self.affect = affect
@@ -275,10 +295,12 @@ class AffectImage(ui.ExpandedImageBox):

 		if not self.toolTipText:
 			textLine = ui.TextLine()
+
 			textLine.SetParent(self)
 			textLine.SetSize(0, 0)
 			textLine.SetOutline()
 			textLine.Hide()
+
 			self.toolTipText = textLine
 			
 		self.toolTipText.SetText(text)
@@ -290,15 +312,16 @@ class AffectImage(ui.ExpandedImageBox):

 	def SetDuration(self, duration):
 		self.endTime = 0
+
+		# MR-10: Add toolTip support and real-time countdown for affects
 		if duration > 0:
 			self.endTime = app.GetGlobalTimeStamp() + duration
-			leftTime = localeInfo.RTSecondToDHMS(self.endTime - app.GetGlobalTimeStamp())
-			self.toolTip.AppendTextLine("(%s : %s)" % (localeInfo.LEFT_TIME, leftTime))
-			self.toolTip.ResizeToolTip()
+		# MR-10: -- END OF -- Add toolTip support and real-time countdown for affects

 	def UpdateAutoPotionDescription(self):		
 		
 		potionType = 0
+
 		if self.affect == chr.NEW_AFFECT_AUTO_HP_RECOVERY:
 			potionType = player.AUTO_POTION_TYPE_HP
 		else:
@@ -315,21 +338,164 @@ class AffectImage(ui.ExpandedImageBox):
 		except:
 			amountPercent = 100.0
 		
-		self.SetToolTipText(self.description % amountPercent, 0, 40)
+		# MR-10: Add toolTip support and real-time countdown for affects
+		if not self.isHover:
+			return
+
+		self.__EnsureToolTip()
+
+		itemName = None
+
+		if slotIndex >= 0:
+			itemVnum = player.GetItemIndex(slotIndex)
+
+			if itemVnum:
+				item.SelectItem(itemVnum)
+				itemName = item.GetItemName()
+
+		if itemName:
+			title = itemName
+		elif player.AUTO_POTION_TYPE_HP == potionType:
+			title = localeInfo.TOOLTIP_AUTO_POTION_HP
+		else:
+			title = localeInfo.TOOLTIP_AUTO_POTION_SP
+
+		line = self.description % amountPercent
+
+		if self.autoPotionToolTipTitle == title and self.autoPotionToolTipLine == line:
+			return
+
+		self.toolTip.ClearToolTip()
+		self.toolTip.SetTitle(title)
+		self.toolTip.AppendTextLine(line)
+		self.toolTip.ResizeToolTip()
+		self.autoPotionToolTipTitle = title
+		self.autoPotionToolTipLine = line
+		# MR-10: -- END OF -- Add toolTip support and real-time countdown for affects
 		
 	def SetClock(self, isClocked):
 		self.isClocked = isClocked
 		
+	# MR-10: Add toolTip support and real-time countdown for affects
 	def UpdateDescription(self):
+		if self.__IsDragonSoulAffect():
+			if self.isHover:
+				self.__UpdateDragonSoulDescription()
+
+				if self.toolTip:
+					self.toolTip.ShowToolTip()
+			return
+
 		if not self.isClocked:
+			self.__UpdateDescription2()
 			return

 		if not self.description:
 			return

-		if self.endTime > 0:
-			leftTime = localeInfo.RTSecondToDHMS(self.endTime - app.GetGlobalTimeStamp())
-			self.toolTip.childrenList[-1].SetText("(%s : %s)" % (localeInfo.LEFT_TIME, leftTime))
+		if self.__ShouldShowTimedToolTip():
+			if self.isHover:
+				remainSec = max(0, self.endTime - app.GetGlobalTimeStamp())
+				self.__UpdateTimedDescription(remainSec)
+
+				if self.toolTip:
+					self.toolTip.ShowToolTip()
+			return
+
+		self.SetToolTipText(self.description, 0, 40)
+		
+	#독일버전에서 시간을 제거하기 위해서 사용 
+	def __UpdateDescription2(self):
+		if not self.description:
+			return
+
+		toolTip = self.description
+		self.SetToolTipText(toolTip, 0, 40)
+
+	def __EnsureToolTip(self):
+		if not self.toolTip:
+			self.toolTip = uiToolTip.ToolTip(100)
+			self.toolTip.HideToolTip()
+
+	def __IsAutoPotionAffect(self):
+		return self.affect in (chr.NEW_AFFECT_AUTO_HP_RECOVERY, chr.NEW_AFFECT_AUTO_SP_RECOVERY)
+
+	def __ShouldShowTimedToolTip(self):
+		return self.isClocked and self.endTime > 0 and not self.__IsAutoPotionAffect()
+
+	def __UpdateTimedDescription(self, remainSec):
+		if not self.description:
+			return
+
+		self.__EnsureToolTip()
+
+		self.toolTip.ClearToolTip()
+		self.toolTip.SetTitle(self.description)
+		self.toolTip.AppendTextLine("(%s : %s)" % (localeInfo.LEFT_TIME, localeInfo.RTSecondToDHMS(remainSec)))
+		self.toolTip.ResizeToolTip()
+
+	def __IsDragonSoulAffect(self):
+		return self.affect in (chr.NEW_AFFECT_DRAGON_SOUL_DECK1, chr.NEW_AFFECT_DRAGON_SOUL_DECK2)
+
+	def __GetDragonSoulMinRemainSec(self):
+		deckIndex = 0 if self.affect == chr.NEW_AFFECT_DRAGON_SOUL_DECK1 else 1
+		now = app.GetGlobalTimeStamp()
+		minRemain = None
+
+		for i in range(6):
+			slotNumber = deckIndex * player.DRAGON_SOUL_EQUIPMENT_FIRST_SIZE + (player.DRAGON_SOUL_EQUIPMENT_SLOT_START + i)
+			itemVnum = player.GetItemIndex(slotNumber)
+
+			if itemVnum == 0:
+				continue
+
+			item.SelectItem(itemVnum)
+			remainSec = None
+
+			for j in range(item.LIMIT_MAX_NUM):
+				(limitType, limitValue) = item.GetLimit(j)
+
+				if item.LIMIT_REAL_TIME == limitType or item.LIMIT_REAL_TIME_START_FIRST_USE == limitType:
+					endTime = player.GetItemMetinSocket(player.INVENTORY, slotNumber, 0)
+					remainSec = endTime - now
+					break
+
+				if item.LIMIT_TIMER_BASED_ON_WEAR == limitType:
+					rawRemain = player.GetItemMetinSocket(player.INVENTORY, slotNumber, 0)
+					cacheKey = (slotNumber, itemVnum)
+					cache = self.dsTimeCache.get(cacheKey)
+
+					if cache and cache["remainSec"] == rawRemain:
+						remainSec = cache["endTime"] - now
+					else:
+						endTime = now + rawRemain
+						self.dsTimeCache[cacheKey] = {"remainSec": rawRemain, "endTime": endTime}
+						remainSec = endTime - now
+					break
+
+			if remainSec is None or remainSec <= 0:
+				continue
+
+			if minRemain is None or remainSec < minRemain:
+				minRemain = remainSec
+
+		return minRemain
+
+	def __UpdateDragonSoulDescription(self):
+		if not self.description:
+			return
+
+		minRemain = self.__GetDragonSoulMinRemainSec()
+
+		self.__EnsureToolTip()
+		self.toolTip.ClearToolTip()
+		self.toolTip.SetTitle(self.description)
+
+		if minRemain is not None:
+			self.toolTip.AppendTextLine("(%s : %s)" % (localeInfo.LEFT_TIME, localeInfo.RTSecondToDHMS(minRemain)))
+
+		self.toolTip.ResizeToolTip()
+	# MR-10: -- END OF -- Add toolTip support and real-time countdown for affects

 	def SetSkillAffectFlag(self, flag):
 		self.isSkillAffect = flag
@@ -338,12 +504,40 @@ class AffectImage(ui.ExpandedImageBox):
 		return self.isSkillAffect

 	def OnMouseOverIn(self):
+		# MR-10: Add toolTip support and real-time countdown for affects
+		self.isHover = True
+
+		if self.__IsAutoPotionAffect():
+			self.UpdateAutoPotionDescription()
+
+			if self.toolTip:
+				self.toolTip.ShowToolTip()
+			return
+		if self.__IsDragonSoulAffect():
+			self.__UpdateDragonSoulDescription()
+
+			if self.toolTip:
+				self.toolTip.ShowToolTip()
+			return
+		if self.__ShouldShowTimedToolTip():
+			remainSec = max(0, self.endTime - app.GetGlobalTimeStamp())
+			self.__UpdateTimedDescription(remainSec)
+
+			if self.toolTip:
+				self.toolTip.ShowToolTip()
+			return
 		if self.toolTipText:
 			self.toolTipText.Show()

 	def OnMouseOverOut(self):
+		self.isHover = False
+
+		if self.toolTip:
+			self.toolTip.HideToolTip()
+
 		if self.toolTipText:
 			self.toolTipText.Hide()
+		# MR-10: -- END OF -- Add toolTip support and real-time countdown for affects

 class AffectShower(ui.Window):

@@ -526,7 +720,7 @@ class AffectShower(ui.Window):
 				if affect == chr.NEW_AFFECT_EXP_BONUS_EURO_FREE or\
 					affect == chr.NEW_AFFECT_EXP_BONUS_EURO_FREE_UNDER_15 or\
 					self.INFINITE_AFFECT_DURATION < duration:
-					image.SetClock(FALSE)
+					image.SetClock(False)
 					image.UpdateDescription()
 				elif affect == chr.NEW_AFFECT_AUTO_SP_RECOVERY or affect == chr.NEW_AFFECT_AUTO_HP_RECOVERY:
 					image.UpdateAutoPotionDescription()
@@ -537,7 +731,7 @@ class AffectShower(ui.Window):
 					image.SetScale(1, 1)
 				else:
 					image.SetScale(0.7, 0.7)
-				image.SetSkillAffectFlag(FALSE)
+				image.SetSkillAffectFlag(False)
 				image.Show()
 				self.affectImageDict[affect] = image
 				self.__ArrangeImageList()
@@ -618,12 +812,13 @@ class AffectShower(ui.Window):
 		filename = affectData[1]

 		skillIndex = player.AffectIndexToSkillIndex(affect)
+
 		if 0 != skillIndex:
 			name = skill.GetSkillName(skillIndex)

 		image = AffectImage()
 		image.SetParent(self)
-		image.SetSkillAffectFlag(TRUE)
+		image.SetSkillAffectFlag(True)

 		try:
 			image.LoadImage(filename)
@@ -680,9 +875,16 @@ class AffectShower(ui.Window):

 	def OnUpdate(self):		
 		try:
-			if app.GetGlobalTime() - self.lastUpdateTime > 500:
+			# MR-10: Add toolTip support and real-time countdown for affects
+			curTime = app.GetGlobalTime()
+
+			if curTime < self.lastUpdateTime:
+				self.lastUpdateTime = 0
+
+			if curTime - self.lastUpdateTime > 500:
 			#if 0 < app.GetGlobalTime():
-				self.lastUpdateTime = app.GetGlobalTime()
+				self.lastUpdateTime = curTime
+			# MR-10: -- END OF -- Add toolTip support and real-time countdown for affects

 				for image in list(self.affectImageDict.values()):
 					if image.GetAffect() == chr.NEW_AFFECT_AUTO_HP_RECOVERY or image.GetAffect() == chr.NEW_AFFECT_AUTO_SP_RECOVERY:
--- a/assets/root/uiinventory.py
+++ b/assets/root/uiinventory.py
@@ -123,7 +123,7 @@ class BeltInventoryWindow(ui.ScriptWindow):
 	def __del__(self):
 		ui.ScriptWindow.__del__(self)

-	def Show(self, openBeltSlot = FALSE):
+	def Show(self, openBeltSlot = False):
 		self.__LoadWindow()
 		self.RefreshSlot()

@@ -201,9 +201,9 @@ class BeltInventoryWindow(ui.ScriptWindow):
 			for i in range(item.BELT_INVENTORY_SLOT_COUNT):
 				slotNumber = item.BELT_INVENTORY_SLOT_START + i
 				wndBeltInventorySlot.SetCoverButton(slotNumber,	"d:/ymir work/ui/game/quest/slot_button_01.sub",\
-												"d:/ymir work/ui/game/quest/slot_button_01.sub",\
-												"d:/ymir work/ui/game/quest/slot_button_01.sub",\
-												"d:/ymir work/ui/game/belt_inventory/slot_disabled.tga", FALSE, FALSE)
+											"d:/ymir work/ui/game/quest/slot_button_01.sub",\
+											"d:/ymir work/ui/game/quest/slot_button_01.sub",\
+											"d:/ymir work/ui/game/belt_inventory/slot_disabled.tga", False, False)
 			
 		except:
 			import exception
@@ -225,7 +225,7 @@ class BeltInventoryWindow(ui.ScriptWindow):
 		for i in range(item.BELT_INVENTORY_SLOT_COUNT):
 			slotNumber = item.BELT_INVENTORY_SLOT_START + i
 			self.wndBeltInventorySlot.SetItemSlot(slotNumber, getItemVNum(slotNumber), player.GetItemCount(slotNumber))
-			self.wndBeltInventorySlot.SetAlwaysRenderCoverButton(slotNumber, TRUE)
+			self.wndBeltInventorySlot.SetAlwaysRenderCoverButton(slotNumber, True)
 			
 			avail = "0"
 			
@@ -986,19 +986,18 @@ class InventoryWindow(ui.ScriptWindow):
 				if self.__CanAddItemAttr(dstSlotPos):
 					return True
 			elif "USE_ADD_ACCESSORY_SOCKET" == useType:
-				if self.__CanAddAccessorySocket(dstSlotPos):
+				# MR-10: Add belt support for accessory sockets
+				if self.__CanAddAccessorySocket(dstSlotPos) or self.__CanAddBeltSocket(dstSlotPos):
 					return True
+				# MR-10: -- END OF -- Add belt support for accessory sockets
 			elif "USE_PUT_INTO_ACCESSORY_SOCKET" == useType:								
 				if self.__CanPutAccessorySocket(dstSlotPos, srcItemVNum):
-					return TRUE
-			elif "USE_PUT_INTO_BELT_SOCKET" == useType:								
-				dstItemVNum = player.GetItemIndex(dstSlotPos)
-				print(("USE_PUT_INTO_BELT_SOCKET", srcItemVNum, dstItemVNum))
-
-				item.SelectItem(dstItemVNum)
-		
-				if item.ITEM_TYPE_BELT == item.GetItemType():
 					return True
+			elif "USE_PUT_INTO_BELT_SOCKET" == useType:								
+				# MR-10: Add belt support for accessory sockets
+				if self.__CanPutBeltSocket(dstSlotPos, srcItemVNum):
+					return True
+				# MR-10: -- END OF -- Add belt support for accessory sockets

 		return False

@@ -1034,6 +1033,32 @@ class InventoryWindow(ui.ScriptWindow):

 		return False

+	# MR-10: Add belt support for accessory sockets
+	def __CanPutBeltSocket(self, dstSlotPos, mtrlVnum):
+		dstItemVNum = player.GetItemIndex(dstSlotPos)
+		if dstItemVNum == 0:
+			return False
+
+		item.SelectItem(dstItemVNum)
+
+		if item.ITEM_TYPE_BELT != item.GetItemType():
+			return False
+
+		if mtrlVnum != constInfo.GET_BELT_MATERIAL_VNUM(dstItemVNum):
+			return False
+
+		curCount = player.GetItemMetinSocket(dstSlotPos, 0)
+		maxCount = player.GetItemMetinSocket(dstSlotPos, 1)
+
+		if maxCount <= 0:
+			return False
+
+		if curCount >= maxCount:
+			return False
+
+		return True
+	# MR-10: -- END OF -- Add belt support for accessory sockets
+
 	def __CanPutAccessorySocket(self, dstSlotPos, mtrlVnum):
 		dstItemVNum = player.GetItemIndex(dstSlotPos)
 		if dstItemVNum == 0:
@@ -1080,6 +1105,29 @@ class InventoryWindow(ui.ScriptWindow):

 		return True

+	# MR-10: Add belt support for accessory sockets
+	def __CanAddBeltSocket(self, dstSlotPos):
+		dstItemVNum = player.GetItemIndex(dstSlotPos)
+
+		if dstItemVNum == 0:
+			return False
+
+		item.SelectItem(dstItemVNum)
+
+		if item.ITEM_TYPE_BELT != item.GetItemType():
+			return False
+
+		curCount = player.GetItemMetinSocket(dstSlotPos, 0)
+		maxCount = player.GetItemMetinSocket(dstSlotPos, 1)
+
+		ACCESSORY_SOCKET_MAX_SIZE = 3
+
+		if maxCount >= ACCESSORY_SOCKET_MAX_SIZE:
+			return False
+
+		return True
+	# MR-10: -- END OF -- Add belt support for accessory sockets
+
 	def __CanAddItemAttr(self, dstSlotPos):
 		dstItemVNum = player.GetItemIndex(dstSlotPos)
 		if dstItemVNum == 0:
--- a/assets/root/uitooltip.py
+++ b/assets/root/uitooltip.py
@@ -174,9 +174,11 @@ class ToolTip(ui.ThinBoard):

 	def AlignTextLineHorizonalCenter(self):
 		for child in self.childrenList:
-			if type(child).__name__ == "TextLine":
+			# MR-10: Fix element centering in tooltips
+			if type(child).__name__ == "TextLine" and getattr(child, "_centerAlign", False):
 				(x, y) = child.GetLocalPosition()
 				child.SetPosition(self.toolTipWidth / 2, y)
+			# MR-10: -- END OF -- Fix element centering in tooltips

 		self.ResizeToolTip()

@@ -190,6 +192,10 @@ class ToolTip(ui.ThinBoard):
 		textLine.SetFeather(False)
 		textLine.Show()

+		# MR-10: Fix element centering in tooltips
+		textLine._centerAlign = centerAlign
+		# MR-10: -- END OF -- Fix element centering in tooltips
+
 		if centerAlign:
 			textLine.SetPosition(self.toolTipWidth/2, self.toolTipHeight)
 			textLine.SetHorizontalAlignCenter()
@@ -222,6 +228,10 @@ class ToolTip(ui.ThinBoard):
 		if show:
 			textLine.Show()

+		# MR-10: Fix element centering in tooltips
+		textLine._centerAlign = centerAlign
+		# MR-10: -- END OF -- Fix element centering in tooltips
+
 		textWidth, _ = textLine.GetTextSize()
 		textWidth += 20

@@ -503,6 +513,18 @@ class ItemToolTip(ToolTip):
 		self.itemSlotIndex = -1
 		self.wndDragonSoul = None
 		self.dsActivatedTimeCache = {}
+		# MR-10: Add accessorySocketTimeCache for real-time remaining time display of accessory sockets.
+		cache = getattr(app, "_accessorySocketTimeCache", None)
+		if cache is None:
+			cache = getattr(player, "_accessorySocketTimeCache", None)
+		if cache is None:
+			cache = constInfo.ACCESSORY_SOCKET_TIME_CACHE
+			app._accessorySocketTimeCache = cache
+			player._accessorySocketTimeCache = cache
+		constInfo.ACCESSORY_SOCKET_TIME_CACHE = cache
+		self.accessorySocketTimeCache = cache
+		# MR-10: -- END OF -- Add accessorySocketTimeCache for real-time remaining time display of accessory sockets.
+		self.hairIcon = None

 	def __del__(self):
 		ToolTip.__del__(self)
@@ -577,6 +599,14 @@ class ItemToolTip(ToolTip):
 		return ToolTip.AppendTextLineTime(self, endTime, getLimit, color)

 	def ClearToolTip(self):
+		# MR-10: Fix element centering in tooltips
+		hairIcon = getattr(self, "hairIcon", None)
+
+		if hairIcon:
+			hairIcon.Hide()
+			self.hairIcon = None
+		# MR-10: -- END OF -- Fix element centering in tooltips
+
 		self.isShopItem = False
 		self.toolTipWidth = self.TOOL_TIP_WIDTH
 		self.itemWindowType = None
@@ -1357,11 +1387,30 @@ class ItemToolTip(ToolTip):
 		elif self.__IsCostumeHair(itemVnum):
 			itemImage.LoadImage("icon/hair/%d.sub" % (itemVnum - 100000))

-		itemImage.SetPosition(itemImage.GetWidth()/2, self.toolTipHeight)
+		# MR-10: Fix element centering in tooltips
+		self.hairIcon = itemImage
+		xPos = max(0, (self.toolTipWidth - itemImage.GetWidth()) / 2)
+
+		itemImage.SetPosition(xPos, self.toolTipHeight)
+		# MR-10: -- END OF -- Fix element centering in tooltips
 		self.toolTipHeight += itemImage.GetHeight()
 		#self.toolTipWidth += itemImage.GetWidth()/2
 		self.childrenList.append(itemImage)
 		self.ResizeToolTip()
+		# MR-10: Fix element centering in tooltips
+		self.__CenterHairIcon()
+		# MR-10: -- END OF -- Fix element centering in tooltips
+
+	# MR-10: Fix element centering in tooltips
+	def __CenterHairIcon(self):
+		if not self.hairIcon:
+			return
+
+		(xPos, yPos) = self.hairIcon.GetLocalPosition()
+		xPos = max(0, (self.toolTipWidth - self.hairIcon.GetWidth()) / 2)
+
+		self.hairIcon.SetPosition(xPos, yPos)
+	# MR-10: -- END OF -- Fix element centering in tooltips

 	## If the Description is large, adjust the tooltip size.
 	def __AdjustMaxWidth(self, attrSlot, desc):
@@ -1371,6 +1420,10 @@ class ItemToolTip(ToolTip):
 		if newToolTipWidth > self.toolTipWidth:
 			self.toolTipWidth = newToolTipWidth
 			self.ResizeToolTip()
+			# MR-10: Fix element centering in tooltips
+			self.AlignTextLineHorizonalCenter()
+			self.__CenterHairIcon()
+			# MR-10: -- END OF -- Fix element centering in tooltips

 	def __AdjustAttrMaxWidth(self, attrSlot):
 		if 0 == attrSlot:
@@ -1406,6 +1459,11 @@ class ItemToolTip(ToolTip):
 	def ResizeToolTipWidth(self, width):
 		self.toolTipWidth = width

+		# MR-10: Fix element centering in tooltips
+		self.AlignTextLineHorizonalCenter()
+		self.__CenterHairIcon()
+		# MR-10: -- END OF -- Fix element centering in tooltips
+
 	def __CalculateToolTipWidth(self):
 		affectTextLineLenList = []

@@ -1430,6 +1488,10 @@ class ItemToolTip(ToolTip):

 		self.AlignTextLineHorizonalCenter()

+		# MR-10: Fix element centering in tooltips
+		self.__CenterHairIcon()
+		# MR-10: -- END OF -- Fix element centering in tooltips
+
 	def __SetSkillBookToolTip(self, skillIndex, bookName, skillGrade):
 		skillName = skill.GetSkillName(skillIndex)

@@ -1854,8 +1916,21 @@ class ItemToolTip(ToolTip):
 				self.childrenList.append(affectTextLine)
 				self.toolTipHeight += 16 + 2

+			# MR-10: Add real-time remaining time display for accessory sockets.
 			if 0 != leftTime:
-				timeText = (localeInfo.LEFT_TIME + " : " + localeInfo.RTSecondToDHMS(leftTime))
+				isEquipped = False
+
+				if self.itemWindowType == player.INVENTORY and self.itemSlotIndex >= 0:
+					isEquipped = player.IsEquipmentSlot(self.itemSlotIndex)
+
+				if isEquipped:
+					endTime = self.__GetAccessorySocketEndTime(leftTime, index)
+					leftSec = max(0, endTime - app.GetGlobalTimeStamp())
+					timeText = localeInfo.LEFT_TIME + " : " + localeInfo.RTSecondToDHMS(leftSec)
+				else:
+					endTime = None
+					timeText = localeInfo.LEFT_TIME + " : " + localeInfo.RTSecondToDHMS(leftTime)
+			# MR-10: -- END OF -- Add real-time remaining time display for accessory sockets.

 				timeTextLine = ui.TextLine()
 				timeTextLine.SetParent(self)
@@ -1867,6 +1942,12 @@ class ItemToolTip(ToolTip):
 				timeTextLine.Show()
 				timeTextLine.SetText(timeText)
 				self.childrenList.append(timeTextLine)
+
+				# MR-10: Add real-time remaining time display for accessory sockets.
+				if isEquipped and endTime is not None:
+					self.timeInfoList.append({"line": timeTextLine, "value": endTime, "limit": None})
+				# MR-10: -- END OF -- Add real-time remaining time display for accessory sockets.
+
 				self.toolTipHeight += 16 + 2

 		else:
@@ -1955,6 +2036,26 @@ class ItemToolTip(ToolTip):
 		self.dsActivatedTimeCache[key] = {"remainSec": remainSec, "endTime": endTime}
 		return endTime
 	
+	# MR-10: Add real-time remaining time display for accessory sockets.
+	def __GetAccessorySocketEndTime(self, remainSec, socketIndex):
+		key = (self.itemWindowType, self.itemSlotIndex, socketIndex, self.itemVnum)
+		cache = self.accessorySocketTimeCache.get(key)
+
+		now = app.GetGlobalTimeStamp()
+
+		if cache:
+			cachedEnd = cache.get("endTime", 0)
+			cachedRemain = cache.get("remainSec", remainSec)
+
+			if cachedEnd > now and remainSec >= cachedRemain:
+				return cachedEnd
+
+		endTime = now + remainSec
+		self.accessorySocketTimeCache[key] = {"remainSec": remainSec, "endTime": endTime}
+
+		return endTime
+	# MR-10: -- END OF -- Add real-time remaining time display for accessory sockets.
+	
 	def AppendRealTimeStartFirstUseLastTime(self, item, metinSlot, limitIndex, getLimit):
 		useCount = metinSlot[1]
 		endTime = metinSlot[0]