summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/other/auction.txt15
-rw-r--r--npc/quests/lvl4_weapon_quest.txt4
-rw-r--r--npc/re/merchants/shadow_refiner.txt17
3 files changed, 25 insertions, 11 deletions
diff --git a/npc/other/auction.txt b/npc/other/auction.txt
index eb4eb7bc4..df76daa32 100644
--- a/npc/other/auction.txt
+++ b/npc/other/auction.txt
@@ -98,11 +98,16 @@ auction_02,43,17,0 warp auction_enterance_lhz 1,1,lighthalzen,209,169
next;
if (select("Yes:No") == 1) {
mes "[Auction Broker]";
- mes "Very well.";
- mes "Please take";
- mes "a look, and see";
- mes "What's being offered~";
- openauction;
+ if ( getbattleflag( "feature.auction" ) ) {
+ mes "Very well.";
+ mes "Please take";
+ mes "a look, and see";
+ mes "What's being offered~";
+ openauction;
+ }
+ else {
+ mes "Auction feature isn't enabled.";
+ }
close;
}
mes "[Auction Broker]";
diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt
index a2839d0cc..e55a57afc 100644
--- a/npc/quests/lvl4_weapon_quest.txt
+++ b/npc/quests/lvl4_weapon_quest.txt
@@ -2870,7 +2870,7 @@ niflheim,187,280,3 script Hein#lv4 4_M_NFDEADMAN,{
if (.@shobu > 1) {
mes "[Hein]";
mes "Let's see...";
- mes "You won " + shobu + " times.";
+ mes "You won " + .@shobu + " times.";
mes "You're really good at game!";
mes "Yes, your luck is at its highest!";
next;
@@ -3333,7 +3333,7 @@ niflheim,331,72,3 script Waltboughst#lv4 4_M_NFDEADMAN,{
next;
if (.@shobu > 1) {
mes "[Waltboughst]";
- mes "Excellent. You won " + shobu + " times,";
+ mes "Excellent. You won " + .@shobu + " times,";
mes "so your luck must be really high.";
mes "That means we can begin~!";
next;
diff --git a/npc/re/merchants/shadow_refiner.txt b/npc/re/merchants/shadow_refiner.txt
index 5bb888d87..33d23450c 100644
--- a/npc/re/merchants/shadow_refiner.txt
+++ b/npc/re/merchants/shadow_refiner.txt
@@ -21,8 +21,8 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
.@menu$ = .@menu$+((getequipisequiped(.@i))?getequipname(.@i):"^8C8C8C"+.@position$[.@i-EQI_SHADOW_ARMOR]+" [Not Equipped]^000000")+":";
}
.@menu$ = .@menu$+"Refine Info";
- .@SelectedPart = select(.@menu$);
- if (.@SelectedPart == 7){
+ .@SelectedPart = select(.@menu$)+EQI_SHADOW_ARMOR-1;
+ if (.@SelectedPart == EQI_SHADOW_ACC_L+1){ // Refine Info
mes "[Shadow Blacksmith]";
mes "Shadow item will gain extra bonus effect by the refine level, same as normal weapon/armour items.";
next;
@@ -38,7 +38,6 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
mes "When +5 or higher refining Shadow item can be destroyed, please use Enriched or HD ingredient for the refinement.";
close;
}
- .@SelectedPart += EQI_SHADOW_ARMOR-1;
while(1){
mes "[Shadow Blacksmith]";
mes "20000 zeny will be spent as a refine fee.";
@@ -125,6 +124,16 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
mes "[Shadow Blacksmith]";
mes "Here we go--!!!";
next;
+ if (Zeny < 20000) {
+ mes "[Shadow Blacksmith]";
+ mes "You do not have enough refine fee.";
+ close;
+ }
+ if (!countitem(.@choose)) {
+ mes "[Shadow Blacksmith]";
+ mes "You do not have enough "+ getitemname(.@choose) +".";
+ close;
+ }
delitem .@choose,1;
Zeny -= 20000;
if (getequippercentrefinery(.@SelectedPart) > rand(100) || getequippercentrefinery(.@SelectedPart) > rand(100)) {
@@ -143,4 +152,4 @@ itemmall,31,76,3 script Shadow Blacksmith#nomal 4_F_JOB_BLACKSMITH,{
close;
}
}
-} \ No newline at end of file
+}