Merge branch 'future' into sunwarps

6 files changed, 186 insertions, 66 deletions

@@ -16,8 +16,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"
 ]
@@ -148,6 +148,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
@@ -346,6 +349,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")
@@ -498,7 +516,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,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
@@ -14,7 +14,8 @@ const EXCLUDED_PAINTINGS = [
         "scenery_3.tscn",
         "scenery_4.tscn",
         "scenery_5.tscn",
-        "pilgrim.tscn"
+        "pilgrim.tscn",
+        "so_pearl_bk.tscn"
 ]
 
 
@@ -24,6 +25,15 @@ func _load():
         var apclient = global.get_node("Archipelago")
         var panels_parent = self.get_node("Panels")
 
+        # Add a wall-blocked raycast to the player.
+        var wallcast = RayCast.new()
+        wallcast.name = "wallcast"
+        wallcast.cast_to = Vector3(0, 0, -15)
+        wallcast.set_collision_mask_bit(1, true)
+        wallcast.set_collision_mask_bit(3, true)
+        wallcast.collide_with_areas = true
+        $player/pivot/camera.add_child(wallcast)
+
         # Override the YOU panel with the AP slot name.
         if self.get_node_or_null("Panels/Color Arrow Room/Panel_you") != null:
                 self.get_node("Panels/Color Arrow Room/Panel_you").answer = apclient.ap_user
@@ -198,6 +208,10 @@ func _load():
         set_gridmap_tile(-88.5, 4.5, -41.5, "MeshInstance8")
         set_gridmap_tile(-89.5, 4.5, -41.5, "MeshInstance4")
 
+        # Remove black block from THE RED.
+        clear_gridmap_tile(68.5, 6.5, 76.5)
+        get_node("Decorations/PanelSign/sign19").queue_free()
+
         if apclient.confusify_world:
                 # Remove welcome back / color hallway / sunwarp indicators.
                 get_node("Decorations/Signs/Welcome Back Signs").queue_free()
@@ -245,12 +259,12 @@ func _load():
 
         if apclient._panel_shuffle != apclient.kNO_PANEL_SHUFFLE:
                 # Make The Wondrous's FIRE solely midred.
-                set_gridmap_tile(-76.5, 1.5, -73.5, "MeshInstance18")
+                clear_gridmap_tile(-76.5, 1.5, -73.5)
 
                 # Reduce double/triple length puzzles in Knight/Night.
-                set_gridmap_tile(24.5, 1.5, 11.5, "MeshInstance18")
-                set_gridmap_tile(25.5, 1.5, 11.5, "MeshInstance18")
-                set_gridmap_tile(47.5, 1.5, 11.5, "MeshInstance18")
+                clear_gridmap_tile(24.5, 1.5, 11.5)
+                clear_gridmap_tile(25.5, 1.5, 11.5)
+                clear_gridmap_tile(47.5, 1.5, 11.5)
 
         if apclient._panel_shuffle == apclient.kREARRANGE_PANELS:
                 # Do the actual shuffling.
@@ -638,6 +652,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()
@@ -708,6 +731,14 @@ func set_gridmap_tile(x, y, z, tile):
         gridmap.set_cell_item(mapvec.x, mapvec.y, mapvec.z, mesh_library.find_item_by_name(tile))
 
 
+func clear_gridmap_tile(x, y, z):
+        var gridmap = self.get_node("GridMap")
+        var mesh_library = gridmap.mesh_library
+        var mapvec = gridmap.world_to_map(gridmap.to_local(Vector3(x, y, z)))
+
+        gridmap.set_cell_item(mapvec.x, mapvec.y, mapvec.z, GridMap.INVALID_CELL_ITEM)
+
+
 func set_small_gridmap_tile(x, y, z, tile):
         var gridmap = self.get_node("GridMapSmall")
         var mesh_library = gridmap.mesh_library
@@ -42,7 +42,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