mirror of
https://github.com/OpenDiablo2/OpenDiablo2
synced 2025-02-04 15:46:51 -05:00
fixed some of the remaining funlen lint errors (#850)
* d2records/: suppressing function legnth lint errors for record loaders * d2gamescreen/character_select.go: broke up OnLoad method to reduce complexity * d2ui/button.go: suppressing funlen lint error, can't reduce function size
This commit is contained in:
parent
1046fb6137
commit
0bd774aaa6
@ -6,6 +6,7 @@ import (
|
||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2txt"
|
||||
)
|
||||
|
||||
// nolint:funlen // cant reduce
|
||||
func beltsLoader(r *RecordManager, d *d2txt.DataDictionary) error {
|
||||
records := make(Belts)
|
||||
|
||||
|
@ -7,6 +7,7 @@ import (
|
||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2txt"
|
||||
)
|
||||
|
||||
// nolint:funlen // cant reduce
|
||||
func charStatsLoader(r *RecordManager, d *d2txt.DataDictionary) error {
|
||||
records := make(CharStats)
|
||||
|
||||
|
@ -7,7 +7,7 @@ import (
|
||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2txt"
|
||||
)
|
||||
|
||||
// LoadInventory loads all of the inventory records from inventory.txt
|
||||
// nolint:funlen // cant reduce
|
||||
func inventoryLoader(r *RecordManager, d *d2txt.DataDictionary) error {
|
||||
records := make(Inventory)
|
||||
|
||||
|
@ -10,6 +10,7 @@ import (
|
||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
|
||||
)
|
||||
|
||||
// nolint:funlen // cant reduce
|
||||
func loadCommonItems(d *d2txt.DataDictionary, source d2enum.InventoryItemType) (CommonItems, error) {
|
||||
records := make(CommonItems)
|
||||
|
||||
|
@ -8,6 +8,7 @@ import (
|
||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
|
||||
)
|
||||
|
||||
// nolint:funlen // cant reduce
|
||||
func levelDetailsLoader(r *RecordManager, d *d2txt.DataDictionary) error {
|
||||
records := make(LevelDetails)
|
||||
|
||||
|
@ -9,6 +9,7 @@ import (
|
||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2calculation"
|
||||
)
|
||||
|
||||
// nolint:funlen // cant reduce
|
||||
func missilesLoader(r *RecordManager, d *d2txt.DataDictionary) error {
|
||||
records := make(Missiles)
|
||||
r.missilesByName = make(missilesByName)
|
||||
|
@ -7,7 +7,7 @@ import (
|
||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2txt"
|
||||
)
|
||||
|
||||
// LoadMonStats loads monstats
|
||||
// nolint:funlen // cant reduce
|
||||
func monsterStatsLoader(r *RecordManager, d *d2txt.DataDictionary) error {
|
||||
records := make(MonStats)
|
||||
|
||||
|
@ -6,6 +6,7 @@ import (
|
||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2fileformats/d2txt"
|
||||
)
|
||||
|
||||
// nolint:funlen // cant reduce
|
||||
func uniqueItemsLoader(r *RecordManager, d *d2txt.DataDictionary) error {
|
||||
records := make(UniqueItems)
|
||||
|
||||
|
@ -116,6 +116,7 @@ const (
|
||||
pressedButtonOffset = 2
|
||||
)
|
||||
|
||||
// nolint:funlen // cant reduce
|
||||
func getButtonLayouts() map[ButtonType]ButtonLayout {
|
||||
return map[ButtonType]ButtonLayout{
|
||||
ButtonTypeWide: {
|
||||
|
@ -152,50 +152,16 @@ func (v *CharacterSelect) OnLoad(loading d2screen.LoadingState) {
|
||||
|
||||
loading.Progress(tenPercent)
|
||||
|
||||
bgX, bgY := 0, 0
|
||||
|
||||
v.background, err = v.uiManager.NewSprite(d2resource.CharacterSelectionBackground, d2resource.PaletteSky)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
|
||||
v.background.SetPosition(bgX, bgY)
|
||||
|
||||
v.loadBackground()
|
||||
v.createButtons(loading)
|
||||
|
||||
heroTitleX, heroTitleY := 320, 23
|
||||
v.d2HeroTitle = v.uiManager.NewLabel(d2resource.Font42, d2resource.PaletteUnits)
|
||||
v.d2HeroTitle.SetPosition(heroTitleX, heroTitleY)
|
||||
v.d2HeroTitle.Alignment = d2gui.HorizontalAlignCenter
|
||||
v.loadHeroTitle()
|
||||
|
||||
loading.Progress(thirtyPercent)
|
||||
|
||||
v.deleteCharConfirmLabel = v.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteUnits)
|
||||
lines := "Are you sure that you want\nto delete this character?\nTake note: this will delete all\nversions of this Character."
|
||||
v.deleteCharConfirmLabel.SetText(lines)
|
||||
v.deleteCharConfirmLabel.Alignment = d2gui.HorizontalAlignCenter
|
||||
deleteConfirmX, deleteConfirmY := 400, 185
|
||||
v.deleteCharConfirmLabel.SetPosition(deleteConfirmX, deleteConfirmY)
|
||||
|
||||
v.selectionBox, err = v.uiManager.NewSprite(d2resource.CharacterSelectionSelectBox, d2resource.PaletteSky)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
|
||||
selBoxX, selBoxY := 37, 86
|
||||
v.selectionBox.SetPosition(selBoxX, selBoxY)
|
||||
|
||||
v.okCancelBox, err = v.uiManager.NewSprite(d2resource.PopUpOkCancel, d2resource.PaletteFechar)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
|
||||
okCancelX, okCancelY := 270, 175
|
||||
v.okCancelBox.SetPosition(okCancelX, okCancelY)
|
||||
|
||||
scrollBarX, scrollBarY, scrollBarHeight := 586, 87, 369
|
||||
v.charScrollbar = v.uiManager.NewScrollbar(scrollBarX, scrollBarY, scrollBarHeight)
|
||||
v.charScrollbar.OnActivated(func() { v.onScrollUpdate() })
|
||||
v.loadDeleteCharConfirm()
|
||||
v.loadSelectionBox()
|
||||
v.loadOkCancelBox()
|
||||
v.loadCharScrollbar()
|
||||
|
||||
loading.Progress(fiftyPercent)
|
||||
|
||||
@ -221,9 +187,69 @@ func (v *CharacterSelect) OnLoad(loading d2screen.LoadingState) {
|
||||
v.characterExpLabel[i].SetPosition(offsetX, offsetY)
|
||||
v.characterExpLabel[i].Color[0] = rgbaColor(lightGreen)
|
||||
}
|
||||
|
||||
v.refreshGameStates()
|
||||
}
|
||||
|
||||
func (v *CharacterSelect) loadBackground() {
|
||||
var err error
|
||||
|
||||
bgX, bgY := 0, 0
|
||||
|
||||
v.background, err = v.uiManager.NewSprite(d2resource.CharacterSelectionBackground, d2resource.PaletteSky)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
|
||||
v.background.SetPosition(bgX, bgY)
|
||||
}
|
||||
|
||||
func (v *CharacterSelect) loadHeroTitle() {
|
||||
heroTitleX, heroTitleY := 320, 23
|
||||
v.d2HeroTitle = v.uiManager.NewLabel(d2resource.Font42, d2resource.PaletteUnits)
|
||||
v.d2HeroTitle.SetPosition(heroTitleX, heroTitleY)
|
||||
v.d2HeroTitle.Alignment = d2gui.HorizontalAlignCenter
|
||||
}
|
||||
|
||||
func (v *CharacterSelect) loadDeleteCharConfirm() {
|
||||
v.deleteCharConfirmLabel = v.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteUnits)
|
||||
lines := "Are you sure that you want\nto delete this character?\nTake note: this will delete all\nversions of this Character."
|
||||
v.deleteCharConfirmLabel.SetText(lines)
|
||||
v.deleteCharConfirmLabel.Alignment = d2gui.HorizontalAlignCenter
|
||||
deleteConfirmX, deleteConfirmY := 400, 185
|
||||
v.deleteCharConfirmLabel.SetPosition(deleteConfirmX, deleteConfirmY)
|
||||
}
|
||||
|
||||
func (v *CharacterSelect) loadSelectionBox() {
|
||||
var err error
|
||||
|
||||
v.selectionBox, err = v.uiManager.NewSprite(d2resource.CharacterSelectionSelectBox, d2resource.PaletteSky)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
|
||||
selBoxX, selBoxY := 37, 86
|
||||
v.selectionBox.SetPosition(selBoxX, selBoxY)
|
||||
}
|
||||
|
||||
func (v *CharacterSelect) loadOkCancelBox() {
|
||||
var err error
|
||||
|
||||
v.okCancelBox, err = v.uiManager.NewSprite(d2resource.PopUpOkCancel, d2resource.PaletteFechar)
|
||||
if err != nil {
|
||||
log.Print(err)
|
||||
}
|
||||
|
||||
okCancelX, okCancelY := 270, 175
|
||||
v.okCancelBox.SetPosition(okCancelX, okCancelY)
|
||||
}
|
||||
|
||||
func (v *CharacterSelect) loadCharScrollbar() {
|
||||
scrollBarX, scrollBarY, scrollBarHeight := 586, 87, 369
|
||||
v.charScrollbar = v.uiManager.NewScrollbar(scrollBarX, scrollBarY, scrollBarHeight)
|
||||
v.charScrollbar.OnActivated(func() { v.onScrollUpdate() })
|
||||
}
|
||||
|
||||
func rgbaColor(rgba uint32) color.RGBA {
|
||||
result := color.RGBA{}
|
||||
a, b, g, r := 0, 1, 2, 3
|
||||
|
Loading…
Reference in New Issue
Block a user