summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
Diffstat (limited to 'world/map')
-rw-r--r--world/map/npc/annuals/fathertime.txt32
1 files changed, 28 insertions, 4 deletions
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 5c37d558..0ebe72ee 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -1,6 +1,6 @@
// Annual Timer
// One timer to check to enable all holiday events
-017-9,26,28,0|script|#HolidayConfig|32767
+-|script|#HolidayConfig|32767
{
end;
@@ -68,15 +68,39 @@ OnClock2313:
L_Clock:
if (gettime(4) != 5)
goto L_Die;
- if (gettime(5) != 13)
- goto L_Die;
+ if (gettime(5) == 13)
+ goto L_Friday;
+ goto L_Pirate;
+
+L_Friday:
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 "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 "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 "057-1", 20, 60, 150, 100, "Blanc's Minion", 1122, 1, "#HolidayConfig::OnLameShield";
+ end;
+
OnFriday:
- areamonster getmap(), getx()-3, gety()-3, getx()+3, gety()+3, "JackO", 1022, 1;
+ areamonster getmap(), getx()-3, gety()-3, getx()+3, gety()+3, "JackO", 1022, 1, "#HolidayConfig::OnLameShield";
+ end;
+
+OnLameShield:
+ // Chance: 0.1%
+ if (rand(1000) > 1)
+ goto L_Die;
+ getitem DragonShield, 1;
end;
L_Die: