Add LocTypes Script

miketrethewey · May 12, 2024 · e701f3e · e701f3e
1 parent 98943ef
commit e701f3e
Show file tree

Hide file tree

Showing 19 changed files with 505 additions and 161 deletions.
diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml
@@ -34,6 +34,7 @@ runs:
         python -m resources.tests.items
         python -m resources.tests.functions
         python -m resources.tests.locations
+        python -m resources.tests.loctypes
         python -m resources.tests.asserts.validate
 
     # print failures

diff --git a/locations/inter/inter-absu.json b/locations/inter/inter-absu.json
@@ -21,10 +21,11 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-up",
             "visibility_rules": ["connections"],
-            "chest_unavailable_img": "images/connections/right.png",
-            "chest_unopened_img": "images/connections/right.png",
-            "chest_opened_img": "images/connections/right.png"
+            "chest_unavailable_img": "images/connections/up.png",
+            "chest_unopened_img": "images/connections/up.png",
+            "chest_opened_img": "images/connections/up.png"
           }
         ]
       },
@@ -44,6 +45,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-right",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/right.png",
             "chest_unopened_img": "images/connections/right.png",

diff --git a/locations/inter/inter-eribu.json b/locations/inter/inter-eribu.json
@@ -18,6 +18,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-right",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/right.png",
             "chest_unopened_img": "images/connections/right.png",
@@ -43,6 +44,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-right",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/right.png",
             "chest_unopened_img": "images/connections/right.png",
@@ -62,6 +64,7 @@
             "name": "Connection",
             "item_count": 1,
             "visibility_rules": ["connections"],
+            "#type": "connection-down",
             "chest_unavailable_img": "images/connections/down.png",
             "chest_unopened_img": "images/connections/down.png",
             "chest_opened_img": "images/connections/down.png"

diff --git a/locations/inter/inter-kur.json b/locations/inter/inter-kur.json
@@ -14,6 +14,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-left",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/left.png",
             "chest_unopened_img": "images/connections/left.png",
@@ -35,6 +36,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-left",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/left.png",
             "chest_unopened_img": "images/connections/left.png",

diff --git a/locations/inter/inter-sudra.json b/locations/inter/inter-sudra.json
@@ -13,6 +13,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-start",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/start.png",
             "chest_unopened_img": "images/connections/start.png",

diff --git a/locations/inter/inter-ukkinna.json b/locations/inter/inter-ukkinna.json
@@ -14,6 +14,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-down",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/down.png",
             "chest_unopened_img": "images/connections/down.png",
@@ -32,6 +33,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-right",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/right.png",
             "chest_unopened_img": "images/connections/right.png",
@@ -53,6 +55,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-up",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/up.png",
             "chest_unopened_img": "images/connections/up.png",

diff --git a/locations/inter/inter-zi.json b/locations/inter/inter-zi.json
@@ -14,6 +14,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-right",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/right.png",
             "chest_unopened_img": "images/connections/right.png",
@@ -37,6 +38,7 @@
           {
             "name": "Connection",
             "item_count": 1,
+            "#type": "connection-up",
             "visibility_rules": ["connections"],
             "chest_unavailable_img": "images/connections/up.png",
             "chest_unopened_img": "images/connections/up.png",

diff --git a/locations/secretworld/secret-absu.json b/locations/secretworld/secret-absu.json
@@ -9,6 +9,7 @@
         "name": "Secret Absu A",
         "short_name": "Secret Absu A",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 500, "y": 996}],
@@ -18,7 +19,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -27,6 +28,7 @@
         "name": "Secret Absu B",
         "short_name": "Secret Absu B",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 465, "y": 1014}],
@@ -36,7 +38,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -45,6 +47,7 @@
         "name": "Secret Absu C",
         "short_name": "Secret Absu C",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 195, "y": 1038}],
@@ -54,7 +57,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -63,6 +66,7 @@
         "name": "Secret Absu D",
         "short_name": "Secret Absu D",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 482, "y": 1034}],
@@ -72,7 +76,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -81,6 +85,7 @@
         "name": "Secret Absu E",
         "short_name": "Secret Absu E",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 611, "y": 1046}],
@@ -90,7 +95,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -99,6 +104,7 @@
         "name": "Secret Absu F",
         "short_name": "Secret Absu F",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 602, "y": 1065}],
@@ -108,7 +114,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -117,6 +123,7 @@
         "name": "Secret Absu G",
         "short_name": "Secret Absu G",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 624, "y": 1065}],
@@ -126,7 +133,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -135,6 +142,7 @@
         "name": "Secret Absu H",
         "short_name": "Secret Absu H",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 575, "y": 1081}],
@@ -144,7 +152,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -153,6 +161,7 @@
         "name": "Secret Absu I",
         "short_name": "Secret Absu I",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 626, "y": 1087}],
@@ -162,7 +171,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -171,6 +180,7 @@
         "name": "Secret Absu J",
         "short_name": "Secret Absu J",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 537, "y": 1106}],
@@ -180,7 +190,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -189,6 +199,7 @@
         "name": "Secret Absu K",
         "short_name": "Secret Absu K",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 573, "y": 1109}],
@@ -198,7 +209,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]
@@ -207,6 +218,7 @@
         "name": "Secret Absu L",
         "short_name": "Secret Absu L",
         "access_rules": ["secretworld", "secretworld-easy"],
+        "#type": "secretworld-easy",
         "chest_unopened_img": "images/chests/secretworld-easy.png",
         "chest_opened_img": "images/chests/secretworld-easy.png",
         "map_locations": [{"map": "sudra", "x": 609, "y": 1104}],
@@ -216,7 +228,7 @@
             "capture_item": true,
             "capture_item_layout": "secretworlds_easy_grid",
             "access_rules": ["[]", "{}"],
-            "visibility_rules": ["secretworld"],
+            "visibility_rules": ["secretworld","secretworld-easy"],
             "item_count": 1
           }
         ]