v0.14.30 5/28/2019

lf201014 · May 27, 2019 · be8435f · be8435f
1 parent c16b3f5
commit be8435f
Show file tree

Hide file tree

Showing 20 changed files with 207 additions and 109 deletions.
diff --git a/Version_log.txt b/Version_log.txt
@@ -348,4 +348,11 @@ v0.14.29 5/12/2019
 *Dark Spark : Base damage : 14( 18 ) -> 7( 10 ) * 2
 *Final Spark : Cost : 8 -> 7;
 *Blaze Away : Rework : Uncommon ; Cost : 1 ; Play the last Attack you played this turn ( twice ).Exhaust.
+*Update support for Googly Eye(Github user:KAMAQUEEN)
+
+v0.14.30 4/28/2019
+*Blaze away : No longer Exhaust ;
+*Fix the bug cause the game crush when entering ? room in act 1 while the language is Traditional Chinese( due to in correct localizat*ion index id ) ;
+*(Hopefullly)Fix the bug that ManaRampage may target dead enemy , causing the energy wasted ;
+*Update Korean texts(Github user : Katinor)
 *Update support for Googly Eye(Github user:KAMAQUEEN)
diff --git a/Version_log_zhs.txt b/Version_log_zhs.txt
@@ -749,4 +749,12 @@ v0.14.29 5/12/2019
 *��ɫ�𻨣������˺���14( 18 ) -> 7( 10 ) * 2��
 *�����𻨣����ã�8->7;
 *�������䣺������������1�ѣ�������غ�ʹ�õ���󹥻��ƣ����Σ������ġ�
-*�����˶�Gooly Eye��֧�֣�github�û�:KAMAQUEEN��
+*�����˶�Gooly Eye��֧�֣�github�û�:KAMAQUEEN��
+
+v0.14.30 4/28/2019
+*�������䣺���ڲ�������
+*�޸�����Ϊ����ı��ػ�����ID���µ�������Ϊ����ʱ���룿�����˵�����
+*����ţ��޸��� ħ������ ������ѡ���Ѿ������ĵ�����ΪĿ�꣬�����������˷ѵ���bug
+*�����˶�Gooly Eye��֧�֣�github�û�:KAMAQUEEN��
+*�����˺����ı���Github user��Katinor��
+*�����˷������ĵ��ı���GitHub �û� : rainfoxest��
diff --git a/src/main/java/ThMod/action/ManaRampageAction.java b/src/main/java/ThMod/action/ManaRampageAction.java
@@ -17,21 +17,15 @@ public class ManaRampageAction
     extends AbstractGameAction {
 
   private boolean f2p;
-  private ArrayList<AbstractCard> list = new ArrayList<>();
   AbstractPlayer p;
+  boolean upgraded;
 
   public ManaRampageAction(int amount, boolean upgraded, boolean freeToPlay) {
     this.duration = Settings.ACTION_DUR_FAST;
     this.amount = amount;
     this.f2p = freeToPlay;
     this.p = AbstractDungeon.player;
-    for (int i = 0; i < this.amount; i++) {
-      AbstractCard tmp = AbstractDungeon.returnTrulyRandomCardInCombat(CardType.ATTACK).makeCopy();
-      if (upgraded) {
-        tmp.upgrade();
-      }
-      list.add(tmp);
-    }
+    this.upgraded = upgraded;
     ThMod.logger.info(
         "ManaRampageAction : Initialize complete ; card number :" +
             amount +
@@ -42,60 +36,16 @@ public ManaRampageAction(int amount, boolean upgraded, boolean freeToPlay) {
 
   public void update() {
 
-    int amount;
-    AbstractMonster target;
-
-    if (list.isEmpty()) {
-      this.isDone = true;
-      return;
-    }
-
-    AbstractCard card = list.get(0);
-    list.remove(0);
-    target = AbstractDungeon.getMonsters().getRandomMonster(true);
-/*
-    if (target == null) {
-      this.isDone = true;
-      ThMod.logger.info("ManaRampageAction : done");
-      return;
-    }
-    */
-    AbstractDungeon.player.limbo.group.add(card);
-    card.current_x = (Settings.WIDTH / 2.0F);
-    card.current_y = (Settings.HEIGHT / 2.0F);
-    card.target_x = (Settings.WIDTH / 2.0F - 300.0F * Settings.scale);
-    card.target_y = (Settings.HEIGHT / 2.0F);
-    card.freeToPlayOnce = true;
-    card.purgeOnUse = true;
-    card.targetAngle = 0.0F;
-    card.drawScale = 0.12F;
-    ThMod.logger.info(
-        "ManaRampageAction : card : " +
-            card.cardID +
-            " ; target : " +
-            target.id
-    );
-    /*
-    if (!card.canUse(AbstractDungeon.player, this.target)) {
-      AbstractDungeon.actionManager.addToTop(new UnlimboAction(card));
-    } else */
-    {
-      card.applyPowers();
-      AbstractDungeon.actionManager.currentAction = null;
-      AbstractDungeon.actionManager.addToTop(this);
-      AbstractDungeon.actionManager.cardQueue.add(
-          new CardQueueItem(card, target)
+    for (int i =0;i<amount;i++){
+      AbstractDungeon.actionManager.addToBottom(
+          new PlayManaRampageCardAction(upgraded)
       );
-      if (!Settings.FAST_MODE) {
-        AbstractDungeon.actionManager.addToTop(new WaitAction(Settings.ACTION_DUR_MED));
-      } else {
-        AbstractDungeon.actionManager.addToTop(new WaitAction(Settings.ACTION_DUR_FASTER));
-      }
     }
 
     if (!this.f2p) {
       p.energy.use(EnergyPanel.totalCount);
     }
+    this.isDone = true;
   }
 
 }
diff --git a/src/main/java/ThMod/action/PlayManaRampageCardAction.java b/src/main/java/ThMod/action/PlayManaRampageCardAction.java
@@ -0,0 +1,61 @@
+package ThMod.action;
+
+import ThMod.ThMod;
+import com.megacrit.cardcrawl.actions.AbstractGameAction;
+import com.megacrit.cardcrawl.actions.utility.WaitAction;
+import com.megacrit.cardcrawl.cards.AbstractCard;
+import com.megacrit.cardcrawl.cards.AbstractCard.CardType;
+import com.megacrit.cardcrawl.cards.CardQueueItem;
+import com.megacrit.cardcrawl.core.Settings;
+import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
+import com.megacrit.cardcrawl.monsters.AbstractMonster;
+
+public class PlayManaRampageCardAction  extends AbstractGameAction {
+
+  private AbstractCard card;
+  boolean upgraded;
+
+  PlayManaRampageCardAction(boolean upgraded){
+    this.duration = Settings.ACTION_DUR_FAST;
+    this.upgraded = upgraded;
+  }
+
+  public void update() {
+
+    target = AbstractDungeon.getMonsters().getRandomMonster(true);
+    card = AbstractDungeon.returnTrulyRandomCardInCombat(CardType.ATTACK).makeCopy();
+
+    if (upgraded){
+      card.upgrade();
+    }
+
+    AbstractDungeon.player.limbo.group.add(card);
+    card.current_x = (Settings.WIDTH / 2.0F);
+    card.current_y = (Settings.HEIGHT / 2.0F);
+    card.target_x = (Settings.WIDTH / 2.0F - 300.0F * Settings.scale);
+    card.target_y = (Settings.HEIGHT / 2.0F);
+    card.freeToPlayOnce = true;
+    card.purgeOnUse = true;
+    card.targetAngle = 0.0F;
+    card.drawScale = 0.12F;
+    card.lighten(false);
+    ThMod.logger.info(
+        "PlayManaRampageCardAction : card : " +
+            card.cardID +
+            " ; target : " +
+            target.id
+    );
+    card.applyPowers();
+    AbstractDungeon.actionManager.currentAction = null;
+    AbstractDungeon.actionManager.addToTop(this);
+    AbstractDungeon.actionManager.cardQueue.add(
+        new CardQueueItem(card, (AbstractMonster) target)
+    );
+    if (!Settings.FAST_MODE) {
+      AbstractDungeon.actionManager.addToTop(new WaitAction(Settings.ACTION_DUR_MED));
+    } else {
+      AbstractDungeon.actionManager.addToTop(new WaitAction(Settings.ACTION_DUR_FASTER));
+    }
+    this.isDone = true;
+  }
+}
diff --git a/src/main/java/ThMod/action/deprecated/ManaRampageAction.java b/src/main/java/ThMod/action/deprecated/ManaRampageAction.java
@@ -0,0 +1,102 @@
+package ThMod.action.deprecated;
+
+import ThMod.ThMod;
+import com.megacrit.cardcrawl.actions.AbstractGameAction;
+import com.megacrit.cardcrawl.actions.utility.WaitAction;
+import com.megacrit.cardcrawl.cards.AbstractCard;
+import com.megacrit.cardcrawl.cards.AbstractCard.CardType;
+import com.megacrit.cardcrawl.cards.CardQueueItem;
+import com.megacrit.cardcrawl.characters.AbstractPlayer;
+import com.megacrit.cardcrawl.core.Settings;
+import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
+import com.megacrit.cardcrawl.monsters.AbstractMonster;
+import com.megacrit.cardcrawl.ui.panels.EnergyPanel;
+import java.util.ArrayList;
+
+@Deprecated
+public class ManaRampageAction
+    extends AbstractGameAction {
+
+  private boolean f2p;
+  private ArrayList<AbstractCard> list = new ArrayList<>();
+  AbstractPlayer p;
+
+  public ManaRampageAction(int amount, boolean upgraded, boolean freeToPlay) {
+    this.duration = Settings.ACTION_DUR_FAST;
+    this.amount = amount;
+    this.f2p = freeToPlay;
+    this.p = AbstractDungeon.player;
+    for (int i = 0; i < this.amount; i++) {
+      AbstractCard tmp = AbstractDungeon.returnTrulyRandomCardInCombat(CardType.ATTACK).makeCopy();
+      if (upgraded) {
+        tmp.upgrade();
+      }
+      list.add(tmp);
+    }
+    ThMod.logger.info(
+        "ManaRampageAction : Initialize complete ; card number :" +
+            amount +
+            " ; upgraded : " +
+            upgraded
+    );
+  }
+
+  public void update() {
+
+    int amount;
+    AbstractMonster target;
+
+    if (list.isEmpty()) {
+      this.isDone = true;
+      return;
+    }
+
+    AbstractCard card = list.get(0);
+    list.remove(0);
+    target = AbstractDungeon.getMonsters().getRandomMonster(true);
+/*
+    if (target == null) {
+      this.isDone = true;
+      ThMod.logger.info("ManaRampageAction : done");
+      return;
+    }
+    */
+    AbstractDungeon.player.limbo.group.add(card);
+    card.current_x = (Settings.WIDTH / 2.0F);
+    card.current_y = (Settings.HEIGHT / 2.0F);
+    card.target_x = (Settings.WIDTH / 2.0F - 300.0F * Settings.scale);
+    card.target_y = (Settings.HEIGHT / 2.0F);
+    card.freeToPlayOnce = true;
+    card.purgeOnUse = true;
+    card.targetAngle = 0.0F;
+    card.drawScale = 0.12F;
+    ThMod.logger.info(
+        "ManaRampageAction : card : " +
+            card.cardID +
+            " ; target : " +
+            target.id
+    );
+    /*
+    if (!card.canUse(AbstractDungeon.player, this.target)) {
+      AbstractDungeon.actionManager.addToTop(new UnlimboAction(card));
+    } else */
+    {
+      card.applyPowers();
+      AbstractDungeon.actionManager.currentAction = null;
+      AbstractDungeon.actionManager.addToTop(this);
+      AbstractDungeon.actionManager.cardQueue.add(
+          new CardQueueItem(card, target)
+      );
+      if (!Settings.FAST_MODE) {
+        AbstractDungeon.actionManager.addToTop(new WaitAction(Settings.ACTION_DUR_MED));
+      } else {
+        AbstractDungeon.actionManager.addToTop(new WaitAction(Settings.ACTION_DUR_FASTER));
+      }
+    }
+
+    if (!this.f2p) {
+      p.energy.use(EnergyPanel.totalCount);
+    }
+  }
+
+}
diff --git a/src/main/java/ThMod/cards/Marisa/BlazeAway.java b/src/main/java/ThMod/cards/Marisa/BlazeAway.java
@@ -38,7 +38,6 @@ public BlazeAway() {
         CardRarity.UNCOMMON,
         CardTarget.SELF
     );
-    this.exhaust = true;
     this.baseMagicNumber = this.magicNumber = NUM;
   }
 

diff --git a/src/main/java/ThMod/patches/AbstractRelicPatch.java b/src/main/java/ThMod/patches/AbstractRelicPatch.java
diff --git a/src/main/java/ThMod/patches/ShopScreenPatch.java b/src/main/java/ThMod/patches/ShopScreenPatch.java
diff --git a/src/main/java/ThMod/relics/ShroomBag.java b/src/main/java/ThMod/relics/ShroomBag.java
@@ -30,6 +30,11 @@ public String getUpdatedDescription() {
   }
 
   public AbstractRelic makeCopy() {
+    if (AbstractDungeon.player != null){
+      if (AbstractDungeon.player.hasRelic("ShroomBag")){
+        return new BigShroomBag();
+      }
+    }
     return new ShroomBag();
   }
 

diff --git a/src/main/resources/ModTheSpire.json b/src/main/resources/ModTheSpire.json
@@ -11,7 +11,7 @@
   "dependencies": [
     "basemod"
   ],
-  "version": "0.14.29",
+  "version": "0.14.30",
   "sts_version": "01-23-2019",
   "update_json": "https://api.github.com/repos/lf201014/STS_ThMod_MRS/releases/latest"
 }
diff --git a/src/main/resources/localization/ThMod_Fnh_cards-fr.json b/src/main/resources/localization/ThMod_Fnh_cards-fr.json
@@ -168,8 +168,8 @@
   },
   "BlazeAway": {
     "NAME": "Flambée",
-    "DESCRIPTION": "Ajoutez une copie de la dernière Attaque jouée ce tour dans votre main. NL Elle coûte 0 ce tour. NL Épuisement.",
-    "UPGRADE_DESCRIPTION": "Ajoutez 2 copies de la dernière Attaque jouée ce tour dans votre main. NL Elle coûte 0 ce tour. NL Épuisement.",
+    "DESCRIPTION": "Ajoutez une copie de la dernière Attaque jouée ce tour dans votre main. NL Elle coûte 0 ce tour. ",
+    "UPGRADE_DESCRIPTION": "Ajoutez 2 copies de la dernière Attaque jouée ce tour dans votre main. NL Elle coûte 0 ce tour.",
     "EXTENDED_DESCRIPTION": [
       " NL (Dernière attaque : ",
       " ).",

diff --git a/src/main/resources/localization/ThMod_Fnh_cards-jp.json b/src/main/resources/localization/ThMod_Fnh_cards-jp.json
@@ -168,8 +168,8 @@
   },
   "BlazeAway": {
     "NAME": "ブレイズアウェイ",
-    "DESCRIPTION": "ターン中、最後にプレイした アタック をも !M! 回　プレイする。 このターンそのカードのコストは 0 。 NL 廃棄 。",
-    "UPGRADE_DESCRIPTION": "ターン中、最後にプレイした アタック の複製 2 枚を手札に加える。 このターンそのカードのコストは 0 。 NL 廃棄 。",
+    "DESCRIPTION": "ターン中、最後にプレイした アタック をも !M! 回　プレイする。 このターンそのカードのコストは 0 。",
+    "UPGRADE_DESCRIPTION": "ターン中、最後にプレイした アタック の複製 2 枚を手札に加える。 このターンそのカードのコストは 0 。",
     "EXTENDED_DESCRIPTION": [
       " NL (最後に使用した アタック : ",
       " )。",

diff --git a/src/main/resources/localization/ThMod_Fnh_cards-kr.json b/src/main/resources/localization/ThMod_Fnh_cards-kr.json
@@ -168,8 +168,8 @@
   },
   "BlazeAway": {
     "NAME": "블레이즈 어웨이",
-    "DESCRIPTION": "이번 턴에 마지막으로 사용한 공격 카드를 !M! 회 사용합니다. NL 소멸.",
-    "UPGRADE_DESCRIPTION": "이번 턴에 가장 최근에 사용한 공격 카드를 2 장 복사합니다. NL 이 턴 동안 복사한 카드의 비용이 0 이 됩니다. NL 소멸.",
+    "DESCRIPTION": "이번 턴에 마지막으로 사용한 공격 카드를 !M! 회 사용합니다.",
+    "UPGRADE_DESCRIPTION": "이번 턴에 가장 최근에 사용한 공격 카드를 2 장 복사합니다. NL 이 턴 동안 복사한 카드의 비용이 0 이 됩니다.",
     "EXTENDED_DESCRIPTION": [
       " NL (사용할 카드 : ",
       " ).",

diff --git a/src/main/resources/localization/ThMod_Fnh_cards-zh.json b/src/main/resources/localization/ThMod_Fnh_cards-zh.json
@@ -172,8 +172,8 @@
   },
   "BlazeAway": {
     "NAME": "连续发射",
-    "DESCRIPTION": "打出本回合最后使用过的攻击卡的 !M! 次。 NL 消耗 。",
-    "UPGRADE_DESCRIPTION": "将你本回合最后使用过的攻击卡的两张复制加入手牌。使其本回合内费用变为0。 NL 消耗 。",
+    "DESCRIPTION": "打出本回合最后使用过的攻击卡的 !M! 次。",
+    "UPGRADE_DESCRIPTION": "将你本回合最后使用过的攻击卡的两张复制加入手牌。使其本回合内费用变为0。",
     "EXTENDED_DESCRIPTION": [
       " NL （最后使用的攻击卡 : ",
       " ）。",