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

v0.6.2: nerfs to some new secret rooms

Browse Source
This commit is contained in:
Evan Debenham 2017-10-11 17:30:46 -04:00
parent 2739595320
commit 01846d1a02
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java
View File

@ -262,7 +262,7 @@ public class WandOfRegrowth extends Wand {
@Override @Override
public void activate() { public void activate() {
int nDrops = Random.NormalIntRange(2, 8); int nDrops = Random.NormalIntRange(3, 6);
ArrayList<Integer> candidates = new ArrayList<Integer>(); ArrayList<Integer> candidates = new ArrayList<Integer>();
for (int i : PathFinder.NEIGHBOURS8){ for (int i : PathFinder.NEIGHBOURS8){
@ -296,7 +296,7 @@ public class WandOfRegrowth extends Wand {
@Override @Override
public void activate() { public void activate() {
int nSeeds = Random.NormalIntRange(1, 5); int nSeeds = Random.NormalIntRange(2, 4);
ArrayList<Integer> candidates = new ArrayList<Integer>(); ArrayList<Integer> candidates = new ArrayList<Integer>();
for (int i : PathFinder.NEIGHBOURS8){ for (int i : PathFinder.NEIGHBOURS8){

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLaboratoryRoom.java
View File

@ -70,10 +70,10 @@ public class SecretLaboratoryRoom extends SecretRoom {
Painter.set( level, pot, Terrain.ALCHEMY ); Painter.set( level, pot, Terrain.ALCHEMY );
Alchemy alchemy = new Alchemy(); Alchemy alchemy = new Alchemy();
alchemy.seed( level, pot.x + level.width() * pot.y, Random.IntRange(40, 75) ); alchemy.seed( level, pot.x + level.width() * pot.y, Random.IntRange(30, 60) );
level.blobs.put( Alchemy.class, alchemy ); level.blobs.put( Alchemy.class, alchemy );
int n = Random.IntRange( 2, 4 ); int n = Random.IntRange( 2, 3 );
HashMap<Class<? extends Potion>, Float> chances = new HashMap<>(potionChances); HashMap<Class<? extends Potion>, Float> chances = new HashMap<>(potionChances);
for (int i=0; i < n; i++) { for (int i=0; i < n; i++) {
int pos; int pos;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretLibraryRoom.java
View File

@ -82,7 +82,7 @@ public class SecretLibraryRoom extends SecretRoom {
} }
entrance.set( Door.Type.HIDDEN ); entrance.set( Door.Type.HIDDEN );
int n = Random.IntRange( 2, 4 ); int n = Random.IntRange( 2, 3 );
HashMap<Class<? extends Scroll>, Float> chances = new HashMap<>(scrollChances); HashMap<Class<? extends Scroll>, Float> chances = new HashMap<>(scrollChances);
for (int i=0; i < n; i++) { for (int i=0; i < n; i++) {
int pos; int pos;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretRoom.java
View File

@ -37,7 +37,7 @@ public abstract class SecretRoom extends SpecialRoom {
private static final ArrayList<Class<? extends SecretRoom>> ALL_SECRETS = new ArrayList<>( Arrays.asList( private static final ArrayList<Class<? extends SecretRoom>> ALL_SECRETS = new ArrayList<>( Arrays.asList(
SecretGardenRoom.class, SecretLaboratoryRoom.class, SecretLibraryRoom.class, SecretGardenRoom.class, SecretLaboratoryRoom.class, SecretLibraryRoom.class,
SecretLarderRoom.class, SecretTransmutationRoom.class, SecretRunestoneRoom.class, SecretLarderRoom.class, SecretWellRoom.class, SecretRunestoneRoom.class,
SecretHoneypotRoom.class)); SecretHoneypotRoom.class));
public static ArrayList<Class<? extends SecretRoom>> runSecrets = new ArrayList<>(); public static ArrayList<Class<? extends SecretRoom>> runSecrets = new ArrayList<>();

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretTransmutationRoom.java → core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/secret/SecretWellRoom.java
View File

@ -21,13 +21,20 @@
package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.secret; package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.secret;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfAwareness;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfHealth;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfTransmutation; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WaterOfTransmutation;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.WellWater;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
import com.watabou.utils.Point; import com.watabou.utils.Point;
import com.watabou.utils.Random;
public class SecretTransmutationRoom extends SecretRoom { public class SecretWellRoom extends SecretRoom {
private static final Class<?>[] WATERS =
{WaterOfAwareness.class, WaterOfHealth.class, WaterOfTransmutation.class};
@Override @Override
public boolean canConnect(Point p) { public boolean canConnect(Point p) {
@ -55,7 +62,10 @@ public class SecretTransmutationRoom extends SecretRoom {
Painter.set( level, well, Terrain.WELL ); Painter.set( level, well, Terrain.WELL );
WaterOfTransmutation.seed(well.x + level.width() * well.y, 1, WaterOfTransmutation.class, level); @SuppressWarnings("unchecked")
Class<? extends WellWater> waterClass = (Class<? extends WellWater>) Random.element( WATERS );
WellWater.seed(well.x + level.width() * well.y, 1, waterClass, level);
entrance().set( Door.Type.HIDDEN ); entrance().set( Door.Type.HIDDEN );
} }