summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/003-3/malindou.txt3
-rw-r--r--npc/items/alcohol.txt10
2 files changed, 12 insertions, 1 deletions
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 21bcf2279..475d5275d 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -515,6 +515,9 @@ OnPCLoginEvent:
// Position and gameplay fixes
HUB_Login();
+ // Alcohol system reset
+ ALCReset();
+
// Daily rewards (always the last)
daily_login_bonus_handler();
end;
diff --git a/npc/items/alcohol.txt b/npc/items/alcohol.txt
index f1e9d4afb..3421bbe9e 100644
--- a/npc/items/alcohol.txt
+++ b/npc/items/alcohol.txt
@@ -79,8 +79,10 @@ OnUse:
// Recalculate Alcohol Threshold and time
ALC_THRESHOLD+=@Alcohol;
- if (ALC_DELAYTIME < gettimetick(2))
+ if (ALC_DELAYTIME < gettimetick(2)) {
ALC_DELAYTIME=gettimetick(2);
+ ALC_THRESHOLD=@Alcohol;
+ }
ALC_DELAYTIME+=@Alcohol*.@deltatime;
// Debug comment if you need to check stuff
@@ -94,3 +96,9 @@ OnUse:
close;
}
+function script ALCReset {
+ if (ALC_DELAYTIME < gettimetick(2))
+ ALC_THRESHOLD=0;
+ end;
+}
+