* Updated RUS and SPN map_msg translations. (credits: Lilith and jaBote)

* Fixed a quest entry and NPC name for Eden Quests 71-85. (bugreport:7551)
* Added missing barrier resets in Poring War script, credits to Zopokx. (bugreport:7241)
* Removed nonexistant function "SetPalete" from item scripts. (bugreport:7409)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@17267 54d463be-8e91-2dee-dedb-b68131a5f0ec

conf/msg_conf/map_msg_rus.conf

@@ -1,4 +1,4 @@
-// rAthena msg_athena.conf
+// rAthena map_msg_rus.conf
 // Перевод сообщений на русский: Lilith
 // Настройки сообщений
 // Формат:
@@ -449,12 +449,12 @@
 // Сообщения команды @makehomun
 450: У вас уже есть гомункулус
 
-// Предметы, привязанные к аккаунту
-497: Вы не можете обменивать предмет, привязанный к аккаунту!
-
-// @itembound / @itembound2
-498: Нельзя создавать привязанные к аккаунту яйца питомцев или броню.
-499: Нельзя создать предмет.
+// @langtype
+460: Введите существующий язык (Используйте: @langtype <язык>).
+461: Установлен язык %s.
+462: Такой язык не активен.
+463: Файлы сообщений перезагружены.
+464: ---- Доступные языки:
 
 // ----------------------------------------
 // Остальные сообщения
@@ -1378,7 +1378,7 @@
 1376: %s данные не поддерживаются :%u
 
 // @reloadquestdb
-1377: База данных квестов перезагружены.
+1377: База данных квестов перезагружена.
 
 // @addperm
 1378: Использование: %s <название_прав>
@@ -1436,13 +1436,13 @@
 1412: Вы не являетесь владельцем канала '%s'.
 1413: Цвета канала '%s' теперь '%s'.
 1414: ---- Доступные опции:
-1415: * %s create <#название_канала> <channel_password>
+1415: * %s create <#название_канала> <пароль_канала>
 1416: -- Создать новый канал.
 1417: * %s list
 1418: -- Список публичных каналов.
 1419: * %s list colors
 1420: -- Список всех доступных цветов для пользовательских каналов.
-1421: * %s setcolor <#название_канала> <color_name>
+1421: * %s setcolor <#название_канала> <название_цвета>
 1422: -- Изменить цвет сообщений канала (доступно только для владльцев).
 1423: * %s leave <#название_канала>
 1424: -- Отключиться от указанного канала.

conf/msg_conf/map_msg_spn.conf

@@ -451,6 +451,13 @@
 // Homunculus messages
 450: Ya tienes un homúnculo.
 
+// Message System
+460: Por favor, especifica una lengua válida (uso: @langtype <lengua>).
+461: Se ha cambiado tu lengua a %s.
+462: Esta lengua está desactivada en estos momentos.
+463: Se ha vuelto a cargar la configuración de mensajes.
+464: ---- Lenguas disponibles:
+
 // Messages of others (not for GM commands)
 // ----------------------------------------
 

db/pre-re/item_db.txt

@@ -3071,8 +3071,8 @@
 6043,Letter_From_Lugen,Letter from Lugen,3,0,,10,,,,,,,,,,,,,{},{},{}
 6044,Letter_From_Otto,Letter from Otto,3,0,,10,,,,,,,,,,,,,{},{},{}
 6045,Supply_Box,Supply Box,3,0,,0,,,,,,,,,,,,,{},{},{}
-6046,Clothing_Dye_Coupon,Clothing Dye Coupon,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "SetPalete",1; },{},{}
-6047,Clothing_Dye_Coupon_II,Clothing Dye Coupon II,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "SetPalete",2; },{},{}
+6046,Clothing_Dye_Coupon,Clothing Dye Coupon,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+6047,Clothing_Dye_Coupon_II,Clothing Dye Coupon II,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 6048,Unidentified_Mineral,Unidentified Mineral,3,0,,10,,,,,,,,,,,,,{},{},{}
 6049,Marlin,Marlin,3,0,,10,,,,,,,,,,,,,{},{},{}
 6050,Mercenary_Contract,Mercenary Contract,3,0,,10,,,,,,,,,,,,,{},{},{}

db/quest_db.txt

@@ -1504,7 +1504,7 @@
 10115,0,1386,20,0,0,0,0,"Juno - sleeper"
 10116,0,1372,20,0,0,0,0,"Juno - Goat"
 10117,0,1376,20,0,0,0,0,"Juno - Harpy"
-10118,0,1269,10,0,0,0,0,"clock tower - Clock"
+10118,0,1269,15,0,0,0,0,"clock tower - Clock"
 10119,0,1199,15,0,0,0,0,"clock tower - Punk"
 10120,0,1195,15,0,0,0,0,"clock tower - Rideword"
 10121,0,1883,15,0,0,0,0,"Localizing - Uzhas"

db/re/item_db.txt

@@ -3527,8 +3527,8 @@
 6043,Letter_From_Lugen,Letter from Lugen,3,0,,10,,,,,,,,,,,,,{},{},{}
 6044,Letter_From_Otto,Letter from Otto,3,0,,10,,,,,,,,,,,,,{},{},{}
 6045,Supply_Box,Supply Box,3,0,,0,,,,,,,,,,,,,{},{},{}
-6046,Clothing_Dye_Coupon,Clothing Dye Coupon,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "SetPalete",1; },{},{}
-6047,Clothing_Dye_Coupon_II,Clothing Dye Coupon II,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ callfunc "SetPalete",2; },{},{}
+6046,Clothing_Dye_Coupon,Clothing Dye Coupon,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+6047,Clothing_Dye_Coupon_II,Clothing Dye Coupon II,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 6048,Unidentified_Mineral,Unidentified Mineral,3,0,,10,,,,,,,,,,,,,{},{},{}
 6049,Marlin,Marlin,3,0,,10,,,,,,,,,,,,,{},{},{}
 6050,Mercenary_Contract,Mercenary Contract,3,0,,10,,,,,,,,,,,,,{},{},{}

npc/kafras/kafras.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Joseph
 //===== Current Version: ===================================== 
-//= 1.1
+//= 1.1a
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: =========================================
@@ -599,7 +599,7 @@ niflheim,202,180,3	script	Kafra Employee::kaf_niflheim	791,{
 // - Byalan Island
 izlu2dun,106,58,8	script	Kafra Employee::kaf_izlu2dun	115,{
 	cutin "kafra_03",2;
-	if( !checkre(0) && BaseJob==Job_Novice && job_merchant_q2 > 0 ){
+	if (!checkre(0) && BaseJob == Job_Novice && job_merchant_q2 > 0) {
 		// Merchant Job Change Quest
 		// function F_MercKafra is found in /pre-re/jobs/1-1/merchant.txt
 		callfunc "F_MercKafra";

npc/other/poring_war.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 1.1b
+//= 1.2
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -14,6 +14,7 @@
 //= 1.1 Fixed some typos/bugs. [CalciumKid]
 //= 1.1a Fixed Waiting rooms witht he default MAX_LEVEL [Slim]
 //= 1.1b Fixed incorrect label calls. [Euphy]
+//= 1.2 Added missing barrier resets, credits to Zopokx. [Euphy]
 //============================================================
 
 // Poring War Recruiter
@@ -931,23 +932,23 @@ OnStop:
 	end;
 
 OnAngelingWin:
-	removemapflag "poring_w02",mf_partylock;
-	removemapflag "poring_w02",mf_pvp;
-	removemapflag "poring_w02",mf_pvp_noguild;
-	removemapflag "poring_w02",mf_pvp_nocalcrank;
-	mapannounce "poring_w02","Mr. Doppel: Angeling Team of party " + getpartyname($@wop_team_a) + " won the battle!",0,0xf08080;
-	donpcevent "Deviruchi#wop_endmaster::OnEnable";
-	stopnpctimer;
-	end;
-
+	set .@i,1;
 OnDevilingWin:
 	removemapflag "poring_w02",mf_partylock;
 	removemapflag "poring_w02",mf_pvp;
 	removemapflag "poring_w02",mf_pvp_noguild;
 	removemapflag "poring_w02",mf_pvp_nocalcrank;
-	mapannounce "poring_w02","Mr. Doppel: Deviling Team of party " + getpartyname($@wop_team_d) + " won the battle!",0,0xf08080;
+	if (.@i)
+		mapannounce "poring_w02","Mr. Doppel: Angeling Team of party " + getpartyname($@wop_team_a) + " won the battle!",0,0xf08080;
+	else
+		mapannounce "poring_w02","Mr. Doppel: Deviling Team of party " + getpartyname($@wop_team_d) + " won the battle!",0,0xf08080;
 	donpcevent "Deviruchi#wop_endmaster::OnEnable";
 	stopnpctimer;
+	// Reset Barriers
+	donpcevent "#aroom_ingate_wop::OnDisable";
+	donpcevent "#aroom_outgate_wop::OnDisable";
+	donpcevent "#droom_ingate_wop::OnDisable";
+	donpcevent "#droom_outgate_wop::OnDisable";
 	end;
 
 OnTimer5000:

npc/quests/quests_moscovia.txt

@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= Kisuka
 //===== Current Version: ===================================== 
-//= 2.0a
+//= 2.0b
 //===== Compatible With: ===================================== 
 //= rAthena SVN
 //===== Description: ========================================= 
@@ -270,14 +270,14 @@ moscovia,135,52,0	script	Bulletin Board#npc	837,{
 // Mr. Ibanoff - Docks
 //----------------------------------------------------------------------------
 moscovia,135,49,5	script	Mr. Ibanoff#npc	964,{
-	if( !mos_whale_edq ){
+	if (mos_whale_edq == 0) {
 		mes "[Mr. Ibanoff]";
 		mes "You are also an adventurer from another province. I also was a great adventurer.";
 		next;
 		mes "[Mr. Ibanoff]";
 		mes "Uf...I just want to be 20 years younger, so I can travel here and there with invigorating youth such as you... Time is an enemy. Hahahahaha!";
 		close;
-	}else if (mos_whale_edq == 1 || mos_whale_edq == 2) {
+	} else if (mos_whale_edq == 1 || mos_whale_edq == 2) {
 		mes "["+strcharinfo(0)+"]";
 		mes "Hello. Are you Mr. Ibanoff?";
 		next;

npc/re/quests/eden/71-85.txt

@@ -68,9 +68,9 @@ moc_para01,44,38,3	script	Mission [71 - 85]	857,{
 			mes "- I'm asking you to hunt -";
 			mes "- some monster inside of.-";
 			mes "- the Clock Tower, -";
-			mes "- Risingeter. -";
+			mes "- Lisingshetter. -";
 			callsub L_Quest,10105,4;
-			mes "- Look for Risingeter -";
+			mes "- Look for Lisingshetter -";
 			mes "- in front of the -";
 			mes "- Clock Tower. -";
 			close;
@@ -421,17 +421,17 @@ aldebaran,144,230,3	script	Jeanbai	900,{
 	close;
 }
 
-aldebaran,105,116,3	script	Risingeter	869,{
+aldebaran,105,116,3	script	Lisingshetter	869,{
 	if ((checkquest(10118) == 2) && (checkquest(10119) == 2) && (checkquest(10120 == 2)) && (slv_quest == 6)) {
 		set slv_quest,0;
-		mes "[Risingeter]";
+		mes "[Lisingshetter]";
 		mes "You've completed all of my missions.";
 		mes "Amazing~! I will inform the Eden Group.";
 		mes "of your assistance. Thanks again!";
 		close;
 	}
 	if (checkquest(10118) == 1 || checkquest(10119) == 1 || checkquest(10120) == 1) {
-		mes "[Risingeter]";
+		mes "[Lisingshetter]";
 		mes "Wow. Are you done?";
 		mes "So fast~?! Unbelievable~";
 		mes "You were the right person for this mission.";
@@ -440,53 +440,53 @@ aldebaran,105,116,3	script	Risingeter	869,{
 		setarray .@monsters$[0],"Clock","Punk","Rideword";
 		set .@i, select(implode(.@monsters$,":"))-1;
 		if (checkquest(10118+.@i,HUNTING) == 2) {
-			mes "[Risingeter]";
+			mes "[Lisingshetter]";
 			mes "Good! You've hunted 15 "+.@monsters$[.@i]+"s.";
 			mes "Ah, now I can hear the clock sound clearly...";
 			mes "Tic!! toc!! tic!! toc!!...";
 			next;
 			completequest 10118+.@i;
 			getexp 48000,0;
-			mes "[Risingeter]";
+			mes "[Lisingshetter]";
 			mes "Thanks a lot!";
 			mes "I hope you can hunt the rest as well.";
 			mes "Go as soon as you can!";
 			close;
 		}
-		mes "[Risingeter]";
+		mes "[Lisingshetter]";
 		mes "Uh? Something is wrong.";
 		mes "15 "+.@monsters$[.@i]+"s, right?";
 		mes "You better check how many you've hunted.";
 		close;
 	}
 	if (slv_quest == 6) {
-		mes "[Risingeter]";
+		mes "[Lisingshetter]";
 		mes "Hunt 15 Clocks, Punks, and Ridewords.";
 		mes "Please hurry.";
 		close;
 	}
-	mes "[Risingeter]";
+	mes "[Lisingshetter]";
 	mes "I like clocks so much.";
 	mes "They move with regular rhythm";
 	mes "making tic toc sounds.";
 	mes "Ahah!! Hail to the clocks!";
 	next;
-	mes "[Risingeter]";
+	mes "[Lisingshetter]";
 	mes "That's why I like the Clock Tower so much.";
 	mes "It makes a really nice sound.";
 	mes "I like it so much!";
 	if (slv_quest == 4) {
 		next;
-		mes "[Risingeter]";
+		mes "[Lisingshetter]";
 		mes "Uh? Have you come to help me solve my trouble.";
 		mes "You already know I like clocks right?";
 		mes "That's why I need your help to hunt these monsters.";
 		next;
-		mes "[Risingeter]";
+		mes "[Lisingshetter]";
 		mes "There are too many monsters inside the Clock Tower.";
 		mes "Their presence is destroying the Clock Tower.";
 		next;
-		mes "[Risingeter]";
+		mes "[Lisingshetter]";
 		mes "Anyway. Can you help me?";
 		mes "Please hunt 15 Clocks, Punks and Ridewords before it breaks down.";
 		next;
@@ -497,14 +497,14 @@ aldebaran,105,116,3	script	Risingeter	869,{
 			setquest 10119;
 			setquest 10120;
 			set slv_quest,6;
-			mes "[Risingeter]";
+			mes "[Lisingshetter]";
 			mes "Ok! I expect you will do the right thing.";
 			mes "Hunt 15 Clocks, Punks and Ridewords.";
 			close;
 		case 2:
 			set slv_quest,0;
 			erasequest 10105;
-			mes "[Risingeter]";
+			mes "[Lisingshetter]";
 			mes "You don't understand my love for clocks";
 			mes "I will find another brave adventurer.";
 			mes "I will inform the Eden Group.";

sql-files/item_db.sql

@@ -3102,8 +3102,8 @@ REPLACE INTO `item_db` VALUES (6042,'Ordinary_Branch','Ordinary Branch',3,NULL,N
 REPLACE INTO `item_db` VALUES (6043,'Letter_From_Lugen','Letter from Lugen',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (6044,'Letter_From_Otto','Letter from Otto',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (6045,'Supply_Box','Supply Box',3,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db` VALUES (6046,'Clothing_Dye_Coupon','Clothing Dye Coupon',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'callfunc "SetPalete",1;',NULL,NULL);
-REPLACE INTO `item_db` VALUES (6047,'Clothing_Dye_Coupon_II','Clothing Dye Coupon II',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'callfunc "SetPalete",2;',NULL,NULL);
+REPLACE INTO `item_db` VALUES (6046,'Clothing_Dye_Coupon','Clothing Dye Coupon',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db` VALUES (6047,'Clothing_Dye_Coupon_II','Clothing Dye Coupon II',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (6048,'Unidentified_Mineral','Unidentified Mineral',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (6049,'Marlin','Marlin',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db` VALUES (6050,'Mercenary_Contract','Mercenary Contract',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);

sql-files/item_db_re.sql

@@ -3558,8 +3558,8 @@ REPLACE INTO `item_db_re` VALUES (6042,'Ordinary_Branch','Ordinary Branch',3,NUL
 REPLACE INTO `item_db_re` VALUES (6043,'Letter_From_Lugen','Letter from Lugen',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6044,'Letter_From_Otto','Letter from Otto',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6045,'Supply_Box','Supply Box',3,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6046,'Clothing_Dye_Coupon','Clothing Dye Coupon',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'callfunc "SetPalete",1;',NULL,NULL);
-REPLACE INTO `item_db_re` VALUES (6047,'Clothing_Dye_Coupon_II','Clothing Dye Coupon II',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,'callfunc "SetPalete",2;',NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6046,'Clothing_Dye_Coupon','Clothing Dye Coupon',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+REPLACE INTO `item_db_re` VALUES (6047,'Clothing_Dye_Coupon_II','Clothing Dye Coupon II',2,NULL,NULL,0,NULL,NULL,NULL,NULL,0xFFFFFFFF,7,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6048,'Unidentified_Mineral','Unidentified Mineral',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6049,'Marlin','Marlin',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 REPLACE INTO `item_db_re` VALUES (6050,'Mercenary_Contract','Mercenary Contract',3,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);