Skip to content

Commit 9139af4

Browse files
committed
Merge branch 'feature/refactor-hints'
2 parents 0553a84 + 818b58e commit 9139af4

File tree

18 files changed

+186
-92
lines changed

18 files changed

+186
-92
lines changed

.golangci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ linters:
55
- godox
66
- gomnd
77
- wsl
8+
- gochecknoglobals
9+
- nlreturn

app.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func NewApp() (*App, error) {
4949
config.ZoneItemMap,
5050
config.Locations,
5151
config.Binds,
52+
config.AlwaysHints,
5253
config.DungeonInputMedallionOrder,
5354
config.DungeonInputDungeonKP,
5455
)

assets/background.png

-7.01 KB
Loading

assets/background.xcf

6.84 KB
Binary file not shown.

assets/config.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,16 @@
115115
}
116116
},
117117

118+
"AlwaysHints": {
119+
"Skull Mask": { "X": 105, "Y": 350 },
120+
"Biggoron Sword": { "X": 140, "Y": 350 },
121+
"Ocarina of Time": { "X": 175, "Y": 350 },
122+
"Frogs 2": { "X": 210, "Y": 350 },
123+
"30 Gold Skullutulas": { "X": 0, "Y": 350 },
124+
"40 Gold Skullutulas": { "X": 35, "Y": 350 },
125+
"50 Gold Skullutulas": { "X": 70, "Y": 350 }
126+
},
127+
118128
"Binds": {
119129
"0": "StartItemInput",
120130
".": "DowngradeNext",

assets/items-disabled.png

3.4 KB
Loading

assets/items.png

-19.2 KB
Loading

assets/items.xcf

21.1 KB
Binary file not shown.

config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ type config struct {
1313
Items []tracker.Item
1414
ZoneItemMap [9][9]string
1515
Locations []string // woth/barren "simple" locations
16+
AlwaysHints map[string]image.Point
1617

1718
DungeonInputMedallionOrder, DungeonInputDungeonKP []string
1819

input-viewer/input_viewer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func (iv *InputViewer) drawButtons(screen *ebiten.Image) {
188188
}
189189
}
190190

191-
// TODO replace when a better idea is found for Z/R
191+
// TODO replace when a better idea is found for Z/R.
192192
func (iv *InputViewer) legacyDraw(screen *ebiten.Image) {
193193
for _, v := range []*InputButton{
194194
&iv.config.Z, &iv.config.R,

0 commit comments

Comments
 (0)