4 files changed, 38 insertions, 7 deletions

@@ -4,6 +4,7 @@ Archipelago init file for Lingo 2
 from typing import ClassVar
 
 from BaseClasses import ItemClassification, Item, Tutorial
+from Options import OptionError
 from settings import Group, UserFilePath
 from worlds.AutoWorld import WebWorld, World
 from .items import Lingo2Item, ANTI_COLLECTABLE_TRAPS
@@ -82,9 +83,9 @@ class Lingo2World(World):
             else:
                 shuffle_entrances(self)
 
-        from Utils import visualize_regions
+        #from Utils import visualize_regions
 
-        visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
+        #visualize_regions(self.multiworld.get_region("Menu", self.player), "my_world.puml")
 
     def create_items(self):
         pool = [self.create_item(name) for name in self.player_logic.real_items]
@@ -109,6 +110,11 @@ class Lingo2World(World):
         for i in range(0, item_difference):
             pool.append(self.create_item(self.get_filler_item_name()))
 
+        if not any(ItemClassification.progression in item.classification for item in pool):
+            raise OptionError(f"Lingo 2 player {self.player} has no progression items. Please enable at least one "
+                              f"option that would add progression gating to your world, such as Shuffle Doors or "
+                              f"Shuffle Letters.")
+
         self.multiworld.itempool += pool
 
     def create_item(self, name: str) -> Item:
@@ -75,6 +75,8 @@ var strict_cyan_ending = false
 var strict_purple_ending = false
 var victory_condition = -1
 
+var color_by_material_path = {}
+
 signal could_not_connect
 signal connect_status
 signal ap_connected
@@ -112,6 +114,20 @@ func _init():
                 if data.size() > 6:
                         show_minimap = data[6]
 
+        # We need to create a mapping from material paths to the original colors of
+        # those materials. We force reload the materials, overwriting any custom
+        # textures, and create the mapping. We then reload the textures in case the
+        # player had a custom one enabled.
+        var directory = DirAccess.open("res://assets/materials")
+        for material_name in directory.get_files():
+                var material = ResourceLoader.load(
+                        "res://assets/materials/" + material_name, "", ResourceLoader.CACHE_MODE_REPLACE
+                )
+
+                color_by_material_path[material.resource_path] = Color(material.albedo_color)
+
+        settings.load_user_textures()
+
 
 func _ready():
         client = SCRIPT_client.new()
@@ -126,6 +126,7 @@ func _process(_delta):
 
 
 func _renderMap(gridmap):
+        var ap = global.get_node("Archipelago")
         var heights = {}
 
         var rendered = Image.create_empty(cell_width, cell_height, false, Image.FORMAT_RGBA8)
@@ -133,7 +134,7 @@ func _renderMap(gridmap):
 
         var meshes_node = get_tree().get_root().get_node("scene/Meshes")
         if meshes_node != null:
-                _renderMeshNode(gridmap, meshes_node, rendered)
+                _renderMeshNode(ap, gridmap, meshes_node, rendered)
 
         for pos in gridmap.get_used_cells():
                 var in_plane = Vector2i(pos.x, pos.z)
@@ -146,20 +147,22 @@ func _renderMap(gridmap):
                 var cell_item = gridmap.get_cell_item(pos)
                 var mesh = gridmap.mesh_library.get_item_mesh(cell_item)
                 var material = mesh.surface_get_material(0)
-                var color = material.albedo_color
+                var color = ap.color_by_material_path.get(material.resource_path, Color.TRANSPARENT)
 
                 rendered.set_pixel(pos.x - cell_left, pos.z - cell_top, color)
 
         return rendered
 
 
-func _renderMeshNode(gridmap, mesh, rendered):
+func _renderMeshNode(ap, gridmap, mesh, rendered):
         if mesh is MeshInstance3D:
                 var local_tl = gridmap.map_to_local(Vector3i(cell_left, 0, cell_top))
                 var global_tl = gridmap.to_global(local_tl)
                 var mesh_material = mesh.get_surface_override_material(0)
                 if mesh_material != null:
-                        var mesh_color = mesh_material.albedo_color
+                        var mesh_color = ap.color_by_material_path.get(
+                                mesh_material.resource_path, Color.TRANSPARENT
+                        )
 
                         for y in range(
                                 max(mesh.position.z - mesh.scale.z / 2 - global_tl.z, 0),
@@ -172,4 +175,4 @@ func _renderMeshNode(gridmap, mesh, rendered):
                                         rendered.set_pixel(x, y, mesh_color)
 
         for child in mesh.get_children():
-                _renderMeshNode(gridmap, child, rendered)
+                _renderMeshNode(ap, gridmap, child, rendered)
@@ -132,6 +132,12 @@ def create_regions(world: "Lingo2World"):
         reqs.simplify()
         reqs.remove_room(from_region)
 
+        if to_region in reqs.rooms:
+            # This connection can't ever increase access because you're required to have access to the other side in
+            # order for it to be usable. We will just not create the connection at all, in order to help GER figure out
+            # what regions are dead ends.
+            continue
+
         connection = Entrance(world.player, connection_name, regions[from_region])
         connection.access_rule = make_location_lambda(reqs, world, regions)