1 files changed, 55 insertions, 20 deletions

@@ -4,7 +4,7 @@ var activated = false
 var effect_running = false
 var slowness_remaining = 0
 var iceland_remaining = 0
-var atbash_activated = false
+var atbash_remaining = 0
 var queued_iceland = 0
 var skip_available = false
 var puzzle_focused = false
@@ -58,13 +58,13 @@ func _ready():
 func activate():
         activated = true
 
-        for _i in range(0, queued_iceland):
-                trigger_iceland_trap()
+        if queued_iceland > 0:
+                trigger_iceland_trap(queued_iceland)
 
         queued_iceland = 0
 
 
-func trigger_slowness_trap():
+func trigger_slowness_trap(length = 30):
         if slowness_remaining == 0:
                 var player = get_tree().get_root().get_node("Spatial/player")
                 player.walk_speed = orig_walk / 2.0
@@ -72,13 +72,16 @@ func trigger_slowness_trap():
 
                 $SlownessTimer.start()
 
-        slowness_remaining += 30
+        slowness_remaining += length
         text_dirty = true
 
+        var apclient = global.get_node("Archipelago")
+        apclient.saveLocaldata()
 
-func trigger_iceland_trap():
+
+func trigger_iceland_trap(length = 60):
         if not activated:
-                queued_iceland += 1
+                queued_iceland += length
                 return
 
         if iceland_remaining == 0:
@@ -88,31 +91,45 @@ func trigger_iceland_trap():
 
                 $IcelandTimer.start()
 
-        iceland_remaining += 60
+        iceland_remaining += length
         text_dirty = true
 
+        var apclient = global.get_node("Archipelago")
+        apclient.saveLocaldata()
+
 
 func trigger_atbash_trap():
-        if not atbash_activated:
-                atbash_activated = true
+        var newly_atbash = (atbash_remaining == 0)
+        atbash_remaining += 1
 
+        if newly_atbash:
                 var apclient = global.get_node("Archipelago")
                 apclient.evaluateSolvability()
 
-                text_dirty = true
+        text_dirty = true
+
+        var apclient = global.get_node("Archipelago")
+        apclient.saveLocaldata()
 
 
 func deactivate_atbash_trap():
-        if atbash_activated:
-                atbash_activated = false
+        if atbash_remaining > 0:
+                atbash_remaining -= 1
 
-                var apclient = global.get_node("Archipelago")
-                apclient.evaluateSolvability()
+                if atbash_remaining == 0:
+                        var apclient = global.get_node("Archipelago")
+                        apclient.evaluateSolvability()
 
                 text_dirty = true
+        
+        var apclient = global.get_node("Archipelago")
+        apclient.saveLocaldata()
 
 
 func show_puzzle_skip_message(node_path):
+        if puzzle_focused and node_path != puzzle_to_skip:
+                hide_puzzle_skip_message()
+
         var panel_input = get_tree().get_root().get_node(node_path)
         if not panel_input.visible:
                 return
@@ -126,6 +143,7 @@ func show_puzzle_skip_message(node_path):
         puzzle_focused = true
         wallcast.enabled = true
         not_behind_wall = false
+        text_dirty = true
         puzzle_to_skip = node_path
         _evaluate_puzzle_skip()
 
@@ -133,6 +151,8 @@ func show_puzzle_skip_message(node_path):
 func hide_puzzle_skip_message():
         puzzle_focused = false
         wallcast.enabled = false
+        not_behind_wall = false
+        text_dirty = true
         _evaluate_puzzle_skip()
 
 
@@ -172,6 +192,10 @@ func _tick_slowness():
                 player.run_speed = orig_run
 
                 $SlownessTimer.stop()
+        
+        if slowness_remaining % 5 == 0:
+                var apclient = global.get_node("Archipelago")
+                apclient.saveLocaldata()
 
 
 func _tick_iceland():
@@ -184,22 +208,33 @@ func _tick_iceland():
                 )
 
                 $IcelandTimer.stop()
+        
+        if iceland_remaining % 5 == 0:
+                var apclient = global.get_node("Archipelago")
+                apclient.saveLocaldata()
 
 
 func _process(_delta):
         if puzzle_focused:
+                var should_nbw = false
                 if wallcast.is_colliding():
-                        var should_nbw = (get_tree().get_root().get_node("Spatial/player")._get_panel_from_ray(wallcast) != null)
-                        if should_nbw != not_behind_wall:
-                                not_behind_wall = true
-                                text_dirty = true
+                        var player = get_tree().get_root().get_node("Spatial/player")
+                        var puzzlecast = player.get_node("pivot/camera/RayCast_sight")
+                        var distance = puzzlecast.get_collision_point().distance_to(wallcast.get_collision_point())
+                        should_nbw = (distance < 0.05)
+                        
+                if should_nbw != not_behind_wall:
+                        not_behind_wall = should_nbw
+                        text_dirty = true
 
         if text_dirty:
                 text_dirty = false
 
                 var text = ""
-                if atbash_activated:
+                if atbash_remaining == 1:
                         text += "Atbash Trap lasts until you solve a puzzle"
+                if atbash_remaining > 1:
+                        text += ("Atbash Trap lasts until you solve %d puzzles" % atbash_remaining)
                 if slowness_remaining > 0:
                         if not text.empty():
                                 text += "\n"