Updated some labels

d2core/d2asset/asset_manager.go

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

d2game/d2gamescreen/character_select.go

@@ -308,7 +308,7 @@ func (v *CharacterSelect) createButtons(loading d2screen.LoadingState) {
 	v.deleteCharButton.OnActivated(func() { v.onDeleteCharButtonClicked() })
 	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.OnActivated(func() { v.onExitButtonClicked() })
 

d2game/d2gamescreen/main_menu.go

@@ -90,38 +90,35 @@ const (
 	copyrightLabel
 	allRightsReservedLabel
 	singlePlayerLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	_
-	battleNetLabel
 	otherMultiplayerLabel
-	exitLabel
+	exitGameLabel
 	creditsLabel
 	cinematicsLabel
 
 	// cinematics menu labels
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	//nolint:deadcode,varcheck,unused // will be used
 	viewAllCinematicsLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	//nolint:deadcode,varcheck,unused // will be used
 	epilogueLabel
 	selectCinematicLabel
 
 	// multiplayer menu labels
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	_
-	openBattleNetLabeL
 	tcpIPGameLabel
 	tcpIPOptionsLabel
 	tcpIPHostGameLabel
 	tcpIPJoinGameLabel
 	tcpIPEnterHostIPLabel
 	tcpIPYourIPLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	//nolint:deadcode,varcheck,unused // will be used
 	tipHostLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	//nolint:deadcode,varcheck,unused // will be used
 	tipJoinLabel
 	ipNotFoundLabel
 
 	// select hero class menu labels
 	charNameLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
 	hardCoreLabel
 	selectHeroClassLabel
 	amazonDescr
@@ -130,28 +127,31 @@ const (
 	sorceressDescr
 	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
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	//nolint:deadcode,varcheck,unused // will be used
 	nightmareLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	//nolint:deadcode,varcheck,unused // will be used
 	normalLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	//nolint:deadcode,varcheck,unused // will be used
 	selectDifficultyLabel
 
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	_
-	notUsed2
 
 	delCharConfLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+	//nolint:deadcode,varcheck,unused // will be used
 	openLabel
-	//nolint:deadcode,varcheck,unused // will be used, or is need
+
-	notUsed3
+	_
+
 	yesLabel
 	noLabel
+
+	_
+
+	exitLabel
 )
 
 // CreateMainMenu creates an instance of MainMenu
@@ -400,7 +400,7 @@ func (v *MainMenu) createLogos(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.OnActivated(func() { v.onExitButtonClicked() })
 

d2game/d2gamescreen/select_hero_class.go

@@ -442,8 +442,7 @@ func (v *SelectHeroClass) createLabels() {
 
 	v.expansionCharLabel = v.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteUnits)
 	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.hardcoreCharLabel = v.uiManager.NewLabel(d2resource.Font16, d2resource.PaletteUnits)
@@ -453,7 +452,7 @@ func (v *SelectHeroClass) createLabels() {
 }
 
 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.OnActivated(func() { v.onExitButtonClicked() })