v.1.5.6 - Another code refactoring

JohnnyBazooka89 · Dec 21, 2018 · 1b574fd · 1b574fd
1 parent 169d420
commit 1b574fd
Show file tree

Hide file tree

Showing 88 changed files with 98 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>StSMod</groupId>
     <artifactId>StSModTheBlackbeard</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6</version>
     <packaging>jar</packaging>
     <name>StSModTheBlackbeard</name>
     <description>Adds a new character to Slay the Spire, The Blackbeard.</description>

diff --git a/src/main/java/blackbeard/TheBlackbeardMod.java b/src/main/java/blackbeard/TheBlackbeardMod.java
@@ -298,9 +298,7 @@ public void receiveEditKeywords() {
 
         keywords = gson.fromJson(keywordStrings, typeToken);
 
-        keywords.forEach((k, v) -> {
-            BaseMod.addKeyword(v.NAMES, v.DESCRIPTION);
-        });
+        keywords.forEach((k, v) -> BaseMod.addKeyword(v.NAMES, v.DESCRIPTION));
 
         logger.info("Done editing keywords");
     }

diff --git a/src/main/java/blackbeard/cards/AgileStrike.java b/src/main/java/blackbeard/cards/AgileStrike.java
@@ -38,6 +38,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new DamageAction(m, new DamageInfo(p, this.damage, this.damageTypeForTurn), AbstractGameAction.AttackEffect.SLASH_DIAGONAL));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Anchor.java b/src/main/java/blackbeard/cards/Anchor.java
@@ -39,6 +39,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         }
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/ArmorUp.java b/src/main/java/blackbeard/cards/ArmorUp.java
@@ -33,6 +33,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new ArmorUpPower(p, this.magicNumber), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Bandana.java b/src/main/java/blackbeard/cards/Bandana.java
@@ -32,6 +32,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new DexterityPower(p, this.magicNumber), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/BeatUp.java b/src/main/java/blackbeard/cards/BeatUp.java
@@ -40,6 +40,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(m, p, new VulnerablePower(m, this.magicNumber, false), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/BlindAttacks.java b/src/main/java/blackbeard/cards/BlindAttacks.java
@@ -33,6 +33,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new SwordBoomerangAction(AbstractDungeon.getMonsters().getRandomMonster(true), new DamageInfo(p, this.baseDamage), NUMBER_OF_ATTACKS));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Boarding.java b/src/main/java/blackbeard/cards/Boarding.java
@@ -37,6 +37,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new DrawCardAction(AbstractDungeon.player, this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/BoostMorale.java b/src/main/java/blackbeard/cards/BoostMorale.java
@@ -38,6 +38,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new GainEnergyAction(ENERGY_TO_GET + (this.upgraded ? UPGRADED_PLUS_ENERGY_TO_GET : 0)));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/BountyHunter.java b/src/main/java/blackbeard/cards/BountyHunter.java
@@ -39,6 +39,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new GreedAction(m, new DamageInfo(p, this.damage, this.damageTypeForTurn), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/BrownPants.java b/src/main/java/blackbeard/cards/BrownPants.java
@@ -33,6 +33,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
 
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/BuriedTreasure.java b/src/main/java/blackbeard/cards/BuriedTreasure.java
@@ -35,6 +35,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.player.gainGold(this.magicNumber);
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/CannonBarrage.java b/src/main/java/blackbeard/cards/CannonBarrage.java
@@ -33,6 +33,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new CannonBarrageAction(p, this.upgraded, this.freeToPlayOnce, this.energyOnUse));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Cannonball.java b/src/main/java/blackbeard/cards/Cannonball.java
@@ -38,6 +38,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
                 AbstractGameAction.AttackEffect.BLUNT_LIGHT));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/CannonballSupply.java b/src/main/java/blackbeard/cards/CannonballSupply.java
@@ -31,6 +31,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new MakeTempCardInHandAction(new Cannonball(), CANNONBALLS_TO_ADD));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/CaptainsCabin.java b/src/main/java/blackbeard/cards/CaptainsCabin.java
@@ -38,6 +38,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new MakeTempCardInHandAction(new Cannonball(), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/CaptainsHat.java b/src/main/java/blackbeard/cards/CaptainsHat.java
@@ -34,6 +34,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new ResistancePower(p, this.magicNumber), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/CatONineTails.java b/src/main/java/blackbeard/cards/CatONineTails.java
@@ -35,6 +35,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new EquipAction(new CatONineTailsOrb(WEAPON_ATTACK, this.magicNumber, false)));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/ChaoticDefend.java b/src/main/java/blackbeard/cards/ChaoticDefend.java
@@ -40,6 +40,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         }
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/CloakAndCannonball.java b/src/main/java/blackbeard/cards/CloakAndCannonball.java
@@ -36,6 +36,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new MakeTempCardInHandAction(new Cannonball(), 1));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Cutlass.java b/src/main/java/blackbeard/cards/Cutlass.java
@@ -34,6 +34,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new EquipAction(new CutlassOrb(WEAPON_ATTACK, WEAPON_DURABILITY, false)));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Dagger.java b/src/main/java/blackbeard/cards/Dagger.java
@@ -35,6 +35,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new EquipAction(new DaggerOrb(WEAPON_ATTACK, this.magicNumber, false)));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/DangerousBlow.java b/src/main/java/blackbeard/cards/DangerousBlow.java
@@ -38,6 +38,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new DamageAtTheEndOfNextTurnPower(p, this.magicNumber), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/DefendBlackbeard.java b/src/main/java/blackbeard/cards/DefendBlackbeard.java
@@ -35,6 +35,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new GainBlockAction(p, p, this.block));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/DelayedPain.java b/src/main/java/blackbeard/cards/DelayedPain.java
@@ -36,6 +36,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new DamageAtTheEndOfNextTurnPower(p, this.magicNumber), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/DoubleBottom.java b/src/main/java/blackbeard/cards/DoubleBottom.java
@@ -35,6 +35,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new NextTurnBlockPower(p, this.block), this.block));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/DoubleCannonball.java b/src/main/java/blackbeard/cards/DoubleCannonball.java
@@ -46,6 +46,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new MakeTempCardInHandAction(cannonball, 1));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Eyepatch.java b/src/main/java/blackbeard/cards/Eyepatch.java
@@ -33,6 +33,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new DrawPower(p, ADDITIONAL_CARDS_TO_DRAW_EACH_TURN), ADDITIONAL_CARDS_TO_DRAW_EACH_TURN));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Fencing.java b/src/main/java/blackbeard/cards/Fencing.java
@@ -28,11 +28,13 @@ public Fencing() {
         this.baseMagicNumber = this.magicNumber = UPGRADE_VALUE;
     }
 
+
     @Override
     public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new UpgradeWeaponsAction(this.magicNumber + 1, this.magicNumber, WeaponsToUseEnum.ONLY_RIGHTMOST_WEAPON));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/FinalBarrage.java b/src/main/java/blackbeard/cards/FinalBarrage.java
@@ -70,6 +70,7 @@ private void setBaseDamageAndUpdateDescription() {
         this.initializeDescription();
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/FishingNets.java b/src/main/java/blackbeard/cards/FishingNets.java
@@ -33,6 +33,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
 
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/GhostInTheRum.java b/src/main/java/blackbeard/cards/GhostInTheRum.java
@@ -35,6 +35,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new ResistancePower(p, -this.magicNumber), -this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/GoldenCannonball.java b/src/main/java/blackbeard/cards/GoldenCannonball.java
@@ -43,12 +43,14 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new DamageAction(m, new DamageInfo(p, this.damage, DamageInfo.DamageType.NORMAL), AbstractGameAction.AttackEffect.BLUNT_LIGHT));
     }
 
+    @Override
     public void setGoldenValuesAndInitializeDescription() {
         this.baseDamage = this.damage = this.magicNumber + GoldenCardsUtil.getBlackbeardGoldGained() / 50;
         this.rawDescription = GoldenCardsUtil.getGoldenCardDescription(upgraded, DESCRIPTION, UPGRADE_DESCRIPTION, EXTENDED_DESCRIPTION);
         this.initializeDescription();
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/GoldenDefend.java b/src/main/java/blackbeard/cards/GoldenDefend.java
@@ -37,12 +37,14 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new GainBlockAction(p, p, this.block));
     }
 
+    @Override
     public void setGoldenValuesAndInitializeDescription() {
         this.baseBlock = this.block = this.magicNumber + (3 * GoldenCardsUtil.getBlackbeardGoldGained() / 200);
         this.rawDescription = GoldenCardsUtil.getGoldenCardDescription(this.upgraded, DESCRIPTION, UPGRADE_DESCRIPTION, EXTENDED_DESCRIPTION);
         this.initializeDescription();
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/GoldenGuillotine.java b/src/main/java/blackbeard/cards/GoldenGuillotine.java
@@ -39,12 +39,14 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new DamageAction(m, new DamageInfo(p, this.damage, DamageInfo.DamageType.NORMAL), AbstractGameAction.AttackEffect.SLASH_DIAGONAL));
     }
 
+    @Override
     public void setGoldenValuesAndInitializeDescription() {
         this.baseDamage = this.damage = this.magicNumber * GoldenCardsUtil.getBlackbeardGoldGained() / 100;
         this.rawDescription = GoldenCardsUtil.getGoldenCardDescription(this.upgraded, DESCRIPTION, DESCRIPTION, EXTENDED_DESCRIPTION);
         this.initializeDescription();
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/GoldenRain.java b/src/main/java/blackbeard/cards/GoldenRain.java
@@ -39,12 +39,14 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new DamageAllEnemiesAction(p, this.multiDamage, this.damageTypeForTurn, AbstractGameAction.AttackEffect.BLUNT_HEAVY));
     }
 
+    @Override
     public void setGoldenValuesAndInitializeDescription() {
         this.baseDamage = this.damage = this.magicNumber * GoldenCardsUtil.getBlackbeardGoldGained() / 1000;
         this.rawDescription = GoldenCardsUtil.getGoldenCardDescription(this.upgraded, DESCRIPTION, UPGRADE_DESCRIPTION, EXTENDED_DESCRIPTION);
         this.initializeDescription();
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/GoldenStrike.java b/src/main/java/blackbeard/cards/GoldenStrike.java
@@ -41,12 +41,14 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new DamageAction(m, new DamageInfo(p, this.damage, DamageInfo.DamageType.NORMAL), AbstractGameAction.AttackEffect.SLASH_DIAGONAL));
     }
 
+    @Override
     public void setGoldenValuesAndInitializeDescription() {
         this.baseDamage = this.damage = this.magicNumber + (3 * GoldenCardsUtil.getBlackbeardGoldGained() / 200);
         this.rawDescription = GoldenCardsUtil.getGoldenCardDescription(upgraded, DESCRIPTION, UPGRADE_DESCRIPTION, EXTENDED_DESCRIPTION);
         this.initializeDescription();
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Halberd.java b/src/main/java/blackbeard/cards/Halberd.java
@@ -35,6 +35,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new EquipAction(new HalberdOrb(this.magicNumber, WEAPON_DURABILITY, false)));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/HumongousCannonball.java b/src/main/java/blackbeard/cards/HumongousCannonball.java
@@ -39,6 +39,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
                 AbstractGameAction.AttackEffect.BLUNT_HEAVY));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/InfiniteBarrage.java b/src/main/java/blackbeard/cards/InfiniteBarrage.java
@@ -29,6 +29,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new InfiniteBarragePower(p, 1), 1));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/IntimidatingStrike.java b/src/main/java/blackbeard/cards/IntimidatingStrike.java
@@ -41,6 +41,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(m, p, new WeakPower(m, this.magicNumber, false), this.magicNumber));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/Intoxication.java b/src/main/java/blackbeard/cards/Intoxication.java
@@ -35,6 +35,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new IntoxicationPower(p, RESISTANCE_TO_LOSE_EACH_TURN), RESISTANCE_TO_LOSE_EACH_TURN));
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();

diff --git a/src/main/java/blackbeard/cards/JollyRoger.java b/src/main/java/blackbeard/cards/JollyRoger.java
@@ -41,6 +41,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
         }
     }
 
+    @Override
     public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();