diff options
| -rw-r--r-- | world/map/npc/annuals/fathertime.txt | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt index 0ebe72ee..10809b28 100644 --- a/world/map/npc/annuals/fathertime.txt +++ b/world/map/npc/annuals/fathertime.txt @@ -66,29 +66,31 @@ OnClock2313: goto L_Clock; L_Clock: - if (gettime(4) != 5) - goto L_Die; - if (gettime(5) == 13) + if (gettime(4) == 5) goto L_Friday; - goto L_Pirate; + if (gettime(4) == 6) + goto L_Pirate; + goto L_Die; L_Friday: + if (gettime(5) != 13) + goto L_Die; areamonster "009-1", 20, 20, 115, 70, "Friday", 1163, 2, "#HolidayConfig::OnFriday"; areamonster "020-1", 20, 20, 120, 140, "Friday", 1163, 2, "#HolidayConfig::OnFriday"; areamonster "001-1", 20, 20, 120, 120, "Friday", 1163, 1, "#HolidayConfig::OnFriday"; end; L_Pirate: - areamonster "001-1", 20, 20, 120, 120, "Blanc's Minion", 1121, 1, "#HolidayConfig::OnLameShield"; - areamonster "002-1", 20, 20, 120, 120, "Blanc's Minion", 1119, 1, "#HolidayConfig::OnLameShield"; + areamonster "001-1", 20, 20, 120, 120, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield"; + areamonster "002-1", 20, 20, 120, 120, "Blanc's Minion", 1119, 2, "#HolidayConfig::OnLameShield"; areamonster "003-4", 20, 20, 170, 120, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield"; - areamonster "004-1", 20, 20, 100, 110, "Blanc's Minion", 1120, 1, "#HolidayConfig::OnLameShield"; - areamonster "007-1", 20, 20, 120, 100, "Blanc's Minion", 1120, 1, "#HolidayConfig::OnLameShield"; - areamonster "011-6", 20, 140, 180, 280, "Blanc's Minion", 1121, 1, "#HolidayConfig::OnLameShield"; + areamonster "004-1", 20, 20, 100, 110, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield"; + areamonster "007-1", 20, 20, 120, 100, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield"; + areamonster "011-6", 20, 140, 180, 280, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield"; areamonster "018-1", 20, 20, 180, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield"; - areamonster "041-1", 20, 20, 75, 100, "Blanc's Minion", 1119, 1, "#HolidayConfig::OnLameShield"; - areamonster "042-1", 20, 20, 140, 120, "Blanc's Minion", 1120, 1, "#HolidayConfig::OnLameShield"; - areamonster "043-1", 20, 20, 100, 130, "Blanc's Minion", 1121, 1, "#HolidayConfig::OnLameShield"; + areamonster "041-1", 20, 20, 75, 100, "Blanc's Minion", 1119, 2, "#HolidayConfig::OnLameShield"; + areamonster "042-1", 20, 20, 140, 120, "Blanc's Minion", 1120, 2, "#HolidayConfig::OnLameShield"; + areamonster "043-1", 20, 20, 100, 130, "Blanc's Minion", 1121, 2, "#HolidayConfig::OnLameShield"; areamonster "057-1", 20, 60, 150, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield"; end; |