diff options
Diffstat (limited to 'npc/commands')
-rw-r--r-- | npc/commands/rate-management.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt index f04597ca9..c7945cd78 100644 --- a/npc/commands/rate-management.txt +++ b/npc/commands/rate-management.txt @@ -75,14 +75,23 @@ OnCall: end; OnPlayerCall: + /* // GM calls take precedence at any time! if (.max_hours > 0 || .hours > 0) end; + */ // $@EXP_EVENT will determine the boost and should not be above 25% // Default duration is one hour, or whatever $@EXP_EVENT_TIME is - $@EXP_EVENT=limit(0, $@EXP_EVENT, 150); + $@EXP_EVENT=limit(0, $@EXP_EVENT, 100); + $@EXP_EVENT+=.current_rate; $@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 + if (.hours || .max_hours) { + $@EXP_EVENT_TIME+=max(0, .max_hours-.hours-1); + } + // Default duration is one hour, or whatever $@EXP_EVENT_TIME is .hours = 0; .max_hours = $@EXP_EVENT_TIME; |