Merge branch 'xmas_bit_clear' into 'master'

bit clear both ways

See merge request legacy/serverdata!714

8 files changed, 10 insertions, 8 deletions

diff --git a/world/map/langs/lang_de.txt b/world/map/langs/lang_de.txt
index da205bde..1f5a530f 100644
--- a/world/map/langs/lang_de.txt
+++ b/world/map/langs/lang_de.txt
@@ -6143,7 +6143,7 @@ Slots#7
 SlowPoisonPotion
 
 
-SmallCrack#XmasPassage
+Small Crack#XmasPassage
 
 
 SmallHealingPotion
diff --git a/world/map/langs/lang_en.txt b/world/map/langs/lang_en.txt
index fd42c69c..d381f482 100644
--- a/world/map/langs/lang_en.txt
+++ b/world/map/langs/lang_en.txt
@@ -6143,8 +6143,8 @@ Slots#7
 SlowPoisonPotion
 SlowPoisonPotion
 
-SmallCrack#XmasPassage
-SmallCrack#XmasPassage
+Small Crack#XmasPassage
+Small Crack#XmasPassage
 
 SmallHealingPotion
 SmallHealingPotion
diff --git a/world/map/langs/lang_es.txt b/world/map/langs/lang_es.txt
index 58d0742b..f6eed82d 100644
--- a/world/map/langs/lang_es.txt
+++ b/world/map/langs/lang_es.txt
@@ -6143,7 +6143,7 @@ Slots#7
 SlowPoisonPotion
 
 
-SmallCrack#XmasPassage
+Small Crack#XmasPassage
 
 
 SmallHealingPotion
diff --git a/world/map/langs/lang_fr.txt b/world/map/langs/lang_fr.txt
index 626b787a..53743dcf 100644
--- a/world/map/langs/lang_fr.txt
+++ b/world/map/langs/lang_fr.txt
@@ -6143,7 +6143,7 @@ Slots#7
 SlowPoisonPotion
 
 
-SmallCrack#XmasPassage
+Small Crack#XmasPassage
 
 
 SmallHealingPotion
diff --git a/world/map/langs/lang_pt_BR.txt b/world/map/langs/lang_pt_BR.txt
index 2c966767..bf6cc57d 100644
--- a/world/map/langs/lang_pt_BR.txt
+++ b/world/map/langs/lang_pt_BR.txt
@@ -6143,7 +6143,7 @@ Slots#7
 SlowPoisonPotion
 
 
-SmallCrack#XmasPassage
+Small Crack#XmasPassage
 
 
 SmallHealingPotion
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";