Browse Source

- Added documentation for 'getmapflag' (follow up to r12175). (bugreport:3314)
- Fixed a zeny check in Transcending quest. (bugreport:3334)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13930 54d463be-8e91-2dee-dedb-b68131a5f0ec

brianluau 16 years ago
parent
commit
50216b7ef6
2 changed files with 18 additions and 10 deletions
  1. 17 9
      doc/script_commands.txt
  2. 1 1
      npc/jobs/valkyrie.txt

+ 17 - 9
doc/script_commands.txt

@@ -5083,7 +5083,7 @@ If this behavior is undesirable, use some other timer mechanism (like 'sleep').
 *startnpctimer{ "<NPC name>" {, <Attach Flag>} } |
 *startnpctimer{ "<NPC name>" {, <Attach Flag>} } |
               { "<NPC name>" | <Attach Flag> };
               { "<NPC name>" | <Attach Flag> };
 *setnpctimer <tick>{,"<NPC name>"};
 *setnpctimer <tick>{,"<NPC name>"};
-*getnpctimer(<type of information>{,"<NPC name>"});
+*getnpctimer(<type of information>{,"<NPC name>"})
 *attachnpctimer {"<character name>"};
 *attachnpctimer {"<character name>"};
 *detachnpctimer {"<NPC name>"};
 *detachnpctimer {"<NPC name>"};
 
 
@@ -5522,8 +5522,22 @@ mf_fireworks) and whether day/night will be in effect on this map (mf_indoors).
 
 
 ---------------------------------------
 ---------------------------------------
 
 
+*removemapflag "<map name>",<flag>;
+
+This command removes a mapflag from a specified map. 
+See 'setmapflag' for a list of mapflags.
+
+---------------------------------------
+
+*getmapflag("<map name>",<flag>)
+
+This command checks the status of a given mapflag. 
+Returns 1 for ON, 0 for OFF. See 'setmapflag' for a list of mapflags.
+
+---------------------------------------
+
 *setbattleflag "<battle flag>",<value>;
 *setbattleflag "<battle flag>",<value>;
-*getbattleflag "<battle flag>";
+*getbattleflag("<battle flag>)
 
 
 Sets or gets the value of the given battle flag.
 Sets or gets the value of the given battle flag.
 Battle flags are the flags found in the battle/*.conf files and is also used in Lupus' variable rates script.
 Battle flags are the flags found in the battle/*.conf files and is also used in Lupus' variable rates script.
@@ -5538,12 +5552,6 @@ Example(s):
 
 
 ---------------------------------------
 ---------------------------------------
 
 
-*removemapflag "<map name>",<flag>;
-
-This command removes a mapflag from a specified map. See 'setmapflag'.
-
----------------------------------------
-
 *warpportal <x>,<y>,"<mapname>",<x>,<y>;
 *warpportal <x>,<y>,"<mapname>",<x>,<y>;
 
 
 Creates a warp Portal as if a acolyte class character did it.
 Creates a warp Portal as if a acolyte class character did it.
@@ -5798,7 +5806,7 @@ memory of where the points are set whatsoever.
 This command will display a picture stored in the GRF file in the client for the 
 This command will display a picture stored in the GRF file in the client for the 
 player. 
 player. 
 
 
-The files are taken from '\data\texture\A_A£AI�I’„AI«§\illust' directory in the 
+The files are taken from '\data\texture\À¯ÀúÀÎÅÍÆäÀ̽º\illust' directory in the 
 GRF file. Also it seems that card cutins from \cardbmp will work here as well. 
 GRF file. Also it seems that card cutins from \cardbmp will work here as well. 
 Only bitmaps (images stored in the bitmap format) will actually get displayed. 
 Only bitmaps (images stored in the bitmap format) will actually get displayed. 
 The '.bmp' extension is optional. 
 The '.bmp' extension is optional. 

+ 1 - 1
npc/jobs/valkyrie.txt

@@ -228,7 +228,7 @@ yuno_in02,88,164,5	script	Metheus Sylphe#Library	742,{
 			mes "1,285,000 zeny.";
 			mes "1,285,000 zeny.";
 			next;
 			next;
 			if (select("Donate.:Cancel.") == 1) {
 			if (select("Donate.:Cancel.") == 1) {
-				if (Zeny > 1284449) {
+				if (Zeny >= 1285000) {
 					set zeny,zeny-1285000;
 					set zeny,zeny-1285000;
 					set valkyrie_Q,1;
 					set valkyrie_Q,1;
 					mes "[Metheus Sylphe]";
 					mes "[Metheus Sylphe]";