Renamed Spicy Sausage to Special Sausage

CHANGELOG.md

@@ -1,5 +1,5 @@
 ### v1.5.0
-* Added relics: Spicy Sausage, Treasure Map, Bottled Yo-Yo, Runic Octahedron
+* Added relics: Special Sausage, Treasure Map, Bottled Yo-Yo, Runic Octahedron
 * Fix: Water orb shouldn't be affected by focus
 * Fix: Necrotic Wound should not play at end of turn when you have Runic Pyramid
 * Fix: Purge shouldn't remove Necronomicurse, Ascender's Bane, and other souldbound cards (interacts with StsLib)

src/main/java/conspire/Conspire.java

@@ -89,9 +89,9 @@
 import conspire.relics.InfiniteJournal;
 import conspire.relics.RoyalGoblet;
 import conspire.relics.RunicOctahedron;
+import conspire.relics.SpecialSausage;
 import conspire.relics.SeveredTorchhead;
 import conspire.relics.SlowCooker;
-import conspire.relics.SpicySausage;
 import conspire.relics.TopHat;
 import conspire.relics.TreasureMap;
 
@@ -236,7 +236,7 @@ public void receiveEditRelics() {
         BaseMod.addRelic(new RunicOctahedron(), RelicType.SHARED);
         BaseMod.addRelic(new SeveredTorchhead(), RelicType.SHARED);
         BaseMod.addRelic(new SlowCooker(), RelicType.SHARED);
-        BaseMod.addRelic(new SpicySausage(), RelicType.SHARED);
+        BaseMod.addRelic(new SpecialSausage(), RelicType.SHARED);
         BaseMod.addRelic(new TopHat(), RelicType.SHARED);
         BaseMod.addRelic(new TreasureMap(), RelicType.SHARED);
         BaseMod.addSaveField("conspire:TreasureMap",new TreasureMap.TreasureMapDataSaver());

src/main/java/conspire/cards/special/SpicySausageOptionDexterity.java → src/main/java/conspire/cards/special/SausageOptionDexterity.java

@@ -12,14 +12,14 @@
 import basemod.abstracts.CustomCard;
 import conspire.Conspire;
 
-public class SpicySausageOptionDexterity extends CustomCard {
-    public static final String ID = "conspire:SpicySausageOptionDexterity";
+public class SausageOptionDexterity extends CustomCard {
+    public static final String ID = "conspire:SausageOptionDexterity";
     private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
     public static final String NAME = cardStrings.NAME;
     public static final String DESCRIPTION = cardStrings.DESCRIPTION;
     private static final int COST = -2;
 
-    public SpicySausageOptionDexterity(int amount) {
+    public SausageOptionDexterity(int amount) {
         super(ID, NAME, Conspire.cardImage(ID), COST, DESCRIPTION, CardType.SKILL, CardColor.COLORLESS, CardRarity.SPECIAL, CardTarget.NONE);
         this.magicNumber = this.baseMagicNumber = amount;
     }
@@ -31,7 +31,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
 
     @Override
     public AbstractCard makeCopy() {
-        return new SpicySausageOptionDexterity(this.baseMagicNumber);
+        return new SausageOptionDexterity(this.baseMagicNumber);
     }
 
     @Override

src/main/java/conspire/cards/special/SpicySausageOptionFocus.java → src/main/java/conspire/cards/special/SausageOptionFocus.java

@@ -12,14 +12,14 @@
 import basemod.abstracts.CustomCard;
 import conspire.Conspire;
 
-public class SpicySausageOptionFocus extends CustomCard {
-    public static final String ID = "conspire:SpicySausageOptionFocus";
+public class SausageOptionFocus extends CustomCard {
+    public static final String ID = "conspire:SausageOptionFocus";
     private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
     public static final String NAME = cardStrings.NAME;
     public static final String DESCRIPTION = cardStrings.DESCRIPTION;
     private static final int COST = -2;
 
-    public SpicySausageOptionFocus(int amount) {
+    public SausageOptionFocus(int amount) {
         super(ID, NAME, Conspire.cardImage(ID), COST, DESCRIPTION, CardType.SKILL, CardColor.COLORLESS, CardRarity.SPECIAL, CardTarget.NONE);
         this.magicNumber = this.baseMagicNumber = amount;
     }
@@ -31,7 +31,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
 
     @Override
     public AbstractCard makeCopy() {
-        return new SpicySausageOptionFocus(this.baseMagicNumber);
+        return new SausageOptionFocus(this.baseMagicNumber);
     }
 
     @Override

src/main/java/conspire/cards/special/SpicySausageOptionStrength.java → src/main/java/conspire/cards/special/SausageOptionStrength.java

@@ -12,14 +12,14 @@
 import basemod.abstracts.CustomCard;
 import conspire.Conspire;
 
-public class SpicySausageOptionStrength extends CustomCard {
-    public static final String ID = "conspire:SpicySausageOptionStrength";
+public class SausageOptionStrength extends CustomCard {
+    public static final String ID = "conspire:SausageOptionStrength";
     private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
     public static final String NAME = cardStrings.NAME;
     public static final String DESCRIPTION = cardStrings.DESCRIPTION;
     private static final int COST = -2;
 
-    public SpicySausageOptionStrength(int amount) {
+    public SausageOptionStrength(int amount) {
         super(ID, NAME, Conspire.cardImage(ID), COST, DESCRIPTION, CardType.SKILL, CardColor.COLORLESS, CardRarity.SPECIAL, CardTarget.NONE);
         this.magicNumber = this.baseMagicNumber = amount;
     }
@@ -31,7 +31,7 @@ public void use(AbstractPlayer p, AbstractMonster m) {
 
     @Override
     public AbstractCard makeCopy() {
-        return new SpicySausageOptionStrength(this.baseMagicNumber);
+        return new SausageOptionStrength(this.baseMagicNumber);
     }
 
     @Override

src/main/java/conspire/relics/SpicySausage.java → src/main/java/conspire/relics/SpecialSausage.java

@@ -21,12 +21,12 @@
 import basemod.ReflectionHacks;
 import basemod.abstracts.CustomSavable;
 import conspire.Conspire;
-import conspire.cards.special.SpicySausageOptionDexterity;
-import conspire.cards.special.SpicySausageOptionFocus;
-import conspire.cards.special.SpicySausageOptionStrength;
+import conspire.cards.special.SausageOptionDexterity;
+import conspire.cards.special.SausageOptionFocus;
+import conspire.cards.special.SausageOptionStrength;
 
-public class SpicySausage extends AbstractConspireRelic implements CustomSavable<SpicySausage.Buff> {
-    public static final String ID = "conspire:SpicySausage";
+public class SpecialSausage extends AbstractConspireRelic implements CustomSavable<SpecialSausage.Buff> {
+    public static final String ID = "conspire:SpecialSausage";
     private static final int STR_AMT = 2;
     private static final int DEX_AMT = 2;
     private static final int FOCUS_AMT = 2;
@@ -35,7 +35,7 @@ enum Buff {
     }
     private Buff buff;
 
-    public SpicySausage() {
+    public SpecialSausage() {
         super(ID, AbstractRelic.RelicTier.BOSS, AbstractRelic.LandingSound.FLAT);
     }
 
@@ -69,19 +69,19 @@ public void onEquip() {
         // Show a screen to select a buff
         buff = null;
         ArrayList<AbstractCard> choices = new ArrayList<>();
-        choices.add(new SpicySausageOptionStrength(STR_AMT));
-        choices.add(new SpicySausageOptionDexterity(DEX_AMT));
-        choices.add(new SpicySausageOptionFocus(FOCUS_AMT));
+        choices.add(new SausageOptionStrength(STR_AMT));
+        choices.add(new SausageOptionDexterity(DEX_AMT));
+        choices.add(new SausageOptionFocus(FOCUS_AMT));
         openCardRewardsScreen(choices);
     }
 
     @Override
     public void update() {
         super.update();
         if (buff == null && AbstractDungeon.cardRewardScreen.discoveryCard != null) {
-            if (AbstractDungeon.cardRewardScreen.discoveryCard instanceof SpicySausageOptionStrength) {
+            if (AbstractDungeon.cardRewardScreen.discoveryCard instanceof SausageOptionStrength) {
                 buff = Buff.STRENGTH;
-            } else if (AbstractDungeon.cardRewardScreen.discoveryCard instanceof SpicySausageOptionStrength) {
+            } else if (AbstractDungeon.cardRewardScreen.discoveryCard instanceof SausageOptionDexterity) {
                 buff = Buff.DEXTERITY;
             } else {
                 buff = Buff.FOCUS;
@@ -105,14 +105,23 @@ public String getUpdatedDescription() {
 
     public void setDescriptionAfterLoading() {
         this.description = getUpdatedDescription();
+        // TODO: figure out how to change relic name
+        /*
+        if (buff != null) {
+            switch (buff) {
+                case STRENGTH:  this.name = DESCRIPTIONS[9];
+                case DEXTERITY: this.name = DESCRIPTIONS[10];
+                case FOCUS:     this.name = DESCRIPTIONS[11];
+            }
+        }*/
         this.tips.clear();
         this.tips.add(new PowerTip(this.name, this.description));
         this.initializeTips();
     }
 
     @Override
     public AbstractRelic makeCopy() {
-        return new SpicySausage();
+        return new SpecialSausage();
     }
 
     @Override

src/main/resources/conspire/localization/eng/conspire-cards.json

@@ -85,16 +85,16 @@
     "DESCRIPTION": "Unplayable. NL When this card is drawn, shuffle a Wound into your draw pile."
   },
 
-  "conspire:SpicySausageOptionStrength": {
-    "NAME": "Strength",
+  "conspire:SausageOptionStrength": {
+    "NAME": "Spicy Sausage",
     "DESCRIPTION": "Start each combat with !M! Strength."
   },
-  "conspire:SpicySausageOptionDexterity": {
-    "NAME": "Dexterity",
+  "conspire:SausageOptionDexterity": {
+    "NAME": "Seasoned Sausage",
     "DESCRIPTION": "Start each combat with !M! Dexterity."
   },
-  "conspire:SpicySausageOptionFocus": {
-    "NAME": "Focus",
+  "conspire:SausageOptionFocus": {
+    "NAME": "Smokey Sausage",
     "DESCRIPTION": "Start each combat with !M! Focus."
   }
 }

src/main/resources/conspire/localization/eng/conspire-relics.json

@@ -102,16 +102,17 @@
       "Gain [E] at the start of each turn. NL On the first turn of combat lose 2 Energy instead."
     ]
   },
-  "conspire:SpicySausage": {
-    "NAME": "Spicy Sausage",
+  "conspire:SpecialSausage": {
+    "NAME": "Special Sausage",
     "FLAVOR": "Found lying around the spire. Should be safe to eat.",
     "DESCRIPTIONS": [
       "Upon pickup, choose to start each combat with #b",
       " #yStrength, #b",
       " #yDexterity, or #b",
       " #yFocus.",
       "Choose a Sausage",
-      "Start each combat with #b"," #yStrength."," #yDexterity."," #yFocus."
+      "Start each combat with #b"," #yStrength."," #yDexterity."," #yFocus.",
+      "Spicy Sausage", "Seasoned Sausage", "Smokey Sausage"
     ]
   },
   "conspire:TopHat": {