From ae568939b158f4f35e4c1de0c4c0e3878cd8d8e3 Mon Sep 17 00:00:00 2001 From: Evelyn Veilwinter Date: Sat, 8 Jun 2024 13:37:53 -0300 Subject: [PATCH] Refactor: Nothing is easy (for someone learning the template for the first time) (i.e. avoid accidentally making people feel bad if they don't understand something) --- src/main/java/code/ModFile.java | 23 ++++++++---------- ...oiceAction.java => ModalChoiceAction.java} | 8 +++---- ...{EasyXCostAction.java => XCostAction.java} | 4 ++-- .../{AbstractEasyCard.java => BaseCard.java} | 10 ++++---- src/main/java/code/cards/Defend.java | 2 +- src/main/java/code/cards/FILE TEMPLATE | 2 +- ...alChoiceCard.java => ModalChoiceCard.java} | 6 ++--- src/main/java/code/cards/Strike.java | 2 +- ...Variable.java => BaseDynamicVariable.java} | 2 +- .../java/code/cards/cardvars/SecondBlock.java | 24 +++++++++---------- .../code/cards/cardvars/SecondDamage.java | 24 +++++++++---------- .../cards/cardvars/SecondMagicNumber.java | 24 +++++++++---------- .../code/cards/cardvars/ThirdMagicNumber.java | 24 +++++++++---------- .../democards/complex/InlinePowerDemo.java | 4 ++-- ...alChoiceDemo.java => ModalChoiceDemo.java} | 18 +++++++------- .../MultiCardPreviewAndDrawCallback.java | 4 ++-- .../complex/SelectCardsPlusCardMods.java | 4 ++-- .../{EasyXCostDemo.java => XCostDemo.java} | 12 +++++----- .../cards/democards/simple/DrawAndShiv.java | 4 ++-- .../democards/simple/StartupBlockCard.java | 4 ++-- .../democards/simple/TwoTypesOfDamage.java | 4 ++-- ...bstractEasyPotion.java => BasePotion.java} | 6 ++--- src/main/java/code/potions/DemoPotion.java | 2 +- ...{AbstractEasyPower.java => BasePower.java} | 4 ++-- src/main/java/code/powers/LambdaPower.java | 2 +- ...{AbstractEasyRelic.java => BaseRelic.java} | 6 ++--- src/main/java/code/relics/TodoItem.java | 2 +- src/main/java/code/util/CardArtRoller.java | 4 ++-- 28 files changed, 116 insertions(+), 119 deletions(-) rename src/main/java/code/actions/{EasyModalChoiceAction.java => ModalChoiceAction.java} (58%) rename src/main/java/code/actions/{EasyXCostAction.java => XCostAction.java} (91%) rename src/main/java/code/cards/{AbstractEasyCard.java => BaseCard.java} (95%) rename src/main/java/code/cards/{EasyModalChoiceCard.java => ModalChoiceCard.java} (83%) rename src/main/java/code/cards/cardvars/{AbstractEasyDynamicVariable.java => BaseDynamicVariable.java} (50%) rename src/main/java/code/cards/democards/complex/{EasyModalChoiceDemo.java => ModalChoiceDemo.java} (52%) rename src/main/java/code/cards/democards/complex/{EasyXCostDemo.java => XCostDemo.java} (77%) rename src/main/java/code/potions/{AbstractEasyPotion.java => BasePotion.java} (79%) rename src/main/java/code/powers/{AbstractEasyPower.java => BasePower.java} (92%) rename src/main/java/code/relics/{AbstractEasyRelic.java => BaseRelic.java} (69%) diff --git a/src/main/java/code/ModFile.java b/src/main/java/code/ModFile.java index 1b318d6e..cd6d7a0f 100644 --- a/src/main/java/code/ModFile.java +++ b/src/main/java/code/ModFile.java @@ -5,6 +5,7 @@ import basemod.abstracts.DynamicVariable; import basemod.helpers.RelicType; import basemod.interfaces.*; +import code.cards.BaseCard; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.MathUtils; @@ -20,14 +21,10 @@ import com.megacrit.cardcrawl.localization.RelicStrings; import com.megacrit.cardcrawl.localization.StanceStrings; import com.megacrit.cardcrawl.localization.UIStrings; -import com.megacrit.cardcrawl.potions.AbstractPotion; import com.megacrit.cardcrawl.unlock.UnlockTracker; -import code.cards.AbstractEasyCard; -import code.cards.cardvars.AbstractEasyDynamicVariable; -import code.cards.cardvars.SecondDamage; -import code.cards.cardvars.SecondMagicNumber; -import code.potions.AbstractEasyPotion; -import code.relics.AbstractEasyRelic; +import code.cards.cardvars.BaseDynamicVariable; +import code.potions.BasePotion; +import code.relics.BaseRelic; import code.util.ProAudio; import java.nio.charset.StandardCharsets; @@ -122,8 +119,8 @@ public void receiveEditCharacters() { CHARSELECT_BUTTON, CHARSELECT_PORTRAIT, CharacterFile.Enums.THE_TODO); new AutoAdd(modID) - .packageFilter(AbstractEasyPotion.class) - .any(AbstractEasyPotion.class, (info, potion) -> { + .packageFilter(BasePotion.class) + .any(BasePotion.class, (info, potion) -> { if (potion.pool == null) BaseMod.addPotion(potion.getClass(), potion.liquidColor, potion.hybridColor, potion.spotsColor, potion.ID); else @@ -134,8 +131,8 @@ public void receiveEditCharacters() { @Override public void receiveEditRelics() { new AutoAdd(modID) - .packageFilter(AbstractEasyRelic.class) - .any(AbstractEasyRelic.class, (info, relic) -> { + .packageFilter(BaseRelic.class) + .any(BaseRelic.class, (info, relic) -> { if (relic.color == null) { BaseMod.addRelic(relic, RelicType.SHARED); } else { @@ -150,11 +147,11 @@ public void receiveEditRelics() { @Override public void receiveEditCards() { new AutoAdd(modID) - .packageFilter(AbstractEasyDynamicVariable.class) + .packageFilter(BaseDynamicVariable.class) .any(DynamicVariable.class, (info, var) -> BaseMod.addDynamicVariable(var)); new AutoAdd(modID) - .packageFilter(AbstractEasyCard.class) + .packageFilter(BaseCard.class) .setDefaultSeen(true) .cards(); } diff --git a/src/main/java/code/actions/EasyModalChoiceAction.java b/src/main/java/code/actions/ModalChoiceAction.java similarity index 58% rename from src/main/java/code/actions/EasyModalChoiceAction.java rename to src/main/java/code/actions/ModalChoiceAction.java index e197c07b..806e8512 100644 --- a/src/main/java/code/actions/EasyModalChoiceAction.java +++ b/src/main/java/code/actions/ModalChoiceAction.java @@ -5,9 +5,9 @@ import java.util.ArrayList; -public class EasyModalChoiceAction extends SelectCardsCenteredAction { +public class ModalChoiceAction extends SelectCardsCenteredAction { - public EasyModalChoiceAction(ArrayList list, int amount, String textforSelect) { + public ModalChoiceAction(ArrayList list, int amount, String textforSelect) { super(list, amount, textforSelect, (cards) -> { for (AbstractCard q : cards) { q.onChoseThisOption(); @@ -15,11 +15,11 @@ public EasyModalChoiceAction(ArrayList list, int amount, String te }); } - public EasyModalChoiceAction(ArrayList list, int amount) { + public ModalChoiceAction(ArrayList list, int amount) { this(list, amount, "Choose."); } - public EasyModalChoiceAction(ArrayList list) { + public ModalChoiceAction(ArrayList list) { this(list, 1, "Choose."); } } diff --git a/src/main/java/code/actions/EasyXCostAction.java b/src/main/java/code/actions/XCostAction.java similarity index 91% rename from src/main/java/code/actions/EasyXCostAction.java rename to src/main/java/code/actions/XCostAction.java index a500a2e1..1418e79c 100644 --- a/src/main/java/code/actions/EasyXCostAction.java +++ b/src/main/java/code/actions/XCostAction.java @@ -8,7 +8,7 @@ import java.util.function.BiFunction; -public class EasyXCostAction extends AbstractGameAction { +public class XCostAction extends AbstractGameAction { public BiFunction xActionUpdate; public int[] params; protected int baseValue; @@ -21,7 +21,7 @@ public class EasyXCostAction extends AbstractGameAction { * @param xActionUpdate A BiFunction that receives an integer for the energy amount (includes Chem X) and any number of integer parameters in the form of an array. The return value of this function is isDone. * @param params Any number of integer parameters. These will be passed to the update function to avoid possible value changes between the creation of this action and when it is updated. */ - public EasyXCostAction(AbstractCard card, BiFunction xActionUpdate, int... params) { + public XCostAction(AbstractCard card, BiFunction xActionUpdate, int... params) { this.baseValue = card.energyOnUse; this.freeToPlayOnce = card.freeToPlayOnce; this.xActionUpdate = xActionUpdate; diff --git a/src/main/java/code/cards/AbstractEasyCard.java b/src/main/java/code/cards/BaseCard.java similarity index 95% rename from src/main/java/code/cards/AbstractEasyCard.java rename to src/main/java/code/cards/BaseCard.java index c29b9eec..9e7f71ce 100644 --- a/src/main/java/code/cards/AbstractEasyCard.java +++ b/src/main/java/code/cards/BaseCard.java @@ -23,7 +23,7 @@ import static code.ModFile.modID; import static code.util.Wiz.*; -public abstract class AbstractEasyCard extends CustomCard { +public abstract class BaseCard extends CustomCard { protected final CardStrings cardStrings; @@ -49,11 +49,11 @@ public abstract class AbstractEasyCard extends CustomCard { private boolean needsArtRefresh = false; - public AbstractEasyCard(final String cardID, final int cost, final CardType type, final CardRarity rarity, final CardTarget target) { + public BaseCard(final String cardID, final int cost, final CardType type, final CardRarity rarity, final CardTarget target) { this(cardID, cost, type, rarity, target, CharacterFile.Enums.TODO_COLOR); } - public AbstractEasyCard(final String cardID, final int cost, final CardType type, final CardRarity rarity, final CardTarget target, final CardColor color) { + public BaseCard(final String cardID, final int cost, final CardType type, final CardRarity rarity, final CardTarget target, final CardColor color) { super(cardID, "", getCardTextureString(cardID.replace(modID + ":", ""), type), cost, "", type, color, rarity, target); cardStrings = CardCrawlGame.languagePack.getCardStrings(this.cardID); @@ -238,8 +238,8 @@ public void update() { public AbstractCard makeStatEquivalentCopy() { AbstractCard result = super.makeStatEquivalentCopy(); - if (result instanceof AbstractEasyCard) { - AbstractEasyCard c = (AbstractEasyCard) result; + if (result instanceof BaseCard) { + BaseCard c = (BaseCard) result; c.baseSecondDamage = c.secondDamage = baseSecondDamage; c.baseSecondBlock = c.secondBlock = baseSecondBlock; c.baseSecondMagic = c.secondMagic = baseSecondMagic; diff --git a/src/main/java/code/cards/Defend.java b/src/main/java/code/cards/Defend.java index 3dc5dcee..84a0a680 100644 --- a/src/main/java/code/cards/Defend.java +++ b/src/main/java/code/cards/Defend.java @@ -5,7 +5,7 @@ import static code.ModFile.makeID; -public class Defend extends AbstractEasyCard { +public class Defend extends BaseCard { public final static String ID = makeID("Defend"); // intellij stuff skill, self, basic, , , 5, 3, , diff --git a/src/main/java/code/cards/FILE TEMPLATE b/src/main/java/code/cards/FILE TEMPLATE index 05d478b7..62fe4a86 100644 --- a/src/main/java/code/cards/FILE TEMPLATE +++ b/src/main/java/code/cards/FILE TEMPLATE @@ -1,6 +1,6 @@ Settings -> Editor -> File and Code Templates and add the following! -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import static code.ModFile.makeID; import static code.util.Wiz.*; diff --git a/src/main/java/code/cards/EasyModalChoiceCard.java b/src/main/java/code/cards/ModalChoiceCard.java similarity index 83% rename from src/main/java/code/cards/EasyModalChoiceCard.java rename to src/main/java/code/cards/ModalChoiceCard.java index 867c3bd0..2e1c7202 100644 --- a/src/main/java/code/cards/EasyModalChoiceCard.java +++ b/src/main/java/code/cards/ModalChoiceCard.java @@ -8,13 +8,13 @@ import static code.ModFile.makeID; @AutoAdd.Ignore -public class EasyModalChoiceCard extends AbstractEasyCard { +public class ModalChoiceCard extends BaseCard { private Runnable onUseOrChosen; private String passedName; private String passedDesc; - public EasyModalChoiceCard(String name, String description, Runnable onUseOrChosen) { + public ModalChoiceCard(String name, String description, Runnable onUseOrChosen) { super(makeID(name), -2, CardType.SKILL, CardRarity.SPECIAL, CardTarget.NONE, CardColor.COLORLESS); this.name = this.originalName = passedName = name; this.rawDescription = passedDesc = description; @@ -49,6 +49,6 @@ public void upgrade() { @Override public AbstractCard makeCopy() { - return new EasyModalChoiceCard(passedName, passedDesc, onUseOrChosen); + return new ModalChoiceCard(passedName, passedDesc, onUseOrChosen); } } diff --git a/src/main/java/code/cards/Strike.java b/src/main/java/code/cards/Strike.java index ac4f98b9..66aa9ec4 100644 --- a/src/main/java/code/cards/Strike.java +++ b/src/main/java/code/cards/Strike.java @@ -6,7 +6,7 @@ import static code.ModFile.makeID; -public class Strike extends AbstractEasyCard { +public class Strike extends BaseCard { public final static String ID = makeID("Strike"); // intellij stuff attack, enemy, basic, 6, 3, , , , diff --git a/src/main/java/code/cards/cardvars/AbstractEasyDynamicVariable.java b/src/main/java/code/cards/cardvars/BaseDynamicVariable.java similarity index 50% rename from src/main/java/code/cards/cardvars/AbstractEasyDynamicVariable.java rename to src/main/java/code/cards/cardvars/BaseDynamicVariable.java index 0253abe9..9767beb0 100644 --- a/src/main/java/code/cards/cardvars/AbstractEasyDynamicVariable.java +++ b/src/main/java/code/cards/cardvars/BaseDynamicVariable.java @@ -2,6 +2,6 @@ import basemod.abstracts.DynamicVariable; -public abstract class AbstractEasyDynamicVariable extends DynamicVariable { +public abstract class BaseDynamicVariable extends DynamicVariable { } \ No newline at end of file diff --git a/src/main/java/code/cards/cardvars/SecondBlock.java b/src/main/java/code/cards/cardvars/SecondBlock.java index 6b87beb0..32ddea86 100644 --- a/src/main/java/code/cards/cardvars/SecondBlock.java +++ b/src/main/java/code/cards/cardvars/SecondBlock.java @@ -1,11 +1,11 @@ package code.cards.cardvars; -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import com.megacrit.cardcrawl.cards.AbstractCard; import static code.ModFile.makeID; -public class SecondBlock extends AbstractEasyDynamicVariable { +public class SecondBlock extends BaseDynamicVariable { @Override public String key() { return makeID("sb"); @@ -13,38 +13,38 @@ public String key() { @Override public boolean isModified(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).isSecondBlockModified; + if (card instanceof BaseCard) { + return ((BaseCard) card).isSecondBlockModified; } return false; } public void setIsModified(AbstractCard card, boolean v) { - if (card instanceof AbstractEasyCard) { - ((AbstractEasyCard) card).isSecondBlockModified = v; + if (card instanceof BaseCard) { + ((BaseCard) card).isSecondBlockModified = v; } } @Override public int value(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).secondBlock; + if (card instanceof BaseCard) { + return ((BaseCard) card).secondBlock; } return -1; } @Override public int baseValue(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).baseSecondBlock; + if (card instanceof BaseCard) { + return ((BaseCard) card).baseSecondBlock; } return -1; } @Override public boolean upgraded(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).upgradedSecondBlock; + if (card instanceof BaseCard) { + return ((BaseCard) card).upgradedSecondBlock; } return false; } diff --git a/src/main/java/code/cards/cardvars/SecondDamage.java b/src/main/java/code/cards/cardvars/SecondDamage.java index 3ea1c27b..4448715d 100644 --- a/src/main/java/code/cards/cardvars/SecondDamage.java +++ b/src/main/java/code/cards/cardvars/SecondDamage.java @@ -1,11 +1,11 @@ package code.cards.cardvars; +import code.cards.BaseCard; import com.megacrit.cardcrawl.cards.AbstractCard; -import code.cards.AbstractEasyCard; import static code.ModFile.makeID; -public class SecondDamage extends AbstractEasyDynamicVariable { +public class SecondDamage extends BaseDynamicVariable { @Override public String key() { @@ -14,38 +14,38 @@ public String key() { @Override public boolean isModified(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).isSecondDamageModified; + if (card instanceof BaseCard) { + return ((BaseCard) card).isSecondDamageModified; } return false; } public void setIsModified(AbstractCard card, boolean v) { - if (card instanceof AbstractEasyCard) { - ((AbstractEasyCard) card).isSecondDamageModified = v; + if (card instanceof BaseCard) { + ((BaseCard) card).isSecondDamageModified = v; } } @Override public int value(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).secondDamage; + if (card instanceof BaseCard) { + return ((BaseCard) card).secondDamage; } return -1; } @Override public int baseValue(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).baseSecondDamage; + if (card instanceof BaseCard) { + return ((BaseCard) card).baseSecondDamage; } return -1; } @Override public boolean upgraded(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).upgradedSecondDamage; + if (card instanceof BaseCard) { + return ((BaseCard) card).upgradedSecondDamage; } return false; } diff --git a/src/main/java/code/cards/cardvars/SecondMagicNumber.java b/src/main/java/code/cards/cardvars/SecondMagicNumber.java index 19f8a25d..6f008305 100644 --- a/src/main/java/code/cards/cardvars/SecondMagicNumber.java +++ b/src/main/java/code/cards/cardvars/SecondMagicNumber.java @@ -1,11 +1,11 @@ package code.cards.cardvars; +import code.cards.BaseCard; import com.megacrit.cardcrawl.cards.AbstractCard; -import code.cards.AbstractEasyCard; import static code.ModFile.makeID; -public class SecondMagicNumber extends AbstractEasyDynamicVariable { +public class SecondMagicNumber extends BaseDynamicVariable { @Override public String key() { @@ -14,38 +14,38 @@ public String key() { @Override public boolean isModified(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).isSecondMagicModified; + if (card instanceof BaseCard) { + return ((BaseCard) card).isSecondMagicModified; } return false; } @Override public int value(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).secondMagic; + if (card instanceof BaseCard) { + return ((BaseCard) card).secondMagic; } return -1; } public void setIsModified(AbstractCard card, boolean v) { - if (card instanceof AbstractEasyCard) { - ((AbstractEasyCard) card).isSecondMagicModified = v; + if (card instanceof BaseCard) { + ((BaseCard) card).isSecondMagicModified = v; } } @Override public int baseValue(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).baseSecondMagic; + if (card instanceof BaseCard) { + return ((BaseCard) card).baseSecondMagic; } return -1; } @Override public boolean upgraded(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).upgradedSecondMagic; + if (card instanceof BaseCard) { + return ((BaseCard) card).upgradedSecondMagic; } return false; } diff --git a/src/main/java/code/cards/cardvars/ThirdMagicNumber.java b/src/main/java/code/cards/cardvars/ThirdMagicNumber.java index a62683ed..051f3dba 100644 --- a/src/main/java/code/cards/cardvars/ThirdMagicNumber.java +++ b/src/main/java/code/cards/cardvars/ThirdMagicNumber.java @@ -1,11 +1,11 @@ package code.cards.cardvars; -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import com.megacrit.cardcrawl.cards.AbstractCard; import static code.ModFile.makeID; -public class ThirdMagicNumber extends AbstractEasyDynamicVariable { +public class ThirdMagicNumber extends BaseDynamicVariable { @Override public String key() { @@ -14,38 +14,38 @@ public String key() { @Override public boolean isModified(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).isThirdMagicModified; + if (card instanceof BaseCard) { + return ((BaseCard) card).isThirdMagicModified; } return false; } @Override public int value(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).thirdMagic; + if (card instanceof BaseCard) { + return ((BaseCard) card).thirdMagic; } return -1; } public void setIsModified(AbstractCard card, boolean v) { - if (card instanceof AbstractEasyCard) { - ((AbstractEasyCard) card).isThirdMagicModified = v; + if (card instanceof BaseCard) { + ((BaseCard) card).isThirdMagicModified = v; } } @Override public int baseValue(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).baseThirdMagic; + if (card instanceof BaseCard) { + return ((BaseCard) card).baseThirdMagic; } return -1; } @Override public boolean upgraded(AbstractCard card) { - if (card instanceof AbstractEasyCard) { - return ((AbstractEasyCard) card).upgradedThirdMagic; + if (card instanceof BaseCard) { + return ((BaseCard) card).upgradedThirdMagic; } return false; } diff --git a/src/main/java/code/cards/democards/complex/InlinePowerDemo.java b/src/main/java/code/cards/democards/complex/InlinePowerDemo.java index 119b0942..1bda1034 100644 --- a/src/main/java/code/cards/democards/complex/InlinePowerDemo.java +++ b/src/main/java/code/cards/democards/complex/InlinePowerDemo.java @@ -6,14 +6,14 @@ import com.megacrit.cardcrawl.characters.AbstractPlayer; import com.megacrit.cardcrawl.monsters.AbstractMonster; import com.megacrit.cardcrawl.powers.AbstractPower; -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import code.powers.LambdaPower; import static code.ModFile.makeID; import static code.util.Wiz.applyToSelf; import static code.util.Wiz.atb; -public class InlinePowerDemo extends AbstractEasyCard { +public class InlinePowerDemo extends BaseCard { public final static String ID = makeID(InlinePowerDemo.class.getSimpleName()); // intellij stuff power, self, uncommon diff --git a/src/main/java/code/cards/democards/complex/EasyModalChoiceDemo.java b/src/main/java/code/cards/democards/complex/ModalChoiceDemo.java similarity index 52% rename from src/main/java/code/cards/democards/complex/EasyModalChoiceDemo.java rename to src/main/java/code/cards/democards/complex/ModalChoiceDemo.java index 0a3d8043..fbbf7b6d 100644 --- a/src/main/java/code/cards/democards/complex/EasyModalChoiceDemo.java +++ b/src/main/java/code/cards/democards/complex/ModalChoiceDemo.java @@ -1,24 +1,24 @@ package code.cards.democards.complex; +import code.cards.BaseCard; import com.megacrit.cardcrawl.actions.common.DrawCardAction; import com.megacrit.cardcrawl.cards.AbstractCard; import com.megacrit.cardcrawl.characters.AbstractPlayer; import com.megacrit.cardcrawl.monsters.AbstractMonster; import com.megacrit.cardcrawl.powers.StrengthPower; -import code.actions.EasyModalChoiceAction; -import code.cards.AbstractEasyCard; -import code.cards.EasyModalChoiceCard; +import code.actions.ModalChoiceAction; +import code.cards.ModalChoiceCard; import java.util.ArrayList; import static code.ModFile.makeID; import static code.util.Wiz.*; -public class EasyModalChoiceDemo extends AbstractEasyCard { - public final static String ID = makeID(EasyModalChoiceDemo.class.getSimpleName()); +public class ModalChoiceDemo extends BaseCard { + public final static String ID = makeID(ModalChoiceDemo.class.getSimpleName()); // intellij stuff skill, self, uncommon, , , , , , - public EasyModalChoiceDemo() { + public ModalChoiceDemo() { super(ID, 1, CardType.SKILL, CardRarity.UNCOMMON, CardTarget.SELF); baseMagicNumber = magicNumber = 3; baseSecondMagic = secondMagic = 1; @@ -26,9 +26,9 @@ public EasyModalChoiceDemo() { public void use(AbstractPlayer p, AbstractMonster m) { ArrayList easyCardList = new ArrayList<>(); - easyCardList.add(new EasyModalChoiceCard(cardStrings.EXTENDED_DESCRIPTION[0], cardStrings.EXTENDED_DESCRIPTION[1] + magicNumber + cardStrings.EXTENDED_DESCRIPTION[2], () -> att(new DrawCardAction(magicNumber)))); - easyCardList.add(new EasyModalChoiceCard(cardStrings.EXTENDED_DESCRIPTION[3], cardStrings.EXTENDED_DESCRIPTION[4]+ secondMagic + cardStrings.EXTENDED_DESCRIPTION[5], () -> applyToSelfTop(new StrengthPower(p, secondMagic)))); - atb(new EasyModalChoiceAction(easyCardList)); + easyCardList.add(new ModalChoiceCard(cardStrings.EXTENDED_DESCRIPTION[0], cardStrings.EXTENDED_DESCRIPTION[1] + magicNumber + cardStrings.EXTENDED_DESCRIPTION[2], () -> att(new DrawCardAction(magicNumber)))); + easyCardList.add(new ModalChoiceCard(cardStrings.EXTENDED_DESCRIPTION[3], cardStrings.EXTENDED_DESCRIPTION[4]+ secondMagic + cardStrings.EXTENDED_DESCRIPTION[5], () -> applyToSelfTop(new StrengthPower(p, secondMagic)))); + atb(new ModalChoiceAction(easyCardList)); } @Override diff --git a/src/main/java/code/cards/democards/complex/MultiCardPreviewAndDrawCallback.java b/src/main/java/code/cards/democards/complex/MultiCardPreviewAndDrawCallback.java index c88b65cd..525c4720 100644 --- a/src/main/java/code/cards/democards/complex/MultiCardPreviewAndDrawCallback.java +++ b/src/main/java/code/cards/democards/complex/MultiCardPreviewAndDrawCallback.java @@ -1,7 +1,7 @@ package code.cards.democards.complex; import basemod.patches.com.megacrit.cardcrawl.cards.AbstractCard.MultiCardPreview; -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import com.megacrit.cardcrawl.actions.AbstractGameAction; import com.megacrit.cardcrawl.actions.common.DrawCardAction; import com.megacrit.cardcrawl.cards.AbstractCard; @@ -13,7 +13,7 @@ import static code.ModFile.makeID; import static code.util.Wiz.*; -public class MultiCardPreviewAndDrawCallback extends AbstractEasyCard { +public class MultiCardPreviewAndDrawCallback extends BaseCard { public final static String ID = makeID(MultiCardPreviewAndDrawCallback.class.getSimpleName()); // intellij stuff skill, self, uncommon, , , , , , diff --git a/src/main/java/code/cards/democards/complex/SelectCardsPlusCardMods.java b/src/main/java/code/cards/democards/complex/SelectCardsPlusCardMods.java index e3f14c01..87a41336 100644 --- a/src/main/java/code/cards/democards/complex/SelectCardsPlusCardMods.java +++ b/src/main/java/code/cards/democards/complex/SelectCardsPlusCardMods.java @@ -3,7 +3,7 @@ import basemod.cardmods.EtherealMod; import basemod.cardmods.ExhaustMod; import basemod.helpers.CardModifierManager; -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import com.evacipated.cardcrawl.mod.stslib.actions.common.SelectCardsAction; import com.megacrit.cardcrawl.actions.common.MakeTempCardInHandAction; import com.megacrit.cardcrawl.cards.AbstractCard; @@ -16,7 +16,7 @@ import static code.ModFile.makeID; import static code.util.Wiz.*; -public class SelectCardsPlusCardMods extends AbstractEasyCard { +public class SelectCardsPlusCardMods extends BaseCard { public final static String ID = makeID(SelectCardsPlusCardMods.class.getSimpleName()); // intellij stuff skill, self, uncommon diff --git a/src/main/java/code/cards/democards/complex/EasyXCostDemo.java b/src/main/java/code/cards/democards/complex/XCostDemo.java similarity index 77% rename from src/main/java/code/cards/democards/complex/EasyXCostDemo.java rename to src/main/java/code/cards/democards/complex/XCostDemo.java index 79f44ca2..9009a248 100644 --- a/src/main/java/code/cards/democards/complex/EasyXCostDemo.java +++ b/src/main/java/code/cards/democards/complex/XCostDemo.java @@ -1,7 +1,7 @@ package code.cards.democards.complex; -import code.actions.EasyXCostAction; -import code.cards.AbstractEasyCard; +import code.actions.XCostAction; +import code.cards.BaseCard; import com.megacrit.cardcrawl.actions.AbstractGameAction; import com.megacrit.cardcrawl.characters.AbstractPlayer; import com.megacrit.cardcrawl.monsters.AbstractMonster; @@ -11,11 +11,11 @@ import static code.util.Wiz.applyToSelfTop; import static code.util.Wiz.atb; -public class EasyXCostDemo extends AbstractEasyCard { - public final static String ID = makeID(EasyXCostDemo.class.getSimpleName()); +public class XCostDemo extends BaseCard { + public final static String ID = makeID(XCostDemo.class.getSimpleName()); // intellij stuff attack, enemy, rare, , , , , 0, 1 - public EasyXCostDemo() { + public XCostDemo() { super(ID, -1, CardType.ATTACK, CardRarity.RARE, CardTarget.ENEMY); baseDamage = 5; baseMagicNumber = magicNumber = 0; @@ -23,7 +23,7 @@ public EasyXCostDemo() { } public void use(AbstractPlayer p, AbstractMonster m) { - atb(new EasyXCostAction(this, (effect, params) -> { + atb(new XCostAction(this, (effect, params) -> { applyToSelfTop(new StrengthPower(p, effect + params[0])); for (int i = 0; i < effect + params[0]; i++) dmgTop(m, AbstractGameAction.AttackEffect.SLASH_DIAGONAL); diff --git a/src/main/java/code/cards/democards/simple/DrawAndShiv.java b/src/main/java/code/cards/democards/simple/DrawAndShiv.java index 6ca889d1..462c2b0b 100644 --- a/src/main/java/code/cards/democards/simple/DrawAndShiv.java +++ b/src/main/java/code/cards/democards/simple/DrawAndShiv.java @@ -4,12 +4,12 @@ import com.megacrit.cardcrawl.cards.tempCards.Shiv; import com.megacrit.cardcrawl.characters.AbstractPlayer; import com.megacrit.cardcrawl.monsters.AbstractMonster; -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import static code.ModFile.makeID; import static code.util.Wiz.*; -public class DrawAndShiv extends AbstractEasyCard { +public class DrawAndShiv extends BaseCard { public final static String ID = makeID(DrawAndShiv.class.getSimpleName()); // intellij stuff skill, self, uncommon, , , , , , diff --git a/src/main/java/code/cards/democards/simple/StartupBlockCard.java b/src/main/java/code/cards/democards/simple/StartupBlockCard.java index 230b8ba6..f6418658 100644 --- a/src/main/java/code/cards/democards/simple/StartupBlockCard.java +++ b/src/main/java/code/cards/democards/simple/StartupBlockCard.java @@ -1,6 +1,6 @@ package code.cards.democards.simple; -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import com.evacipated.cardcrawl.mod.stslib.cards.interfaces.StartupCard; import com.megacrit.cardcrawl.actions.AbstractGameAction; import com.megacrit.cardcrawl.actions.common.GainBlockAction; @@ -11,7 +11,7 @@ import static code.ModFile.makeID; import static code.util.Wiz.atb; -public class StartupBlockCard extends AbstractEasyCard implements StartupCard { // This card implements StartupCard, an extra 'type' of card that adds the ability to trigger at the start of combat. +public class StartupBlockCard extends BaseCard implements StartupCard { // This card implements StartupCard, an extra 'type' of card that adds the ability to trigger at the start of combat. public final static String ID = makeID(StartupBlockCard.class.getSimpleName()); // intellij stuff skill, self, uncommon, , , , , , diff --git a/src/main/java/code/cards/democards/simple/TwoTypesOfDamage.java b/src/main/java/code/cards/democards/simple/TwoTypesOfDamage.java index ac959727..4a038cb9 100644 --- a/src/main/java/code/cards/democards/simple/TwoTypesOfDamage.java +++ b/src/main/java/code/cards/democards/simple/TwoTypesOfDamage.java @@ -4,11 +4,11 @@ import com.megacrit.cardcrawl.characters.AbstractPlayer; import com.megacrit.cardcrawl.monsters.AbstractMonster; import com.megacrit.cardcrawl.powers.VulnerablePower; -import code.cards.AbstractEasyCard; +import code.cards.BaseCard; import static code.ModFile.makeID; -public class TwoTypesOfDamage extends AbstractEasyCard { +public class TwoTypesOfDamage extends BaseCard { public final static String ID = makeID(TwoTypesOfDamage.class.getSimpleName()); // intellij stuff skill, self, uncommon, , , , , , diff --git a/src/main/java/code/potions/AbstractEasyPotion.java b/src/main/java/code/potions/BasePotion.java similarity index 79% rename from src/main/java/code/potions/AbstractEasyPotion.java rename to src/main/java/code/potions/BasePotion.java index 6d78b684..0a9c20e5 100644 --- a/src/main/java/code/potions/AbstractEasyPotion.java +++ b/src/main/java/code/potions/BasePotion.java @@ -8,11 +8,11 @@ import com.megacrit.cardcrawl.localization.PotionStrings; import com.megacrit.cardcrawl.potions.AbstractPotion; -public abstract class AbstractEasyPotion extends CustomPotion { +public abstract class BasePotion extends CustomPotion { public AbstractPlayer.PlayerClass pool; protected PotionStrings strings; - public AbstractEasyPotion(String id, PotionRarity rarity, PotionSize size, Color liquidColor, Color hybridColor, Color spotsColor) { + public BasePotion(String id, PotionRarity rarity, PotionSize size, Color liquidColor, Color hybridColor, Color spotsColor) { super("", id, rarity, size, PotionColor.WHITE); this.liquidColor = liquidColor; this.hybridColor = hybridColor; @@ -20,7 +20,7 @@ public AbstractEasyPotion(String id, PotionRarity rarity, PotionSize size, Color initializeData(); } - public AbstractEasyPotion(String id, PotionRarity rarity, PotionSize size, Color liquidColor, Color hybridColor, Color spotsColor, AbstractPlayer.PlayerClass pool, Color labOutlineColor) { + public BasePotion(String id, PotionRarity rarity, PotionSize size, Color liquidColor, Color hybridColor, Color spotsColor, AbstractPlayer.PlayerClass pool, Color labOutlineColor) { this(id, rarity, size, liquidColor, hybridColor, spotsColor); this.labOutlineColor = labOutlineColor; this.pool = pool; diff --git a/src/main/java/code/potions/DemoPotion.java b/src/main/java/code/potions/DemoPotion.java index 4cf79fb7..b20c0c23 100644 --- a/src/main/java/code/potions/DemoPotion.java +++ b/src/main/java/code/potions/DemoPotion.java @@ -11,7 +11,7 @@ import static code.ModFile.makeID; import static code.util.Wiz.*; -public class DemoPotion extends AbstractEasyPotion { +public class DemoPotion extends BasePotion { public static String ID = makeID("DemoPotion"); public DemoPotion() { diff --git a/src/main/java/code/powers/AbstractEasyPower.java b/src/main/java/code/powers/BasePower.java similarity index 92% rename from src/main/java/code/powers/AbstractEasyPower.java rename to src/main/java/code/powers/BasePower.java index e1e4ce5f..1b2e70e5 100644 --- a/src/main/java/code/powers/AbstractEasyPower.java +++ b/src/main/java/code/powers/BasePower.java @@ -11,14 +11,14 @@ import code.ModFile; import code.util.TexLoader; -public abstract class AbstractEasyPower extends AbstractPower { +public abstract class BasePower extends AbstractPower { public int amount2 = -1; public boolean isTwoAmount = false; public static Color redColor2 = Color.RED.cpy(); public static Color greenColor2 = Color.GREEN.cpy(); public boolean canGoNegative2 = false; - public AbstractEasyPower(String ID, String NAME, PowerType powerType, boolean isTurnBased, AbstractCreature owner, int amount) { + public BasePower(String ID, String NAME, PowerType powerType, boolean isTurnBased, AbstractCreature owner, int amount) { this.ID = ID; this.isTurnBased = isTurnBased; diff --git a/src/main/java/code/powers/LambdaPower.java b/src/main/java/code/powers/LambdaPower.java index f8aebf80..e8ba6fb1 100644 --- a/src/main/java/code/powers/LambdaPower.java +++ b/src/main/java/code/powers/LambdaPower.java @@ -2,7 +2,7 @@ import com.megacrit.cardcrawl.core.AbstractCreature; -public abstract class LambdaPower extends AbstractEasyPower { +public abstract class LambdaPower extends BasePower { public LambdaPower(String ID, String name, PowerType powerType, boolean isTurnBased, AbstractCreature owner, int amount) { super(ID, name, powerType, isTurnBased, owner, amount); } diff --git a/src/main/java/code/relics/AbstractEasyRelic.java b/src/main/java/code/relics/BaseRelic.java similarity index 69% rename from src/main/java/code/relics/AbstractEasyRelic.java rename to src/main/java/code/relics/BaseRelic.java index c4b18489..a1716075 100644 --- a/src/main/java/code/relics/AbstractEasyRelic.java +++ b/src/main/java/code/relics/BaseRelic.java @@ -8,14 +8,14 @@ import static code.ModFile.makeRelicPath; import static code.ModFile.modID; -public abstract class AbstractEasyRelic extends CustomRelic { +public abstract class BaseRelic extends CustomRelic { public AbstractCard.CardColor color; - public AbstractEasyRelic(String setId, AbstractRelic.RelicTier tier, AbstractRelic.LandingSound sfx) { + public BaseRelic(String setId, AbstractRelic.RelicTier tier, AbstractRelic.LandingSound sfx) { this(setId, tier, sfx, null); } - public AbstractEasyRelic(String setId, AbstractRelic.RelicTier tier, AbstractRelic.LandingSound sfx, AbstractCard.CardColor color) { + public BaseRelic(String setId, AbstractRelic.RelicTier tier, AbstractRelic.LandingSound sfx, AbstractCard.CardColor color) { super(setId, TexLoader.getTexture(makeRelicPath(setId.replace(modID + ":", "") + ".png")), tier, sfx); outlineImg = TexLoader.getTexture(makeRelicPath(setId.replace(modID + ":", "") + "Outline.png")); this.color = color; diff --git a/src/main/java/code/relics/TodoItem.java b/src/main/java/code/relics/TodoItem.java index 973b0525..baf0def1 100644 --- a/src/main/java/code/relics/TodoItem.java +++ b/src/main/java/code/relics/TodoItem.java @@ -4,7 +4,7 @@ import static code.ModFile.makeID; -public class TodoItem extends AbstractEasyRelic { +public class TodoItem extends BaseRelic { public static final String ID = makeID("TodoItem"); public TodoItem() { diff --git a/src/main/java/code/util/CardArtRoller.java b/src/main/java/code/util/CardArtRoller.java index e90689cf..f03242fb 100644 --- a/src/main/java/code/util/CardArtRoller.java +++ b/src/main/java/code/util/CardArtRoller.java @@ -3,6 +3,7 @@ import basemod.BaseMod; import basemod.patches.whatmod.WhatMod; import code.ModFile; +import code.cards.BaseCard; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.Texture; @@ -23,7 +24,6 @@ import com.megacrit.cardcrawl.cards.red.Strike_Red; import com.megacrit.cardcrawl.helpers.CardLibrary; import com.megacrit.cardcrawl.random.Random; -import code.cards.AbstractEasyCard; import java.util.ArrayList; import java.util.HashMap; @@ -189,7 +189,7 @@ public class CardArtRoller { private static FrameBuffer smallBuffer = null; private static OrthographicCamera smallCamera = null; - public static void computeCard(AbstractEasyCard c) { + public static void computeCard(BaseCard c) { c.portrait = doneCards.computeIfAbsent(c.cardID, key -> { ReskinInfo r = infos.computeIfAbsent(key, key2 -> { Random rng = new Random((long) c.cardID.hashCode());