Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed checks in "Gemstone Trader" script, and cleaned a little, bugreport:6370 (merchants\gemstone.txt)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16532 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
euphyy 2012-07-30 00:01:38 +00:00
parent 4f02b8352f
commit a0bc17bd04
2 changed files with 44 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
npc/pre-re/merchants/gemstone.txt
View File

@ -1,9 +1,9 @@
//===== rAthena Script ======================================= //===== rAthena Script =======================================
//= Gemstone trader //= Gemstone Trader
//===== By: ================================================== //===== By: ==================================================
//= L0ne_W0lf //= L0ne_W0lf
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.2 //= 1.3
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -16,6 +16,7 @@
//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.2 Updated input with min/max values. [L0ne_W0lf] //= 1.2 Updated input with min/max values. [L0ne_W0lf]
//= Added a checkweight. //= Added a checkweight.
//= 1.3 Fixed checks. [Euphy]
//============================================================ //============================================================
payon,173,238,5 script Jade#pay 754,{ payon,173,238,5 script Jade#pay 754,{
@ -60,13 +61,7 @@ S_TradeGems:
case 1: case 1:
delitem getarg(0),.@gems * 2; delitem getarg(0),.@gems * 2;
getitem getarg(1),.@gems; getitem getarg(1),.@gems;
mes "[Jade]"; break;
mes "There you go.";
mes "Feel free to come";
mes "back any time.";
mes "Hm, what's that look for?";
mes "Is there something on my face?";
close;
case 2: case 2:
mes "[Jade]"; mes "[Jade]";
mes "So how many"; mes "So how many";
@ -91,27 +86,31 @@ S_TradeGems:
mes "than 100, remember...?"; mes "than 100, remember...?";
next; next;
} }
else { else if (.@gems < .@input) {
break; // Custom dialogue
mes "[Jade]";
mes "Errm...";
mes "You don't have that";
mes "many gems to trade...";
next;
} }
else break;
} }
delitem getarg(0),.@input * 2;
if (.@gems > .@input) { getitem getarg(1),.@input;
delitem getarg(0),.@input * 2; break;
getitem getarg(1),.@input;
mes "[Jade]";
mes "There you go.";
mes "Feel free to come";
mes "back any time.";
mes "Hm, what's that look for?";
mes "Is there something on my face?";
}
close;
case 3: case 3:
mes "[Jade]"; mes "[Jade]";
mes "Sure, no problem."; mes "Sure, no problem.";
mes "Come back any time."; mes "Come back any time.";
close; close;
} }
mes "[Jade]";
mes "There you go.";
mes "Feel free to come";
mes "back any time.";
mes "Hm, what's that look for?";
mes "Is there something on my face?";
close;
} }
} }

45
npc/re/merchants/gemstone.txt
View File

@ -1,9 +1,9 @@
//===== rAthena Script ======================================= //===== rAthena Script =======================================
//= Gemstone trader //= Gemstone Trader
//===== By: ================================================== //===== By: ==================================================
//= L0ne_W0lf //= L0ne_W0lf
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.2 //= 1.3
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena SVN //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
@ -16,6 +16,7 @@
//= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf] //= 1.1 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
//= 1.2 Updated input with min/max values. [L0ne_W0lf] //= 1.2 Updated input with min/max values. [L0ne_W0lf]
//= Added a checkweight. //= Added a checkweight.
//= 1.3 Fixed checks. [Euphy]
//============================================================ //============================================================
payon,173,238,5 script Jade#pay 754,{ payon,173,238,5 script Jade#pay 754,{
@ -60,13 +61,7 @@ S_TradeGems:
case 1: case 1:
delitem getarg(0),.@gems * 2; delitem getarg(0),.@gems * 2;
getitem getarg(1),.@gems; getitem getarg(1),.@gems;
mes "[Jade]"; break;
mes "There you go.";
mes "Feel free to come";
mes "back any time.";
mes "Hm, what's that look for?";
mes "Is there something on my face?";
close;
case 2: case 2:
mes "[Jade]"; mes "[Jade]";
mes "So how many"; mes "So how many";
@ -91,27 +86,31 @@ S_TradeGems:
mes "than 100, remember...?"; mes "than 100, remember...?";
next; next;
} }
else { else if (.@gems < .@input) {
break; // Custom dialogue
mes "[Jade]";
mes "Errm...";
mes "You don't have that";
mes "many gems to trade...";
next;
} }
else break;
} }
delitem getarg(0),.@input * 2;
if (.@gems > .@input) { getitem getarg(1),.@input;
delitem getarg(0),.@input * 2; break;
getitem getarg(1),.@input;
mes "[Jade]";
mes "There you go.";
mes "Feel free to come";
mes "back any time.";
mes "Hm, what's that look for?";
mes "Is there something on my face?";
}
close;
case 3: case 3:
mes "[Jade]"; mes "[Jade]";
mes "Sure, no problem."; mes "Sure, no problem.";
mes "Come back any time."; mes "Come back any time.";
close; close;
} }
mes "[Jade]";
mes "There you go.";
mes "Feel free to come";
mes "back any time.";
mes "Hm, what's that look for?";
mes "Is there something on my face?";
close;
} }
} }