v.1.6.1 - effectOnUse refactoring

JohnnyBazooka89 · Dec 27, 2018 · 41b47f8 · 41b47f8
1 parent 70328c8
commit 41b47f8
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 12 deletions.
diff --git a/src/main/java/blackbeard/orbs/CatONineTailsOrb.java b/src/main/java/blackbeard/orbs/CatONineTailsOrb.java
@@ -20,7 +20,6 @@ public CatONineTailsOrb(int attack, int durability, boolean justAddedUsingAttack
 
     @Override
     public void effectOnUse() {
-        super.effectOnUse();
         this.upgrade(ATTACK_UPGRADE_ON_USE, 0);
     }
 }
diff --git a/src/main/java/blackbeard/orbs/DaggerOrb.java b/src/main/java/blackbeard/orbs/DaggerOrb.java
@@ -21,7 +21,6 @@ public DaggerOrb(int attack, int durability, boolean justAddedUsingAttackCard) {
 
     @Override
     public void effectAtStartOfTurnPostDraw() {
-        super.effectAtStartOfTurnPostDraw();
         AbstractDungeon.actionManager.addToBottom(new DaggerAction(this));
     }
 

diff --git a/src/main/java/blackbeard/orbs/SmithingHammerOrb.java b/src/main/java/blackbeard/orbs/SmithingHammerOrb.java
@@ -22,13 +22,11 @@ public SmithingHammerOrb(int attack, int durability, boolean justAddedUsingAttac
 
     @Override
     public void effectOnUse() {
-        super.effectOnUse();
         AbstractDungeon.actionManager.addToBottom(new UpgradeRandomCardAction());
     }
 
     @Override
     public void effectAtStartOfTurnPostDraw() {
-        super.effectAtStartOfTurnPostDraw();
         AbstractDungeon.actionManager.addToBottom(new SmithingHammerAction(this));
     }
 

diff --git a/src/main/java/blackbeard/orbs/SwordOfChaosOrb.java b/src/main/java/blackbeard/orbs/SwordOfChaosOrb.java
@@ -21,7 +21,6 @@ public SwordOfChaosOrb(int attack, int durability, boolean justAddedUsingAttackC
 
     @Override
     public void effectOnUse() {
-        super.effectOnUse();
         AbstractDungeon.actionManager.addToBottom(new MakeTempCardInHandAction(AbstractDungeon.returnTrulyRandomCardInCombat().makeCopy(), false));
     }
 }
diff --git a/src/main/java/blackbeard/orbs/SwordOfFireOrb.java b/src/main/java/blackbeard/orbs/SwordOfFireOrb.java
@@ -24,7 +24,6 @@ public SwordOfFireOrb(int attack, int durability, boolean justAddedUsingAttackCa
 
     @Override
     public void effectOnUse() {
-        super.effectOnUse();
         AbstractDungeon.actionManager.addToBottom(new DamageAllEnemiesAction((AbstractCreature) null, DamageInfo.createDamageMatrix(3, true), DamageInfo.DamageType.THORNS, AbstractGameAction.AttackEffect.FIRE));
     }
 }
diff --git a/src/main/java/blackbeard/orbs/SwordOfWisdomOrb.java b/src/main/java/blackbeard/orbs/SwordOfWisdomOrb.java
@@ -21,7 +21,6 @@ public SwordOfWisdomOrb(int attack, int durability, boolean justAddedUsingAttack
 
     @Override
     public void effectOnUse() {
-        super.effectOnUse();
         AbstractDungeon.actionManager.addToBottom(new DrawCardAction(AbstractDungeon.player, 1));
     }
 }
diff --git a/src/main/java/blackbeard/orbs/WeaponOrb.java b/src/main/java/blackbeard/orbs/WeaponOrb.java
@@ -110,6 +110,11 @@ public boolean isJustAddedUsingAttackCard() {
 
     public void use(boolean triggerEffectOnUse) {
         durability--;
+        if (AbstractDungeon.player.hasPower(ArmorUpPower.POWER_ID)) {
+            ArmorUpPower armorUpPower = (ArmorUpPower) AbstractDungeon.player.getPower(ArmorUpPower.POWER_ID);
+            AbstractDungeon.actionManager.addToBottom(new GainBlockAction(AbstractDungeon.player, AbstractDungeon.player, armorUpPower.amount));
+            armorUpPower.flash();
+        }
         if (triggerEffectOnUse) {
             effectOnUse();
         }
@@ -132,11 +137,7 @@ public void clearJustAddedUsingAttackCard() {
     }
 
     public void effectOnUse() {
-        if (AbstractDungeon.player.hasPower(ArmorUpPower.POWER_ID)) {
-            ArmorUpPower armorUpPower = (ArmorUpPower) AbstractDungeon.player.getPower(ArmorUpPower.POWER_ID);
-            AbstractDungeon.actionManager.addToBottom(new GainBlockAction(AbstractDungeon.player, AbstractDungeon.player, armorUpPower.amount));
-            armorUpPower.flash();
-        }
+        //method can be overridden in subclasses
     }
 
     public void effectAtStartOfTurnPostDraw() {