* Added kunai_maker.txt to make elemental kunais. [erKURITA]

* Added new npcs @ que_ng.gat ninja map portion. [erKURITA]
* Added new shops @ que_ng.gat ninja map portion. [erKURITA]
* Commented wrong shops @ amatsu.txt. [erKURITA]
* Added que_ng.gat ninja map portion's warp. [erKURITA]
* Modified and corrected the gunslinger quest. [erKURITA]
* Changed the prices of the ninja stones according to kRO. [erKURITA]

All the kRO related info is thanks to RockmanEXE

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6448 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 122 insertions, 22 deletions

diff --git a/npc/merchants/kunai_maker.txt b/npc/merchants/kunai_maker.txt
new file mode 100644
index 000000000..fc79db9fb
--- /dev/null
+++ b/npc/merchants/kunai_maker.txt
@@ -0,0 +1,104 @@
+//===== eAthena Script =======================================

+//= Kunai "Trader" @ que_ng.gat

+//===== By: ==================================================

+//= erKURITA

+//===== Current Version: =====================================

+//= 1.0

+//===== Compatible With: =====================================

+//= eAthena 1.0

+//===== Description: =========================================

+//= NPC that trades you a few shurikens + ninja stones for 

+//= elemental kunais.

+//===== Additional Comments: =================================

+//= 1.0 Added the npc. It uses a function that sends the item 

+//=	  id of the 2 required items plus the amount. Can trade

+//= 	  up to 500 units (5,000 kunais) at once. [erKURITA]

+//============================================================

+que_ng.gat,72,29,3	script	Kunai Seller	83,{

+mes "[Jin]";

+mes "Hi, I sell elemental enchanted kunais. I'll trade you some elemental stones and one kind of shurikens for a determined elemental Kunai";

+next;

+mes "[Jin]";

+mes "What would you like to trade some? It's free";

+switch(select("10 Poison Kunais:10 Icycle Kunais:10 Rough Wind Kunais:10 Black Soil Kunai:10 Explosion Kunai:Nothing at the Moment")) {

+//Callfunc usage: callfunc "Kunai_Trade",itemreqid1,itemreqct1,itemreqid2,itemreqct2,itemidtrade;

+	case 1:

+		next;

+		callfunc "Kunai_Trade",13250,20,7524,1,13259;

+		close;

+	case 2:

+		next;

+		callfunc "Kunai_Trade",13251,8,7522,2,13255;

+		goto L_Bye;

+	case 3:

+		next;

+		callfunc "Kunai_Trade",13252,4,7523,2,13257;

+		goto L_Bye;

+	case 4:

+		next;

+		callfunc "Kunai_Trade",13253,2,7524,1,13256;

+		goto L_Bye;

+	case 5:

+		next;

+		callfunc "Kunai_Trade",13254,1,7521,2,13258;

+		goto L_Bye;

+	case 6:

+		next;

+		goto L_Bye;

+	}

+L_Bye:

+	next;

+	mes "[Jin]";

+	mes "Good bye and hope to see you again then";

+	close;

+}

+

+function	script	Kunai_Trade	-1,{

+

+mes "[Jin]";

+if (MaxWeight*50/100 < Weight) {

+	if (MaxWeight*90/100 < Weight) {

+		mes "Sorry but you have more than 90% weight. Your kunais might drop. I can't give you anything.";

+		next;

+		goto L_Menu;

+	} else

+	mes "You have 50% or more weight, do you still want to continue?";

+	menu "Yes",-,"No, thanks",L_Return;

+}

+

+mes "Would you like to trade my 10 "+getitemname(getarg(4))+" for yours "+getarg(1)+" "+getitemname(getarg(0))+" and "+getarg(3)+" "+getitemname(getarg(2))+" ?";

+switch(select("Yes:I'll think about it")) {

+	case 1:

+		next; 

+		mes "[Jin]";

+		if (countitem(getarg(0)) < getarg(1) || countitem(getarg(2)) < getarg(3)) {

+			mes "Sorry but you're missing one of the required items. Please get them";

+			close;

+		} else

+		mes "How many do you want to trade? I can only trade you 500 units at once, and remember 1 unit = 10 kunais of your wish";

+		input @trade;

+		next;

+		mes "[Jin]";

+		if (@trade > 500) {

+			mes "Sorry, but I told you I could only trade you 500 units at once. Try again";

+			close;

+		} else if (@trade == 0) {

+			mes "Sorry, but 1 unit is the minimun I can trade. Try again please.";

+			close;

+		} else if ((countitem(getarg(0)) < @trade*getarg(1)) || (countitem(getarg(2)) < @trade*getarg(3))) {

+ 			mes "Sorry, but you don't have enough items to trade "+@trade+" unit(s). Get more please";

+			close;

+		} else

+		mes "Here you go, enjoy them";

+		delitem getarg(0),getarg(1)*@trade;

+		delitem getarg(2),getarg(3)*@trade;

+		getitem getarg(4),10*@trade;

+		next;

+		return;

+	case 2:

+		return;

+	}

+L_Bye:

+return;

+

+}
\ No newline at end of file
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index a7fec97b6..5d1773ddb 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -16,6 +16,9 @@
 //= 1.4 Added an ingredient seller to Morroc, thanks to Muad_Dib [MasterOfMuppets]

 //= a Removed doubled Morocc Ing.Seller, arranged the rest Ing.Sellers according to the city names [Lupus]

 //= 1.4b Commented out temp Gunslinger shops. [Lupus]

+//= 1.5 Removed Temp gunslinger shops and moved up the official ones. [erKURITA]

+//=	  Added Official Ninja shops in their correct location and commented a few

+//=	  shops. Thanks to RockmanEXE and Muad_Dib [erKURITA]

 //============================================================ 

 

 

@@ -46,22 +49,25 @@ aldebaran.gat,166,109,7	shop	Ingredient Seller	750,580:-1,7482:-1	//temp goods
 //=======================================================

 //AMATSU

 //=======================================================

-//Fruit merchant opens a zeny exploit (due to Juice Maker NPC)

-amatsu.gat,176,126,4	shop	Fruit Merchant	53,512:-1,513:-1,515:-1,516:-1

+//|Removed the following shops according to RockmanEXe's info. Some were removed anyway.

+//amatsu.gat,176,126,4	shop	Fruit Merchant	53,512:-1,513:-1,515:-1,516:-1

 //amatsu.gat,169,111,6	shop	Tool Dealer	83,611:-1,1750:-1,501:-1,502:-1,503:-1,504:-1,506:-1,525:-1,601:-1,602:-1,1065:-1,2239:-1

-amatsu.gat,180,102,3	shop	Flower Girl	96,712:-1,744:-1,2612:-1

-amatsu.gat,189,99,7	shop	Butcher	49,517:-1,528:-1,540:-1,541:-1

-amatsu.gat,169,119,6	shop	Gift Merchant	91,734:-1,735:-1,736:-1,737:-1,746:-1

-amatsu.gat,183,127,5	shop	Milk Merchant	90,519:-1

-//1st set

+//amatsu.gat,180,102,3	shop	Flower Girl	96,712:-1,744:-1,2612:-1

+//amatsu.gat,189,99,7	shop	Butcher	49,517:-1,528:-1,540:-1,541:-1

+//amatsu.gat,169,119,6	shop	Gift Merchant	91,734:-1,735:-1,736:-1,737:-1,746:-1

+//amatsu.gat,183,127,5	shop	Milk Merchant	90,519:-1

 //ama_in01.gat,96,28,4	shop	Weapon Dealer	54,1750:-1,1751:-1,1701:-1,1201:-1,1204:-1,1207:-1,1601:-1,1101:-1,1104:-1,1107:-1,1110:-1,1113:-1,1122:-1,1119:-1,1123:-1,1126:-1,1157:-1,1129:-1,1116:-1,1301:-1,1771:-1

 //ama_in01.gat,103,24,1	shop	Armor Dealer	48,2101:-1,2103:-1,2401:-1,2403:-1,2501:-1,2503:-1,2220:-1,2226:-1,2301:-1,2303:-1,2305:-1,2328:-1,2307:-1,2309:-1,2312:-1,2314:-1

-ama_in01.gat,101,18,8	shop	Weapon Dealer	47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1

+//ama_in01.gat,101,18,8	shop	Weapon Dealer	47,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1

 //2nd set

+//|<= end of removed shops

 ama_in01.gat,89,28,4	shop	Armor Dealer	757,2211:-1,2401:-1,2403:-1,2501:-1,2503:-1,2101:-1,2103:-1,2305:-1,2321:-1,2332:-1,2314:-1,2627:-1

 ama_in01.gat,102,28,4	shop	Weapon Dealer	766,1207:-1,1216:-1,1107:-1,1122:-1,1116:-1,1154:-1,1407:-1,1457:-1,1354:-1,1519:-1

 ama_in01.gat,24,30,4	shop	Tool Dealer	763,1750:-1,1770:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1

-amatsu.gat,205,150,2	shop	Ingredient Seller	750,7453:-1,579:-1

+amatsu.gat,205,150,2	shop	Ingredient Seller	83,7453:-1,579:-1

+//| Official Ninja Shops

+que_ng.gat,72,31,2	shop	Shuriken Dealer	83,13250:-1,13251:-1,13252:-1,13253:-1,13254:-1

+que_ng.gat,73,26,5	shop	Tool Dealer	83,2117:-1,7521:-1,7522:-1,7523:-1,7524:-1

 

 //=======================================================

 //AYOTHAYA

@@ -94,11 +100,9 @@ ein_in01.gat,109,27,4	shop	Two-Hand Weapon Dealer	850,1116:-1,1151:-1,1154:-1,11
 ein_in01.gat,119,26,4	shop	Weapon Dealer	855,1247:-1,1248:-1,1249:-1,13000:-1

 einbroch.gat,138,66,3	shop	Head Gear Dealer	850,5114,:-1,2218:-1

 einbroch.gat,82,199,3	shop	Paddler	855,512:-1,645:-1,1750:-1,501:-1

-//Temp shops! Normally you can't buy all the equipment & ammo.

-//Use official GUNSLINGER SHOPS

-//einbroch.gat,235,106,3	shop	Ammo Dealer	847,13200:-1,13201:-1,13202:-1,13203:-1,13204:-1,13205:-1,13206:-1,13207:-1

-//einbroch.gat,232,106,3	shop	Gun Dealer	847,13150:-1,13100:-1,13101:-1,13102:-1,13103:-1,13104:-1,13105:-1,13106:-1,13151:-1,13152:-1,13153:-1,13154:-1,13155:-1,13156:-1,13157:-1,13158:-1,13159:-1,13160:-1,13161:-1,13162:-1

-

+//Official Gunslingers shops.

+que_ng.gat,179,91,4	shop	Gunner#Gun Seller	900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1

+que_ng.gat,180,79,4	shop	Gunner#Ammo Seller	900,13200:-1,13201:-1,13202:-1

 //=======================================================

 //GEFFEN

 //=======================================================

@@ -296,14 +300,6 @@ yuno.gat,133,171,2	shop	Ingredient Seller	750,7457:-1,7482:-1
 //=======================================================

 prt_monk.gat,135,263,3	shop	Blacksmith	726,1801:-1,1803:-1,1805:-1

 

-

-//=======================================================

-// GUNSLINGER SHOPS

-//=======================================================

-que_ng.gat,179,91,4	shop	Gunner#Gunner1	900,13150:-1,13102:-1,13151:-1,13154:-1,13155:-1

-que_ng.gat,180,79,4	shop	Gunner#Gunner2	900,13200:-1,13201:-1,13202:-1

-

-

 //===== Additional Comments(old): ================================= 

 //= swapped shop titles in GONRYUN, thanks to Kashy

 //= 1.3a Fixed Louyang map name. Added additional shops in Yuno. [kobra_k88]