summaryrefslogtreecommitdiff
path: root/npc/pre-re/merchants
diff options
context:
space:
mode:
Diffstat (limited to 'npc/pre-re/merchants')
-rw-r--r--npc/pre-re/merchants/3rd_trader.txt524
-rw-r--r--npc/pre-re/merchants/diamond.txt244
-rw-r--r--npc/pre-re/merchants/falcon_flute.txt123
-rw-r--r--npc/pre-re/merchants/shops_re.txt42
4 files changed, 0 insertions, 933 deletions
diff --git a/npc/pre-re/merchants/3rd_trader.txt b/npc/pre-re/merchants/3rd_trader.txt
deleted file mode 100644
index 908bc7ad6..000000000
--- a/npc/pre-re/merchants/3rd_trader.txt
+++ /dev/null
@@ -1,524 +0,0 @@
-//===== rAthena Script =======================================
-//= 3rd Item Seller
-//===== By: ==================================================
-//= Masao
-//= Mercurial
-//===== Current Version: =====================================
-//= 1.1
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= [Aegis Conversion]
-//= Sells some 3rd Job related Items.
-//===== Additional Comments: =================================
-//= v1.1 Optimized Poison Herb Salesman NPC
-//= v1.0 First Version.
-//============================================================
-
-
-job3_guil01,79,96,3 script Poison Herb Salesman::PHS 877,{
-
- // We are unsure about agis script command equivalent please refer to 3rd_trader.sc line 3
- //if( (countitem(1201)>=30000) || checkweight() )
-
- for(set .x,0; .x<getarraysize(.herbs); set .x,.x+1)
- {
- if(!checkweight(.herbs[.x],.maxHerbs))
- {
- mes "- Wait a minute !! -";
- mes "- Currently you're carrying -";
- mes "- too many items with you. -";
- mes "- Please try again -";
- mes "- after you loose some weight. -";
- close;
- }
- }
-
- mes .npcName$;
- mes "I am the professional";
- mes "poison herb seller.";
- mes "Which one do you want?";
- mes "They cost "+.herbCost[0]+" zeny each!";
- set .herbType,select("Nerium:Rantana:Makulata:Seratum:Scopolia:Amoena:Poison Kit")-1;
- next;
- if(.herbType==(getarraysize(.herbs)-1))
- {
- mes .npcName$;
- mes "You can only buy";
- mes "1 Poison Kit and it costs "+.herbCost[(getarraysize(.herbs)-1)]+" zeny.";
- mes "Will you buy it?";
-
- switch(select("Yes, I will.:No, I won't."))
- {
- case 1:
- if(Zeny < .poisHerbCost)
- {
- next;
- mes .npcName$;
- mes "Please check the money you have.";
- mes "It doesn't seem like you have enough money.";
- close;
- }
- else
- {
- set Zeny,Zeny-.poisHerbCost;
- getitem .herbs[getarraysize(.herbs)-1],1;
- next;
- mes .npcName$;
- mes "Thank you. See you~!";
- close;
- }
- break;
- case 2:
- next;
- mes "[Poison Herb Salesman]";
- mes "Well, I see. See you~!";
- close;
- break;
- }
- }
- else
- {
- mes .npcName$;
- mes "How many do you want? You can";
- mes "only buy a maximum of "+.maxHerbs+" ea";
- mes "and if you want to cancel, enter '0'.";
- input .herbsCount;
- if(.herbsCount<=0) // check if player canceled herb purchase
- {
- next;
- mes .npcName$;
- mes "You've cancelled the trade.";
- close;
- }
- else if(.herbsCount>.maxHerbs) // checks if herbs count exceeds maxHerbs limit
- {
- next;
- mes .npcName$;
- mes "Please check the maximum";
- mes "amount and then try again.";
- close;
- }
- else if(.herbsCount+countitem(.herbs[.herbType]) > .maxItemStack) // Check item stack according to Aegis script
- {
- mes "- Wait a minute !! -";
- mes "- Currently you're carrying -";
- mes "- too many items with you. -";
- mes "- Please try again -";
- mes "- after you loose some weight. -";
- close;
- }
- else
- {
- if(Zeny<(.herbsCount*.herbCost)) // Check if Zeny is enough
- {
- next;
- mes .npcName$;
- mes "Please check the money you have.";
- mes "It doesn't seem like you have enough money.";
- close;
- }
- else // all requirements are met give the item
- {
- set Zeny,Zeny-(.herbsCount*.herbCost);
- getitem .herbs[.herbType],.herbsCount;
- next;
- mes .npcName$;
- mes "Thank you. See you~!";
- close;
- }
- }
- }
-OnInit:
-// Initialize Item Id's on script engine Init Event
- set .npcName$,"[Poison Herb Salesman]";
- setarray .herbs[0],7932,7933,7934,7935,7936,7937,7931;
- setarray .herbCost[0],4000,4000,4000,4000,4000,4000,5000;
- set .maxHerbs,2000;
- set .poisHerbCost,5000;
- set .maxItemStack,30000;
-}
-
-
-job3_rune01,90,62,3 script Rune Salesman::runesale 853,{
-
- if(checkweight(1201,1) == 0 || MaxWeight - Weight < 20000)
- {
- mes "- Wait a minute !! -";
- mes "- Currently you're carrying -";
- mes "- too many items with you. -";
- mes "- Please try again -";
- mes "- after you loose some weight. -";
- close;
- }
-
- mes "[Rune Salesman]";
- mes "Hey, do you need Runes?!";
- mes "I sell all kinds of Rune Stones!";
- mes "What kind of Rune do you want?";
- next;
- switch(select("Buy high-quality Rune Stones.:Buy ordinary Rune Stones."))
- {
- case 1:
- mes "[Rune Salesman]";
- mes "High-quality Runes!";
- mes "They cost 2,500 zeny each!";
- mes "Tell me how many you want to buy";
- mes "and remember, you can only";
- mes "buy a maximum amount of 2000 ea!";
- next;
- input .@amount;
- if(.@amount == 0)
- {
- mes "[Rune Salesman]";
- mes "You're not buying? Go away!";
- close;
- }
- else if(.@amount > 2000)
- {
- mes "[Rune Salesman]";
- mes "Please check the maximum";
- mes "amount and then come back to me again!";
- close;
- }
- else if(Zeny < .@amount * 2500)
- {
- mes "[Rune Salesman]";
- mes "Money! Money!";
- mes "You are short of money!";
- mes "Check the amount of money you have!!";
- close;
- }
- set .@checkweight,.@amount * 100;
- if (MaxWeight < .@checkweight)
- {
- mes "[Rune Salesman]";
- mes "You're not able to carry it, so why are you trying to buy it?!";
- close;
- }
- set Zeny,Zeny - .@amount * 2500;
- getitem 12734,.@amount;
- mes "[Rune Salesman]";
- mes "You can buy more again.";
- mes "So, see you later.";
- close;
- case 2:
- mes "[Rune Salesman]";
- mes "Ordinary Rune Stones?";
- mes "They cost 1,000 zeny each!";
- mes "Tell me how many you want to buy";
- mes "and remember, you can only";
- mes "buy a maximum amount of 2000 ea!";
- next;
- input .@amount;
- if(.@amount == 0)
- {
- mes "[Rune Salesman]";
- mes "You're not buying? Go away!";
- close;
- }
- else if(.@amount > 2000)
- {
- mes "[Rune Salesman]";
- mes "Please check the maximum";
- mes "amount and then come back to me again!";
- close;
- }
- else if(Zeny < .@amount * 1000)
- {
- mes "[Rune Salesman]";
- mes "Money! Money!";
- mes "You are short of money!";
- mes "Check the amount of money you have!!";
- close;
- }
- set .@checkweight,.@amount * 100;
- if (MaxWeight < .@checkweight)
- {
- mes "[Rune Salesman]";
- mes "You're not able to carry it, so why are you trying to buy it?!";
- close;
- }
- set Zeny,Zeny - .@amount * 1000;
- getitem 12737,.@amount;
- mes "[Rune Salesman]";
- mes "You can buy more again.";
- mes "So, see you later.";
- close;
- }
-}
-
-job3_guil01,91,93,3 script Rare Herb Collector 49,{
-
- if(checkweight(1201,1) == 0 || MaxWeight - Weight < 20000)
- {
- mes "- Wait a minute !! -";
- mes "- Currently you're carrying -";
- mes "- too many items with you. -";
- mes "- Please try again -";
- mes "- after you loose some weight. -";
- close;
- }
-
- if (Class == 4059 || Class == 4065)
- {
- mes "[Rare Poison Herb Collector]";
- mes "I wander around the world and collect rare poison herbs. Recently, I am dealing in the herb called Izidor. If you are interested, you can buy them.";
- next;
- switch(select("How can I buy them?:Exchange it with Animal Blood:Exchange it with a Bitter Herb:Exchange it with a Deadly Noxious Herb:Exchange it with a Frozen Rose:Exchange it with Ment:Exchange it with Hinalle"))
- {
- case 1:
- mes "[Rare Poison Herb Collector]";
- mes "You can buy any of those items for 10,000 zeny: Animal Blood, Bitter Herb, Deadly Noxious Herb, Frozen Rose, Ment or Hinalle. ";
- next;
- mes "[Rare Poison Herb Collector]";
- mes "Why I ask for money? That is just to pay a little respect to a collector like me. Ha ha ha...";
- close;
- case 2:
- if ((countitem(702) > 0) && (Zeny > 9999))
- {
- mes "[Rare Poison Herb Collector]";
- mes "Thank you. I've received your payment.";
- delitem 702,1;
- set Zeny,Zeny - 10000;
- getitem 709,1;
- close;
- }
- mes "[Rare Poison Herb Collector]";
- mes "Hey, try again after you've prepared all the requirements for the exchange.";
- close;
- case 3:
- if ((countitem(621) > 0) && (Zeny > 9999))
- {
- mes "[Rare Poison Herb Collector]";
- mes "Thank you. I've received your payment.";
- delitem 621,1;
- set Zeny,Zeny - 10000;
- getitem 709,1;
- close;
- }
- mes "[Rare Poison Herb Collector]";
- mes "Hey, try again after you've prepared all the requirements for the exchange.";
- close;
- case 4:
- if ((countitem(631) > 0) && (Zeny > 9999))
- {
- mes "[Rare Poison Herb Collector]";
- mes "Thank you. I've received your payment.";
- delitem 631,1;
- set Zeny,Zeny - 10000;
- getitem 709,1;
- close;
- }
- mes "[Rare Poison Herb Collector]";
- mes "Hey, try again after you've prepared all the requirements for the exchange.";
- close;
- case 5:
- if ((countitem(749) > 0) && (Zeny > 9999))
- {
- mes "[Rare Poison Herb Collector]";
- mes "Thank you. I've received your payment.";
- delitem 749,1;
- set Zeny,Zeny - 10000;
- getitem 709,1;
- close;
- }
- mes "[Rare Poison Herb Collector]";
- mes "Hey, try again after you've prepared all the requirements for the exchange.";
- close;
- case 6:
- if ((countitem(605) > 0) && (Zeny > 9999))
- {
- mes "[Rare Poison Herb Collector]";
- mes "Thank you. I've received your payment.";
- delitem 605,1;
- set Zeny,Zeny - 10000;
- getitem 709,1;
- close;
- }
- mes "[Rare Poison Herb Collector]";
- mes "Hey, try again after you've prepared all the requirements for the exchange.";
- close;
- case 7:
- if ((countitem(703) > 0) && (Zeny > 9999))
- {
- mes "[Rare Poison Herb Collector]";
- mes "Thank you. I've received your payment.";
- delitem 703,1;
- set Zeny,Zeny - 10000;
- getitem 709,1;
- close;
- }
- mes "[Rare Poison Herb Collector]";
- mes "Hey, try again after you've prepared all the requirements for the exchange.";
- close;
- }
- }
- mes "[Rare Poison Herb Collector]";
- mes "I wander around the world and collect rare poison herbs. But I don't feel like selling my herbs to a person like you... ha ha ha...";
- close;
-}
-
-gef_tower,105,172,5 script Point Salesman#Sorcerer::pss 700,{
-
- if(checkweight(1201,1) == 0 || MaxWeight - Weight < 20000)
- {
- mes "- Wait a minute !! -";
- mes "- Currently you're carrying -";
- mes "- too many items with you. -";
- mes "- Please try again -";
- mes "- after you loose some weight. -";
- close;
- }
-
- mes "[Point Salesman]";
- mes "Hello. I'm selling a catalyst that are called ^FF0000Points^000000 for Sorcerers. What would you like?";
- next;
- switch(select("Scarlet Points - 200z:Lime Green Points - 200z:Indigo Points - 200z:Yellow Wish Points - 200z:Cancel"))
- {
- case 1:
- mes "[Point Salesman]";
- mes "You have chosen Scarlet Points.";
- mes "How many do you want?";
- mes "If you want to cancel, enter 0.";
- next;
- input .@amount;
- if (.@amount == 0)
- {
- mes "[Point Salesman]";
- mes "You've cancelled the trade.";
- close;
- }
- set .@po_weight,.@amount * 10;
- set .@tt_weight,MaxWeight - .@po_weight;
- set .@po_money,.@amount * 200;
- if (.@tt_weight > 0)
- {
- if (Zeny >= .@po_money)
- {
- set Zeny,Zeny - .@po_money;
- getitem 6360,.@amount;
- mes "[Point Salesman]";
- mes "Thank you very much. See you~!";
- close;
- }
- mes "[Point Salesman]";
- mes "You don't seem to have enough money.";
- close;
- }
- mes "[Point Salesman]";
- mes "You don't have enough space in your inventory to buy this amount.";
- close;
- case 2:
- mes "[Point Salesman]";
- mes "You have chosen Lime Green Points.";
- mes "How many do you want?";
- mes "If you want to cancel, enter 0.";
- next;
- input .@amount;
- if (.@amount == 0)
- {
- mes "[Point Salesman]";
- mes "You've cancelled the trade.";
- close;
- }
- set .@po_weight,.@amount * 10;
- set .@tt_weight,MaxWeight - .@po_weight;
- set .@po_money,.@amount * 200;
- if (.@tt_weight > 0)
- {
- if (Zeny >= .@po_money)
- {
- set Zeny,Zeny - .@po_money;
- getitem 6363,.@amount;
- mes "[Point Salesman]";
- mes "Thank you very much. See you~!";
- close;
- }
- mes "[Point Salesman]";
- mes "You don't seem to have enough money.";
- close;
- }
- mes "[Point Salesman]";
- mes "You don't have enough space in your inventory to buy this amount.";
- close;
- case 3:
- mes "[Point Salesman]";
- mes "You have chosen Indigo Points.";
- mes "How many do you want?";
- mes "If you want to cancel, enter 0.";
- next;
- input .@amount;
- if (.@amount == 0)
- {
- mes "[Point Salesman]";
- mes "You've cancelled the trade.";
- close;
- }
- set .@po_weight,.@amount * 10;
- set .@tt_weight,MaxWeight - .@po_weight;
- set .@po_money,.@amount * 200;
- if (.@tt_weight > 0)
- {
- if (Zeny >= .@po_money)
- {
- set Zeny,Zeny - .@po_money;
- getitem 6361,.@amount;
- mes "[Point Salesman]";
- mes "Thank you very much. See you~!";
- close;
- }
- mes "[Point Salesman]";
- mes "You don't seem to have enough money.";
- close;
- }
- mes "[Point Salesman]";
- mes "You don't have enough space in your inventory to buy this amount.";
- close;
- case 4:
- mes "[Point Salesman]";
- mes "You have chosen Yellow Wish Points.";
- mes "How many do you want?";
- mes "If you want to cancel, enter 0.";
- next;
- input .@amount;
- if (.@amount == 0)
- {
- mes "[Point Salesman]";
- mes "You've cancelled the trade.";
- close;
- }
- set .@po_weight,.@amount * 10;
- set .@tt_weight,MaxWeight - .@po_weight;
- set .@po_money,.@amount * 200;
- if (.@tt_weight > 0)
- {
- if (Zeny >= .@po_money)
- {
- set Zeny,Zeny - .@po_money;
- getitem 6362,.@amount;
- mes "[Point Salesman]";
- mes "Thank you very much. See you~!";
- close;
- }
- mes "[Point Salesman]";
- mes "You don't seem to have enough money.";
- close;
- }
- mes "[Point Salesman]";
- mes "You don't have enough space in your inventory to buy this amount.";
- close;
- case 5:
- mes "[Point Salesman]";
- mes "You can't find the stuff you need?";
- close;
- }
-}
-
-
-morocc,190,96,4 duplicate(PHS) Poison Herb Salesman#moc 877
-lhz_in02,16,205,4 duplicate(PHS) Poison Herb Salesman#lhz 877
-prontera,168,228,3 duplicate(runesale) Rune Salesman#1 853
-comodo,241,103,6 duplicate(pss) Point Salesman#1 700
-alberta,105,52,7 duplicate(pss) Point Salesman#2 700
-veins,202,128,6 duplicate(pss) Point Salesman#3 700 \ No newline at end of file
diff --git a/npc/pre-re/merchants/diamond.txt b/npc/pre-re/merchants/diamond.txt
deleted file mode 100644
index 118a3d111..000000000
--- a/npc/pre-re/merchants/diamond.txt
+++ /dev/null
@@ -1,244 +0,0 @@
-//===== rAthena Script =======================================
-//= Rare Diamond Merchant
-//===== By: ==================================================
-//= Z3R0
-//===== Current Version: =====================================
-//= 1.5
-//===== Compatible With: =====================================
-//= rAthena SVN
-//===== Description: =========================================
-//= [Aegis Conversion]
-//= Exchanges 17 Carat Diamond
-//===== Additional Comments: =================================
-//= v1.0 First / Optimized Version
-//= v1.1 Adjusted for Missing ; on Line #271 (#15425)
-//= v1.2 Removed Comments per Request (#15426)
-//= v1.3 Changed Emotion # to Const Definition (#15427)
-//= v1.4 Removed Double Space on Line #148 (#15428)
-//= v1.5 Added This Version History (#15429)
-//============================================================
-
-- script RareDiamondMerchant 58,{
-
- set .@npc$, "[Rare Diamond Merchant]";
-
- mes .@npc$;
- mes "Ladies and Gentlemen! ! !";
- mes "You've heard rumors but you've never once seen with your own eyes";
- mes "the world's rarest diamond!";
- mes "The ^FF82FF'17 Carat Diamond'^000000 is currently on sale for a cheap price!!";
- mes "If valuable diamonds interest you then listen up!";
- next;
-
- mes .@npc$;
- mes "You can give the diamond as a gift to your lover.";
- mes "The receiver of the ^FF82FF'17 Carat Diamond'^000000 will cherish it";
- mes "and treasure you in their heart.";
- emotion e_loud;
- next;
-
- mes .@npc$;
- mes "What? You don't have a lover?";
- mes "You can still just hang on to it for yourself.";
- mes "The enchanting aura of the ^FF82FF'17 Carat Diamond'^000000 is likely";
- mes "to bring love into your life.";
- next;
-
- mes .@npc$;
- mes "Known as the captivating diamond of diamonds...";
- mes "It is the ^FF82FF'17 Carat Diamond'^000000!";
- next;
-
- set .@menu$, "^FF82FF'17 Carat Diamond'^000000?";
- if (countitem(6024))
- set .@menu$, .@menu$ + ":Exchange my 17 Carat Diamond for zeny...";
-
- switch(select(.@menu$)) {
- case 1:
- mes .@npc$;
- mes "Yes!";
- mes "Hehe, the ^FF82FF'17 Carat Diamond'^000000 you see right now";
- mes "is one of the highest quality 17 carat diamonds.";
- mes "Comparing it to any pea-sized, colorless rock you may have";
- mes "dug up from Morroc is unspeakable!";
- emotion e_omg;
- next;
-
- mes .@npc$;
- mes "Some claim that this is the very same diamond";
- mes "that was seen by Kachua in Comodo!";
- next;
-
- if (select("End Conversation:How much is it?") == 1) {
- mes .@npc$;
- mes "It's rather inexpensive!";
- mes "If you're interested, talk to me any time!";
- close;
- }
-
- mes .@npc$;
- mes "Of course! The most important thing is price!";
- mes "As I've said earlier, the ^FF82FF'17 Carat Diamond'^000000 has been";
- mes "appraised as a 17 carat diamond.";
- mes "There aren't many like it in the world.";
- next;
-
- mes .@npc$;
- mes "The price is a mere 500 million zeny!";
- mes "There is also a 1,000,000z service fee.";
- mes "Compared to the quality of the diamond";
- mes "this is a small price to pay.";
- next;
-
- if (select("^828282It's too expensive.^000000:I'll buy it.") == 1) {
- mes .@npc$;
- mes "To say that a diamond such as the";
- mes "^FF82FF'17 Carat Diamond'^000000 is too expensive, ";
- mes "you leave me speechless.";
- close;
- }
-
- mes .@npc$;
- mes "OOOH! I knew from the moment I saw you that you were the rightful";
- mes "owner of this wonderful diamond.";
- mes "I'm glad I wasn't wrong!";
- mes "I believe this diamond will suit you quite well.";
- mes "All I need from you is to complete this contract.";
- next;
-
- while(1) {
- if (select("^B9062FI will sign the contract.^000000:^828282Nevermind, I changed my mind.^000000") == 2) {
- mes .@npc$;
- mes "I see, that's too bad..";
- close;
- }
-
- mes .@npc$;
- mes "What is your name?";
- next;
-
- mes "[" + strcharinfo(0) + "]";
- mes "My name is " + strcharinfo(0) + ".";
- next;
-
- mes .@npc$;
- mes "Alright then, please sign here.";
- next;
-
- input .@charname$;
- if (.@charname$ == strcharinfo(0)) {
- mes .@npc$;
- mes "Okay, good.";
- mes "All that is left now is payment.";
- next;
-
- if (Zeny >= 501000000) {
- mes .@npc$;
- mes ". . . . . .";
- next;
-
- mes .@npc$;
- mes "Calculating the price and service fee..";
- mes "501,000,000 zeny.";
- mes "Amount has been confirmed.";
- emotion e_loud;
- set Zeny, Zeny - 501000000;
- getitem 6024, 1;
- next;
-
- mes .@npc$;
- mes "You may exchange the diamond back for zeny at any time.";
- mes "However, there will be a 1,000,000z service fee.";
- mes "Thank you for your business.";
- emotion e_thx;
- close;
- }
- else {
- mes .@npc$;
- mes "Hm?";
- mes "I'm sorry, but you don't have sufficient funds.";
- mes "Including the service fee, a total of 501,000,000z is required.";
- mes "Please check your zeny balance and try again.";
- emotion e_hmm;
- close;
- }
- }
- else {
- mes .@npc$;
- mes "Is this really your signature?";
- mes "Will sign again to confirm?";
- next;
- }
- }
- case 2:
- mes .@npc$;
- mes "AAH. You would like to exchange your ^FF82FF'17 Carat Diamond'^000000 for zeny?";
- emotion e_gasp;
- next;
- if (select("Yes:No") == 2) {
- mes .@npc$;
- mes "Then, what is it you desire?..";
- mes ". . . . . ....";
- emotion e_dots;
- close;
- }
-
- mes .@npc$;
- mes "I see. After I receive your signature, ";
- mes "You must offer your ^FF82FF'17 Carat Diamond'^000000.";
- mes "Also don't forget there is a 1,000,000z service fee!";
- next;
-
- mes .@npc$;
- mes "What is your name?";
- next;
-
- mes "[" + strcharinfo(0) + "]";
- mes "My name is " + strcharinfo(0) + ".";
- next;
-
- mes .@npc$;
- mes "Alright then, please sign here.";
- next;
-
- while (1) {
- if (select("Sign:Don't Sign") == 2) {
- mes .@npc$;
- mes "The trade cannot be completed without your signature.";
- close;
- }
-
- input .@charname$;
- if (.@charname$ == strcharinfo(0)) {
- mes .@npc$;
- mes "Your signature has been received.";
- mes "I will now take your ^FF82FF'17 Carat Diamond'^000000..";
- mes "You will receive ^0000FF499,000,000z^000000 afterwards.";
- next;
-
- mes .@npc$;
- mes "Thank you for your business.";
- mes "Whenever you need a ^FF82FF'17 Carat Diamond'^000000,";
- mes "come back anytime with 500 million zeny.";
- emotion e_thx;
- delitem 6024, 1;
- set Zeny, Zeny + 499000000;
- close;
- }
- else {
- mes .@npc$;
- mes "Is this really your signature?";
- mes "Will sign again to confirm?";
- next;
- }
- }
- }
-}
-
-prontera,165,89,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#1 58
-geffen,106,63,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#2 58
-morocc,146,100,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#3 58
-alberta,129,60,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#4 58
-lighthalzen,163,65,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#5 58
-rachel,106,142,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#6 58
-payon,180,130,6 duplicate(RareDiamondMerchant) Rare Diamond Merchant#7 58
diff --git a/npc/pre-re/merchants/falcon_flute.txt b/npc/pre-re/merchants/falcon_flute.txt
deleted file mode 100644
index 738275d73..000000000
--- a/npc/pre-re/merchants/falcon_flute.txt
+++ /dev/null
@@ -1,123 +0,0 @@
-//===== rAthena Script =======================================
-//= Falcon Flute Trader
-//===== By: ==================================================
-//= Masao
-//= Credits to Muad_Dib for the translation & Ziu for the
-//= Item ID of the Falcon Flute.
-//===== Current Version: =====================================
-//= 1.0
-//===== Compatible With: =====================================
-//= rAthena
-//===== Description: =========================================
-//= An NPC which sells you a Falcon Flute so you're able to
-//= summon a Falcon wherever you are.
-//===== Additional Comments: =================================
-//= 1.0 First Version. [Masao]
-//= 1.1 Added Baby Hunter and Baby Ranger check. bugreport:5728 [Masao]
-//============================================================
-
-- script Falcon Flute Trader::fflute -1,{
-
- if (Class == Job_Baby_Hunter || Class == Job_Hunter || Class == Job_Sniper || Class == Job_Baby_Ranger || Class == Job_Ranger || Class == Job_Ranger_T) {
- mes "[Falcon Flute Trader]";
- mes "Do you need a Falcon?";
- mes "With a magical Flute, you can call your Falcon from anywhere!";
- next;
- mes "[Falcon Flute Trader]";
- mes "It's marvelous, isn't it? Ha ha ha!";
- next;
- mes "[Falcon Flute Trader]";
- mes "Why I'm selling these Falcon Flutes?";
- mes "It's because I have no clue how they work.";
- mes "Ha ha ha!";
- next;
- mes "[Falcon Flute Trader]";
- mes "Of course, you'll need the Skill ^ff0000Falcon Mastery^000000.";
- mes "I don't have the Skill, so I don't know how to handle Falcons.";
- mes "As it's for now, I may never have a Falcon.";
- next;
- mes "[Falcon Flute Trader]";
- mes "But I can't give you one for free!";
- mes "I have to make money since i also need to eat!";
- next;
- mes "[Falcon Flute Trader]";
- mes "If you need a Falcon Flute I will sell them for 12,500 zeny. Or is that too expensive?";
- next;
- if (Class == Job_Baby_Hunter || Class == Job_Hunter || Class == Job_Sniper) {
- switch (select("Don't buy one:Buy a Falcon Flute")) {
- case 1:
- mes "[Falcon Flute Trader]";
- mes "That's too bad. If you need one, come back!";
- close;
- case 2:
- if (Zeny >= 12500) {
- if (countitem(12848) >= 1) {
- mes "[Falcon Flute Trader]";
- mes "As i can see you already have an Falcon Flute!";
- mes "Don't worry my young friend, once you've purchased the Falcon Flute you won't need to do so again";
- mes "since the Falcon Flute won't disappear upon usage, isn't that great?";
- close;
- }
- mes "[Falcon Flute Trader]";
- mes "Here, take this Flute.";
- mes "With it you can whistle for your Falcon from anywhere.";
- set Zeny, Zeny - 12500;
- getitem 12848,1; // Falcon Flute
- next;
- mes "[Falcon Flute Trader]";
- mes "Just a reminder.";
- mes "You need the Skill ^ff0000Falcon Mastery^000000 in order to use it!";
- close;
- }
- mes "[Falcon Flute Trader]";
- mes "I'm sorry but you don't have enough money to buy a Falcon Flute, please come back when you have more money!";
- close;
- }
- }
- mes "[Falcon Flute Trader]";
- mes "For Rangers however, I have a special Price of 10,000 zeny!";
- next;
- switch (select("Don't buy one:Buy a Falcon flute")) {
- case 1:
- mes "[Falcon Flute Trader]";
- mes "That's too bad. If you need one, come back!";
- close;
- case 2:
- if (Zeny >= 10000) {
- if (countitem(12848) >= 1) {
- mes "[Falcon Flute Trader]";
- mes "As i can see you already have an Falcon Flute!";
- mes "Don't worry my young friend, once you've purchased the Falcon Flute you won't need to do so again";
- mes "since the Falcon Flute won't disappear upon usage, isn't that great?";
- close;
- }
- mes "[Falcon Flute Trader]";
- mes "Here take this Flute.";
- mes "With it you can whistle for your Falcon from anywhere.";
- set Zeny, Zeny - 10000;
- getitem 12848,1; // Falcon Flute
- next;
- mes "[Falcon Flute Trader]";
- mes "Just a reminder.";
- mes "You need the Skill ^ff0000Falcon Mastery^000000 in order to use it!";
- close;
- }
- mes "[Falcon Flute Trader]";
- mes "I'm sorry but you don't have enough money to buy a Falcon Flute, please come back when you have more money!";
- close;
- }
- }
- if (Class == Job_Baby_Archer || Class == Job_Archer) {
- mes "[Falcon Flute Trader]";
- mes "Hello young one!";
- mes "Currently i can't help you,";
- mes "but why don't you return to me when you've become an great Hunter and learned how to handle Falcons properly?";
- close;
- }
- mes "[Falcon Flute Trader]";
- mes "Isn't it a beautiful Day today?";
- close;
-}
-
-hu_in01,386,306,3 duplicate(fflute) Falcon Flute Trader#fft 51
-pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 51
diff --git a/npc/pre-re/merchants/shops_re.txt b/npc/pre-re/merchants/shops_re.txt
deleted file mode 100644
index 4f0ad37e3..000000000
--- a/npc/pre-re/merchants/shops_re.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-//===== rAthena Script =======================================
-//= Shops
-//===== By: ==================================================
-//= rAthena Dev Team
-//===== Current Version: =====================================
-//= 3.1
-//===== Compatible With: =====================================
-//= rAthena 1.0+
-//===== Description: =========================================
-//= Renewal-specific town shop NPCs.
-//===== Additional Comments: =================================
-//= 3.1 Moved some merchants to a separate renewal file. [Kenpachi]
-//============================================================
-
-//=======================================================
-// Einbroch
-//=======================================================
-einbroch,122,250,4 shop Black Marketeer#ein 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-
-//=======================================================
-// Lighthalzen
-//=======================================================
-lhz_in03,181,17,4 shop Black Marketeer#lhz 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,15,65,5 shop Part-Timer#sc_lgt 89,6123:-1,6120:-1
-
-//=======================================================
-// Mid Camp
-//=======================================================
-mid_camp,129,284,4 shop Trap Specialist#mid 66,7940:-1,12341:-1
-mid_camp,184,263,4 shop Black Marketeer#mid 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-
-//=======================================================
-// Prontera
-//=======================================================
-prt_in,175,137,4 shop Black Marketeer#prt 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,17,110,1 shop Part-Timer#sc_prt 67,6123:-1,6120:-1
-
-//=======================================================
-// Rachel
-//=======================================================
-ra_in01,257,266,4 shop Black Marketeer#ra 49,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2804:-1,2806:-1,2807:-1,18000:-1,18001:-1,18002:-1,18003:-1,18004:-1,12392:-1,12393:-1,12394:-1,6145:-1,6146:-1,6147:-1,6186:-1,2808:-1
-s_atelier,137,60,3 shop Part-Timer#sc_ra 70,6123:-1,6120:-1
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 06:45:11 +0000