summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/other/Global_Functions.txt27
-rw-r--r--npc/other/auction.txt15
-rw-r--r--npc/re/quests/quests_eclage.txt2
3 files changed, 38 insertions, 6 deletions
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 4e9060419..b88fa647a 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -39,10 +39,37 @@
//= 2.16 Added F_GetWeaponType, and F_GetArmorType. [L0ne_W0lf]
//= 2.17 Renamed 'F_RandMes' to 'F_Rand'. [Euphy]
//= 2.18 Removed useless 'getJobName' function. [Euphy]
+//= 2.19 Improved 'F_InsertComma' function. [Emistry]
//============================================================
//////////////////////////////////////////////////////////////////////////////////
+// Returns a number with commas based on precision of digits and custom separator.
+// -- callfunc "F_InsertComma",<number>{,<precision>,<separator>}
+// Examples:
+// callfunc("F_InsertComma",7777777{,<precision>,<separator>}) // returns "7,777,777"
+// callfunc("F_InsertComma",1000000000,3,","}) // returns "1,000,000,000"
+// callfunc("F_InsertComma",1000000000,3,"_"}) // returns "1_000_000_000"
+// callfunc("F_InsertComma",1000000000,4) // returns "10,0000,0000"
+//////////////////////////////////////////////////////////////////////////////////
+function script F_InsertComma {
+ .@value = getarg(0);
+ .@precision = getarg(1,3);
+ .@separator$ = getarg( 2,"," );
+
+ .@str$ = ""+.@value;
+ .@is_negative = ( .@value < 0 );
+
+ .@length = getstrlen( .@str$ ) - .@precision - .@is_negative;
+ while ( .@length > 0 ) {
+ .@str$ = insertchar( .@str$, .@separator$ , ( .@length + .@is_negative ) );
+ .@length -= .@precision;
+ }
+ return .@str$;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////
// Function that clears job quest variables
//////////////////////////////////////////////////////////////////////////////////
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/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt
index 164f66fad..4f85b42c8 100644
--- a/npc/re/quests/quests_eclage.txt
+++ b/npc/re/quests/quests_eclage.txt
@@ -18543,7 +18543,7 @@ ecl_tdun04,32,35,3 script Hisie#tlord 4_M_FARIY_HISIE,{
mes "[Hisie]";
mes "If you climbed all the way here out of curiosity, you'd better start going down now.";
mes "Professor has been under the weather nowadays.";
- close;
+ close2;
}
else if (ep14_2_mylord == 14) {
cutin "hisie01",0;