Merge pull request #695 from NotFoxtrot/add-sceptre-to-jewellery

Add Pharaoh's sceptre to the jewellery count
This commit is contained in:
Adam
2018-02-25 19:02:47 -05:00
committed by GitHub
2 changed files with 11 additions and 2 deletions

View File

@@ -108,7 +108,15 @@ public enum JewelleryCharges
TCRYSTAL4(TCRYSTAL, TELEPORT_CRYSTAL_4, 4), TCRYSTAL4(TCRYSTAL, TELEPORT_CRYSTAL_4, 4),
TCRYSTAL3(TCRYSTAL, TELEPORT_CRYSTAL_3, 3), TCRYSTAL3(TCRYSTAL, TELEPORT_CRYSTAL_3, 3),
TCRYSTAL2(TCRYSTAL, TELEPORT_CRYSTAL_2, 2), TCRYSTAL2(TCRYSTAL, TELEPORT_CRYSTAL_2, 2),
TCRYSTAL1(TCRYSTAL, TELEPORT_CRYSTAL_1, 1); TCRYSTAL1(TCRYSTAL, TELEPORT_CRYSTAL_1, 1),
PHARAO8(PHARAO, PHARAOHS_SCEPTRE_8, 8),
PHARAO7(PHARAO, PHARAOHS_SCEPTRE_7, 7),
PHARAO6(PHARAO, PHARAOHS_SCEPTRE_6, 6),
PHARAO5(PHARAO, PHARAOHS_SCEPTRE_5, 5),
PHARAO4(PHARAO, PHARAOHS_SCEPTRE_4, 4),
PHARAO3(PHARAO, PHARAOHS_SCEPTRE_3, 3),
PHARAO2(PHARAO, PHARAOHS_SCEPTRE_2, 2),
PHARAO1(PHARAO, PHARAOHS_SCEPTRE_1, 1);
private final JewelleryType type; private final JewelleryType type;
private final int id; private final int id;

View File

@@ -37,5 +37,6 @@ public enum JewelleryType
BURNING, BURNING,
PASSAGE, PASSAGE,
RETURNING, RETURNING,
TCRYSTAL TCRYSTAL,
PHARAO
} }