diff options
author | Jesusaves <cpntb1@ymail.com> | 2018-06-08 11:32:56 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2018-06-08 11:32:56 -0300 |
commit | 8c8e8d455502eeb8904b8a90022b119646ecebe7 (patch) | |
tree | ec37a3ae3c1e6ef2b1b734ba6b92d8e9ca49cce8 /npc/006-1 | |
parent | 5c75bdd070c8b41e1a1104c3ed861578b85456a6 (diff) | |
download | serverdata-8c8e8d455502eeb8904b8a90022b119646ecebe7.tar.gz serverdata-8c8e8d455502eeb8904b8a90022b119646ecebe7.tar.bz2 serverdata-8c8e8d455502eeb8904b8a90022b119646ecebe7.tar.xz serverdata-8c8e8d455502eeb8904b8a90022b119646ecebe7.zip |
Crazyfefe's cave should honor $@GM_OVERRIDE flag
Diffstat (limited to 'npc/006-1')
-rw-r--r-- | npc/006-1/crazyfefe.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/npc/006-1/crazyfefe.txt b/npc/006-1/crazyfefe.txt index 0a95d21e1..4f5234252 100644 --- a/npc/006-1/crazyfefe.txt +++ b/npc/006-1/crazyfefe.txt @@ -15,6 +15,8 @@ // How many players are there // $@FEFE_WAVE // Current wave +// $@GM_OVERRIDE +// Only possible with @set command, overrides the co-op requeriment. 006-1,47,22,0 script Crazyfefe NPC_STATUE_EVILMAN,{ if ($@FEFE_CAVE_LEVEL) goto L_Enjoy; @@ -61,8 +63,7 @@ L_Next: close; L_StartFight: - /* to debug, embrace this code in comments */ - if (getmapusers("006-1") < 3) + if (getmapusers("006-1") < 3 && !$@GM_OVERRIDE) goto L_NotEnoughPlayers; $@FEFE_CAVE_LEVEL = 1; @@ -135,11 +136,11 @@ L_CaveLogic: goto L_NextRound; // Victory conditions: Too few players are alive OR twenty minutes went on. - // WARNING, of dead players still in cave are counted, we might never finish the fight. + // WARNING, if dead players still in cave are counted, we might never finish the fight. // And a GM might be called to ban everyone inside. - // To enable debug, comment last part of victory condition. - if ($@FEFE_CAVE_PLAYER_COUNT <= rand(1,2) || gettimetick(2) >= $@FEFE_DELAY - (60*40)) + if ($@FEFE_CAVE_PLAYER_COUNT <= rand(1,2) && !$@GM_OVERRIDE || gettimetick(2) >= $@FEFE_DELAY - (60*40)) { goto L_CleanUp; + } // reset timer initnpctimer; @@ -232,7 +233,7 @@ OnTimer5000: end; // Announces and attempts to start the fight once time run out -//OnTimer30000: // to enable debug, uncomment this line +//OnTimer30000: // If you need to start without 5 minutes delay, this line must be uncommented. OnTimer300000: if ($@FEFE_CAVE_LEVEL > 0) end; if ($@FEFE_DELAY <= gettimetick(2)) goto L_StartFight; |