Merge branch 'master' of https://github.uconn.edu/joh13010/2102-Group…

…-Project-Spring-2017.git
joh13010 · Feb 28, 2017 · 0a14529 · 0a14529
2 parents 42f385b + 4189b67
commit 0a14529
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 0 deletions.
diff --git a/src/Main/Profession b/src/Main/Profession
@@ -0,0 +1 @@
+
diff --git a/src/Main/die.java b/src/Main/die.java
@@ -0,0 +1,23 @@
+import java.util.Random;
+
+
+public class Die {
+/*
+ * Die will probably have to go in each individual turn, so that it can pull charity status
+ * from the player currently playing
+ */
+	public int rollDice(Boolean c) {
+		Random rand = new Random();
+		if (c) {
+			int face = 1+rand.nextInt(12);
+			return face;
+			/* There needs to be something that takes charity - 1 from the player after rolling
+			 * Or maybe just a simple "if charity > 0 then charity - 1 after every turn
+			 */
+		}
+		else {
+			int face = 1+rand.nextInt(6);
+			return face;
+		}
+	}
+}
diff --git a/src/die.java b/src/die.java
@@ -0,0 +1,23 @@
+import java.util.Random;
+
+
+public class Die {
+/*
+ * Die will probably have to go in each individual turn, so that it can pull charity status
+ * from the player currently playing
+ */
+	public int rollDice(Boolean c) {
+		Random rand = new Random();
+		if (c) {
+			int face = 1+rand.nextInt(12);
+			return face;
+			/* There needs to be something that takes charity - 1 from the player after rolling
+			 * Or maybe just a simple "if charity > 0 then charity - 1 after every turn
+			 */
+		}
+		else {
+			int face = 1+rand.nextInt(6);
+			return face;
+		}
+	}
+}