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

v1.4.2: reverted spinner changes for the moment, was causing crashes

Browse Source
This commit is contained in:
Evan Debenham
2022-10-28 12:19:48 -04:00
parent c6830ae2af
commit 1e7a473d03
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java
+2 -9
View File
@@ -132,15 +132,13 @@ public class Spinner extends Mob {
} }
private boolean shotWebVisually = false; private boolean shotWebVisually = false;
private int visualWebPos = -1;
@Override @Override
public void move(int step, boolean travelling) { public void move(int step, boolean travelling) {
if (travelling && enemySeen && webCoolDown <= 0 && lastEnemyPos != -1){ if (travelling && enemySeen && webCoolDown <= 0 && lastEnemyPos != -1){
if (webPos() != -1){ if (webPos() != -1){
if (sprite != null && (sprite.visible || enemy.sprite.visible)) { if (sprite != null && (sprite.visible || enemy.sprite.visible)) {
visualWebPos = webPos(); sprite.zap( webPos() );
sprite.zap(visualWebPos);
shotWebVisually = true; shotWebVisually = true;
} else { } else {
shootWeb(); shootWeb();
@@ -152,13 +150,9 @@ public class Spinner extends Mob {
public int webPos(){ public int webPos(){
if (visualWebPos != -1){
return visualWebPos;
}
Char enemy = this.enemy; Char enemy = this.enemy;
if (enemy == null) return -1; if (enemy == null) return -1;
Ballistica b; Ballistica b;
//aims web in direction enemy is moving, or between self and enemy if they aren't moving //aims web in direction enemy is moving, or between self and enemy if they aren't moving
if (lastEnemyPos == enemy.pos){ if (lastEnemyPos == enemy.pos){
@@ -216,7 +210,6 @@ public class Spinner extends Mob {
if (Dungeon.level.heroFOV[enemy.pos]){ if (Dungeon.level.heroFOV[enemy.pos]){
Dungeon.hero.interrupt(); Dungeon.hero.interrupt();
} }
visualWebPos = -1;
} }
next(); next();
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/v1_X_Changes.java
-1
View File
@@ -123,7 +123,6 @@ public class v1_X_Changes {
"_-_ Recharging effects sometimes getting an extra action on game load\n" + "_-_ Recharging effects sometimes getting an extra action on game load\n" +
"_-_ Screen orientation changes cancelling the scroll of enchantment\n" + "_-_ Screen orientation changes cancelling the scroll of enchantment\n" +
"_-_ Magical infusion incorrectly clearing curses on wands and rings\n" + "_-_ Magical infusion incorrectly clearing curses on wands and rings\n" +
"_-_ Spinners failing to shoot webs in rare cases\n" +
"_-_ Projecting weapons not reaching through webs in rare cases\n" + "_-_ Projecting weapons not reaching through webs in rare cases\n" +
"_-_ Death by necromancer summoning damage not producing a record in rankings")); "_-_ Death by necromancer summoning damage not producing a record in rankings"));