Merge branch 'test'

bin/localization/NecroMod-CardStrings.json

@@ -11,7 +11,7 @@
 
 	"Negative_Energy_Arrows": {
 		"NAME" : "Negative Energy Arrows",
-		"DESCRIPTION": "Deal !D! damage !M! times. NL Apply !M! Negative Level."
+		"DESCRIPTION": "Deal !D! damage !M! times. NL Apply !M! NegativeLevel."
 	},
 
 	"Bone_Wall": {
@@ -21,7 +21,7 @@
 
 	"Negative_Energy_Javelin": {
 		"NAME" : "Negative Energy Javelin",
-		"DESCRIPTION" : "Deal !D! damage. NL Apply !M! Negative Level."
+		"DESCRIPTION" : "Deal !D! damage. NL Apply !M! NegativeLevel."
 	},
 
 	"Thousand_Bone_Knives": {
@@ -51,7 +51,7 @@
 
 	"Negative_Energy_Bomb": {
 		"NAME" : "Negative Energy Bomb",
-		"DESCRIPTION" : "Deal !D! damage each stack of NegativeLevel."
+		"DESCRIPTION" : "Deal !D! damage for each stack of NegativeLevel."
 		},
 
 	"Summon_Death_Knight": {
@@ -147,6 +147,21 @@
 	"Detonate_Bones": {
 		"NAME" : "Detonate Bones",
 		"DESCRIPTION" : "Remove all bones. Apply !D! damage times the amount of stacks removed."
+		},
+
+	"Negative_Energy_Mist": {
+		"NAME" : "Negative Energy Mist",
+		"DESCRIPTION" : "Apply 2 NegativeLevels."
+		},
+
+	"Consume_Illness": {
+		"NAME" : "Consume Illness",
+		"DESCRIPTION" : "Remove a negative effect. If you do : Heal 3 HP. Exhaust."
+		},
+
+	"Negative_Energy_Shield": {
+		"NAME" : "Negative Energy Shield",
+		"DESCRIPTION" : "Gain !B! Block. Gain 1 Negative Energy Shield."
 		}
 
 }	

src/main/java/necromod/NecroMod.java

@@ -105,6 +105,10 @@ public class NecroMod implements PostInitializeSubscriber, EditCardsSubscriber,
     public static final String DETONATE_BONES = "cards/detonate_bones.png";
     public static final String SPECTRAL_ARMOR = "cards/spectral_armor.png";
     public static final String GRASP_HEART = "cards/grasp_heart.png";
+    public static final String NEGATIVE_ENERGY_MIST = "cards/negative_energy_mist.png";
+    public static final String CONSUME_ILLNESS = "cards/consume_illness.png";
+    public static final String BLOOD_CURSE = "cards/blood_curse.png";
+    public static final String NEGATIVE_ENERGY_SHIELD = "cards/negative_energy_shield.png";
 
 
     //power images
@@ -124,8 +128,8 @@ public class NecroMod implements PostInitializeSubscriber, EditCardsSubscriber,
     public static final String VAMPIRE_PRINCESS_POWER = "powers/vampire_princess.png";
     public static final String ZOMBIE_POWER = "powers/zombie.png";
     public static final String BONE_PRISON_POWER ="powers/bone_prison.png";
-    public static final String GRASP_HEART_POWER = "powers/grasp_heart.png";
-
+    public static final String GRASP_HEART_POWER = "powers/crushed_heart.png";
+    public static final String NEGATIVE_SHIELD_POWER = "powers/negative_shield.png";
 
     //relic images
 
@@ -216,6 +220,10 @@ public static Texture getGraspHeartPowerTexture() {
     	return new Texture(makePath(GRASP_HEART_POWER));
     }
 
+    public static Texture getNegativeShieldPowerTexture() {
+    	return new Texture(makePath(NEGATIVE_SHIELD_POWER));
+    }
+
     /**
      * Makes a full path for a resource path
      * @param resource the resource, must *NOT* have a leading "/"
@@ -368,6 +376,19 @@ public void receiveEditCards() {
 		BaseMod.addCard(new Grasp_Heart());
 		logger.info("added Test Case");
 
+		BaseMod.addCard(new Consume_Illness());
+		logger.info("added Test Case");
+
+		BaseMod.addCard(new Negative_Energy_Mist());
+		logger.info("added Test Case");
+
+		BaseMod.addCard(new Blood_Curse());
+		logger.info("added Test Case");
+
+		BaseMod.addCard(new Negative_Energy_Shield());
+		logger.info("added Test Case");
+
+		/****/
 		/**	BaseMod.addCard(new ());
 			logger.info("added Test Case");
 		**/

src/main/java/necromod/cards/Blood_Curse.java

@@ -0,0 +1,64 @@
+package necromod.cards;
+
+import com.megacrit.cardcrawl.cards.AbstractCard;
+import com.megacrit.cardcrawl.characters.AbstractPlayer;
+import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
+import com.megacrit.cardcrawl.monsters.AbstractMonster;
+import com.megacrit.cardcrawl.powers.VulnerablePower;
+import com.megacrit.cardcrawl.powers.WeakPower;
+import com.megacrit.cardcrawl.core.*;
+//import com.megacrit.cardcrawl.powers.*;
+import com.megacrit.cardcrawl.actions.common.*;
+import com.megacrit.cardcrawl.actions.AbstractGameAction;
+import com.megacrit.cardcrawl.cards.DamageInfo;
+
+import basemod.abstracts.CustomCard;
+import necromod.NecroMod;
+import necromod.patches.AbstractCardEnum;
+
+public class Blood_Curse extends CustomCard {
+	public static final String ID = "Blood_Curse";
+	public static final String NAME = "Blood Curse";
+	private static final int COST = 1;
+	private static final int ATTACK_DMG = 4;
+	public static final String DESCRIPTION = "Deal !D! damage. NL Apply !M! Weak. Apply !M! Vulnerable.";
+	private static final int UPGRADE_PLUS_DMG = 3;
+	private static final int POOL = 1;
+	public final int AMOUNT = 1;
+
+	public Blood_Curse() {
+		super (ID, NAME, NecroMod.makePath(NecroMod.BLOOD_CURSE), COST, DESCRIPTION,
+				AbstractCard.CardType.ATTACK, AbstractCardEnum.WHITE,
+				AbstractCard.CardRarity.COMMON, AbstractCard.CardTarget.ENEMY, POOL);
+
+		this.baseDamage = this.damage =  ATTACK_DMG;
+		this.baseMagicNumber = this.magicNumber = AMOUNT;
+
+	}
+
+	@Override
+    public void use(AbstractPlayer p, AbstractMonster m) {
+
+
+        	AbstractDungeon.actionManager.addToBottom(new DamageAction((AbstractCreature)m, new DamageInfo(p, this.damage, this.damageTypeForTurn), AbstractGameAction.AttackEffect.POISON));
+        	AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(m, p, new VulnerablePower(m, this.magicNumber, false), this.magicNumber));
+        	AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(m, p, new WeakPower(m, this.magicNumber, false), this.magicNumber));
+
+    }
+
+	@Override
+    public AbstractCard makeCopy() {
+        return new Blood_Curse();
+    }
+
+    @Override
+    public void upgrade() {
+        if (!this.upgraded) {
+            this.upgradeName();
+            this.upgradeDamage(UPGRADE_PLUS_DMG);
+            this.upgradeMagicNumber(1);
+        }
+
+    }
+
+}

src/main/java/necromod/cards/Bone_Prison.java

@@ -28,6 +28,7 @@ public class Bone_Prison extends CustomCard {
 	public Bone_Prison() {
 		super(ID, NAME, NecroMod.makePath(NecroMod.BONE_PRISON), COST, DESCRIPTION, AbstractCard.CardType.SKILL,
 				AbstractCardEnum.WHITE, AbstractCard.CardRarity.COMMON, AbstractCard.CardTarget.ENEMY, POOL);
+		this.exhaust = true;
 
 	}
 

src/main/java/necromod/cards/Consume_Illness.java

@@ -0,0 +1,100 @@
+package necromod.cards;
+
+import com.megacrit.cardcrawl.cards.*;
+import com.megacrit.cardcrawl.localization.*;
+import com.megacrit.cardcrawl.characters.*;
+import com.megacrit.cardcrawl.monsters.*;
+import com.megacrit.cardcrawl.powers.StrengthPower;
+import com.megacrit.cardcrawl.vfx.ThoughtBubble;
+import com.megacrit.cardcrawl.dungeons.*;
+import com.megacrit.cardcrawl.actions.common.*;
+import com.megacrit.cardcrawl.core.*;
+import com.megacrit.cardcrawl.powers.DexterityPower;
+import java.util.*;
+
+import basemod.abstracts.CustomCard;
+import necromod.NecroMod;
+import necromod.patches.AbstractCardEnum;
+
+public class Consume_Illness extends CustomCard{
+
+		public static final String ID = "Consume_Illness";
+		private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
+		public static final	String NAME = cardStrings.NAME;
+		public static final	String DESCRIPTION = cardStrings.DESCRIPTION;
+		private static final int COST = 1;
+		private static final int POOL = 1;
+		public static final String[] EXTENDED_DESCRIPTION = new String[] {
+				"I do not have any negative effects."
+		};
+
+		public Consume_Illness() {
+			super(ID, NAME, NecroMod.makePath(NecroMod.CONSUME_ILLNESS), COST, DESCRIPTION, AbstractCard.CardType.SKILL,
+					AbstractCardEnum.WHITE, AbstractCard.CardRarity.COMMON, AbstractCard.CardTarget.SELF, POOL);
+			this.baseMagicNumber = this.magicNumber = 1;
+			this.exhaust = true;
+
+		}
+
+		public void use(AbstractPlayer p, AbstractMonster m) {
+
+			ArrayList<String> Debuff = new ArrayList<String>();
+			Debuff.add("Poison");
+			Debuff.add("Weakened");
+			Debuff.add("Frail");
+			Debuff.add("Vulnerable");
+
+			ArrayList<String> Random = new ArrayList<String>();
+
+			for(String d : Debuff) {
+				if (p.hasPower(d)){
+					Random.add(d);
+				}
+			}
+			if(p.hasPower("Strength") && (p.getPower("Strength").amount < 0)){
+				Random.add("Strength");
+			}
+
+			if(p.hasPower("Dexterity") && (p.getPower("Dexterity").amount < 0)){
+					Random.add("Dexterity");
+			}
+
+			if(!Random.isEmpty()) {
+				int i = Random.size();
+				int r = (int) Math.random()*i;
+
+				if(!Random.get(r).equals("Strength") && !Random.get(r).equals("Dexterity")) {
+					AbstractDungeon.actionManager.addToTop(new RemoveSpecificPowerAction(p, p, Random.get(r)));
+					AbstractDungeon.actionManager.addToBottom(new HealAction(p, p, 3));
+				}
+				else if(Random.get(r).equals("Strength")){
+					int amount = -1*(p.getPower("Strength").amount);
+					AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new StrengthPower(p, amount), amount));
+					AbstractDungeon.actionManager.addToBottom(new HealAction(p, p, 3));
+				}
+				else {
+					int amount = -1*(p.getPower("Strength").amount);
+					AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new DexterityPower(p, amount), amount));
+					AbstractDungeon.actionManager.addToBottom(new HealAction(p, p, 3));
+				}
+
+
+			}
+			else {
+				AbstractDungeon.effectList.add(new ThoughtBubble(p.dialogX, p.dialogY, 3.0f, Consume_Illness.EXTENDED_DESCRIPTION[0], true));
+			}
+
+		}
+
+		public AbstractCard makeCopy() {
+			return new Consume_Illness();
+		}
+
+		public void upgrade() {
+			if (!this.upgraded) {
+				this.upgradeName();
+				this.upgradeBaseCost(0);
+			}
+		}
+
+}

src/main/java/necromod/cards/Negative_Energy_Mist.java

@@ -0,0 +1,54 @@
+package necromod.cards;
+
+import com.megacrit.cardcrawl.cards.*;
+import com.megacrit.cardcrawl.localization.*;
+import com.megacrit.cardcrawl.characters.*;
+import com.megacrit.cardcrawl.monsters.*;
+import com.megacrit.cardcrawl.dungeons.*;
+import com.megacrit.cardcrawl.vfx.combat.*;
+import com.megacrit.cardcrawl.actions.animations.*;
+import com.megacrit.cardcrawl.actions.common.*;
+import com.megacrit.cardcrawl.core.*;
+
+import basemod.abstracts.CustomCard;
+import necromod.NecroMod;
+import necromod.actions.common.NegativeLevelAction;
+import necromod.patches.AbstractCardEnum;
+import necromod.powers.NegativeLevelsPower;
+
+public class Negative_Energy_Mist extends CustomCard {
+	public static final String ID = "Negative_Energy_Mist";
+	private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
+	public static final	String NAME = cardStrings.NAME;
+	public static final	String DESCRIPTION = cardStrings.DESCRIPTION;
+	private static final int COST = 1;
+	private static final int POOL = 1;
+
+	public Negative_Energy_Mist() {
+		super(ID, NAME, NecroMod.makePath(NecroMod.NEGATIVE_ENERGY_MIST), COST, DESCRIPTION, AbstractCard.CardType.SKILL,
+				AbstractCardEnum.WHITE, AbstractCard.CardRarity.COMMON, AbstractCard.CardTarget.ALL_ENEMY, POOL);
+		this.baseMagicNumber = this.magicNumber = 2;
+		this.exhaust = true;
+	}
+
+	public void use(AbstractPlayer p, AbstractMonster m) {
+		AbstractDungeon.actionManager.addToBottom(new VFXAction(p, new ShockWaveEffect(p.hb.cX, p.hb.cY, Settings.GREEN_TEXT_COLOR, ShockWaveEffect.ShockWaveType.CHAOTIC), 1.5f));
+        for (final AbstractMonster mo : AbstractDungeon.getCurrRoom().monsters.monsters) {
+        	AbstractDungeon.actionManager.addToBottom(new NegativeLevelAction(mo, p, this.baseMagicNumber));
+        	AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(mo, p, new NegativeLevelsPower(mo, p, this.baseMagicNumber), this.baseMagicNumber));
+        }
+
+	}
+
+	public AbstractCard makeCopy() {
+		return new Negative_Energy_Mist();
+	}
+
+	public void upgrade() {
+		if (!this.upgraded) {
+			this.upgradeName();
+			this.exhaust = false;
+		}
+	}
+
+}

src/main/java/necromod/cards/Negative_Energy_Shield.java

@@ -0,0 +1,51 @@
+package necromod.cards;
+
+import com.megacrit.cardcrawl.actions.common.ApplyPowerAction;
+import com.megacrit.cardcrawl.actions.common.GainBlockAction;
+import com.megacrit.cardcrawl.cards.AbstractCard;
+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 basemod.abstracts.CustomCard;
+import necromod.NecroMod;
+import necromod.patches.AbstractCardEnum;
+import necromod.powers.NegativeShieldPower;
+
+public class Negative_Energy_Shield extends CustomCard {
+	public static final String ID = "Negative_Energy_Shield";
+	private static final CardStrings cardStrings = CardCrawlGame.languagePack.getCardStrings(ID);
+	public static final	String NAME = cardStrings.NAME;
+	public static final	String DESCRIPTION = cardStrings.DESCRIPTION;
+	private static final int COST = 1;
+	private static final int BLOCK_AMT = 8;
+	private static final int UPGRADE_PLUS_BLOCK = 3;
+	private static final int POOL = 0;	
+
+	public Negative_Energy_Shield() {
+		super(ID, NAME, NecroMod.makePath(NecroMod.NEGATIVE_ENERGY_SHIELD), COST, DESCRIPTION, AbstractCard.CardType.SKILL,
+				AbstractCardEnum.WHITE, AbstractCard.CardRarity.BASIC, AbstractCard.CardTarget.SELF, POOL);
+		this.baseBlock = BLOCK_AMT;
+
+	}
+
+	public void use(AbstractPlayer p, AbstractMonster m) {
+
+			AbstractDungeon.actionManager.addToBottom(new GainBlockAction(p, p, this.block));
+			AbstractDungeon.actionManager.addToBottom(new ApplyPowerAction(p, p, new NegativeShieldPower(p, 1), 1));
+	}
+
+	public AbstractCard makeCopy() {
+		return new Negative_Energy_Shield();
+	}
+
+	public void upgrade() {
+		if (!this.upgraded) {
+			upgradeName();
+			upgradeBlock(UPGRADE_PLUS_BLOCK);
+		}
+	}
+
+}