Use correct color for energized effect of Channel

dbjorge · Oct 13, 2019 · c0d15b8 · c0d15b8
1 parent f931bba
commit c0d15b8
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 3 deletions.
diff --git a/src/main/java/stsjorbsmod/cards/Channel.java b/src/main/java/stsjorbsmod/cards/Channel.java
@@ -5,9 +5,9 @@
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
-import com.megacrit.cardcrawl.powers.EnergizedBluePower;
 import stsjorbsmod.JorbsMod;
 import stsjorbsmod.characters.Wanderer;
+import stsjorbsmod.powers.EnergizedCustomPower;
 
 import static stsjorbsmod.JorbsMod.makeCardPath;
 
@@ -34,7 +34,7 @@ public Channel() {
     @Override
     public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new GainBlockAction(p, p, block));
-        AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new EnergizedBluePower(p, magicNumber), magicNumber));
+        AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new EnergizedCustomPower(p, magicNumber), magicNumber));
     }
 
     @Override

diff --git a/src/main/java/stsjorbsmod/powers/EnergizedCustomPower.java b/src/main/java/stsjorbsmod/powers/EnergizedCustomPower.java
@@ -0,0 +1,56 @@
+package stsjorbsmod.powers;
+
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.megacrit.cardcrawl.actions.common.RemoveSpecificPowerAction;
+import com.megacrit.cardcrawl.core.AbstractCreature;
+import com.megacrit.cardcrawl.core.CardCrawlGame;
+import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
+import com.megacrit.cardcrawl.localization.PowerStrings;
+import com.megacrit.cardcrawl.powers.AbstractPower;
+import stsjorbsmod.JorbsMod;
+import stsjorbsmod.util.TextureLoader;
+
+import static stsjorbsmod.JorbsMod.makePowerPath;
+
+public class EnergizedCustomPower extends AbstractPower {
+    public static final String POWER_ID = JorbsMod.makeID(EnergizedCustomPower.class.getSimpleName());
+    private static final PowerStrings powerStrings = CardCrawlGame.languagePack.getPowerStrings(POWER_ID);
+    public static final String NAME = powerStrings.NAME;
+    public static final String[] DESCRIPTIONS = powerStrings.DESCRIPTIONS;
+
+    private static final Texture tex84 = TextureLoader.getTexture(makePowerPath("energized_custom_power84.png"));
+    private static final Texture tex32 = TextureLoader.getTexture(makePowerPath("energized_custom_power32.png"));
+
+    public EnergizedCustomPower(AbstractCreature owner, int energyAmt) {
+        this.name = NAME;
+        this.ID = POWER_ID;
+        this.owner = owner;
+        this.amount = energyAmt;
+        if (this.amount >= 999) {
+            this.amount = 999;
+        }
+
+        this.region128 = new TextureAtlas.AtlasRegion(tex84, 0, 0, 84, 84);
+        this.region48 = new TextureAtlas.AtlasRegion(tex32, 0, 0, 32, 32);
+
+        this.updateDescription();
+    }
+
+    public void stackPower(int stackAmount) {
+        super.stackPower(stackAmount);
+        if (this.amount >= 999) {
+            this.amount = 999;
+        }
+    }
+
+    public void updateDescription() {
+        this.description = DESCRIPTIONS[0] + this.amount + DESCRIPTIONS[1];
+    }
+
+    public void onEnergyRecharge() {
+        this.flash();
+        AbstractDungeon.player.gainEnergy(this.amount);
+        AbstractDungeon.actionManager.addToBottom(new RemoveSpecificPowerAction(this.owner, this.owner, this.ID));
+    }
+}
diff --git a/src/main/resources/stsjorbsmodResources/localization/eng/JorbsMod-Card-Strings.json b/src/main/resources/stsjorbsmodResources/localization/eng/JorbsMod-Card-Strings.json
@@ -92,6 +92,6 @@
   },
   "stsjorbsmod:Channel": {
     "NAME": "Channel",
-    "DESCRIPTION": "Gain !B! Block. Gain !M! [E] next turn."
+    "DESCRIPTION": "Gain !B! Block. NL Gain !M! [E] next turn."
   }
 }
diff --git a/src/main/resources/stsjorbsmodResources/localization/eng/JorbsMod-Power-Strings.json b/src/main/resources/stsjorbsmodResources/localization/eng/JorbsMod-Power-Strings.json
@@ -37,6 +37,13 @@
       " Damage to all enemies and lose all Coil."
     ]
   },
+  "stsjorbsmod:EnergizedCustomPower": {
+    "NAME": "Energized",
+    "DESCRIPTIONS": [
+      "Gain #b",
+      " additional [E] next turn."
+    ]
+  },
   "stsjorbsmod:SnappedPower": {
     "NAME": "Snapped",
     "DESCRIPTIONS": [