LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.9.2: implemented final versions of first two new combo moves

Browse Source
This commit is contained in:
Evan Debenham 2021-02-06 23:12:58 -05:00
parent f62c6f6509
commit 22916e02b8
2 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/assets/messages/actors/actors.properties
View File

@ -123,11 +123,11 @@ actors.buffs.combo.combo=%d hit combo!
actors.buffs.combo.bad_target=You must target an enemy in attack range.
actors.buffs.combo.prompt=Select a target to attack.
actors.buffs.combo.desc=The gladiator builds momentum as they land successful blows. Each attack increases the combo counter by one, but taking too long between hits will reset the combo counter to 0.\n\nBuilding combo unlocks special combo attacks that cannot miss! A different attack is unlocked at 2, 4, 6, 8, and 10 combo count.
actors.buffs.combo$combomove.clobber_desc=_Clobber_ knocks an enemy back 2 tiles, but not into a pit. Requires 2 combo, increments combo by 1, 1 use per combo.
actors.buffs.combo$combomove.cleave_desc=_Clobber_ knocks an enemy back 2 tiles, but not into a pit. Requires 2 combo, increments combo by 1, 1 use per combo.
actors.buffs.combo$combomove.slam_desc=_Clobber_ knocks an enemy back 2 tiles, but not into a pit. Requires 2 combo, increments combo by 1, 1 use per combo.
actors.buffs.combo$combomove.crush_desc=_Clobber_ knocks an enemy back 2 tiles, but not into a pit. Requires 2 combo, increments combo by 1, 1 use per combo.
actors.buffs.combo$combomove.fury_desc=_Clobber_ knocks an enemy back 2 tiles, but not into a pit. Requires 2 combo, increments combo by 1, 1 use per combo.
actors.buffs.combo$combomove.clobber_desc=_Clobber_ knocks an enemy back 2 tiles, but deals no damage and cannot knock into pits. Requires 2 combo, increments combo by 1, 1 use per combo.
actors.buffs.combo$combomove.slam_desc=_Slam_ deals 20% of your armor's blocking power as bonus damage for each combo you have. Requires 4 combo, resets combo when used.
actors.buffs.combo$combomove.parry_desc=_Parry_ ... . Requires 6 combo, resets combo if nothing is parried, 1 use per combo.
actors.buffs.combo$combomove.crush_desc=_???_ ... . Requires 8 combo, resets combo when used.
actors.buffs.combo$combomove.fury_desc=_???_ ... . Requires 10 combo, resets combo when used.
actors.buffs.corruption.name=Corrupted
actors.buffs.corruption.desc=Corruption seeps into the essence of a being, twisting them against their former nature.\n\nCorrupted creatures will attack their allies, and ignore their former enemies. Corruption is damaging as well, and will slowly cause its target to succumb.\n\nCorruption is permanent, its effects only end in death.

62
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Combo.java
View File

@ -125,19 +125,30 @@ public class Combo extends Buff implements ActionIndicator.Action {
private static final String COUNT = "count";
private static final String TIME = "combotime";
private static final String CLOBBER_USED = "clobber_used";
private static final String PARRY_USED = "parry_used";
@Override
public void storeInBundle(Bundle bundle) {
super.storeInBundle(bundle);
bundle.put(COUNT, count);
bundle.put(TIME, comboTime);
bundle.put(CLOBBER_USED, clobberUsed);
bundle.put(PARRY_USED, parryUsed);
}
@Override
public void restoreFromBundle(Bundle bundle) {
super.restoreFromBundle(bundle);
count = bundle.getInt( COUNT );
if (getHighestMove() != null) ActionIndicator.setAction(this);
comboTime = bundle.getFloat( TIME );
clobberUsed = bundle.getBoolean(CLOBBER_USED);
parryUsed = bundle.getBoolean(PARRY_USED);
if (getHighestMove() != null) ActionIndicator.setAction(this);
}
@Override
@ -160,12 +171,11 @@ public class Combo extends Buff implements ActionIndicator.Action {
}
public enum ComboMove {
//TODO rework these moves
CLOBBER(2, 0xFF00FF00),
CLEAVE(4, 0xFFCCFF00),
SLAM(6, 0xFFFFFF00),
CRUSH(8, 0xFFFFCC00),
FURY(10, 0xFFFF0000);
SLAM (4, 0xFFCCFF00),
PARRY (6, 0xFFFFFF00), //TODO implement
CRUSH (8, 0xFFFFCC00), //TODO rework
FURY (10, 0xFFFF0000); //TODO rework
public int comboReq, tintColor;
@ -178,9 +188,11 @@ public class Combo extends Buff implements ActionIndicator.Action {
return Messages.get(this, name()+"_desc");
}
}
private boolean clobberUsed = false;
private boolean parryUsed = false;
public ComboMove getHighestMove(){
ComboMove best = null;
for (ComboMove move : ComboMove.values()){
@ -192,13 +204,20 @@ public class Combo extends Buff implements ActionIndicator.Action {
}
public boolean canUseMove(ComboMove move){
if (move == ComboMove.CLOBBER && clobberUsed) return false;
if (move == ComboMove.PARRY && parryUsed) return false;
return move.comboReq <= count;
}
public void useMove(ComboMove move){
if (move == ComboMove.PARRY){
//TODO
parryUsed = true;
} else {
moveBeingUsed = move;
GameScene.selectCell(listener);
}
}
private static ComboMove moveBeingUsed;
@ -244,13 +263,10 @@ public class Combo extends Buff implements ActionIndicator.Action {
//variance in damage dealt
switch (moveBeingUsed) {
case CLOBBER:
dmg = Math.round(dmg * 0.6f);
break;
case CLEAVE:
dmg = Math.round(dmg * 1.5f);
dmg = 0;
break;
case SLAM:
dmg += target.drRoll();
dmg += Math.round(target.drRoll() * count/5f);
break;
case CRUSH:
//rolls 4 times, takes the highest roll
@ -283,9 +299,13 @@ public class Combo extends Buff implements ActionIndicator.Action {
Ballistica trajectory = new Ballistica(target.pos, enemy.pos, Ballistica.STOP_TARGET);
//trim it to just be the part that goes past them
trajectory = new Ballistica(trajectory.collisionPos, trajectory.path.get(trajectory.path.size() - 1), Ballistica.PROJECTILE);
//knock them back along that ballistica
WandOfBlastWave.throwChar(enemy, trajectory, 2, true, false);
Buff.prolong(enemy, Vertigo.class, Random.NormalIntRange(1, 4));
//knock them back along that ballistica, ensuring they don't fall into a pit
int dist = 2;
while (dist > 0 && Dungeon.level.pit[trajectory.path.get(dist)]){
dist--;
}
WandOfBlastWave.throwChar(enemy, trajectory, dist, true, false);
hit( enemy );
}
break;
case SLAM:
@ -317,7 +337,13 @@ public class Combo extends Buff implements ActionIndicator.Action {
//Post-attack behaviour
switch(moveBeingUsed){
case CLEAVE:
case CLOBBER:
clobberUsed = true;
if (getHighestMove() == null) ActionIndicator.clearAction(Combo.this);
hero.spendAndNext(hero.attackDelay());
break;
/*case CLEAVE:
//combo isn't reset, but rather increments with a cleave kill, and grants more time.
//this includes corrupting kills (which is why we check alignment
if (!enemy.isAlive() || (!wasAlly && enemy.alignment == target.alignment)) {
@ -328,7 +354,7 @@ public class Combo extends Buff implements ActionIndicator.Action {
ActionIndicator.clearAction(Combo.this);
}
hero.spendAndNext(hero.attackDelay());
break;
break;*/
case FURY:
count--;
@ -360,8 +386,6 @@ public class Combo extends Buff implements ActionIndicator.Action {
BrokenSeal.WarriorShield shield = hero.buff(BrokenSeal.WarriorShield.class);
shield.supercharge(Math.round(shield.maxShield() * hero.pointsInTalent(Talent.LETHAL_DEFENSE)/3f));
}
hit( enemy );
comboTime = 12f;
}
}