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

v2.1.3: fixed action and minor pathfinding errors with mine action

Browse Source
This commit is contained in:
Evan Debenham
2023-06-23 12:35:47 -04:00
parent 161a67b8e1
commit 10dc3bba75
1 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java
+42 -32
View File
@@ -1049,6 +1049,7 @@ public class Hero extends Char {
private boolean actOpenChest( HeroAction.OpenChest action ) { private boolean actOpenChest( HeroAction.OpenChest action ) {
int dst = action.dst; int dst = action.dst;
if (Dungeon.level.adjacent( pos, dst ) || pos == dst) { if (Dungeon.level.adjacent( pos, dst ) || pos == dst) {
path = null;
Heap heap = Dungeon.level.heaps.get( dst ); Heap heap = Dungeon.level.heaps.get( dst );
if (heap != null && (heap.type != Type.HEAP && heap.type != Type.FOR_SALE)) { if (heap != null && (heap.type != Type.HEAP && heap.type != Type.FOR_SALE)) {
@@ -1095,6 +1096,7 @@ public class Hero extends Char {
private boolean actUnlock( HeroAction.Unlock action ) { private boolean actUnlock( HeroAction.Unlock action ) {
int doorCell = action.dst; int doorCell = action.dst;
if (Dungeon.level.adjacent( pos, doorCell )) { if (Dungeon.level.adjacent( pos, doorCell )) {
path = null;
boolean hasKey = false; boolean hasKey = false;
int door = Dungeon.level.map[doorCell]; int door = Dungeon.level.map[doorCell];
@@ -1140,47 +1142,55 @@ public class Hero extends Char {
} }
public boolean actMine(HeroAction.Mine action){ public boolean actMine(HeroAction.Mine action){
if (Dungeon.level.adjacent(pos, action.dst) if (Dungeon.level.adjacent(pos, action.dst)){
&& (Dungeon.level.map[action.dst] == Terrain.WALL || Dungeon.level.map[action.dst] == Terrain.WALL_DECO) path = null;
if ((Dungeon.level.map[action.dst] == Terrain.WALL || Dungeon.level.map[action.dst] == Terrain.WALL_DECO)
&& Dungeon.level.insideMap(action.dst)){ && Dungeon.level.insideMap(action.dst)){
sprite.attack(action.dst, new Callback() { sprite.attack(action.dst, new Callback() {
@Override @Override
public void call() { public void call() {
if (Dungeon.level.map[action.dst] == Terrain.WALL_DECO){ if (Dungeon.level.map[action.dst] == Terrain.WALL_DECO){
DarkGold gold = new DarkGold(); DarkGold gold = new DarkGold();
if (gold.doPickUp( Dungeon.hero )) { if (gold.doPickUp( Dungeon.hero )) {
GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", gold.name())) ); GLog.i( Messages.capitalize(Messages.get(Dungeon.hero, "you_now_have", gold.name())) );
} else {
Dungeon.level.drop( gold, pos ).sprite.drop();
}
CellEmitter.center( action.dst ).burst( Speck.factory( Speck.STAR ), 7 );
Sample.INSTANCE.play( Assets.Sounds.EVOKE );
} else { } else {
Dungeon.level.drop( gold, pos ).sprite.drop(); CellEmitter.get( action.dst ).burst( Speck.factory( Speck.ROCK ), 2 );
Sample.INSTANCE.play( Assets.Sounds.MINE );
} }
CellEmitter.center( action.dst ).burst( Speck.factory( Speck.STAR ), 7 );
Sample.INSTANCE.play( Assets.Sounds.EVOKE ); PixelScene.shake(0.5f, 0.5f);
} else {
CellEmitter.get( action.dst ).burst( Speck.factory( Speck.ROCK ), 2 ); Level.set( action.dst, Terrain.EMPTY_DECO );
Sample.INSTANCE.play( Assets.Sounds.MINE ); for (int i : PathFinder.NEIGHBOURS9) {
Dungeon.level.discoverable[action.dst + i] = true;
}
for (int i : PathFinder.NEIGHBOURS9) {
GameScene.updateMap( action.dst+i );
}
Dungeon.observe();
spendAndNext(TICK);
} }
});
} else {
ready();
}
return false;
} else if (getCloser( action.dst )) {
PixelScene.shake(0.5f, 0.5f); return true;
Level.set( action.dst, Terrain.EMPTY_DECO ); } else {
for (int i : PathFinder.NEIGHBOURS9) { ready();
Dungeon.level.discoverable[action.dst + i] = true;
}
for (int i : PathFinder.NEIGHBOURS9) {
GameScene.updateMap( action.dst+i );
}
Dungeon.observe();
spendAndNext(TICK);
ready();
}
});
return false; return false;
} }
ready();
return false;
} }
private boolean actTransition(HeroAction.LvlTransition action ) { private boolean actTransition(HeroAction.LvlTransition action ) {