UPDATE BODY TEXT

Jedi515 · Dec 17, 2018 · d07ae62 · d07ae62
1 parent 1c24591
commit d07ae62
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 23 deletions.
diff --git a/src/jedi.java b/src/jedi.java
@@ -6,16 +6,20 @@
 import com.badlogic.gdx.graphics.Color;
 import com.evacipated.cardcrawl.modthespire.Loader;
 import com.evacipated.cardcrawl.modthespire.lib.SpireInitializer;
+import com.megacrit.cardcrawl.cards.AbstractCard;
+import com.megacrit.cardcrawl.cards.CardGroup;
 import com.megacrit.cardcrawl.characters.AbstractPlayer;
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.dungeons.Exordium;
 import com.megacrit.cardcrawl.dungeons.TheCity;
+import com.megacrit.cardcrawl.helpers.CardLibrary;
 import com.megacrit.cardcrawl.localization.*;
 import mod.jedi.cards.blue.*;
 import mod.jedi.cards.colorless.Cleanse;
 import mod.jedi.cards.colorless.Forcepull;
 import mod.jedi.cards.colorless.Forcepush;
 import mod.jedi.cards.curses.Frostbite;
+import mod.jedi.cards.red.StrikingStrike;
 import mod.jedi.events.SwordDojo;
 import mod.jedi.potions.CoolantLeak;
 import mod.jedi.potions.HolyWater;
@@ -80,6 +84,9 @@ public void receiveEditCards()
         BaseMod.addCard(new Meditation());
         BaseMod.addCard(new DarknessCall());
 
+        //Red
+        BaseMod.addCard(new StrikingStrike());
+
         //Curses
         BaseMod.addCard(new Frostbite());
     }
@@ -118,4 +125,16 @@ public int receiveMapHPChange(int amount) {
         return amount;
     }
 
+    public static AbstractCard returnTrulyRandomStrike()
+    {
+        final CardGroup group = new CardGroup(CardGroup.CardGroupType.UNSPECIFIED);
+        for (AbstractCard card : CardLibrary.getAllCards())
+        {
+            if ((card.hasTag(AbstractCard.CardTags.STRIKE) && (card.rarity != AbstractCard.CardRarity.BASIC)))
+            {
+                group.addToBottom(card.makeCopy());
+            }
+        }
+        return group.getRandomCard(true).makeCopy();
+    }
 }
diff --git a/src/mod/jedi/cards/blue/LockNLoad.java b/src/mod/jedi/cards/blue/LockNLoad.java
@@ -18,24 +18,23 @@ public class LockNLoad
     public static final String ID = "jedi:locknload";
     private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
     public static final String NAME = cardStrings.NAME;
-    public static int CardLightningChannel = 2;
-    public static String DESCRIPTION = cardStrings.DESCRIPTION + CardLightningChannel + cardStrings.UPGRADE_DESCRIPTION;
+    public static String DESCRIPTION = cardStrings.DESCRIPTION;
+    public static int COST = 2;
 
 
     public LockNLoad()
     {
-        super(ID, NAME, "resources/images/cards/jedi_beta.png", 1, DESCRIPTION, CardType.SKILL, CardColor.BLUE, CardRarity.COMMON, CardTarget.ENEMY);
-        this.baseMagicNumber = 1;
+        super(ID, NAME, "resources/images/cards/jedi_beta.png", COST, DESCRIPTION, CardType.SKILL, CardColor.BLUE, CardRarity.COMMON, CardTarget.ENEMY);
+        this.baseMagicNumber = 2;
         this.magicNumber = this.baseMagicNumber;
-        CardLightningChannel = this.magicNumber+1;
-        this.rawDescription = cardStrings.DESCRIPTION + CardLightningChannel + cardStrings.UPGRADE_DESCRIPTION;
+        this.rawDescription = cardStrings.DESCRIPTION;
         initializeDescription();
     }
 
 
     public void use(AbstractPlayer p, AbstractMonster m) {
         AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(m, p, new LockOnPower(m, this.magicNumber), this.magicNumber));
-        for (int i = 0; i <= magicNumber; i++)
+        for (int i = 0; i < magicNumber; i++)
         {
             AbstractDungeon.actionManager.addToBottom(new ChannelAction(new Lightning()));
         }
@@ -47,9 +46,6 @@ public void upgrade() {
         if (!this.upgraded) {
             this.upgradeName();
             this.upgradeMagicNumber(1);
-            CardLightningChannel = this.magicNumber + 1;
-            this.rawDescription = cardStrings.DESCRIPTION + CardLightningChannel + cardStrings.UPGRADE_DESCRIPTION;
-            initializeDescription();
         }
     }
 

diff --git a/src/mod/jedi/cards/blue/Meditation.java b/src/mod/jedi/cards/blue/Meditation.java
@@ -42,4 +42,9 @@ public void upgrade()
             this.upgradeMagicNumber(1);
         }
     }
+
+    public AbstractCard makeCopy()
+    {
+        return new Meditation();
+    }
 }
diff --git a/src/mod/jedi/cards/red/StrikingStrike.java b/src/mod/jedi/cards/red/StrikingStrike.java
@@ -0,0 +1,67 @@
+package mod.jedi.cards.red;
+
+import basemod.abstracts.CustomCard;
+import com.megacrit.cardcrawl.actions.AbstractGameAction;
+import com.megacrit.cardcrawl.actions.common.DamageAction;
+import com.megacrit.cardcrawl.cards.AbstractCard;
+import com.megacrit.cardcrawl.cards.CardQueueItem;
+import com.megacrit.cardcrawl.cards.DamageInfo;
+import com.megacrit.cardcrawl.characters.AbstractPlayer;
+import com.megacrit.cardcrawl.core.CardCrawlGame;
+import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
+import com.megacrit.cardcrawl.localization.CardStrings;
+import com.megacrit.cardcrawl.monsters.AbstractMonster;
+
+import static sts_jedi.jedi.returnTrulyRandomStrike;
+
+public class StrikingStrike
+    extends CustomCard
+{
+    public static final String ID = "jedi:strikingstrike";
+    private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
+    public static final String NAME = cardStrings.NAME;
+    public static final String DESCRIPTION = cardStrings.DESCRIPTION;
+    public static final String UPGRADE_DESCRIPTION = cardStrings.UPGRADE_DESCRIPTION;
+    public static final int COST = 1;
+    public static final String IMG_PATH = "resources/images/cards/jedi_beta_attack.png";
+
+    public StrikingStrike()
+    {
+        super(ID, NAME, IMG_PATH, COST, DESCRIPTION, CardType.ATTACK, AbstractCard.CardColor.RED, AbstractCard.CardRarity.RARE, CardTarget.ENEMY);
+        this.damage = 6;
+        this.baseDamage = this.damage;
+        this.tags.add(CardTags.STRIKE);
+        this.exhaust = true;
+    }
+
+
+    @Override
+    public void use(AbstractPlayer p, AbstractMonster m)
+    {
+        AbstractDungeon.actionManager.addToBottom(new DamageAction(m, new DamageInfo(p, this.damage, this.damageTypeForTurn), AbstractGameAction.AttackEffect.SLASH_DIAGONAL));
+        AbstractCard card = returnTrulyRandomStrike().makeCopy();
+        if (this.upgraded)
+        {
+            card.upgrade();
+        }
+        card.freeToPlayOnce = true;
+        card.applyPowers();
+        card.purgeOnUse = true;
+        AbstractDungeon.actionManager.cardQueue.add(new CardQueueItem(card, m));
+    }
+
+    @Override
+    public void upgrade()
+    {
+        if (!this.upgraded) {
+            upgradeName();
+            this.rawDescription = UPGRADE_DESCRIPTION;
+            initializeDescription();
+        }
+    }
+
+    public AbstractCard makeCopy()
+    {
+        return new StrikingStrike();
+    }
+}
diff --git a/src/mod/jedi/events/SwordDojo.java b/src/mod/jedi/events/SwordDojo.java
@@ -2,19 +2,19 @@
 
 import com.megacrit.cardcrawl.cards.AbstractCard;
 import com.megacrit.cardcrawl.cards.CardGroup;
-import com.megacrit.cardcrawl.cards.curses.Pain;
 import com.megacrit.cardcrawl.cards.red.PerfectedStrike;
 import com.megacrit.cardcrawl.core.CardCrawlGame;
 import com.megacrit.cardcrawl.core.Settings;
 import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.events.AbstractImageEvent;
-import com.megacrit.cardcrawl.helpers.CardLibrary;
 import com.megacrit.cardcrawl.localization.EventStrings;
 import com.megacrit.cardcrawl.relics.AbstractRelic;
 import com.megacrit.cardcrawl.rooms.AbstractRoom;
 import com.megacrit.cardcrawl.unlock.UnlockTracker;
 import com.megacrit.cardcrawl.vfx.cardManip.ShowCardAndObtainEffect;
 
+import static sts_jedi.jedi.returnTrulyRandomStrike;
+
 public class SwordDojo
     extends AbstractImageEvent
 {
@@ -58,18 +58,11 @@ protected void buttonEffect(int buttonPressed) {
                     case 0:
                         this.imageEventText.updateBodyText(DESCRIPTIONS[1]);
                         screenNum = 1;
-                        CardGroup group = new CardGroup(CardGroup.CardGroupType.UNSPECIFIED);
-                        for (AbstractCard card : CardLibrary.getAllCards())
-                        {
-                            if ((card.hasTag(AbstractCard.CardTags.STRIKE) && (card.rarity != AbstractCard.CardRarity.BASIC)))
-                            {
-                                group.addToBottom(card.makeCopy());
-                            }
-                        }
+
                         CardGroup GiveToPlayer = new CardGroup(CardGroup.CardGroupType.UNSPECIFIED);
                         for (int i = 0; i < strikesAmount; i++)
                         {
-                            AbstractCard card = group.getRandomCard(true);
+                            AbstractCard card = returnTrulyRandomStrike();
                             GiveToPlayer.addToBottom(card.makeCopy());
                             UnlockTracker.markCardAsSeen(card.cardID);
                             card.isSeen = true;

diff --git a/src/resources/localization/cardStrings.json b/src/resources/localization/cardStrings.json
@@ -40,8 +40,7 @@
   "jedi:locknload":
   {
     "NAME": "Lock'N'Load",
-    "DESCRIPTION":"Apply !M! Lock-On. NL Channel ",
-    "UPGRADE_DESCRIPTION": " Lightning."
+    "DESCRIPTION":"Apply !M! Lock-On. NL Channel !M! Lightning."
   },
   "jedi:hex":
   {
@@ -92,5 +91,11 @@
   {
     "NAME": "Frostbite",
     "DESCRIPTION": "Unplayable. NL When drawn, lose 3 Strength this turn."
+  },
+  "jedi:strikingstrike":
+  {
+    "NAME": "Striking Strike",
+    "DESCRIPTION": "Deal !D! damage. NL Play a random Strike card on the same enemy. NL Exhaust.",
+    "UPGRADE_DESCRIPTION" : "Deal !D! damage. NL Play a random upgraded Strike card on the same enemy. NL Exhaust."
   }
 }