diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-12-11 00:14:51 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-12-11 00:14:51 +0000 |
| commit | e2c252cdd9a335ae2d4260046b8368b9d31236af (patch) | |
| tree | c23834937e76a8d7d2bba838506fde6182b8794c /world/map/npc | |
| parent | adb94d74aa8fecdca8eccc71ab478fdde92562d8 (diff) | |
| parent | a09db993d4ad84a119f7ada369457cd3e0d870b9 (diff) | |
| download | serverdata-e2c252cdd9a335ae2d4260046b8368b9d31236af.tar.gz serverdata-e2c252cdd9a335ae2d4260046b8368b9d31236af.tar.bz2 serverdata-e2c252cdd9a335ae2d4260046b8368b9d31236af.tar.xz serverdata-e2c252cdd9a335ae2d4260046b8368b9d31236af.zip | |
Merge branch 'xmas_bit_clear' into 'master'
bit clear both ways
See merge request legacy/serverdata!714
Diffstat (limited to 'world/map/npc')
| -rw-r--r-- | world/map/npc/030-2/bedding_helper.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/030-2/glitter_helper.txt | 3 | ||||
| -rw-r--r-- | world/map/npc/annuals/xmas/barriers.txt | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/world/map/npc/030-2/bedding_helper.txt b/world/map/npc/030-2/bedding_helper.txt index 8e35d4c2..a8595475 100644 --- a/world/map/npc/030-2/bedding_helper.txt +++ b/world/map/npc/030-2/bedding_helper.txt @@ -62,6 +62,7 @@ L_Fur: if (countitem("WhiteFur") < $@xmas_bedding_amount) goto L_NoItems; delitem "WhiteFur", $@xmas_bedding_amount; + set XMASTIME, XMASTIME &~ $@xmas_helper_bit_bed_starts; set XMASTIME, XMASTIME | $@xmas_helper_bit_bed_ends; set @karma_bonus, $@xmas_karma_bonus; callfunc "XmasNice"; diff --git a/world/map/npc/030-2/glitter_helper.txt b/world/map/npc/030-2/glitter_helper.txt index b04e3b2a..ac04c76c 100644 --- a/world/map/npc/030-2/glitter_helper.txt +++ b/world/map/npc/030-2/glitter_helper.txt @@ -58,6 +58,7 @@ L_GemPowders: goto L_NoItems; delitem "RubyPowder", $@xmas_red_amount; delitem "TopazPowder", $@xmas_yellow_amount; + set XMASTIME, XMASTIME &~ $@xmas_helper_bit_glitter_starts; set XMASTIME, XMASTIME | $@xmas_helper_bit_glitter_ends; set @karma_bonus, $@xmas_karma_bonus; callfunc "XmasNice"; @@ -71,8 +72,8 @@ L_FakePowders: goto L_NoItems; delitem "RedPowder", $@xmas_red_amount; delitem "YellowPowder", $@xmas_yellow_amount; - set XMASTIME, XMASTIME | $@xmas_helper_bit_glitter_ends; set XMASTIME, XMASTIME &~ $@xmas_helper_bit_glitter_starts; + set XMASTIME, XMASTIME | $@xmas_helper_bit_glitter_ends; set @karma_bonus, $@xmas_karma_bonus; callfunc "XmasNaughty"; callfunc "XmasXpReward"; diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt index 63af8eaf..b7dba276 100644 --- a/world/map/npc/annuals/xmas/barriers.txt +++ b/world/map/npc/annuals/xmas/barriers.txt @@ -71,7 +71,7 @@ L_Close: // Annual Xmas secret passage to a trapdoor in Santa's Inn Basement -030-3,27,24,0|script|SmallCrack#XmasPassage|400,0,1 +030-3,27,24,0|script|Small Crack#XmasPassage|400,0,1 { callfunc "XmasStates"; |