diff options
| -rw-r--r-- | npc/003-1/aahna.txt | 11 | ||||
| -rw-r--r-- | npc/commands/rate-management.txt | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/npc/003-1/aahna.txt b/npc/003-1/aahna.txt index 4ad2bdd10..8d88923a1 100644 --- a/npc/003-1/aahna.txt +++ b/npc/003-1/aahna.txt @@ -25,13 +25,12 @@ OnInit: // Server Happy Hour // Used to be Sunday 18:00~20:00 -// Now it is Sunday 16:00~20:00 -OnSun1600: +// Then it is Sunday 16:00~20:00 +// Currently it is the whole weekend +OnSat0000: if (debug) end; - $@EXP_EVENT=rand2(15, 20); - if ($@EXP_EVENT > 15 && $@EXP_EVENT != 20) - $@EXP_EVENT=rand2(15, 20); - $@EXP_EVENT_TIME=any(2,2,2,3,3,4); + $@EXP_EVENT=10; + $@EXP_EVENT_TIME=48; donpcevent "@exprate::OnPlayerCall"; end; diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt index 886fed58d..b31057f78 100644 --- a/npc/commands/rate-management.txt +++ b/npc/commands/rate-management.txt @@ -114,7 +114,10 @@ OnPlayerCall: // Default duration is one hour, or whatever $@EXP_EVENT_TIME is $@EXP_EVENT=limit(0, $@EXP_EVENT, 100); $@EXP_EVENT+=.current_rate; - $@EXP_EVENT_TIME=limit(1, $@EXP_EVENT_TIME, 6); + if ($@EXP_EVENT_TIME > 6 && gettime(4) != SATURDAY && gettime(3)) { + consolewarn("Tried to set EXP Event Time to %d hours, but max is 6", $@EXP_eVENT_TIME); + $@EXP_EVENT_TIME=limit(1, $@EXP_EVENT_TIME, 6); + } // If a GM rate-up was running, we will sum the time, too. // It'll be rounded down. (so 1h + 30m = 1h) FIXME average is better |