Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Map Layout #145

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"extends": [
"airbnb",
"plugin:@typescript-eslint/recommended"
"plugin:@typescript-eslint/recommended",
"plugin:react/jsx-runtime",
"prettier"
],
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint", "import"],
Expand All @@ -28,17 +30,13 @@
}],
"react/jsx-indent": ["error", 4],
"react/jsx-indent-props": ["error", 4],
"react/jsx-filename-extension": ["error", {"extensions": [".jsx", ".js"]}],
"react/jsx-filename-extension": ["error", {"extensions": [".jsx", ".js", "tsx"]}],
// I would like us to consider this in the future, but for now it is too sweeping of a change to be feasible
// It also may make code less readable in a lot of places where we use both props and state in the same functions
// (although this may be symptomatic of a bigger issue with naming things)
"max-len": 0,
"react/destructuring-assignment": ["off", "never"],
"no-plusplus": ["off"],
"react/jsx-curly-newline": ["error", {
"singleline": "forbid",
"multiline": "require"
}],
"operator-linebreak": ["error", "after", {
"overrides": {
"?": "before",
Expand All @@ -61,7 +59,10 @@
"js": "never",
"ts": "never",
"tsx": "never"
}]
}],
"react/require-default-props": ["off"],
"react/function-component-definition": ["off"] ,
"lines-between-class-members": ["error", "always", { "exceptAfterSingleLine": true }]
}
}
],
Expand Down
26 changes: 26 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# dependencies
/node_modules
/.pnp
.pnp.js

# testing
/coverage

# production
/build

# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*

package-lock.json
/public
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,19 @@
- Stone of trials is now part of Sky Keep
- Added semi-logical support for Batreaux's checks (by YourAverageLink)
- Checks will be semi-logical if you have access to enough loose crystals to get the reward
- Added map layout (by YourAverageLink)
- If the map layout is enabled, the entire tracker is rearranged to make room for a large map display.
- Most notably, the dungeon block is completely redesigned, containing just the keys and dungeon abbreviations, and it has been moved with the rest of the items.
- A world map is shown, containing markers for the Thunderhead and Sky regions, as well as markers for four submaps (Skyloft, Faron, Eldin, and Lanayru)
- Hovering over a map marker displays the region name, how many checks are accessible, and how many are remaining. If a hint has been assigned to a region, it is also shown in the tooltip. Hovering over a submap displays the sum of all accessible and remaining checks in the province, as well as any hints marked in the submap's regions.
- The marker itself has the 'checked' color if no locations remain, the 'outLogic' color if no locations are accessible, the 'semiLogic' color with a number displaying how many checks are accessible if some are, and the 'inLogic' color plus how many locations are accessible if every location remainijg in the region is accessible. Markers have a 'squircle' shape (a square with rounded corners)
- Submaps
- When a submap marker is clicked, the map changes to the map for the selected submap. Its own regions are added, along with a button to return to the world map.
- Special markers
- Silent realms have circular markers on the map.
- Dungeon entrances have square markers on the map. If dungeon entrance rando is off, they are bound to their vanilla dungeon by default.
- If the entrance has no assigned dungeon, it displays '?', and when clicked, opens a context menu to select a dungeon to bind.
- Once a dungeon is bound, it is treated as a region in the containing submap (counts towards check total). It can be clicked on to open the check list, and it can be right-clicked to assign hints or to change which dungeon is bound there.

## Changes

Expand Down
Loading