Skip to content

Commit

Permalink
an ironically quick fix to slow
Browse files Browse the repository at this point in the history
  • Loading branch information
@The-Evil-Pickle
The-Evil-Pickle committed Feb 26, 2019
1 parent def51d1 commit a7e94de
Show file tree
Hide file tree
Showing 5 changed files with 88 additions and 30 deletions.
3 changes: 2 additions & 1 deletion src/main/java/com/megacrit/cardcrawl/mod/replay/monsters/replay/FadingForestBoss.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.megacrit.cardcrawl.powers.HexPower;
import com.megacrit.cardcrawl.powers.IntangiblePower;
import com.megacrit.cardcrawl.powers.SlowPower;
import com.megacrit.cardcrawl.powers.SlowPower2;
import com.megacrit.cardcrawl.powers.VulnerablePower;
import com.megacrit.cardcrawl.powers.WeakPower;
import com.megacrit.cardcrawl.rooms.MonsterRoomBoss;
Expand Down Expand Up @@ -971,7 +972,7 @@ public void buttonEffect(final int p0) {
AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, this, new ConfusionPower(AbstractDungeon.player), 1));
break;
case 2:
AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, this, new SlowPower(AbstractDungeon.player, -1)));
AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, this, new SlowPower2(AbstractDungeon.player, -1)));
break;
}
this.c_part = 1;
Expand Down
52 changes: 30 additions & 22 deletions src/main/java/com/megacrit/cardcrawl/mod/replay/monsters/replay/hec/Conductor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ public class Conductor extends AbstractMonster {
public static final String[] DIALOG = monsterStrings.DIALOG;
private HellsEngine engine;

public static final int START_DMG = 20;
public static final int START_DMG_A = 25;
public static final int COALS_DMG = 4;
public static final int COALS_DMG_A = 5;
public static final int GUN_DMG = 12;
public static final int GUN_DMG_A = 14;
public static final int DYN_DMG = 25;
public static final int DYN_DMG_A = 30;
public static final int ARMOR_INIT = 20;
public static final int ARMOR_INIT_A = 20;



private int startDmg;
private int coalsDmg;
private int railgunnerDmg;
private int dynamiteDmg;



Expand All @@ -50,8 +50,8 @@ public class Conductor extends AbstractMonster {


//move id bytes
private static final byte HOT_COALS = 1;
private static final byte DOORS_CLOSING = 2;
private static final byte RAIL_GUNNER = 1;
private static final byte DYNAMITE = 2;
private static final byte RUNAWAY_TRAIN = 3;
private static final byte LIVING_STEEL = 4;
private static final byte STOKE_THE_ENGINE = 5;
Expand All @@ -68,15 +68,15 @@ public Conductor() {
this.setHp(HellsEngine.HP);
}
if (AbstractDungeon.ascensionLevel >= 4) {
this.startDmg = START_DMG_A;
this.coalsDmg = COALS_DMG_A;
this.railgunnerDmg = GUN_DMG_A;
this.dynamiteDmg = DYN_DMG_A;
}
else {
this.startDmg = START_DMG;
this.coalsDmg = COALS_DMG;
this.railgunnerDmg = GUN_DMG;
this.dynamiteDmg = DYN_DMG;
}
this.damage.add(new DamageInfo(this, this.startDmg));
this.damage.add(new DamageInfo(this, this.coalsDmg));
this.damage.add(new DamageInfo(this, this.railgunnerDmg));
this.damage.add(new DamageInfo(this, this.dynamiteDmg));
//this.loadAnimation("images/monsters/theBottom/boss/guardian/skeleton.atlas", "images/monsters/theBottom/boss/guardian/skeleton.json", 2.0f);
//this.state.setAnimation(0, "idle", true);
}
Expand All @@ -93,14 +93,22 @@ public void usePreBattleAction() {

private void setMoveNow(byte nextTurn) {
switch (nextTurn) {
case STARTUP: {
this.setMove(nextTurn, Intent.UNKNOWN);
break;
}
default: {
this.setMove(nextTurn, Intent.NONE);
break;
}
case STARTUP: {
this.setMove(nextTurn, Intent.UNKNOWN);
break;
}
case RAIL_GUNNER: {
this.setMove(nextTurn, Intent.ATTACK, this.damage.get(0).base);
break;
}
case DYNAMITE: {
this.setMove(nextTurn, Intent.UNKNOWN, this.damage.get(1).base);
break;
}
default: {
this.setMove(nextTurn, Intent.NONE);
break;
}
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/megacrit/cardcrawl/mod/replay/relics/OozeArmor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.megacrit.cardcrawl.mod.replay.powers.*;
import com.megacrit.cardcrawl.powers.MalleablePower;
import com.megacrit.cardcrawl.powers.SlowPower;
import com.megacrit.cardcrawl.powers.SlowPower2;
import com.megacrit.cardcrawl.relics.*;
import com.megacrit.cardcrawl.core.*;
import com.megacrit.cardcrawl.unlock.*;
Expand Down Expand Up @@ -52,13 +53,13 @@ public void onUnequip() {

@Override
public void atTurnStart() {
AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, AbstractDungeon.player, new SlowPower(AbstractDungeon.player, -3), -3));
AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, AbstractDungeon.player, new SlowPower2(AbstractDungeon.player, -3), -3));
}

@Override
public void atBattleStart() {
this.flash();
AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, AbstractDungeon.player, new SlowPower(AbstractDungeon.player, 0), 0));
AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, AbstractDungeon.player, new SlowPower2(AbstractDungeon.player, 0), 0));
AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, AbstractDungeon.player, new MalleablePower(AbstractDungeon.player, 4)));
//AbstractDungeon.actionManager.addToTop(new ApplyPowerAction(AbstractDungeon.player, AbstractDungeon.player, new MetallicizePower(AbstractDungeon.player, 2), 2));
//AbstractDungeon.actionManager.addToBottom(new MakeTempCardInDrawPileAction(AbstractDungeon.player, AbstractDungeon.player, new Slimed(), 2, true, false));
Expand Down
10 changes: 5 additions & 5 deletions .../megacrit/cardcrawl/powers/SlowPower.java → ...megacrit/cardcrawl/powers/SlowPower2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
import com.megacrit.cardcrawl.cards.DamageInfo;
import com.megacrit.cardcrawl.core.*;

public class SlowPower extends AbstractPower
public class SlowPower2 extends AbstractPower
{
public static final String POWER_ID = "Slow";
private static final PowerStrings powerStrings;
public static final String NAME;
public static final String[] DESCRIPTIONS;
private int baseAmount;

public SlowPower(final AbstractCreature owner, final int amount) {
public SlowPower2(final AbstractCreature owner, final int amount) {
this(owner, amount, 0);
}

public SlowPower(final AbstractCreature owner, final int amount, final int baseAmount) {
public SlowPower2(final AbstractCreature owner, final int amount, final int baseAmount) {
this.name = SlowPower.NAME;
this.ID = "Slow";
this.baseAmount = baseAmount;
Expand Down Expand Up @@ -77,7 +77,7 @@ public void stackPower(final int stackAmount) {

static {
powerStrings = CardCrawlGame.languagePack.getPowerStrings("Slow");
NAME = SlowPower.powerStrings.NAME;
DESCRIPTIONS = SlowPower.powerStrings.DESCRIPTIONS;
NAME = powerStrings.NAME;
DESCRIPTIONS = powerStrings.DESCRIPTIONS;
}
}
48 changes: 48 additions & 0 deletions src/main/resources/localization/ReplayCardStrings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,6 +890,54 @@
"NAME": "Dynamite!",
"DESCRIPTION": "Deal !D! damage to ALL enemies after !M! turns."
},
"Replay:Jungle:SS_maw_1": {
"NAME": "Spore Cloud",
"DESCRIPTION": "Apply 1 Vulnerable to a random enemy !M! times. NL Exhaust."
},
"Replay:Jungle:SS_maw_2": {
"NAME": "Assymilate",
"DESCRIPTION": "Deal !D! damage to ALL enemies. NL Does double damage to Minions. NL Heal for unblocked damage dealt. NL Exhaust."
},
"Replay:Jungle:SS_maw_3": {
"NAME": "Mending Spores",
"DESCRIPTION": "Gain !B! Block. NL Draw 1 card. NL Exhaustive !stslib:ex!."
},
"Replay:Jungle:SS_maw_4": {
"NAME": "Grow",
"DESCRIPTION": "Gain !B! Block. NL Gain !M! Strength."
},
"Replay:Jungle:SS_spyder_1": {
"NAME": "Web Wall",
"DESCRIPTION": "Gain !B! Block. NL Apply !M! Weak to all enemies that intend to attack. NL Exhaust."
},
"Replay:Jungle:SS_spyder_2": {
"NAME": "Guarding Spyder",
"DESCRIPTION": "Gain !B! Shielding and !M! Buffer. NL Exhaust."
},
"Replay:Jungle:SS_spyder_3": {
"NAME": "Attacking Spyder",
"DESCRIPTION": "Gain !B! Shielding. NL Deal !D! damage to a random enemy. NL Exhaust."
},
"Replay:Jungle:SS_spyder_4": {
"NAME": "Wrap",
"DESCRIPTION": "Apply to an enemy. NL They take !M! damage at the end of thier turns."
},
"Replay:Jungle:SS_totem_1": {
"NAME": "Guarding Totem",
"DESCRIPTION": "Gain !B! Shielding. NL Gain !M! Block each turn."
},
"Replay:Jungle:SS_totem_2": {
"NAME": "Totemic Response",
"DESCRIPTION": "Gain !M! Thorns."
},
"Replay:Jungle:SS_totem_3": {
"NAME": "Encouraging Totem",
"DESCRIPTION": "Gain !B! Shielding. NL Gain !M! Strength each turn."
},
"Replay:Jungle:SS_totem_4": {
"NAME": "Snekomania",
"DESCRIPTION": "Deal !D! damage to a random enemy !M! times. NL Confuse all enemies. NL Exhaust. NL Ethereal."
},
"m_BoundBlade": {
"NAME": "Bound Blade",
"DESCRIPTION": "Cantrip. NL Add a Shiv to your hand. NL Draw a card.",
Expand Down

0 comments on commit a7e94de

Please sign in to comment.