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

v0.6.0: standard and connection rooms now vary based on depth

Browse Source
This commit is contained in:
Evan Debenham 2017-05-20 16:51:27 -04:00
parent 36b80cf1fd
commit e4907b432f
2 changed files with 74 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/connection/ConnectionRoom.java
View File

@ -27,8 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
import com.watabou.utils.Point;
import com.watabou.utils.Random;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.ArrayList;
public abstract class ConnectionRoom extends Room {
@ -58,19 +57,42 @@ public abstract class ConnectionRoom extends Room {
return super.canPlaceTrap(p) && Dungeon.depth > 1;
}
private static HashMap<Class<?extends ConnectionRoom>, Float> chances = new LinkedHashMap<>();
//FIXME this is a very messy way of handing variable connection rooms
private static ArrayList<Class<?extends ConnectionRoom>> rooms = new ArrayList<>();
static {
chances.put(TunnelRoom.class, 10f);
chances.put(PerimeterRoom.class, 10f);
chances.put(BridgeRoom.class, 3f);
chances.put(WalkwayRoom.class, 3f);
chances.put(MazeConnectionRoom.class, 1f);
rooms.add(TunnelRoom.class);
rooms.add(BridgeRoom.class);
rooms.add(PerimeterRoom.class);
rooms.add(WalkwayRoom.class);
rooms.add(MazeConnectionRoom.class);
}
private static float[][] chances = new float[27][];
static {
chances[1] = new float[]{6, 1, 0, 1, 0};
chances[4] = chances[3] = chances[2] = chances[1];
chances[5] = new float[]{1, 0, 0, 0, 0};
chances[6] = new float[]{0, 0, 5, 1, 0};
chances[10] = chances[9] = chances[8] = chances[7] = chances[6];
chances[11] = new float[]{6, 0, 0, 3, 0};
chances[15] = chances[14] = chances[13] = chances[12] = chances[11];
chances[16] = new float[]{0, 1, 6, 1, 0};
chances[20] = chances[19] = chances[18] = chances[17] = chances[16];
chances[21] = chances[5];
chances[22] = new float[]{6, 2, 0, 1, 0};
chances[26] = chances[25] = chances[24] = chances[23] = chances[22];
}
public static ConnectionRoom createRoom(){
try {
return Random.chances(chances).newInstance();
return rooms.get(Random.chances(chances[Dungeon.depth])).newInstance();
} catch (Exception e) {
ShatteredPixelDungeon.reportException(e);
return null;

58
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/standard/StandardRoom.java
View File

@ -21,12 +21,12 @@
package com.shatteredpixel.shatteredpixeldungeon.levels.rooms.standard;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.levels.rooms.Room;
import com.watabou.utils.Random;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.ArrayList;
public abstract class StandardRoom extends Room {
@ -110,27 +110,53 @@ public abstract class StandardRoom extends Room {
else return 4;
}
private static HashMap<Class<?extends StandardRoom>, Float> chances = new LinkedHashMap<>();
//FIXME this is a very messy way of handing variable standard rooms
private static ArrayList<Class<?extends StandardRoom>> rooms = new ArrayList<>();
static {
//currently effective average room size value is 1.15916
chances.put(EmptyRoom.class, 24f);//average value: 1.0000, +.00000 overall
rooms.add(EmptyRoom.class);
chances.put(RingRoom.class, 8f); //average value: 1.5000, +.10000 overall
rooms.add(RingRoom.class);
rooms.add(SegmentedRoom.class);
rooms.add(CaveRoom.class);
rooms.add(PillarsRoom.class);
rooms.add(RuinsRoom.class);
chances.put(GardenRoom.class, 1f); //average value: 1.2500, +.00625 overall
chances.put(AquariumRoom.class, 1f); //average value: 1.2500, +.00625 overall
chances.put(PlatformRoom.class, 1f); //average value: 1.5000, +.01250 overall
chances.put(BurnedRoom.class, 1f); //average value: 1.2000, +.00500 overall
chances.put(FissureRoom.class, 1f); //average value: 1.5000, +.01250 overall
chances.put(GrassyGraveRoom.class, 1f); //average value: 1.0000, +.00000 overall
chances.put(StripedRoom.class, 1f); //average value: 1.3333, +.00833 overall
chances.put(StudyRoom.class, 1f); //average value: 1.3333, +.00833 overall
rooms.add(GardenRoom.class);
rooms.add(AquariumRoom.class);
rooms.add(PlatformRoom.class);
rooms.add(BurnedRoom.class);
rooms.add(FissureRoom.class);
rooms.add(GrassyGraveRoom.class);
rooms.add(StripedRoom.class);
rooms.add(StudyRoom.class);
}
private static float[][] chances = new float[27][];
static {
chances[1] = new float[]{22, 10, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1};
chances[2] = new float[]{22, 10, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1};
chances[4] = chances[3] = chances[2];
chances[5] = new float[]{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
chances[6] = new float[]{22, 0, 10, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1};
chances[10] = chances[9] = chances[8] = chances[7] = chances[6];
chances[11] = new float[]{22, 0, 0, 10, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1};
chances[15] = chances[14] = chances[13] = chances[12] = chances[11];
chances[16] = new float[]{22, 0, 0, 0, 10, 0, 1, 1, 1, 1, 1, 1, 1, 1};
chances[20] = chances[19] = chances[18] = chances[17] = chances[16];
chances[21] = chances[5];
chances[22] = new float[]{22, 0, 0, 0, 0, 10, 1, 1, 1, 1, 1, 1, 1, 1};
chances[26] = chances[25] = chances[24] = chances[23] = chances[22];
}
public static StandardRoom createRoom(){
try{
return Random.chances(chances).newInstance();
return rooms.get(Random.chances(chances[Dungeon.depth])).newInstance();
} catch (Exception e) {
ShatteredPixelDungeon.reportException(e);
return null;