Browse Source

* Fixed some parts of the Gunslinger gun quests
* Added Ammo Casing Seller Kenny
* Added Holy Arrow Quivers to Inventor Jaax

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

Playtester 19 years ago
parent
commit
13b1fd6ecd

+ 3 - 0
npc/Changelog.txt

@@ -36,6 +36,9 @@ Playtester
 Date		Added
 ======
 08/15
+	* Fixed some parts of the Gunslinger gun quests [Playtester]
+	* Added Ammo Casing Seller Kenny [Playtester]
+	* Added Holy Arrow Quivers to Inventor Jaax [Playtester]
 	* Added all the Gunslinger gun quests [Playtester]
 	- sphere creation and ammo casing are still missing, working on it
 	- removed erKURITA's version, he's okay with it

+ 116 - 0
npc/merchants/ammo_boxes.txt

@@ -0,0 +1,116 @@
+//===== eAthena Script ========================================
+//= Ammo Box Event
+//===== By: ==================================================
+//= Playtester
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena 1.0+
+//===== Description: =========================================
+//= Turns bullets into ammo boxes.
+//===== Additional Comments: =================================
+//= 1.0 Added the first 8 ammo boxes [Playtester]
+//============================================================
+
+que_ng.gat,187,149,3	script	Kenny	83,{
+	mes "[Kenny]";
+	mes "My name is Kenny.";
+	mes "I can create ^0000FFbullet casings^000000";
+	mes "and ^0000FFsphere packs^000000.";
+	next;
+	mes "[Kenny]";
+	mes "Would you like to try using one of";
+	mes "my bullet bullet casings or sphere";
+	mes "packs?";
+	mes "Select the one you want me to make!";
+	next;
+
+	menu "Bullet Casing",-,"Silver Bullet Casing",Q2,"Shell of Blood Casing",Q3,"Lightning Sphere Pack",Q4,"Blind Sphere Pack",Q5,"Poison Sphere Pack",Q6,"Freezing Sphere Pack",Q7,"Flare Sphere Pack",Q8;
+
+// Arguments
+//===========
+		callsub sF_Make, 13200,500,12149, "Bullet Casings";
+			goto M_Menu;
+Q2:
+		callsub sF_Make, 13201,500,12151, "Silver Bullet Casings";
+			goto M_Menu;
+Q3:
+		callsub sF_Make, 13202,500,12150, "Shell of Blood Casings";
+			goto M_Menu;
+Q4:
+		callsub sF_Make, 13204,500,12144, "Lightning Sphere Packs";
+			goto M_Menu;
+Q5:
+		callsub sF_Make, 13206,500,12145, "Blind Sphere Packs";
+			goto M_Menu;
+Q6:
+		callsub sF_Make, 13205,500,12146, "Poison Sphere Packs";
+			goto M_Menu;
+Q7:
+		callsub sF_Make, 13207,500,12147, "Freezing Sphere Packs";
+			goto M_Menu;
+Q8:
+		callsub sF_Make, 13203,500,12148, "Flare Sphere Packs";
+			goto M_Menu;
+
+// Subfunction for making ammo boxes
+//==================================
+sF_Make:
+	set @ammonum,500;
+	if(countitem(getarg(0)) < @ammonum) goto L_NdAmmo;
+	if(Zeny < getarg(1)) goto L_NdZeny;
+	mes "[Kenny]";
+	mes "What do you want me to do?";
+	next;
+	menu "Give me as many as you can.",-, "I want to set the amount.",sM_0b, "Nevermind",M_End;
+
+		set @amount,50;
+		if(zeny/getarg(1) < @amount) set @amount, zeny/getarg(1);
+		if(countitem(getarg(0))/@ammonum < @amount) set @amount, countitem(getarg(0))/@ammonum;
+		if(@amount > 0) goto L_End;
+		mes "[Kenny]";
+		mes "Dude, you don't even have the right items...";
+		close;
+		
+	sM_0b:
+		input @amount;
+		if(@amount<1 || @amount>50) goto L_BadAmnt;
+		if(countitem(getarg(0))/@ammonum < @amount) goto L_NdAmmo;
+		if(Zeny < (getarg(1)*@amount)) goto L_NdZeny;
+
+	L_End:
+		set Zeny, Zeny - (getarg(1)*@amount);
+		delitem getarg(0), (@amount*@ammonum);
+		getitem getarg(2), @amount;
+		mes "[Kenny]";
+		mes "There you go~!";
+		mes "Here are your " +getarg(3)+ ".";
+		close;
+
+	L_NdAmmo:
+		mes "[Kenny]";
+		mes "Sorry, but you need 500 bullets or"; 
+		mes "spheres and 500 zeny to make";
+		mes "1 bullet casing or 1 sphere pack.";
+		close;
+		
+	L_NdZeny:
+		mes "[Kenny]";
+		mes "You don't have enough zeny for that many.";
+		close;
+
+	L_BadAmnt:
+		mes "[Kenny]";
+		mes "Please choose a number between 1 and 50.";	
+		close;
+
+L_Come:
+	mes "[Kenny]";
+	mes "Please, come again whenever you want too.";
+	close;
+M_End:
+	mes "[Kenny]";
+	mes "Sure, no problem.";
+	mes "Come back any time.";
+	close;
+}

+ 6 - 2
npc/merchants/quivers.txt

@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Muad_Dib (Prometheus Project)
 //===== Current Version: =====================================
-//= 1.0b
+//= 1.1
 //===== Compatible With: =====================================
 //= eAthena 1.0+
 //===== Description: =========================================
@@ -13,6 +13,7 @@
 //= Converted to eAthena format by Dr.Evil
 //= added prize to quest - 500 Zeny
 //= Fixed a few spelling errors. [Nexon]
+//= 1.1 Added Holy Arrow Quivers [Playtester]
 //============================================================
 
 
@@ -46,7 +47,7 @@ payon_in01.gat,5,134,4	script	Inventor Jaax	89,{
 	mes "appreciate my genius!";
 	next;
 
-	menu "Arrow Quiver",-,"Iron Arrow Quiver",Q2,"Steel Arrow Quiver",Q3,"Oridecon Arrow Quiver",Q4,"Fire Arrow Quiver",Q5,"Silver Arrow Quiver",Q6,"Wind Arrow Quiver",Q7,"Stone Arrow Quiver",Q8,"Crystal Arrow Quiver",Q9,"Shadow Arrow Quiver",Q10,"Immaterial Arrow Quiver",Q11,"Rusty Arrow Quiver",Q12;
+	menu "Arrow Quiver",-,"Iron Arrow Quiver",Q2,"Steel Arrow Quiver",Q3,"Oridecon Arrow Quiver",Q4,"Fire Arrow Quiver",Q5,"Silver Arrow Quiver",Q6,"Wind Arrow Quiver",Q7,"Stone Arrow Quiver",Q8,"Crystal Arrow Quiver",Q9,"Shadow Arrow Quiver",Q10,"Immaterial Arrow Quiver",Q11,"Rusty Arrow Quiver",Q12,"Holy Arrow Quiver",Q13;
 
 // Arguments
 //===========
@@ -85,6 +86,9 @@ Q11:
 Q12:
 		callsub sF_Make, 1762,500,12015, "Rusty Arrow Quiver";
 			goto M_Menu;
+Q13:
+		callsub sF_Make, 1772,500,12183, "Holy Arrow Quiver";
+			goto M_Menu;
 
 // Subfunction for making quivers
 //================================

+ 18 - 17
npc/quests/gunslinger_quests.txt

@@ -8,7 +8,8 @@
 //= Gunslinger guns and bullet quests
 //===== Additional Comments: =================================
 //= 1.0 Only Garrison Gun done yet [Playtester]
-//= 1.1 Added Garrison[2]
+//= 1.1 Added Garrison[2] [Playtester]
+//= 1.2 Added Drifter, Destroyer and Inferno [Playtester]
 //============================================================
 
 
@@ -68,14 +69,15 @@ que_ng.gat,182,85,3	script	Mr.Garrison	109,{
 				mes "Come back when you have the materials.";
 				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;
+			mes "I see you came prepared.";
+			mes "Let me take those material.";
+			next;
 			mes @npcname$;
 			mes "Give me just a minute...";
 			mes "...";
@@ -134,14 +136,15 @@ L_Slot:
 				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 "I see you came prepared.";
+			mes "Let me take those materials.";
+			next;
 			mes @npcname$;
 			mes "Give me just a minute...";
 			mes "...";
@@ -167,12 +170,7 @@ L_Already:
 	close;
 }
 
-// NPC locations, working on implementing them
-
-que_ng.gat,187,149,3	script	Kenny	83,{
-	end;
-}
-
+//Make Spheres here
 que_ng.gat,187,156,3	script	Tony	86,{
 	end;
 }
@@ -230,13 +228,14 @@ que_ng.gat,187,163,3	script	Ingrid	744,{
 				mes "Come back when you have the materials.";
 				close;
 			}
-			mes "Oh, you already have the materials.";
-			next;
 			delitem 7319,100;
 			delitem 984,10;
 			delitem 7317,50;
 			delitem 7097,100;
 			set Zeny,Zeny-200000;
+			mes "Oh, you already have the materials.";
+			mes "Let me have them.";
+			next;
 			mes @npcname$;
 			mes "I need to be careful...";
 			mes "...";
@@ -306,12 +305,13 @@ que_ng.gat,185,180,3	script	Vanessa	726,{
 				mes "Come back when you have the materials.";
 				close;
 			}
-			mes "Oh, you already have the materials.";
-			next;
 			delitem 7319,50;
 			delitem 984,5;
 			delitem 7317,70;
 			set Zeny,Zeny-100000;
+			mes "Oh, you already have the materials.";
+			mes "Let me have them.";
+			next;
 			mes @npcname$;
 			mes "I'll make it in a minute...";
 			mes "...";
@@ -382,14 +382,15 @@ que_ng.gat,149,178,5	script	N.A	744,{
 				mes "Come back when you have the materials.";
 				close;
 			}
-			mes "I see you came prepared.";
-			next;
 			delitem 999,70;
 			delitem 985,5;
 			delitem 984,3;
 			delitem 1003,70;
 			delitem 7317,50;
 			set Zeny,Zeny-50000;
+			mes "I see you came prepared.";
+			mes "Let me take those materials.";
+			next;
 			mes @npcname$;
 			mes "Alright, you won't regret it...";
 			mes "...";

+ 1 - 0
npc/scripts_athena.conf

@@ -53,6 +53,7 @@ npc: npc/merchants/icecream.txt
 npc: npc/merchants/quivers.txt
 npc: npc/merchants/kunai_maker.txt
 npc: npc/merchants/socket_enchant.txt
+npc: npc/merchants/ammo_boxes.txt
 // Temp Shops
 // Removed in kRO (because Scrolls have been added into mobs drops)
 //npc: npc/merchants/scrolls_arrows.txt