diff options
| author | Jesusaves <cpntb1@ymail.com> | 2020-05-18 05:57:44 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2020-05-18 05:57:44 -0300 |
| commit | 60ff4413bc1a6acd5b21ccb3bc65c746a9dcbb14 (patch) | |
| tree | f4e9bf6900983bdf82e1d83db912829dbab50b09 /npc | |
| parent | 5c90003cf468780c7dc6c3860928749afaf07a42 (diff) | |
| download | serverdata-60ff4413bc1a6acd5b21ccb3bc65c746a9dcbb14.tar.gz serverdata-60ff4413bc1a6acd5b21ccb3bc65c746a9dcbb14.tar.bz2 serverdata-60ff4413bc1a6acd5b21ccb3bc65c746a9dcbb14.tar.xz serverdata-60ff4413bc1a6acd5b21ccb3bc65c746a9dcbb14.zip | |
Server Restart: The Regnum's Blessing effects will now be preserved.
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/commands/event.txt | 10 | ||||
| -rw-r--r-- | npc/functions/aurora.txt | 14 | ||||
| -rw-r--r-- | npc/functions/news.txt | 2 |
3 files changed, 14 insertions, 12 deletions
diff --git a/npc/commands/event.txt b/npc/commands/event.txt index 9079a2d03..b25a46ea7 100644 --- a/npc/commands/event.txt +++ b/npc/commands/event.txt @@ -61,14 +61,16 @@ function script sClear { // Nullify Regnum Blessing if ($EVENT$ == "Regnum") { // Remove the blessing - setmapflag($@REGNUM_BLESSMAP$, mf_bexp, 100); - $@REGNUM_BLESSMAP_H$=""; - $@REGNUM_BLESSMAP$=""; + setmapflag($REGNUM_BLESSMAP$, mf_bexp, 100); + $REGNUM_BLESSMAP_H$=""; + $REGNUM_BLESSMAP$=""; kamibroadcast("Regnum's Blessing is over."); } // Hand Aurora Event Rewards callfunc("FYRewardEvent"); + $REGNUM_BLESSMAP$=""; + $REGNUM_BLESSMAP_H$=""; // Simpler events $PATRICK_DAYCTRL=0; @@ -366,7 +368,7 @@ function script GlobalEventMenu { break; case 11: $EVENT$="Regnum"; callfunc("FYE_Regnum"); - dispbottom l("Blessing applied at: %s", $@REGNUM_BLESSMAP_H$); + dispbottom l("Blessing applied at: %s", $REGNUM_BLESSMAP_H$); logmes "Enabled REGNUM event.", LOGMES_ATCOMMAND; break; case 12: DelItemFromEveryPlayer(MurdererCrown); break; diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt index 02b4aae35..a88caa106 100644 --- a/npc/functions/aurora.txt +++ b/npc/functions/aurora.txt @@ -19,9 +19,9 @@ // pay special attention to them. // $FYEVENT_CYCLE // Current cycle. I thought in using gettimeparam(WEEK) but gave up. -// $@REGNUM_BLESSMAP$ +// $REGNUM_BLESSMAP$ // Map under Regnum's Blessing -// $@REGNUM_BLESSMAP_H$ +// $REGNUM_BLESSMAP_H$ // Human-readable form of the map under Regnum's Blessing // Q_AuroraEvent // Quest Variable: DayCtrl, Score, ClaimedControl @@ -54,7 +54,7 @@ function script FYNewEvent { case 3: $EVENT$="Regnum"; callfunc("FYE_Regnum"); - kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events"); + kamibroadcast("Regnum's Blessing: "+$REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events"); break; case 4: $EVENT$="Fishing"; @@ -74,7 +74,7 @@ function script FYNewEvent { // FIXME: PLACEHOLDER $EVENT$="Regnum"; callfunc("FYE_Regnum"); - kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events"); + kamibroadcast("Regnum's Blessing: "+$REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events"); break; case 8: // FIXME: PLACEHOLDER @@ -95,7 +95,7 @@ function script FYNewEvent { // FIXME: PLACEHOLDER $EVENT$="Regnum"; callfunc("FYE_Regnum"); - kamibroadcast("Regnum's Blessing: "+$@REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events"); + kamibroadcast("Regnum's Blessing: "+$REGNUM_BLESSMAP_H$+" is now blessed!", "Aurora Events"); break; case 12: // FIXME: PLACEHOLDER @@ -152,8 +152,8 @@ function script FYE_Regnum { "Snow Field", "Fortress Island - South", "Fortress Island South Cave", "Soren Island"; .@m=rand2(getarraysize(.@ma$)); - $@REGNUM_BLESSMAP$=.@ma$[.@m]; - $@REGNUM_BLESSMAP_H$=.@mb$[.@m]; + $REGNUM_BLESSMAP$=.@ma$[.@m]; + $REGNUM_BLESSMAP_H$=.@mb$[.@m]; // Apply the blessing setmapflag(.@ma$[.@m], mf_bexp, 200); return; diff --git a/npc/functions/news.txt b/npc/functions/news.txt index aedc04167..400fc4564 100644 --- a/npc/functions/news.txt +++ b/npc/functions/news.txt @@ -470,7 +470,7 @@ function script EventHelp { mes l("to give double experience!"); mes ""; mes l("Farm there and get the best experience value!"); - mesc l("Location: %s", $@REGNUM_BLESSMAP_H$), 3; + mesc l("Location: %s", $REGNUM_BLESSMAP_H$), 3; ///////////////////////////////////////////////////////////////////////// } else if ($EVENT$ == "Expo") { mesc ".:: " + l("World Expo") + " ::.", 2; |