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

v1.4.0: reduced cases where piranha would live in land for a turn

Browse Source
This commit is contained in:
Evan Debenham
2022-08-01 17:43:30 -04:00
parent 9d6fbea2ba
commit 59341628bc
2 changed files with 7 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
View File

@@ -48,6 +48,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Talent;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.abilities.huntress.SpiritHawk;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Bestiary;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Mob;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Piranha;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.YogFist;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Sheep;
import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlowParticle;
@@ -1056,6 +1057,10 @@ public abstract class Level implements Bundlable {
Door.enter( ch.pos );
}
}
if (ch.isAlive() && ch instanceof Piranha && !water[ch.pos]){
ch.die(null);
}
}
//public method for forcing the hard press of a cell. e.g. when an item lands on it

39
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DistortionTrap.java
View File

@@ -100,42 +100,8 @@ public class DistortionTrap extends Trap{
for (Integer point : respawnPoints) {
summoned++;
Mob mob;
switch (summoned){
case 1:
if (Dungeon.depth != 5 && Random.Int(100) == 0){
mob = new RatKing();
break;
}
case 3: case 5 : default:
int floor;
do {
floor = Random.Int(25);
} while( Dungeon.bossLevel(floor));
mob = Reflection.newInstance(Bestiary.getMobRotation(floor).get(0));
break;
case 2:
switch (Random.Int(4)){
case 0: default:
Wraith.spawnAt(point);
continue; //wraiths spawn themselves, no need to do more
case 1:
//yes it's intended that these are likely to die right away
mob = new Piranha();
break;
case 2:
mob = Mimic.spawnAt(point, new ArrayList<>());
((Mimic)mob).stopHiding();
mob.alignment = Char.Alignment.ENEMY;
break;
case 3:
mob = Statue.random();
break;
}
break;
case 4:
mob = Reflection.newInstance(Random.element(RARE));
break;
}
mob = new Piranha();
if (Char.hasProp(mob, Char.Property.LARGE) && !Dungeon.level.openSpace[point]){
continue;
@@ -158,7 +124,6 @@ public class DistortionTrap extends Trap{
t.activate();
}
ScrollOfTeleportation.appear(mob, mob.pos);
Dungeon.level.occupyCell(mob);
}
}