Skip to content

Commit 9aa38a8

Browse files
committed
Fixes, rarity changes, file clenaup
1 parent 2355856 commit 9aa38a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+87
-159
lines changed

src/main/java/guardian/GuardianMod.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.badlogic.gdx.Gdx;
77
import com.badlogic.gdx.graphics.Color;
88
import com.badlogic.gdx.graphics.Texture;
9+
import com.evacipated.cardcrawl.mod.stslib.Keyword;
910
import com.evacipated.cardcrawl.modthespire.Loader;
1011
import com.evacipated.cardcrawl.modthespire.lib.SpireEnum;
1112
import com.google.gson.Gson;
@@ -671,9 +672,13 @@ public void receiveEditKeywords() {
671672
logger.info("begin editing strings");
672673
final String json = Gdx.files.internal("localization/" + language + "/Guardian-KeywordStrings.json").readString(String.valueOf(StandardCharsets.UTF_8));
673674

674-
final com.evacipated.cardcrawl.mod.stslib.Keyword[] keywords = (com.evacipated.cardcrawl.mod.stslib.Keyword[])gson.fromJson(json, (Class) com.evacipated.cardcrawl.mod.stslib.Keyword[].class);
675+
com.evacipated.cardcrawl.mod.stslib.Keyword[] keywords = gson.fromJson(json, com.evacipated.cardcrawl.mod.stslib.Keyword[].class);
675676
if (keywords != null) {
676-
for (final com.evacipated.cardcrawl.mod.stslib.Keyword keyword : keywords) {
677+
com.evacipated.cardcrawl.mod.stslib.Keyword[] var6 = keywords;
678+
int var7 = keywords.length;
679+
680+
for(int var8 = 0; var8 < var7; ++var8) {
681+
Keyword keyword = var6[var8];
677682
BaseMod.addKeyword(keyword.PROPER_NAME, keyword.NAMES, keyword.DESCRIPTION);
678683
}
679684
}
@@ -859,7 +864,7 @@ public void receivePostInitialize() {
859864
settingsPanel.addUIElement(contentSharingBtnRelics);
860865
*/
861866

862-
BaseMod.registerModBadge(badgeTexture, "Slimebound", "Michael Mayhem", "Adds the Slimebound character to the game.", settingsPanel);
867+
BaseMod.registerModBadge(badgeTexture, "The Guardian", "Michael Mayhem, zwolfiez", "Adds the Guardian character to the game.", settingsPanel);
863868

864869
logger.info("Done loading badge Image and mod options");
865870

src/main/java/guardian/cards/ChargeCore.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
1414
import com.megacrit.cardcrawl.localization.CardStrings;
1515
import com.megacrit.cardcrawl.monsters.AbstractMonster;
16+
import com.megacrit.cardcrawl.powers.DrawCardNextTurnPower;
1617
import com.megacrit.cardcrawl.powers.EnergizedBluePower;
1718
import com.megacrit.cardcrawl.powers.EnergizedPower;
1819
import guardian.GuardianMod;
@@ -34,7 +35,7 @@ public class ChargeCore extends AbstractGuardianCard {
3435
//TUNING CONSTANTS
3536

3637
private static final int COST = 1;
37-
private static final int DAMAGE = 7;
38+
private static final int DAMAGE = 8;
3839
private static final int UPGRADE_BONUS = 3;
3940
private static final int SOCKETS = 1;
4041
private static final boolean SOCKETSAREAFTER = true;
@@ -58,7 +59,7 @@ public ChargeCore() {
5859
public void use(AbstractPlayer p, AbstractMonster m) {
5960
super.use(p, m);
6061
AbstractDungeon.actionManager.addToBottom(new DamageAction(m, new DamageInfo(p, this.damage, this.damageTypeForTurn), AbstractGameAction.AttackEffect.FIRE));
61-
AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new EnergizedPower(p, 1), 1));
62+
AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new DrawCardNextTurnPower(p, 1), 1));
6263

6364
this.useGems(p, m);
6465
}

src/main/java/guardian/cards/CurlUp.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ public void upgrade() {
6262
if (!this.upgraded) {
6363
upgradeName();
6464
upgradeBlock(UPGRADE_BONUS);
65+
this.socketCount++;
66+
this.updateDescription();
6567
}
6668
}
6769

src/main/java/guardian/cards/PrismaticBeam.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class PrismaticBeam extends AbstractGuardianCard {
2626
public static String UPGRADED_DESCRIPTION;
2727
public static final String IMG_PATH = "cards/prismaticBeam.png";
2828
private static final CardType TYPE = CardType.ATTACK;
29-
private static final CardRarity RARITY = CardRarity.COMMON;
29+
private static final CardRarity RARITY = CardRarity.UNCOMMON;
3030
private static final CardTarget TARGET = CardTarget.ENEMY;
3131

3232
private static final CardStrings cardStrings;

src/main/java/guardian/cards/Suspension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class Suspension extends AbstractGuardianCard {
2525

2626
private static final CardStrings cardStrings;
2727
private static final CardType TYPE = CardType.SKILL;
28-
private static final CardRarity RARITY = CardRarity.UNCOMMON;
28+
private static final CardRarity RARITY = CardRarity.COMMON;
2929
private static final CardTarget TARGET = CardTarget.SELF;
3030

3131
//TUNING CONSTANTS
259 Bytes
-6.11 KB
Binary file not shown.
-6.9 KB
Binary file not shown.
-5.74 KB
Binary file not shown.
-8.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)