gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2024-12-25 19:46:50 -05:00
Code Issues Releases Wiki Activity

Updated some labels

Browse Source
This commit is contained in:
M. Sz 2020-11-26 13:51:39 +01:00
parent 640a9e043d
commit 2dab48a2ee
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
d2core/d2asset/asset_manager.go
View File

@ -364,6 +364,8 @@ func (am *AssetManager) baseLabelNumbers(idx int) int {
1926, // not used, for locales with +1 mod 1926, // not used, for locales with +1 mod
970, // EXIT
971,
} }
return baseLabelNumbers[idx] return baseLabelNumbers[idx]

2
d2game/d2gamescreen/character_select.go
View File

@ -308,7 +308,7 @@ func (v *CharacterSelect) createButtons(loading d2screen.LoadingState) {
v.deleteCharButton.OnActivated(func() { v.onDeleteCharButtonClicked() }) v.deleteCharButton.OnActivated(func() { v.onDeleteCharButtonClicked() })
v.deleteCharButton.SetPosition(deleteCharBtnX, deleteCharBtnY) v.deleteCharButton.SetPosition(deleteCharBtnX, deleteCharBtnY)
v.exitButton = v.uiManager.NewButton(d2ui.ButtonTypeMedium, "EXIT") v.exitButton = v.uiManager.NewButton(d2ui.ButtonTypeMedium, v.asset.TranslateLabel(exitLabel))
v.exitButton.SetPosition(exitBtnX, exitBtnY) v.exitButton.SetPosition(exitBtnX, exitBtnY)
v.exitButton.OnActivated(func() { v.onExitButtonClicked() }) v.exitButton.OnActivated(func() { v.onExitButtonClicked() })

44
d2game/d2gamescreen/main_menu.go
View File

@ -90,38 +90,35 @@ const (
copyrightLabel copyrightLabel
allRightsReservedLabel allRightsReservedLabel
singlePlayerLabel singlePlayerLabel
//nolint:deadcode,varcheck,unused // will be used, or is need _
battleNetLabel
otherMultiplayerLabel otherMultiplayerLabel
exitLabel exitGameLabel
creditsLabel creditsLabel
cinematicsLabel cinematicsLabel
// cinematics menu labels // cinematics menu labels
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
viewAllCinematicsLabel viewAllCinematicsLabel
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
epilogueLabel epilogueLabel
selectCinematicLabel selectCinematicLabel
// multiplayer menu labels // multiplayer menu labels
//nolint:deadcode,varcheck,unused // will be used, or is need _
openBattleNetLabeL
tcpIPGameLabel tcpIPGameLabel
tcpIPOptionsLabel tcpIPOptionsLabel
tcpIPHostGameLabel tcpIPHostGameLabel
tcpIPJoinGameLabel tcpIPJoinGameLabel
tcpIPEnterHostIPLabel tcpIPEnterHostIPLabel
tcpIPYourIPLabel tcpIPYourIPLabel
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
tipHostLabel tipHostLabel
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
tipJoinLabel tipJoinLabel
ipNotFoundLabel ipNotFoundLabel
// select hero class menu labels // select hero class menu labels
charNameLabel charNameLabel
//nolint:deadcode,varcheck,unused // will be used, or is need
hardCoreLabel hardCoreLabel
selectHeroClassLabel selectHeroClassLabel
amazonDescr amazonDescr
@ -130,28 +127,31 @@ const (
sorceressDescr sorceressDescr
paladinDescr paladinDescr
//nolint:deadcode,varcheck,unused // will be used, or is need _
notUsed1 // this position isn't used here.
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
hellLabel hellLabel
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
nightmareLabel nightmareLabel
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
normalLabel normalLabel
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
selectDifficultyLabel selectDifficultyLabel
//nolint:deadcode,varcheck,unused // will be used, or is need _
notUsed2
delCharConfLabel delCharConfLabel
//nolint:deadcode,varcheck,unused // will be used, or is need //nolint:deadcode,varcheck,unused // will be used
openLabel openLabel
//nolint:deadcode,varcheck,unused // will be used, or is need
notUsed3 _
yesLabel yesLabel
noLabel noLabel
_
exitLabel
) )
// CreateMainMenu creates an instance of MainMenu // CreateMainMenu creates an instance of MainMenu
@ -400,7 +400,7 @@ func (v *MainMenu) createLogos(loading d2screen.LoadingState) {
} }
func (v *MainMenu) createButtons(loading d2screen.LoadingState) { func (v *MainMenu) createButtons(loading d2screen.LoadingState) {
v.exitDiabloButton = v.uiManager.NewButton(d2ui.ButtonTypeWide, v.asset.TranslateLabel(exitLabel)) v.exitDiabloButton = v.uiManager.NewButton(d2ui.ButtonTypeWide, v.asset.TranslateLabel(exitGameLabel))
v.exitDiabloButton.SetPosition(exitDiabloBtnX, exitDiabloBtnY) v.exitDiabloButton.SetPosition(exitDiabloBtnX, exitDiabloBtnY)
v.exitDiabloButton.OnActivated(func() { v.onExitButtonClicked() }) v.exitDiabloButton.OnActivated(func() { v.onExitButtonClicked() })

5
d2game/d2gamescreen/select_hero_class.go
View File

@ -442,8 +442,7 @@ func (v *SelectHeroClass) createLabels() {
v.expansionCharLabel = v.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteUnits) v.expansionCharLabel = v.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteUnits)
v.expansionCharLabel.Alignment = d2ui.HorizontalAlignLeft v.expansionCharLabel.Alignment = d2ui.HorizontalAlignLeft
// to be honest, it should be TranslateString("#803"), but I suppose that's the same v.expansionCharLabel.SetText(d2ui.ColorTokenize(v.asset.TranslateString("#803"), d2ui.ColorTokenGold))
v.expansionCharLabel.SetText(d2ui.ColorTokenize(v.asset.TranslateString("expansionchar2x"), d2ui.ColorTokenGold))
v.expansionCharLabel.SetPosition(expansionLabelX, expansionLabelY) v.expansionCharLabel.SetPosition(expansionLabelX, expansionLabelY)
v.hardcoreCharLabel = v.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteUnits) v.hardcoreCharLabel = v.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteUnits)
@ -453,7 +452,7 @@ func (v *SelectHeroClass) createLabels() {
} }
func (v *SelectHeroClass) createButtons() { func (v *SelectHeroClass) createButtons() {
v.exitButton = v.uiManager.NewButton(d2ui.ButtonTypeMedium, "EXIT") v.exitButton = v.uiManager.NewButton(d2ui.ButtonTypeMedium, v.asset.TranslateLabel(exitLabel))
v.exitButton.SetPosition(selHeroExitBtnX, selHeroExitBtnY) v.exitButton.SetPosition(selHeroExitBtnX, selHeroExitBtnY)
v.exitButton.OnActivated(func() { v.onExitButtonClicked() }) v.exitButton.OnActivated(func() { v.onExitButtonClicked() })