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

v0.6.0: refactoring and improvements to standard room size categories

Browse Source
This commit is contained in:
Evan Debenham 2017-05-08 16:17:18 -04:00
parent 2b03f58bc2
commit 7029f5d6ef
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/RegularLevel.java
View File

@ -99,7 +99,7 @@ public abstract class RegularLevel extends Level {
StandardRoom s; StandardRoom s;
do { do {
s = StandardRoom.createRoom(); s = StandardRoom.createRoom();
} while ((i + s.sizeCat.roomValue) > standards); } while (!s.setSizeCat( standards-i ));
i += s.sizeCat.roomValue-1; i += s.sizeCat.roomValue-1;
initRooms.add(s); initRooms.add(s);
} }

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

@ -30,7 +30,7 @@ import java.util.LinkedHashMap;
public abstract class StandardRoom extends Room { public abstract class StandardRoom extends Room {
public enum SizeCategories{ public enum SizeCategory {
NORMAL(4, 10, 1), NORMAL(4, 10, 1),
LARGE(10, 14, 2), LARGE(10, 14, 2),
@ -39,7 +39,7 @@ public abstract class StandardRoom extends Room {
public final int minDim, maxDim; public final int minDim, maxDim;
public final int roomValue; public final int roomValue;
SizeCategories(int min, int max, int val){ SizeCategory(int min, int max, int val){
minDim = min; minDim = min;
maxDim = max; maxDim = max;
roomValue = val; roomValue = val;
@ -51,7 +51,44 @@ public abstract class StandardRoom extends Room {
} }
public SizeCategories sizeCat = SizeCategories.NORMAL; public SizeCategory sizeCat;
{ setSizeCat(); }
//Note that if a room wishes to allow itself to be forced to a certain size category,
//but would (effectively) never roll that size category, consider using Float.MIN_VALUE
public float[] sizeCatProbs(){
//always normal by default
return new float[]{1, 0, 0};
}
public boolean setSizeCat(){
return setSizeCat(0, SizeCategory.values().length-1);
}
//assumes room value is always ordinal+1
public boolean setSizeCat( int maxRoomValue ){
return setSizeCat(0, maxRoomValue-1);
}
//returns false if size cannot be set
public boolean setSizeCat( int minOrdinal, int maxOrdinal ) {
float[] probs = sizeCatProbs();
SizeCategory[] categories = SizeCategory.values();
if (probs.length != categories.length) return false;
for (int i = 0; i < minOrdinal; i++) probs[i] = 0;
for (int i = maxOrdinal+1; i < categories.length; i++) probs[i] = 0;
int ordinal = Random.chances(probs);
if (ordinal != -1){
sizeCat = categories[ordinal];
return true;
} else {
return false;
}
}
@Override @Override
public int minWidth() { return sizeCat.minDim; } public int minWidth() { return sizeCat.minDim; }