summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/022-1/gift_collector.txt29
-rw-r--r--npc/items/books.txt3
2 files changed, 24 insertions, 8 deletions
diff --git a/npc/022-1/gift_collector.txt b/npc/022-1/gift_collector.txt
index 09dfb8c22..6b52b303f 100644
--- a/npc/022-1/gift_collector.txt
+++ b/npc/022-1/gift_collector.txt
@@ -12,17 +12,25 @@
// 2 - Rewards Collected
022-1,65,53,0 script Gift Fanatic NPC_GNOME_C,{
+ // Start Event for the first time
+ if (gettime(GETTIME_MONTH) != JANUARY && getq(SQuest_XmasCollector) < gettime(GETTIME_YEAR)) {
+ npctalk3 l("Bug, please report: Merry Christmas I am undefined");
+ setq SQuest_XmasCollector, 1, 0, gettime(GETTIME_YEAR);
+ }
+ if (gettime(GETTIME_MONTH) == JANUARY && getq(SQuest_XmasCollector) != gettime(GETTIME_YEAR)-1) {
+ npctalk3 l("Bug, please report: Merry Christmas, I am @@. I got @@/@@ on exams last week!", getq(SQuest_XmasCollector), getq2(SQuest_XmasCollector), getq3(SQuest_XmasCollector));
+ setq SQuest_XmasCollector, 1, 0, gettime(GETTIME_YEAR)-1;
+ }
+ // Main Loop
+ if ($EVENT$ == "Christmas")
+ goto L_Main;
+
// Last year
if (getq3(SQuest_XmasCollector) == gettime(GETTIME_YEAR)-1)
goto L_Reward;
+
// Not on season
- if ($EVENT$ != "Christmas")
- goto L_OutOfSeason;
- // Start Event for the first time
- if (getq3(SQuest_XmasCollector) < gettime(GETTIME_YEAR))
- setq SQuest_XmasCollector, 1, 0, gettime(GETTIME_YEAR);
- // Main Loop
- goto L_Main;
+ goto L_OutOfSeason;
L_OutOfSeason:
mesn;
@@ -30,14 +38,21 @@ L_OutOfSeason:
close;
// The reward is actually just an extra bonus, there is nothing WOW to see here...
+// Unless you reach the milestones: 200, 400, 800, 1600, 3200, 6400, 12800... gifts
+// The maximum is 10 christmas boxes, or 102.400 gifts.
+// There's a floor, though: Your Base Level. That determines the minimum amount
+// before it starts counting. So in reality, you need 200~300 gifts to get prize.
L_Reward:
+ inventoryplace XmasGift, 10;
.@q=getq2(SQuest_XmasCollector);
.@q=max(0, .@q-BaseLevel);
+ .@gifts=min(10, log2(.@q/200))+1;
mesn;
mesq l("Hey, huge THANKS for the help! I love gifts! Here's your due reward!");
mesc l("Got @@ EXP, @@ JExp and @@ GP for helping out.", .@q*7, .@q, .@q*5);
getexp .@q*7, .@q;
Zeny=Zeny+(.@q*5);
+ getitem XmasGift, .@gifts;
setq SQuest_XmasCollector, 2, 0, 0;
close;
diff --git a/npc/items/books.txt b/npc/items/books.txt
index 7b16293e3..4183b9b51 100644
--- a/npc/items/books.txt
+++ b/npc/items/books.txt
@@ -47,7 +47,8 @@
l("Some types of fish also enjoy @@ quite a bit.",
getitemlink(Aquada)),
l("Some people, however, prefer to fish with more unorthodox baits, such as @@ or @@.",
- getitemlink(RoastedMaggot), getitemlink(CaveSnakeTongue));
+ getitemlink(RoastedMaggot), getitemlink(CaveSnakeTongue)),
+ l("Other food can be used as a bait, too.");
break;
case 3:
narrator S_FIRST_BLANK_LINE | S_LAST_NEXT,