summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/item_db.conf7
-rw-r--r--npc/001-11/Demure.txt18
2 files changed, 16 insertions, 9 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 0b288f611..8ef11b6ad 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2707,6 +2707,13 @@ item_db: (
Weight: 11
Refine: false
ViewSprite: 641
+ Trade: {
+ nodrop: true
+ noselltonpc: true
+ nogstorage: true
+ nomail: true
+ noauction: true
+ }
Script: <"
if ($EVENT$ != "Valentine" || #VALENTINE_OPENED >= #VALENTINE_RECEIVED) {
dispbottom l("Past due date.");
diff --git a/npc/001-11/Demure.txt b/npc/001-11/Demure.txt
index 0378a5bce..37aafbf64 100644
--- a/npc/001-11/Demure.txt
+++ b/npc/001-11/Demure.txt
@@ -59,11 +59,11 @@
.@ref$="";
// Send the Chocolate
- .@m = htget($@VALENTINE_GIFTSTACKS, .@ref);
+ .@m = htget($@VALENTINE_GIFTSTACKS, str(.@ref));
if (!.@m)
- htput $@VALENTINE_GIFTSTACKS, .@ref, @Val_Ammo;
+ htput $@VALENTINE_GIFTSTACKS, str(.@ref), @Val_Ammo;
else
- htput $@VALENTINE_GIFTSTACKS, .@ref, .@m+@Val_Ammo;
+ htput $@VALENTINE_GIFTSTACKS, str(.@ref), .@m+@Val_Ammo;
// Get 1 Point per sent box
#VALENTINE_POINTS+=1;
@@ -80,9 +80,9 @@
// Register your name on love letter
.@s$ = htget($@VALENTINE_LOVELETTER, .@ref);
if (.@s$ == "")
- htput $@VALENTINE_LOVELETTER, .@ref, strip(strcharinfo(0));
+ htput $@VALENTINE_LOVELETTER, str(.@ref), strip(strcharinfo(0));
else
- htput $@VALENTINE_LOVELETTER, .@ref, .@s$+", "+strip(strcharinfo(0));
+ htput $@VALENTINE_LOVELETTER, str(.@ref), .@s$+", "+strip(strcharinfo(0));
// Get the bonus
// Old rule: 1 point for 2 boxes, capped at 25 and minimum 1 extra point
@@ -107,16 +107,16 @@
return;
}
function GetGift {
- .@m = htget($@VALENTINE_GIFTSTACKS, getcharid(3));
+ .@m = htget($@VALENTINE_GIFTSTACKS, str(getcharid(3)));
if (.@m > 0) {
mesq l("Hey, look, you have @@ boxes to collect!", .@m);
- .@n$ = htget($@VALENTINE_LOVELETTER, getcharid(3), l("Secret Admirer"));
+ .@n$ = htget($@VALENTINE_LOVELETTER, str(getcharid(3)), l("Secret Admirer"));
mesq l("They were given with @@ by @@.", any(l("love"), l("passion"), l("affection")), .@n$);
inventoryplace BoxOfChocolates, .@m;
getitem BoxOfChocolates, .@m;
- htput $@VALENTINE_GIFTSTACKS, getcharid(3), 0;
- htput $@VALENTINE_LOVELETTER, getcharid(3), "";
+ htput $@VALENTINE_GIFTSTACKS, str(getcharid(3)), 0;
+ htput $@VALENTINE_LOVELETTER, str(getcharid(3)), "";
} else {
mesq l("Sorry, you don't have any chocolate to pick up.");