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

v3.3.0: quest tester area is no longer enterable during ascent

Browse Source
This commit is contained in:
Evan Debenham
2025-12-02 19:33:41 -05:00
committed by Evan Debenham
parent 0e58334df6
commit d92ac9e444
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/CityLevel.java
View File

@@ -24,6 +24,7 @@ package com.shatteredpixel.shatteredpixeldungeon.levels;
import com.shatteredpixel.shatteredpixeldungeon.Assets; import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics; import com.shatteredpixel.shatteredpixeldungeon.Statistics;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AscensionChallenge;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Imp;
@@ -99,24 +100,24 @@ public class CityLevel extends RegularLevel {
//6 to 8, average 7 //6 to 8, average 7
return 6+Random.chances(new float[]{1, 3, 1}); return 6+Random.chances(new float[]{1, 3, 1});
} }
@Override @Override
protected int specialRooms(boolean forceMax) { protected int specialRooms(boolean forceMax) {
if (forceMax) return 3; if (forceMax) return 3;
//2 to 3, average 2.33 //2 to 3, average 2.33
return 2 + Random.chances(new float[]{2, 1}); return 2 + Random.chances(new float[]{2, 1});
} }
@Override @Override
public String tilesTex() { public String tilesTex() {
return Assets.Environment.TILES_CITY; return Assets.Environment.TILES_CITY;
} }
@Override @Override
public String waterTex() { public String waterTex() {
return Assets.Environment.WATER_CITY; return Assets.Environment.WATER_CITY;
} }
@Override @Override
protected Painter painter() { protected Painter painter() {
return new CityPainter() return new CityPainter()
@@ -124,7 +125,7 @@ public class CityLevel extends RegularLevel {
.setGrass(feeling == Feeling.GRASS ? 0.80f : 0.20f, 3) .setGrass(feeling == Feeling.GRASS ? 0.80f : 0.20f, 3)
.setTraps(nTraps(), trapClasses(), trapChances()); .setTraps(nTraps(), trapClasses(), trapChances());
} }
@Override @Override
protected Class<?>[] trapClasses() { protected Class<?>[] trapClasses() {
return new Class[]{ return new Class[]{
@@ -145,6 +146,10 @@ public class CityLevel extends RegularLevel {
public boolean activateTransition(Hero hero, LevelTransition transition) { public boolean activateTransition(Hero hero, LevelTransition transition) {
if (transition.type == LevelTransition.Type.BRANCH_EXIT) { if (transition.type == LevelTransition.Type.BRANCH_EXIT) {
if (hero.buff(AscensionChallenge.class) != null){
return false;
}
Game.runOnRenderThread(new Callback() { Game.runOnRenderThread(new Callback() {
@Override @Override
public void call() { public void call() {