Merge branch 'master' of gitlab.principis.be:OGP/worms

OGP1718-Worms/src/worms/model/Team.java

@@ -1,5 +1,94 @@
 package worms.model;
 
-public class Team {
+import java.util.ArrayList;
+import java.util.Collections;
 
+public class Team {
+	public void addWorm(Worm worm) {
+		if (worm.getMass() > minMassTeam/2 && worm.getMass() < 2 * maxMassTeam && worm.isAlive()) {
+			listWorms.add(worm);
+			sortList(listWorms);
+		}
+	}
+	
+	public void sortList(ArrayList<Worm> list) {
+		Collections.sort(list, 
+				(el1, el2) -> el1.getName().compareToIgnoreCase(el2.getName()));
+	}
+	
+	public void removeWorm(Worm worm) {
+		listWorms.remove(worm);
+	}
+	
+	public boolean containsWorm(Worm worm) {
+		if (listWorms.contains(worm)) {
+			return true;
+		}
+		return false;
+	}
+	
+	public ArrayList<Worm> returnTeam() {
+		return listWorms;
+	}
+	
+	private ArrayList<Worm> listWorms;
+	
+	public double getMinMassTeam() {
+		return this.minMassTeam;
+	}
+	
+	public void setMinMassTeam() {
+		for (int i = 0; i < listWorms.size() - 2; i++) {
+			Worm wormA = listWorms.get(i);
+			Worm wormB = listWorms.get(i+1);
+			if (wormA.getMass() < wormB.getMass()) {
+				minMassTeam = wormA.getMass();
+			}
+		}
+	}
+	
+	private double minMassTeam;
+	
+	public double getMaxMassTeam() {
+		return this.maxMassTeam;
+	}
+	
+	public void setMaxMassTeam() {
+		for (int i = 0; i < listWorms.size() - 2; i++) {
+			Worm wormA = listWorms.get(i);
+			Worm wormB = listWorms.get(i+1);
+			if (wormA.getMass() > wormB.getMass()) {
+				maxMassTeam = wormA.getMass();
+			}
+		}
+	}
+	
+	private double maxMassTeam;
+	
+	public String getTeamName() {
+		return this.teamName;
+	}
+	
+	public void setTeamName() {
+		
+	}
+	
+	private String teamName;
+	
+	
+	public String getWinner(){
+		return this.winner;
+	}
+	
+	public void setWinner() {
+		if (listWorms.size() == 1) {
+			winner = (listWorms.get(0)).getName();
+		}
+		else {
+			winner = this.getTeamName();
+		}
+	}
+	
+	private String winner;
+	
 }

OGP1718-Worms/src/worms/model/Worm.java

@@ -792,4 +792,9 @@ public class Worm {
     
     //===================================================================================
     // endregion
+    
+    //TODO nog te implementeren
+    public boolean isAlive() {
+		return true;
+	}
 }