Skip to content

Commit

Permalink
v1.0.2 update: logic improvements, shop item prices, map tweak
Browse files Browse the repository at this point in the history
  • Loading branch information
@ladybunne
ladybunne committed Jun 25, 2024
1 parent 52116df commit d8c4272
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 23 deletions.
Binary file modified images/maps/OverworldMap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 19 additions & 12 deletions locations/locations.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,7 @@
"sections": [
{
"name": "Firecage_top_heart_door",
"access_rules": ["$FireCageInner", "$FireCageInnerOOL, [false]"]
"access_rules": ["$FireCageInner, ceilingstick", "$FireCageInnerOOL, ceilingstick, [false]"]
}
],
"map_locations": [
Expand All @@ -1061,7 +1061,13 @@
},
{
"name": "FireCage Tollgate",
"access_rules": ["$FireCageInner, fireshot:2, redenergy, hatch", "$FireCageInner, ceilingstick:2, hatch", "$FireCageInnerOOL, fireshot:2, hatch, [false]"],
"access_rules": [
"$FireCageInner, fireshot:2, redenergy, hatch",
"$FireCageInner, ceilingstick:2, hatch",
"$FireCageInner, $JumpHeightMin|8, fireshot, redenergy, hatch",
"$FireCageInnerOOL, fireshot:2, redenergy, hatch, [false]",
"$FireCageInnerOOL, ceilingstick:2, hatch, [false]",
"$FireCageInnerOOL, $JumpHeightMin|8, fireshot, redenergy, hatch, [false]"],
"sections": [
{
"name": "Firecage_top_left_gate"
Expand Down Expand Up @@ -2020,35 +2026,36 @@
"access_rules": ["redenergy", "$SkySandInner"]
},
{
"name": "Skytown_shop_1",
"name": "Skytown_shop_1 (21 crystals)",
"access_rules": [""]
},
{
"name": "Skytown_shop_2",
"name": "Skytown_shop_2 (35 crystals)",
"access_rules": [""]
},
{
"name": "Skytown_shop_3",
"name": "Skytown_shop_3 (87 crystals)",
"access_rules": [""]
},
{
"name": "Skytown_shop_4",
"name": "Skytown_shop_4 (132 crystals)",
"access_rules": ["[$CanBuyEverythingInShop]"]
},
{
"name": "Skytown_shop_5",
"access_rules": [""]
"name": "Skytown_shop_5 (246 crystals)",
"access_rules": ["[$CanBuyEverythingInShop]"]

},
{
"name": "Skytown_shop_6",
"access_rules": ["[$CanBuyEverythingInShop]"]
"name": "Skytown_shop_6 (32 crystals)",
"access_rules": [""]
},
{
"name": "Skytown_shop_7",
"name": "Skytown_shop_7 (197 crystals)",
"access_rules": ["[$CanBuyEverythingInShop]"]
},
{
"name": "Skytown_shop_8",
"name": "Skytown_shop_8 (417 crystals)",
"access_rules": ["[$CanBuyEverythingInShop]"]
}
],
Expand Down
2 changes: 1 addition & 1 deletion manifest.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "An Untitled Story - Archipelago",
"game_name": "An Untitled Story",
"package_version": "1.0.1",
"package_version": "1.0.2",
"package_uid": "AnUntitledStory-Archipelago",
"platform": "Windows",
"author": "Ladybunne",
Expand Down
16 changes: 8 additions & 8 deletions scripts/autotracking/location_mapping.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,14 +142,14 @@ LOCATION_MAPPING = {
[72104] = {"@Sky Town/Sky Town Pit Left/Skytown_pit_left"},
[72007] = {"@Sky Town/Sky Town Pit Right/Skytown_pit_right"},
[72110] = {"@Sky Town/Sky Town Shop/Skytown_red_heart"},
[72112] = {"@Sky Town/Sky Town Shop/Skytown_shop_1"},
[72113] = {"@Sky Town/Sky Town Shop/Skytown_shop_2"},
[72114] = {"@Sky Town/Sky Town Shop/Skytown_shop_3"},
[72115] = {"@Sky Town/Sky Town Shop/Skytown_shop_4"},
[72116] = {"@Sky Town/Sky Town Shop/Skytown_shop_5"},
[72004] = {"@Sky Town/Sky Town Shop/Skytown_shop_6"},
[72015] = {"@Sky Town/Sky Town Shop/Skytown_shop_7"},
[72201] = {"@Sky Town/Sky Town Shop/Skytown_shop_8"},
[72112] = {"@Sky Town/Sky Town Shop/Skytown_shop_1 (21 crystals)"},
[72113] = {"@Sky Town/Sky Town Shop/Skytown_shop_2 (35 crystals)"},
[72114] = {"@Sky Town/Sky Town Shop/Skytown_shop_3 (87 crystals)"},
[72115] = {"@Sky Town/Sky Town Shop/Skytown_shop_4 (132 crystals)"},
[72116] = {"@Sky Town/Sky Town Shop/Skytown_shop_5 (246 crystals)"},
[72004] = {"@Sky Town/Sky Town Shop/Skytown_shop_6 (32 crystals)"},
[72015] = {"@Sky Town/Sky Town Shop/Skytown_shop_7 (197 crystals)"},
[72201] = {"@Sky Town/Sky Town Shop/Skytown_shop_8 (417 crystals)"},
[72109] = {"@Sky Town/Sky Town Entrance Save/Skytown_tower_heart"},
[72111] = {"@Sky Town/Sky Town Edge/Skytown_yellow_heart"},
[72405] = {"@StoneCastle/StoneCastle Rock Boss/Stonecastle_boss_5"},
Expand Down
4 changes: 2 additions & 2 deletions scripts/logic/logic.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,11 @@ end
-- Extras to help with subzones

function BlackCastleInner()
return BlackCastle() and Has("goldorb", 7) and JumpHeightMin(7) and Has("redenergy") and Has("divebomb")
return BlackCastle() and Has("goldorb", 7) and JumpHeightMin(7) and Has("redenergy") and Has("divebomb") and Has("ceilingstick", 2)
end

function BlackCastleInnerOOL()
return BlackCastleOOL() and Has("goldorb", 7) and JumpHeightMin(7) and Has("redenergy") and Has("divebomb")
return BlackCastleOOL() and Has("goldorb", 7) and JumpHeightMin(7) and Has("redenergy") and Has("divebomb") and Has("ceilingstick", 2)
end

function BlancLandLowerLeft()
Expand Down
8 changes: 8 additions & 0 deletions versions.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
{
"versions": [
{
"package_version": "1.0.2",
"download_url": "https://github.com/ladybunne/AnUntitledStory_PopTrackerPack/releases/download/v1.0.2/AnUntitledStory_PopTrackerPack.zip",
"sha": "5375cbb1c8a93a893eeff93faebfd1c630fced7c008a64616b222b97bff2f4bd",
"changelog": [
"Tweaked map graphic slightly, added shop item prices (while they're static!), improved logic for FireCage and BlackCastle."
]
},
{
"package_version": "1.0.1",
"download_url": "https://github.com/ladybunne/AnUntitledStory_PopTrackerPack/releases/download/v1.0.1/AnUntitledStory_PopTrackerPack.zip",
Expand Down

0 comments on commit d8c4272

Please sign in to comment.