summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-01 20:01:52 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-01-01 20:01:52 +0000
commit9d5ed889d81740c4122e05747fd938dab1c53ba7 (patch)
treeb91e33ac969d9bb08fa3dfa847b9b0b8c069e160
parent40e63cdda0c726c69aebe8202875a337e7f0e888 (diff)
downloadhercules-9d5ed889d81740c4122e05747fd938dab1c53ba7.tar.gz
hercules-9d5ed889d81740c4122e05747fd938dab1c53ba7.tar.bz2
hercules-9d5ed889d81740c4122e05747fd938dab1c53ba7.tar.xz
hercules-9d5ed889d81740c4122e05747fd938dab1c53ba7.zip
- Added Genetic Book Seller to Alchemist Shop.
- Updated Gunslinger Ammo & Boxes Sales NPC positions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15347 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/merchants/alchemist.txt115
-rw-r--r--npc/merchants/ammo_boxes.txt7
-rw-r--r--npc/merchants/ammo_dealer.txt7
3 files changed, 123 insertions, 6 deletions
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index 8424525bb..d2e55c918 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena Team
//===== Current Version: =====================================
-//= 1.6
+//= 1.7
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -16,11 +16,122 @@
//= 1.4 Alchemists can now purchase 2000 Medicine Bowls at once. [SinSloth]
//= 1.5 Updated to Aegis 10.3 Standards. [L0ne_W0lf]
//= 1.6 Corrected canceling purchase. [L0ne_W0lf]
+//= 1.7 Updated to match AEGIS script. [Masao]
//============================================================
+alde_alche,31,186,3 script Craft Book Salesman#alde 883,{
+
+ mes "[Craft Book Salesman]";
+ mes "Welcome.";
+ mes "I'm here to sell";
+ mes "^0000FFspecial craft books^000000 for Geneticists.";
+ next;
+ mes "[Craft Book Salesman]";
+ mes "Geneticists have some skills";
+ mes "that require craft books to activate.";
+ next;
+ mes "[Craft Book Salesman]";
+ mes "The more craft books you have,";
+ mes "the more skills you can use.";
+ next;
+ mes "[Craft Book Salesman]";
+ mes "Please understand that";
+ mes "I specialize in the sale of these special books and";
+ mes "I ^FF0000don't sell other items^000000.";
+ next;
+ mes "[Craft Book Salesman]"
+ mes "Okay then, here's the list of available craft books."
+ next;
+ switch(select("[Apple Bomb Craft Book] 100,000 zeny:[Pineapple Bomb Craft Book] 100,000 zeny:[Coconut Bomb Craft Book] 100,000 zeny:[Melon Bomb Craft Book] 100,000 zeny:[Banana Bomb Craft Book] 100,000 zeny:[Plant Gene Cultivation Method] 100,000 zeny:[Superior Potion Craft Manual] 100,000 zeny:[Mix Cooking Book] 100,000 zeny:[Health Improvement Research Book] 100,000 zeny:[Vigor Drink Recipe] 100,000 zeny:Close")){
+ case 1:
+ callsub S_SellManual,6279,100000;
+ break;
+ case 2:
+ callsub S_SellManual,6280,100000;
+ break;
+ case 3:
+ callsub S_SellManual,6281,100000;
+ break;
+ case 4:
+ callsub S_SellManual,6282,100000;
+ break;
+ case 5:
+ callsub S_SellManual,6283,100000;
+ break;
+ case 6:
+ callsub S_SellManual,6284,100000;
+ break;
+ case 7:
+ callsub S_SellManual,6285,100000;
+ break;
+ case 8:
+ callsub S_SellManual,11022,100000;
+ break;
+ case 9:
+ callsub S_SellManual,11023,100000;
+ break;
+ case 10:
+ callsub S_SellManual,11024,100000;
+ break;
+ case 11:
+ mes "[Craft Book Salesman]";
+ mes "Thank you for your patronage.";
+ mes "Please come again.";
+ close;
+ }
+
+S_SellManual:
+ mes "[Craft Book Salesman]";
+ mes ""+getitemname(getarg(0))+"?";
+ mes "That'll be "+getarg(1)+" zeny ea.";
+ mes "How many of these books would you like to purchase?";
+ next;
+ input .@amount;
+ if (.@amount == 0) {
+ mes "[Craft Book Salesman]";
+ mes "Would you like to see some different books?";
+ close;
+ }
+ if (.@amount < 1 || .@amount > 99 ){
+ mes "[Craft Book Salesman]";
+ mes "You cannot purchase more than 100 at a time.";
+ close;
+ }
+ mes "[Craft Book Salesman]"
+ mes "You've entered "+.@amount+"x "+getitemname(getarg(0))+".";
+ mes "That'll be "+getarg(1) * .@amount+" Zeny.";
+ mes "Would you like to continue?"
+ next;
+ if (select("Yes:No") == 1) {
+ if (Zeny < getarg(1) * .@amount) {
+ mes "[Craft Book Salesman]";
+ mes "You don't";
+ mes "have enough zeny.";
+ mes "Check how much zeny";
+ mes "you have first.";
+ close;
+ }
+ if (checkweight(getarg(0),.@amount) == 0){
+ mes "[Craft Book Salesman]";
+ mes "It doesn't seem like you can carry everything.";
+ mes "Please check the space in your inventory.";
+ close;
+ }
+ mes "[Craft Book Salesman]";
+ mes "Thank you for your patronage.";
+ set Zeny,Zeny - getarg(1) * .@amount;
+ getitem getarg(0),.@amount;
+ close;
+ }
+ mes "[Craft Book Salesman]";
+ mes "Please take your time";
+ mes "before you make your decision.";
+ close;
+}
+
alde_alche,24,188,3 script Guild Dealer 740,{
if (checkweight(1201,1) == 0) {
- mes "- Wait a minute! -";
+ mes "- next; a minute! -";
mes "- Currently you are carrying -";
mes "- too many items with you. -";
mes "- Please come back again -";
diff --git a/npc/merchants/ammo_boxes.txt b/npc/merchants/ammo_boxes.txt
index 1ec561a33..f3fed67e6 100644
--- a/npc/merchants/ammo_boxes.txt
+++ b/npc/merchants/ammo_boxes.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= rAthena dev team
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= rAthena SVN
//===== Description: =========================================
@@ -14,9 +14,10 @@
//= 1.2 Optimized^2, corrected npc's name [ultramage]
//= 1.2a Optimized. Please, ommit extra NPC names [Lupus]
//= 1.3 Updated to match AEGIS script. [Kisuka]
+//= 1.4 Updated to match AEGIS script again. [Masao]
//============================================================
-que_ng,187,149,3 script Magazine Dealer Kenny 83,{
+izlude,171,127,3 script Magazine Dealer Kenny#iz::mdk 83,{
if(BaseJob == Job_Gunslinger) {
mes "[Kenny]";
mes "Welcome to my Magazine Shop.";
@@ -133,3 +134,5 @@ function script Func_Casing {
close;
}
}
+
+alberta,118,157,3 duplicate(mdk) Magazine Dealer Tonny#alb 83
diff --git a/npc/merchants/ammo_dealer.txt b/npc/merchants/ammo_dealer.txt
index 545d8b3f5..ea5f9a803 100644
--- a/npc/merchants/ammo_dealer.txt
+++ b/npc/merchants/ammo_dealer.txt
@@ -3,7 +3,7 @@
//===== By ===================================================
//= Playtester, Paradox924X
//===== Version ==============================================
-//= 1.4
+//= 1.5
//===== Compatible With ======================================
//= rAthena SVN
//===== Description ==========================================
@@ -15,9 +15,10 @@
//= 1.2a Removed .GATs [Lupus]
//= 1.3 Fixed [Playtester] Optimized. Got rid of @vars [Lupus]
//= 1.4 Updated to match AEGIS script. [Kisuka]
+//= 1.5 Updated to match AEGIS script again. [Masao]
//============================================================
-que_ng,187,156,3 script Bullet Dealer Tony 86,{
+alberta,118,160,3 script Bullet Dealer Tony#alb::bdt 86,{
if (BaseJob == Job_Gunslinger) {
mes "[Tony]";
mes "I'm Tony, the Bullet Dealer.";
@@ -121,3 +122,5 @@ function script Bullet_Trade {
close;
}
}
+
+izlude,171,133,3 duplicate(bdt) Bullet Dealer Tony#iz 86