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

Merging 1.7.5 Source: plant changes

Browse Source
This commit is contained in:
Evan Debenham 2015-01-29 14:16:55 -05:00
parent 11d550cbe0
commit 1b10338b37
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/shatteredpixel/shatteredpixeldungeon/plants/Fadeleaf.java
View File

@ -48,9 +48,7 @@ public class Fadeleaf extends Plant {
((Hero)ch).curAction = null;
} else if (ch instanceof Mob) {
// Why do I try to choose a new position 10 times?
// I don't remember...
int count = 10;
int newPos;
do {

1
src/com/shatteredpixel/shatteredpixeldungeon/plants/Icecap.java
View File

@ -48,7 +48,6 @@ public class Icecap extends Plant {
for (int i=0; i < Level.LENGTH; i++) {
if (PathFinder.distance[i] < Integer.MAX_VALUE) {
Freezing.affect( i, fire );
}
}

4
src/com/shatteredpixel/shatteredpixeldungeon/plants/Plant.java
View File

@ -161,7 +161,9 @@ public class Plant implements Bundlable {
public Plant couch( int pos ) {
try {
Sample.INSTANCE.play( Assets.SND_PLANT );
if (Dungeon.visible[pos]) {
Sample.INSTANCE.play(Assets.SND_PLANT);
}
Plant plant = plantClass.newInstance();
plant.pos = pos;
return plant;