diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index c077f1e..794f3ca 100644 --- 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 index cc74002..09f34cd 100644 --- 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 index de4b96d..93f9f32 100644 --- 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 index f144ae2..134da46 100644 --- 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 index 4216d84..90f015a 100644 --- 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 index 333bce3..a7fd69b 100644 --- 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 index beb23e8..618a740 100644 --- 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 index 394f74c..d3147dd 100644 --- 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 } ] diff --git a/locations/secretworld/secret-edin.json b/locations/secretworld/secret-edin.json index 4a3b75b..9ee08d9 100644 --- a/locations/secretworld/secret-edin.json +++ b/locations/secretworld/secret-edin.json @@ -9,6 +9,7 @@ "name": "Secret Edin A", "short_name": "Secret Edin A", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 753, "y": 704}], @@ -18,7 +19,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -27,6 +28,7 @@ "name": "Secret Edin B", "short_name": "Secret Edin B", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 789, "y": 711}], @@ -36,7 +38,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -45,6 +47,7 @@ "name": "Secret Edin C", "short_name": "Secret Edin C", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 682, "y": 735}], @@ -54,7 +57,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -63,6 +66,7 @@ "name": "Secret Edin D", "short_name": "Secret Edin D", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 778, "y": 762}], @@ -72,7 +76,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -81,6 +85,7 @@ "name": "Secret Edin E", "short_name": "Secret Edin E", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 500, "y": 781}], @@ -90,7 +95,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -99,6 +104,7 @@ "name": "Secret Edin F", "short_name": "Secret Edin F", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 635, "y": 787}], @@ -108,7 +114,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -117,6 +123,7 @@ "name": "Secret Edin G", "short_name": "Secret Edin G", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 672, "y": 788}], @@ -126,7 +133,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -135,6 +142,7 @@ "name": "Secret Edin H", "short_name": "Secret Edin H", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 735, "y": 781}], @@ -144,7 +152,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -153,6 +161,7 @@ "name": "Secret Edin I", "short_name": "Secret Edin I", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 824, "y": 781}], @@ -162,7 +171,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -171,6 +180,7 @@ "name": "Secret Edin J", "short_name": "Secret Edin J", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 619, "y": 795}], @@ -180,7 +190,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -189,6 +199,7 @@ "name": "Secret Edin K", "short_name": "Secret Edin K", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 703, "y": 797}], @@ -198,7 +209,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] diff --git a/locations/secretworld/secret-ekurmah.json b/locations/secretworld/secret-ekurmah.json index 72669f7..980dc64 100644 --- a/locations/secretworld/secret-ekurmah.json +++ b/locations/secretworld/secret-ekurmah.json @@ -9,6 +9,7 @@ "name": "Secret E-Kur-Mah A", "short_name": "Secret E-Kur-Mah A", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1150, "y": 434}], @@ -18,7 +19,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -27,6 +28,7 @@ "name": "Secret E-Kur-Mah B", "short_name": "Secret E-Kur-Mah B", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1132, "y": 454}], @@ -36,7 +38,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -45,6 +47,7 @@ "name": "Secret E-Kur-Mah C", "short_name": "Secret E-Kur-Mah C", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1167, "y": 461}], @@ -54,7 +57,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -63,6 +66,7 @@ "name": "Secret E-Kur-Mah D", "short_name": "Secret E-Kur-Mah D", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1202, "y": 469}], @@ -72,7 +76,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -81,6 +85,7 @@ "name": "Secret E-Kur-Mah E", "short_name": "Secret E-Kur-Mah E", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1113, "y": 474}], @@ -90,7 +95,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -99,6 +104,7 @@ "name": "Secret E-Kur-Mah F", "short_name": "Secret E-Kur-Mah F", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1188, "y": 480}], @@ -108,7 +114,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -117,6 +123,7 @@ "name": "Secret E-Kur-Mah G", "short_name": "Secret E-Kur-Mah G", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1165, "y": 499}], @@ -126,7 +133,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -135,6 +142,7 @@ "name": "Secret E-Kur-Mah H", "short_name": "Secret E-Kur-Mah H", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1237, "y": 506}], @@ -144,7 +152,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -153,6 +161,7 @@ "name": "Secret E-Kur-Mah I", "short_name": "Secret E-Kur-Mah I", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1237, "y": 530}], @@ -162,7 +171,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -171,6 +180,7 @@ "name": "Secret E-Kur-Mah J", "short_name": "Secret E-Kur-Mah J", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1221, "y": 548}], @@ -180,7 +190,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -189,6 +199,7 @@ "name": "Secret E-Kur-Mah K", "short_name": "Secret E-Kur-Mah K", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1239, "y": 623}], @@ -198,7 +209,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -207,6 +218,7 @@ "name": "Secret E-Kur-Mah L", "short_name": "Secret E-Kur-Mah L", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1202, "y": 681}], @@ -216,7 +228,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -225,6 +237,7 @@ "name": "Secret E-Kur-Mah M", "short_name": "Secret E-Kur-Mah M", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1150, "y": 711}], @@ -234,7 +247,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -243,6 +256,7 @@ "name": "Secret E-Kur-Mah N", "short_name": "Secret E-Kur-Mah N", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1202, "y": 728}], @@ -252,7 +266,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -261,6 +275,7 @@ "name": "Secret E-Kur-Mah O", "short_name": "Secret E-Kur-Mah O", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1150, "y": 746}], @@ -270,7 +285,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -279,6 +294,7 @@ "name": "Secret E-Kur-Mah P", "short_name": "Secret E-Kur-Mah P", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1202, "y": 765}], @@ -288,7 +304,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -297,6 +313,7 @@ "name": "Secret E-Kur-Mah Q", "short_name": "Secret E-Kur-Mah Q", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 1132, "y": 793}], @@ -306,7 +323,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] diff --git a/locations/secretworld/secret-eribu.json b/locations/secretworld/secret-eribu.json index 77165e5..543bbd7 100644 --- a/locations/secretworld/secret-eribu.json +++ b/locations/secretworld/secret-eribu.json @@ -9,6 +9,7 @@ "name": "Secret Eribu A", "short_name": "Secret Eribu A", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 140, "y": 618}], @@ -18,7 +19,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -27,6 +28,7 @@ "name": "Secret Eribu B", "short_name": "Secret Eribu B", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 125, "y": 634}], @@ -36,7 +38,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -45,6 +47,7 @@ "name": "Secret Eribu C", "short_name": "Secret Eribu C", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 267, "y": 632}], @@ -54,7 +57,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -63,6 +66,7 @@ "name": "Secret Eribu D", "short_name": "Secret Eribu D", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 122, "y": 652}], @@ -72,7 +76,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -81,6 +85,7 @@ "name": "Secret Eribu E", "short_name": "Secret Eribu E", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 158, "y": 652}], @@ -90,7 +95,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -99,6 +104,7 @@ "name": "Secret Eribu F", "short_name": "Secret Eribu F", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 230, "y": 649}], @@ -108,7 +114,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -117,6 +123,7 @@ "name": "Secret Eribu G", "short_name": "Secret Eribu G", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 123, "y": 672}], @@ -126,7 +133,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -135,6 +142,7 @@ "name": "Secret Eribu H", "short_name": "Secret Eribu H", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 251, "y": 720}], @@ -144,7 +152,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -153,6 +161,7 @@ "name": "Secret Eribu I", "short_name": "Secret Eribu I", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 51, "y": 741}], @@ -162,7 +171,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -171,6 +180,7 @@ "name": "Secret Eribu J", "short_name": "Secret Eribu J", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 68, "y": 751}], @@ -180,7 +190,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -189,6 +199,7 @@ "name": "Secret Eribu K", "short_name": "Secret Eribu K", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 73, "y": 759}], @@ -198,7 +209,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -207,6 +218,7 @@ "name": "Secret Eribu L", "short_name": "Secret Eribu L", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 231, "y": 786}], @@ -216,7 +228,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -225,6 +237,7 @@ "name": "Secret Eribu M", "short_name": "Secret Eribu M", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 213, "y": 817}], @@ -234,7 +247,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -243,6 +256,7 @@ "name": "Secret Eribu N", "short_name": "Secret Eribu N", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 193, "y": 834}], @@ -252,7 +266,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -261,6 +275,7 @@ "name": "Secret Eribu O", "short_name": "Secret Eribu O", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 159, "y": 846}], @@ -270,7 +285,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -279,6 +294,7 @@ "name": "Secret Eribu P", "short_name": "Secret Eribu P", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 230, "y": 853}], @@ -288,7 +304,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -297,6 +313,7 @@ "name": "Secret Eribu Q", "short_name": "Secret Eribu Q", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 177, "y": 866}], @@ -306,7 +323,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] diff --git a/locations/secretworld/secret-indi.json b/locations/secretworld/secret-indi.json index 84dc2a7..5884bf3 100644 --- a/locations/secretworld/secret-indi.json +++ b/locations/secretworld/secret-indi.json @@ -9,6 +9,7 @@ "name": "Secret Indi A", "short_name": "Secret Indi A", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 463, "y": 818}], @@ -18,7 +19,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -27,6 +28,7 @@ "name": "Secret Indi B", "short_name": "Secret Indi B", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 447, "y": 835}], @@ -36,7 +38,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -45,6 +47,7 @@ "name": "Secret Indi C", "short_name": "Secret Indi C", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 698, "y": 818}], @@ -54,7 +57,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -63,6 +66,7 @@ "name": "Secret Indi D", "short_name": "Secret Indi D", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 700, "y": 826}], @@ -72,7 +76,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -81,6 +85,7 @@ "name": "Secret Indi E", "short_name": "Secret Indi E", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 711, "y": 826}], @@ -90,7 +95,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -99,6 +104,7 @@ "name": "Secret Indi F", "short_name": "Secret Indi F", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 707, "y": 841}], @@ -108,7 +114,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -117,6 +123,7 @@ "name": "Secret Indi G", "short_name": "Secret Indi G", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 303, "y": 849}], @@ -126,7 +133,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -135,6 +142,7 @@ "name": "Secret Indi H", "short_name": "Secret Indi H", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 695, "y": 853}], @@ -144,7 +152,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -153,6 +161,7 @@ "name": "Secret Indi I", "short_name": "Secret Indi I", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 721, "y": 854}], @@ -162,7 +171,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -171,6 +180,7 @@ "name": "Secret Indi J", "short_name": "Secret Indi J", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 319, "y": 870}], @@ -180,7 +190,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -189,6 +199,7 @@ "name": "Secret Indi K", "short_name": "Secret Indi K", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 389, "y": 870}], @@ -198,7 +209,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -207,6 +218,7 @@ "name": "Secret Indi L", "short_name": "Secret Indi L", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 381, "y": 879}], @@ -216,7 +228,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -225,6 +237,7 @@ "name": "Secret Indi M", "short_name": "Secret Indi M", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 610, "y": 876}], @@ -234,7 +247,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -243,6 +256,7 @@ "name": "Secret Indi N", "short_name": "Secret Indi N", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 624, "y": 878}], @@ -252,7 +266,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -261,6 +275,7 @@ "name": "Secret Indi O", "short_name": "Secret Indi O", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 815, "y": 878}], @@ -270,7 +285,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -279,6 +294,7 @@ "name": "Secret Indi P", "short_name": "Secret Indi P", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 821, "y": 872}], @@ -288,7 +304,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -297,6 +313,7 @@ "name": "Secret Indi Q", "short_name": "Secret Indi Q", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 875, "y": 872}], @@ -306,7 +323,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -315,6 +332,7 @@ "name": "Secret Indi R", "short_name": "Secret Indi R", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 448, "y": 886}], @@ -324,7 +342,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -333,6 +351,7 @@ "name": "Secret Indi S", "short_name": "Secret Indi S", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 465, "y": 886}], @@ -342,7 +361,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -351,6 +370,7 @@ "name": "Secret Indi T", "short_name": "Secret Indi T", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 700, "y": 890}], @@ -360,7 +380,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -369,6 +389,7 @@ "name": "Secret Indi U", "short_name": "Secret Indi U", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 716, "y": 890}], @@ -378,7 +399,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] diff --git a/locations/secretworld/secret-kur.json b/locations/secretworld/secret-kur.json index e9c9025..85d76de 100644 --- a/locations/secretworld/secret-kur.json +++ b/locations/secretworld/secret-kur.json @@ -9,6 +9,7 @@ "name": "Secret Kur A", "short_name": "Secret Kur 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": 1203, "y": 546}], @@ -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 Kur B", "short_name": "Secret Kur 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": 1056, "y": 567}], @@ -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 Kur C", "short_name": "Secret Kur 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": 1060, "y": 600}], @@ -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 Kur D", "short_name": "Secret Kur 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": 1155, "y": 600}], @@ -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 Kur E", "short_name": "Secret Kur 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": 969, "y": 618}], @@ -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 Kur F", "short_name": "Secret Kur 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": 1149, "y": 620}], @@ -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 Kur G", "short_name": "Secret Kur 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": 1003, "y": 661}], @@ -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 Kur H", "short_name": "Secret Kur 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": 1091, "y": 663}], @@ -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 Kur I", "short_name": "Secret Kur 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": 915, "y": 708}], @@ -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 Kur J", "short_name": "Secret Kur 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": 1000, "y": 704}], @@ -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 Kur K", "short_name": "Secret Kur 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": 1042, "y": 708}], @@ -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 Kur L", "short_name": "Secret Kur 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": 1057, "y": 728}], @@ -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 } ] @@ -225,6 +237,7 @@ "name": "Secret Kur M", "short_name": "Secret Kur M", "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": 966, "y": 745}], @@ -234,7 +247,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] @@ -243,6 +256,7 @@ "name": "Secret Kur N", "short_name": "Secret Kur N", "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": 1040, "y": 743}], @@ -252,7 +266,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] @@ -261,6 +275,7 @@ "name": "Secret Kur O", "short_name": "Secret Kur O", "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": 897, "y": 764}], @@ -270,7 +285,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] @@ -279,6 +294,7 @@ "name": "Secret Kur P", "short_name": "Secret Kur P", "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": 1003, "y": 771}], @@ -288,7 +304,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] @@ -297,6 +313,7 @@ "name": "Secret Kur Q", "short_name": "Secret Kur Q", "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": 912, "y": 800}], @@ -306,7 +323,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] @@ -315,6 +332,7 @@ "name": "Secret Kur R", "short_name": "Secret Kur R", "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": 895, "y": 817}], @@ -324,7 +342,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] @@ -333,6 +351,7 @@ "name": "Secret Kur S", "short_name": "Secret Kur S", "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": 915, "y": 836}], @@ -342,7 +361,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] @@ -351,6 +370,7 @@ "name": "Secret Kur T", "short_name": "Secret Kur T", "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": 945, "y": 891}], @@ -360,7 +380,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] diff --git a/locations/secretworld/secret-maruru.json b/locations/secretworld/secret-maruru.json index 54a2497..3abb7ab 100644 --- a/locations/secretworld/secret-maruru.json +++ b/locations/secretworld/secret-maruru.json @@ -9,6 +9,7 @@ "name": "Secret Mar-Uru A", "short_name": "Secret Mar-Uru A", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 390, "y": 79}], @@ -18,7 +19,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -27,6 +28,7 @@ "name": "Secret Mar-Uru B", "short_name": "Secret Mar-Uru B", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 375, "y": 85}], @@ -36,7 +38,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -45,6 +47,7 @@ "name": "Secret Mar-Uru C", "short_name": "Secret Mar-Uru C", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 379, "y": 103}], @@ -54,7 +57,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -63,6 +66,7 @@ "name": "Secret Mar-Uru D", "short_name": "Secret Mar-Uru D", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 392, "y": 151}], @@ -72,7 +76,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -81,6 +85,7 @@ "name": "Secret Mar-Uru E", "short_name": "Secret Mar-Uru E", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 379, "y": 174}], @@ -90,7 +95,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -99,6 +104,7 @@ "name": "Secret Mar-Uru F", "short_name": "Secret Mar-Uru F", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 432, "y": 222}], @@ -108,7 +114,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -117,6 +123,7 @@ "name": "Secret Mar-Uru G", "short_name": "Secret Mar-Uru G", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 432, "y": 239}], @@ -126,7 +133,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -135,6 +142,7 @@ "name": "Secret Mar-Uru H", "short_name": "Secret Mar-Uru H", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 354, "y": 246}], @@ -144,7 +152,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -153,6 +161,7 @@ "name": "Secret Mar-Uru I", "short_name": "Secret Mar-Uru I", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 378, "y": 272}], @@ -162,7 +171,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -171,6 +180,7 @@ "name": "Secret Mar-Uru J", "short_name": "Secret Mar-Uru J", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 390, "y": 290}], @@ -180,7 +190,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -189,6 +199,7 @@ "name": "Secret Mar-Uru K", "short_name": "Secret Mar-Uru K", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 407, "y": 347}], @@ -198,7 +209,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -207,6 +218,7 @@ "name": "Secret Mar-Uru L", "short_name": "Secret Mar-Uru L", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 396, "y": 351}], @@ -216,7 +228,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -225,6 +237,7 @@ "name": "Secret Mar-Uru M", "short_name": "Secret Mar-Uru M", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 379, "y": 369}], @@ -234,7 +247,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -243,6 +256,7 @@ "name": "Secret Mar-Uru N", "short_name": "Secret Mar-Uru N", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 395, "y": 369}], @@ -252,7 +266,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -261,6 +275,7 @@ "name": "Secret Mar-Uru O", "short_name": "Secret Mar-Uru O", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 409, "y": 391}], @@ -270,7 +285,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -279,6 +294,7 @@ "name": "Secret Mar-Uru P", "short_name": "Secret Mar-Uru P", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 396, "y": 408}], @@ -288,7 +304,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] @@ -297,6 +313,7 @@ "name": "Secret Mar-Uru Q", "short_name": "Secret Mar-Uru Q", "access_rules": ["secretworld", "secretworld-hard"], + "#type": "secretworld-hard", "chest_unopened_img": "images/chests/secretworld-hard.png", "chest_opened_img": "images/chests/secretworld-hard.png", "map_locations": [{"map": "sudra", "x": 396, "y": 440}], @@ -306,7 +323,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_hard_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-hard"], "item_count": 1 } ] diff --git a/locations/secretworld/secret-ukkinna.json b/locations/secretworld/secret-ukkinna.json index d82bde7..fc7c20d 100644 --- a/locations/secretworld/secret-ukkinna.json +++ b/locations/secretworld/secret-ukkinna.json @@ -9,6 +9,7 @@ "name": "Secret Ukkin-Na A", "short_name": "Secret Ukkin-Na A", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 465, "y": 458}], @@ -18,7 +19,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -27,6 +28,7 @@ "name": "Secret Ukkin-Na B", "short_name": "Secret Ukkin-Na B", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 395, "y": 510}], @@ -36,7 +38,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -45,6 +47,7 @@ "name": "Secret Ukkin-Na C", "short_name": "Secret Ukkin-Na C", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 429, "y": 528}], @@ -54,7 +57,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -63,6 +66,7 @@ "name": "Secret Ukkin-Na D", "short_name": "Secret Ukkin-Na D", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 444, "y": 528}], @@ -72,7 +76,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -81,6 +85,7 @@ "name": "Secret Ukkin-Na E", "short_name": "Secret Ukkin-Na E", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 429, "y": 547}], @@ -90,7 +95,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -99,6 +104,7 @@ "name": "Secret Ukkin-Na F", "short_name": "Secret Ukkin-Na F", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 447, "y": 547}], @@ -108,7 +114,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -117,6 +123,7 @@ "name": "Secret Ukkin-Na G", "short_name": "Secret Ukkin-Na G", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 448, "y": 566}], @@ -126,7 +133,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -135,6 +142,7 @@ "name": "Secret Ukkin-Na H", "short_name": "Secret Ukkin-Na H", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 321, "y": 566}], @@ -144,7 +152,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -153,6 +161,7 @@ "name": "Secret Ukkin-Na I", "short_name": "Secret Ukkin-Na I", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 339, "y": 566}], @@ -162,7 +171,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -171,6 +180,7 @@ "name": "Secret Ukkin-Na J", "short_name": "Secret Ukkin-Na J", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 375, "y": 566}], @@ -180,7 +190,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -189,6 +199,7 @@ "name": "Secret Ukkin-Na K", "short_name": "Secret Ukkin-Na K", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 430, "y": 566}], @@ -198,7 +209,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -207,6 +218,7 @@ "name": "Secret Ukkin-Na L", "short_name": "Secret Ukkin-Na L", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 411, "y": 582}], @@ -216,7 +228,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -225,6 +237,7 @@ "name": "Secret Ukkin-Na M", "short_name": "Secret Ukkin-Na M", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 465, "y": 582}], @@ -234,7 +247,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -243,6 +256,7 @@ "name": "Secret Ukkin-Na N", "short_name": "Secret Ukkin-Na N", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 410, "y": 602}], @@ -252,7 +266,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -261,6 +275,7 @@ "name": "Secret Ukkin-Na O", "short_name": "Secret Ukkin-Na O", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 448, "y": 602}], @@ -270,7 +285,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -279,6 +294,7 @@ "name": "Secret Ukkin-Na P", "short_name": "Secret Ukkin-Na P", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 430, "y": 616}], @@ -288,7 +304,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -297,6 +313,7 @@ "name": "Secret Ukkin-Na Q", "short_name": "Secret Ukkin-Na Q", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 447, "y": 616}], @@ -306,7 +323,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -315,6 +332,7 @@ "name": "Secret Ukkin-Na R", "short_name": "Secret Ukkin-Na R", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 412, "y": 624}], @@ -324,7 +342,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -333,6 +351,7 @@ "name": "Secret Ukkin-Na S", "short_name": "Secret Ukkin-Na S", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 430, "y": 635}], @@ -342,7 +361,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -351,6 +370,7 @@ "name": "Secret Ukkin-Na T", "short_name": "Secret Ukkin-Na T", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 447, "y": 635}], @@ -360,7 +380,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -369,6 +389,7 @@ "name": "Secret Ukkin-Na U", "short_name": "Secret Ukkin-Na U", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 430, "y": 643}], @@ -378,7 +399,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -387,6 +408,7 @@ "name": "Secret Ukkin-Na V", "short_name": "Secret Ukkin-Na V", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 430, "y": 672}], @@ -396,7 +418,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -405,6 +427,7 @@ "name": "Secret Ukkin-Na W", "short_name": "Secret Ukkin-Na W", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 426, "y": 684}], @@ -414,7 +437,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -423,6 +446,7 @@ "name": "Secret Ukkin-Na X", "short_name": "Secret Ukkin-Na X", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 376, "y": 704}], @@ -432,7 +456,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -441,6 +465,7 @@ "name": "Secret Ukkin-Na Y", "short_name": "Secret Ukkin-Na Y", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 447, "y": 731}], @@ -450,7 +475,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -459,6 +484,7 @@ "name": "Secret Ukkin-Na Z", "short_name": "Secret Ukkin-Na Z", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 340, "y": 772}], @@ -468,7 +494,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -477,6 +503,7 @@ "name": "Secret Ukkin-Na AA", "short_name": "Secret Ukkin-Na AA", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 447, "y": 784}], @@ -486,7 +513,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -495,6 +522,7 @@ "name": "Secret Ukkin-Na AB", "short_name": "Secret Ukkin-Na AB", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 357, "y": 788}], @@ -504,7 +532,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] @@ -513,6 +541,7 @@ "name": "Secret Ukkin-Na AC", "short_name": "Secret Ukkin-Na AC", "access_rules": ["secretworld", "secretworld-medium"], + "#type": "secretworld-medium", "chest_unopened_img": "images/chests/secretworld-medium.png", "chest_opened_img": "images/chests/secretworld-medium.png", "map_locations": [{"map": "sudra", "x": 393, "y": 788}], @@ -522,7 +551,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_medium_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-medium"], "item_count": 1 } ] diff --git a/locations/secretworld/secret-zi.json b/locations/secretworld/secret-zi.json index 8fa4dbc..64f7e1e 100644 --- a/locations/secretworld/secret-zi.json +++ b/locations/secretworld/secret-zi.json @@ -9,6 +9,7 @@ "name": "Secret Zi A", "short_name": "Secret Zi 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": 736, "y": 909}], @@ -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 Zi B", "short_name": "Secret Zi 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": 696, "y": 924}], @@ -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 Zi C", "short_name": "Secret Zi 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": 734, "y": 924}], @@ -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 Zi D", "short_name": "Secret Zi 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": 803, "y": 974}], @@ -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 Zi E", "short_name": "Secret Zi 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": 824, "y": 974}], @@ -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 Zi F", "short_name": "Secret Zi 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": 824, "y": 995}], @@ -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 Zi G", "short_name": "Secret Zi 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": 824, "y": 1013}], @@ -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 Zi H", "short_name": "Secret Zi 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": 752, "y": 1037}], @@ -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 Zi I", "short_name": "Secret Zi 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": 767, "y": 1041}], @@ -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 Zi J", "short_name": "Secret Zi 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": 663, "y": 1064}], @@ -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 Zi K", "short_name": "Secret Zi 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": 697, "y": 1064}], @@ -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 Zi L", "short_name": "Secret Zi 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": 751, "y": 1083}], @@ -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 } ] @@ -225,6 +237,7 @@ "name": "Secret Zi M", "short_name": "Secret Zi M", "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": 757, "y": 1094}], @@ -234,7 +247,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] @@ -243,6 +256,7 @@ "name": "Secret Zi N", "short_name": "Secret Zi N", "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": 716, "y": 1124}], @@ -252,7 +266,7 @@ "capture_item": true, "capture_item_layout": "secretworlds_easy_grid", "access_rules": ["[]", "{}"], - "visibility_rules": ["secretworld"], + "visibility_rules": ["secretworld","secretworld-easy"], "item_count": 1 } ] diff --git a/resources/app/meta/manifests/loctypes.json b/resources/app/meta/manifests/loctypes.json new file mode 100644 index 0000000..8e7e428 --- /dev/null +++ b/resources/app/meta/manifests/loctypes.json @@ -0,0 +1,64 @@ +{ + "default": { + "chest_unavailable_img": "images/chests/unavailable.png", + "chest_unopened_img": "images/chests/available.png", + "chest_opened_img": "images/chests/opened.png", + "moo": "moo" + }, + "boss": { + "chest_unavailable_img": "images/chests/boss_unavailable.png", + "chest_unopened_img": "images/chests/boss_unopened.png", + "chest_opened_img": "images/chests/boss_opened.png", + "moo": "moo" + }, + "connection-start": { + "visibility_rules": ["connections"], + "chest_unavailable_img": "images/connections/start.png", + "chest_unopened_img": "images/connections/start.png", + "chest_opened_img": "images/connections/start.png", + "moo": "moo" + }, + "connection-up": { + "visibility_rules": ["connections"], + "chest_unavailable_img": "images/connections/up.png", + "chest_unopened_img": "images/connections/up.png", + "chest_opened_img": "images/connections/up.png", + "moo": "moo" + }, + "connection-left": { + "visibility_rules": ["connections"], + "chest_unavailable_img": "images/connections/left.png", + "chest_unopened_img": "images/connections/left.png", + "chest_opened_img": "images/connections/left.png", + "moo": "moo" + }, + "connection-right": { + "visibility_rules": ["connections"], + "chest_unavailable_img": "images/connections/right.png", + "chest_unopened_img": "images/connections/right.png", + "chest_opened_img": "images/connections/right.png", + "moo": "moo" + }, + "connection-down": { + "visibility_rules": ["connections"], + "chest_unavailable_img": "images/connections/down.png", + "chest_unopened_img": "images/connections/down.png", + "chest_opened_img": "images/connections/down.png", + "moo": "moo" + }, + "secretworld-easy": { + "chest_unopened_img": "images/chests/secretworld-easy.png", + "chest_opened_img": "images/chests/secretworld-easy.png", + "moo": "moo" + }, + "secretworld-medium": { + "chest_unopened_img": "images/chests/secretworld-medium.png", + "chest_opened_img": "images/chests/secretworld-medium.png", + "moo": "moo" + }, + "secretworld-hard": { + "chest_unopened_img": "images/chests/secretworld-hard.png", + "chest_opened_img": "images/chests/secretworld-hard.png", + "moo": "moo" + } +} diff --git a/resources/app/meta/manifests/pip_requirements.txt b/resources/app/meta/manifests/pip_requirements.txt index 3adbea1..a84558f 100644 --- a/resources/app/meta/manifests/pip_requirements.txt +++ b/resources/app/meta/manifests/pip_requirements.txt @@ -1,5 +1,6 @@ wheel commentjson +flatten_json jsonschema pyjson5 pyyaml diff --git a/resources/tests/loctypes.py b/resources/tests/loctypes.py new file mode 100644 index 0000000..21340ae --- /dev/null +++ b/resources/tests/loctypes.py @@ -0,0 +1,107 @@ +import json +import os + +from flatten_json import flatten + +typeDefnsPath = os.path.join(".","resources","app","meta","manifests","loctypes.json") +with open(typeDefnsPath, "r") as typeDefnsFile: + typeDefnsJSON = json.load(typeDefnsFile) + +print("Reading Location Image Types") +dirname = os.path.join(".", "locations") +for r, d, f in os.walk(dirname): + if "main.json" in f: + f.pop(f.index("main.json")) + f.reverse() + f.append("main.json") + f.reverse() + for filename in f: + if os.path.isfile(os.path.join(r, filename)): + if os.path.splitext(filename)[1].lower() == ".json": + print(f" Reading: {os.path.join(r, filename)}") + with open(os.path.join(r, filename), "r", encoding="utf-8") as locsFile: + locsManifest = json.load(locsFile) + flattened_dict = [ + flatten(d, '.') for d in locsManifest + ][0] + + locName = "" + locTree = "" + typeName = "" + typeCheck = "" + typesChecked = [] + typeCheckPass = 0 + typeCheckToPass = 0 + + hasSections = False + notChest = False + + for [k, v] in flattened_dict.items(): + if ".name" in k: + if v not in ["Box"]: + for checkType in [ + "Boss", + "Connection", + "Secret" + ]: + if checkType in v: + if locName != "": # and locName != v: + if typeName == "": + print(f" 🔴{locName} no type set!") + if typeCheck != "": + if typeCheck != "default": + if typeCheck in list(typeDefnsJSON.keys()): + typeCheckToPass = len(typeDefnsJSON[typeCheck]) - 1 + if typeCheckPass < typeCheckToPass: + typesNotChecked = list(set(list(typeDefnsJSON[typeCheck].keys())) - set(typesChecked)) + if "moo" in typesNotChecked: + del typesNotChecked[typesNotChecked.index("moo")] + if len(typesNotChecked) > 0: + print(f" 🔴{locName}: '{typeCheck}' properties not set! {typesNotChecked}") + locName = v + locTree = k + typeName = "" + typesChecked = [] + typeCheckPass = 0 + if locName != "" and \ + "Box" not in v: + pass + if locName != "": + if ".#type" in k: + typeName = v + if typeName in list(typeDefnsJSON.keys()): + typeCheck = typeName + typeCheckPass = 0 + # print(f" 🟡{locName}",v) + if typeCheck != "": + baseK = k.split(".") + baseK.pop() + propType = k.split(".")[-1] + if propType.isnumeric(): + propType = k.split(".")[-2] + if propType in typeDefnsJSON[typeCheck]: + if typeDefnsJSON[typeCheck][propType] == v: + typeCheckPass += 1 + typesChecked.append(propType) + # print(f" 🟢{locName}: Property Type '{propType}' set! [{typeCheckPass}/{typeCheckToPass}]") + else: + handleK = "locsManifest[0]" + lastK = baseK.pop() + for partK in baseK: + if partK.isnumeric(): + handleK += f"[{partK}]" + else: + handleK += f"[\"{partK}\"]" + if ( + "sections" not in baseK or + ("sections" in baseK and "connection" in typeCheck) + ) and \ + lastK in eval(handleK): + typeCheckPass += 1 + typesChecked.append(propType) + # print(f" 🟢{locName}: Property Type '{propType}' set! [{typeCheckPass}/{typeCheckToPass}]") + pass + else: + print(f" 🔴{handleK},{lastK}: Property Type '{propType}' invalid value [{v}]!") + pass +print("")