diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index ea15e145220159e928e06abb5b8277e7d44e90db..b5f7dd578e98114dfdb3053ca4aac303ef5cb147 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -31,7 +31,7 @@ public class Main {
EntityManager entityManager = new EntityManager(roomManager, db);
PlayerManager playerManager = new PlayerManager(db);
- Stats chrisBrianStats = new Stats(7, 8, 6, 5, 4, 10, 100, 20, 1);
+ Stats chrisBrianStats = new Stats(7, 8, 6, 5, 4, 10, 100,10, 20, 1);
if (playerManager.getPlayerMetadata(new Player("chris").getPlayerId()) == null) {
System.out.println("Creating Chris User.");
playerManager.savePlayerMetadata(new PlayerMetadata("chris", "poop", new String(Base64.encodeBase64("chris".getBytes())), chrisBrianStats));
diff --git a/src/main/java/com/comandante/creeper/managers/NewUserRegistrationManager.java b/src/main/java/com/comandante/creeper/managers/NewUserRegistrationManager.java
index 171bcf42897519c831529a22b3cca1d1c577483b..813673794878a4119391d28e3482adf5895f5b96 100644
--- a/src/main/java/com/comandante/creeper/managers/NewUserRegistrationManager.java
+++ b/src/main/java/com/comandante/creeper/managers/NewUserRegistrationManager.java
@@ -58,7 +58,7 @@ public class NewUserRegistrationManager {
return;
}
session.setPassword(Optional.of(password));
- PlayerMetadata playerMetadata = new PlayerMetadata(session.getUsername().get(), session.getPassword().get(), new Player(session.getUsername().get()).getPlayerId(), new Stats(7, 8, 6, 5, 4, 10, 100, 20, 1));
+ PlayerMetadata playerMetadata = new PlayerMetadata(session.getUsername().get(), session.getPassword().get(), new Player(session.getUsername().get()).getPlayerId(), new Stats(7, 8, 6, 5, 4, 10, 100, 10, 20, 1));
playerManager.savePlayerMetadata(playerMetadata);
e.getChannel().write("User created.\r\n");
session.setState(CreeperSession.State.newUserRegCompleted);
diff --git a/src/main/java/com/comandante/creeper/model/Stats.java b/src/main/java/com/comandante/creeper/model/Stats.java
index c97dae8c024997bc225c6736ea837f9c0da89edd..f82befe3c5af55699ccd05e3375c10558751ab98 100644
--- a/src/main/java/com/comandante/creeper/model/Stats.java
+++ b/src/main/java/com/comandante/creeper/model/Stats.java
@@ -11,12 +11,13 @@ public class Stats implements Serializable {
int armorRating;
int meleSkill;
int health;
- int weaponRating;
+ int weaponRatingMax;
+ int weaponRatingMin;
int numberweaponOfRolls;
public static int NO_TURNS = 0;
- public Stats(int strength, int willpower, int aim, int agile, int armorRating, int meleSkill, int health, int weaponRating, int numberweaponOfRolls) {
+ public Stats(int strength, int willpower, int aim, int agile, int armorRating, int meleSkill, int health, int weaponRatingMin, int weaponRatingMax, int numberweaponOfRolls) {
this.strength = strength;
this.willpower = willpower;
this.aim = aim;
@@ -24,7 +25,8 @@ public class Stats implements Serializable {
this.armorRating = armorRating;
this.meleSkill = meleSkill;
this.health = health;
- this.weaponRating = weaponRating;
+ this.weaponRatingMax = weaponRatingMax;
+ this.weaponRatingMin = weaponRatingMin;
this.numberweaponOfRolls = numberweaponOfRolls;
}
@@ -87,12 +89,20 @@ public class Stats implements Serializable {
this.health = health;
}
- public int getWeaponRating() {
- return weaponRating;
+ public int getWeaponRatingMax() {
+ return weaponRatingMax;
}
- public void setWeaponRating(int weaponRating) {
- this.weaponRating = weaponRating;
+ public void setWeaponRatingMax(int weaponRatingMax) {
+ this.weaponRatingMax = weaponRatingMax;
+ }
+
+ public int getWeaponRatingMin() {
+ return weaponRatingMin;
+ }
+
+ public void setWeaponRatingMin(int weaponRatingMin) {
+ this.weaponRatingMin = weaponRatingMin;
}
public int getNumberweaponOfRolls() {
@@ -104,14 +114,10 @@ public class Stats implements Serializable {
}
public static void main(String[] args) throws InterruptedException {
- Stats challenger = new Stats(7, 8, 6, 5, 4, 10, 100, 20, 1);
- Stats victim = new Stats(7, 8, 6, 5, 4, 10, 100, 10, 1);
-
-
int totalChallengerWin = 0;
int totalVictimWin = 0;
for (int i = 0; i < 30000; i++) {
- boolean results = fight(new Stats(5, 1, 1, 5, 5, 5, 100, 3, 1), new Stats(2, 1, 2, 2, 2, 2, 100, 10, 1));
+ boolean results = fight(new Stats(5, 1, 1, 5, 5, 5, 100, 10, 20, 1), new Stats(5, 1, 1, 5, 5, 5, 100, 1, 5, 1));
if (results) {
totalChallengerWin++;
} else {
@@ -178,7 +184,7 @@ public class Stats implements Serializable {
int totDamage = 0;
while (rolls <= challenger.getNumberweaponOfRolls()) {
rolls++;
- totDamage = totDamage + randInt(1, challenger.getWeaponRating());
+ totDamage = totDamage + randInt(challenger.getWeaponRatingMin(), challenger.getWeaponRatingMax());
}
return challenger.getStrength() + totDamage - victim.getArmorRating();
}
diff --git a/src/main/java/com/comandante/creeper/npc/Derper.java b/src/main/java/com/comandante/creeper/npc/Derper.java
index e224932a9c7e148623cb64b336de8dfb093eef66..c387f78834b85aaf60a607518090027f3595db85 100644
--- a/src/main/java/com/comandante/creeper/npc/Derper.java
+++ b/src/main/java/com/comandante/creeper/npc/Derper.java
@@ -22,7 +22,7 @@ public class Derper extends Npc {
.append(RESET).toString();
public Derper(GameManager gameManager, Integer roomId) {
- super(gameManager, roomId, NAME, colorName, 0, new Stats(7, 8, 6, 5, 4, 10, 100, 20, 1));
+ super(gameManager, roomId, NAME, colorName, 0, new Stats(7, 8, 6, 5, 4, 10, 100,10, 20, 1));
this.random = new Random();
}