diff --git a/images/money.webp b/images/money.webp new file mode 100644 index 0000000..b32a201 Binary files /dev/null and b/images/money.webp differ diff --git a/images/stage1.png b/images/stage1.png new file mode 100644 index 0000000..8919261 Binary files /dev/null and b/images/stage1.png differ diff --git a/images/stage2.png b/images/stage2.png new file mode 100644 index 0000000..4b6c930 Binary files /dev/null and b/images/stage2.png differ diff --git a/images/stage3.png b/images/stage3.png new file mode 100644 index 0000000..083a1fe Binary files /dev/null and b/images/stage3.png differ diff --git a/images/stage4.png b/images/stage4.png new file mode 100644 index 0000000..1e07c71 Binary files /dev/null and b/images/stage4.png differ diff --git a/items/items.json b/items/items.json index 5ad7482..fe72144 100644 --- a/items/items.json +++ b/items/items.json @@ -241,5 +241,35 @@ "loop": "true", "img": "images/Classic Mode.png", "codes": "chestNumber" - } + }, + { + "name": "Money", + "type": "consumable", + "img": "images/items/money.png", + "codes": "Money" + }, + { + "name": "Stage 1", + "type": "consumable", + "img": "images/stage1.png", + "codes": "Stage 1" + }, + { + "name": "Stage 2", + "type": "consumable", + "img": "images/stage2.png", + "codes": "Stage 2" + }, + { + "name": "Stage 3", + "type": "consumable", + "img": "images/stage3.png", + "codes": "Stage 3" + }, + { + "name": "Stage 4", + "type": "consumable", + "img": "images/stage4.png", + "codes": "Stage 4" + } ] \ No newline at end of file diff --git a/layouts/items.json b/layouts/items.json index cf48557..0b32daf 100644 --- a/layouts/items.json +++ b/layouts/items.json @@ -4,33 +4,53 @@ { "shared_item_grid": { - "type": "dock", - "orientation": "top", - "margin": "0,0", + "type": "array", + "orientation": "Vertical", "content": [ { - "type": "group", - "header": "Items", - "margin": "0,0", + "type": "dock", "content": [ { - "type": "itemgrid", - "item_margin": "10, 10", - "h_alignment": "left", - "item_size": 4, - "rows": [ - [ - "LunarTrinket", - "Dios Best Friend", - "Common item", - "Uncommon item", - "Legendary item", - "Boss item", - "Lunar item", - "Equipment", - "Void Item" - ] - ] + "type": "group", + "header": "Items", + "dock": "left", + "content":{ + "type": "itemgrid", + "item_margin": "10, 10", + "h_alignment": "left", + "item_size": 4, + "rows": [ + [ + "LunarTrinket", + "Dios Best Friend", + "Common item", + "Uncommon item", + "Legendary item", + "Boss item", + "Lunar item", + "Equipment", + "Void Item" + ] + ] + }, + },{ + "type": "group", + "header": "Stage", + "dock": "left", + "content":{ + "type": "itemgrid", + "item_margin": "10, 10", + "h_alignment": "left", + "item_size": 4, + "rows": [ + [ + "Stage 1", + "Stage 2", + "Stage 3", + "Stage 4" + ] + ] + }, }, ] } diff --git a/locations/locations.json b/locations/locations.json index 44c0940..9fb6c3c 100644 --- a/locations/locations.json +++ b/locations/locations.json @@ -72,8 +72,7 @@ { "name": "Distant Roost Scavenger", "access_rules": [ - - "Distant Roost", + "{Distant Roost}", "Distant Roost,$Zone1Access,$Zone2Access,$Zone3Access,$Zone4Access,Sky Meadow" ], "sections": [{ @@ -1320,7 +1319,7 @@ "name": "Commencement", "access_rules": [ "{Moon}", - "Sky Meadow, Moon" + "$Zone1Access,$Zone2Access,$Zone3Access,$Zone4Access, Sky Meadow, Moon" ], "sections": [{ "name": "Commencement", diff --git a/manifest.json b/manifest.json index c831bec..ad8dc74 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Risk of Rain 2", "game_name": "Risk of Rain 2 ", - "package_version": "0.2b", + "package_version": "0.3", "package_uid": "risk_ap_tracker", "author": "Bluejello", "variants": { diff --git a/scripts/ap_item_mapping.lua b/scripts/ap_item_mapping.lua index f3ebf37..896cc87 100644 --- a/scripts/ap_item_mapping.lua +++ b/scripts/ap_item_mapping.lua @@ -42,7 +42,12 @@ ITEM_MAPPING = { [37726] = {"The Simulacrum (Sky Meadow)","toggle"}, [37746] = {"VoidLocus","toggle"}, [37745] = {"Planetarium","toggle"}, - [37013] = {"LunarTrinket","toggle"}, + [37013] = {"LunarTrinket","toggle"}, + [37301] = {"Money","consumable"}, + [37501] = {"Stage 1","consumable"}, + [37502] = {"Stage 2","consumable"}, + [37503] = {"Stage 3","consumable"}, + [37504] = {"Stage 4","consumable"}, } SETTINGS_MAPPING = { diff --git a/scripts/logic.lua b/scripts/logic.lua index dd5cecf..f52c632 100644 --- a/scripts/logic.lua +++ b/scripts/logic.lua @@ -6,7 +6,7 @@ function Zone1Access() Tracker:ProviderCountForCode("Titanic Plains (2)") + Tracker:ProviderCountForCode("Siphoned Forest") - if (value > 0) then + if (value > 0) and (Tracker:ProviderCountForCode("Stage 1") > 0) then return 1 end @@ -22,7 +22,7 @@ function Zone2Access() Tracker:ProviderCountForCode("Wetland Aspect") + Tracker:ProviderCountForCode("Aphelian Sanctuary") - if (value > 0) then + if (value > 0) and (Tracker:ProviderCountForCode("Stage 2") > 0) then return 1 end return 0 @@ -34,7 +34,7 @@ function Zone3Access() Tracker:ProviderCountForCode("Sulfur Pools") + Tracker:ProviderCountForCode("Scorched Acres") - if (value > 0) then + if (value > 0) and (Tracker:ProviderCountForCode("Stage 3") > 0) then return 1 end @@ -47,7 +47,8 @@ function Zone4Access() Tracker:ProviderCountForCode("Sirens Call") + Tracker:ProviderCountForCode("Sundered Grove") - if (value > 0 ) then + if (value > 0 ) and (Tracker:ProviderCountForCode("Stage 4") > 0) then + return 1 end