Use BaseMod card tags to auto-patch events

Patch BaseMod card upgrade code to use InfiniteJournal
twanvl · Sep 18, 2018 · 53d9b7a · 53d9b7a
1 parent 10e1299
commit 53d9b7a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 56 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### v0.2.2
 * Fixed: Infinite Journal Upgrades Removed Upon Reloading (#12)
+* Fixed: Patch BaseMod upgrade code to check for InfiniteJournal when upgrading cards.
 
 ### v0.2.1
 * Compatibility with ModTheSpire v3.0.0

diff --git a/src/main/java/madsciencemod/MadScienceMod.java b/src/main/java/madsciencemod/MadScienceMod.java
@@ -13,7 +13,6 @@
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.Color;
-import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.localization.CardStrings;
 import com.megacrit.cardcrawl.localization.CharacterStrings;
 import com.megacrit.cardcrawl.localization.RelicStrings;

diff --git a/src/main/java/madsciencemod/cards/AutoStrike.java b/src/main/java/madsciencemod/cards/AutoStrike.java
@@ -11,6 +11,9 @@
 import com.megacrit.cardcrawl.localization.CardStrings;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
 
+import basemod.helpers.BaseModTags;
+import basemod.helpers.CardTags;
+
 public class AutoStrike extends AbstractMadScienceCard {
     public static final String ID = "AutoStrike";
     private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
@@ -29,6 +32,7 @@ public AutoStrike() {
         super(ID, NAME, COST, DESCRIPTION, TYPE, RARITY, TARGET);
         this.baseDamage = ATTACK_DMG;
         this.magicNumber = this.baseMagicNumber = DRAW_DMG;
+        CardTags.addTags(this, BaseModTags.STRIKE);
     }
 
     @Override

diff --git a/src/main/java/madsciencemod/cards/Defend_Bronze.java b/src/main/java/madsciencemod/cards/Defend_Bronze.java
@@ -9,6 +9,9 @@
 import com.megacrit.cardcrawl.localization.CardStrings;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
 
+import basemod.helpers.BaseModTags;
+import basemod.helpers.CardTags;
+
 public class Defend_Bronze extends AbstractMadScienceCard {
     public static final String ID = "Defend_Bronze";
     private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
@@ -24,6 +27,7 @@ public class Defend_Bronze extends AbstractMadScienceCard {
     public Defend_Bronze() {
         super(ID, NAME, COST, DESCRIPTION, TYPE, RARITY, TARGET);
         this.baseBlock = BLOCK_AMT;
+        CardTags.addTags(this, BaseModTags.BASIC_DEFEND);
     }
 
     @Override

diff --git a/src/main/java/madsciencemod/cards/Strike_Bronze.java b/src/main/java/madsciencemod/cards/Strike_Bronze.java
@@ -11,6 +11,9 @@
 import com.megacrit.cardcrawl.localization.CardStrings;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
 
+import basemod.helpers.BaseModTags;
+import basemod.helpers.CardTags;
+
 public class Strike_Bronze extends AbstractMadScienceCard {
     public static final String ID = "Strike_Bronze";
     private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
@@ -26,6 +29,7 @@ public class Strike_Bronze extends AbstractMadScienceCard {
     public Strike_Bronze() {
         super(ID, NAME, COST, DESCRIPTION, TYPE, RARITY, TARGET);
         this.baseDamage = ATTACK_DMG;
+        CardTags.addTags(this, BaseModTags.BASIC_STRIKE, BaseModTags.STRIKE);
     }
 
     @Override

diff --git a/src/main/java/madsciencemod/patches/BackToBasicsPatch.java b/src/main/java/madsciencemod/patches/BackToBasicsPatch.java
diff --git a/src/main/java/madsciencemod/patches/UpgradePatches.java b/src/main/java/madsciencemod/patches/UpgradePatches.java
@@ -34,15 +34,21 @@
 @SpirePatch(clz=com.megacrit.cardcrawl.events.shrines.UpgradeShrine.class, method="update")
 @SpirePatch(clz=com.megacrit.cardcrawl.events.exordium.LivingWall.class, method="update")
 @SpirePatch(clz=com.megacrit.cardcrawl.events.exordium.ShiningLight.class, method="upgradeCards")
+@SpirePatch(clz=com.megacrit.cardcrawl.events.city.BackToBasics.class, method="upgradeStrikeAndDefends")
 // Note: NeowReward is at start of game
-// Note: BackToBasics is patched separately.
 
 // Relics
 // Note: Don't care about eggs
 @SpirePatch(clz=com.megacrit.cardcrawl.relics.TinyHouse.class, method="onEquip")
 @SpirePatch(clz=com.megacrit.cardcrawl.relics.WarPaint.class, method="onEquip")
 @SpirePatch(clz=com.megacrit.cardcrawl.relics.Whetstone.class, method="onEquip")
 
+// BaseMod patches
+@SpirePatch(clz=basemod.DevConsole.class, method="cmdHand")
+@SpirePatch(clz=basemod.DevConsole.class, method="cmdDeck")
+@SpirePatch(clz=basemod.patches.com.megacrit.cardcrawl.events.BackToBasics.UpgradeStrikeAndDefends.class, method="Insert")
+@SpirePatch(clz=basemod.patches.com.megacrit.cardcrawl.events.NoteForYourself.MissingCard.class, method="Replace")
+
 public class UpgradePatches {
 
     public static ExprEditor patch = new ExprEditor() {

diff --git a/src/main/java/madsciencemod/patches/VampiresPatch.java b/src/main/java/madsciencemod/patches/VampiresPatch.java