Skip to content

Commit

Permalink
Officially end support for EmoTracker, although this pack never would…
Browse files Browse the repository at this point in the history
… show up in Emo

Add some new things to manifest.json
  * Add lorom flag to all variants
  * Add versions.json url
Remove extraneous autotracking-custom.lua files from variants
Check if the player has magic for certain checks
Update the Magridd Left Tower requirements for the new Archipelago logic
  • Loading branch information
powerlord committed Jun 9, 2024
1 parent c48423e commit fbe1ab3
Show file tree
Hide file tree
Showing 13 changed files with 152 additions and 54 deletions.
43 changes: 32 additions & 11 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,26 +1,47 @@
{
"json.schemas": [

{
"fileMatch": [
"*/items/*.json",
"*/*.items.json",
"*/manifest.json"
],
"url": "https://emotracker.net/developers/schemas/items.json"
"url": "https://poptracker.github.io/schema/packs/strict/manifest.json"
},
{
"fileMatch": [
"*/layouts/*.json",
"*/*.layouts.json",
"*/items/*.json"
],
"url": "https://emotracker.net/developers/schemas/layouts.json"
"url": "https://poptracker.github.io/schema/packs/strict/items.json"
},
{
"fileMatch": [
"*/locations/*.json",
"*/*.locations.json"
"*/locations/*.json"
],
"url": "https://emotracker.net/developers/schemas/locations.json"
}
"url": "https://poptracker.github.io/schema/packs/strict/locations.json"
},
{
"fileMatch": [
"*/layouts/*.json"
],
"url": "https://poptracker.github.io/schema/packs/strict/layouts.json"
},
{
"fileMatch": [
"*/maps/*.json"
],
"url": "https://poptracker.github.io/schema/packs/strict/maps.json"
},
{
"fileMatch": [
"/settings.json"
],
"url": "https://poptracker.github.io/schema/packs/strict/settings.json"
},
{
"fileMatch": [
"/versions.json"
],
"url": "https://raw.githubusercontent.com/black-sliver/PopTracker/packlist/schema/versions.schema.json"
}

]
}
1 change: 1 addition & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MIT License

Copyright (c) 2019 Jason Felds
Copyright (c) 2024 Ross Bemrose

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
14 changes: 1 addition & 13 deletions archipelago-items_equipment-map_simple/scripts/logic-custom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -89,17 +89,5 @@ function canSummonDeathtoll()
return 0
end

if Tracker:ProviderCountForCode( "phoenix" ) <= 0 then
return 0
end

if Tracker:ProviderCountForCode( "soulblade" ) <= 0 then
return 0
end

if Tracker:ProviderCountForCode( "soularmor" ) <= 0 then
return 0
end

return 1
return CanUsePhoenix()
end
Empty file.
Empty file.
11 changes: 7 additions & 4 deletions locations/world5.json
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,12 @@
"chest_opened_img": "images/tracker/monsterlairsealed.png",
"sections": [
{
"name": "South-West near the River"
"name": "South-West near the River",
"access_rules": ["[$CanUseMagic]"]
},
{
"name": "West, House on the Left Hill"
"name": "West, House on the Left Hill",
"access_rules": ["[$CanUseMagic]"]
},
{
"name": "West, House on the Middle Hill"
Expand All @@ -316,12 +318,13 @@
},
{
"name": "East, Hidden Enemies Lairs",
"access_rules": ["[souldetection]"],
"access_rules": ["[souldetection],[$CanUseMagic]"],
"clear_as_group": false,
"item_count": 2
},
{
"name": "House Maze Lair"
"name": "House Maze Lair",
"access_rules": ["[$CanUseMagic]"]
},
{
"name": "House Maze Chest",
Expand Down
5 changes: 4 additions & 1 deletion locations/world6.json
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,10 @@
},
{
"name": "Left Tower",
"access_rules": ["w6soldierleft,platinumcard"],
"access_rules": [
"w6soldierleft,platinumcard",
"w6soldierleft,ripleo"
],
"map_locations": [
{
"map": "world6",
Expand Down
9 changes: 6 additions & 3 deletions locations/world7.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
],
"sections": [
{
"name": "Clear the South-East Lair first"
"name": "Clear the South-East Lair first",
"access_rules": "[$CanUseMagic]"
}
]
},
Expand All @@ -32,7 +33,8 @@
],
"sections": [
{
"name": "Clear the South-West Lair first"
"name": "Clear the South-West Lair first",
"access_rules": "[$CanUseMagic]"
}
]
},
Expand All @@ -47,7 +49,8 @@
],
"sections": [
{
"name": "Warp unlocked by a nearby lair"
"name": "Warp unlocked by a nearby lair",
"access_rules": "$CanUseMagic"
}
]
},
Expand Down
36 changes: 27 additions & 9 deletions manifest.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,47 @@
{
"name": "Soul Blazer Rando Tracker Beta",
"name": "Soul Blazer Rando Tracker",
"game_name": "Soul Blazer Randomizer",
"game_variant": "yes",
"platform": "snes",
"package_version": "2.2.0.0-beta2",
"package_uid": "soulblazer-wolfman-beta",
"package_version": "2.2.0.4",
"package_uid": "soulblazer-wolfman",
"author": "Wolfman2000 and Powerlord",
"variants": {
"items_minimal-map_simple": {
"display_name": "Item (Minimal) & Map Tracker"
"display_name": "Item (Minimal) & Map Tracker",
"flags": [
"lorom"
]
},
"items_equipment-map_simple": {
"display_name": "Item (Equipment) & Map Tracker"
"display_name": "Item (Equipment) & Map Tracker",
"flags": [
"lorom"
]
},
"items_minimal-map_none": {
"display_name": "Item (Minimal) Only Tracker"
"display_name": "Item (Minimal) Only Tracker",
"flags": [
"lorom"
]
},
"items_equipment-map_none": {
"display_name": "Item (Equipment) Only Tracker"
"display_name": "Item (Equipment) Only Tracker",
"flags": [
"lorom"
]
},
"items_skarsnik-map_none": {
"display_name": "Item (Skarsnik) Only Tracker"
"display_name": "Item (Skarsnik) Only Tracker",
"flags": [
"lorom"
]
},
"archipelago-items_equipment-map_simple": {
"display_name": "Archipelago Item (Equipment) & Map Tracker"
"display_name": "Archipelago Item (Equipment) & Map Tracker",
"flags": [
"lorom"
]
}
}
}
File renamed without changes.
14 changes: 1 addition & 13 deletions scripts/logic-custom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,5 @@ function canSummonDeathtoll()
end
end

if Tracker:ProviderCountForCode( "phoenix" ) <= 0 then
return 0
end

if Tracker:ProviderCountForCode( "soulblade" ) <= 0 then
return 0
end

if Tracker:ProviderCountForCode( "soularmor" ) <= 0 then
return 0
end

return 1
return CanUsePhoenix()
end
59 changes: 59 additions & 0 deletions scripts/logic.lua
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,63 @@ function canDefeatSpiritMonsters()
return Tracker:ProviderCountForCode( "soulblade" )
end

-- This function isn't needed yet, but may be in the future
function CanUsePhoenix()

if Tracker:ProviderCountForCode( "phoenix" ) <= 0 then
return 0
end

if Tracker:ProviderCountForCode( "soulblade" ) <= 0 then
return 0
end

if Tracker:ProviderCountForCode( "soularmor" ) <= 0 then
return 0
end

return 1
end

function CanUseMagic()
if Tracker:ProviderCountForCode( "soulmagician" ) <= 0 then
return 0
end

if Tracker:ProviderCountForCode( "flameball" ) > 0 then
return 1
end

if Tracker:ProviderCountForCode( "lightarrow" ) > 0 then
return 1
end

if Tracker:ProviderCountForCode( "magicflare" ) > 0 then
return 1
end

if Tracker:ProviderCountForCode( "rotator" ) > 0 then
return 1
end

if Tracker:ProviderCountForCode( "sparkbomb" ) > 0 then
return 1
end

if Tracker:ProviderCountForCode( "flamepillar" ) > 0 then
return 1
end

if Tracker:ProviderCountForCode( "tornado" ) > 0 then
return 1
end

if CanUsePhoenix() > 0 then
return 1
end

return 0

end

ScriptHost:LoadScript("scripts/logic-custom.lua")
14 changes: 14 additions & 0 deletions versions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"versions": [
{
"package_version": "2.2.0.4",
"download_url": "",
"sha256": "",
"changelog": [
"",
""
]

}
]
}

0 comments on commit fbe1ab3

Please sign in to comment.