- Added moscovia quest 'Koshei the Immortal'.

- Added 2009rwc maps & mosk_que to map indexing/conf.
- Removed duplicate Moscovia Inn NPC (bugreport:3188).
- Removed pointless specialeffects from speed items (bugreport:3208).

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

conf/maps_athena.conf

@@ -802,6 +802,7 @@ map: mosk_fild02
 map: mosk_dun01
 map: mosk_dun02
 map: mosk_dun03
+map: mosk_que
 
 // --- Episode 12: Satan Morroc & Schwaltzvalt Seige ---
 // -- 2007-09-19sdata_k.gpf
@@ -906,6 +907,14 @@ map: spl_in02
 //map: rwc02
 //map: rwc03
 
+// Ragnarok World Championship 2009
+// Requires: RWC 2009 Map files
+//map: 2009rwc_f01
+//map: 2009rwc_01
+//map: 2009rwc_02
+//map: 2009rwc_03
+//map: 2009rwc_04
+
 //Christmas & Sakura Special
 //Requires Akaru's SuperGRF 1.1 or newer
 //map: prontera_x

db/item_db.txt

@@ -160,7 +160,7 @@
 659,Heart_Of_Her,Her Heart,2,500,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1188; },{},{}
 660,Prohibition_Red_Candle,Forbidden Red Candle,2,20000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1200; },{},{}
 661,Sway_Apron,Soft Apron,2,20000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1275; },{},{}
-662,Inspector_Certificate,Authoritative Badge,2,1450,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 507; sc_start SC_SpeedUp0,180000,0; },{},{}
+662,Inspector_Certificate,Authoritative Badge,2,1450,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,180000,0; },{},{}
 663,Korea_Rice_Cake,Korean Rice Cake,0,1,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,0; },{},{}
 // Item Givers
 664,Gift_Box_1,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox_1),1; },{},{}
@@ -3526,7 +3526,7 @@
 12014,Imma_Arrow_Container,Immaterial Arrow Quiver,2,2,,250,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1757,500; },{},{}
 12015,Rusty_Arrow_Container,Rusty Arrow Quiver,2,2,,250,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1762,500; },{},{}
 // Speed Potions
-12016,Speed_Up_Potion,Speed Potion,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 507; sc_start SC_SpeedUp1,5000,0; },{},{}
+12016,Speed_Up_Potion,Speed Potion,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp1,5000,0; },{},{}
 12017,Slow_Down_Potion,Slow Potion,0,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SlowDown,5000,0; },{},{}
 12018,Fire_Cracker,Firecracker,2,2,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ end; },{},{}
 12019,Holy_Egg,Holy Egg,11,2,,150,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill "ALL_RESURRECTION",2; },{},{}
@@ -3781,7 +3781,7 @@
 12259,Miracle_Medicine,Miracle Medicine,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 12260,Cool_Summer_Outfit,Summer Event Suit,2,0,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Summer,600000,0; },{},{}
 12261,Secret_Medicine,Secret Medicine,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12262,Inspector_Certificate_,Authoritative Badge,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect2 507; sc_start SC_SpeedUp0,180000,0; },{},{}
+12262,Inspector_Certificate_,Authoritative Badge,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SpeedUp0,180000,0; },{},{}
 12263,Comp_Battle_Manual,Battle Manual,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_EXPBOOST,1800000,50; },{},{}
 12264,Comp_Bubble_Gum,Bubble Gum,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ITEMBOOST,1800000,0; },{},{}
 12265,Comp_Insurance,Insurance,2,2,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_LIFEINSURANCE,1800000,0; },{},{}

db/item_trade.txt

@@ -464,7 +464,7 @@
 7880,115,100	// Babayaga_Silver_Spoon
 7881,115,100	// Book_Of_Magic
 7882,115,100	// Pointed_Branch
-7883,115,100	// Reed_Pipe
+7883,115,100	// Wooden_Flute
 2429,115,100	// Iron_Shoes_01
 2430,115,100	// Iron_Shoes_02
 

db/map_index.txt

@@ -662,6 +662,7 @@ mosk_fild02
 mosk_dun01
 mosk_dun02
 mosk_dun03
+mosk_que
 force_4-1
 force_5-1
 06guild_r
@@ -762,6 +763,11 @@ bat_c03
 //rwc01	1000
 //rwc02
 //rwc03
+//2009rwc_f01
+//2009rwc_01
+//2009rwc_02
+//2009rwc_03
+//2009rwc_04
 //prontera_x
 //alberta_x
 //aldebaran_x

npc/merchants/inn.txt

@@ -4,7 +4,7 @@
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: ===================================== 
-//= 2.7
+//= 2.8
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -42,6 +42,7 @@
 //= 2.5 Added Moskovia Gostinitsa (Inn) from jA
 //= 2.6 Updated Alberta inn to official. [L0ne_W0lf]
 //= 2.7 Removed Morroc Inns as per episode 12.1. [L0ne_W0lf]
+//= 2.8 Removed Moscovia Inn; Its in quests/quest_moscovia.txt [Kisuka]
 //============================================================ 
 
 
@@ -200,36 +201,6 @@ ve_in,157,219,5	script	Inn Master#Receptionist	709,{
 		close;
 }
 
-//======================== Moscovia ====================================
-mosk_in,135,191,5	script	Landlord#mosk	961,{
-	mes "[Landlord]";
-	mes "Oh, welcome to the Inn 'Sticky Herb Tree'.";
-	mes "It is the most comfortable and";
-	mes "calmest place in all of Moscovia.";
-	next;
-	if (select("Save:Stay the night - 5000z") == 1) {
-		mes "[Landlord]";
-		mes "Your respawn point";
-		mes "has been saved.";
-		mes "Hope we can see you again next time hoho.";
-		savepoint "mosk_in",141,188;
-		close;
-	}
-	mes "[Landlord]";
-	if(Zeny < 5000) {
-		mes "The service charge is 5000z.";
-		mes "Please make sure you have enough";
-		mes "money for the service.";
-		close;
-	}
-	mes "Please be comfortable.";
-	close2;
-	set Zeny,Zeny - 5000;
-	percentheal 100,100;
-	warp "mosk_in",215,181;
-	end;
-}
-
 //======================= Inn Function ==============================
 function	script	F_InnMaid	{
 	mes getarg(0);