summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--world/map/db/item_db_generic.txt2
-rw-r--r--world/map/db/mob_db.conf2
-rw-r--r--world/map/db/mob_db_0_19.txt2
-rw-r--r--world/map/db/mob_db_over_150.txt2
-rw-r--r--world/map/npc/annuals/2022.txt310
-rw-r--r--world/map/npc/annuals/fathertime.txt38
6 files changed, 227 insertions, 129 deletions
diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt
index 6a54f370..0705bbd8 100644
--- a/world/map/db/item_db_generic.txt
+++ b/world/map/db/item_db_generic.txt
@@ -253,4 +253,4 @@
//5122, RunestoneW, 3, 1000, 100, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
//5123, QuillOfBinding, 3, 10, 10, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
6000, RESERVED_PINKIE, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
-5292, SilverOre, 3, 2500, 1250, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
+5292, SilverOre, 3, 1600, 800, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {}
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index 175169fb..9c98b491 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -3911,7 +3911,6 @@ mob_db: (
MutationStrength: 10
Drops: {
TreasureKey: 800
- Naftalin: 150
UndeadEar: 90
UndeadEye: 80
RottenRags: 70
@@ -6813,7 +6812,6 @@ mob_db: (
AttackMotion: 672
DamageMotion: 480
Drops: {
- Naftalin: 4000
MaggotSlime: 800
CactusDrink: 150
BugLeg: 400
diff --git a/world/map/db/mob_db_0_19.txt b/world/map/db/mob_db_0_19.txt
index 74e1f1c9..661e0ca6 100644
--- a/world/map/db/mob_db_0_19.txt
+++ b/world/map/db/mob_db_0_19.txt
@@ -20,6 +20,6 @@
1105, ViciousSquirrel, ViciousSquirrel, 15, 140, 1, 35, 7, 1, 20, 25, 1, 6, 0, 3, 3, 1, 0, 15, 40, 9, 10, 1, 3, 10, 133, 800, 800, 672, 480, 704, 7000, 680, 1000, 681, 1000, 682, 1000, 683, 1000, 807, 800, 4005, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15
1135, LovelyMaggot, LovelyMaggot, 1, 50, 0, 1, 1, 1, 69, 6969, 0, 5, 0, 5, 5, 1, 0, 6, 5, 9, 10, 1, 3, 11, 133, 200, 1872, 672, 480, 505, 400, 501, 70, 518, 200, 533, 75, 502, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1136, LesserGhost, LesserGhost, 1, 1, 0, 1, 1, 0, 150, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 10, 1, 1, 17, 131, 340, 1800, 672, 950, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20
-1162, Grinchboo, Grinchboo, 5, 50, 0, 6, 1, 1, 5, 10, 0, 5, 0, 1, 1, 1, 0, 6, 5, 9, 10, 1, 3, 11, 129, 800, 1872, 672, 480, 5288, 4000, 505, 800, 501, 150, 518, 400, 527, 50, 527, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1162, Grinchboo, Grinchboo, 5, 50, 0, 6, 1, 1, 5, 10, 0, 5, 0, 1, 1, 1, 0, 6, 5, 9, 10, 1, 3, 11, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 527, 50, 527, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1165, ChristmasGift, ChristmasGift, 1, 1, 0, 1, 1, 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 742, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1172, Bif, Bif, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 704, 1200, 640, 1000, 4001, 800, 5292, 500, 763, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/world/map/db/mob_db_over_150.txt b/world/map/db/mob_db_over_150.txt
index ccd52b61..f06c12a0 100644
--- a/world/map/db/mob_db_over_150.txt
+++ b/world/map/db/mob_db_over_150.txt
@@ -23,7 +23,7 @@
1146, Flashmob, Flashmob, 181, 27000, 280, 72000, 5000, 1, 40, 60, 57, 57, 0, 31, 22, 90, 127, 255, 95, 31, 10, 1, 1, 37, 149, 160, 600, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1147, Koyntety, Koyntety, 181, 27000, 280, 72000, 5000, 4, 220, 240, 52, 52, 0, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 149, 240, 1400, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1148, DoomGolem, DoomGolem, 180, 22000, 280, 65000, 2000, 3, 160, 180, 60, 30, 0, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 149, 320, 1000, 672, 50, 537, 800, 779, 150, 780, 150, 777, 70, 1198, 50, 666, 30, 5253, 4, 5258, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10
-1149, Enchanter, Enchanter, 181, 19000, 280, 55000, 2000, 8, 140, 180, 30, 60, 0, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 149, 240, 800, 672, 50, 537, 800, 5288, 150, 779, 90, 780, 80, 777, 70, 1198, 50, 666, 30, 1227, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10
+1149, Enchanter, Enchanter, 181, 19000, 280, 55000, 2000, 8, 140, 180, 30, 60, 0, 31, 22, 90, 127, 255, 105, 31, 10, 1, 1, 37, 149, 240, 800, 672, 50, 537, 800, 779, 90, 780, 80, 777, 70, 1198, 50, 666, 30, 1227, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 10
1150, ManaTyrant, ManaTyrant, 180, 24000, 280, 27000, 5000, 2, 300, 325, 42, 67, 0, 31, 22, 90, 127, 255, 95, 31, 10, 1, 1, 37, 149, 180, 1050, 672, 50, 759, 1, 5237, 20, 1253, 5, 720, 100, 825, 500, 868, 20, 1172, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1161, Xakelbael, Xakelbael, 200, 29999, 280, 999999, 99999, 9, 90, 124, 74, 100, 0, 199, 2, 199, 197, 255, 175, 31, 10, 1, 1, 37, 181, 210, 672, 672, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1170, CrystalGolem, CrystalGolem, 180, 25000, 280, 68000, 2200, 3, 170, 190, 75, 40, 0, 35, 26, 99, 127, 255, 105, 31, 30, 1, 0, 46, 171, 320, 1000, 672, 50, 4002, 50, 4003, 50, 4004, 50, 4005, 50, 4006, 50, 4007, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/world/map/npc/annuals/2022.txt b/world/map/npc/annuals/2022.txt
index a6782c3c..d66aac42 100644
--- a/world/map/npc/annuals/2022.txt
+++ b/world/map/npc/annuals/2022.txt
@@ -247,45 +247,6 @@ OnInit:
end;
}
-// Puppets
-008-1,140,74,0|script|Halifax|395
-{
- end;
-OnInit:
- disablenpc strnpcinfo(0);
- end;
-}
-
-// Puppets
-018-1,142,75,0|script|Red Bearer|395
-{
- end;
-OnInit:
- disablenpc strnpcinfo(0);
- end;
-}
-
-// Puppets
-008-1,140,70,0|script|Tal#CRC|427
-{
- end;
-OnInit:
- disablenpc strnpcinfo(0);
- end;
-}
-
-// Puppets
-020-1,76,85,0|script|Zax De'Kagen#CRC|400
-{
- //mes "[Zax De'Kagen]";
- //mes "\"I will not tolerate people trying to defile my world. I'm sealing the lake, and that's final.\"";
- //close;
- end;
-OnInit:
- disablenpc strnpcinfo(0);
- end;
-}
-
020-1,78,85,0|script|Santa#X2022|200
{
@@ -293,8 +254,8 @@ OnInit:
goto L_Start;
if (gettime(6) > 1)
goto L_Scores;
- if (gettime(5) > 8)
- goto L_Scores;
+ if (gettime(5) >= 11)
+ goto L_Reward;
goto L_Start;
L_Start:
@@ -305,8 +266,9 @@ L_Start:
mesq l("That's because I forgot Jack Frost existed, hohoho! So, if you could collect the [@@5288|@@] back to me... Well, you would get a Christmas gift, that's for sure, hohoho!");
next;
mesn l("Santa Claus");
- mesq l("I recovered "+$XMAS2022+" [@@5288|@@]. From these, you gave me "+XMAS2022+" [@@5288|@@]. Grinchboos have them but they only appear every hour in four maps, and the others were lost to time, so... Do you want to give me some more? Ah, ##Bbe careful with the snowmans##b, it seems like wicked magic is turning the Naftalin into snowmans!");
- mes l("##1Date limit: January 8th, 2023##0");
+ mesq l("I recovered "+$XMAS2022+" [@@5288|@@]. From these, you gave me "+XMAS2022+" [@@5288|@@]. I'll start handing out the rewards tomorrow!");
+ mes l("##1Date limit: Event ended. Delivery will not be ranked.##0");
+ mes l("##1Rewards will only be available until January 31st, 23:59 UTC##0");
next;
menu
"Deliver", L_Deliver,
@@ -317,56 +279,11 @@ L_Deliver:
set XMAS2022, XMAS2022 + countitem(Naftalin);
set $XMAS2022, $XMAS2022 + countitem(Naftalin);
delitem Naftalin, countitem(Naftalin);
- set @loop, 0;
- set @rank, 0;
- goto L_MaybeInsertNext;
-
-L_MaybeInsertNext:
- if (XMAS2022 > $Record_XXXmas_Kills[@rank])
- goto L_InsertScore;
- // you already had a better score
- if (strcharinfo(0) == $Record_XXXmas_Name$[@rank])
- goto L_Scores;
- set @rank, @rank + 1;
- if (@rank == MAX_HIGH_SCORES)
- goto L_Scores;
- goto L_MaybeInsertNext;
-
-L_InsertScore:
- set @loop, @rank;
- goto L_FindLastScore;
-
-L_FindLastScore:
- // comment this out to allow the player to be in the list more than once
- // though actually, it might be better just to assume the list is full
- if (strcharinfo(0) == $Record_XXXmas_Name$[@loop])
- goto L_MoveStuff;
-
- set @loop, @loop + 1;
- if (@loop == MAX_HIGH_SCORES)
- goto L_MoveStuff;
- goto L_FindLastScore;
-
-L_MoveStuff:
- if (@loop == @rank)
- goto L_FinallyInsertMe;
- set $Record_XXXmas_Kills[@loop], $Record_XXXmas_Kills[@loop - 1];
- set $Record_XXXmas_Name$[@loop], $Record_XXXmas_Name$[@loop - 1];
- set $Record_XXXmas_Date$[@loop], $Record_XXXmas_Date$[@loop - 1];
- set @loop, @loop - 1;
- goto L_MoveStuff;
-
-L_FinallyInsertMe:
- set $Record_XXXmas_Kills[@rank], XMAS2022;
- set $Record_XXXmas_Name$[@rank], strcharinfo(0);
- callfunc "time_stamp";
- set $Record_XXXmas_Date$[@rank], @ts_date$ + " " + @ts_time$;
- set @ts_date$, "";
- set @ts_time$, "";
goto L_Scores;
L_Scores:
mes l("I recovered "+$XMAS2022+" [@@5288|@@]. From these, you gave me "+XMAS2022+" [@@5288|@@].");
+ mes "";
set @rank, 0;
set @loop, 0;
goto L_ShowNextRecord;
@@ -384,6 +301,221 @@ L_NextShowNextRecord:
next;
goto L_ShowNextRecord;
+L_Full:
+ mes "[Santa Claus]";
+ mes "\"Your backpack seems to be full. You should get rid of some unused stuff before you get my gifts, or maybe try one super resistant red bag, my personal favorite! Hoh-hoh!\"";
+ close;
+
+
+L_Reward:
+ if (XMAS2022 < 1) goto L_Scores;
+ getinventorylist;
+ if (@inventorylist_count > 80) goto L_Full;
+ mes l("Ho-ho-ho, you gave me "+XMAS2022+" [@@5288|@@]! Time for late Christmas and New Year gifts!");
+ mes "";
+ // Individual Performance
+ if (XMAS2022 >= 1) goto L_Del1;
+ goto L_Del1_Return;
+
+L_Del1_Return:
+ if (XMAS2022 >= 100) goto L_Del100;
+ goto L_Del100_Return;
+
+L_Del100_Return:
+ if (XMAS2022 >= 500) goto L_Del500;
+ goto L_Del500_Return;
+
+L_Del500_Return:
+ if (XMAS2022 >= 1000) goto L_Del1000;
+ goto L_Del1000_Return;
+
+L_Del1000_Return:
+ if (XMAS2022 >= 2500) goto L_Del2500;
+ goto L_Del2500_Return;
+
+L_Del2500_Return:
+ if (XMAS2022 >= 5000) goto L_Del5000;
+ goto L_Del5000_Return;
+
+L_Del5000_Return:
+ if (XMAS2022 >= 10000) goto L_Del10000;
+ goto L_Del10000_Return;
+
+L_Del10000_Return:
+ // Santa gift for global performance
+ if ($XMAS2022 >= 10000) goto L_Global10k;
+ goto L_Global10k_Return;
+
+L_Global10k_Return:
+ if ($XMAS2022 >= 25000) goto L_Global25k;
+ goto L_Global25k_Return;
+
+L_Global25k_Return:
+ if ($XMAS2022 >= 50000) goto L_Global50k;
+ goto L_Global50k_Return;
+
+L_Global50k_Return:
+ if ($XMAS2022 >= 75000) goto L_Global75k;
+ goto L_Global75k_Return;
+
+L_Global75k_Return:
+ if ($XMAS2022 >= 100000) goto L_Global100k;
+ goto L_Global100k_Return;
+
+L_Global100k_Return:
+ if ($XMAS2022 >= 150000) goto L_Global150k;
+ goto L_Global150k_Return;
+
+L_Global150k_Return:
+ if ($XMAS2022 >= 200000) goto L_Global200k;
+ goto L_Global200k_Return;
+
+L_Global200k_Return:
+ // Scoreboard performance
+ set XMAS2022, 0;
+ set @loop, 0;
+ goto L_ScoreGift;
+
+L_ScoreGift:
+ if (@loop == MAX_HIGH_SCORES)
+ goto L_Finish;
+ if (strcharinfo(0) == $Record_XXXmas_Name$[@loop])
+ goto L_LoopReward;
+ set @loop, @loop + 1;
+ goto L_ScoreGift;
+
+L_LoopReward:
+ if (@loop < 15) goto L_Rank15;
+ goto L_LoopReward15;
+L_LoopReward15:
+ if (@loop < 10) goto L_Rank10;
+ goto L_LoopReward10;
+L_LoopReward10:
+ if (@loop < 5) goto L_Rank5;
+ goto L_LoopReward5;
+L_LoopReward5:
+ if (@loop < 2) goto L_Rank2;
+ goto L_LoopReward2;
+L_LoopReward2:
+ goto L_Finish;
+
+L_Finish:
+ set @loop, 0;
+ mesn;
+ mesq l("Ho-ho-ho! Thanks for helping me to retrieve the Naphtalene! See you next year, ho-ho-ho!");
+ next;
+ goto L_Scores;
+
+L_Del1:
+ // Minimum 20 gp, Maximum 125,000 Naphtalenes
+ set @gp, min(XMAS2022 * 20, 2500000);
+ set Zeny, Zeny + @gp;
+ getexp @gp, 0;
+ mes l("##9Gained "+@gp+" GP!##0");
+ mes l("##9Gained "+@gp+" Experience points.##0");
+ set @gp, 0;
+ goto L_Del1_Return;
+
+L_Del100:
+ getitem IronPotion, 10;
+ getitem ConcentrationPotion, 10;
+ goto L_Del100_Return;
+
+L_Del500:
+ getitem IronPotion, 20;
+ getitem ConcentrationPotion, 20;
+ getitem MediumManaElixir, 10;
+ goto L_Del500_Return;
+
+L_Del1000:
+ // Minimum 40 boss points, Maximum 5,000 boss points
+ set @bp, min(XMAS2022 / 25, 5000);
+ set BOSS_POINTS, BOSS_POINTS + @bp;
+ mes l("Gained "+@bp+" Boss points!");
+ set @bp, 0;
+ goto L_Del1000_Return;
+
+L_Del2500:
+ getitem IronPotion, 20;
+ getitem ConcentrationPotion, 20;
+ getitem MediumManaElixir, 15;
+ goto L_Del2500_Return;
+
+L_Del5000:
+ getitem MediumManaElixir, 25;
+ getitem GumiCandy, 25;
+ goto L_Del5000_Return;
+
+L_Del10000:
+ getitem LovePotion, 50;
+ getitem BlueRose, 1;
+ goto L_Del10000_Return;
+
+L_Global10k:
+ setarray @oldstock$, "PlushMouboo", "StickReinboo", "Doll", "LeatherBall", "SantaSnowGlobe", "SnowmanSnowGlobe", "RedOrnament", "YellowOrnament", "GreenOrnament", "AquaOrnament", "BlueOrnament", "MagentaOrnament";
+ getitem @oldstock$[rand(getarraysize(@oldstock$))], 1;
+ cleararray @oldstock$, "", getarraysize(@oldstock$);
+ goto L_Global10k_Return;
+
+L_Global25k:
+ setarray @oldstock$, "PlushMouboo", "StickReinboo", "Doll", "LeatherBall", "SantaSnowGlobe", "SnowmanSnowGlobe", "RedOrnament", "YellowOrnament", "GreenOrnament", "AquaOrnament", "BlueOrnament", "MagentaOrnament", "RawTalisman", "FlightTalisman";
+ getitem @oldstock$[rand(getarraysize(@oldstock$))], 1;
+ cleararray @oldstock$, "", getarraysize(@oldstock$);
+ goto L_Global25k_Return;
+
+L_Global50k:
+ setarray @oldstock$, "PlushMouboo", "StickReinboo", "Doll", "LeatherBall", "SantaSnowGlobe", "SnowmanSnowGlobe", "RedOrnament", "YellowOrnament", "GreenOrnament", "AquaOrnament", "BlueOrnament", "MagentaOrnament", "RawTalisman", "FlightTalisman", "StrangeCoin";
+ getitem @oldstock$[rand(getarraysize(@oldstock$))], 1;
+ cleararray @oldstock$, "", getarraysize(@oldstock$);
+ goto L_Global50k_Return;
+
+L_Global75k:
+ setarray @oldstock$, "PlushMouboo", "StickReinboo", "Doll", "LeatherBall", "SantaSnowGlobe", "SnowmanSnowGlobe", "RedOrnament", "YellowOrnament", "GreenOrnament", "AquaOrnament", "BlueOrnament", "MagentaOrnament", "RawTalisman", "FlightTalisman", "StrangeCoin", "RedChristmasStocking";
+ getitem @oldstock$[rand(getarraysize(@oldstock$))], 1;
+ cleararray @oldstock$, "", getarraysize(@oldstock$);
+ goto L_Global75k_Return;
+
+L_Global100k:
+ setarray @oldstock$, "MoubooHead", "MushHat", "ChristmasElfHat", "FunkyHat", "ShroomHat", "ElfNightcap", "BowlerHat", "TopHat";
+ getitem @oldstock$[rand(getarraysize(@oldstock$))], 1;
+ cleararray @oldstock$, "", getarraysize(@oldstock$);
+ goto L_Global100k_Return;
+
+L_Global150k:
+ setarray @oldstock$, "PlushMouboo", "StickReinboo", "Doll", "LeatherBall", "SantaSnowGlobe", "SnowmanSnowGlobe", "RedOrnament", "YellowOrnament", "GreenOrnament", "AquaOrnament", "BlueOrnament", "MagentaOrnament", "RawTalisman", "FlightTalisman", "StrangeCoin", "RedChristmasStocking";
+ getitem @oldstock$[rand(getarraysize(@oldstock$))], 1;
+ cleararray @oldstock$, "", getarraysize(@oldstock$);
+ goto L_Global150k_Return;
+
+L_Global200k:
+ setarray @oldstock$, "PlushMouboo", "StickReinboo", "Doll", "LeatherBall", "SantaSnowGlobe", "SnowmanSnowGlobe", "RedOrnament", "YellowOrnament", "GreenOrnament", "AquaOrnament", "BlueOrnament", "MagentaOrnament", "RawTalisman", "FlightTalisman", "StrangeCoin", "RedChristmasStocking";
+ getitem @oldstock$[rand(getarraysize(@oldstock$))], 1;
+ cleararray @oldstock$, "", getarraysize(@oldstock$);
+ goto L_Global200k_Return;
+
+L_Rank15:
+ setarray @oldstock, ChristmasElfHat, Towel, ElfNightcap, PaperBag, ChristmasTreeHat, MovieCap, FourLeafClover, BlueWolfHelmet;
+ getitem @oldstock[rand(getarraysize(@oldstock))], 1;
+ cleararray @oldstock, 0, getarraysize(@oldstock);
+ goto L_LoopReward15;
+
+L_Rank10:
+ setarray @oldstock, ChristmasElfHat, Towel, ElfNightcap, PaperBag, Earmuffs, FunkyHat, ScarabArmlet, SantaBeardHat, MovieCap, AFKCap, FourLeafClover, ChicSantaHat, BlueWolfHelmet;
+ getitem @oldstock[rand(getarraysize(@oldstock))], 1;
+ cleararray @oldstock, 0, getarraysize(@oldstock);
+ goto L_LoopReward10;
+
+L_Rank5:
+ setarray @oldstock, Earmuffs, FunkyHat, ScarabArmlet, ChristmasTreeHat, TamOShanter, SantaBeardHat, GroovyHat, JazzyHat, AFKCap, DarkHelm, ChicSantaHat, PilotHat;
+ getitem @oldstock[rand(getarraysize(@oldstock))], 1;
+ cleararray @oldstock, 0, getarraysize(@oldstock);
+ goto L_LoopReward5;
+
+L_Rank2:
+ setarray @oldstock, TamOShanter, GroovyHat, JazzyHat, DarkHelm, PilotHat;
+ getitem @oldstock[rand(getarraysize(@oldstock))], 1;
+ cleararray @oldstock, 0, getarraysize(@oldstock);
+ goto L_LoopReward2;
L_Close:
close;
}
diff --git a/world/map/npc/annuals/fathertime.txt b/world/map/npc/annuals/fathertime.txt
index 340976c3..91bbec65 100644
--- a/world/map/npc/annuals/fathertime.txt
+++ b/world/map/npc/annuals/fathertime.txt
@@ -7,7 +7,7 @@
OnInit:
if (debug >= 2) end;
donpcevent strnpcinfo(0) + "::OnTimer20000";
- goto L_Clock;
+ end;
OnTimer20000:
donpcevent "#XmasConfig::OnCommandRestartQuest";
@@ -66,17 +66,6 @@ OnClock2313:
goto L_Clock;
L_Clock:
- // Christmas 2022 code, remove it later
- areamonster "034-1", 20, 20, 160, 110, "", 1162, 64;
- areamonster "033-1", 20, 20, 120, 110, "", 1162, 64;
- areamonster "046-1", 20, 20, 160, 115, "", 1162, 64;
- areamonster "047-1", 20, 20, 200, 180, "", 1162, 240;
- areamonster "033-1", 20, 20, 120, 110, "", SnowmanBoss, 1, "#HolidayConfig::OnCuoco331";
- areamonster "034-1", 20, 20, 160, 110, "", SnowmanBoss, 1, "#HolidayConfig::OnCuoco341";
- areamonster "046-1", 20, 20, 160, 115, "", SnowmanBoss, 1, "#HolidayConfig::OnCuoco461";
- areamonster "047-1", 20, 20, 200, 180, "", SnowmanBoss, 2, "#HolidayConfig::OnCuoco471";
- announce "Santa : Ho ho ho, I see a huge movement by the grinchboos!", 0;
-
// Official code below:
if (gettime(4) == 5)
goto L_Friday;
@@ -116,37 +105,16 @@ OnLameShield:
// TODO: Once MLP brings the Dragon Shield, replace with HMC Hat.
if (rand(10000) > 9)
goto L_Die;
- getitem "DragonShield", 1;
+ getitem DragonShield, 1;
end;
OnLameHat:
// Chance: 0.1%
if (rand(1000) > 1)
goto OnLameShield;
- getitem "HMCPirateHat", 1;
- end;
-
-OnCuoco:
- // TODO: Detect alts?
- getitem Naftalin, 15;
+ getitem HMCPirateHat, 1;
end;
-OnCuoco331:
- areatimer 0, "033-1", 20, 20, 120, 110, 10, "#HolidayConfig::OnCuoco";
- goto OnCuoco;
-
-OnCuoco341:
- areatimer 0, "034-1", 20, 20, 160, 110, 10, "#HolidayConfig::OnCuoco";
- goto OnCuoco;
-
-OnCuoco461:
- areatimer 0, "046-1", 20, 20, 160, 115, 10, "#HolidayConfig::OnCuoco";
- goto OnCuoco;
-
-OnCuoco471:
- areatimer 0, "047-1", 20, 20, 200, 180, 10, "#HolidayConfig::OnCuoco";
- goto OnCuoco;
-
L_Die:
end;
}
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-02 02:45:39 +0000