diff options
| -rw-r--r-- | db/constants.conf | 2 | ||||
| -rw-r--r-- | npc/commands/rate-management.txt | 8 | ||||
| -rw-r--r-- | npc/functions/scoreboards.txt | 1 | ||||
| -rw-r--r-- | npc/functions/weather.txt | 15 |
4 files changed, 19 insertions, 7 deletions
diff --git a/db/constants.conf b/db/constants.conf index f264a1e8a..3e81cbaa0 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -4455,7 +4455,7 @@ constants_db: { PVP_WAITTIME: 1800 // 30 minutes BCONFN_SPAWN: 70 BCONFD_SPAWN: 100 - BCONFN_MOBHP: 100 // TODO: Maybe we don't want this constant? + BCONFN_MOBHP: 95 // TODO: Maybe we don't want this constant? (ie. variable) BCONFD_MOBHP: 85 BCONFB_EXPR: 100 BCONFN_EXPR: 5 diff --git a/npc/commands/rate-management.txt b/npc/commands/rate-management.txt index 51a8e2d78..0a0e531ec 100644 --- a/npc/commands/rate-management.txt +++ b/npc/commands/rate-management.txt @@ -176,6 +176,14 @@ OnReload: //charcommand("@reloadmobdb"); //SeasonReload(1); // TODO FIXME: We are casting this twice. end; + +OnInheirtedReload: + debugmes "[EXP] Inheir Reload"; + .@new_rate = expRecalc(.current_rate); + setbattleflag("base_exp_rate", .@new_rate); + setbattleflag("job_exp_rate", .@new_rate); + donpcevent("@droprate::OnReload"); + end; } diff --git a/npc/functions/scoreboards.txt b/npc/functions/scoreboards.txt index 7a3379aa1..0a3fa29e6 100644 --- a/npc/functions/scoreboards.txt +++ b/npc/functions/scoreboards.txt @@ -57,6 +57,7 @@ OnDay1201: end; +// Hourly Reload (maybe "OnMinute00" would work better?) OnHour00: OnHour01: OnHour02: diff --git a/npc/functions/weather.txt b/npc/functions/weather.txt index 561c6b596..039c2e7a9 100644 --- a/npc/functions/weather.txt +++ b/npc/functions/weather.txt @@ -110,6 +110,7 @@ OnMinute00: OnMinute15: OnMinute30: OnMinute45: + debugmes "[Weather.sys] Starting to regen"; .@hti = htiterator(.wcore); for(.@key$ = htinextkey(.@hti); hticheck(.@hti); .@key$ = htinextkey(.@hti)) { @@ -193,6 +194,7 @@ OnMinute45: } } htidelete(.@hti); + debugmes "[Weather.sys] Regenerated"; // During night, normal monsters respawn 30% faster. (Bifs and Bosses are immune) // @@ -205,25 +207,26 @@ OnMinute45: for (.@i = 0; .@i < .@c; .@i++) { message(.@players[.@i], "The night falls."); } + $@WEATHER_NIGHT=is_night(true); setbattleflag("mob_spawn_delay", BCONFN_SPAWN); setbattleflag("monster_hp_rate", BCONFN_MOBHP); //charcommand("@reloadbattleconf"); // Careful! - donpcevent("@exprate::OnReload"); - donpcevent("@droprate::OnReload"); + donpcevent("@exprate::OnInheirtedReload"); + //donpcevent("@droprate::OnReload"); } else if (!is_night() && $@WEATHER_NIGHT) { .@c = getunits(BL_PC, .@players, MAX_CYCLE_PC); for (.@i = 0; .@i < .@c; .@i++) { message(.@players[.@i], "The day rises."); } + $@WEATHER_NIGHT=is_night(true); setbattleflag("mob_spawn_delay", BCONFD_SPAWN); setbattleflag("monster_hp_rate", BCONFD_MOBHP); //charcommand("@reloadbattleconf"); // Careful! - donpcevent("@exprate::OnReload"); - donpcevent("@droprate::OnReload"); + donpcevent("@exprate::OnInheirtedReload"); + //donpcevent("@droprate::OnReload"); } - $@WEATHER_NIGHT=is_night(true); - //debugmes "[Weather.sys] Weather reloaded"; + debugmes "[Weather.sys] Weather reloaded"; end; // Function to check stuff |