diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-04 10:35:56 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-07-04 10:35:56 +0000 |
commit | 7c3e5c8d6b6a6609645ed9974c4e6adf590534d0 (patch) | |
tree | c6f0a31eef7886d8b1a05b17d638d190bcdc3cdd | |
parent | 194db7969cd18c1611a7bcb244d1d26d4fb2eac7 (diff) | |
download | hercules-7c3e5c8d6b6a6609645ed9974c4e6adf590534d0.tar.gz hercules-7c3e5c8d6b6a6609645ed9974c4e6adf590534d0.tar.bz2 hercules-7c3e5c8d6b6a6609645ed9974c4e6adf590534d0.tar.xz hercules-7c3e5c8d6b6a6609645ed9974c4e6adf590534d0.zip |
- Added documentation for 'getmapflag' (follow up to r12175). (bugreport:3314)
- Fixed a zeny check in Transcending quest. (bugreport:3334)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13930 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | doc/script_commands.txt | 26 | ||||
-rw-r--r-- | npc/jobs/valkyrie.txt | 2 |
2 files changed, 18 insertions, 10 deletions
diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 415f88f41..e5cefac8d 100644 --- a/doc/script_commands.txt +++ b/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>} } | { "<NPC name>" | <Attach Flag> }; *setnpctimer <tick>{,"<NPC name>"}; -*getnpctimer(<type of information>{,"<NPC name>"}); +*getnpctimer(<type of information>{,"<NPC name>"}) *attachnpctimer {"<character 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>; -*getbattleflag "<battle flag>"; +*getbattleflag("<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. @@ -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>; 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 player. -The files are taken from '\data\texture\A_AAIIAI\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. Only bitmaps (images stored in the bitmap format) will actually get displayed. The '.bmp' extension is optional. diff --git a/npc/jobs/valkyrie.txt b/npc/jobs/valkyrie.txt index 73bb62ff7..592dfd186 100644 --- a/npc/jobs/valkyrie.txt +++ b/npc/jobs/valkyrie.txt @@ -228,7 +228,7 @@ yuno_in02,88,164,5 script Metheus Sylphe#Library 742,{ mes "1,285,000 zeny."; next; if (select("Donate.:Cancel.") == 1) { - if (Zeny > 1284449) { + if (Zeny >= 1285000) { set zeny,zeny-1285000; set valkyrie_Q,1; mes "[Metheus Sylphe]"; |