diff --git a/.gitignore b/.gitignore index a7eea82..0849a28 100644 --- a/.gitignore +++ b/.gitignore @@ -28,7 +28,7 @@ com_crashlytics_export_strings.xml ## maven target/ -lib/ +src/main/java/lib/ AndroidTestMod_dex.jar *.bat diff --git a/lib/SlayTheSpire-android.jar b/lib/SlayTheSpire-android.jar new file mode 100644 index 0000000..08d0063 Binary files /dev/null and b/lib/SlayTheSpire-android.jar differ diff --git a/pom.xml b/pom.xml index b81094e..331abd7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ - AndroidTestMod + RandomMod org.apache.maven.plugins diff --git a/src/main/java/com/megacrit/cardcrawl/relics/MercuryHourglass.java b/src/main/java/com/megacrit/cardcrawl/relics/MercuryHourglass.java new file mode 100644 index 0000000..7dd8610 --- /dev/null +++ b/src/main/java/com/megacrit/cardcrawl/relics/MercuryHourglass.java @@ -0,0 +1,38 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package com.megacrit.cardcrawl.relics; + +import com.megacrit.cardcrawl.actions.AbstractGameAction.AttackEffect; +import com.megacrit.cardcrawl.actions.common.DamageAllEnemiesAction; +import com.megacrit.cardcrawl.actions.common.RelicAboveCreatureAction; +import com.megacrit.cardcrawl.cards.DamageInfo; +import com.megacrit.cardcrawl.cards.DamageInfo.DamageType; +import com.megacrit.cardcrawl.core.AbstractCreature; +import com.megacrit.cardcrawl.dungeons.AbstractDungeon; +import com.megacrit.cardcrawl.relics.AbstractRelic.LandingSound; +import com.megacrit.cardcrawl.relics.AbstractRelic.RelicTier; + +public class MercuryHourglass extends AbstractRelic { + public static final String ID = "Mercury Hourglass"; + private static final int DMG = 3; + + public MercuryHourglass() { + super("Mercury Hourglass", "hourglass.png", RelicTier.UNCOMMON, LandingSound.CLINK); + } + + public String getUpdatedDescription() { + return this.DESCRIPTIONS[0] + 3 + this.DESCRIPTIONS[1]; + } + + public void atTurnStart() { + this.flash(); + this.addToBot(new RelicAboveCreatureAction(AbstractDungeon.player, this)); + } + + public AbstractRelic makeCopy() { + return new MercuryHourglass(); + } +} diff --git a/src/main/java/randomMod/RandomMod.java b/src/main/java/randomMod/RandomMod.java index cbe4fc4..eb75e6f 100644 --- a/src/main/java/randomMod/RandomMod.java +++ b/src/main/java/randomMod/RandomMod.java @@ -40,7 +40,7 @@ public static String makeId(String name) { } public static String getResourcePath(String path) { - return "Random-TestImages/" + path; + return "RandomMod-TestImages/" + path; } @Override @@ -62,8 +62,8 @@ public void receiveEditStrings() { default: language = "eng"; } - BaseMod.loadCustomStringsFile(MOD_ID, CardStrings.class, "Random-localization/" + language + "/AndroidTest-CardStrings.json"); - BaseMod.loadCustomStringsFile(MOD_ID, RelicStrings.class, "Random-localization/" + language + "/Random-RelicStrings.json"); + BaseMod.loadCustomStringsFile(MOD_ID, CardStrings.class, "RandomMod-localization/" + language + "/AndroidTest-CardStrings.json"); + BaseMod.loadCustomStringsFile(MOD_ID, RelicStrings.class, "RandomMod-localization/" + language + "/Random-RelicStrings.json"); } @Override @@ -82,7 +82,7 @@ public void receiveEditKeywords() { language = "eng"; } final Gson gson = new Gson(); - final String json = AssetLoader.getString(MOD_ID, "Random-localization/" + language + "/Random-keyword.json"); + final String json = AssetLoader.getString(MOD_ID, "RandomMod-localization/" + language + "/Random-keyword.json"); Keyword[] keywords = gson.fromJson(json, Keyword[].class); if (keywords != null) { for (Keyword keyword : keywords) { diff --git a/src/main/java/randomMod/relics/RandomFusionMonster.java b/src/main/java/randomMod/relics/RandomFusionMonster.java index 8bee588..9fdb363 100644 --- a/src/main/java/randomMod/relics/RandomFusionMonster.java +++ b/src/main/java/randomMod/relics/RandomFusionMonster.java @@ -1,5 +1,6 @@ package randomMod.relics; +import com.megacrit.cardcrawl.relics.MercuryHourglass; import randomMod.RandomMod; import randomMod.utils.randommonster; import com.megacrit.cardcrawl.actions.AbstractGameAction; @@ -23,7 +24,7 @@ public class RandomFusionMonster extends CustomRelic { public static final String IMG_PATH = RandomMod.getResourcePath("relics/runeOctahedron.png"); public RandomFusionMonster() { - super(RandomMod.MOD_ID, ID, IMG_PATH, RelicTier.RARE, LandingSound.SOLID); + super(RandomMod.MOD_ID, ID, IMG_PATH, RelicTier.SPECIAL, LandingSound.SOLID); this.counter = 2; } @@ -31,6 +32,7 @@ public RandomFusionMonster() { @Override public void atBattleStart() { roll_monster(); + } public void roll_monster() { AbstractMonster m; @@ -142,10 +144,20 @@ public void update() { this.addToBot(new ApplyPowerAction(SP, AbstractDungeon.player, new VulnerablePower(SP, 1, false), 1, true)); } - if (m.maxHealth!=400) { AbstractDungeon.actionManager.addToBottom(new CannotLoseAction()); - + if (m.maxHealth!=400) { + AbstractMonster finalM = m; + AbstractDungeon.actionManager.addToBottom(new AbstractGameAction() { + @Override + public void update() { + AbstractDungeon.getCurrRoom().cannotLose = true; + finalM.gold = 0; + finalM.currentHealth = 0; + finalM.die(false); + finalM.healthBarUpdatedEvent(); + isDone=true; + } + }); AbstractDungeon.actionManager.addToBottom(new HideHealthBarAction(m)); - AbstractDungeon.actionManager.addToBottom(new SuicideAction(m, false)); AbstractDungeon.actionManager.addToBottom(new CanLoseAction());} }} diff --git a/src/main/resources/ModTheSpire.json b/src/main/resources/ModTheSpire.json index 7677c75..c5867d0 100644 --- a/src/main/resources/ModTheSpire.json +++ b/src/main/resources/ModTheSpire.json @@ -1,7 +1,7 @@ { "modId": "RandomMod", "modName": "随机融合怪", - "modVersion": "1.6", + "modVersion": "1.8", "descriptions": { "zhs": ["怪物变成随机同层怪物,血量不变,buff保留"], "eng": ["STS android test mod.怪物变成随机同层怪物,血量不变,buff保留"] diff --git a/src/main/resources/Random-TestImages/1024/bg_attack_huntress.png b/src/main/resources/RandomMod-TestImages/1024/bg_attack_huntress.png similarity index 100% rename from src/main/resources/Random-TestImages/1024/bg_attack_huntress.png rename to src/main/resources/RandomMod-TestImages/1024/bg_attack_huntress.png diff --git a/src/main/resources/Random-TestImages/1024/bg_power_huntress.png b/src/main/resources/RandomMod-TestImages/1024/bg_power_huntress.png similarity index 100% rename from src/main/resources/Random-TestImages/1024/bg_power_huntress.png rename to src/main/resources/RandomMod-TestImages/1024/bg_power_huntress.png diff --git a/src/main/resources/Random-TestImages/1024/bg_power_yellow.png b/src/main/resources/RandomMod-TestImages/1024/bg_power_yellow.png similarity index 100% rename from src/main/resources/Random-TestImages/1024/bg_power_yellow.png rename to src/main/resources/RandomMod-TestImages/1024/bg_power_yellow.png diff --git a/src/main/resources/Random-TestImages/1024/bg_skill_huntress.png b/src/main/resources/RandomMod-TestImages/1024/bg_skill_huntress.png similarity index 100% rename from src/main/resources/Random-TestImages/1024/bg_skill_huntress.png rename to src/main/resources/RandomMod-TestImages/1024/bg_skill_huntress.png diff --git a/src/main/resources/Random-TestImages/1024/card_huntress_orb.png b/src/main/resources/RandomMod-TestImages/1024/card_huntress_orb.png similarity index 100% rename from src/main/resources/Random-TestImages/1024/card_huntress_orb.png rename to src/main/resources/RandomMod-TestImages/1024/card_huntress_orb.png diff --git a/src/main/resources/Random-TestImages/512/bg_attack_huntress.png b/src/main/resources/RandomMod-TestImages/512/bg_attack_huntress.png similarity index 100% rename from src/main/resources/Random-TestImages/512/bg_attack_huntress.png rename to src/main/resources/RandomMod-TestImages/512/bg_attack_huntress.png diff --git a/src/main/resources/Random-TestImages/512/bg_attack_huntress.psd b/src/main/resources/RandomMod-TestImages/512/bg_attack_huntress.psd similarity index 100% rename from src/main/resources/Random-TestImages/512/bg_attack_huntress.psd rename to src/main/resources/RandomMod-TestImages/512/bg_attack_huntress.psd diff --git a/src/main/resources/Random-TestImages/512/bg_power_huntress.png b/src/main/resources/RandomMod-TestImages/512/bg_power_huntress.png similarity index 100% rename from src/main/resources/Random-TestImages/512/bg_power_huntress.png rename to src/main/resources/RandomMod-TestImages/512/bg_power_huntress.png diff --git a/src/main/resources/Random-TestImages/512/bg_power_huntress.psd b/src/main/resources/RandomMod-TestImages/512/bg_power_huntress.psd similarity index 100% rename from src/main/resources/Random-TestImages/512/bg_power_huntress.psd rename to src/main/resources/RandomMod-TestImages/512/bg_power_huntress.psd diff --git a/src/main/resources/Random-TestImages/512/bg_skill_huntress.png b/src/main/resources/RandomMod-TestImages/512/bg_skill_huntress.png similarity index 100% rename from src/main/resources/Random-TestImages/512/bg_skill_huntress.png rename to src/main/resources/RandomMod-TestImages/512/bg_skill_huntress.png diff --git a/src/main/resources/Random-TestImages/512/bg_skill_huntress.psd b/src/main/resources/RandomMod-TestImages/512/bg_skill_huntress.psd similarity index 100% rename from src/main/resources/Random-TestImages/512/bg_skill_huntress.psd rename to src/main/resources/RandomMod-TestImages/512/bg_skill_huntress.psd diff --git a/src/main/resources/Random-TestImages/512/card_huntress_orb.png b/src/main/resources/RandomMod-TestImages/512/card_huntress_orb.png similarity index 100% rename from src/main/resources/Random-TestImages/512/card_huntress_orb.png rename to src/main/resources/RandomMod-TestImages/512/card_huntress_orb.png diff --git a/src/main/resources/Random-TestImages/512/card_small_orb.png b/src/main/resources/RandomMod-TestImages/512/card_small_orb.png similarity index 100% rename from src/main/resources/Random-TestImages/512/card_small_orb.png rename to src/main/resources/RandomMod-TestImages/512/card_small_orb.png diff --git a/src/main/resources/Random-TestImages/cards/testStrike.png b/src/main/resources/RandomMod-TestImages/cards/testStrike.png similarity index 100% rename from src/main/resources/Random-TestImages/cards/testStrike.png rename to src/main/resources/RandomMod-TestImages/cards/testStrike.png diff --git a/src/main/resources/Random-TestImages/cards/testStrike_p.png b/src/main/resources/RandomMod-TestImages/cards/testStrike_p.png similarity index 100% rename from src/main/resources/Random-TestImages/cards/testStrike_p.png rename to src/main/resources/RandomMod-TestImages/cards/testStrike_p.png diff --git a/src/main/resources/Random-TestImages/relics/runeOctahedron.png b/src/main/resources/RandomMod-TestImages/relics/runeOctahedron.png similarity index 100% rename from src/main/resources/Random-TestImages/relics/runeOctahedron.png rename to src/main/resources/RandomMod-TestImages/relics/runeOctahedron.png diff --git a/src/main/resources/Random-TestImages/relics/runeOctahedron.psd b/src/main/resources/RandomMod-TestImages/relics/runeOctahedron.psd similarity index 100% rename from src/main/resources/Random-TestImages/relics/runeOctahedron.psd rename to src/main/resources/RandomMod-TestImages/relics/runeOctahedron.psd diff --git a/src/main/resources/Random-localization/eng/AndroidTest-CardStrings.json b/src/main/resources/RandomMod-localization/eng/AndroidTest-CardStrings.json similarity index 100% rename from src/main/resources/Random-localization/eng/AndroidTest-CardStrings.json rename to src/main/resources/RandomMod-localization/eng/AndroidTest-CardStrings.json diff --git a/src/main/resources/Random-localization/eng/Random-RelicStrings.json b/src/main/resources/RandomMod-localization/eng/Random-RelicStrings.json similarity index 100% rename from src/main/resources/Random-localization/eng/Random-RelicStrings.json rename to src/main/resources/RandomMod-localization/eng/Random-RelicStrings.json diff --git a/src/main/resources/Random-localization/eng/Random-keyword.json b/src/main/resources/RandomMod-localization/eng/Random-keyword.json similarity index 100% rename from src/main/resources/Random-localization/eng/Random-keyword.json rename to src/main/resources/RandomMod-localization/eng/Random-keyword.json diff --git a/src/main/resources/Random-localization/zhs/AndroidTest-CardStrings.json b/src/main/resources/RandomMod-localization/zhs/AndroidTest-CardStrings.json similarity index 100% rename from src/main/resources/Random-localization/zhs/AndroidTest-CardStrings.json rename to src/main/resources/RandomMod-localization/zhs/AndroidTest-CardStrings.json diff --git a/src/main/resources/Random-localization/zhs/Random-RelicStrings.json b/src/main/resources/RandomMod-localization/zhs/Random-RelicStrings.json similarity index 100% rename from src/main/resources/Random-localization/zhs/Random-RelicStrings.json rename to src/main/resources/RandomMod-localization/zhs/Random-RelicStrings.json diff --git a/src/main/resources/Random-localization/zhs/Random-keyword.json b/src/main/resources/RandomMod-localization/zhs/Random-keyword.json similarity index 100% rename from src/main/resources/Random-localization/zhs/Random-keyword.json rename to src/main/resources/RandomMod-localization/zhs/Random-keyword.json