diff options
| -rw-r--r-- | db/re/mob_db.conf | 1 | ||||
| -rw-r--r-- | npc/commands/event.txt | 10 | ||||
| -rw-r--r-- | npc/functions/event.txt | 2 | ||||
| -rw-r--r-- | npc/functions/seasons.txt | 14 |
4 files changed, 14 insertions, 13 deletions
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf index 769b998b8..c11c31973 100644 --- a/db/re/mob_db.conf +++ b/db/re/mob_db.conf @@ -2282,7 +2282,6 @@ mob_db: ( ChocolateBiscuit: 800 Coal: 500 LeadOre: 400 - DarkEggshellHat: 2 } }, { diff --git a/npc/commands/event.txt b/npc/commands/event.txt index 5135fc101..3b9eb3a28 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -15,6 +15,7 @@ function script sClear { } else { .@nb = query_sql("SELECT c.name, i.amount FROM `inventory` AS i, `char` AS c WHERE i.nameid=834 AND i.char_id=c.char_id ORDER BY i.amount DESC LIMIT 10", $@easter_name$, $@easter_value); setnpcdisplay("Aurora", "Lilica#final", NPC_EASTER); + delmonsterdrop(Forain, DarkEggshellHat); } // Delete all Christmas stuff @@ -137,15 +138,6 @@ function script GlobalEventMenu { return; } - // Easter is map-only, so it can be handled here instead of seasons.txt - function sEaster { - - // Enable event - set $EVENT$, "Easter"; - logmes "Enabled EASTER event.", LOGMES_ATCOMMAND; - return; - } - // :> function superSpawn { mesc l("Monster ID, 0 to cancel"); diff --git a/npc/functions/event.txt b/npc/functions/event.txt index 733658c91..c594bc562 100644 --- a/npc/functions/event.txt +++ b/npc/functions/event.txt @@ -533,7 +533,7 @@ OnClock0000: kamibroadcast("Easter begun!"); if ($EVENT$ != "") FYStopEvent(); - $EVENT$="Easter"; + sEaster(); } // End the event the day after else if (.@d == .easter_endday+1 && .@m == .easter_endmon) { diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt index fa3b5c5bd..f79b9e3d2 100644 --- a/npc/functions/seasons.txt +++ b/npc/functions/seasons.txt @@ -119,6 +119,14 @@ function script sValentine { return; } +function script sEaster { + // Enable event + set $EVENT$, "Easter"; + addmonsterdrop(Forain, DarkEggshellHat, 2); + logmes "Enabled EASTER event.", LOGMES_ATCOMMAND; + return; +} + // This allows GMs to change seasons if needed function script SeasonControl { do @@ -134,6 +142,7 @@ function script SeasonControl { "Spring End", "SPECIAL - Christmas", "SPECIAL - Valentine", + "SPECIAL - Easter", "FORCED DAYLIGHT", "FORCED NIGHTTIME", "Abort"; @@ -149,8 +158,9 @@ function script SeasonControl { case 8: donpcevent("#SeasonCore::OnSpringEnd"); break; case 9: sChristmas(); break; case 10: sValentine(); break; - case 11: $@WEATHER_NIGHT=false; doevent("#WeatherCore::OnMinute45"); break; - case 12: $@WEATHER_NIGHT=true; doevent("#WeatherCore::OnMinute45"); break; + case 11: sEaster(); break; + case 12: $@WEATHER_NIGHT=false; doevent("#WeatherCore::OnMinute45"); break; + case 13: $@WEATHER_NIGHT=true; doevent("#WeatherCore::OnMinute45"); break; } } while (@menu != 13); return; |