diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-04-08 01:52:01 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-04-08 01:52:01 +0000 |
| commit | 23d7e85f8fcc94b0680e8b66e8fb6cf34c369ca0 (patch) | |
| tree | e9e4bf03b9cb28a773fa534f6115868e016f3447 | |
| parent | 306d1ab5dc4eadb9d2a4ffd977ba8f6c1e9cd080 (diff) | |
| parent | df6ba4d77016167369bff782d2b1bb831ae2e5bf (diff) | |
| download | serverdata-23d7e85f8fcc94b0680e8b66e8fb6cf34c369ca0.tar.gz serverdata-23d7e85f8fcc94b0680e8b66e8fb6cf34c369ca0.tar.bz2 serverdata-23d7e85f8fcc94b0680e8b66e8fb6cf34c369ca0.tar.xz serverdata-23d7e85f8fcc94b0680e8b66e8fb6cf34c369ca0.zip | |
Merge branch 'jesusalva/hotfix' into 'master'
Hotfix for Ledmitz
See merge request legacy/serverdata!636
| -rw-r--r-- | world/map/npc/069-2/wizard.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/annuals/fathertime.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/world/map/npc/069-2/wizard.txt b/world/map/npc/069-2/wizard.txt index 5bb6f4e1..d9d0464a 100644 --- a/world/map/npc/069-2/wizard.txt +++ b/world/map/npc/069-2/wizard.txt @@ -137,7 +137,7 @@ L_Doomsday: mes "\"...The Doomsday was a fierce battle. If you go there alone, you definitely will die. You should make a party and bring them all here, then I'll consider helping you.\""; next; mes "[Rodium]"; - mes "\"##1##BBut... not yet. The time wheel is broken again! Oh dear, these things happen, but I guess that to see the past... You must wait for the future...##b##0\""; + mes "\"##1##BBut... not yet. The time wheel is broken again! Oh dear, these things happen, so I guess that to see the past... You must wait for the future...##b##0\""; if (debug) goto L_Warp; if (GM >= G_EVENT) goto L_Warp; goto L_Menu2; diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt index 91bbec65..fe9fc621 100644 --- a/world/map/npc/annuals/fathertime.txt +++ b/world/map/npc/annuals/fathertime.txt @@ -82,6 +82,8 @@ L_Friday: end; L_Pirate: + if (gettime(5) != -1) + goto L_Die; set $@BLANC, (getusers(1) / 4) + 1; areamonster "001-1", 20, 20, 120, 120, "Blanc's Minion", 1121, $@BLANC, "#HolidayConfig::OnLameShield"; areamonster "002-1", 20, 20, 120, 120, "Blanc's Minion", 1119, $@BLANC, "#HolidayConfig::OnLameShield"; |