Merge branch 'main' into future

1 files changed, 118 insertions, 55 deletions

@@ -4,16 +4,19 @@ 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
 var solve_mode = false
+var not_behind_wall = false
 var puzzle_to_skip = ""
+var text_dirty = true
 
 var orig_env
 var orig_walk
 var orig_run
+var wallcast
 
 
 func _ready():
@@ -21,6 +24,8 @@ func _ready():
         orig_walk = get_tree().get_root().get_node("Spatial/player").walk_speed
         orig_run = get_tree().get_root().get_node("Spatial/player").run_speed
 
+        wallcast = get_tree().get_root().get_node("Spatial/player/pivot/camera/wallcast")
+
         var label = Label.new()
         label.set_name("label")
         label.margin_right = 1920.0 - 20.0
@@ -37,31 +42,46 @@ func _ready():
 
         add_child(label)
 
+        var slowness_timer = Timer.new()
+        slowness_timer.name = "SlownessTimer"
+        slowness_timer.wait_time = 1.0
+        add_child(slowness_timer)
+        slowness_timer.connect("timeout", self, "_tick_slowness")
+
+        var iceland_timer = Timer.new()
+        iceland_timer.name = "IcelandTimer"
+        iceland_timer.wait_time = 1.0
+        add_child(iceland_timer)
+        iceland_timer.connect("timeout", self, "_tick_iceland")
+
 
 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
                 player.run_speed = orig_run / 2.0
 
-        slowness_remaining += 30
+                $SlownessTimer.start()
 
-        if not effect_running:
-                _process_effects()
+        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:
@@ -69,32 +89,47 @@ func trigger_iceland_trap():
                         load("res://environments/level_iceland.tres")
                 )
 
-        iceland_remaining += 60
+                $IcelandTimer.start()
+
+        iceland_remaining += length
+        text_dirty = true
 
-        if not effect_running:
-                _process_effects()
+        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()
 
-        if not effect_running:
-                _process_effects()
+        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
@@ -106,12 +141,18 @@ func show_puzzle_skip_message(node_path):
                 return
 
         puzzle_focused = true
+        wallcast.enabled = true
+        not_behind_wall = false
+        text_dirty = true
         puzzle_to_skip = node_path
         _evaluate_puzzle_skip()
 
 
 func hide_puzzle_skip_message():
         puzzle_focused = false
+        wallcast.enabled = false
+        not_behind_wall = false
+        text_dirty = true
         _evaluate_puzzle_skip()
 
 
@@ -136,26 +177,64 @@ func skip_puzzle():
 func _evaluate_puzzle_skip():
         if puzzle_focused and not solve_mode:
                 skip_available = true
-
-                if not effect_running:
-                        _process_effects()
         else:
                 skip_available = false
+        text_dirty = true
+
+
+func _tick_slowness():
+        slowness_remaining -= 1
+        text_dirty = true
+
+        if slowness_remaining == 0:
+                var player = get_tree().get_root().get_node("Spatial/player")
+                player.walk_speed = orig_walk
+                player.run_speed = orig_run
+
+                $SlownessTimer.stop()
+        
+        if slowness_remaining % 5 == 0:
+                var apclient = global.get_node("Archipelago")
+                apclient.saveLocaldata()
+
+
+func _tick_iceland():
+        iceland_remaining -= 1
+        text_dirty = true
+
+        if iceland_remaining == 0:
+                get_tree().get_root().get_node("Spatial/player/pivot/camera").set_environment(
+                        orig_env
+                )
+
+                $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 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
 
-func _process_effects():
-        effect_running = true
+        if text_dirty:
+                text_dirty = false
 
-        while slowness_remaining > 0 or iceland_remaining > 0 or atbash_activated or skip_available:
                 var text = ""
-                if atbash_activated:
+                if atbash_remaining == 1:
                         text += "Atbash Trap lasts until you solve a puzzle"
-                if skip_available:
-                        var apclient = global.get_node("Archipelago")
-                        if apclient.getAvailablePuzzleSkips() > 0:
-                                if not text.empty():
-                                        text += "\n"
-                                text += "Press P to skip puzzle (%d available)" % apclient.getAvailablePuzzleSkips()
+                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"
@@ -164,26 +243,10 @@ func _process_effects():
                         if not text.empty():
                                 text += "\n"
                         text += "Iceland: %d seconds" % iceland_remaining
+                if skip_available and not_behind_wall:
+                        var apclient = global.get_node("Archipelago")
+                        if apclient.getAvailablePuzzleSkips() > 0:
+                                if not text.empty():
+                                        text += "\n"
+                                text += "Press P to skip puzzle (%d available)" % apclient.getAvailablePuzzleSkips()
                 self.get_node("label").text = text
-
-                yield(get_tree().create_timer(1.0), "timeout")
-
-                if !get_tree().paused:
-                        if slowness_remaining > 0:
-                                slowness_remaining -= 1
-
-                                if slowness_remaining == 0:
-                                        var player = get_tree().get_root().get_node("Spatial/player")
-                                        player.walk_speed = orig_walk
-                                        player.run_speed = orig_run
-
-                        if iceland_remaining > 0:
-                                iceland_remaining -= 1
-
-                                if iceland_remaining == 0:
-                                        get_tree().get_root().get_node("Spatial/player/pivot/camera").set_environment(
-                                                orig_env
-                                        )
-
-        self.get_node("label").text = ""
-        effect_running = false