diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-11-27 20:05:27 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-11-27 20:05:27 +0000 |
| commit | de1fe2d14d6151dcf3a93d37164b4b6dd6ca3ff5 (patch) | |
| tree | bd7884106ffd1f5dd58a4f8519e203e34ff72882 /world/map/npc/030-2/storage_helper.txt | |
| parent | 7e34122d0b0255d3c4d530364820d1fb0dbc2e08 (diff) | |
| parent | 8cf8c00f612fa571512108c9454cd4ed2bfc40df (diff) | |
| download | serverdata-de1fe2d14d6151dcf3a93d37164b4b6dd6ca3ff5.tar.gz serverdata-de1fe2d14d6151dcf3a93d37164b4b6dd6ca3ff5.tar.bz2 serverdata-de1fe2d14d6151dcf3a93d37164b4b6dd6ca3ff5.tar.xz serverdata-de1fe2d14d6151dcf3a93d37164b4b6dd6ca3ff5.zip | |
Merge branch 'xmas_dailys' into 'master'
xmas dailys fix
See merge request legacy/serverdata!623
Diffstat (limited to 'world/map/npc/030-2/storage_helper.txt')
| -rw-r--r-- | world/map/npc/030-2/storage_helper.txt | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/world/map/npc/030-2/storage_helper.txt b/world/map/npc/030-2/storage_helper.txt index d1c3f357..168937e8 100644 --- a/world/map/npc/030-2/storage_helper.txt +++ b/world/map/npc/030-2/storage_helper.txt @@ -69,7 +69,7 @@ L_Helping: next; menu "Give " + $@xmas_good_friendly_name$, L_GoodCandy, - "Give " + $@xmas_bad_friendly_name$ + "(What? how mean!).", L_BadCandy; + "Give " + $@xmas_bad_friendly_name$ + " (What? how mean!).", L_BadCandy; L_BadCandy: set @dq_level, $@xmas_bad_level; @@ -81,9 +81,7 @@ L_BadCandy: set @dq_exp, $@xmas_bad_exp; callfunc "DailyQuest"; - if (countitem(@dq_name$) < @dq_count) - goto L_Close; - set @karma_bonus, $@xmas_karma_bonus; + set @karma_bonus, $@xmas_karma_bonus * @multipler; callfunc "XmasNaughty"; goto L_Close; @@ -97,9 +95,7 @@ L_GoodCandy: set @dq_exp, $@xmas_good_exp; callfunc "DailyQuest"; - if (countitem(@dq_name$) < @dq_count) - goto L_Close; - set @karma_bonus, $@xmas_karma_bonus; + set @karma_bonus, $@xmas_karma_bonus * @multipler; callfunc "XmasNice"; goto L_Close; |