Added Pack Tactics : Ever 3 Stacks of Zomnbie now result in a 9 damag…

…e hit instead of 3 3 damage hits to reduce the waiting time on Summon builds.
ShikiSeiren · Mar 9, 2018 · dae8ab8 · dae8ab8
1 parent 1d88e28
commit dae8ab8
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 15 deletions.
diff --git a/bin/necromod/actions/common/CheckIfDeadAction.class b/bin/necromod/actions/common/CheckIfDeadAction.class
diff --git a/bin/necromod/cards/Detonate_Bones.class b/bin/necromod/cards/Detonate_Bones.class
diff --git a/bin/necromod/powers/DeathKnightPower.class b/bin/necromod/powers/DeathKnightPower.class
diff --git a/bin/necromod/powers/VampireLadyPower.class b/bin/necromod/powers/VampireLadyPower.class
diff --git a/bin/necromod/powers/VampirePrincessPower.class b/bin/necromod/powers/VampirePrincessPower.class
diff --git a/bin/necromod/powers/ZombiePower.class b/bin/necromod/powers/ZombiePower.class
diff --git a/src/main/java/necromod/actions/common/CheckIfDeadAction.java b/src/main/java/necromod/actions/common/CheckIfDeadAction.java
@@ -32,14 +32,30 @@ public void update() {
     	if (this.firstActivation) {
     		if(this.owner.hasPower("ZombiePower")) {
     			int ZP= this.owner.getPower("ZombiePower").amount;
-    			this.ID = "ZombiePower";
+    			int ZPPack = 0;
+
+    			while(ZP >= 3) { 
+    				ZP = ZP - 3;
+    				ZPPack++;
+    			}
+
+      			this.ID = "ZombiePower";
     			final AbstractMonster randomMonster = AbstractDungeon.getMonsters().getRandomMonster(true);
-                AbstractDungeon.actionManager.addToBottom(new CheckIfDeadAction(randomMonster, this.owner, this.DAMAGE_AMT, ZP, this.ID, false));
+    			this.DAMAGE_AMT = 3;
+
+    			if(ZPPack > 0) {
+    				AbstractDungeon.actionManager.addToBottom(new CheckIfDeadAction(randomMonster, this.owner, 3*this.DAMAGE_AMT, ZPPack, this.ID, false));
+    			}
+    			if(ZP > 0) {
+    				AbstractDungeon.actionManager.addToBottom(new CheckIfDeadAction(randomMonster, this.owner, this.DAMAGE_AMT, ZP, this.ID, false));
+    			}
+
     		}
 
     		if(this.owner.hasPower("VampireLadyPower")) {
     			int VLP = this.owner.getPower("VampireLadyPower").amount;
     			this.ID = "VampireLadyPower";
+    			this.DAMAGE_AMT = 4;
     			final AbstractMonster randomMonster = AbstractDungeon.getMonsters().getRandomMonster(true);
                 AbstractDungeon.actionManager.addToBottom(new CheckIfDeadAction(randomMonster, this.owner, this.DAMAGE_AMT, VLP, this.ID, false));
 
@@ -48,6 +64,7 @@ public void update() {
     		if(this.owner.hasPower("VampirePrincessPower")) {
     			int VPP = this.owner.getPower("VampirePrincessPower").amount;
     			this.ID = "VampirePrincessPower";
+    			this.DAMAGE_AMT = 4;
     			final AbstractMonster randomMonster = AbstractDungeon.getMonsters().getRandomMonster(true);
                 AbstractDungeon.actionManager.addToBottom(new CheckIfDeadAction(randomMonster, this.owner, this.DAMAGE_AMT, VPP, this.ID, false));
 
@@ -56,6 +73,7 @@ public void update() {
     		if(this.owner.hasPower("DeathKnightPower")) {
     			int DKP = this.owner.getPower("DeathKnightPower").amount;
     			this.ID = "DeathKnightPower";
+    			this.DAMAGE_AMT = 5;
     			final AbstractMonster randomMonster = AbstractDungeon.getMonsters().getRandomMonster(true);
                 AbstractDungeon.actionManager.addToBottom(new CheckIfDeadAction(randomMonster, this.owner, this.DAMAGE_AMT, DKP, this.ID, false));
 
@@ -75,19 +93,19 @@ public void update() {
     		}
     		if (this.target.currentHealth > 0) {
     			if(this.ID.equals("DeathKnightPower")) {
-    				AbstractDungeon.actionManager.addToBottom(new DamageAction(this.target, new DamageInfo(this.owner, 5, DamageInfo.DamageType.THORNS), 0));
+    				AbstractDungeon.actionManager.addToBottom(new DamageAction(this.target, new DamageInfo(this.owner, this.DAMAGE_AMT, DamageInfo.DamageType.THORNS), 0));
     			}
 
     			if(this.ID.equals("ZombiePower")) {
-    				AbstractDungeon.actionManager.addToBottom(new DamageAction(this.target, new DamageInfo(this.owner, 3, DamageInfo.DamageType.THORNS), 0));
+    				AbstractDungeon.actionManager.addToBottom(new DamageAction(this.target, new DamageInfo(this.owner, this.DAMAGE_AMT, DamageInfo.DamageType.THORNS), 0));
     			}
 
     			if(this.ID.equals("VampireLadyPower")){
-    				AbstractDungeon.actionManager.addToBottom(new VampireDamageAction(this.target, new DamageInfo(this.owner, 3, DamageInfo.DamageType.THORNS), AbstractGameAction.AttackEffect.SLASH_VERTICAL));
+    				AbstractDungeon.actionManager.addToBottom(new VampireDamageAction(this.target, new DamageInfo(this.owner, this.DAMAGE_AMT, DamageInfo.DamageType.THORNS), AbstractGameAction.AttackEffect.SLASH_VERTICAL));
     			}
 
     			if(this.ID.equals("VampirePrincessPower")){
-    				AbstractDungeon.actionManager.addToBottom(new VampireDamageAction(this.target, new DamageInfo(this.owner, 3, DamageInfo.DamageType.THORNS), AbstractGameAction.AttackEffect.SLASH_VERTICAL));
+    				AbstractDungeon.actionManager.addToBottom(new VampireDamageAction(this.target, new DamageInfo(this.owner, this.DAMAGE_AMT, DamageInfo.DamageType.THORNS), AbstractGameAction.AttackEffect.SLASH_VERTICAL));
     			}
     			AbstractDungeon.actionManager.addToTop(new WaitAction(0.05f));
     			/**test : for(int i =0; i <= numTime; i++{

diff --git a/src/main/java/necromod/cards/Detonate_Bones.java b/src/main/java/necromod/cards/Detonate_Bones.java
@@ -3,11 +3,9 @@
 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.dungeons.*;
 import com.megacrit.cardcrawl.vfx.*;
 import com.megacrit.cardcrawl.cards.*;
-import com.megacrit.cardcrawl.actions.*;
 import com.megacrit.cardcrawl.actions.common.*;
 import com.megacrit.cardcrawl.core.*;
 

diff --git a/src/main/java/necromod/powers/DeathKnightPower.java b/src/main/java/necromod/powers/DeathKnightPower.java
@@ -7,7 +7,6 @@
 import com.megacrit.cardcrawl.monsters.*;
 
 import necromod.NecroMod;
-import necromod.actions.common.CheckIfDeadAction;
 
 public class DeathKnightPower extends AbstractPower {
 	public static final String POWER_ID = "DeathKnightPower";

diff --git a/src/main/java/necromod/powers/VampireLadyPower.java b/src/main/java/necromod/powers/VampireLadyPower.java
@@ -1,12 +1,11 @@
 package necromod.powers;
 
 import com.megacrit.cardcrawl.core.AbstractCreature;
-import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.powers.AbstractPower;
 import com.megacrit.cardcrawl.monsters.*;
 
 import necromod.NecroMod;
-import necromod.actions.common.CheckIfDeadAction;
+
 
 public class VampireLadyPower extends AbstractPower {
 	public static final String POWER_ID = "VampireLadyPower";

diff --git a/src/main/java/necromod/powers/VampirePrincessPower.java b/src/main/java/necromod/powers/VampirePrincessPower.java
@@ -1,12 +1,10 @@
 package necromod.powers;
 
 import com.megacrit.cardcrawl.core.AbstractCreature;
-import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.powers.AbstractPower;
 import com.megacrit.cardcrawl.monsters.*;
 
 import necromod.NecroMod;
-import necromod.actions.common.CheckIfDeadAction;
 
 public class VampirePrincessPower extends AbstractPower {
 	public static final String POWER_ID = "VampirePrincessPower";

diff --git a/src/main/java/necromod/powers/ZombiePower.java b/src/main/java/necromod/powers/ZombiePower.java
@@ -2,12 +2,10 @@
 
 //import com.megacrit.cardcrawl.actions.utility.WaitAction;
 import com.megacrit.cardcrawl.core.AbstractCreature;
-import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
 import com.megacrit.cardcrawl.powers.AbstractPower;
 import com.megacrit.cardcrawl.monsters.*;
 
 import necromod.NecroMod;
-import necromod.actions.common.CheckIfDeadAction;
 
 public class ZombiePower extends AbstractPower {
 	public static final String POWER_ID = "ZombiePower";