Merging 1.7.5 Source: plant changes
This commit is contained in:
@@ -48,9 +48,7 @@ public class Fadeleaf extends Plant {
|
|||||||
((Hero)ch).curAction = null;
|
((Hero)ch).curAction = null;
|
||||||
|
|
||||||
} else if (ch instanceof Mob) {
|
} else if (ch instanceof Mob) {
|
||||||
|
|
||||||
// Why do I try to choose a new position 10 times?
|
|
||||||
// I don't remember...
|
|
||||||
int count = 10;
|
int count = 10;
|
||||||
int newPos;
|
int newPos;
|
||||||
do {
|
do {
|
||||||
|
|||||||
@@ -48,7 +48,6 @@ public class Icecap extends Plant {
|
|||||||
|
|
||||||
for (int i=0; i < Level.LENGTH; i++) {
|
for (int i=0; i < Level.LENGTH; i++) {
|
||||||
if (PathFinder.distance[i] < Integer.MAX_VALUE) {
|
if (PathFinder.distance[i] < Integer.MAX_VALUE) {
|
||||||
|
|
||||||
Freezing.affect( i, fire );
|
Freezing.affect( i, fire );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -161,7 +161,9 @@ public class Plant implements Bundlable {
|
|||||||
|
|
||||||
public Plant couch( int pos ) {
|
public Plant couch( int pos ) {
|
||||||
try {
|
try {
|
||||||
Sample.INSTANCE.play( Assets.SND_PLANT );
|
if (Dungeon.visible[pos]) {
|
||||||
|
Sample.INSTANCE.play(Assets.SND_PLANT);
|
||||||
|
}
|
||||||
Plant plant = plantClass.newInstance();
|
Plant plant = plantClass.newInstance();
|
||||||
plant.pos = pos;
|
plant.pos = pos;
|
||||||
return plant;
|
return plant;
|
||||||
|
|||||||
Reference in New Issue
Block a user