Make dice generic

Convert dice from dealing exclusively with ints, to deal with objects of
arbitrary types

1 files changed, 0 insertions, 58 deletions

diff --git a/dice/src/main/java/bjc/dicelang/neodice/diepool/DropLastPool.java b/dice/src/main/java/bjc/dicelang/neodice/diepool/DropLastPool.java
deleted file mode 100644
index 9503e8f..0000000
--- a/dice/src/main/java/bjc/dicelang/neodice/diepool/DropLastPool.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package bjc.dicelang.neodice.diepool;
-
-import java.util.*;
-
-import bjc.dicelang.neodice.*;
-
-public class DropLastPool implements DiePool {
-	private final int     number;
-	private final DiePool pool;
-	
-	public DropLastPool(DiePool pool, int number) {
-		this.pool   = pool;
-		this.number = number;
-	}
-
-	@Override
-	public int[] roll(Random rng) {
-		int[] rolls = pool.roll(rng);
-		
-		if (number >= rolls.length) {
-			return new int[0];
-		} else {
-			int[] newRolls = new int[rolls.length - number];
-			
-			for (int index = 0; index < rolls.length - number; index++) {
-				newRolls[index] = rolls[index];
-			}
-			
-			return newRolls;
-		}
-	}
-	
-	@Override
-	public Die[] contained() {
-		return pool.contained();
-	}
-
-	@Override
-	public String toString() {
-		return String.format("%sdL%d", pool, number);
-	}
-	
-	@Override
-	public int hashCode() {
-		return Objects.hash(number, pool);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)                  return true;
-		if (obj == null)                  return false;
-		if (getClass() != obj.getClass()) return false;
-		
-		DropLastPool other = (DropLastPool) obj;
-	
-		return number == other.number && Objects.equals(pool, other.pool);
-	}
-}
\ No newline at end of file