From d5efa887bbaf28497ddfdc7eec478255c8080b87 Mon Sep 17 00:00:00 2001 From: Vex Darkon <edanvirgo@gmail.com> Date: Sun, 26 Jan 2020 10:25:14 -0700 Subject: [PATCH] bug fixes, other tweaks and changes, etc --- src/main/java/theHexaghost/cards/FastForward.java | 5 ++--- src/main/java/theHexaghost/cards/Ghostwalk.java | 2 +- src/main/java/theHexaghost/cards/PowerFromBeyond.java | 4 +++- src/main/java/theHexaghost/cards/TimeWarp.java | 2 +- .../theHexaghost/ghostflames/BolsteringGhostflame.java | 6 +++--- .../java/theHexaghost/ghostflames/CrushingGhostflame.java | 8 ++++---- .../java/theHexaghost/ghostflames/InfernoGhostflame.java | 3 +-- .../java/theHexaghost/ghostflames/SearingGhostflame.java | 8 ++++---- .../java/theHexaghost/powers/ApocalypticArmorPower.java | 6 +++--- src/main/java/theHexaghost/powers/BurnPower.java | 2 +- .../powers/GainStrengthThatGoesAwayPower.java | 2 +- .../hexamodResources/localization/eng/Cardstrings.json | 8 ++++---- .../hexamodResources/localization/eng/Keywordstrings.json | 3 +-- 13 files changed, 29 insertions(+), 30 deletions(-) diff --git a/src/main/java/theHexaghost/cards/FastForward.java b/src/main/java/theHexaghost/cards/FastForward.java index 6226dc2e36..508fa1153f 100644 --- 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 index bc92c2fd32..c5b29103b3 100644 --- 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 index b382042de2..496ffa9bb6 100644 --- 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(); } } } \ No newline at end of file diff --git a/src/main/java/theHexaghost/cards/TimeWarp.java b/src/main/java/theHexaghost/cards/TimeWarp.java index 9c37db5675..afac506c20 100644 --- 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 index e421712984..aa3207d7ea 100644 --- 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 index 7c57a59035..154589cfcb 100644 --- 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 index 111dc45ab4..570a82c086 100644 --- 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 index cf8ec2008b..f8758eaf0d 100644 --- 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 index 34fbb33bc7..9f1b571d29 100644 --- 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."; } } \ No newline at end of file diff --git a/src/main/java/theHexaghost/powers/BurnPower.java b/src/main/java/theHexaghost/powers/BurnPower.java index 71bc828bfc..7e900927fc 100644 --- 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 index a7c1939c16..8de721b623 100644 --- 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 index dbd2aacaf1..4b8210e5ec 100644 --- 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 index 9620127ba1..574d8a09f2 100644 --- 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." },