From ac6846b0ec17000ff06490e344951494ee0bc0c5 Mon Sep 17 00:00:00 2001 From: "M. Sz" Date: Tue, 24 Nov 2020 11:50:58 +0100 Subject: [PATCH] Fixed lints --- d2core/d2asset/asset_manager.go | 15 ++++++++------- d2game/d2gamescreen/character_select.go | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/d2core/d2asset/asset_manager.go b/d2core/d2asset/asset_manager.go index 9a1fa611..5a5acdec 100644 --- a/d2core/d2asset/asset_manager.go +++ b/d2core/d2asset/asset_manager.go @@ -291,21 +291,22 @@ func (am *AssetManager) TranslateString(key string) string { return key } +// TranslateHeroClass translates her class given to game locale func (am *AssetManager) TranslateHeroClass(h d2enum.Hero) string { switch h { - case 1: + case d2enum.HeroBarbarian: return am.TranslateString("Barbarian") - case 2: + case d2enum.HeroNecromancer: return am.TranslateString("Necromancer") - case 3: + case d2enum.HeroPaladin: return am.TranslateString("Paladin") - case 4: + case d2enum.HeroAssassin: return am.TranslateString("Assassin") - case 5: + case d2enum.HeroSorceress: return am.TranslateString("Sorceress") - case 6: + case d2enum.HeroAmazon: return am.TranslateString("Amazon") - case 7: + case d2enum.HeroDruid: return am.TranslateString("Druid") default: am.Error("Unknown Hero Class") diff --git a/d2game/d2gamescreen/character_select.go b/d2game/d2gamescreen/character_select.go index 49dff050..2e78579b 100644 --- a/d2game/d2gamescreen/character_select.go +++ b/d2game/d2gamescreen/character_select.go @@ -348,7 +348,8 @@ func (v *CharacterSelect) updateCharacterBoxes() { } heroName := v.gameStates[idx].HeroName - heroInfo := v.asset.TranslateString("level") + " " + strconv.FormatInt(int64(v.gameStates[idx].Stats.Level), 10) + " " + v.asset.TranslateHeroClass(v.gameStates[idx].HeroType) + heroInfo := v.asset.TranslateString("level") + " " + strconv.FormatInt(int64(v.gameStates[idx].Stats.Level), 10) + + " " + v.asset.TranslateHeroClass(v.gameStates[idx].HeroType) v.characterNameLabel[i].SetText(d2ui.ColorTokenize(heroName, d2ui.ColorTokenGold)) v.characterStatsLabel[i].SetText(d2ui.ColorTokenize(heroInfo, d2ui.ColorTokenWhite))