New

.gitignore

@@ -28,7 +28,7 @@ com_crashlytics_export_strings.xml
 
 ## maven
 target/
-lib/
+src/main/java/lib/
 AndroidTestMod_dex.jar
 *.bat
 

pom.xml

@@ -24,7 +24,7 @@
     </dependencies>
 
     <build>
-        <finalName>AndroidTestMod</finalName>
+        <finalName>RandomMod</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

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();
+    }
+}

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) {

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,14 +24,15 @@ 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;
     }
 
 
     @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());}
 
         }}

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保留"]