Added New Heroes

-Golem Master -Succubus -Orc Band
ucestorage · Jan 18, 2018 · d554a96 · d554a96
1 parent c2b8193
commit d554a96
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...om/ubboeicke/application/Controller/Center/CenterSubController/Tabs/PopulateTab_Hero.java b/...om/ubboeicke/application/Controller/Center/CenterSubController/Tabs/PopulateTab_Hero.java
@@ -105,13 +105,16 @@ public void addHeroes() {
         mHeroes1.add(new Hero("Windy", goc.promotionCB(Promotions.Windy), goc.levelTextField(), goc.levelPrestigeTextField(), goc.attackModeCB(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
         mHeroes1.add(new Hero("Angel", goc.promotionCB(Promotions.Angel), goc.levelTextField(), goc.levelPrestigeTextField(), goc.attackModeCB(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
         mHeroes1.add(new Hero("Zeus", goc.promotionCB(Promotions.Zeus), goc.levelTextField(), goc.levelPrestigeTextField(), goc.attackModeCB(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
+        mHeroes1.add(new Hero("Golem Master", goc.promotionCB(Promotions.GolemMaster), goc.levelTextField(),goc.levelPrestigeTextField(),goc.attackModeCB(),goc.weaponCB(mWeaponList),goc.accessoryCB(mAccessoryList)));
+        mHeroes1.add(new Hero("Succubus", goc.promotionCB(Promotions.Succubus),goc.levelTextField(),goc.levelPrestigeTextField(),goc.attackModeCB(),goc.weaponCB(mWeaponList),goc.accessoryCB(mAccessoryList)));
         mHeroes2.add(new Hero("White Mage", goc.promotionCB(Promotions.WhiteMage), goc.levelTextField(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
         mHeroes2.add(new Hero("Necromancer", goc.promotionCB(Promotions.Necromancer), goc.levelTextField(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
         mHeroes2.add(new Hero("Military Band (F)", goc.promotionCB(Promotions.MBandF), goc.levelTextField(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
         mHeroes2.add(new Hero("Military Band (M)", goc.promotionCB(Promotions.MBandM), goc.levelTextField(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
         mHeroes2.add(new Hero("Priest", goc.promotionCB(Promotions.Priest), goc.levelTextField(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
         mHeroes2.add(new Hero("Smith", goc.promotionCB(Promotions.Smith), goc.levelTextField(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
         mHeroes2.add(new Hero("Architect", goc.promotionCB(Promotions.Architect), goc.levelTextField(), goc.weaponCB(mWeaponList), goc.accessoryCB(mAccessoryList)));
+        mHeroes2.add(new Hero("Orc Band", goc.promotionCB(Promotions.OrcBand),goc.levelTextField(),goc.weaponCB(mWeaponList),goc.accessoryCB(mAccessoryList)));
         mHeroTableView1.setItems(mHeroes1);
         mHeroTableView2.setItems(mHeroes2);
         mHeroTableView1.setOnKeyReleased(event -> {

diff --git a/src/com/ubboeicke/application/Model/Enums/Promotions.java b/src/com/ubboeicke/application/Model/Enums/Promotions.java
@@ -24,13 +24,16 @@ public class Promotions {
     public static final String[] Windy = {"Ice Windy","Fire Windy"};
     public static final String[] Angel = {"N/A"};
     public static final String[] Zeus = {"CD Zeus I", "CD Zeus II", "Slow Zeus I", "Slow Zeus II"};
+    public static final String[] GolemMaster = {"Golem Master I", "GM II Extra DMG", "GM II GEM", "GM II Double Attack"};
+    public static final String[] Succubus = {"Succubus Active", "Succubus Extra Target", "Succubus Monster DMG"};
     public static final String[] WhiteMage = {"White Wizard","Pure Wizard","White Sorcerer","Pure Sorcerer"};
     public static final String[] Necromancer = {"Evil Necromancer","Dark Necromancer","Nightmare","Dark Nightmare"};
     public static final String[] MBandF = {"Military Band (F) II"};
     public static final String[] MBandM = {"Military Band (M) II"};
     public static final String[] Priest = {"Cleric","Bishop"};
     public static final String[] Smith = {"Smith II", "STOS"};
     public static final String[] Architect = {"Careful Architect", "Skilled Architect","Great Architect"};
+    public static final String[] OrcBand = {"Orc Band I", "Orc Band II"};
     public static final String[] Tree = {"Crystal Tree", "Golden Tree"};
     public static final String[] Worm = {"Death Worm ", "Death Worm II"};
     public static final String[] FlameTower = {"Burning Tower", "Burning Tower II"};
@@ -135,6 +138,15 @@ public static String[] getPromotion(String s){
         if (s.equals("Smith")){
             strings = Smith;
         }
+        if (s.equals("Golem Master")){
+            strings = GolemMaster;
+        }
+        if (s.equals("Succubus")){
+            strings = Succubus;
+        }
+        if (s.equals("Orc Band")){
+            strings = OrcBand;
+        }
         if (s.equals("Architect")){
             strings = Architect;
         }