bug fixes, other tweaks and changes, etc

DarkVexon · DarkVexon · commit d5efa887bbaf · 2020-01-26T10:25:14.000-07:00
diff --git a/src/main/java/theHexaghost/cards/FastForward.java b/src/main/java/theHexaghost/cards/FastForward.java
@@ -17,10 +17,9 @@ public FastForward() {
     }
 
     public void use(AbstractPlayer p, AbstractMonster m) {
-        atb(new AdvanceAction());
-        atb(new ChargeCurrentFlameAction());
         if (upgraded) atb(new AdvanceAction());
-
+        atb(new ChargeCurrentFlameAction());
+        atb(new AdvanceAction());
     }
 
     public void upgrade() {
diff --git a/src/main/java/theHexaghost/cards/Ghostwalk.java b/src/main/java/theHexaghost/cards/Ghostwalk.java
@@ -2,9 +2,9 @@
 
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
-import sneckomod.CardIgnore;
 import theHexaghost.actions.RetractAction;
 import theHexaghost.powers.EtherealRefundPower;
+import theHexaghost.util.CardIgnore;
 
 @CardIgnore
 public class Ghostwalk extends AbstractHexaCard {
diff --git a/src/main/java/theHexaghost/cards/PowerFromBeyond.java b/src/main/java/theHexaghost/cards/PowerFromBeyond.java
@@ -29,7 +29,7 @@ public boolean canUse(AbstractPlayer p, AbstractMonster m) {
 
     @Override
     public void triggerOnExhaust() {
-        applyToSelf(new EnergizedBluePower(AbstractDungeon.player, magicNumber));
+        applyToSelf(new EnergizedBluePower(AbstractDungeon.player, 1));
         applyToSelf(new DrawCardNextTurnPower(AbstractDungeon.player, magicNumber));
     }
 
@@ -40,6 +40,8 @@ public void upgrade() {
         if (!upgraded) {
             upgradeName();
             upgradeMagicNumber(UPG_MAGIC);
+            rawDescription = UPGRADE_DESCRIPTION;
+            initializeDescription();
         }
     }
 }
diff --git a/src/main/java/theHexaghost/cards/TimeWarp.java b/src/main/java/theHexaghost/cards/TimeWarp.java
@@ -17,7 +17,7 @@ public class TimeWarp extends AbstractHexaCard implements OnAdvanceOrRetractSubs
     private static final int UPG_DAMAGE = 2;
 
     public TimeWarp() {
-        super(ID, 2, CardType.ATTACK, CardRarity.UNCOMMON, CardTarget.ENEMY);
+        super(ID, 0, CardType.ATTACK, CardRarity.UNCOMMON, CardTarget.ENEMY);
         baseDamage = DAMAGE;
     }
 
diff --git a/src/main/java/theHexaghost/ghostflames/BolsteringGhostflame.java b/src/main/java/theHexaghost/ghostflames/BolsteringGhostflame.java
@@ -51,14 +51,14 @@ public String getDescription() {
             s = "Ignited. ";
         }
         if (GhostflameHelper.activeGhostFlame == this) {
-            s = s + "#yActive. Ignites after a #yPower is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
+            s = s + "#yActive. #yIgnites after a #yPower is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
         } else {
-            s = s + "Inactive. Ignites after a #yPower is played while #yActive.";
+            s = s + "Inactive. #yIgnites after a #yPower is played while #yActive.";
         }
         int x = block;
         if (AbstractDungeon.player.hasPower(EnhancePower.POWER_ID)) {
             x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;
         }
-        return s + " NL #y Ignition: When Ignited, gain #b" + x + " #yBlock and #b1 #yStrength.";
+        return s + " NL #yIgnition: When #yIgnited, gain #b" + x + " #yBlock and #b1 #yStrength.";
     }
 }
diff --git a/src/main/java/theHexaghost/ghostflames/CrushingGhostflame.java b/src/main/java/theHexaghost/ghostflames/CrushingGhostflame.java
@@ -68,17 +68,17 @@ public String getDescription() {
         if (GhostflameHelper.activeGhostFlame == this) {
             int x = (2 - skillsPlayedThisTurn);
             if (x == 1) {
-                s = s + "#yActive. Ignites after #b" + x + " #ySkill is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
+                s = s + "#yActive. #yIgnites after #b" + x + " #ySkill is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
             } else {
-                s = s + "#yActive. Ignites after #b" + x + " #ySkills are played this turn.";
+                s = s + "#yActive. #yIgnites after #b" + x + " #ySkills are played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
             }
         } else {
-            s = s + "Inactive. Play #b2 #ySkills while #yActive to Charge.";
+            s = s + "Inactive. #yIgnites after #b2 #ySkills are played while #yActive.";
         }
         int x = damage;
         if (AbstractDungeon.player.hasPower(EnhancePower.POWER_ID)) {
             x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;
         }
-        return s + " NL Ignition: When Ignited, deal #b" + x + " damage to a random enemy twice.";
+        return s + " NL #yIgnition: When #yIgnited, deal #b" + x + " damage to a random enemy twice.";
     }
 }
diff --git a/src/main/java/theHexaghost/ghostflames/InfernoGhostflame.java b/src/main/java/theHexaghost/ghostflames/InfernoGhostflame.java
@@ -30,7 +30,6 @@ public void onCharge() {
             x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;
         }
         for (int j = GhostflameHelper.hexaGhostFlames.size() - 1; j >= 0; j--) {
-            //i have no ghostflame. goodnight
             AbstractGhostflame gf = GhostflameHelper.hexaGhostFlames.get(j);
             if (gf.charged) {
                 att(new ExtinguishAction(gf));
@@ -87,6 +86,6 @@ public String getDescription() {
         if (AbstractDungeon.player.hasPower(EnhancePower.POWER_ID)) {
             x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;
         }
-        return s + " NL Ignition: When Ignited, deal #b" + x + " damage to a random enemy for each #yCharged #yGhostflame, then #yExtinguish them.";
+        return s + " NL #yIgnition: When #yIgnited, deal #b" + x + " damage to a random enemy for each #yIgnited #yGhostflame, then #yExtinguish them.";
     }
 }
diff --git a/src/main/java/theHexaghost/ghostflames/SearingGhostflame.java b/src/main/java/theHexaghost/ghostflames/SearingGhostflame.java
@@ -60,18 +60,18 @@ public String getDescription() {
         if (GhostflameHelper.activeGhostFlame == this) {
             int x = (2 - attacksPlayedThisTurn);
             if (x == 1) {
-                s = s + "#yActive. Ignites after #b" + x + " #yAttack is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
+                s = s + "#yActive. #yIgnites after #b" + x + " #yAttack is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
             } else {
-                s = s + "#yActive. Ignites after #b" + x + " #yAttacks are played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
+                s = s + "#yActive. #yIgnites after #b" + x + " #yAttacks are played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";
             }
         } else {
-            s = s + "Inactive. Ignites after #b2 #yAttacks are played while #yActive.";
+            s = s + "Inactive. #yIgnites after #b2 #yAttacks are played while #yActive.";
         }
         int x = magic;
         if (AbstractDungeon.player.hasPower(EnhancePower.POWER_ID)) {
             x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;
         }
-        return s + " NL Ignition: When Ignited, apply #b" + x + " #yBurn to a random enemy.";
+        return s + " NL #yIgnition: When #yIgnited, apply #b" + x + " #yBurn to a random enemy.";
 
     }
 }
diff --git a/src/main/java/theHexaghost/powers/ApocalypticArmorPower.java b/src/main/java/theHexaghost/powers/ApocalypticArmorPower.java
@@ -29,7 +29,7 @@ public class ApocalypticArmorPower extends AbstractPower implements OnChargeSubs
     private static final Texture tex32 = TextureLoader.getTexture(HexaMod.getModID() + "Resources/images/powers/ApocalypseArmor32.png");
 
     public ApocalypticArmorPower(final int amount) {
-        this.name = "Apocalypse Armor";
+        this.name = "Doomsday";
         this.ID = POWER_ID;
         this.owner = AbstractDungeon.player;
         this.amount = amount;
@@ -61,8 +61,8 @@ public void onCharge(AbstractGhostflame g) {
     @Override
     public void updateDescription() {
         if (amount >= GhostflameHelper.hexaGhostFlames.size())
-            description = "The next time you Charge the Inferno Ghostflame and all #b" + amount + " Ghostflames are Charged, take an additional turn.";
+            description = "The next time you Charge the Inferno Ghostflame and all #b" + amount + " Ghostflames are Charged, end your turn and take an additional turn.";
         else
-            description = "Whenver you Charge the Inferno Ghostflame and at least #b" + amount + " Ghostflames are Charged, take an additional turn.";
+            description = "Whenver you Charge the Inferno Ghostflame and at least #b" + amount + " Ghostflames are Charged, end your turn and take an additional turn.";
     }
 }
diff --git a/src/main/java/theHexaghost/powers/BurnPower.java b/src/main/java/theHexaghost/powers/BurnPower.java
@@ -59,7 +59,7 @@ public void atStartOfTurn() {
 
     @Override
     public void updateDescription() {
-        description = "At the start of its turn, loses #b" + amount + " HP, then Burn is halved (rounding up).";
+        description = "At the start of its turn, loses #b" + amount + " HP, then Burn is halved (rounding down).";
     }
 
     @Override
diff --git a/src/main/java/theHexaghost/powers/GainStrengthThatGoesAwayPower.java b/src/main/java/theHexaghost/powers/GainStrengthThatGoesAwayPower.java
@@ -33,7 +33,7 @@ public GainStrengthThatGoesAwayPower(final int amount) {
         this.updateDescription();
     }
 
-    public boolean activated = false;
+    public boolean activated = true;
 
     @Override
     public void updateDescription() {
diff --git a/src/main/resources/hexamodResources/localization/eng/Cardstrings.json b/src/main/resources/hexamodResources/localization/eng/Cardstrings.json
@@ -45,7 +45,7 @@
   },
   "hexamod:TimeWarp": {
     "NAME": "Time Warp",
-    "DESCRIPTION": "Deal !D! damage to a random enemy. NL If the first Ghostflame is not hexamod:Active, hexamod:Retract and repeat this."
+    "DESCRIPTION": "Deal !D! damage. NL Whenever you hexamod:Advance or hexamod:Retract, return this from the discard pile to your hand."
   },
   "hexamod:EmpoweredFlame": {
     "NAME": "Empowered Flame",
@@ -189,7 +189,7 @@
   },
   "hexamod:PowerFromBeyond": {
     "NAME": "Power from Beyond",
-    "DESCRIPTION": "Unplayable. NL Ethereal. NL If this card is Exhausted, gain [E] and draw !M! cards next turn.",
+    "DESCRIPTION": "Unplayable. NL Ethereal. NL If this card is Exhausted, gain [E] and draw !M! card next turn.",
     "UPGRADE_DESCRIPTION": "Unplayable. NL Ethereal. NL If this card is Exhausted, gain [E] and draw !M! cards next turn."
   },
   "hexamod:BurningTouch": {
@@ -309,8 +309,8 @@
   },
   "hexamod:ApocalypticArmor": {
     "NAME": "Doomsday",
-    "DESCRIPTION": "The next time you hexamod:Ignite the Inferno Ghostflame and all !M! Ghostflames are hexamod:Ignited, take an extra turn.",
-    "UPGRADE_DESCRIPTION": "The next time you hexamod:Ignite the Inferno Ghostflame and at least !M! Ghostflames are hexamod:Ignited, take an extra turn."
+    "DESCRIPTION": "The next time you hexamod:Ignite the Inferno Ghostflame and all !M! Ghostflames are hexamod:Ignited, end your turn and take an extra turn.",
+    "UPGRADE_DESCRIPTION": "The next time you hexamod:Ignite the Inferno Ghostflame and at least !M! Ghostflames are hexamod:Ignited, end your turn and take an extra turn."
   },
   "hexamod:FirstSeal": {
     "NAME": "First Seal",
diff --git a/src/main/resources/hexamodResources/localization/eng/Keywordstrings.json b/src/main/resources/hexamodResources/localization/eng/Keywordstrings.json
@@ -51,8 +51,7 @@
     "PROPER_NAME": "Ignite",
     "NAMES": [
       "ignite",
-      "ignited",
-      "unignited"
+      "ignited"
     ],
     "DESCRIPTION": "Triggers the Ignition effect described on a Ghostflame."
   },

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,9 @@ public FastForward() {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public void use(AbstractPlayer p, AbstractMonster m) {`
`20`		`- atb(new AdvanceAction());`
`21`		`- atb(new ChargeCurrentFlameAction());`
`22`	`20`	`if (upgraded) atb(new AdvanceAction());`
`23`		`-`
	`21`	`+ atb(new ChargeCurrentFlameAction());`
	`22`	`+ atb(new AdvanceAction());`
`24`	`23`	`}`
`25`	`24`
`26`	`25`	`public void upgrade() {`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public boolean canUse(AbstractPlayer p, AbstractMonster m) {`
`29`	`29`
`30`	`30`	`@Override`
`31`	`31`	`public void triggerOnExhaust() {`
`32`		`- applyToSelf(new EnergizedBluePower(AbstractDungeon.player, magicNumber));`
	`32`	`+ applyToSelf(new EnergizedBluePower(AbstractDungeon.player, 1));`
`33`	`33`	`applyToSelf(new DrawCardNextTurnPower(AbstractDungeon.player, magicNumber));`
`34`	`34`	`}`
`35`	`35`
`@@ -40,6 +40,8 @@ public void upgrade() {`
`40`	`40`	`if (!upgraded) {`
`41`	`41`	`upgradeName();`
`42`	`42`	`upgradeMagicNumber(UPG_MAGIC);`
	`43`	`+ rawDescription = UPGRADE_DESCRIPTION;`
	`44`	`+ initializeDescription();`
`43`	`45`	`}`
`44`	`46`	`}`
`45`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class TimeWarp extends AbstractHexaCard implements OnAdvanceOrRetractSubs`
`17`	`17`	`private static final int UPG_DAMAGE = 2;`
`18`	`18`
`19`	`19`	`public TimeWarp() {`
`20`		`- super(ID, 2, CardType.ATTACK, CardRarity.UNCOMMON, CardTarget.ENEMY);`
	`20`	`+ super(ID, 0, CardType.ATTACK, CardRarity.UNCOMMON, CardTarget.ENEMY);`
`21`	`21`	`baseDamage = DAMAGE;`
`22`	`22`	`}`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,14 @@ public String getDescription() {`
`51`	`51`	`s = "Ignited. ";`
`52`	`52`	`}`
`53`	`53`	`if (GhostflameHelper.activeGhostFlame == this) {`
`54`		`- s = s + "#yActive. Ignites after a #yPower is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
	`54`	`+ s = s + "#yActive. #yIgnites after a #yPower is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
`55`	`55`	`} else {`
`56`		`- s = s + "Inactive. Ignites after a #yPower is played while #yActive.";`
	`56`	`+ s = s + "Inactive. #yIgnites after a #yPower is played while #yActive.";`
`57`	`57`	`}`
`58`	`58`	`int x = block;`
`59`	`59`	`if (AbstractDungeon.player.hasPower(EnhancePower.POWER_ID)) {`
`60`	`60`	`x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;`
`61`	`61`	`}`
`62`		`- return s + " NL #y Ignition: When Ignited, gain #b" + x + " #yBlock and #b1 #yStrength.";`
	`62`	`+ return s + " NL #yIgnition: When #yIgnited, gain #b" + x + " #yBlock and #b1 #yStrength.";`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,17 +68,17 @@ public String getDescription() {`
`68`	`68`	`if (GhostflameHelper.activeGhostFlame == this) {`
`69`	`69`	`int x = (2 - skillsPlayedThisTurn);`
`70`	`70`	`if (x == 1) {`
`71`		`- s = s + "#yActive. Ignites after #b" + x + " #ySkill is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
	`71`	`+ s = s + "#yActive. #yIgnites after #b" + x + " #ySkill is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
`72`	`72`	`} else {`
`73`		`- s = s + "#yActive. Ignites after #b" + x + " #ySkills are played this turn.";`
	`73`	`+ s = s + "#yActive. #yIgnites after #b" + x + " #ySkills are played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
`74`	`74`	`}`
`75`	`75`	`} else {`
`76`		`- s = s + "Inactive. Play #b2 #ySkills while #yActive to Charge.";`
	`76`	`+ s = s + "Inactive. #yIgnites after #b2 #ySkills are played while #yActive.";`
`77`	`77`	`}`
`78`	`78`	`int x = damage;`
`79`	`79`	`if (AbstractDungeon.player.hasPower(EnhancePower.POWER_ID)) {`
`80`	`80`	`x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;`
`81`	`81`	`}`
`82`		`- return s + " NL Ignition: When Ignited, deal #b" + x + " damage to a random enemy twice.";`
	`82`	`+ return s + " NL #yIgnition: When #yIgnited, deal #b" + x + " damage to a random enemy twice.";`
`83`	`83`	`}`
`84`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ public void onCharge() {`
`30`	`30`	`x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;`
`31`	`31`	`}`
`32`	`32`	`for (int j = GhostflameHelper.hexaGhostFlames.size() - 1; j >= 0; j--) {`
`33`		`- //i have no ghostflame. goodnight`
`34`	`33`	`AbstractGhostflame gf = GhostflameHelper.hexaGhostFlames.get(j);`
`35`	`34`	`if (gf.charged) {`
`36`	`35`	`att(new ExtinguishAction(gf));`
`@@ -87,6 +86,6 @@ public String getDescription() {`
`87`	`86`	`if (AbstractDungeon.player.hasPower(EnhancePower.POWER_ID)) {`
`88`	`87`	`x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;`
`89`	`88`	`}`
`90`		`- return s + " NL Ignition: When Ignited, deal #b" + x + " damage to a random enemy for each #yCharged #yGhostflame, then #yExtinguish them.";`
	`89`	`+ return s + " NL #yIgnition: When #yIgnited, deal #b" + x + " damage to a random enemy for each #yIgnited #yGhostflame, then #yExtinguish them.";`
`91`	`90`	`}`
`92`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,18 +60,18 @@ public String getDescription() {`
`60`	`60`	`if (GhostflameHelper.activeGhostFlame == this) {`
`61`	`61`	`int x = (2 - attacksPlayedThisTurn);`
`62`	`62`	`if (x == 1) {`
`63`		`- s = s + "#yActive. Ignites after #b" + x + " #yAttack is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
	`63`	`+ s = s + "#yActive. #yIgnites after #b" + x + " #yAttack is played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
`64`	`64`	`} else {`
`65`		`- s = s + "#yActive. Ignites after #b" + x + " #yAttacks are played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
	`65`	`+ s = s + "#yActive. #yIgnites after #b" + x + " #yAttacks are played this turn. NL At the end of your turn, #yAdvance to the next Ghostflame.";`
`66`	`66`	`}`
`67`	`67`	`} else {`
`68`		`- s = s + "Inactive. Ignites after #b2 #yAttacks are played while #yActive.";`
	`68`	`+ s = s + "Inactive. #yIgnites after #b2 #yAttacks are played while #yActive.";`
`69`	`69`	`}`
`70`	`70`	`int x = magic;`
`71`	`71`	`if (AbstractDungeon.player.hasPower(EnhancePower.POWER_ID)) {`
`72`	`72`	`x += AbstractDungeon.player.getPower(EnhancePower.POWER_ID).amount;`
`73`	`73`	`}`
`74`		`- return s + " NL Ignition: When Ignited, apply #b" + x + " #yBurn to a random enemy.";`
	`74`	`+ return s + " NL #yIgnition: When #yIgnited, apply #b" + x + " #yBurn to a random enemy.";`
`75`	`75`
`76`	`76`	`}`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void atStartOfTurn() {`
`59`	`59`
`60`	`60`	`@Override`
`61`	`61`	`public void updateDescription() {`
`62`		`- description = "At the start of its turn, loses #b" + amount + " HP, then Burn is halved (rounding up).";`
	`62`	`+ description = "At the start of its turn, loses #b" + amount + " HP, then Burn is halved (rounding down).";`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`