mirror of
https://github.com/OpenDiablo2/OpenDiablo2
synced 2024-06-17 21:05:22 +00:00
Merge pull request #947 from gucio321/square-button-types
Square button names
This commit is contained in:
Tim Sarbin
GitHub
commit
b2a9477816
|
|
@ -48,6 +48,8 @@ const (
|
|||
ButtonTypeRepairAll ButtonType = 28
|
||||
ButtonTypeLeftArrow ButtonType = 29
|
||||
ButtonTypeRightArrow ButtonType = 30
|
||||
ButtonTypeQuery ButtonType = 31
|
||||
ButtonTypeSquelchChat ButtonType = 32
|
||||
|
||||
ButtonNoFixedWidth int = -1
|
||||
ButtonNoFixedHeight int = -1
|
||||
|
|
@ -60,16 +62,16 @@ const (
|
|||
)
|
||||
|
||||
const (
|
||||
// buyButtonBaseFrame = 2 // base frame offset of the "buy" button dc6
|
||||
// sellButtonBaseFrame = 4 // base frame offset of the "sell" button dc6
|
||||
// repairButtonBaseFrame = 6 // base frame offset of the "repair" button dc6
|
||||
// quaryButtonBaseFrame = 8 // base frame offset of the "quary" button dc6
|
||||
closeButtonBaseFrame = 10 // base frame offset of the "close" button dc6
|
||||
// leftArrowButtonBaseFrame = 12 // base frame offset of the "leftArrow" button dc6
|
||||
// rightArrowButtonBaseFrame = 14 // base frame offset of the "rightArrow" button dc6
|
||||
okButtonBaseFrame = 16 // base frame offset of the "ok" button dc6
|
||||
// repairAllButtonBaseFrame = 18 // base frame offset of the "repair all" button dc6
|
||||
// ?AllButtonBaseFrame = 20 // base frame offset of the "?" button dc6
|
||||
buyButtonBaseFrame = 2 // base frame offset of the "buy" button dc6
|
||||
sellButtonBaseFrame = 4 // base frame offset of the "sell" button dc6
|
||||
repairButtonBaseFrame = 6 // base frame offset of the "repair" button dc6
|
||||
queryButtonBaseFrame = 8 // base frame offset of the "query" button dc6
|
||||
closeButtonBaseFrame = 10 // base frame offset of the "close" button dc6
|
||||
leftArrowButtonBaseFrame = 12 // base frame offset of the "leftArrow" button dc6
|
||||
rightArrowButtonBaseFrame = 14 // base frame offset of the "rightArrow" button dc6
|
||||
okButtonBaseFrame = 16 // base frame offset of the "ok" button dc6
|
||||
repairAllButtonBaseFrame = 18 // base frame offset of the "repair all" button dc6
|
||||
squelchChatButtonBaseFrame = 20 // base frame offset of the "?" button dc6
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -105,11 +107,19 @@ const (
|
|||
buttonTooltipNone int = iota
|
||||
buttonTooltipClose
|
||||
buttonTooltipOk
|
||||
buttonTooltipBuy
|
||||
buttonTooltipSell
|
||||
buttonTooltipRepair
|
||||
buttonTooltipRepairAll
|
||||
buttonTooltipLeftArrow
|
||||
buttonTooltipRightArrow
|
||||
buttonTooltipQuery
|
||||
buttonTooltipSquelchChat
|
||||
)
|
||||
|
||||
const (
|
||||
buttonCloseTooltipXOffset = 15
|
||||
buttonCloseTooltipYOffset = -2
|
||||
buttonBuySellTooltipXOffset = 15
|
||||
buttonBuySellTooltipYOffset = -2
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
@ -130,6 +140,10 @@ const (
|
|||
buttonTallSegmentsY = 1
|
||||
buttonTallTextOffset = 5
|
||||
|
||||
buttonCancelSegmentsX = 1
|
||||
buttonCancelSegmentsY = 1
|
||||
buttonCancelTextOffset = 1
|
||||
|
||||
buttonOkCancelSegmentsX = 1
|
||||
buttonOkCancelSegmentsY = 1
|
||||
buttonOkCancelDisabledFrame = -1
|
||||
|
|
@ -188,6 +202,21 @@ func getButtonLayouts() map[ButtonType]ButtonLayout {
|
|||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
},
|
||||
ButtonTypeCancel: {
|
||||
XSegments: buttonCancelSegmentsX,
|
||||
YSegments: buttonCancelSegmentsY,
|
||||
DisabledFrame: 0,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
TextOffset: buttonCancelTextOffset,
|
||||
ResourceName: d2resource.CancelButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
FontPath: d2resource.FontExocet10,
|
||||
AllowFrameChange: true,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
},
|
||||
ButtonTypeShort: {
|
||||
XSegments: buttonShortSegmentsX,
|
||||
YSegments: buttonShortSegmentsY,
|
||||
|
|
@ -290,8 +319,8 @@ func getButtonLayouts() map[ButtonType]ButtonLayout {
|
|||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipClose,
|
||||
TooltipXOffset: buttonCloseTooltipXOffset,
|
||||
TooltipYOffset: buttonCloseTooltipYOffset,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeSquareOk: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
|
|
@ -309,8 +338,160 @@ func getButtonLayouts() map[ButtonType]ButtonLayout {
|
|||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipOk,
|
||||
TooltipXOffset: buttonCloseTooltipXOffset,
|
||||
TooltipYOffset: buttonCloseTooltipYOffset,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeBuy: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
YSegments: buttonBuySellSegmentsY,
|
||||
DisabledFrame: buttonBuySellDisabledFrame,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
ResourceName: d2resource.BuySellButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
Toggleable: true,
|
||||
FontPath: d2resource.Font30,
|
||||
AllowFrameChange: true,
|
||||
BaseFrame: buyButtonBaseFrame,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipBuy,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeSell: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
YSegments: buttonBuySellSegmentsY,
|
||||
DisabledFrame: buttonBuySellDisabledFrame,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
ResourceName: d2resource.BuySellButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
Toggleable: true,
|
||||
FontPath: d2resource.Font30,
|
||||
AllowFrameChange: true,
|
||||
BaseFrame: sellButtonBaseFrame,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipSell,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeRepair: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
YSegments: buttonBuySellSegmentsY,
|
||||
DisabledFrame: buttonBuySellDisabledFrame,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
ResourceName: d2resource.BuySellButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
Toggleable: true,
|
||||
FontPath: d2resource.Font30,
|
||||
AllowFrameChange: true,
|
||||
BaseFrame: repairButtonBaseFrame,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipRepair,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeRepairAll: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
YSegments: buttonBuySellSegmentsY,
|
||||
DisabledFrame: buttonBuySellDisabledFrame,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
ResourceName: d2resource.BuySellButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
Toggleable: true,
|
||||
FontPath: d2resource.Font30,
|
||||
AllowFrameChange: true,
|
||||
BaseFrame: repairAllButtonBaseFrame,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipRepairAll,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeLeftArrow: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
YSegments: buttonBuySellSegmentsY,
|
||||
DisabledFrame: buttonBuySellDisabledFrame,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
ResourceName: d2resource.BuySellButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
Toggleable: true,
|
||||
FontPath: d2resource.Font30,
|
||||
AllowFrameChange: true,
|
||||
BaseFrame: leftArrowButtonBaseFrame,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipLeftArrow,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeRightArrow: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
YSegments: buttonBuySellSegmentsY,
|
||||
DisabledFrame: buttonBuySellDisabledFrame,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
ResourceName: d2resource.BuySellButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
Toggleable: true,
|
||||
FontPath: d2resource.Font30,
|
||||
AllowFrameChange: true,
|
||||
BaseFrame: rightArrowButtonBaseFrame,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipRightArrow,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeQuery: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
YSegments: buttonBuySellSegmentsY,
|
||||
DisabledFrame: buttonBuySellDisabledFrame,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
ResourceName: d2resource.BuySellButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
Toggleable: true,
|
||||
FontPath: d2resource.Font30,
|
||||
AllowFrameChange: true,
|
||||
BaseFrame: queryButtonBaseFrame,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipQuery,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeSquelchChat: {
|
||||
XSegments: buttonBuySellSegmentsX,
|
||||
YSegments: buttonBuySellSegmentsY,
|
||||
DisabledFrame: buttonBuySellDisabledFrame,
|
||||
DisabledColor: lightGreyAlpha75,
|
||||
ResourceName: d2resource.BuySellButton,
|
||||
PaletteName: d2resource.PaletteUnits,
|
||||
Toggleable: true,
|
||||
FontPath: d2resource.Font30,
|
||||
AllowFrameChange: true,
|
||||
BaseFrame: squelchChatButtonBaseFrame,
|
||||
HasImage: true,
|
||||
FixedWidth: ButtonNoFixedWidth,
|
||||
FixedHeight: ButtonNoFixedHeight,
|
||||
LabelColor: greyAlpha100,
|
||||
Tooltip: buttonTooltipSquelchChat,
|
||||
TooltipXOffset: buttonBuySellTooltipXOffset,
|
||||
TooltipYOffset: buttonBuySellTooltipYOffset,
|
||||
},
|
||||
ButtonTypeSkillTreeTab: {
|
||||
XSegments: buttonSkillTreeTabXSegments,
|
||||
|
|
@ -569,7 +750,8 @@ type buttonStateDescriptor struct {
|
|||
|
||||
func (v *Button) createTooltip() {
|
||||
var t *Tooltip
|
||||
|
||||
// this is also related with https://github.com/OpenDiablo2/OpenDiablo2/issues/944
|
||||
// all strings starting with "#" could be wrong translated to another locales
|
||||
switch v.buttonLayout.Tooltip {
|
||||
case buttonTooltipNone:
|
||||
return
|
||||
|
|
@ -579,6 +761,30 @@ func (v *Button) createTooltip() {
|
|||
case buttonTooltipOk:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("#971"))
|
||||
case buttonTooltipBuy:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("NPCPurchaseItems"))
|
||||
case buttonTooltipSell:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("NPCSellItems"))
|
||||
case buttonTooltipRepair:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("NPCRepairItems"))
|
||||
case buttonTooltipRepairAll:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("#128"))
|
||||
case buttonTooltipLeftArrow:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("KeyLeft"))
|
||||
case buttonTooltipRightArrow:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("KeyRight"))
|
||||
case buttonTooltipQuery:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("")) // need to be set up
|
||||
case buttonTooltipSquelchChat:
|
||||
t = v.manager.NewTooltip(d2resource.Font16, d2resource.PaletteSky, TooltipXCenter, TooltipYBottom)
|
||||
t.SetText(v.manager.asset.TranslateString("strParty19")) // need to be verivied
|
||||
}
|
||||
|
||||
t.SetVisible(false)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user