6 files changed, 122 insertions, 27 deletions

@@ -15,8 +15,8 @@ var ap_pass = ""
 var confusify_world = false
 var enable_multiplayer = false
 
-const my_version = "1.1.0"
-const ap_version = {"major": 0, "minor": 4, "build": 4, "class": "Version"}
+const my_version = "2.0.0-beta2"
+const ap_version = {"major": 0, "minor": 4, "build": 5, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
 ]
@@ -49,6 +49,19 @@ const progressive_items = {
         [
                 {"item": "The Fearless (First Floor) - Second Floor", "display": "Second Floor"},
                 {"item": "The Fearless (Second Floor) - Third Floor", "display": "Third Floor"},
+        ],
+        "Progressive Colorful":
+        [
+                {"item": "The Colorful - White Door", "display": "White"},
+                {"item": "The Colorful - Black Door", "display": "Black"},
+                {"item": "The Colorful - Red Door", "display": "Red"},
+                {"item": "The Colorful - Yellow Door", "display": "Yellow"},
+                {"item": "The Colorful - Blue Door", "display": "Blue"},
+                {"item": "The Colorful - Purple Door", "display": "Purple"},
+                {"item": "The Colorful - Orange Door", "display": "Orange"},
+                {"item": "The Colorful - Green Door", "display": "Green"},
+                {"item": "The Colorful - Brown Door", "display": "Brown"},
+                {"item": "The Colorful - Gray Door", "display": "Gray"},
         ]
 }
 
@@ -112,6 +125,9 @@ var _progressive_progress = {}
 var _has_colors = ["white"]
 var _received_indexes = []
 var _puzzle_skips = 0
+var _cached_slowness = 0
+var _cached_iceland = 0
+var _cached_atbash = 0
 
 signal could_not_connect
 signal connect_status
@@ -298,6 +314,21 @@ func _on_data():
                                 if localdata.size() > 1:
                                         _puzzle_skips = localdata[1]
 
+                                if localdata.size() > 2:
+                                        _cached_slowness = localdata[2]
+                                else:
+                                        _cached_slowness = 0
+
+                                if localdata.size() > 3:
+                                        _cached_iceland = localdata[3]
+                                else:
+                                        _cached_iceland = 0
+
+                                if localdata.size() > 4:
+                                        _cached_atbash = localdata[4]
+                                else:
+                                        _cached_atbash = 0
+
                         requestSync()
 
                         emit_signal("client_connected")
@@ -450,7 +481,15 @@ func saveLocaldata():
         var file = File.new()
         file.open(_localdata_file, File.WRITE)
 
-        var data = [_last_new_item, _puzzle_skips]
+        var effects_node = get_tree().get_root().get_node("Spatial/AP_Effects")
+
+        var data = [
+                _last_new_item,
+                _puzzle_skips,
+                effects_node.slowness_remaining,
+                effects_node.iceland_remaining,
+                effects_node.atbash_remaining
+        ]
         file.store_var(data, true)
         file.close()
 
@@ -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"
@@ -91,9 +91,21 @@ func _load():
 
         wanderer_achieve.translation = Vector3(-51, -33, 35)  # way under the map
 
+        # Turn THE COLORFUL into a cdp.
+        var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful")
+        var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn")
+        var colorful_cdp = cdp_auto_scene.instance()
+        colorful_cdp.name = "CountdownPanel_colorful"
+        colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful"
+        colorful_cdp.panels = "../../Panels/Doorways Room"
+        colorful_cdp.translation = real_colorful.translation
+        colorful_cdp.rotation = real_colorful.rotation
+        get_node("CountdownPanels").add_child(colorful_cdp)
+        real_colorful.translation = Vector3(-51, -35, 35)  # way under the map
+        get_node("Doors/Doorway Room Doors/Door_gray2").queue_free()
+
         # Set up The Master to be variable.
         var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16")
-        var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn")
         var new_master_cdp = cdp_auto_scene.instance()
         new_master_cdp.name = "AP_variable_master"
         new_master_cdp.replace_with = old_master_cdp.replace_with
@@ -565,6 +577,15 @@ func _load():
         global._print("Hooked Load End")
         ._load()
 
+        # Activate any cached traps.
+        if apclient._cached_slowness > 0:
+                effects.trigger_slowness_trap(apclient._cached_slowness)
+        if apclient._cached_iceland > 0:
+                effects.trigger_iceland_trap(apclient._cached_iceland)
+        if apclient._cached_atbash > 0:
+                for _i in range(0, apclient._cached_atbash):
+                        effects.trigger_atbash_trap()
+
         # Process any items received while the map was loading, and send the checks
         # from the save load.
         apclient.mapFinishedLoading()
@@ -46,7 +46,7 @@ func evaluate_solvability():
                                 solvable = false
 
         if solvable:
-                if effects.atbash_activated:
+                if effects.atbash_remaining > 0:
                         self.get_parent().get_node("Viewport/GUI/Panel/Label").text = atbash_text
                 else:
                         self.get_parent().get_node("Viewport/GUI/Panel/Label").text = orig_text
@@ -4,4 +4,4 @@ extends "res://scripts/panelEnd.gd"
 func handle_correct():
         # We don't call the base method because we want to suppress the original
         # behaviour.
-        global.solved -= 1
+        pass
@@ -4,4 +4,4 @@ extends "res://scripts/panelLevelSwitch.gd"
 func handle_correct():
         # We don't call the base method because we want to suppress the original
         # behaviour.
-        global.solved -= 1
+        pass