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

v0.6.0: moved important usages of collections.shuffle into Random

Browse Source
This commit is contained in:
Evan Debenham 2017-04-14 04:55:26 -04:00 committed by Evan Debenham
parent 75f9cd454b
commit 048b5e5f7b
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SPD-classes/src/main/java/com/watabou/utils/Random.java
View File

@ -22,7 +22,9 @@
package com.watabou.utils; package com.watabou.utils;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
public class Random { public class Random {
@ -156,6 +158,10 @@ public class Random {
(T)collection.toArray()[Int( size )] : (T)collection.toArray()[Int( size )] :
null; null;
} }
public static<T> void shuffle( List<?extends T> list){
Collections.shuffle(list, rand);
}
public static<T> void shuffle( T[] array ) { public static<T> void shuffle( T[] array ) {
for (int i=0; i < array.length - 1; i++) { for (int i=0; i < array.length - 1; i++) {

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

@ -74,7 +74,7 @@ public abstract class RegularLevel extends Level {
ArrayList<Room> initRooms = initRooms(); ArrayList<Room> initRooms = initRooms();
Collections.shuffle(initRooms); Random.shuffle(initRooms);
do { do {
for (Room r : initRooms){ for (Room r : initRooms){
@ -340,7 +340,7 @@ public abstract class RegularLevel extends Level {
} }
protected Room randomRoom( Class<?extends Room> type ) { protected Room randomRoom( Class<?extends Room> type ) {
Collections.shuffle( rooms ); Random.shuffle( rooms );
for (Room r : rooms) { for (Room r : rooms) {
if (type.isInstance(r) if (type.isInstance(r)
//compatibility with pre-0.6.0 saves //compatibility with pre-0.6.0 saves

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/ShopRoom.java
View File

@ -274,7 +274,7 @@ public class ShopRoom extends SpecialRoom {
if (itemsToSpawn.size() > 63) if (itemsToSpawn.size() > 63)
throw new RuntimeException("Shop attempted to carry more than 63 items!"); throw new RuntimeException("Shop attempted to carry more than 63 items!");
Collections.shuffle(itemsToSpawn); Random.shuffle(itemsToSpawn);
} }
private static void ChooseBag(Belongings pack){ private static void ChooseBag(Belongings pack){

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/SpecialRoom.java
View File

@ -85,7 +85,7 @@ public class SpecialRoom extends Room {
} }
guaranteedWellDepth = Random.IntRange( 6, 14 ); guaranteedWellDepth = Random.IntRange( 6, 14 );
Collections.shuffle(runSpecials); Random.shuffle(runSpecials);
} }
public static void initForFloor(){ public static void initForFloor(){