amsr2239 · amsr2239 · Jan 2, 2026 · Jan 2, 2026 · Jan 2, 2026 · Jan 2, 2026
diff --git a/README.md b/README.md
@@ -1 +1 @@
-1/28/2024 - This is a temporary message to let everyone know the Discord account and server is back under our control.
+
diff --git a/pom.example b/pom.example
diff --git a/src/main/java/automaton/AutomatonMod.java b/src/main/java/automaton/AutomatonMod.java
@@ -262,17 +262,7 @@ public void receiveEditCards() {
 
     public void addPotions() {
 
-        BaseMod.addPotion(BuildAFunctionPotion.class, Color.FIREBRICK, Color.GRAY, Color.TAN, BuildAFunctionPotion.POTION_ID, AutomatonChar.Enums.THE_AUTOMATON);
-        BaseMod.addPotion(CleanCodePotion.class, Color.CORAL, Color.PURPLE, Color.MAROON, CleanCodePotion.POTION_ID, AutomatonChar.Enums.THE_AUTOMATON);
-        BaseMod.addPotion(FreeFunctionsPotion.class, Color.BLACK, Color.PURPLE, Color.GRAY, FreeFunctionsPotion.POTION_ID, AutomatonChar.Enums.THE_AUTOMATON);
-//        BanSharedContentPatch.registerRunLockedPotion(AutomatonChar.Enums.THE_AUTOMATON, BurnAndBuffPotion.POTION_ID);
-
-        if (Loader.isModLoaded("widepotions")) {
-            WidePotionsMod.whitelistSimplePotion(BuildAFunctionPotion.POTION_ID);
-            WidePotionsMod.whitelistSimplePotion(BurnAndBuffPotion.POTION_ID);
-            WidePotionsMod.whitelistSimplePotion(CleanCodePotion.POTION_ID);
-            WidePotionsMod.whitelistSimplePotion(FreeFunctionsPotion.POTION_ID);
-        }
+        //handled in downfallMod
     }
 
     public void receivePostInitialize() {

diff --git a/src/main/java/automaton/FunctionHelper.java b/src/main/java/automaton/FunctionHelper.java
@@ -48,24 +48,24 @@ public static int max() {
     public static final float SEQUENCED_CARD_SIZE = 0.225f;
     public static final float FUNC_CARD_SIZE = 0.45f;
 
-    public static final float BG_X = 150f * Settings.scale;
-    public static final float BG_Y = 700f * Settings.scale;
-    public static final float HEIGHT_SEQUENCE = 800f * Settings.yScale;
-    public static final float HEIGHT_SPOT = 700f * Settings.yScale;
-    public static final float HEIGHT_FUNCTION = 820f * Settings.yScale;
+    public static final float BG_X = 650f * Settings.scale;
+    public static final float BG_Y = 600f * Settings.scale;
+    public static final float HEIGHT_SEQUENCE = 700f * Settings.yScale;
+    public static final float HEIGHT_SPOT = 600f * Settings.yScale;
+    public static final float HEIGHT_FUNCTION = 720f * Settings.yScale;
 
     public static final Vector2[] cardPositions = {
-            new Vector2(218f * Settings.xScale, HEIGHT_SEQUENCE),
-            new Vector2(293f * Settings.xScale, HEIGHT_SEQUENCE),
-            new Vector2(368f * Settings.xScale, HEIGHT_SEQUENCE),
-            new Vector2(443f * Settings.xScale, HEIGHT_SEQUENCE)
+            new Vector2(718f * Settings.xScale, HEIGHT_SEQUENCE),
+            new Vector2(793f * Settings.xScale, HEIGHT_SEQUENCE),
+            new Vector2(868f * Settings.xScale, HEIGHT_SEQUENCE),
+            new Vector2(943f * Settings.xScale, HEIGHT_SEQUENCE)
     };
 
     public static final Vector2[] floaterStartPositions = {
-            new Vector2(177F * Settings.xScale, HEIGHT_SPOT),
-            new Vector2(252f * Settings.xScale, HEIGHT_SPOT),
-            new Vector2(327f * Settings.xScale, HEIGHT_SPOT),
-            new Vector2(402f * Settings.xScale, HEIGHT_SPOT)
+            new Vector2(677F * Settings.xScale, HEIGHT_SPOT),
+            new Vector2(752f * Settings.xScale, HEIGHT_SPOT),
+            new Vector2(827f * Settings.xScale, HEIGHT_SPOT),
+            new Vector2(902f * Settings.xScale, HEIGHT_SPOT)
     };
 
     public static BobEffect[] bobEffects = {
@@ -76,8 +76,8 @@ public static int max() {
     };
 
     public static final Vector2[] funcPositions = {
-            new Vector2(480f * Settings.xScale, HEIGHT_FUNCTION),
-            new Vector2(560f * Settings.xScale, HEIGHT_FUNCTION)
+            new Vector2(980f * Settings.xScale, HEIGHT_FUNCTION),
+            new Vector2(1060f * Settings.xScale, HEIGHT_FUNCTION)
     };
 
     private static final Texture bg = TextureLoader.getTexture("bronzeResources/images/ui/sequenceframe.png");

diff --git a/src/main/java/automaton/actions/ChosenAction.java b/src/main/java/automaton/actions/ChosenAction.java
@@ -1,8 +1,3 @@
-//
-// Source code recreated from a .class file by IntelliJ IDEA
-// (powered by Fernflower decompiler)
-//
-
 package automaton.actions;
 
 import com.megacrit.cardcrawl.actions.AbstractGameAction;

diff --git a/src/main/java/automaton/actions/ScryBlockStatusAction.java b/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;

diff --git a/src/main/java/automaton/actions/ScryEncodeCardsAction.java b/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;

diff --git a/src/main/java/automaton/cardmods/CardEffectsCardMod.java b/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;

diff --git a/src/main/java/automaton/cardmods/EncodeAndShuffleMod.java b/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;

diff --git a/src/main/java/automaton/cardmods/EncodeMod.java b/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";

diff --git a/src/main/java/automaton/cardmods/PlayMeTwiceCardmod.java b/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;

diff --git a/src/main/java/automaton/cards/AbstractBronzeCard.java b/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;

diff --git a/src/main/java/automaton/cards/Assembly.java b/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 {
 

diff --git a/src/main/java/automaton/cards/Batch.java b/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;
 

diff --git a/src/main/java/automaton/cards/BitShift.java b/src/main/java/automaton/cards/BitShift.java
@@ -10,13 +10,12 @@
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.monsters.AbstractMonster;
 import expansioncontent.cardmods.PropertiesMod;
-import expansioncontent.cardmods.RetainCardMod;
 import sneckomod.SneckoMod;
 
-import static automaton.AutomatonMod.makeBetaCardPath;
-
 import java.util.ArrayList;
 
+import static automaton.AutomatonMod.makeBetaCardPath;
+
 public class BitShift extends AbstractBronzeCard {
     public final static String ID = makeID("BitShift");
 

diff --git a/src/main/java/automaton/cards/Branch.java b/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");
@@ -29,7 +37,7 @@ public class Branch extends AbstractBronzeCard implements OctopusCard {
     private static final int BLOCK = 6;
 
     public Branch() {
-        super(ID, 1, CardType.ATTACK, CardRarity.COMMON, CardTarget.SELF_AND_ENEMY);
+        super(ID, 1, CardType.ATTACK, CardRarity.COMMON, CardTarget.ENEMY);
         baseDamage = DAMAGE;
         baseBlock = BLOCK;
         exhaust = true;
@@ -60,6 +68,24 @@ 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();
+                    }
+                }
+
+                if (AbstractDungeon.player.hasPower(VigorPower.POWER_ID)) {
+                    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": {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		1/28/2024 - This is a temporary message to let everyone know the Discord account and server is back under our control.