party panel: switchers creator, party indexes (name, classs labels and switchers)
This commit is contained in:
parent
dbacb63fae
commit
bd3fc4bb25
|
@ -0,0 +1,8 @@
|
||||||
|
package d2enum
|
||||||
|
|
||||||
|
// Players relationships
|
||||||
|
const (
|
||||||
|
PlayerRelationNeutral = iota
|
||||||
|
PlayerRelationFriend
|
||||||
|
PlayerRelationEnemy
|
||||||
|
)
|
|
@ -247,6 +247,9 @@ const (
|
||||||
Frame = "/data/global/ui/PANEL/800borderframe.dc6"
|
Frame = "/data/global/ui/PANEL/800borderframe.dc6"
|
||||||
InventoryCharacterPanel = "/data/global/ui/PANEL/invchar6.DC6"
|
InventoryCharacterPanel = "/data/global/ui/PANEL/invchar6.DC6"
|
||||||
PartyPanel = "/data/global/ui/MENU/party.dc6"
|
PartyPanel = "/data/global/ui/MENU/party.dc6"
|
||||||
|
PartyButton = "/data/global/ui/MENU/partybuttons.dc6"
|
||||||
|
PartyBoxes = "/data/global/ui/MENU/partyboxes.dc6"
|
||||||
|
PartyBar = "/data/global/ui/MENU/partybar.dc6"
|
||||||
HeroStatsPanelStatsPoints = "/data/global/ui/PANEL/skillpoints.dc6"
|
HeroStatsPanelStatsPoints = "/data/global/ui/PANEL/skillpoints.dc6"
|
||||||
HeroStatsPanelSocket = "/data/global/ui/PANEL/levelsocket.dc6"
|
HeroStatsPanelSocket = "/data/global/ui/PANEL/levelsocket.dc6"
|
||||||
InventoryWeaponsTab = "/data/global/ui/PANEL/invchar6Tab.DC6"
|
InventoryWeaponsTab = "/data/global/ui/PANEL/invchar6Tab.DC6"
|
||||||
|
|
|
@ -18,7 +18,6 @@ type SwitchableButton struct {
|
||||||
// NewSwitchableButton creates new switchable button
|
// NewSwitchableButton creates new switchable button
|
||||||
func (ui *UIManager) NewSwitchableButton(active, inactive *Button, state bool) *SwitchableButton {
|
func (ui *UIManager) NewSwitchableButton(active, inactive *Button, state bool) *SwitchableButton {
|
||||||
base := NewBaseWidget(ui)
|
base := NewBaseWidget(ui)
|
||||||
base.SetVisible(true)
|
|
||||||
|
|
||||||
sbtn := &SwitchableButton{
|
sbtn := &SwitchableButton{
|
||||||
BaseWidget: base,
|
BaseWidget: base,
|
||||||
|
@ -26,10 +25,14 @@ func (ui *UIManager) NewSwitchableButton(active, inactive *Button, state bool) *
|
||||||
inactive: inactive,
|
inactive: inactive,
|
||||||
state: state,
|
state: state,
|
||||||
}
|
}
|
||||||
|
sbtn.bindManager(ui)
|
||||||
|
sbtn.SetVisible(false)
|
||||||
|
|
||||||
sbtn.OnActivated(func() {})
|
sbtn.OnActivated(func() {})
|
||||||
sbtn.OnDezactivated(func() {})
|
sbtn.OnDezactivated(func() {})
|
||||||
|
|
||||||
|
ui.addWidget(sbtn)
|
||||||
|
|
||||||
return sbtn
|
return sbtn
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,6 +96,12 @@ func (sbtn *SwitchableButton) Advance(_ float64) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Render renders widget
|
// Render renders widget
|
||||||
func (sbtn *SwitchableButton) Render(_ d2interface.Surface) {
|
func (sbtn *SwitchableButton) Render(target d2interface.Surface) {
|
||||||
// noop
|
if sbtn.active.GetVisible() {
|
||||||
|
sbtn.active.Render(target)
|
||||||
|
}
|
||||||
|
|
||||||
|
if sbtn.inactive.GetVisible() {
|
||||||
|
sbtn.inactive.Render(target)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package d2player
|
package d2player
|
||||||
|
|
||||||
import (
|
import (
|
||||||
// "github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
|
||||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
|
||||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2resource"
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2resource"
|
||||||
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2util"
|
"github.com/OpenDiablo2/OpenDiablo2/d2common/d2util"
|
||||||
|
@ -23,8 +23,69 @@ const (
|
||||||
|
|
||||||
const (
|
const (
|
||||||
partyPanelCloseButtonX, partyPanelCloseButtonY = 358, 453
|
partyPanelCloseButtonX, partyPanelCloseButtonY = 358, 453
|
||||||
|
partyPanelHeroNameX, partyPanelHeroNameY = 180, 80
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
seeingButtonFrame = iota * 4
|
||||||
|
relationshipsFrame
|
||||||
|
listeningButtonFrame
|
||||||
|
lockButtonFrame
|
||||||
|
|
||||||
|
nextButtonFrame = 2
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
maxPlayersInGame = 8
|
||||||
|
barX = 90
|
||||||
|
relationshipSwitcherX = 95
|
||||||
|
seeingSwitcherX = 345
|
||||||
|
listeningSwitcherX = 365
|
||||||
|
nameLabelX = 115
|
||||||
|
classLabelX = 115
|
||||||
|
baseBarY = 134
|
||||||
|
baseRelationshipSwitcherY = 150
|
||||||
|
baseSeeingSwitcherY = 145
|
||||||
|
baseListeningSwitcherY = 145
|
||||||
|
baseNameLabelY = 145
|
||||||
|
baseClassLabelY = 160
|
||||||
|
nextBar = 52
|
||||||
|
)
|
||||||
|
|
||||||
|
type partyIndex struct {
|
||||||
|
name *d2ui.Label
|
||||||
|
class *d2ui.Label
|
||||||
|
level *d2ui.Label
|
||||||
|
relationshipSwitcher *d2ui.SwitchableButton
|
||||||
|
seeingSwitcher *d2ui.SwitchableButton
|
||||||
|
listeningSwitcher *d2ui.SwitchableButton
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *PartyPanel) NewPartyIndex(name string, class d2enum.Hero, level int, idx int) *partyIndex {
|
||||||
|
result := &partyIndex{}
|
||||||
|
|
||||||
|
nameLabel := s.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteSky)
|
||||||
|
nameLabel.SetText(name)
|
||||||
|
nameLabel.SetPosition(nameLabelX, baseNameLabelY+nextBar*idx)
|
||||||
|
result.name = nameLabel
|
||||||
|
|
||||||
|
classLabel := s.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteSky)
|
||||||
|
classLabel.SetText(s.asset.TranslateString(class.String()))
|
||||||
|
classLabel.SetPosition(classLabelX, baseClassLabelY+nextBar*idx)
|
||||||
|
result.class = classLabel
|
||||||
|
|
||||||
|
relationships := s.createSwitcher(relationshipsFrame, relationshipSwitcherX, baseRelationshipSwitcherY+nextBar*idx)
|
||||||
|
result.relationshipSwitcher = relationships
|
||||||
|
|
||||||
|
seeing := s.createSwitcher(seeingButtonFrame, seeingSwitcherX, baseSeeingSwitcherY+nextBar*idx)
|
||||||
|
result.seeingSwitcher = seeing
|
||||||
|
|
||||||
|
listening := s.createSwitcher(listeningButtonFrame, listeningSwitcherX, baseListeningSwitcherY+nextBar*idx)
|
||||||
|
result.listeningSwitcher = listening
|
||||||
|
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
// NewPartyPanel creates a new party panel
|
// NewPartyPanel creates a new party panel
|
||||||
func NewPartyPanel(asset *d2asset.AssetManager,
|
func NewPartyPanel(asset *d2asset.AssetManager,
|
||||||
ui *d2ui.UIManager,
|
ui *d2ui.UIManager,
|
||||||
|
@ -34,14 +95,22 @@ func NewPartyPanel(asset *d2asset.AssetManager,
|
||||||
originX := 0
|
originX := 0
|
||||||
originY := 0
|
originY := 0
|
||||||
|
|
||||||
|
var v [maxPlayersInGame]*partyIndex
|
||||||
|
for i := 0; i < maxPlayersInGame; i++ {
|
||||||
|
v[i] = &partyIndex{}
|
||||||
|
}
|
||||||
|
|
||||||
hsp := &PartyPanel{
|
hsp := &PartyPanel{
|
||||||
asset: asset,
|
asset: asset,
|
||||||
uiManager: ui,
|
uiManager: ui,
|
||||||
originX: originX,
|
originX: originX,
|
||||||
originY: originY,
|
originY: originY,
|
||||||
heroState: heroState,
|
heroState: heroState,
|
||||||
heroName: heroName,
|
heroName: heroName,
|
||||||
labels: &StatsPanelLabels{},
|
labels: &StatsPanelLabels{},
|
||||||
|
partyIndexes: v,
|
||||||
|
barX: barX,
|
||||||
|
barY: baseBarY,
|
||||||
}
|
}
|
||||||
|
|
||||||
hsp.Logger = d2util.NewLogger()
|
hsp.Logger = d2util.NewLogger()
|
||||||
|
@ -53,18 +122,22 @@ func NewPartyPanel(asset *d2asset.AssetManager,
|
||||||
|
|
||||||
// PartyPanel represents the party panel
|
// PartyPanel represents the party panel
|
||||||
type PartyPanel struct {
|
type PartyPanel struct {
|
||||||
asset *d2asset.AssetManager
|
asset *d2asset.AssetManager
|
||||||
uiManager *d2ui.UIManager
|
uiManager *d2ui.UIManager
|
||||||
panel *d2ui.Sprite
|
panel *d2ui.Sprite
|
||||||
heroState *d2hero.HeroStatsState
|
bar *d2ui.Sprite
|
||||||
heroName string
|
heroState *d2hero.HeroStatsState
|
||||||
labels *StatsPanelLabels
|
heroName string
|
||||||
onCloseCb func()
|
labels *StatsPanelLabels
|
||||||
panelGroup *d2ui.WidgetGroup
|
onCloseCb func()
|
||||||
|
panelGroup *d2ui.WidgetGroup
|
||||||
|
partyIndexes [maxPlayersInGame]*partyIndex
|
||||||
|
|
||||||
originX int
|
originX int
|
||||||
originY int
|
originY int
|
||||||
isOpen bool
|
isOpen bool
|
||||||
|
barX int
|
||||||
|
barY int
|
||||||
|
|
||||||
*d2util.Logger
|
*d2util.Logger
|
||||||
}
|
}
|
||||||
|
@ -84,7 +157,7 @@ func (s *PartyPanel) Load() {
|
||||||
}
|
}
|
||||||
|
|
||||||
w, h := frame.GetSize()
|
w, h := frame.GetSize()
|
||||||
staticPanel := s.uiManager.NewCustomWidgetCached(s.renderStaticMenu, w, h)
|
staticPanel := s.uiManager.NewCustomWidgetCached(s.renderStaticPanelFrames, w, h)
|
||||||
s.panelGroup.AddWidget(staticPanel)
|
s.panelGroup.AddWidget(staticPanel)
|
||||||
|
|
||||||
closeButton := s.uiManager.NewButton(d2ui.ButtonTypeSquareClose, "")
|
closeButton := s.uiManager.NewButton(d2ui.ButtonTypeSquareClose, "")
|
||||||
|
@ -93,9 +166,59 @@ func (s *PartyPanel) Load() {
|
||||||
closeButton.OnActivated(func() { s.Close() })
|
closeButton.OnActivated(func() { s.Close() })
|
||||||
s.panelGroup.AddWidget(closeButton)
|
s.panelGroup.AddWidget(closeButton)
|
||||||
|
|
||||||
|
heroName := s.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteSky)
|
||||||
|
heroName.SetText(s.heroName)
|
||||||
|
heroName.SetPosition(partyPanelHeroNameX, partyPanelHeroNameY)
|
||||||
|
heroName.Alignment = d2ui.HorizontalAlignCenter
|
||||||
|
s.panelGroup.AddWidget(heroName)
|
||||||
|
|
||||||
|
s.bar, err = s.uiManager.NewSprite(d2resource.PartyBar, d2resource.PaletteSky)
|
||||||
|
if err != nil {
|
||||||
|
s.Error(err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
s.barX, s.barY = barX, baseBarY+1*nextBar
|
||||||
|
w, h = s.bar.GetCurrentFrameSize()
|
||||||
|
v := s.uiManager.NewCustomWidget(s.renderBar, w, h)
|
||||||
|
s.panelGroup.AddWidget(v)
|
||||||
|
|
||||||
|
// example data
|
||||||
|
s.partyIndexes[0] = s.NewPartyIndex("PartyMember", d2enum.HeroPaladin, 5, 0)
|
||||||
|
for _, i := range s.partyIndexes {
|
||||||
|
// needed for "developing time" to avoit panic
|
||||||
|
if i.name != nil {
|
||||||
|
s.panelGroup.AddWidget(i.name)
|
||||||
|
}
|
||||||
|
|
||||||
|
if i.class != nil {
|
||||||
|
s.panelGroup.AddWidget(i.class)
|
||||||
|
}
|
||||||
|
|
||||||
|
if i.relationshipSwitcher != nil {
|
||||||
|
s.panelGroup.AddWidget(i.relationshipSwitcher)
|
||||||
|
}
|
||||||
|
|
||||||
|
if i.seeingSwitcher != nil {
|
||||||
|
s.panelGroup.AddWidget(i.seeingSwitcher)
|
||||||
|
}
|
||||||
|
|
||||||
|
if i.listeningSwitcher != nil {
|
||||||
|
s.panelGroup.AddWidget(i.listeningSwitcher)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
s.panelGroup.SetVisible(false)
|
s.panelGroup.SetVisible(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *PartyPanel) createSwitcher(frame, x, y int) *d2ui.SwitchableButton {
|
||||||
|
active := s.uiManager.NewCustomButton(d2resource.PartyBoxes, frame)
|
||||||
|
inactive := s.uiManager.NewCustomButton(d2resource.PartyBoxes, frame+nextButtonFrame)
|
||||||
|
switcher := s.uiManager.NewSwitchableButton(active, inactive, true)
|
||||||
|
switcher.SetPosition(x, y)
|
||||||
|
|
||||||
|
return switcher
|
||||||
|
}
|
||||||
|
|
||||||
// IsOpen returns true if the hero status panel is open
|
// IsOpen returns true if the hero status panel is open
|
||||||
func (s *PartyPanel) IsOpen() bool {
|
func (s *PartyPanel) IsOpen() bool {
|
||||||
return s.isOpen
|
return s.isOpen
|
||||||
|
@ -132,10 +255,6 @@ func (s *PartyPanel) Advance(_ float64) {
|
||||||
// noop
|
// noop
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *PartyPanel) renderStaticMenu(target d2interface.Surface) {
|
|
||||||
s.renderStaticPanelFrames(target)
|
|
||||||
}
|
|
||||||
|
|
||||||
// nolint:dupl // see quest_log.go.renderStaticPanelFrames comment
|
// nolint:dupl // see quest_log.go.renderStaticPanelFrames comment
|
||||||
func (s *PartyPanel) renderStaticPanelFrames(target d2interface.Surface) {
|
func (s *PartyPanel) renderStaticPanelFrames(target d2interface.Surface) {
|
||||||
frames := []int{
|
frames := []int{
|
||||||
|
@ -171,3 +290,32 @@ func (s *PartyPanel) renderStaticPanelFrames(target d2interface.Surface) {
|
||||||
s.panel.Render(target)
|
s.panel.Render(target)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *PartyPanel) renderBar(target d2interface.Surface) {
|
||||||
|
frames := []int{
|
||||||
|
partyPanelTopLeft,
|
||||||
|
partyPanelTopRight,
|
||||||
|
}
|
||||||
|
|
||||||
|
currentX := s.originX + s.barX
|
||||||
|
currentY := s.originY + s.barY
|
||||||
|
|
||||||
|
for _, frameIndex := range frames {
|
||||||
|
if err := s.bar.SetCurrentFrame(frameIndex); err != nil {
|
||||||
|
s.Error(err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
w, h := s.bar.GetCurrentFrameSize()
|
||||||
|
|
||||||
|
switch frameIndex {
|
||||||
|
case statsPanelTopLeft:
|
||||||
|
s.bar.SetPosition(currentX, currentY)
|
||||||
|
currentX += w
|
||||||
|
case statsPanelTopRight:
|
||||||
|
s.bar.SetPosition(currentX, currentY)
|
||||||
|
currentY += h
|
||||||
|
}
|
||||||
|
|
||||||
|
s.bar.Render(target)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue