From 30647011e23b97ab3d4b3cb16ea2a43c124cb8c5 Mon Sep 17 00:00:00 2001 From: Lemongrass3110 Date: Thu, 29 Sep 2016 15:04:35 +0200 Subject: [PATCH] Small cleanups --- doc/mapflags.txt | 10 +++------- doc/script_commands.txt | 4 ++-- npc/re/other/Global_Functions.txt | 8 ++++---- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/doc/mapflags.txt b/doc/mapflags.txt index 82191dbe050..2b37b097b81 100644 --- a/doc/mapflags.txt +++ b/doc/mapflags.txt @@ -266,18 +266,14 @@ because it does not necessarily require PvP mode to be set. *gvg_noparty *gvg_castle *gvg_dungeon +*gvg_te +*gvg_te_castle Enables Guild vs. Guild mode on a map and applies the corresponding damage adjustments. 'gvg_noparty' will ignore party alliances. 'gvg_castle' marks a guild castle. GvG mode will be active only during the War of Emperium. 'gvg_dungeon' marks a guild dungeon. Players will be warped out after two deaths. - ---------------------------------------- - -*gvg_te -*gvg_te_castle - -Used to determines map is WOE:TE area. Special restrictions are applied. +'gvg_te' and 'gvg_te_castle' marks a WOE:TE area and special restrictions are applied. --------------------------------------- diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 615afc0ecf1..0918fdf3489 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -3670,7 +3670,7 @@ Name is optional, and defaults to the attached player if omitted. These function will let you check whether the server is currently in WoE:FE mode (agitcheck()), WoE:SE mode (agitcheck2()), or WoE:TE mode (agitcheck3()) and will -return 1 if War of Emperium is on and 0 if it isn't. +return true if War of Emperium is on and false if it isn't. --------------------------------------- @@ -6693,7 +6693,7 @@ For examples, check the WoE scripts in the distribution. *agitstart3; *agitend3; -These six commands will start and end War of Emperium, War of Emperium SE, +These commands will start and end War of Emperium FE, War of Emperium SE, or War of Emperium TE. This is a bit more complex than it sounds, since the commands themselves won't diff --git a/npc/re/other/Global_Functions.txt b/npc/re/other/Global_Functions.txt index c4778c9b841..0d34d234efa 100644 --- a/npc/re/other/Global_Functions.txt +++ b/npc/re/other/Global_Functions.txt @@ -5,10 +5,10 @@ //= General script functions. //===== Changelogs: ========================================== //= 1.0 WoeTECheckHour(X) function check if the woe -// will start in X seconds. [Capuche] +// will start in X seconds or less. [Capuche] //============================================================ -// WoeTETimeStart() : return 1 if the woe te will start in less than X seconds, 0 otherwise +// WoeTETimeStart() : return true if the woe te will start in X seconds or less, false otherwise function script WoeTETimeStart { .@woe_status = agitcheck3(); .@min_today = gettime(2); @@ -20,8 +20,8 @@ function script WoeTETimeStart { if (.@h > .@hour_today) { .@time = (60 - .@min_today) *60 + ( .@h - .@hour_today -1 ) *3600; if (.@time <= getarg(0)) - return 1; + return true; } } - return 0; + return false; }