Skip to content

Commit

Permalink
HUGE UPDATE
Browse files Browse the repository at this point in the history
Auto-Layout Switching, Library/Dungeon Logic rework, New Settings toggles, farding, autotracking new items.
  • Loading branch information
Br00ty committed Oct 25, 2023
1 parent 8a355c9 commit 77b16ce
Show file tree
Hide file tree
Showing 26 changed files with 930 additions and 134 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ To connect to the AP server for auto-tracking, click on the `AP` button at the t

Find the [Pseudoregalia AP Randomizer](https://github.com/pseudoregalia-modding/pseudoregalia-archipelago) here and download the most recent release and follow the instructions for setting up Pseudoregalia randomizer there.

Check out PopTrackers Documentation on packs [here](https://github.com/black-sliver/PopTracker/blob/master/doc/PACKS.md)
Check out PopTrackers [here](https://github.com/black-sliver/PopTracker)

Still having trouble realizing your pack and looking for help or just want more information about everything PopTracker? Check out the ['Unofficial' PopTracker Discord Server](https://discord.com/invite/gwThqMCPgK)!
Check out the ['Unofficial' PopTracker Discord Server](https://discord.com/invite/gwThqMCPgK)!

## License

Expand Down
Binary file added images/logic_settings/progbreaker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/logic_settings/progslide.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/logic_settings/splitgreaves.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/logic_settings/splitgreaves_grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
138 changes: 138 additions & 0 deletions items/items.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,77 @@
"disabled_img": "images/icons/icon_attack_grey.png",
"codes": "breaker"
},
{
"name": "Progressive Breaker",
"type": "progressive",
"allow_disabled": true,
//"initial_stage_idx": 0,
"loop": false,
"stages": [
{
"img": "images/icons/icon_attack.png",
"disabled_img": "images/icons/icon_attack_grey.png",
"codes": "progbreaker,breaker1",
"inherit_codes": true
},
{
"img": "images/icons/icon_chargeAttack.png",
"codes": "progbreaker,breaker2",
"inherit_codes": true
},
{
"img": "images/icons/icon_Projectile.png",
"codes": "progbreaker,breaker3",
"inherit_codes": true
}
]
},
{
"name": "Sun Greaves",
"type": "toggle",
"img": "images/icons/icon_greaves.png",
"disabled_img": "images/icons/icon_greaves_grey.png",
"codes": "greaves"
},
{
"name": "Split Kicks",
"type": "consumable",
"img": "images/icons/icon_HeliacalPower.png",
"disabled_img": "images/icons/icon_HeliacalPower_grey.png",
"max_quantity": 4,
"increment": 1,
"decrement": 1,
"initial_quantity": 0,
"overlay_font_size": 8,
"codes": "splitkick,airkick"
},
{
"name": "Slide",
"type": "toggle",
"img": "images/icons/icon_slide.png",
"disabled_img": "images/icons/icon_slide_grey.png",
"codes": "slide"
},
{
"name": "Progressive Slide",
"type": "progressive",
"allow_disabled": true,
//"initial_stage_idx": 0,
"loop": false,
"stages": [
{
"img": "images/icons/icon_slide.png",
"disabled_img": "images/icons/icon_slide_grey.png",
"codes": "progslide,slide1",
"inherit_codes": true
},
{
"img": "images/icons/icon_slideJump.png",
"codes": "progslide,slide2",
"inherit_codes": true
}
]
},
{
"name": "Solar Wind",
"type": "toggle",
Expand Down Expand Up @@ -127,12 +184,93 @@
}
]
},
// SETTINGS
{
"name": "Obscure Knowledge",
"type": "toggle",
"img": "images/logic_settings/obscure.png",
"codes": "obscure"
},
{
"name": "Progressive Breaker Setting",
"type": "toggle",
"img": "images/logic_settings/progbreaker.png",
"codes": "op_progbreaker"
},
{
"name": "Progressive Slide Setting",
"type": "toggle",
"img": "images/logic_settings/progslide.png",
"codes": "op_progslide"
},
{
"name": "Split Kicks Setting",
"type": "progressive",
"allow_disabled": false,
"initial_stage_idx": 0,
"stages": [
{
"img": "images/logic_settings/splitgreaves_grey.png",
"codes": "op_splitkick_off,op_splitkick",
"inherit_codes": false
},
{
"img": "images/logic_settings/splitgreaves.png",
"codes": "op_splitkick_on,op_splitkick",
"inherit_codes": false
}
]
},
// LAYOUTS
{
"name": "Progressive Breaker Layout",
"type": "toggle",
"img": "images/icons/icon_attack.png",
"disabled_img": "images/icons/icon_attack_grey.png",
"codes": "progbreakerLayout"
},
{
"name": "Progressive Slide Layout",
"type": "toggle",
"img": "images/icons/icon_slide.png",
"disabled_img": "images/icons/icon_slide_grey.png",
"codes": "progslideLayout"
},
{
"name": "Split Kicks Layout",
"type": "toggle",
"img": "images/icons/icon_HeliacalPower.png",
"disabled_img": "images/icons/icon_HeliacalPower_grey.png",
"codes": "splitkickLayout"
},
{
"name": "Progressive Breaker and Progressive Slide Layout",
"type": "toggle",
"img": "images/icons/icon_HeliacalPower.png",
"disabled_img": "images/icons/icon_HeliacalPower_grey.png",
"codes": "progbreakerprogslideLayout"
},
{
"name": "Progressive Breaker and Split Kick Layout",
"type": "toggle",
"img": "images/icons/icon_HeliacalPower.png",
"disabled_img": "images/icons/icon_HeliacalPower_grey.png",
"codes": "progbreakersplitkickLayout"
},
{
"name": "Progressive Slide and Split Kick Layout",
"type": "toggle",
"img": "images/icons/icon_HeliacalPower.png",
"disabled_img": "images/icons/icon_HeliacalPower_grey.png",
"codes": "progslidesplitkickLayout"
},
{
"name": "All Progressives and Split Kick Layout",
"type": "toggle",
"img": "images/icons/icon_HeliacalPower.png",
"disabled_img": "images/icons/icon_HeliacalPower_grey.png",
"codes": "progsandsplitLayout"
},
// EXAMPLE CODE
{
"name": "Progressive",
Expand Down
34 changes: 3 additions & 31 deletions layouts/broadcast.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,12 @@
"content": [
{
"type": "array",
"orientation": "vertical",
"orientation": "horizontal",
"margin": "0,0",
"content": [
{
"type": "itemgrid",
"item_margin": "5, 7",
"item_size": 60,
"h_alignment": "left",
"rows": [
[
"breaker",
"slide"
],
[
"sunsetter",
"strikebreak"
],
[
"greaves",
"heliacal"
],
[
"cutter",
"solar"
],
[
"ascendant",
"cling"
],
[
"smallkey",
"majorkey"
]
]
"type": "layout",
"key": "shared_item_grid"
}
]
}
Expand Down
44 changes: 44 additions & 0 deletions layouts/items_only_progbreaker.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"shared_item_grid": {
"type": "array",
"orientation": "vertical",
"margin": "0,0",
"content": [
{
"type": "array",
"orientation": "vertical",
"margin": "0,0",
"content": [
{
"type": "itemgrid",
"item_margin": "5, 7",
"item_size": 60,
"h_alignment": "left",
"rows": [
[
"progbreaker",
"sunsetter"
],
[
"slide",
"solar"
],
[
"greaves",
"heliacal"
],
[
"ascendant",
"cling"
],
[
"smallkey",
"majorkey"
]
]
}
]
}
]
}
}
47 changes: 47 additions & 0 deletions layouts/items_only_progslide.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"shared_item_grid": {
"type": "array",
"orientation": "vertical",
"margin": "0,0",
"content": [
{
"type": "array",
"orientation": "vertical",
"margin": "0,0",
"content": [
{
"type": "itemgrid",
"item_margin": "5, 7",
"item_size": 60,
"h_alignment": "left",
"rows": [
[
"breaker",
"progslide"
],
[
"sunsetter",
"strikebreak"
],
[
"greaves",
"heliacal"
],
[
"cutter",
"ascendant"
],
[
"cling"
],
[
"smallkey",
"majorkey"
]
]
}
]
}
]
}
}
47 changes: 47 additions & 0 deletions layouts/items_only_splitkick.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"shared_item_grid": {
"type": "array",
"orientation": "vertical",
"margin": "0,0",
"content": [
{
"type": "array",
"orientation": "vertical",
"margin": "0,0",
"content": [
{
"type": "itemgrid",
"item_margin": "5, 7",
"item_size": 60,
"h_alignment": "left",
"rows": [
[
"breaker",
"slide"
],
[
"sunsetter",
"strikebreak"
],
[
"splitkick",
"cutter"
],
[
"solar",
"ascendant"
],
[
"cling"
],
[
"smallkey",
"majorkey"
]
]
}
]
}
]
}
}
Loading

0 comments on commit 77b16ce

Please sign in to comment.