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

v0.7.0: corrected a visual issue with some well water effects

Browse Source
This commit is contained in:
Evan Debenham
2018-09-18 05:51:05 -04:00
parent ed33859d76
commit defbf99bd1
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfAwareness.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class WaterOfAwareness extends WellWater {
} }
@Override @Override
protected Item affectItem( Item item ) { protected Item affectItem( Item item, int pos ) {
if (item.isIdentified()) { if (item.isIdentified()) {
return null; return null;
} else { } else {
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfHealth.java
+2 -2
View File
@@ -53,7 +53,7 @@ public class WaterOfHealth extends WellWater {
hero.belongings.uncurseEquipped(); hero.belongings.uncurseEquipped();
((Hunger)hero.buff( Hunger.class )).satisfy( Hunger.STARVING ); ((Hunger)hero.buff( Hunger.class )).satisfy( Hunger.STARVING );
CellEmitter.get( pos ).start( ShaftParticle.FACTORY, 0.2f, 3 ); CellEmitter.get( hero.pos ).start( ShaftParticle.FACTORY, 0.2f, 3 );
Dungeon.hero.interrupt(); Dungeon.hero.interrupt();
@@ -63,7 +63,7 @@ public class WaterOfHealth extends WellWater {
} }
@Override @Override
protected Item affectItem( Item item ) { protected Item affectItem( Item item, int pos ) {
if (item instanceof DewVial && !((DewVial)item).isFull()) { if (item instanceof DewVial && !((DewVial)item).isFull()) {
((DewVial)item).fill(); ((DewVial)item).fill();
return item; return item;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WaterOfTransmutation.java
+1 -1
View File
@@ -48,7 +48,7 @@ import com.watabou.utils.Random;
public class WaterOfTransmutation extends WellWater { public class WaterOfTransmutation extends WellWater {
@Override @Override
protected Item affectItem( Item item ) { protected Item affectItem( Item item, int pos ) {
if (item instanceof MagesStaff) { if (item instanceof MagesStaff) {
item = changeStaff( (MagesStaff)item ); item = changeStaff( (MagesStaff)item );
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/WellWater.java
+2 -4
View File
@@ -34,8 +34,6 @@ import com.watabou.utils.Random;
public abstract class WellWater extends Blob { public abstract class WellWater extends Blob {
protected int pos;
@Override @Override
protected void evolve() { protected void evolve() {
int cell; int cell;
@@ -71,7 +69,7 @@ public abstract class WellWater extends Blob {
} else if ((heap = Dungeon.level.heaps.get( pos )) != null) { } else if ((heap = Dungeon.level.heaps.get( pos )) != null) {
Item oldItem = heap.peek(); Item oldItem = heap.peek();
Item newItem = affectItem( oldItem ); Item newItem = affectItem( oldItem, pos );
if (newItem != null) { if (newItem != null) {
@@ -112,7 +110,7 @@ public abstract class WellWater extends Blob {
protected abstract boolean affectHero( Hero hero ); protected abstract boolean affectHero( Hero hero );
protected abstract Item affectItem( Item item ); protected abstract Item affectItem( Item item, int pos );
protected abstract Notes.Landmark record(); protected abstract Notes.Landmark record();