summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/001-11/Demure.txt13
-rw-r--r--npc/001-11/_mobs.txt2
-rw-r--r--npc/functions/seasons.txt4
3 files changed, 12 insertions, 7 deletions
diff --git a/npc/001-11/Demure.txt b/npc/001-11/Demure.txt
index 1d5f6871e..5cad9f2fb 100644
--- a/npc/001-11/Demure.txt
+++ b/npc/001-11/Demure.txt
@@ -34,7 +34,7 @@
input @Val_Ammo;
mes "";
- if (@Val_Ammo > countitem(BoxOfChocolates)) {
+ if (@Val_Ammo > countitem(BoxOfChocolates) || @Val_Ammo < 1) {
mesc l("You don't have that many!");
return;
}
@@ -84,11 +84,16 @@
else
htput $@VALENTINE_LOVELETTER, .@ref, .@s$+", "+strip(strcharinfo(0));
- // Get the bonus: 1 point for 2 boxes, capped at 25 and minimum 1 extra point
+ // Get the bonus
+ // Old rule: 1 point for 2 boxes, capped at 25 and minimum 1 extra point
// Sending over 50 boxes at once won't give bonus, give another Love Letter.
- #VALENTINE_POINTS+=min(25, max(1, @Val_Ammo/2));
+ //#VALENTINE_POINTS+=min(25, max(1, @Val_Ammo/2));
+
+ // New rule: Double points up to 10 points
+ #VALENTINE_POINTS+=min(10, @Val_Ammo);
} // Love Letter OK
+ mesc l("Ok, done!");
} // Not yourself
} // Valid Person
} else {
@@ -155,7 +160,7 @@ L_Main:
switch (@menu) {
case 1:
mesn;
- mes lg("Valentine Day event consist in gathering @@ and sending them to your loved one.", getitemlink(BoxOfChocolates));
+ mes lg("Valentine Day event consist in gathering @@ and sending them to your loved one.","Valentine Day event consist in gathering @@ and sending them to your loved one.", getitemlink(BoxOfChocolates));
next;
mesn;
mes l("Don't worry if they don't correspond to you. Each box sent will grant you 1 event point.");
diff --git a/npc/001-11/_mobs.txt b/npc/001-11/_mobs.txt
index f111aa73a..6125af184 100644
--- a/npc/001-11/_mobs.txt
+++ b/npc/001-11/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Map 001-11: Valentine Highlands mobs
001-11,47,34,29,14 monster Lovely Fluffy 1050,6,15000,1500
-001-11,48,34,32,16 monster Red Mushroom 1024,2,75000,150000
+001-11,48,34,32,16 monster Red Mushroom 1042,2,75000,150000
001-11,74,48,1,2 monster Chocolate Slime 1180,1,120000,150000
diff --git a/npc/functions/seasons.txt b/npc/functions/seasons.txt
index cbed27770..8ae930001 100644
--- a/npc/functions/seasons.txt
+++ b/npc/functions/seasons.txt
@@ -110,8 +110,8 @@ function script sChristmas {
// Valentine Day is handled by @event, this is only for @reloadmobdb
function script sValentine {
// Add Valentine drops
- addmonsterdrop(ChocolateSlime, LoveLetter, 8);
- addmonsterdrop(RedMushroom, LoveLetter, 4);
+ addmonsterdrop(RedMushroom, LoveLetter, 8);
+ addmonsterdrop(ChocolateSlime, LoveLetter, 4);
return;
}