From d071e64d9db490c2743f2f425fdf2919da2cf1da Mon Sep 17 00:00:00 2001 From: Twan van Laarhoven Date: Thu, 1 Nov 2018 01:19:00 +0100 Subject: [PATCH] Renamed Spicy Sausage to Special Sausage --- CHANGELOG.md | 2 +- src/main/java/conspire/Conspire.java | 4 +-- ...erity.java => SausageOptionDexterity.java} | 8 ++--- ...tionFocus.java => SausageOptionFocus.java} | 8 ++--- ...rength.java => SausageOptionStrength.java} | 8 ++--- ...{SpicySausage.java => SpecialSausage.java} | 33 +++++++++++------- ...xterity.png => SausageOptionDexterity.png} | Bin ...OptionFocus.png => SausageOptionFocus.png} | Bin ...Strength.png => SausageOptionStrength.png} | Bin .../{SpicySausage.png => SpecialSausage.png} | Bin .../localization/eng/conspire-cards.json | 12 +++---- .../localization/eng/conspire-relics.json | 7 ++-- 12 files changed, 46 insertions(+), 36 deletions(-) rename src/main/java/conspire/cards/special/{SpicySausageOptionDexterity.java => SausageOptionDexterity.java} (81%) rename src/main/java/conspire/cards/special/{SpicySausageOptionFocus.java => SausageOptionFocus.java} (82%) rename src/main/java/conspire/cards/special/{SpicySausageOptionStrength.java => SausageOptionStrength.java} (81%) rename src/main/java/conspire/relics/{SpicySausage.java => SpecialSausage.java} (82%) rename src/main/resources/conspire/images/cards/large/{SpicySausageOptionDexterity.png => SausageOptionDexterity.png} (100%) rename src/main/resources/conspire/images/cards/large/{SpicySausageOptionFocus.png => SausageOptionFocus.png} (100%) rename src/main/resources/conspire/images/cards/large/{SpicySausageOptionStrength.png => SausageOptionStrength.png} (100%) rename src/main/resources/conspire/images/relics/source/{SpicySausage.png => SpecialSausage.png} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76396b8..503354a 100644 --- a/CHANGELOG.md +++ b/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) diff --git a/src/main/java/conspire/Conspire.java b/src/main/java/conspire/Conspire.java index 56bdaeb..572c14d 100644 --- a/src/main/java/conspire/Conspire.java +++ b/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()); diff --git a/src/main/java/conspire/cards/special/SpicySausageOptionDexterity.java b/src/main/java/conspire/cards/special/SausageOptionDexterity.java similarity index 81% rename from src/main/java/conspire/cards/special/SpicySausageOptionDexterity.java rename to src/main/java/conspire/cards/special/SausageOptionDexterity.java index 174e2a8..9ad9915 100644 --- a/src/main/java/conspire/cards/special/SpicySausageOptionDexterity.java +++ b/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 diff --git a/src/main/java/conspire/cards/special/SpicySausageOptionFocus.java b/src/main/java/conspire/cards/special/SausageOptionFocus.java similarity index 82% rename from src/main/java/conspire/cards/special/SpicySausageOptionFocus.java rename to src/main/java/conspire/cards/special/SausageOptionFocus.java index a708ac9..6db8843 100644 --- a/src/main/java/conspire/cards/special/SpicySausageOptionFocus.java +++ b/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 diff --git a/src/main/java/conspire/cards/special/SpicySausageOptionStrength.java b/src/main/java/conspire/cards/special/SausageOptionStrength.java similarity index 81% rename from src/main/java/conspire/cards/special/SpicySausageOptionStrength.java rename to src/main/java/conspire/cards/special/SausageOptionStrength.java index a064bd6..0bec529 100644 --- a/src/main/java/conspire/cards/special/SpicySausageOptionStrength.java +++ b/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 diff --git a/src/main/java/conspire/relics/SpicySausage.java b/src/main/java/conspire/relics/SpecialSausage.java similarity index 82% rename from src/main/java/conspire/relics/SpicySausage.java rename to src/main/java/conspire/relics/SpecialSausage.java index b6e3fa2..305cdcf 100644 --- a/src/main/java/conspire/relics/SpicySausage.java +++ b/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 { - public static final String ID = "conspire:SpicySausage"; +public class SpecialSausage extends AbstractConspireRelic implements CustomSavable { + 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,9 +69,9 @@ public void onEquip() { // Show a screen to select a buff buff = null; ArrayList 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); } @@ -79,9 +79,9 @@ public void onEquip() { 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,6 +105,15 @@ 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(); @@ -112,7 +121,7 @@ public void setDescriptionAfterLoading() { @Override public AbstractRelic makeCopy() { - return new SpicySausage(); + return new SpecialSausage(); } @Override diff --git a/src/main/resources/conspire/images/cards/large/SpicySausageOptionDexterity.png b/src/main/resources/conspire/images/cards/large/SausageOptionDexterity.png similarity index 100% rename from src/main/resources/conspire/images/cards/large/SpicySausageOptionDexterity.png rename to src/main/resources/conspire/images/cards/large/SausageOptionDexterity.png diff --git a/src/main/resources/conspire/images/cards/large/SpicySausageOptionFocus.png b/src/main/resources/conspire/images/cards/large/SausageOptionFocus.png similarity index 100% rename from src/main/resources/conspire/images/cards/large/SpicySausageOptionFocus.png rename to src/main/resources/conspire/images/cards/large/SausageOptionFocus.png diff --git a/src/main/resources/conspire/images/cards/large/SpicySausageOptionStrength.png b/src/main/resources/conspire/images/cards/large/SausageOptionStrength.png similarity index 100% rename from src/main/resources/conspire/images/cards/large/SpicySausageOptionStrength.png rename to src/main/resources/conspire/images/cards/large/SausageOptionStrength.png diff --git a/src/main/resources/conspire/images/relics/source/SpicySausage.png b/src/main/resources/conspire/images/relics/source/SpecialSausage.png similarity index 100% rename from src/main/resources/conspire/images/relics/source/SpicySausage.png rename to src/main/resources/conspire/images/relics/source/SpecialSausage.png diff --git a/src/main/resources/conspire/localization/eng/conspire-cards.json b/src/main/resources/conspire/localization/eng/conspire-cards.json index c99850b..d46f03e 100644 --- a/src/main/resources/conspire/localization/eng/conspire-cards.json +++ b/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." } } \ No newline at end of file diff --git a/src/main/resources/conspire/localization/eng/conspire-relics.json b/src/main/resources/conspire/localization/eng/conspire-relics.json index f3eea53..0222e68 100644 --- a/src/main/resources/conspire/localization/eng/conspire-relics.json +++ b/src/main/resources/conspire/localization/eng/conspire-relics.json @@ -102,8 +102,8 @@ "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", @@ -111,7 +111,8 @@ " #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": {