adjusted logic, moved upper castle checks to their own section, setti…

…ngs popup blahblahblah
Br00ty · Oct 18, 2023 · b3f63b0 · b3f63b0
1 parent 9393e30
commit b3f63b0
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 69 deletions.
diff --git a/layouts/items.json b/layouts/items.json
@@ -40,24 +40,31 @@
                                 "majorkey"           
                             ]
                         ]
-                    },
-                    {
-                        "type": "itemgrid",
-                        //"margin": "0,40",
-                        "item_margin": "0,5",
-                        "item_size": "140, 46", 
-                        "h_alignment": "left",
-                        "rows": [
-                            [
-                                "normal"
-                            ],
-                            [
-                                "obscure"
-                            ]
-                        ]
                     }
                 ]
             }
         ]
+    },
+    "settings_popup": {
+        "type": "array",
+        "background": "#000000",
+        "orientation": "vertical",
+        "margin": "0,0",
+        "content": [
+            {
+                    "type": "itemgrid",
+                    "item_margin": "0,5",
+                    "item_size": "200, 80", 
+                    "h_alignment": "left",
+                    "rows": [
+                        [
+                            "normal"
+                        ],
+                        [
+                            "obscure"
+                        ]
+                    ]
+            }
+        ]
     }
 }
diff --git a/locations/locations.json b/locations/locations.json
@@ -143,8 +143,7 @@
     {
         "name": "Castle Sansa",
         "access_rules": [
-            "$dungeon_strong_eyes,[$has_small_keys],smallkey:1",
-            "$empty_bailey"
+            "$castle_sansa|true, [$castle_sansa]"
     ],
         "children": [
             {
@@ -185,46 +184,6 @@
                     }
                 ]
             },
-            {
-                "name": "Near Theatre Front",
-                "access_rules": [
-                    "$Castle_theatre_front|true, [$Castle_theatre_front]"
-                ],
-                "sections": [
-                    {
-                        "item_count": 1,
-                        "chest_opened_img": "images/items/aspect.png",
-                        "chest_unopened_img": "images/items/aspect_gray.png"
-                    }
-                ],
-                "map_locations": [
-                    {
-                        "map": "full_map",
-                        "x": 2438,
-                        "y": 2718
-                    }
-                ]
-            },
-            {
-                "name": "High Climb From Courtyard",
-                "access_rules": [
-                    "$Castle_courtyard_high_climb|true, [$Castle_courtyard_high_climb]"
-                ],
-                "sections": [
-                    {
-                        "item_count": 1,
-                        "chest_opened_img": "images/items/aspect.png",
-                        "chest_unopened_img": "images/items/aspect_gray.png"
-                    }
-                ],
-                "map_locations": [
-                    {
-                        "map": "full_map",
-                        "x": 2144,
-                        "y": 2237
-                    }
-                ]
-            },
             {
                 "name": "Locked Door",
                 "access_rules": [
@@ -345,10 +304,56 @@
                     }
                 ]
             },
+            {
+                "name": "Balcony",
+                "access_rules": [
+                    "$Castle_balcony|true, [$Castle_balcony]"
+                ],
+                "sections": [
+                    {
+                        "item_count": 1,
+                        "chest_opened_img": "images/items/healthup.png",
+                        "chest_unopened_img": "images/items/healthup_gray.png"
+                    }
+                ],
+                "map_locations": [
+                    {
+                        "map": "full_map",
+                        "x": 3040,
+                        "y": 1995
+                    }
+                ]
+            }
+        ]
+    },
+    {
+        "name": "Upper Castle Sansa",
+        "access_rules": [],
+        "children": [
+            {
+                "name": "High Climb From Courtyard",
+                "access_rules": [
+                    "$Castle_high_climb, $Castle_courtyard_high_climb|true, [$Castle_courtyard_high_climb]"
+                ],
+                "sections": [
+                    {
+                        "item_count": 1,
+                        "chest_opened_img": "images/items/aspect.png",
+                        "chest_unopened_img": "images/items/aspect_gray.png"
+                    }
+                ],
+                "map_locations": [
+                    {
+                        "map": "full_map",
+                        "x": 2144,
+                        "y": 2237
+                    }
+                ]
+            },
             {
                 "name": "Alcove Near Scythe Corridor",
                 "access_rules": [
-                    "$Castle_alcove_scythe|true, [$Castle_alcove_scythe]"
+                    "$Scythe_corridor, $Castle_alcove_scythe|true, [$Castle_alcove_scythe]"
                 ],
                 "sections": [
                     {
@@ -366,22 +371,22 @@
                 ]
             },
             {
-                "name": "Balcony",
+                "name": "Near Theatre Front",
                 "access_rules": [
-                    "$Castle_balcony|true, [$Castle_balcony]"
+                    "$Theatre_front, $Castle_theatre_front|true, [$Castle_theatre_front]"
                 ],
                 "sections": [
                     {
                         "item_count": 1,
-                        "chest_opened_img": "images/items/healthup.png",
-                        "chest_unopened_img": "images/items/healthup_gray.png"
+                        "chest_opened_img": "images/items/aspect.png",
+                        "chest_unopened_img": "images/items/aspect_gray.png"
                     }
                 ],
                 "map_locations": [
                     {
                         "map": "full_map",
-                        "x": 3040,
-                        "y": 1995
+                        "x": 2438,
+                        "y": 2718
                     }
                 ]
             }

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "Pseudoregalia",
     "game_name": "Pseudoregalia",
-    "package_version": "0.1.4.1.1",
+    "package_version": "0.1.4.2",
     "package_uid": "pseudoregalia_brooty",
     "platform": "pc",
     "author": "Br00ty",

diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua
@@ -20,9 +20,9 @@ LOCATION_MAPPING = {
     [2365810014] = {"@Empty Bailey/Cheese Bell/"},
     [2365810015] = {"@Twilight Theatre/Locked Door/"},
     [2365810016] = {"@Dilapitaded Dungeon/Dark Orbs/"},    
-    [2365810017] = {"@Castle Sansa/Near Theatre Front/"},    
+    [2365810017] = {"@Upper Castle Sansa/Near Theatre Front/"},    
     [2365810018] = {"@Underbelly/Strikebreak Wall/"},
-    [2365810019] = {"@Castle Sansa/High Climb From Courtyard/"},    
+    [2365810019] = {"@Upper Castle Sansa/High Climb From Courtyard/"},    
     [2365810020] = {"@Listless Library/Locked Door Across/"},
     [2365810021] = {"@Sansa Keep/Near Theatre/"},    
     [2365810022] = {"@Castle Sansa/Locked Door/"},    
@@ -40,7 +40,7 @@ LOCATION_MAPPING = {
     [2365810032] = {"@Castle Sansa/Alcove Near Dungeon/"},    
     [2365810033] = {"@Castle Sansa/Corner Corridor/"},    
     [2365810034] = {"@Castle Sansa/Wheel Crawlers/"},    
-    [2365810035] = {"@Castle Sansa/Alcove Near Scythe Corridor/"},    
+    [2365810035] = {"@Upper Castle Sansa/Alcove Near Scythe Corridor/"},    
     [2365810036] = {"@Castle Sansa/Balcony/"},    
     [2365810037] = {"@Listless Library/Upper Back/"},
     [2365810038] = {"@Listless Library/Locked Door Left/"},

diff --git a/scripts/logic/logic.lua b/scripts/logic/logic.lua
@@ -169,10 +169,13 @@ function theatre_main(n)
         Theatre_front(n)
 end
 
-function castle_sansa(n)
+function castle_sansa(outOflogic, n)
     if n == nil then; n = 0; end
     if n > 10 then; return false; end -- detect 10th step when trying to resolve and abort
     n = n + 1
+    if outOflogic then
+        return (has("smallkey",1) and dungeon_strong_eyes(n)) or empty_bailey(n) or Castle_spiral_climb(n)
+    end
     -- print("castle_sansa")
     return (has_small_keys(n) and dungeon_strong_eyes(n)) or empty_bailey(n) or Castle_spiral_climb(n)
 end

diff --git a/versions.json b/versions.json
@@ -1,5 +1,15 @@
 {
     "versions": [
+        {
+            "package_version": "0.1.4.2",
+            "download_url": "https://github.com/Br00ty/pseudoregalia_brooty/releases/download/0.1.4.2/pseudoregalia_brooty.zip",
+            "sha256": "125e68be11731c4b9f4a3656593da2bb16cdf81bfa6d1b0c811a19fc074edcb9",
+            "changelog": [
+                "moved settings to a seperate popup for future proofing (more settings to come)",
+                "moved all 'Upper Castle Sansa' checks into their own section, along with logic changes for those",
+                "adjusted auto-tracking to accomodate those newly moved locations"
+            ]
+        },
         {
             "package_version": "0.1.4.1.1",
             "download_url": "https://github.com/Br00ty/pseudoregalia_brooty/releases/download/0.1.4.1.1/pseudoregalia_brooty.zip",