From 376c574dd89457aebaea58f47a1624fbfae69249 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Sat, 23 Mar 2019 04:01:37 -0700 Subject: [PATCH] Added class only string to item label --- core/src/com/riiablo/CharacterClass.java | 13 +++++++++++++ core/src/com/riiablo/item/Item.java | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/core/src/com/riiablo/CharacterClass.java b/core/src/com/riiablo/CharacterClass.java index 73ade995..e5e257d0 100644 --- a/core/src/com/riiablo/CharacterClass.java +++ b/core/src/com/riiablo/CharacterClass.java @@ -146,4 +146,17 @@ public enum CharacterClass { default: throw new GdxRuntimeException("Invalid class id: " + classId); } } + + public static CharacterClass get(String charClass) { + if (charClass == null || charClass.length() < 3) throw new GdxRuntimeException("Invalid class id: " + charClass); + switch (charClass.charAt(0)) { + case 'a': return charClass.charAt(1) == 'm' ? CharacterClass.AMAZON : CharacterClass.ASSASSIN; + case 'b': return CharacterClass.BARBARIAN; + case 'd': return CharacterClass.DRUID; + case 'n': return CharacterClass.NECROMANCER; + case 'p': return CharacterClass.PALADIN; + case 's': return CharacterClass.SORCERESS; + default: throw new GdxRuntimeException("Invalid class id: " + charClass); + } + } } diff --git a/core/src/com/riiablo/item/Item.java b/core/src/com/riiablo/item/Item.java index eb321ff2..510b76db 100644 --- a/core/src/com/riiablo/item/Item.java +++ b/core/src/com/riiablo/item/Item.java @@ -14,6 +14,7 @@ import com.badlogic.gdx.utils.GdxRuntimeException; import com.badlogic.gdx.utils.IntMap; import com.badlogic.gdx.utils.IntSet; import com.badlogic.gdx.utils.ObjectMap; +import com.riiablo.CharacterClass; import com.riiablo.Riiablo; import com.riiablo.codec.DC6; import com.riiablo.codec.Index; @@ -890,6 +891,9 @@ public class Item extends Actor implements Disposable { } if (!Item.this.base.nodurability && (stat = stats.get(Stat.durability)) != null) add(new Label(Riiablo.string.lookup("ItemStats1d") + " " + stat.value + " " + Riiablo.string.lookup("ItemStats1j") + " " + stats.get(Stat.maxdurability).value, font, Riiablo.colors.white)).center().space(SPACING).row(); + if (Item.this.type.is("clas")) { + add(new Label(Riiablo.string.lookup(CharacterClass.get(Item.this.type.Class).entry().StrClassOnly), font, Riiablo.colors.white)).center().space(SPACING).row(); + } if ((stat = stats.get(Stat.dexterity)) != null && stat.value > 0) add(new Label(Riiablo.string.lookup("ItemStats1f") + " " + stat.value, font, Riiablo.colors.white)).center().space(SPACING).row(); if ((stat = stats.get(Stat.strength)) != null && stat.value > 0)