v.1.5.4 - Small code refactoring

JohnnyBazooka89 · Dec 20, 2018 · 51987ac · 51987ac
1 parent 9321418
commit 51987ac
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>StSMod</groupId>
     <artifactId>StSModTheBlackbeard</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.4</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
@@ -43,7 +43,7 @@ public class TheBlackbeardMod implements PostInitializeSubscriber,
     public static final String DEFAULT_WEAPON_ORB_ID = "blackbeard:WeaponOrb";
 
     //Mod metadata
-    private static final String MODNAME = "The Blackbeard";
+    private static final String MOD_NAME = "The Blackbeard";
     private static final String AUTHOR = "JohnnyBazooka89";
     private static final String DESCRIPTION = "Adds The Blackbeard as a new playable character.";
 
@@ -127,7 +127,7 @@ public void receivePostInitialize() {
         // Mod badge
         Texture badgeTexture = new Texture(BADGE_IMG);
         ModPanel settingsPanel = new ModPanel();
-        BaseMod.registerModBadge(badgeTexture, MODNAME, AUTHOR, DESCRIPTION, settingsPanel);
+        BaseMod.registerModBadge(badgeTexture, MOD_NAME, AUTHOR, DESCRIPTION, settingsPanel);
     }
 
     @Override
@@ -136,7 +136,7 @@ public void receiveEditCharacters() {
         logger.info("Add " + TheBlackbeardEnum.BLACKBEARD_CLASS.toString());
 
         BaseMod.addCharacter(
-                new TheBlackbeard("The Blackbeard", TheBlackbeardEnum.BLACKBEARD_CLASS),
+                new TheBlackbeard(MOD_NAME, TheBlackbeardEnum.BLACKBEARD_CLASS),
                 BLACKBEARD_BUTTON,
                 BLACKBEARD_PORTRAIT,
                 TheBlackbeardEnum.BLACKBEARD_CLASS

diff --git a/.../blackbeard/actions/UndeadFormAction.java → ...tions/DamageWhenIntangibleEndsAction.java b/.../blackbeard/actions/UndeadFormAction.java → ...tions/DamageWhenIntangibleEndsAction.java
@@ -10,12 +10,12 @@
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.powers.IntangiblePlayerPower;
 
-public class UndeadFormAction extends AbstractGameAction {
+public class DamageWhenIntangibleEndsAction extends AbstractGameAction {
 
     private AbstractPlayer p;
     private int damageAmount;
 
-    public UndeadFormAction(int damageAmount) {
+    public DamageWhenIntangibleEndsAction(int damageAmount) {
         this.actionType = ActionType.DAMAGE;
         this.p = AbstractDungeon.player;
         this.damageAmount = damageAmount;

diff --git a/src/main/java/blackbeard/powers/DamageWhenIntangibleEndsPower.java b/src/main/java/blackbeard/powers/DamageWhenIntangibleEndsPower.java
@@ -1,6 +1,6 @@
 package blackbeard.powers;
 
-import blackbeard.actions.UndeadFormAction;
+import blackbeard.actions.DamageWhenIntangibleEndsAction;
 import com.megacrit.cardcrawl.core.AbstractCreature;
 import com.megacrit.cardcrawl.core.CardCrawlGame;
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
@@ -32,6 +32,6 @@ public void updateDescription() {
 
     @Override
     public void atStartOfTurn() {
-        AbstractDungeon.actionManager.addToBottom(new UndeadFormAction(this.amount));
+        AbstractDungeon.actionManager.addToBottom(new DamageWhenIntangibleEndsAction(this.amount));
     }
 }
diff --git a/src/main/resources/ModTheSpire.json b/src/main/resources/ModTheSpire.json
@@ -5,7 +5,7 @@
     "JohnnyBazooka89"
   ],
   "description": "Adds The Blackbeard as a new playable character. More info: https://github.com/JohnnyBazooka89/StSModTheBlackbeard",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "dependencies": [
     "basemod"
   ],