Achievements and controller support

src/main/java/automaton/AutomatonMod.java

@@ -139,7 +139,6 @@ public static void loadJokeCardImage(AbstractCard card, String img) {
         ReflectionHacks.setPrivate(card, AbstractCard.class, "jokePortrait", cardImg);
     }
 
-
     public static String makeCardPath(String resourcePath) {
         return getModID() + "Resources/images/cards/" + resourcePath;
     }
@@ -226,12 +225,13 @@ public void receiveEditRelics() {
         BaseMod.addRelicToCustomPool(new BronzeCore(), AutomatonChar.Enums.BRONZE_AUTOMATON);
         BaseMod.addRelicToCustomPool(new CableSpool(), AutomatonChar.Enums.BRONZE_AUTOMATON);
         BaseMod.addRelic(new DecasWashers(), RelicType.SHARED);
-        BaseMod.addRelic(new DonusWashers(), RelicType.SHARED);
+        //  BaseMod.addRelic(new DonusWashers(), RelicType.SHARED);
+        BaseMod.addRelicToCustomPool(new DonusWashers(), AutomatonChar.Enums.BRONZE_AUTOMATON);
         BaseMod.addRelicToCustomPool(new ElectromagneticCoil(), AutomatonChar.Enums.BRONZE_AUTOMATON);
         BaseMod.addRelicToCustomPool(new ProtectiveGoggles(), AutomatonChar.Enums.BRONZE_AUTOMATON);
         BaseMod.addRelicToCustomPool(new Mallet(), AutomatonChar.Enums.BRONZE_AUTOMATON);
         BaseMod.addRelicToCustomPool(new PlatinumCore(), AutomatonChar.Enums.BRONZE_AUTOMATON);
-        BaseMod.addRelic(new MakeshiftBattery(), RelicType.SHARED);
+        BaseMod.addRelicToCustomPool(new MakeshiftBattery(), AutomatonChar.Enums.BRONZE_AUTOMATON);
         BaseMod.addRelic(new BronzeIdol(), RelicType.SHARED);
         BaseMod.addRelicToCustomPool(new SilverBullet(), AutomatonChar.Enums.BRONZE_AUTOMATON);
         BaseMod.addRelicToCustomPool(new BottledCode(), AutomatonChar.Enums.BRONZE_AUTOMATON);

src/main/java/automaton/actions/ChosenAction.java

@@ -1,16 +1,7 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
 package automaton.actions;
 
-import automaton.FunctionHelper;
 import com.megacrit.cardcrawl.actions.AbstractGameAction;
-import com.megacrit.cardcrawl.cards.AbstractCard;
-import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
-import com.megacrit.cardcrawl.helpers.GetAllInBattleInstances;
-import java.util.Iterator;
+
 import java.util.UUID;
 
 public class ChosenAction extends AbstractGameAction {

src/main/java/automaton/actions/ScryBlockStatusAction.java

@@ -11,7 +11,6 @@
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.localization.UIStrings;
 import com.megacrit.cardcrawl.powers.AbstractPower;
-import theHexaghost.HexaMod;
 
 public class ScryBlockStatusAction extends AbstractGameAction {
     private static final UIStrings uiStrings;
@@ -73,8 +72,8 @@ public void update() {
                         AbstractDungeon.player.drawPile.moveToDiscardPile(c);
                         if (c.type == AbstractCard.CardType.STATUS) {
                             addToBot(new GainBlockAction(AbstractDungeon.player, blockPerCard));
+                            addToBot(new ExhaustSpecificCardAction(c, AbstractDungeon.player.discardPile));
                         }
-                        addToBot(new ExhaustSpecificCardAction(c, AbstractDungeon.player.discardPile));
                     }
                 }
                 AbstractDungeon.gridSelectScreen.selectedCards.clear();

src/main/java/automaton/actions/ScryEncodeCardsAction.java

@@ -1,7 +1,6 @@
 package automaton.actions;
 
 import automaton.AutomatonMod;
-import automaton.FunctionHelper;
 import com.megacrit.cardcrawl.actions.AbstractGameAction;
 import com.megacrit.cardcrawl.cards.AbstractCard;
 import com.megacrit.cardcrawl.cards.CardGroup;

src/main/java/automaton/cardmods/CardEffectsCardMod.java

@@ -18,8 +18,6 @@
 import com.megacrit.cardcrawl.helpers.CardLibrary;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
 
-import static automaton.FunctionHelper.WITH_DELIMITER;
-
 public class CardEffectsCardMod extends BronzeCardMod {
 
     public CardSave store;

src/main/java/automaton/cardmods/EncodeAndShuffleMod.java

@@ -2,7 +2,6 @@
 
 import automaton.AutomatonMod;
 import basemod.abstracts.AbstractCardModifier;
-import com.megacrit.cardcrawl.actions.common.MakeTempCardInDiscardAction;
 import com.megacrit.cardcrawl.actions.utility.UseCardAction;
 import com.megacrit.cardcrawl.cards.AbstractCard;
 import com.megacrit.cardcrawl.core.AbstractCreature;

src/main/java/automaton/cardmods/EncodeMod.java

@@ -5,8 +5,6 @@
 import basemod.abstracts.AbstractCardModifier;
 import com.megacrit.cardcrawl.cards.AbstractCard;
 
-import static automaton.FunctionHelper.WITH_DELIMITER;
-
 public class EncodeMod extends BronzeCardMod {
 
     public static String ID = "bronze:EncodeModifier";

src/main/java/automaton/cardmods/PlayMeTwiceCardmod.java

@@ -1,6 +1,5 @@
 package automaton.cardmods;
 
-import automaton.actions.RepeatCardAction;
 import basemod.abstracts.AbstractCardModifier;
 import com.megacrit.cardcrawl.actions.utility.UseCardAction;
 import com.megacrit.cardcrawl.cards.AbstractCard;

src/main/java/automaton/cards/AbstractBronzeCard.java

@@ -18,7 +18,6 @@
 import com.megacrit.cardcrawl.core.CardCrawlGame;
 import com.megacrit.cardcrawl.core.Settings;
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
-import com.megacrit.cardcrawl.helpers.ImageMaster;
 import com.megacrit.cardcrawl.localization.CardStrings;
 import com.megacrit.cardcrawl.localization.UIStrings;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;

src/main/java/automaton/cards/AlphaBuild.java

@@ -1,4 +1,4 @@
-/*
+package automaton.cards;/*
 package automaton.cards;
 
 import automaton.AutomatonMod;

src/main/java/automaton/cards/Assembly.java

@@ -4,7 +4,6 @@
 import automaton.actions.ScryEncodeCardsAction;
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
-import sneckomod.SneckoMod;
 
 public class Assembly extends AbstractBronzeCard {
 

src/main/java/automaton/cards/Batch.java

@@ -1,10 +1,10 @@
 package automaton.cards;
 
-import automaton.AutomatonMod;
 import automaton.FunctionHelper;
 import com.megacrit.cardcrawl.actions.AbstractGameAction;
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
+import automaton.AutomatonMod;
 
 import static automaton.AutomatonMod.makeBetaCardPath;
 

src/main/java/automaton/cards/BetaBuild.java

@@ -1,4 +1,4 @@
-/*
+package automaton.cards;/*
 package automaton.cards;
 
 import automaton.AutomatonMod;

src/main/java/automaton/cards/BitShift.java

@@ -10,19 +10,20 @@
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
 import expansioncontent.cardmods.PropertiesMod;
-import expansioncontent.cardmods.RetainCardMod;
-
-import static automaton.AutomatonMod.makeBetaCardPath;
+import sneckomod.SneckoMod;
 
 import java.util.ArrayList;
 
+import static automaton.AutomatonMod.makeBetaCardPath;
+
 public class BitShift extends AbstractBronzeCard {
     public final static String ID = makeID("BitShift");
 
     public BitShift() {
         super(ID, 0, CardType.SKILL, CardRarity.COMMON, CardTarget.SELF);
         exhaust = true;
         baseMagicNumber = magicNumber = 1;
+        this.tags.add(SneckoMod.BANNEDFORSNECKO);
         AutomatonMod.loadJokeCardImage(this, makeBetaCardPath("BitShift.png"));
     }
 

src/main/java/automaton/cards/Branch.java

@@ -2,25 +2,33 @@
 
 import automaton.AutomatonMod;
 import automaton.actions.AddToFuncAction;
+import awakenedOne.relics.EyeOfTheOccult;
+import awakenedOne.relics.OnAwakenRelic;
+import champ.powers.GladiatorFormPower;
+import champ.powers.ParryPower;
+import champ.relics.RageAmulet;
 import com.megacrit.cardcrawl.actions.AbstractGameAction;
-import com.megacrit.cardcrawl.actions.common.ApplyPowerAction;
 import com.megacrit.cardcrawl.actions.common.DamageAction;
 import com.megacrit.cardcrawl.actions.common.GainBlockAction;
+import com.megacrit.cardcrawl.actions.common.RemoveSpecificPowerAction;
 import com.megacrit.cardcrawl.cards.AbstractCard;
 import com.megacrit.cardcrawl.cards.DamageInfo;
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.core.Settings;
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
-import com.megacrit.cardcrawl.powers.AbstractPower;
 import com.megacrit.cardcrawl.powers.watcher.VigorPower;
+import com.megacrit.cardcrawl.relics.AbstractRelic;
 import com.megacrit.cardcrawl.unlock.UnlockTracker;
 import downfall.actions.OctoChoiceAction;
 import downfall.cards.OctoChoiceCard;
 import downfall.util.OctopusCard;
+import guardian.powers.RevengePower;
 
 import java.util.ArrayList;
 
+import static hermit.util.Wiz.removePower;
+
 public class Branch extends AbstractBronzeCard implements OctopusCard {
 
     public final static String ID = makeID("Branch");
@@ -60,6 +68,23 @@ public void doChoiceStuff(AbstractMonster m, OctoChoiceCard card) {
                 if (upgraded) q.upgrade();
                 att(new AddToFuncAction(q, null));
                 att(new DamageAction(m, new DamageInfo(AbstractDungeon.player, card.baseDamage, card.damageTypeForTurn), AbstractGameAction.AttackEffect.SLASH_HORIZONTAL));
+
+                if (AbstractDungeon.player.hasPower(GladiatorFormPower.POWER_ID)) {
+                    GladiatorFormPower revengePower = (GladiatorFormPower) AbstractDungeon.player.getPower(GladiatorFormPower.POWER_ID);
+
+                    if (revengePower != null) {
+                        revengePower.onSpecificTriggerBranch();
+                    }
+                }
+
+                for (AbstractRelic r : AbstractDungeon.player.relics) {
+                    if (r instanceof RageAmulet) {
+                        ((RageAmulet) r).onSpecificTrigger();
+                    }
+                }
+
+                atb(new RemoveSpecificPowerAction(AbstractDungeon.player, AbstractDungeon.player, VigorPower.POWER_ID));
+
                 break;
             }
             case "bronze:BranchBlock": {