konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v2.0.0: fixed challenge having no text if targeting an empty space

Browse Source
This commit is contained in:
Evan Debenham
2023-02-27 18:41:40 -05:00
parent 76cddd5ac7
commit 83a017409e
1 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/abilities/duelist/Challenge.java
+73 -72
View File
@@ -81,104 +81,105 @@ public class Challenge extends ArmorAbility {
@Override @Override
protected void activate(ClassArmor armor, Hero hero, Integer target) { protected void activate(ClassArmor armor, Hero hero, Integer target) {
if (target == null || !Dungeon.level.heroFOV[target]){ if (target == null){
return; return;
} }
Char targetCh = Actor.findChar(target); Char targetCh = Actor.findChar(target);
if (targetCh == null || !Dungeon.level.heroFOV[target]){
GLog.w(Messages.get(this, "no_target"));
return;
}
if (hero.buff(DuelParticipant.class) != null){ if (hero.buff(DuelParticipant.class) != null){
GLog.w(Messages.get(this, "already_dueling")); GLog.w(Messages.get(this, "already_dueling"));
return; return;
} }
if (targetCh != null){ if (targetCh.alignment == hero.alignment){
GLog.w(Messages.get(this, "ally_target"));
return;
}
if (targetCh.alignment == hero.alignment){ boolean[] passable = Dungeon.level.passable.clone();
GLog.w(Messages.get(this, "ally_target")); for (Char c : Actor.chars()) {
return; if (c != hero) passable[c.pos] = false;
} }
PathFinder.buildDistanceMap(targetCh.pos, passable);
int[] reachable = PathFinder.distance.clone();
boolean[] passable = Dungeon.level.passable.clone(); int blinkpos = hero.pos;
for (Char c : Actor.chars()) { if (hero.hasTalent(Talent.CLOSE_THE_GAP)){
if (c != hero) passable[c.pos] = false;
}
PathFinder.buildDistanceMap(targetCh.pos, passable);
int[] reachable = PathFinder.distance.clone();
int blinkpos = hero.pos; int blinkrange = 1 + hero.pointsInTalent(Talent.CLOSE_THE_GAP);
if (hero.hasTalent(Talent.CLOSE_THE_GAP)){ PathFinder.buildDistanceMap(hero.pos, BArray.not(Dungeon.level.solid,null), blinkrange);
int blinkrange = 1 + hero.pointsInTalent(Talent.CLOSE_THE_GAP); for (int i = 0; i < PathFinder.distance.length; i++){
PathFinder.buildDistanceMap(hero.pos, BArray.not(Dungeon.level.solid,null), blinkrange); if (PathFinder.distance[i] == Integer.MAX_VALUE
|| reachable[i] == Integer.MAX_VALUE
|| i == targetCh.pos){
continue;
}
for (int i = 0; i < PathFinder.distance.length; i++){ if (Dungeon.level.distance(i, targetCh.pos) < Dungeon.level.distance(blinkpos, targetCh.pos)){
if (PathFinder.distance[i] == Integer.MAX_VALUE blinkpos = i;
|| reachable[i] == Integer.MAX_VALUE } else if (Dungeon.level.distance(i, targetCh.pos) == Dungeon.level.distance(blinkpos, targetCh.pos)){
|| i == targetCh.pos){ if (Dungeon.level.trueDistance(i, hero.pos) < Dungeon.level.trueDistance(blinkpos, hero.pos)){
continue;
}
if (Dungeon.level.distance(i, targetCh.pos) < Dungeon.level.distance(blinkpos, targetCh.pos)){
blinkpos = i; blinkpos = i;
} else if (Dungeon.level.distance(i, targetCh.pos) == Dungeon.level.distance(blinkpos, targetCh.pos)){
if (Dungeon.level.trueDistance(i, hero.pos) < Dungeon.level.trueDistance(blinkpos, hero.pos)){
blinkpos = i;
}
} }
} }
} }
}
if (PathFinder.distance[blinkpos] == Integer.MAX_VALUE){ if (PathFinder.distance[blinkpos] == Integer.MAX_VALUE){
GLog.w(Messages.get(this, "unreachable_target")); GLog.w(Messages.get(this, "unreachable_target"));
return; return;
}
if (Dungeon.level.distance(blinkpos, targetCh.pos) >= 5){
GLog.w(Messages.get(this, "distant_target"));
return;
}
if (blinkpos != hero.pos){
Dungeon.hero.pos = blinkpos;
Dungeon.level.occupyCell(Dungeon.hero);
//prevents the hero from being interrupted by seeing new enemies
Dungeon.observe();
GameScene.updateFog();
Dungeon.hero.checkVisibleMobs();
Dungeon.hero.sprite.place( Dungeon.hero.pos );
CellEmitter.get( Dungeon.hero.pos ).burst( Speck.factory( Speck.WOOL ), 6 );
Sample.INSTANCE.play( Assets.Sounds.PUFF );
}
boolean bossTarget = Char.hasProp(targetCh, Char.Property.BOSS);
for (Char toFreeze : Actor.chars()){
if (toFreeze != targetCh && toFreeze.alignment != hero.alignment
&& (!bossTarget || !(Char.hasProp(targetCh, Char.Property.BOSS) || Char.hasProp(targetCh, Char.Property.BOSS_MINION)))) {
Actor.delayChar(toFreeze, DuelParticipant.DURATION);
Buff.affect(toFreeze, SpectatorFreeze.class, DuelParticipant.DURATION);
} }
}
if (Dungeon.level.distance(blinkpos, targetCh.pos) >= 5){ Buff.affect(targetCh, DuelParticipant.class);
GLog.w(Messages.get(this, "distant_target")); Buff.affect(hero, DuelParticipant.class);
return; if (targetCh instanceof Mob){
} ((Mob) targetCh).aggro(hero);
}
if (blinkpos != hero.pos){ GameScene.flash(0x80FFFFFF);
Dungeon.hero.pos = blinkpos; Sample.INSTANCE.play(Assets.Sounds.DESCEND);
Dungeon.level.occupyCell(Dungeon.hero);
//prevents the hero from being interrupted by seeing new enemies
Dungeon.observe();
GameScene.updateFog();
Dungeon.hero.checkVisibleMobs();
Dungeon.hero.sprite.place( Dungeon.hero.pos ); armor.charge -= chargeUse( hero );
CellEmitter.get( Dungeon.hero.pos ).burst( Speck.factory( Speck.WOOL ), 6 ); armor.updateQuickslot();
Sample.INSTANCE.play( Assets.Sounds.PUFF ); hero.sprite.zap(target);
}
boolean bossTarget = Char.hasProp(targetCh, Char.Property.BOSS); hero.next();
for (Char toFreeze : Actor.chars()){
if (toFreeze != targetCh && toFreeze.alignment != hero.alignment
&& (!bossTarget || !(Char.hasProp(targetCh, Char.Property.BOSS) || Char.hasProp(targetCh, Char.Property.BOSS_MINION)))) {
Actor.delayChar(toFreeze, DuelParticipant.DURATION);
Buff.affect(toFreeze, SpectatorFreeze.class, DuelParticipant.DURATION);
}
}
Buff.affect(targetCh, DuelParticipant.class); if (hero.buff(EliminationMatchTracker.class) != null){
Buff.affect(hero, DuelParticipant.class); hero.buff(EliminationMatchTracker.class).detach();
if (targetCh instanceof Mob){
((Mob) targetCh).aggro(hero);
}
GameScene.flash(0x80FFFFFF);
Sample.INSTANCE.play(Assets.Sounds.DESCEND);
armor.charge -= chargeUse( hero );
armor.updateQuickslot();
hero.sprite.zap(target);
hero.next();
if (hero.buff(EliminationMatchTracker.class) != null){
hero.buff(EliminationMatchTracker.class).detach();
}
} }
} }