Feature/refactor

.classpath

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
+
+
+
+
 </classpath>
+

.gitignore

@@ -0,0 +1,3 @@
+.metadata/*
+.settings/*
+bin/*

src/risk/game/Constants.java

@@ -0,0 +1,5 @@
+package risk.game;
+
+public class Constants {
+	public final static int MAX_STAT = 100;
+}

src/risk/main/Main.java

@@ -1,16 +1,35 @@
 package risk.main;
 
-import risk.home.Homecontroller;
-import risk.home.Homemodel;
-import risk.home.Homeview;
+import risk.player.CreateUserModel;
+import risk.player.IGamePlayer;
+import risk.player.Player;
 
 public class Main {
 
+
+	// ENTRY POINT
+	// boot strapping. 
+	@SuppressWarnings("unused")
 	public static void main(String[] args) {
-
+	/*	
 		Homeview theView = new Homeview();
 		Homemodel theModel = new Homemodel();
-		Homecontroller theController = new Homecontroller(null, null);
+		Homecontroller theController = new Homecontroller(null, null);*/
+
+		CreateUserModel model = new CreateUserModel();
+
+		boolean agility =model.setAgility(3);
+		boolean health = model.setHeatlh(7);
+		boolean attack = model.setAttack(7);
+
+		IGamePlayer playerplayer = new Player(model);
+
+		int agile =playerplayer.getAgility();
+		playerplayer.ProcessXp(1000);
+
+		int newstats = playerplayer.getAgility();
+
+
 	}
 
 }

src/risk/player/CreateUserModel.java

@@ -0,0 +1,112 @@
+package risk.player;
+
+public class CreateUserModel implements IPlayerStats{
+
+	private static int START_STAT = 5;
+
+	private static int POINTS = 10;
+
+
+	public CreateUserModel(){
+		// defaults. 
+		_attack= _defence= _range =_magic =_agility=_health= START_STAT;
+		_remainingPoints = POINTS;
+	}
+
+	private int _attack;
+	private int _defence;
+	private int _range;
+	private int _magic;
+	private int _agility;
+	private int _health;	
+
+	private int _remainingPoints;
+
+
+	private boolean canAddValue(int value){	 
+		int newValue = _remainingPoints - value;
+		if(newValue < 0) return false;	
+		_remainingPoints = newValue;		
+		return true;
+	}
+
+	@Override
+	public int getAttack() {
+		// TODO Auto-generated method stub
+		return _attack;
+	}
+
+	@Override
+	public int getDefence() {
+		// TODO Auto-generated method stub
+		return _defence;
+	}
+
+	@Override
+	public int getRange() {
+		// TODO Auto-generated method stub
+		return _range;
+	}
+
+	@Override
+	public int getMagic() {
+		// TODO Auto-generated method stub
+		return _magic;
+	}
+
+	@Override
+	public int getAgility() {
+		// TODO Auto-generated method stub
+		return _agility;
+	}
+
+	@Override
+	public int getHeatlh() {
+		// TODO Auto-generated method stub
+		return _health;
+	}
+
+
+
+	public boolean setAttack(int value) {
+		if(!canAddValue(value)) return false;
+		_attack+= value;
+		return true;
+	}
+
+
+	public boolean setDefence(int value) {
+		if(!canAddValue(value)) return false;
+		_defence+= value;
+		return true;
+	}
+
+
+	public boolean setRange(int value) {
+		if(!canAddValue(value)) return false;
+		_range+= value;
+		return true;
+	}
+
+
+	public boolean setMagic(int value) {
+		if(!canAddValue(value)) return false;
+		_magic+= value;
+		return true;
+	}
+
+
+	public boolean setAgility(int value) {
+		if(!canAddValue(value)) return false;
+		_agility+= value;
+		return true;
+	}
+
+
+	public boolean setHeatlh(int value) {
+		if(!canAddValue(value)) return false;
+		_health+= value;
+		return true;
+	}
+
+}

src/risk/player/IGamePlayer.java

@@ -0,0 +1,7 @@
+package risk.player;
+
+public interface IGamePlayer extends IPlayerStats{
+
+	void ProcessXp(int xp);
+
+}

src/risk/player/IPlayerStats.java

@@ -0,0 +1,10 @@
+package risk.player;
+
+public interface IPlayerStats{
+	int getAttack();
+	int getDefence();
+	int getRange();
+	int getMagic();
+	int getAgility();
+	int getHeatlh();
+}

src/risk/player/player.java

@@ -1,19 +1,130 @@
 package risk.player;
 
-public class player {
-
-	//global player
-	public static int START_STAT = 5;
-	public static int MAX_STAT = 100;
-	public static int POINTS = 10;
+import java.util.ArrayList;
+
+import risk.game.Constants;
+import risk.player.stats.Dave;
+import risk.player.stats.IStatModifier;
+import risk.player.stats.PlayerStatModification;
+
+public class Player implements IGamePlayer {
 
 	//player
-	public int attack,defence,range,magic,agility = START_STAT;
-	public int health = 500;
+	private int _attack;
+	private int _defence;
+	private int _range;
+	private int _magic;
+	private int _agility;
+	private int _health;
+	private final ArrayList<IStatModifier> _statModifiers;
 
-	public player(){
-
+	public Player(CreateUserModel model){
+		_agility = model.getAgility();
+		_attack = model.getAttack();
+		_defence = model.getDefence();
+		_health = model.getHeatlh();
+		_magic = model.getMagic();
+		_range = model.getRange();
+		_statModifiers = new ArrayList<IStatModifier>();
+		_statModifiers.add(new Dave());
 	}
 
+	@Override
+	public int getAttack() {
+		// TODO Auto-generated method stub
+		return _attack;
+	}
 
+	@Override
+	public int getDefence() {
+		// TODO Auto-generated method stub
+		return _defence;
+	}
+
+	@Override
+	public int getRange() {
+		// TODO Auto-generated method stub
+		return _range;
+	}
+
+	@Override
+	public int getMagic() {
+		// TODO Auto-generated method stub
+		return _magic;
+	}
+
+	@Override
+	public int getAgility() {
+		// TODO Auto-generated method stub
+		return _agility;
+	}
+
+	@Override
+	public int getHeatlh() {
+		// TODO Auto-generated method stub
+		return _health;
+	}
+
+	@Override
+	public void ProcessXp(int xp){
+
+		for (IStatModifier mod: _statModifiers) {
+			for(PlayerStatModification modifier : mod.Results(xp)){
+				addXpResult(modifier);
+			}
+		}
+	}
+
+	private void addXpResult(PlayerStatModification mod){
+		switch(mod.Type){
+		case Agility:
+			if(_agility + mod.IncreaseBy > Constants.MAX_STAT) _agility = Constants.MAX_STAT; else _agility += mod.IncreaseBy;
+			break;
+		case Attack:
+			if(_attack + mod.IncreaseBy > Constants.MAX_STAT) _attack = Constants.MAX_STAT; else _attack += mod.IncreaseBy;
+			break;
+		case Defence:
+			if(_defence + mod.IncreaseBy > Constants.MAX_STAT) _defence = Constants.MAX_STAT; else _defence += mod.IncreaseBy;
+			break;
+		case Health:
+			if(_health + mod.IncreaseBy > Constants.MAX_STAT) _health = Constants.MAX_STAT; else _health += mod.IncreaseBy;
+			break;
+		case Magic:
+			if(_magic + mod.IncreaseBy > Constants.MAX_STAT) _magic = Constants.MAX_STAT; else _magic += mod.IncreaseBy;
+			break;
+		case Range:
+			if(_range + mod.IncreaseBy > Constants.MAX_STAT) _range = Constants.MAX_STAT; else _range += mod.IncreaseBy;
+			break;
+			}
+	}
+
+
+	private void setAttack(int value) {
+		_health= value;
+	}
+
+
+	private void setDefence(int value) {
+		_health= value;
+	}
+
+
+	private void setRange(int value) {
+		_health= value;
+	}
+
+
+	private void setMagic(int value) {
+		_health= value;
+	}
+
+
+	private void setAgility(int value) {
+		_health= value;
+	}
+
+
+	private void setHeatlh(int value) {		
+		_health= value;
+	}
 }

src/risk/player/stats/Dave.java

@@ -0,0 +1,16 @@
+package risk.player.stats;
+
+import java.util.ArrayList;
+
+public class Dave  implements IStatModifier {
+
+	@Override
+	public ArrayList<PlayerStatModification> Results(int xp) {
+		ArrayList<PlayerStatModification> mods = new ArrayList<PlayerStatModification>();
+		if(xp == 1000){
+			mods.add(new PlayerStatModification(StatType.Agility, 50));
+		}
+		return mods;
+	}
+
+}

src/risk/player/stats/IStatModifier.java

@@ -0,0 +1,8 @@
+package risk.player.stats;
+
+import java.util.ArrayList;
+
+public interface IStatModifier {
+
+	ArrayList<PlayerStatModification> Results(int xp);
+}

src/risk/player/stats/PlayerStatModification.java

@@ -0,0 +1,12 @@
+package risk.player.stats;
+
+public class PlayerStatModification {
+
+	public PlayerStatModification(StatType type, int increaseBy){
+		Type = type;
+		IncreaseBy = increaseBy;
+	}
+
+	public final StatType Type;
+	public final int IncreaseBy;
+}

src/risk/player/stats/StatType.java

@@ -0,0 +1,10 @@
+package risk.player.stats;
+
+public enum StatType {
+	Attack,
+	Defence,
+	Range,
+	Magic,
+	Agility,
+	Health;
+}