* Added Violin[3] to the Comodo Weapon seller

* Optimized a warp near Gunslinger weapon shop
* Extended the Garrison quest to slot the Garrison

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

db/Changelog.txt

@@ -19,6 +19,8 @@
 	-----
 
 =========================
+08/12
+	* Reduced weight of Thanatos Tower quest items to 0 [Playtester]
 08/10
 	* Updated the Packet DB up to the 2006-08-07aSakexe client. [Zephiris]
 	* Reverted Tracking being affected by dex [Playtester]

db/item_db.txt

@@ -2190,16 +2190,16 @@
 7418,Mission_ScrollB,Written Request 02,3,,10,10,,,,,,,,,,,,,{},{},{}
 7419,Embryo_Create_Book,Embryo Creation Guide,3,,10,10,,,,,,,,,,,,,{},{},{}
 7420,Skull_,Skull,3,,0,10,,,,,,,,,,,,,{},{},{}
-7421,Red_Key,Red Key,3,,10,10,,,,,,,,,,,,,{},{},{}
-7422,Yellow_Key,Yellow Key,3,,10,10,,,,,,,,,,,,,{},{},{}
-7423,Blue_Key,Blue Key,3,,10,10,,,,,,,,,,,,,{},{},{}
-7424,Green_Key,Green Key,3,,10,10,,,,,,,,,,,,,{},{},{}
-7425,Black_Key,Black Key,3,,10,10,,,,,,,,,,,,,{},{},{}
-7426,Red_Magic_Stone,Red Magic Stone,3,,10,10,,,,,,,,,,,,,{},{},{}
-7427,Yellow_Magic_Stone,Yellow Magic Stone,3,,10,10,,,,,,,,,,,,,{},{},{}
-7428,Blue_Magic_Stone,Blue Magic Stone,3,,10,10,,,,,,,,,,,,,{},{},{}
-7429,Green_Magic_Stone,Green Magic Stone,3,,10,10,,,,,,,,,,,,,{},{},{}
-7430,Black_Magic_Stone,Black Magic Stone,3,,10,10,,,,,,,,,,,,,{},{},{}
+7421,Red_Key,Red Key,3,,10,0,,,,,,,,,,,,,{},{},{}
+7422,Yellow_Key,Yellow Key,3,,10,0,,,,,,,,,,,,,{},{},{}
+7423,Blue_Key,Blue Key,3,,10,0,,,,,,,,,,,,,{},{},{}
+7424,Green_Key,Green Key,3,,10,0,,,,,,,,,,,,,{},{},{}
+7425,Black_Key,Black Key,3,,10,0,,,,,,,,,,,,,{},{},{}
+7426,Red_Magic_Stone,Red Magic Stone,3,,10,0,,,,,,,,,,,,,{},{},{}
+7427,Yellow_Magic_Stone,Yellow Magic Stone,3,,10,0,,,,,,,,,,,,,{},{},{}
+7428,Blue_Magic_Stone,Blue Magic Stone,3,,10,0,,,,,,,,,,,,,{},{},{}
+7429,Green_Magic_Stone,Green Magic Stone,3,,10,0,,,,,,,,,,,,,{},{},{}
+7430,Black_Magic_Stone,Black Magic Stone,3,,10,0,,,,,,,,,,,,,{},{},{}
 7431,Books,Books,3,,10,10,,,,,,,,,,,,,{},{},{}
 7432,Leather_Pouch,Leather Pouch,3,,10,10,,,,,,,,,,,,,{},{},{}
 7433,Empty_Scroll,Empty Scroll,3,,2000,10,,,,,,,,,,,,,{},{},{}

npc/Changelog.txt

@@ -34,6 +34,10 @@ Playtester
 
 Date		Added
 ======
+08/12
+	* Added Violin[3] to the Comodo Weapon seller [Playtester]
+	* Optimized a warp near Gunslinger weapon shop [Playtester]
+	* Extended the Garrison quest to slot the Garrison [Playtester]
 08/10
 	* Switch airplanelocation variables to temp variables to avoid unusefull mapreg(sql/txt) writes [Toms]
 	* Added file for gunslinger quests [Playtester]

npc/merchants/shops.txt

@@ -84,7 +84,7 @@ ayothaya.gat,202,178,4	shop	Food Seller	750,7456:-1,577:-1
 //COMODO
 //=======================================================
 cmd_in01.gat,117,165,4	shop	Armor Dealer	101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1
-cmd_in01.gat,131,165,4	shop	Weapon Dealer	49,1903:-1,1905:-1,1907:-1,1950:-1,1952:-1,1954:-1,1956:-1,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
+cmd_in01.gat,131,165,4	shop	Weapon Dealer	49,1901:-1,1903:-1,1905:-1,1907:-1,1950:-1,1952:-1,1954:-1,1956:-1,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1
 cmd_in01.gat,79,182,4	shop	Tool Dealer	83,1753:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,657:-1,601:-1,602:-1,611:-1,1065:-1
 comodo.gat,296,125,4	shop	Souvenir Merchant	101,965:-1,964:-1
 comodo.gat,244,296,7	shop	Item Collector	74,909:-1

npc/quests/gunslinger_quests.txt

@@ -1,13 +1,14 @@
 //===== By: ==================================================
 //= Playtester
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= SVN eA
 //===== Description: =========================================
 //= Gunslinger guns and bullet quests
 //===== Additional Comments: =================================
 //= 1.0 Only Garrison Gun done yet [Playtester]
+//= 1.1 Added Garrison[2]
 //============================================================
 
 
@@ -17,6 +18,8 @@ que_ng.gat,182,85,3	script	Mr.Garrison	109,{
 	set @npcname$,"[Mr.Garrison]";
 
 	mes @npcname$;
+	if(countitem(13105)>0) goto L_Already;
+	if(countitem(13104)>0) goto L_Slot;
 	mes "I have invented a new Revolver!";
 	mes "I think I call it... Garrison.";
 	next;
@@ -66,13 +69,13 @@ que_ng.gat,182,85,3	script	Mr.Garrison	109,{
 				close;
 			}
 			mes "I see you came prepared.";
+			next;
 			delitem 999,50;
 			delitem 985,3;
 			delitem 984,1;
 			delitem 1003,50;
 			delitem 7317,20;
 			set Zeny,Zeny-30000;
-			next;
 			mes @npcname$;
 			mes "Give me just a minute...";
 			mes "...";
@@ -91,4 +94,75 @@ que_ng.gat,182,85,3	script	Mr.Garrison	109,{
 			mes "favorite gun, heh.";
 			close;
 	}
+
+L_Slot:
+	mes "Oh, I see you have one of";
+	mes "my high-quality guns.";
+	next;
+	mes @npcname$;
+	mes "Now that I look at it, I";
+	mes "think I could improve it";
+	mes "some more.";
+	next;
+	mes @npcname$;
+	mes "How about I add a ^0000FFslot^000000";
+	mes "to it? Be careful, though.";
+	mes "If you put a card into it";
+	mes "already, it will be lost";
+	mes "in the process.";
+	next;
+	switch(select("Yes, please add a slot.","Nah, I keep it as it is now."))
+	{
+
+		case 1:
+			mes @npcname$;
+			mes "Great! But first you need to";
+			mes "bring me the materials I need";
+			mes "to improve it.";
+			next;
+			mes @npcname$;
+			mes "This is what I need:";
+			mes "^FF000010 Steels^000000,";
+			mes "^FF00001 Eluniums^000000,";
+			mes "^FF000010 Emveretarcon^000000,";
+			mes "^FF000030 Coals^000000,";
+			mes "^FF000010 Rusty Screws^000000 and";
+			mes "of course your ^FF0000Garrison^000000.";
+			next;
+			mes @npcname$;
+			if ( (countitem(999)<10) || (countitem(985)<1) || (countitem(1011)<10) ||(countitem(1003)<30) || (countitem(7317)<10) || (countitem(13104)<1) ) {
+				mes "Come back when you have the materials.";
+				close;
+			}
+			mes "I see you came prepared.";
+			next;
+			delitem 999,10;
+			delitem 985,1;
+			delitem 1011,10;
+			delitem 1003,30;
+			delitem 7317,10;
+			delitem 13104,1;
+			mes @npcname$;
+			mes "Give me just a minute...";
+			mes "...";
+			mes "...";
+			next;
+			getitem 13105,1;
+			mes @npcname$;
+			mes "It's done. Now it is";
+			mes "even better than before.";
+			mes "Put it to good use.";
+			close;
+
+		case 2:
+			mes @npcname$;
+			mes "Okay, come back when you";
+			mes "changed your mind.";
+			close;
+	}
+
+L_Already:
+	mes "So how do you like";
+	mes "my gun?";
+	close;
 }

npc/warps/cities/einbroch.txt

@@ -108,8 +108,8 @@ ein_fild08.gat,164,380,0	warp	ein_fd02a	1,1,einbroch.gat,150,28
 //==========================================================================
 einbroch.gat,136,199,0	warp	gswarp1	1,1,que_ng.gat,138,167
 que_ng.gat,130,166,0	warp	gswarp2	1,1,einbroch.gat,130,197
-que_ng.gat,178,162,0	warp	gswarp3	1,1,que_ng.gat,176,86
-que_ng.gat,170,85,0	warp	gswarp4	1,1,que_ng.gat,182,161
+que_ng.gat,178,162,0	warp	gswarp3	1,1,que_ng.gat,172,86
+que_ng.gat,166,85,0	warp	gswarp4	1,1,que_ng.gat,182,161
 que_ng.gat,165,137,0	warp	gswarp5	1,1,que_ng.gat,177,41
 que_ng.gat,172,42,0	warp	gswarp6	1,1,que_ng.gat,160,139
 //This one seems to be wrong