summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-18 15:35:26 +0800
committerHaru <haru@dotalux.com>2015-12-22 01:06:13 +0100
commit1c3378e161859ca6da728ea5cb0a5dc07fff5364 (patch)
tree487d755304022fd72b0bb32532124538a961ff3b
parent1f3dda4623ce6fe083b59992ac721bbde6c020b4 (diff)
downloadhercules-1c3378e161859ca6da728ea5cb0a5dc07fff5364.tar.gz
hercules-1c3378e161859ca6da728ea5cb0a5dc07fff5364.tar.bz2
hercules-1c3378e161859ca6da728ea5cb0a5dc07fff5364.tar.xz
hercules-1c3378e161859ca6da728ea5cb0a5dc07fff5364.zip
NPC Update:
- Add RENEWAL Checks for Material Seller. - in Renewal the selling prize of Medicine Bowl of Guild Dealer is 250z. Closes #982 as merged Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--npc/merchants/alchemist.txt36
-rw-r--r--npc/merchants/shops.txt18
2 files changed, 30 insertions, 24 deletions
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index ee5663232..16ccccd65 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -36,7 +36,7 @@
//================= Description ===========================================
//= Merchants for Alchemist Materials and Manuals.
//================= Current Version =======================================
-//= 1.8
+//= 1.9
//=========================================================================
alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{
@@ -53,18 +53,18 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{
mes "Alchemist Union.";
mes "How can I assist you today?";
next;
- switch(select("Purchase materials.:Purchase a production manual.:Quit.")) {
+ switch (select("Purchase materials.:Purchase a production manual.:Quit.")) {
case 1:
mes "[Gever Al Sharp]";
mes "What would you like?";
next;
- if (select("Medicine Bowl - 8 Zeny:Cancel.") == 1) {
+ if (select("Medicine Bowl - " + (RENEWAL ? "250z" : "8 Zeny") +":Cancel.") == 1) {
mes "[Gever Al Sharp]";
mes "How many do you want?";
mes "Enter '0' if you want to quit.";
next;
while(1) {
- input .@input,0,2001;
+ input .@input, 0, 2001;
if (.@input == 0) {
mes "[Gever Al Sharp]";
mes "The deal was cancelled.";
@@ -81,7 +81,11 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{
break;
}
}
- .@sell = .@input * 8;
+ if (RENEWAL) {
+ .@sell = .@input * 250;
+ } else {
+ .@sell = .@input * 8;
+ }
.@item_weight = .@input * 10;
if (Zeny < .@sell) {
mes "[Gever Al Sharp]";
@@ -118,30 +122,30 @@ alde_alche,24,188,3 script Guild Dealer 2_M_ALCHE,{
mes "What do you need?";
mes "Manuals are generally 100,000 zeny. But there are a couple of special manuals that will cost more.";
next;
- switch(select("Potion Creation Guide:Alcohol Creation Guide:Bottle Grenade Creation Guide:Acid Bottle Creation Guide:Plant Bottle Creation Guide:Marine Sphere Bottle Creation Guide:Glistening Coat Creation Guide:Condensed Potion Creation Guide:Cancel Deal.")) {
+ switch (select("Potion Creation Guide:Alcohol Creation Guide:Bottle Grenade Creation Guide:Acid Bottle Creation Guide:Plant Bottle Creation Guide:Marine Sphere Bottle Creation Guide:Glistening Coat Creation Guide:Condensed Potion Creation Guide:Cancel Deal.")) {
case 1:
- callsub S_SellManual,7144,100000; //Normal_Potion_Book
+ callsub S_SellManual, Normal_Potion_Book, 100000;
break;
case 2:
- callsub S_SellManual,7127,100000; //Alcol_Create_Book
+ callsub S_SellManual, Alcol_Create_Book, 100000;
break;
case 3:
- callsub S_SellManual,7128,100000; //FireBottle_Create_Book
+ callsub S_SellManual, FireBottle_Create_Book, 100000;
break;
case 4:
- callsub S_SellManual,7129,100000; //Acid_Create_Book
+ callsub S_SellManual, Acid_Create_Book, 100000;
break;
case 5:
- callsub S_SellManual,7130,100000; //Plant_Create_Book
+ callsub S_SellManual, Plant_Create_Book, 100000;
break;
case 6:
- callsub S_SellManual,7131,100000; //Mine_Create_Book
+ callsub S_SellManual, Mine_Create_Book, 100000;
break;
case 7:
- callsub S_SellManual,7132,100000; //Coating_Create_Book
+ callsub S_SellManual, Coating_Create_Book, 100000;
break;
case 8:
- callsub S_SellManual,7133,240000; //Slim_Potion_Create_Book
+ callsub S_SellManual, Slim_Potion_Create_Book, 240000;
break;
case 9:
mes "[Gever Al Sharp]";
@@ -168,8 +172,8 @@ S_SellManual:
close;
}
mes "[Gever Al Sharp]";
- mes ""+getitemname(getarg(0))+"?";
- mes "That'll be "+getarg(1)+" zeny.";
+ mes ""+ getitemname(getarg(0)) +"?";
+ mes "That'll be "+ getarg(1) +" zeny.";
next;
if (select("Purchase.:Quit.") == 1) {
Zeny -= getarg(1);
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 381399589..d93baa57c 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -46,7 +46,7 @@
//================= Description ===========================================
//= Town shop NPCs.
//================= Current Version =======================================
-//= 3.5
+//= 3.5.1
//=========================================================================
//== Alberta ===============================================
@@ -208,13 +208,15 @@ OnInit:
sellitem Life_Force_Pot;
sellitem Yggdrasilberry_Dew;
sellitem Seed_Of_Life;
- sellitem Melange_Pot;
- sellitem Cooking_Skewer;
- sellitem Black_Charcoal;
- sellitem Large_Cookpot;
- sellitem Fine_Noodle;
- sellitem Cool_Gravy;
- sellitem Bottle_To_Throw;
+ if (RENEWAL) {
+ sellitem Melange_Pot;
+ sellitem Cooking_Skewer;
+ sellitem Black_Charcoal;
+ sellitem Large_Cookpot;
+ sellitem Fine_Noodle;
+ sellitem Cool_Gravy;
+ sellitem Bottle_To_Throw;
+ }
}
//== Amatsu ================================================