diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-05-17 13:51:05 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-05-17 13:51:05 -0300 |
| commit | 937202e881e76a9fd7a3c2b988f14ca01dce264d (patch) | |
| tree | 102d6dfbc769cd92b885cb7b987475c51746c0a7 /npc/commands | |
| parent | 61c08aebefa260a32afce0453ebe38dda0411d25 (diff) | |
| download | serverdata-937202e881e76a9fd7a3c2b988f14ca01dce264d.tar.gz serverdata-937202e881e76a9fd7a3c2b988f14ca01dce264d.tar.bz2 serverdata-937202e881e76a9fd7a3c2b988f14ca01dce264d.tar.xz serverdata-937202e881e76a9fd7a3c2b988f14ca01dce264d.zip | |
Prepare to deprecate and unify 003-1 NPCs
Diffstat (limited to 'npc/commands')
| -rw-r--r-- | npc/commands/event.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt index 0b18dcbd0..9079a2d03 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -12,10 +12,9 @@ function script sClear { if ($EVENT$ != "Easter") { DelItemFromEveryPlayer(SilverEasteregg); DelItemFromEveryPlayer(GoldenEasteregg); - disablenpc "Lilica#final"; } 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); - enablenpc "Lilica#final"; + setnpcdisplay("Aurora", "Lilica#final", NPC_EASTER); } // Delete all Christmas stuff @@ -45,13 +44,12 @@ function script sClear { // Remove event items DelItemFromEveryPlayer(LoveLetter); DelItemFromEveryPlayer(BoxOfChocolates); - disablenpc "Demure#ValentineFinal"; } else if ($EVENT$ == "Valentine") { htdelete $@VALENTINE_GIFTSTACKS; htdelete $@VALENTINE_LOVELETTER; $@VALENTINE_GIFTSTACKS=0; $@VALENTINE_LOVELETTER=0; - enablenpc "Demure#ValentineFinal"; + donpcevent "Aurora::OnValentine"; } // Longer EXP rate controls @@ -331,7 +329,7 @@ function script GlobalEventMenu { $EVENT$="Patrick"; $@PATRICK_DAYMAX=31; enablenpc "sPatrick"; - enablenpc "Patrick Saulc"; + setnpcdisplay("Aurora", "Patrick Saulc", NPC_WEIRDGREEN); enablenpc "St. Patrick Gold Pot"; donpcevent "St. Patrick Gold Pot::OnForcedMove"; logmes "Enabled ST. PATRICK DAY event (until day 31).", LOGMES_ATCOMMAND; |