Skip to content

Commit

Permalink
Small cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
Lemongrass3110 committed Sep 29, 2016
1 parent 2661b7a commit 3064701
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
10 changes: 3 additions & 7 deletions doc/mapflags.txt
Expand Up @@ -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.

---------------------------------------

Expand Down
4 changes: 2 additions & 2 deletions doc/script_commands.txt
Expand Up @@ -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.

---------------------------------------

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions npc/re/other/Global_Functions.txt
Expand Up @@ -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(<seconds>) : return 1 if the woe te will start in less than X seconds, 0 otherwise
// WoeTETimeStart(<seconds>) : 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);
Expand All @@ -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;
}

0 comments on commit 3064701

Please sign in to comment.