diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html
index edb1ec45fb8ebc5a3cbfce77d839eed5dbc9b4ce..c75e6869e5a7ed78315e4b0c56bc9e01de055a8e 100644
--- a/javadoc/allclasses-index.html
+++ b/javadoc/allclasses-index.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>All Classes and Interfaces</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -66,11 +66,11 @@ loadScripts(document, 'script');</script>
<div class="block">Class that extends Application
from javafx.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></div>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">public class Army.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.army">ArmyFileHandler</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></div>
<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">Handles writing, reading and importing
armies to and from a file.</div>
@@ -79,16 +79,16 @@ loadScripts(document, 'script');</script>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">Class Battle that simulates a battle between two armies.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></div>
<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">A controller class which
handles events in the fxml file battle-armies.fxml.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CavalryUnit</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></div>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">Class CavalryUnit that inherits from Unit.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CommanderUnit</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></div>
<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">Class CommanderUnit that inherits from CavalryUnit.</div>
</div>
@@ -102,17 +102,17 @@ loadScripts(document, 'script');</script>
<div class="block">A builder class which simplifies the process of
building a DialogBox object.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></div>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">A controller class which
handles events in the fxml file edit-army.fxml.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab5"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu">FileExtensionException</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab5"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a></div>
<div class="col-last even-row-color all-classes-table all-classes-table-tab5">
<div class="block">Thrown if an extension of a file is invalid
The exception thrown needs to have a message</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">InfantryUnit</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></div>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">Class InfantryUnit that inherits from Unit.</div>
</div>
@@ -121,7 +121,7 @@ loadScripts(document, 'script');</script>
<div class="block">The main class that is run when the application
is called upon.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">RangedUnit</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></div>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">Class RangedUnit that inherits from Unit.</div>
</div>
@@ -134,15 +134,15 @@ loadScripts(document, 'script');</script>
<div class="block">An enum that represents the different terrains
that the battles can occur on.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></div>
<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
<div class="block">The abstract class Unit.</div>
</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.units">UnitFactory</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></div>
<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
<div class="block">A class to simply and elegantly create units.</div>
</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab3"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab3"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></div>
<div class="col-last even-row-color all-classes-table all-classes-table-tab3">
<div class="block">An enum that represents the different unit types
that an army can contain.</div>
diff --git a/javadoc/allpackages-index.html b/javadoc/allpackages-index.html
index d3efade3b94fb09aad8174faeb0c58ba2c7ca120..0f7e213aed82b5953aac0b726a2f00cd929c4632 100644
--- a/javadoc/allpackages-index.html
+++ b/javadoc/allpackages-index.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>All Packages</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -55,19 +55,19 @@ loadScripts(document, 'script');</script>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Package</div>
<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-summary.html">edu.ntnu.idatt2001.carljgu</a></div>
+<div class="col-first even-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a></div>
<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-summary.html">edu.ntnu.idatt2001.carljgu.army</a></div>
+<div class="col-first odd-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></div>
<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a></div>
+<div class="col-first even-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></div>
<div class="col-last even-row-color"> </div>
<div class="col-first odd-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a></div>
+<div class="col-first even-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a></div>
<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html">edu.ntnu.idatt2001.carljgu.units</a></div>
+<div class="col-first odd-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a></div>
<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.units.specialized</a></div>
+<div class="col-first even-row-color"><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html">edu.ntnu.idatt2001.carljgu.filehandling</a></div>
<div class="col-last even-row-color"> </div>
</div>
</main>
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index ead9bd20e7b1f0ea606bd002e23b3b203e3a324f..eb9c4ba631b4c20567f1c36fa868bea4d92689b9 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>Constant Field Values</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index d7fad2044c1071d3216e5aa9c99a3587f71a9ae9..b88ee675e9d50ebbc0419370e2161a28a872ae4c 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>Deprecated List</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/ArmyFileHandler.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/ArmyFileHandler.html
index 38629b1e04a855da335feb6578717e6d92085429..794464398160ba92c23f77d1141db5355051866c 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/ArmyFileHandler.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/ArmyFileHandler.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class ArmyFileHandler" class="title">Class ArmyFileHandler</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.army.ArmyFileHandler</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.filehandling.ArmyFileHandler</div>
</div>
<section class="class-description" id="class-description">
<hr>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html
index 8e13f9186205f2f0dd3c53ace634e71f1dbac0ae..4df91f7f65cfd6a16812f7030a7a0b94a3fd2d73 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">java.lang.Exception</a>
<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">java.lang.RuntimeException</a>
<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">java.lang.IllegalArgumentException</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.FileExtensionException</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException</div>
</div>
</div>
</div>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html
index 243e38fcdbdd87b94c28590415f89b2790495dec..3154145ec68cd854da089634ded13b126e20750f 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class Army" class="title">Class Army</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.army.Army</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.Army</div>
</div>
<section class="class-description" id="class-description">
<hr>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html
index f120dfd7aefa9aa99a218312d141a43772ccb30e..9da85d1d2ef5d9d78ad3de9bba6670d504665552 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class ArmyFileHandler" class="title">Class ArmyFileHandler</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.army.ArmyFileHandler</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.filehandling.ArmyFileHandler</div>
</div>
<section class="class-description" id="class-description">
<hr>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html
new file mode 100644
index 0000000000000000000000000000000000000000..456aaa3a8bd11230bb9d319847de072024ed72df
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html
@@ -0,0 +1,512 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>Army</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle, class: Army">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a></div>
+<h1 title="Class Army" class="title">Class Army</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.Army</div>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">Army</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
+<div class="block">public class Army.
+ An army object stores a list of units
+ meant to fight another army.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.4 18.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String)" class="member-name-link">Army</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Instantiates a new Army.</div>
+</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(java.lang.String,java.util.List)" class="member-name-link">Army</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>> units)</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Instantiates a new Army.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#addUnit(edu.ntnu.idatt2001.carljgu.battle.units.Unit)" class="member-name-link">addUnit</a><wbr>(<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> unit)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Add unit if it does not exist from before.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#addUnits(java.util.List)" class="member-name-link">addUnits</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>> units)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Add units.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#equals(java.lang.Object)" class="member-name-link">equals</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a> o)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Checks if two armies are equal based on name and list of units.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAllUnits()" class="member-name-link">getAllUnits</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets all units.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCalculatedStrength()" class="member-name-link">getCalculatedStrength</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Calculates the strength of an army
+ by combining health, attack and armor
+ of every unit.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCavalryUnits()" class="member-name-link">getCavalryUnits</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Returns a list of cavalry units
+ using stream and filter.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCommanderUnits()" class="member-name-link">getCommanderUnits</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Returns a list of commander units
+ using stream and filter.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getInfantryUnits()" class="member-name-link">getInfantryUnits</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Returns a list of infantry units
+ using stream and filter.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getName()" class="member-name-link">getName</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets the army's name.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getRandom()" class="member-name-link">getRandom</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets a random unit from the list.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getRangedUnits()" class="member-name-link">getRangedUnits</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Returns a list of ranged units
+ using stream and filter.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#hashCode()" class="member-name-link">hashCode</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Hashes name and units for the equals method</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#hasUnits()" class="member-name-link">hasUnits</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Checks if the list of units is empty</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#remove(edu.ntnu.idatt2001.carljgu.battle.units.Unit)" class="member-name-link">remove</a><wbr>(<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> unit)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Remove a specified unit.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setName(java.lang.String)" class="member-name-link">setName</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets the army's name</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#strengthAndUnitRepresentation()" class="member-name-link">strengthAndUnitRepresentation</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Another method for return a representation
+ of the army.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#toString()" class="member-name-link">toString</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Overrides the toString() method from Object.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>(java.lang.String,java.util.List)">
+<h3>Army</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">Army</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>> units)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
+<div class="block">Instantiates a new Army.
+ Used if a list of units already exists.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - the name of the army.</dd>
+<dd><code>units</code> - List - the units of the army.</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - thrown if name is not valid.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="<init>(java.lang.String)">
+<h3>Army</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">Army</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name)</span></div>
+<div class="block">Instantiates a new Army.
+ Second constructor if a list of units does not
+ exist from before.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - the name of the army</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="getName()">
+<h3>getName</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">getName</span>()</div>
+<div class="block">Gets the army's name.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>name - String - the name of the army.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setName(java.lang.String)">
+<h3>setName</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setName</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
+<div class="block">Sets the army's name</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - - String - the name of the army</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - thrown if name is not valid.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="addUnit(edu.ntnu.idatt2001.carljgu.battle.units.Unit)">
+<h3>addUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">addUnit</span><wbr><span class="parameters">(<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> unit)</span></div>
+<div class="block">Add unit if it does not exist from before.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>unit</code> - Unit - an instance of Unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="addUnits(java.util.List)">
+<h3>addUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">addUnits</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>> units)</span></div>
+<div class="block">Add units.
+ Iterates over units and adds them if
+ they do not exist from before.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>units</code> - List - a list of units.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="remove(edu.ntnu.idatt2001.carljgu.battle.units.Unit)">
+<h3>remove</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">boolean</span> <span class="element-name">remove</span><wbr><span class="parameters">(<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> unit)</span></div>
+<div class="block">Remove a specified unit.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>unit</code> - Unit - an instance of Unit.</dd>
+<dt>Returns:</dt>
+<dd>boolean - true if the unit was removed</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="hasUnits()">
+<h3>hasUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">boolean</span> <span class="element-name">hasUnits</span>()</div>
+<div class="block">Checks if the list of units is empty</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>boolean - true if the list is not empty.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getAllUnits()">
+<h3>getAllUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">getAllUnits</span>()</div>
+<div class="block">Gets all units.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>units - List - a list of units.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getInfantryUnits()">
+<h3>getInfantryUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">getInfantryUnits</span>()</div>
+<div class="block">Returns a list of infantry units
+ using stream and filter.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>List - a list of infantry units</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getRangedUnits()">
+<h3>getRangedUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">getRangedUnits</span>()</div>
+<div class="block">Returns a list of ranged units
+ using stream and filter.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>List - a list of ranged units</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getCavalryUnits()">
+<h3>getCavalryUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">getCavalryUnits</span>()</div>
+<div class="block">Returns a list of cavalry units
+ using stream and filter.
+ Makes sure units are not commander units</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>List - a list of cavalry units</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getCommanderUnits()">
+<h3>getCommanderUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">getCommanderUnits</span>()</div>
+<div class="block">Returns a list of commander units
+ using stream and filter.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>List - a list of commander units</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getRandom()">
+<h3>getRandom</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></span> <span class="element-name">getRandom</span>()</div>
+<div class="block">Gets a random unit from the list.
+ If there are no units it returns a null object.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>Unit - an instance of Unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getCalculatedStrength()">
+<h3>getCalculatedStrength</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getCalculatedStrength</span>()</div>
+<div class="block">Calculates the strength of an army
+ by combining health, attack and armor
+ of every unit.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>int - the army's calculated strength</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="strengthAndUnitRepresentation()">
+<h3>strengthAndUnitRepresentation</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">strengthAndUnitRepresentation</span>()</div>
+<div class="block">Another method for return a representation
+ of the army. Includes the calculated strength
+ and how many of each unit type.
+ Example of a string representation:
+ Strength: 302
+ Infantry: 1
+ Ranged: 5
+ Cavalry: 1
+ Commander: 0</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>String - representation of the army.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="toString()">
+<h3>toString</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">toString</span>()</div>
+<div class="block">Overrides the toString() method from Object.
+ iterates over all units and calls their toString() method.
+ Uses StringBuilder to avoid making new Strings.
+
+ Example of a string representation:
+ Army Human army
+ ------------------------
+ Infantry: 10
+ Ranged: 23
+ Cavalry: 4
+ Commander: 0
+ ------------------------</div>
+<dl class="notes">
+<dt>Overrides:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a></code> in class <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></code></dd>
+<dt>Returns:</dt>
+<dd>String - representation of the army.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="equals(java.lang.Object)">
+<h3>equals</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">boolean</span> <span class="element-name">equals</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a> o)</span></div>
+<div class="block">Checks if two armies are equal based on name and list of units.</div>
+<dl class="notes">
+<dt>Overrides:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a></code> in class <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></code></dd>
+<dt>Parameters:</dt>
+<dd><code>o</code> - Object - object checking validity to.</dd>
+<dt>Returns:</dt>
+<dd>boolean - true if name and list of units are equal.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="hashCode()">
+<h3>hashCode</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">hashCode</span>()</div>
+<div class="block">Hashes name and units for the equals method</div>
+<dl class="notes">
+<dt>Overrides:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a></code> in class <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></code></dd>
+<dt>Returns:</dt>
+<dd>int - hashcode to the army</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
index 91ee9df2e4e0189500e23422dd95a7be43f481c2..79297cc35bce0c92d8140422a1944b394353d669 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>Battle</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -98,8 +98,8 @@ loadScripts(document, 'script');</script>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Constructor</div>
<div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">Battle</a><wbr>(<a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> armyOne,
- <a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> armyTwo,
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">Battle</a><wbr>(<a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> armyOne,
+ <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> armyTwo,
<a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
<div class="col-last even-row-color">
<div class="block">Instantiates a new Battle.</div>
@@ -119,11 +119,11 @@ loadScripts(document, 'script');</script>
<div class="table-header col-second">Method</div>
<div class="table-header col-last">Description</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army)" class="member-name-link">attackStringRepresentation</a><wbr>(int damageDealt,
- <a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> attacker,
- <a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> defender,
- <a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> attackingArmy,
- <a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> defendingArmy)</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">attackStringRepresentation</a><wbr>(int damageDealt,
+ <a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> attacker,
+ <a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> defender,
+ <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> attackingArmy,
+ <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> defendingArmy)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Information displayed is the
name of the attacking and defending army,
@@ -144,13 +144,13 @@ loadScripts(document, 'script');</script>
<div class="block">Gets the terrain where
the battle occurs.</div>
</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getWinner()" class="member-name-link">getWinner</a>()</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Gets the winner of the army
or a null object.</div>
</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#simulate()" class="member-name-link">simulate</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">Simulate a battle.</div>
@@ -178,10 +178,10 @@ loadScripts(document, 'script');</script>
<h2>Constructor Details</h2>
<ul class="member-list">
<li>
-<section class="detail" id="<init>(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<section class="detail" id="<init>(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)">
<h3>Battle</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">Battle</span><wbr><span class="parameters">(<a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> armyOne,
- <a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> armyTwo,
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">Battle</span><wbr><span class="parameters">(<a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> armyOne,
+ <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> armyTwo,
<a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span>
throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a>,
<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></span></div>
@@ -208,7 +208,7 @@ loadScripts(document, 'script');</script>
<li>
<section class="detail" id="getWinner()">
<h3>getWinner</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></span> <span class="element-name">getWinner</span>()</div>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">getWinner</span>()</div>
<div class="block">Gets the winner of the army
or a null object.</div>
<dl class="notes">
@@ -245,7 +245,7 @@ loadScripts(document, 'script');</script>
<li>
<section class="detail" id="simulate()">
<h3>simulate</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></span> <span class="element-name">simulate</span>()</div>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">simulate</span>()</div>
<div class="block">Simulate a battle.
The attacking army is chosen at random.
One random unit from the attacking army attacks
@@ -261,13 +261,13 @@ loadScripts(document, 'script');</script>
</section>
</li>
<li>
-<section class="detail" id="attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army)">
+<section class="detail" id="attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army)">
<h3>attackStringRepresentation</h3>
<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">attackStringRepresentation</span><wbr><span class="parameters">(int damageDealt,
- <a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> attacker,
- <a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> defender,
- <a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> attackingArmy,
- <a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> defendingArmy)</span></div>
+ <a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> attacker,
+ <a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> defender,
+ <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> attackingArmy,
+ <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> defendingArmy)</span></div>
<div class="block">Information displayed is the
name of the attacking and defending army,
unit information like name and class
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
index 7497e47e25b2d122b22da83585cd7b3b5d638979..77d453496906aec6992c509ae7ae7ec731b61cea 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>SimulationAttack</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -105,10 +105,10 @@ loadScripts(document, 'script');</script>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Constructor</div>
<div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">SimulationAttack</a><wbr>(<a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> attackingArmy,
- <a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> attacker,
- <a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> defendingArmy,
- <a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> defender,
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">SimulationAttack</a><wbr>(<a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> attackingArmy,
+ <a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> attacker,
+ <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> defendingArmy,
+ <a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> defender,
<a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
<div class="col-last even-row-color">
<div class="block"><span class="deprecated-label">Deprecated.</span></div>
@@ -128,13 +128,13 @@ loadScripts(document, 'script');</script>
<div class="table-header col-first">Modifier and Type</div>
<div class="table-header col-second">Method</div>
<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getAttacker()" class="member-name-link">getAttacker</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
<div class="block"><span class="deprecated-label">Deprecated.</span></div>
<div class="block">Gets the attacker.</div>
</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getAttackingArmy()" class="member-name-link">getAttackingArmy</a>()</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
<div class="block"><span class="deprecated-label">Deprecated.</span></div>
@@ -148,13 +148,13 @@ loadScripts(document, 'script');</script>
<div class="block">Gets the damage done by
the attacker to the defender.</div>
</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getDefender()" class="member-name-link">getDefender</a>()</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
<div class="block"><span class="deprecated-label">Deprecated.</span></div>
<div class="block">Gets the defender.</div>
</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getDefendingArmy()" class="member-name-link">getDefendingArmy</a>()</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
<div class="block"><span class="deprecated-label">Deprecated.</span></div>
@@ -194,12 +194,12 @@ loadScripts(document, 'script');</script>
<h2>Constructor Details</h2>
<ul class="member-list">
<li>
-<section class="detail" id="<init>(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<section class="detail" id="<init>(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)">
<h3>SimulationAttack</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">SimulationAttack</span><wbr><span class="parameters">(<a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> attackingArmy,
- <a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> attacker,
- <a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> defendingArmy,
- <a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> defender,
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">SimulationAttack</span><wbr><span class="parameters">(<a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> attackingArmy,
+ <a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> attacker,
+ <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> defendingArmy,
+ <a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> defender,
<a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span>
throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
@@ -234,7 +234,7 @@ loadScripts(document, 'script');</script>
<li>
<section class="detail" id="getAttackingArmy()">
<h3>getAttackingArmy</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></span> <span class="element-name">getAttackingArmy</span>()</div>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">getAttackingArmy</span>()</div>
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
<div class="block">Gets the attacking army with the
attacking unit.</div>
@@ -248,7 +248,7 @@ loadScripts(document, 'script');</script>
<li>
<section class="detail" id="getAttacker()">
<h3>getAttacker</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></span> <span class="element-name">getAttacker</span>()</div>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></span> <span class="element-name">getAttacker</span>()</div>
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
<div class="block">Gets the attacker.</div>
<dl class="notes">
@@ -260,7 +260,7 @@ loadScripts(document, 'script');</script>
<li>
<section class="detail" id="getDefendingArmy()">
<h3>getDefendingArmy</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></span> <span class="element-name">getDefendingArmy</span>()</div>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">getDefendingArmy</span>()</div>
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
<div class="block">Gets the defending army with the
defending unit.</div>
@@ -274,7 +274,7 @@ loadScripts(document, 'script');</script>
<li>
<section class="detail" id="getDefender()">
<h3>getDefender</h3>
-<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></span> <span class="element-name">getDefender</span>()</div>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></span> <span class="element-name">getDefender</span>()</div>
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
<div class="block">Gets the defender.</div>
<dl class="notes">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
index b281182a4a12a43f8feb9759a8060d4dc2ea7836..11049af0b440b4690c229fecbfbd46e5e3fb4d04 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>Terrain</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
index 40a61a6f6a6615d6b3273f6bb402486bfabe4ee4..0f41adbdd069701fb1e4c5a1187769cebd7425a0 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -74,14 +74,8 @@ loadScripts(document, 'script');</script>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Package</div>
<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="../package-summary.html">edu.ntnu.idatt2001.carljgu</a></div>
+<div class="col-first even-row-color"><a href="units/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></div>
<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><a href="../army/package-summary.html">edu.ntnu.idatt2001.carljgu.army</a></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><a href="../client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><a href="../units/package-summary.html">edu.ntnu.idatt2001.carljgu.units</a></div>
-<div class="col-last odd-row-color"> </div>
</div>
</div>
</li>
@@ -92,16 +86,20 @@ loadScripts(document, 'script');</script>
<div class="summary-table two-column-summary" aria-labelledby="class-summary-tab0">
<div class="table-header col-first">Class</div>
<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color class-summary class-summary-tab2"><a href="Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></div>
<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="block">public class Army.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab2">
<div class="block">Class Battle that simulates a battle between two armies.</div>
</div>
-<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="SimulationAttack.html" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></div>
-<div class="col-last odd-row-color class-summary class-summary-tab2">Deprecated.
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="SimulationAttack.html" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">Deprecated.
<div class="deprecation-comment">Provided no extra functionality and made the program harder to read.</div>
</div>
-<div class="col-first even-row-color class-summary class-summary-tab3"><a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab3">
+<div class="col-first odd-row-color class-summary class-summary-tab3"><a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab3">
<div class="block">An enum that represents the different terrains
that the battles can occur on.</div>
</div>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
index 3dc3aa9e744160dee31f44936c511b3d7d3f9e3f..58367c61e3aab0347e71af33862ad2554da269b6 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.battle Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -60,6 +60,7 @@ loadScripts(document, 'script');</script>
<ul>
<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.<a href="Army.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></li>
<li class="circle">edu.ntnu.idatt2001.carljgu.battle.<a href="Battle.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></li>
<li class="circle">edu.ntnu.idatt2001.carljgu.battle.<a href="SimulationAttack.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></li>
</ul>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html
new file mode 100644
index 0000000000000000000000000000000000000000..854b95dc46a64a6fc89a8589ba9a3b2d7bffc0eb
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html
@@ -0,0 +1,365 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>Unit</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units, class: Unit">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></div>
+<h1 title="Class Unit" class="title">Class Unit</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.Unit</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>Direct Known Subclasses:</dt>
+<dd><code><a href="specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></code>, <code><a href="specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></code>, <code><a href="specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public abstract class </span><span class="element-name type-name-label">Unit</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
+<div class="block">The abstract class Unit.
+ A unit object should not be created because all units
+ that are used in the simulations are subclasses of Unit.
+ Since it is abstract a Unit object can not be created.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.5 15.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">Unit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Checks validity of name and health.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">attack</a><wbr>(<a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> unit,
+ <a href="../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Method for dealing damage to another unit.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getArmor()" class="member-name-link">getArmor</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets armor.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAttack()" class="member-name-link">getAttack</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets attack.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>abstract int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus</a><wbr>(<a href="../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
+<div class="block">Gets attack bonus.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getClassName()" class="member-name-link">getClassName</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets the name of the class.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getHealth()" class="member-name-link">getHealth</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets health.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getName()" class="member-name-link">getName</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets name.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>abstract int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus</a><wbr>(<a href="../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
+<div class="block">Gets resist bonus.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setHealth(int)" class="member-name-link">setHealth</a><wbr>(int health)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Sets health.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#toString()" class="member-name-link">toString</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Overrides toString() method from Object.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>(java.lang.String,int,int,int)">
+<h3>Unit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">Unit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
+<div class="block">Checks validity of name and health. Health can not be less than or equal to zero.
+ Attack and armor can not be negative, but can be equal to zero.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+<dd><code>attack</code> - int - damage done, excluding attack bonus, on an enemy unit.</dd>
+<dd><code>armor</code> - int - damage resisted, excluding resist bonus, from an enemy unit.</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - thrown if name is whitespace or contains comma or if health starts at zero or less.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>attack</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">attack</span><wbr><span class="parameters">(<a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> unit,
+ <a href="../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Method for dealing damage to another unit.
+ It uses the enemy unit's attributes like health, resist bonus and armor
+ to calculate its remaining health.
+ If the total damage dealt is less than the armor and resistance bonus
+ for the defender, the unit's health is unaffected.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>unit</code> - Unit - enemy of any unit subclass.</dd>
+<dd><code>terrain</code> - Terrain - the terrain where the attack is done.</dd>
+<dt>Returns:</dt>
+<dd>totalDamage - int - the amount of damage the attacker inflicted</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getName()">
+<h3>getName</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">getName</span>()</div>
+<div class="block">Gets name.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>name - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getClassName()">
+<h3>getClassName</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">getClassName</span>()</div>
+<div class="block">Gets the name of the class.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>class name - String - the name of the class</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getHealth()">
+<h3>getHealth</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getHealth</span>()</div>
+<div class="block">Gets health.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>health - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getAttack()">
+<h3>getAttack</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getAttack</span>()</div>
+<div class="block">Gets attack.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>attack - int - damage done, excluding attack bonus, on an enemy unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getArmor()">
+<h3>getArmor</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getArmor</span>()</div>
+<div class="block">Gets armor.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>armor - int - damage resisted, excluding resist bonus, from an enemy unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setHealth(int)">
+<h3>setHealth</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setHealth</span><wbr><span class="parameters">(int health)</span></div>
+<div class="block">Sets health.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>health</code> - - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="toString()">
+<h3>toString</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">toString</span>()</div>
+<div class="block">Overrides toString() method from Object.
+ Example:
+ InfantryUnit infantry with 15 health
+ has 10 attack and 15 armor.</div>
+<dl class="notes">
+<dt>Overrides:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a></code> in class <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></code></dd>
+<dt>Returns:</dt>
+<dd>String - string representation of object</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>getAttackBonus</h3>
+<div class="member-signature"><span class="modifiers">public abstract</span> <span class="return-type">int</span> <span class="element-name">getAttackBonus</span><wbr><span class="parameters">(<a href="../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Gets attack bonus.
+ Abstract method that is to be defined in subclasses.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>terrain</code> - Terrain - the terrain of the attack</dd>
+<dt>Returns:</dt>
+<dd>the attack bonus</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>getResistBonus</h3>
+<div class="member-signature"><span class="modifiers">public abstract</span> <span class="return-type">int</span> <span class="element-name">getResistBonus</span><wbr><span class="parameters">(<a href="../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Gets resist bonus.
+ Abstract method that is to be defined in subclasses.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>terrain</code> - Terrain - the terrain of the attack</dd>
+<dt>Returns:</dt>
+<dd>the resist bonus</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html
new file mode 100644
index 0000000000000000000000000000000000000000..d40e6865f49530f838c009af99892fd69d4c467c
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html
@@ -0,0 +1,253 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>UnitFactory</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units, class: UnitFactory">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></div>
+<h1 title="Class UnitFactory" class="title">Class UnitFactory</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory</div>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">UnitFactory</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
+<div class="block">A class to simply and elegantly create units.
+ Either one by one or many at once. Uses string
+ instead of enums to directly insert the
+ unit type from the file reader. In addition,
+ the exception is handled in the factory.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.3 13.04.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">UnitFactory</a>()</code></div>
+<div class="col-last even-row-color"> </div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createListOfUnits(int,edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)" class="member-name-link">createListOfUnits</a><wbr>(int amount,
+ <a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a> unitType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Returns a list of units.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createUnit(edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)" class="member-name-link">createUnit</a><wbr>(<a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a> unitType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Creates a unit between
+ InfantryUnit, RangedUnit,
+ CavalryUnit or CommanderUnit.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#deepCopyBasicUnits(java.util.List)" class="member-name-link">deepCopyBasicUnits</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>> units)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Deep copies units, but ignores overridden
+ attack and armor points.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>()">
+<h3>UnitFactory</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">UnitFactory</span>()</div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="createUnit(edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)">
+<h3>createUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></span> <span class="element-name">createUnit</span><wbr><span class="parameters">(<a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a> unitType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
+<div class="block">Creates a unit between
+ InfantryUnit, RangedUnit,
+ CavalryUnit or CommanderUnit.
+ If the unit type could not be
+ found, it will return null instead.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>unitType</code> - UnitType - the type of unit to create.</dd>
+<dd><code>name</code> - String - name of the created unit.</dd>
+<dd><code>health</code> - int - amount of health the unit starts width</dd>
+<dt>Returns:</dt>
+<dd>unit - Unit - an instance of specialized unit with name and health specified</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - thrown if the unit could not be created or
+ if the type of unit does not exist.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="createListOfUnits(int,edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)">
+<h3>createListOfUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">createListOfUnits</span><wbr><span class="parameters">(int amount,
+ <a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a> unitType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
+<div class="block">Returns a list of units.
+ Uses the createUnit method to create a
+ list of "amount" units with the same name and health.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>amount</code> - int - amount of units to create.</dd>
+<dd><code>unitType</code> - UnitType - the type of unit to create.</dd>
+<dd><code>name</code> - String - name of the created unit.</dd>
+<dd><code>health</code> - int - amount of health the unit starts width</dd>
+<dt>Returns:</dt>
+<dd>units - List - a list of units with the equal attributes.</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - thrown if amount is a negative number, if
+ unit could not be created or if unit type does not exist.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="deepCopyBasicUnits(java.util.List)">
+<h3>deepCopyBasicUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">deepCopyBasicUnits</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>> units)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
+<div class="block">Deep copies units, but ignores overridden
+ attack and armor points.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>units</code> - List - a list of units.</dd>
+<dt>Returns:</dt>
+<dd>new_units - List - a deep copied list of all units</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - thrown if any units could not be
+ created or if unit type does not exist.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html
new file mode 100644
index 0000000000000000000000000000000000000000..b87aeb5a319b8d585bd906f20940a9c917dae286
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html
@@ -0,0 +1,278 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>UnitType</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units, enum: UnitType">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li><a href="#nested-class-summary">Nested</a> | </li>
+<li><a href="#enum-constant-summary">Enum Constants</a> | </li>
+<li>Field | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li><a href="#enum-constant-detail">Enum Constants</a> | </li>
+<li>Field | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></div>
+<h1 title="Enum Class UnitType" class="title">Enum Class UnitType</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">java.lang.Enum</a><<a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a>>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.UnitType</div>
+</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a><<a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a>></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/constant/Constable.html" title="class or interface in java.lang.constant" class="external-link">Constable</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public enum </span><span class="element-name type-name-label">UnitType</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a><<a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a>></span></div>
+<div class="block">An enum that represents the different unit types
+ that an army can contain.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.2 16.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<li>
+<section class="nested-class-summary" id="nested-class-summary">
+<h2>Nested Class Summary</h2>
+<div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-java.lang.Enum">Nested classes/interfaces inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a></h2>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.EnumDesc.html" title="class or interface in java.lang" class="external-link">Enum.EnumDesc</a><<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.EnumDesc.html" title="class or interface in java.lang" class="external-link">E</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a><<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.EnumDesc.html" title="class or interface in java.lang" class="external-link">E</a>>></code></div>
+</section>
+</li>
+<!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<li>
+<section class="constants-summary" id="enum-constant-summary">
+<h2>Enum Constant Summary</h2>
+<div class="caption"><span>Enum Constants</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Enum Constant</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code><a href="#CAVALRY_UNIT" class="member-name-link">CAVALRY_UNIT</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code><a href="#COMMANDER_UNIT" class="member-name-link">COMMANDER_UNIT</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code><a href="#INFANTRY_UNIT" class="member-name-link">INFANTRY_UNIT</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code><a href="#RANGED_UNIT" class="member-name-link">RANGED_UNIT</a></code></div>
+<div class="col-last odd-row-color"> </div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getClassName()" class="member-name-link">getClassName</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets the class name from the enum</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#getUnitType(java.lang.String)" class="member-name-link">getUnitType</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> readableName)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Gets a UnitType enum from a string.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#valueOf(java.lang.String)" class="member-name-link">valueOf</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Returns the enum constant of this class with the specified name.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a>[]</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#values()" class="member-name-link">values</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Returns an array containing the constants of this enum class, in
+the order they are declared.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Enum">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#compareTo(E)" title="class or interface in java.lang" class="external-link">compareTo</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#describeConstable()" title="class or interface in java.lang" class="external-link">describeConstable</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#getDeclaringClass()" title="class or interface in java.lang" class="external-link">getDeclaringClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#name()" title="class or interface in java.lang" class="external-link">name</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#ordinal()" title="class or interface in java.lang" class="external-link">ordinal</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html#valueOf(java.lang.Class,java.lang.String)" title="class or interface in java.lang" class="external-link">valueOf</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ ENUM CONSTANT DETAIL =========== -->
+<li>
+<section class="constant-details" id="enum-constant-detail">
+<h2>Enum Constant Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="INFANTRY_UNIT">
+<h3>INFANTRY_UNIT</h3>
+<div class="member-signature"><span class="modifiers">public static final</span> <span class="return-type"><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></span> <span class="element-name">INFANTRY_UNIT</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="RANGED_UNIT">
+<h3>RANGED_UNIT</h3>
+<div class="member-signature"><span class="modifiers">public static final</span> <span class="return-type"><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></span> <span class="element-name">RANGED_UNIT</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="CAVALRY_UNIT">
+<h3>CAVALRY_UNIT</h3>
+<div class="member-signature"><span class="modifiers">public static final</span> <span class="return-type"><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></span> <span class="element-name">CAVALRY_UNIT</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="COMMANDER_UNIT">
+<h3>COMMANDER_UNIT</h3>
+<div class="member-signature"><span class="modifiers">public static final</span> <span class="return-type"><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></span> <span class="element-name">COMMANDER_UNIT</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="values()">
+<h3>values</h3>
+<div class="member-signature"><span class="modifiers">public static</span> <span class="return-type"><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a>[]</span> <span class="element-name">values</span>()</div>
+<div class="block">Returns an array containing the constants of this enum class, in
+the order they are declared.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>an array containing the constants of this enum class, in the order they are declared</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="valueOf(java.lang.String)">
+<h3>valueOf</h3>
+<div class="member-signature"><span class="modifiers">public static</span> <span class="return-type"><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></span> <span class="element-name">valueOf</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name)</span></div>
+<div class="block">Returns the enum constant of this class with the specified name.
+The string must match <i>exactly</i> an identifier used to declare an
+enum constant in this class. (Extraneous whitespace characters are
+not permitted.)</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - the name of the enum constant to be returned.</dd>
+<dt>Returns:</dt>
+<dd>the enum constant with the specified name</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - if this enum class has no constant with the specified name</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - if the argument is null</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getClassName()">
+<h3>getClassName</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">getClassName</span>()</div>
+<div class="block">Gets the class name from the enum</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>className - String - enum in PascalCase</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getUnitType(java.lang.String)">
+<h3>getUnitType</h3>
+<div class="member-signature"><span class="modifiers">public static</span> <span class="return-type"><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></span> <span class="element-name">getUnitType</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> readableName)</span></div>
+<div class="block">Gets a UnitType enum from a string.
+ If a unit type was not found, null is returned instead.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>readableName</code> - String - the enum in PascalCase</dd>
+<dt>Returns:</dt>
+<dd>UnitType - the enum respective to the readable name</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html
new file mode 100644
index 0000000000000000000000000000000000000000..540446a5a5b970f7af3bce50336a3ac087f08e12
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html
@@ -0,0 +1,114 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>edu.ntnu.idatt2001.carljgu.battle.units</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units">
+<meta name="generator" content="javadoc/PackageWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li class="nav-bar-cell1-rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#package">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Package: </li>
+<li>Description | </li>
+<li><a href="#related-package-summary">Related Packages</a> | </li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<div class="sub-title"><span class="module-label-in-package">Module</span> <a href="../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<h1 title="Package edu.ntnu.idatt2001.carljgu.battle.units" class="title">Package edu.ntnu.idatt2001.carljgu.battle.units</h1>
+</div>
+<hr>
+<div class="package-signature">package <span class="element-name">edu.ntnu.idatt2001.carljgu.battle.units</span></div>
+<section class="summary">
+<ul class="summary-list">
+<li>
+<div id="related-package-summary">
+<div class="caption"><span>Related Packages</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Package</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><a href="../package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><a href="specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></div>
+<div class="col-last odd-row-color"> </div>
+</div>
+</div>
+</li>
+<li>
+<div id="class-summary">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="class-summary-tab0" role="tab" aria-selected="true" aria-controls="class-summary.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="class-summary-tab2" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab2', 2)" class="table-tab">Classes</button><button id="class-summary-tab3" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab3', 2)" class="table-tab">Enum Classes</button></div>
+<div id="class-summary.tabpanel" role="tabpanel">
+<div class="summary-table two-column-summary" aria-labelledby="class-summary-tab0">
+<div class="table-header col-first">Class</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="block">The abstract class Unit.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab2">
+<div class="block">A class to simply and elegantly create units.</div>
+</div>
+<div class="col-first even-row-color class-summary class-summary-tab3"><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab3">
+<div class="block">An enum that represents the different unit types
+ that an army can contain.</div>
+</div>
+</div>
+</div>
+</div>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..0d9f80c2e26d58c3b631f051aa1afd69dea26e3f
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>edu.ntnu.idatt2001.carljgu.battle.units Class Hierarchy</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units">
+<meta name="generator" content="javadoc/PackageTreeWriter">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-tree-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="nav-bar-cell1-rev">Tree</li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#tree">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package edu.ntnu.idatt2001.carljgu.battle.units</h1>
+<span class="package-hierarchy-label">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<section class="hierarchy">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.<a href="Unit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.<a href="UnitFactory.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></li>
+</ul>
+</li>
+</ul>
+</section>
+<section class="hierarchy">
+<h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" class="type-name-link external-link" title="class or interface in java.lang">Enum</a><E> (implements java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a><T>, java.lang.constant.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/constant/Constable.html" title="class or interface in java.lang.constant" class="external-link">Constable</a>, java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a>)
+<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.<a href="UnitType.html" class="type-name-link" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html
new file mode 100644
index 0000000000000000000000000000000000000000..d8c68390942b43d08f2dfc29b8334c6f8c91d274
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html
@@ -0,0 +1,256 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>CavalryUnit</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized, class: CavalryUnit">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></div>
+<h1 title="Class CavalryUnit" class="title">Class CavalryUnit</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">edu.ntnu.idatt2001.carljgu.battle.units.Unit</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit</div>
+</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>Direct Known Subclasses:</dt>
+<dd><code><a href="CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">CavalryUnit</span>
+<span class="extends-implements">extends <a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></span></div>
+<div class="block">Class CavalryUnit that inherits from Unit.
+ CavalryUnit objects implements methods from
+ the superclass.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.4 01.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int)" class="member-name-link">CavalryUnit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Instantiates a new Cavalry unit with
+ a simplified constructor.</div>
+</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">CavalryUnit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Instantiates a new Cavalry unit.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus</a><wbr>(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Overrides the abstract method getAttackBonus from Unit.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus</a><wbr>(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Overrides the abstract method getResistBonus from Unit.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-edu.ntnu.idatt2001.carljgu.battle.units.Unit">Methods inherited from class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></h3>
+<code><a href="../Unit.html#attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)">attack</a>, <a href="../Unit.html#getArmor()">getArmor</a>, <a href="../Unit.html#getAttack()">getAttack</a>, <a href="../Unit.html#getClassName()">getClassName</a>, <a href="../Unit.html#getHealth()">getHealth</a>, <a href="../Unit.html#getName()">getName</a>, <a href="../Unit.html#setHealth(int)">setHealth</a>, <a href="../Unit.html#toString()">toString</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>(java.lang.String,int,int,int)">
+<h3>CavalryUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">CavalryUnit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</span></div>
+<div class="block">Instantiates a new Cavalry unit.
+ Uses the constructor of its superclass Unit.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+<dd><code>attack</code> - int - damage done, excluding attack bonus, on an enemy unit.</dd>
+<dd><code>armor</code> - int - damage resisted, excluding resist bonus, from an enemy unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="<init>(java.lang.String,int)">
+<h3>CavalryUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">CavalryUnit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</span></div>
+<div class="block">Instantiates a new Cavalry unit with
+ a simplified constructor.
+ Attack is set to 20 and health is set to 12
+ Uses the constructor over since it instantiates other variables</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>getAttackBonus</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getAttackBonus</span><wbr><span class="parameters">(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Overrides the abstract method getAttackBonus from Unit.
+ The first time it is run, the default usedAttackBonus
+ is used to simulate the first charge. After that the
+ attack bonus for melee is used instead throughout
+ the CavalryUnit's lifetime.
+ The bonus is also increased if the terrain is plains.</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="../Unit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">getAttackBonus</a></code> in class <code><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></dd>
+<dt>Parameters:</dt>
+<dd><code>terrain</code> - Terrain - the terrain where the attack occurs.</dd>
+<dt>Returns:</dt>
+<dd>attackBonus - int - value of the attack bonus
+ used when calculating an enemy unit's health in an attack.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>getResistBonus</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getResistBonus</span><wbr><span class="parameters">(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Overrides the abstract method getResistBonus from Unit.
+ The resist bonus is increased if the terrain is forest.</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="../Unit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">getResistBonus</a></code> in class <code><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></dd>
+<dt>Parameters:</dt>
+<dd><code>terrain</code> - Terrain - the terrain where the attack occurs.</dd>
+<dt>Returns:</dt>
+<dd>resistBonus - int - value of the resist bonus
+ used when calculating this object's health in an attack.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html
new file mode 100644
index 0000000000000000000000000000000000000000..1c6c1088e61b586fe3cf5c855476821cabb016b9
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html
@@ -0,0 +1,188 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>CommanderUnit</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized, class: CommanderUnit">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li>Method</li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></div>
+<h1 title="Class CommanderUnit" class="title">Class CommanderUnit</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">edu.ntnu.idatt2001.carljgu.battle.units.Unit</a>
+<div class="inheritance"><a href="CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.specialized.CommanderUnit</div>
+</div>
+</div>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">CommanderUnit</span>
+<span class="extends-implements">extends <a href="CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></span></div>
+<div class="block">Class CommanderUnit that inherits from CavalryUnit.
+ CommanderUnit objects does not implement methods from
+ the superclass Unit as they are defined in CavalryUnit.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.4 01.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int)" class="member-name-link">CommanderUnit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Instantiates a new CommanderUnit unit with
+ a simplified constructor.</div>
+</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">CommanderUnit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Instantiates a new CommanderUnit unit.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit">Methods inherited from class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></h3>
+<code><a href="CavalryUnit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">getAttackBonus</a>, <a href="CavalryUnit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">getResistBonus</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-edu.ntnu.idatt2001.carljgu.battle.units.Unit">Methods inherited from class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></h3>
+<code><a href="../Unit.html#attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)">attack</a>, <a href="../Unit.html#getArmor()">getArmor</a>, <a href="../Unit.html#getAttack()">getAttack</a>, <a href="../Unit.html#getClassName()">getClassName</a>, <a href="../Unit.html#getHealth()">getHealth</a>, <a href="../Unit.html#getName()">getName</a>, <a href="../Unit.html#setHealth(int)">setHealth</a>, <a href="../Unit.html#toString()">toString</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>(java.lang.String,int,int,int)">
+<h3>CommanderUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">CommanderUnit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</span></div>
+<div class="block">Instantiates a new CommanderUnit unit.
+ Uses the constructor of its superclass CavalryUnit</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+<dd><code>attack</code> - int - damage done, excluding attack bonus, on an enemy unit.</dd>
+<dd><code>armor</code> - int - damage resisted, excluding resist bonus, from an enemy unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="<init>(java.lang.String,int)">
+<h3>CommanderUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">CommanderUnit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</span></div>
+<div class="block">Instantiates a new CommanderUnit unit with
+ a simplified constructor.
+ Attack is set to 25 and health is set to 15
+ Uses the constructor of its superclass CavalryUnit since the constructor gives
+ no other value.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html
new file mode 100644
index 0000000000000000000000000000000000000000..e5a0f612b74542a1510d07a66db794c77eae66a5
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html
@@ -0,0 +1,248 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>InfantryUnit</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized, class: InfantryUnit">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></div>
+<h1 title="Class InfantryUnit" class="title">Class InfantryUnit</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">edu.ntnu.idatt2001.carljgu.battle.units.Unit</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit</div>
+</div>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">InfantryUnit</span>
+<span class="extends-implements">extends <a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></span></div>
+<div class="block">Class InfantryUnit that inherits from Unit.
+ InfantryUnit objects implements methods from
+ the superclass.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.4 01.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int)" class="member-name-link">InfantryUnit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Instantiates a new Infantry unit with
+ a simplified constructor.</div>
+</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">InfantryUnit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Instantiates a new Infantry unit.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus</a><wbr>(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Overrides the abstract method getAttackBonus from Unit.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus</a><wbr>(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Overrides the abstract method getResistBonus from Unit.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-edu.ntnu.idatt2001.carljgu.battle.units.Unit">Methods inherited from class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></h3>
+<code><a href="../Unit.html#attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)">attack</a>, <a href="../Unit.html#getArmor()">getArmor</a>, <a href="../Unit.html#getAttack()">getAttack</a>, <a href="../Unit.html#getClassName()">getClassName</a>, <a href="../Unit.html#getHealth()">getHealth</a>, <a href="../Unit.html#getName()">getName</a>, <a href="../Unit.html#setHealth(int)">setHealth</a>, <a href="../Unit.html#toString()">toString</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>(java.lang.String,int,int,int)">
+<h3>InfantryUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">InfantryUnit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</span></div>
+<div class="block">Instantiates a new Infantry unit.
+ Uses the constructor of its superclass Unit</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+<dd><code>attack</code> - int - damage done, excluding attack bonus, on an enemy unit.</dd>
+<dd><code>armor</code> - int - damage resisted, excluding resist bonus, from an enemy unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="<init>(java.lang.String,int)">
+<h3>InfantryUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">InfantryUnit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</span></div>
+<div class="block">Instantiates a new Infantry unit with
+ a simplified constructor.
+ Attack is set to 15 and health is set to 10
+ Uses the constructor over since it instantiates other variables</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>getAttackBonus</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getAttackBonus</span><wbr><span class="parameters">(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Overrides the abstract method getAttackBonus from Unit.
+ The attack bonus is increased if the terrain is forest.</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="../Unit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">getAttackBonus</a></code> in class <code><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></dd>
+<dt>Parameters:</dt>
+<dd><code>terrain</code> - Terrain - the terrain where the attack occurs.</dd>
+<dt>Returns:</dt>
+<dd>attackBonus - int - value of the attack bonus
+ used when calculating an enemy unit's health in an attack.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>getResistBonus</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getResistBonus</span><wbr><span class="parameters">(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Overrides the abstract method getResistBonus from Unit.
+ The resistance bonus is increased if the terrain is forest.</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="../Unit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">getResistBonus</a></code> in class <code><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></dd>
+<dt>Parameters:</dt>
+<dd><code>terrain</code> - Terrain - the terrain where the attack occurs.</dd>
+<dt>Returns:</dt>
+<dd>resistBonus - int - value of the resist bonus
+ used when calculating this object's health in an attack.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html
new file mode 100644
index 0000000000000000000000000000000000000000..c2169728e2bbb15da6e68910bd9edd4e31c1933a
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html
@@ -0,0 +1,255 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>RangedUnit</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized, class: RangedUnit">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></div>
+<h1 title="Class RangedUnit" class="title">Class RangedUnit</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">edu.ntnu.idatt2001.carljgu.battle.units.Unit</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit</div>
+</div>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">RangedUnit</span>
+<span class="extends-implements">extends <a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></span></div>
+<div class="block">Class RangedUnit that inherits from Unit.
+ RangedUnit objects implements methods from
+ the superclass.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.4 01.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int)" class="member-name-link">RangedUnit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Instantiates a new Ranged unit with
+ a simplified constructor.</div>
+</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">RangedUnit</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Instantiates a new Ranged unit.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus</a><wbr>(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Overrides the abstract method getAttackBonus from Unit.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus</a><wbr>(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Overrides the abstract method getAttackBonus from Unit.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-edu.ntnu.idatt2001.carljgu.battle.units.Unit">Methods inherited from class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></h3>
+<code><a href="../Unit.html#attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)">attack</a>, <a href="../Unit.html#getArmor()">getArmor</a>, <a href="../Unit.html#getAttack()">getAttack</a>, <a href="../Unit.html#getClassName()">getClassName</a>, <a href="../Unit.html#getHealth()">getHealth</a>, <a href="../Unit.html#getName()">getName</a>, <a href="../Unit.html#setHealth(int)">setHealth</a>, <a href="../Unit.html#toString()">toString</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>(java.lang.String,int,int,int)">
+<h3>RangedUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">RangedUnit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health,
+ int attack,
+ int armor)</span></div>
+<div class="block">Instantiates a new Ranged unit.
+ Uses the constructor of its superclass Unit</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+<dd><code>attack</code> - int - damage done, excluding attack bonus, on an enemy unit.</dd>
+<dd><code>armor</code> - int - damage resisted, excluding resist bonus, from an enemy unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="<init>(java.lang.String,int)">
+<h3>RangedUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">RangedUnit</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name,
+ int health)</span></div>
+<div class="block">Instantiates a new Ranged unit with
+ a simplified constructor.
+ Attack is set to 15 and health is set to 8
+ Uses the constructor over since it instantiates other variables</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>name</code> - String - a short name of the unit that can't be left with whitespace or empty.</dd>
+<dd><code>health</code> - int - HP - amount of health unit has. If it hits zero or more, the unit is dead.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>getAttackBonus</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getAttackBonus</span><wbr><span class="parameters">(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Overrides the abstract method getAttackBonus from Unit.
+ The attack bonus is decreased if the terrain is forest
+ and increased if the terrain is hills.</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="../Unit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">getAttackBonus</a></code> in class <code><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></dd>
+<dt>Parameters:</dt>
+<dd><code>terrain</code> - Terrain - the terrain where the attack occurs.</dd>
+<dt>Returns:</dt>
+<dd>attackBonus - int - value of the attack bonus
+ used when calculating an enemy unit's health in an attack.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">
+<h3>getResistBonus</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getResistBonus</span><wbr><span class="parameters">(<a href="../../Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a> terrain)</span></div>
+<div class="block">Overrides the abstract method getAttackBonus from Unit.
+ The first time it is run, times resisted is less than 2
+ and therefore returns the initial resist bonus.
+ The second time resisted is still less than 2, but
+ the initial resist bonus is subtracted by 2.
+ (initialResistBonus - 2 * timesResisted (1)).
+ The third time and all other times this method is,
+ the default finalResistBonus is used.</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="../Unit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)">getResistBonus</a></code> in class <code><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></code></dd>
+<dt>Parameters:</dt>
+<dd><code>terrain</code> - Terrain - the terrain where the attack occurs.</dd>
+<dt>Returns:</dt>
+<dd>resistBonus - int - value of the resist bonus
+ used when calculating this object's health in an attack.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html
new file mode 100644
index 0000000000000000000000000000000000000000..d27d811773cc02276900f94ba95e5170f7ab2195
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html
@@ -0,0 +1,109 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>edu.ntnu.idatt2001.carljgu.battle.units.specialized</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized">
+<meta name="generator" content="javadoc/PackageWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../../module-summary.html">Module</a></li>
+<li class="nav-bar-cell1-rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../../help-doc.html#package">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Package: </li>
+<li>Description | </li>
+<li><a href="#related-package-summary">Related Packages</a> | </li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<div class="sub-title"><span class="module-label-in-package">Module</span> <a href="../../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<h1 title="Package edu.ntnu.idatt2001.carljgu.battle.units.specialized" class="title">Package edu.ntnu.idatt2001.carljgu.battle.units.specialized</h1>
+</div>
+<hr>
+<div class="package-signature">package <span class="element-name">edu.ntnu.idatt2001.carljgu.battle.units.specialized</span></div>
+<section class="summary">
+<ul class="summary-list">
+<li>
+<div id="related-package-summary">
+<div class="caption"><span>Related Packages</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Package</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><a href="../package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></div>
+<div class="col-last even-row-color"> </div>
+</div>
+</div>
+</li>
+<li>
+<div id="class-summary">
+<div class="caption"><span>Classes</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Class</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="block">Class CavalryUnit that inherits from Unit.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab2">
+<div class="block">Class CommanderUnit that inherits from CavalryUnit.</div>
+</div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="block">Class InfantryUnit that inherits from Unit.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab2">
+<div class="block">Class RangedUnit that inherits from Unit.</div>
+</div>
+</div>
+</div>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..6aac07579869d82bfc86b93b69a583f7ad4f064b
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>edu.ntnu.idatt2001.carljgu.battle.units.specialized Class Hierarchy</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle.units.specialized">
+<meta name="generator" content="javadoc/PackageTreeWriter">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-tree-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="nav-bar-cell1-rev">Tree</li>
+<li><a href="../../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../../help-doc.html#tree">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package edu.ntnu.idatt2001.carljgu.battle.units.specialized</h1>
+<span class="package-hierarchy-label">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<section class="hierarchy">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.<a href="../Unit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>
+<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="CavalryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a>
+<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="CommanderUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></li>
+</ul>
+</li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="InfantryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="RangedUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
index ef8ae23324df7b3a68278fa701eaf5b910366979..8e5ed9bbda9ec88221271b4367b8b8863fdd39ed 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>App</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html
index 20ebb8df9061516774f552e6950a20d13ec689da..f61f632a5b81e2df12b1ab1cb0dea71278d9111b 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class BattleController" class="title">Class BattleController</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.client.BattleController</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.client.controllers.BattleController</div>
</div>
<section class="class-description" id="class-description">
<dl class="notes">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html
index 1f02c8411069a09b96c57b98d58e8850ac36c9f2..55996d7c9fed28c0d969ee2b1ed429bf1c100a90 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class EditArmyController" class="title">Class EditArmyController</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.client.EditArmyController</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.client.controllers.EditArmyController</div>
</div>
<section class="class-description" id="class-description">
<dl class="notes">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
index ae94aba7da885f2467e56c7c9e471f56137abd6b..d0769ca34d334f499b10800b2d63fbb030d07b46 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>Main</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html
new file mode 100644
index 0000000000000000000000000000000000000000..2267193f6b7bbbeba5dcf3fbfb92fb17d03a73e3
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html
@@ -0,0 +1,353 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>BattleController</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.controllers, class: BattleController">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a></div>
+<h1 title="Class BattleController" class="title">Class BattleController</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.client.controllers.BattleController</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Implemented Interfaces:</dt>
+<dd><code>javafx.fxml.Initializable</code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">BattleController</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
+implements javafx.fxml.Initializable</span></div>
+<div class="block">A controller class which
+ handles events in the fxml file battle-armies.fxml.
+ This includes requesting to import
+ armies and simulate the battle</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.9 14.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">BattleController</a>()</code></div>
+<div class="col-last even-row-color"> </div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createArmy()" class="member-name-link">createArmy</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Creates a dialog box with custom buttons
+ where the user can change which side to
+ create an army to.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#displayArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">displayArmy</a><wbr>(int armyNumber,
+ <a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Updates the information about an army
+ in the chosen elements.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#editArmy(int)" class="member-name-link">editArmy</a><wbr>(int armyNumber)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Goes to the edit page of an imported army.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#editArmyOne()" class="member-name-link">editArmyOne</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Edits the left army.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#editArmyTwo()" class="member-name-link">editArmyTwo</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Edits the right army.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#importArmyOne()" class="member-name-link">importArmyOne</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Imports an army for the first army.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#importArmyTwo()" class="member-name-link">importArmyTwo</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Imports an army for the second army.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#initialize(java.net.URL,java.util.ResourceBundle)" class="member-name-link">initialize</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URL.html" title="class or interface in java.net" class="external-link">URL</a> url,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ResourceBundle.html" title="class or interface in java.util" class="external-link">ResourceBundle</a> resourceBundle)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Run when the fxml file is first loaded.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#resetArmies()" class="member-name-link">resetArmies</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Run when clicking on reset armies.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#runSimulation()" class="member-name-link">runSimulation</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Run when clicking on the button reset and run.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setOriginalArmy</a><wbr>(int armyNumber,
+ <a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Inserts an army into the originalArmies table
+ Useful for sending armies across controllers.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>()">
+<h3>BattleController</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">BattleController</span>()</div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)">
+<h3>setOriginalArmy</h3>
+<div class="member-signature"><span class="modifiers">public static</span> <span class="return-type">void</span> <span class="element-name">setOriginalArmy</span><wbr><span class="parameters">(int armyNumber,
+ <a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</span></div>
+<div class="block">Inserts an army into the originalArmies table
+ Useful for sending armies across controllers.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the insertion index for the army.</dd>
+<dd><code>army</code> - Army - the army to insert into the table.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="importArmyOne()">
+<h3>importArmyOne</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">importArmyOne</span>()</div>
+<div class="block">Imports an army for the first army.
+ Uses the system's file explorer to find the file.
+ 0 selects the first army.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="importArmyTwo()">
+<h3>importArmyTwo</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">importArmyTwo</span>()</div>
+<div class="block">Imports an army for the second army.
+ Uses the system's file explorer to find the file.
+ 1 selects the second army.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="resetArmies()">
+<h3>resetArmies</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">boolean</span> <span class="element-name">resetArmies</span>()</div>
+<div class="block">Run when clicking on reset armies.
+ Deep copies the armies and creates a new battle.
+ Also resets the labels.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>result - boolean - true if the reset was a success, false otherwise</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="runSimulation()">
+<h3>runSimulation</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">runSimulation</span>()</div>
+<div class="block">Run when clicking on the button reset and run.
+ Creates deep copies of the armies and runs the
+ simulation. Then it calls the methods in View
+ to display that information.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="displayArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)">
+<h3>displayArmy</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">displayArmy</span><wbr><span class="parameters">(int armyNumber,
+ <a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></span></div>
+<div class="block">Updates the information about an army
+ in the chosen elements.
+ Uses both armyNumber and army to be able to display armies that
+ have changed. For example after a battle.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - 0 or 1 depending on which elements to use to display an army.</dd>
+<dd><code>army</code> - Army - the army to display.</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - thrown if the army is null</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="editArmy(int)">
+<h3>editArmy</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">editArmy</span><wbr><span class="parameters">(int armyNumber)</span></div>
+<div class="block">Goes to the edit page of an imported army.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</code> - int - the specified army's number to edit</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="editArmyOne()">
+<h3>editArmyOne</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">editArmyOne</span>()</div>
+<div class="block">Edits the left army. Army one</div>
+</section>
+</li>
+<li>
+<section class="detail" id="editArmyTwo()">
+<h3>editArmyTwo</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">editArmyTwo</span>()</div>
+<div class="block">Edits the right army. Army two</div>
+</section>
+</li>
+<li>
+<section class="detail" id="createArmy()">
+<h3>createArmy</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">createArmy</span>()</div>
+<div class="block">Creates a dialog box with custom buttons
+ where the user can change which side to
+ create an army to. From there it changes scene
+ to edit a new army.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="initialize(java.net.URL,java.util.ResourceBundle)">
+<h3>initialize</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">initialize</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URL.html" title="class or interface in java.net" class="external-link">URL</a> url,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ResourceBundle.html" title="class or interface in java.util" class="external-link">ResourceBundle</a> resourceBundle)</span></div>
+<div class="block">Run when the fxml file is first loaded.
+ Fills in the tables of information for the armies</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code>initialize</code> in interface <code>javafx.fxml.Initializable</code></dd>
+<dt>Parameters:</dt>
+<dd><code>url</code> - URL - a Uniform Resource Loader</dd>
+<dd><code>resourceBundle</code> - ResourceBundle</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html
new file mode 100644
index 0000000000000000000000000000000000000000..f671fd44904bdd163964b5d7aed07e1a86159274
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html
@@ -0,0 +1,479 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>EditArmyController</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.controllers, class: EditArmyController">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li><a href="#field-summary">Field</a> | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li><a href="#field-detail">Field</a> | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a></div>
+<h1 title="Class EditArmyController" class="title">Class EditArmyController</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.client.controllers.EditArmyController</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Implemented Interfaces:</dt>
+<dd><code>javafx.fxml.Initializable</code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">EditArmyController</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
+implements javafx.fxml.Initializable</span></div>
+<div class="block">A controller class which
+ handles events in the fxml file edit-army.fxml.
+ This includes requesting to import
+ armies and simulate the battle</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.9 14.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- =========== FIELD SUMMARY =========== -->
+<li>
+<section class="field-summary" id="field-summary">
+<h2>Field Summary</h2>
+<div class="caption"><span>Fields</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Field</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>javafx.scene.control.Button</code></div>
+<div class="col-second even-row-color"><code><a href="#addUnitsButton" class="member-name-link">addUnitsButton</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>javafx.scene.control.ComboBox<<a href="../../battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second odd-row-color"><code><a href="#allUnitsComboBox" class="member-name-link">allUnitsComboBox</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>javafx.scene.control.Spinner<<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>></code></div>
+<div class="col-second even-row-color"><code><a href="#amountOfUnitsSpinner" class="member-name-link">amountOfUnitsSpinner</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>javafx.scene.control.Label</code></div>
+<div class="col-second odd-row-color"><code><a href="#armyToString" class="member-name-link">armyToString</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>javafx.scene.control.ListView<<a href="../../battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></code></div>
+<div class="col-second even-row-color"><code><a href="#armyUnitsListView" class="member-name-link">armyUnitsListView</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>javafx.scene.control.ListView<<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>></code></div>
+<div class="col-second odd-row-color"><code><a href="#changelogListView" class="member-name-link">changelogListView</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>javafx.scene.control.Button</code></div>
+<div class="col-second even-row-color"><code><a href="#deleteUnitsButton" class="member-name-link">deleteUnitsButton</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>javafx.scene.control.Button</code></div>
+<div class="col-second odd-row-color"><code><a href="#editArmyNameButton" class="member-name-link">editArmyNameButton</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>javafx.scene.control.Label</code></div>
+<div class="col-second even-row-color"><code><a href="#editArmyTitle" class="member-name-link">editArmyTitle</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>javafx.scene.control.TextField</code></div>
+<div class="col-second odd-row-color"><code><a href="#editNameField" class="member-name-link">editNameField</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>javafx.scene.layout.HBox</code></div>
+<div class="col-second even-row-color"><code><a href="#hboxRoot" class="member-name-link">hboxRoot</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>javafx.scene.control.Spinner<<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>></code></div>
+<div class="col-second odd-row-color"><code><a href="#unitsHealthSpinner" class="member-name-link">unitsHealthSpinner</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>javafx.scene.control.TextField</code></div>
+<div class="col-second even-row-color"><code><a href="#unitsNameField" class="member-name-link">unitsNameField</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>javafx.scene.control.ComboBox<<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>></code></div>
+<div class="col-second odd-row-color"><code><a href="#unitsTypeComboBox" class="member-name-link">unitsTypeComboBox</a></code></div>
+<div class="col-last odd-row-color"> </div>
+</div>
+</section>
+</li>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">EditArmyController</a>()</code></div>
+<div class="col-last even-row-color"> </div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#addEventListenersToFieldsAndLists()" class="member-name-link">addEventListenersToFieldsAndLists</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Adds event listeners to some fields to set
+ buttons to disabled if input is invalid.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#addUnits()" class="member-name-link">addUnits</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Called for adding new units.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#cancelAllChanges()" class="member-name-link">cancelAllChanges</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Cancel all changes and changes scene to the main page.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#deleteUnit()" class="member-name-link">deleteUnit</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Called for deleting a unit.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#displaySuccessfulPopupMessage(java.lang.String)" class="member-name-link">displaySuccessfulPopupMessage</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> successMessage)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Display successful popup message.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#editArmyName()" class="member-name-link">editArmyName</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Called for updating the army's name.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#initialize(java.net.URL,java.util.ResourceBundle)" class="member-name-link">initialize</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URL.html" title="class or interface in java.net" class="external-link">URL</a> url,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ResourceBundle.html" title="class or interface in java.util" class="external-link">ResourceBundle</a> resourceBundle)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Run when the fxml file is first loaded.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#setArmyToEdit(edu.ntnu.idatt2001.carljgu.battle.Army,int)" class="member-name-link">setArmyToEdit</a><wbr>(<a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> armyToEdit,
+ int armyNumberToEdit)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Sets army to edit.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateAllFields()" class="member-name-link">updateAllFields</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Update all fields and labels with updated information.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Update army and go back.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#writeToCSV()" class="member-name-link">writeToCSV</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Writes the changed army to a csv file.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ FIELD DETAIL =========== -->
+<li>
+<section class="field-details" id="field-detail">
+<h2>Field Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="editArmyTitle">
+<h3>editArmyTitle</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">editArmyTitle</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyToString">
+<h3>armyToString</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">armyToString</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="editNameField">
+<h3>editNameField</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.TextField</span> <span class="element-name">editNameField</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="editArmyNameButton">
+<h3>editArmyNameButton</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.Button</span> <span class="element-name">editArmyNameButton</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="addUnitsButton">
+<h3>addUnitsButton</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.Button</span> <span class="element-name">addUnitsButton</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="deleteUnitsButton">
+<h3>deleteUnitsButton</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.Button</span> <span class="element-name">deleteUnitsButton</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="unitsTypeComboBox">
+<h3>unitsTypeComboBox</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.ComboBox<<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>></span> <span class="element-name">unitsTypeComboBox</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="amountOfUnitsSpinner">
+<h3>amountOfUnitsSpinner</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.Spinner<<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>></span> <span class="element-name">amountOfUnitsSpinner</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="unitsHealthSpinner">
+<h3>unitsHealthSpinner</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.Spinner<<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>></span> <span class="element-name">unitsHealthSpinner</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="unitsNameField">
+<h3>unitsNameField</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.TextField</span> <span class="element-name">unitsNameField</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="allUnitsComboBox">
+<h3>allUnitsComboBox</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.ComboBox<<a href="../../battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">allUnitsComboBox</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyUnitsListView">
+<h3>armyUnitsListView</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.ListView<<a href="../../battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>></span> <span class="element-name">armyUnitsListView</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="changelogListView">
+<h3>changelogListView</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.control.ListView<<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>></span> <span class="element-name">changelogListView</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="hboxRoot">
+<h3>hboxRoot</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">javafx.scene.layout.HBox</span> <span class="element-name">hboxRoot</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>()">
+<h3>EditArmyController</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">EditArmyController</span>()</div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="setArmyToEdit(edu.ntnu.idatt2001.carljgu.battle.Army,int)">
+<h3>setArmyToEdit</h3>
+<div class="member-signature"><span class="modifiers">public static</span> <span class="return-type">void</span> <span class="element-name">setArmyToEdit</span><wbr><span class="parameters">(<a href="../../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> armyToEdit,
+ int armyNumberToEdit)</span></div>
+<div class="block">Sets army to edit.
+ Called from the BattleController to set
+ the army to edit.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyToEdit</code> - the army to edit</dd>
+<dd><code>armyNumberToEdit</code> - int - the selected army to import.
+ 0 for army one and 1 for army two</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="editArmyName()">
+<h3>editArmyName</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">editArmyName</span>()</div>
+<div class="block">Called for updating the army's name.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="addUnits()">
+<h3>addUnits</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">addUnits</span>()</div>
+<div class="block">Called for adding new units.
+ Adds units with information about
+ amount of units, their name, their health,
+ and their unit type.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="deleteUnit()">
+<h3>deleteUnit</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">deleteUnit</span>()</div>
+<div class="block">Called for deleting a unit.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="cancelAllChanges()">
+<h3>cancelAllChanges</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">cancelAllChanges</span>()</div>
+<div class="block">Cancel all changes and changes scene to the main page.
+ As the changes are stored in a deep copy, the scene
+ change disregards these changes.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="writeToCSV()">
+<h3>writeToCSV</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">writeToCSV</span>()</div>
+<div class="block">Writes the changed army to a csv file.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="updateArmyAndGoBack()">
+<h3>updateArmyAndGoBack</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">updateArmyAndGoBack</span>()</div>
+<div class="block">Update army and go back.
+ Sets the original army to the deep copied army.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="displaySuccessfulPopupMessage(java.lang.String)">
+<h3>displaySuccessfulPopupMessage</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">displaySuccessfulPopupMessage</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> successMessage)</span></div>
+<div class="block">Display successful popup message.
+ Creates a new stage which is removed after a click.
+ Adds a blur effect behind the popup message that
+ is removed after it is hidden.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>successMessage</code> - the success message</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="updateAllFields()">
+<h3>updateAllFields</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">updateAllFields</span>()</div>
+<div class="block">Update all fields and labels with updated information.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="addEventListenersToFieldsAndLists()">
+<h3>addEventListenersToFieldsAndLists</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">addEventListenersToFieldsAndLists</span>()</div>
+<div class="block">Adds event listeners to some fields to set
+ buttons to disabled if input is invalid.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="initialize(java.net.URL,java.util.ResourceBundle)">
+<h3>initialize</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">initialize</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URL.html" title="class or interface in java.net" class="external-link">URL</a> url,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ResourceBundle.html" title="class or interface in java.util" class="external-link">ResourceBundle</a> resourceBundle)</span></div>
+<div class="block">Run when the fxml file is first loaded.
+ Fills in the combo boxes and spinners</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code>initialize</code> in interface <code>javafx.fxml.Initializable</code></dd>
+<dt>Parameters:</dt>
+<dd><code>url</code> - URL - a Uniform Resource Loader</dd>
+<dd><code>resourceBundle</code> - ResourceBundle</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html
new file mode 100644
index 0000000000000000000000000000000000000000..1cd222965423f49174eef68e1a191f456d1b0a0e
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>edu.ntnu.idatt2001.carljgu.client.controllers</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.controllers">
+<meta name="generator" content="javadoc/PackageWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li class="nav-bar-cell1-rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#package">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Package: </li>
+<li>Description | </li>
+<li><a href="#related-package-summary">Related Packages</a> | </li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<div class="sub-title"><span class="module-label-in-package">Module</span> <a href="../../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<h1 title="Package edu.ntnu.idatt2001.carljgu.client.controllers" class="title">Package edu.ntnu.idatt2001.carljgu.client.controllers</h1>
+</div>
+<hr>
+<div class="package-signature">package <span class="element-name">edu.ntnu.idatt2001.carljgu.client.controllers</span></div>
+<section class="summary">
+<ul class="summary-list">
+<li>
+<div id="related-package-summary">
+<div class="caption"><span>Related Packages</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Package</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><a href="../package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><a href="../dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a></div>
+<div class="col-last odd-row-color"> </div>
+</div>
+</div>
+</li>
+<li>
+<div id="class-summary">
+<div class="caption"><span>Classes</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Class</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="block">A controller class which
+ handles events in the fxml file battle-armies.fxml.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab2">
+<div class="block">A controller class which
+ handles events in the fxml file edit-army.fxml.</div>
+</div>
+</div>
+</div>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..f3dbbf72cfc591e3e7611a313d9451ab5c35d373
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>edu.ntnu.idatt2001.carljgu.client.controllers Class Hierarchy</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.controllers">
+<meta name="generator" content="javadoc/PackageTreeWriter">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-tree-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="nav-bar-cell1-rev">Tree</li>
+<li><a href="../../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../../help-doc.html#tree">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package edu.ntnu.idatt2001.carljgu.client.controllers</h1>
+<span class="package-hierarchy-label">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<section class="hierarchy">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.client.controllers.<a href="BattleController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.client.controllers.<a href="EditArmyController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a> (implements javafx.fxml.Initializable)</li>
+</ul>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
index df36ffea6120ec1e952eb658cb72623b72ff4b11..c2571f5aec455640a700ed407f7cc291bafb2c8a 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>DialogBox</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
index e6b93f041745678f45dd4fb78fa541cc953d5507..c8d63fc5451bf11af8a54d427f350dd49924e6c0 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>DialogBoxBuilder</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
index c730049c46dd719a9b51306b01498e47331de5e8..f66a931d368c1f4884c59aa90df6ae4ae3395bf8 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.dialogs</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -72,6 +72,8 @@ loadScripts(document, 'script');</script>
<div class="table-header col-last">Description</div>
<div class="col-first even-row-color"><a href="../package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><a href="../controllers/package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a></div>
+<div class="col-last odd-row-color"> </div>
</div>
</div>
</li>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
index 6cea938ec0a232b5ac99d993c20cbd839b0c023b..434f655bd4548da7141ff4c064dbc5fd6ebf7c89 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client.dialogs Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
index 81e2b5a2d81aef663bce169323bd10cd547f265f..f0130749dd23573cf8a2a02f22961aa733193223 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -70,16 +70,10 @@ loadScripts(document, 'script');</script>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Package</div>
<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><a href="../package-summary.html">edu.ntnu.idatt2001.carljgu</a></div>
+<div class="col-first even-row-color"><a href="controllers/package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a></div>
<div class="col-last even-row-color"> </div>
<div class="col-first odd-row-color"><a href="dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a></div>
<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><a href="../army/package-summary.html">edu.ntnu.idatt2001.carljgu.army</a></div>
-<div class="col-last even-row-color"> </div>
-<div class="col-first odd-row-color"><a href="../battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a></div>
-<div class="col-last odd-row-color"> </div>
-<div class="col-first even-row-color"><a href="../units/package-summary.html">edu.ntnu.idatt2001.carljgu.units</a></div>
-<div class="col-last even-row-color"> </div>
</div>
</div>
</li>
@@ -94,16 +88,6 @@ loadScripts(document, 'script');</script>
<div class="block">Class that extends Application
from javafx.</div>
</div>
-<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></div>
-<div class="col-last odd-row-color class-summary class-summary-tab2">
-<div class="block">A controller class which
- handles events in the fxml file battle-armies.fxml.</div>
-</div>
-<div class="col-first even-row-color class-summary class-summary-tab2"><a href="EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab2">
-<div class="block">A controller class which
- handles events in the fxml file edit-army.fxml.</div>
-</div>
<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></div>
<div class="col-last odd-row-color class-summary class-summary-tab2">
<div class="block">The main class that is run when the application
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
index 1cd45e3f2c98c36314e9528a1a54423031c75aa1..7be7ac9e5e818c4bc31221bc85ed9f8f24f3c216 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -65,8 +65,6 @@ loadScripts(document, 'script');</script>
<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="App.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">App</a></li>
</ul>
</li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="BattleController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a> (implements javafx.fxml.Initializable)</li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="EditArmyController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a> (implements javafx.fxml.Initializable)</li>
<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="Main.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></li>
</ul>
</li>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html
new file mode 100644
index 0000000000000000000000000000000000000000..0d28cdd7dcd75eb1325d64a7e6c746a086d54ab7
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html
@@ -0,0 +1,266 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>ArmyFileHandler</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.filehandling, class: ArmyFileHandler">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.filehandling</a></div>
+<h1 title="Class ArmyFileHandler" class="title">Class ArmyFileHandler</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.filehandling.ArmyFileHandler</div>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">ArmyFileHandler</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
+<div class="block">Handles writing, reading and importing
+ armies to and from a file.</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.4 1.05.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">ArmyFileHandler</a>()</code></div>
+<div class="col-last even-row-color">
+<div class="block">Constructor which initiates the readLinesSkipped arraylist
+ Sets the delimiter to a comma for comma seperated value.</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getFilePath(java.lang.String)" class="member-name-link">getFilePath</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> fileChooserType)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Uses the system default file explorer to get
+ a file path of the user's choice.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getReadLinesSkipped()" class="member-name-link">getReadLinesSkipped</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Gets the amount of units
+ that were skipped when reading from file.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#readArmyFromFile(java.lang.String)" class="member-name-link">readArmyFromFile</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> filePath)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Finds a specified csv file
+ and converts it to an army if it can.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#writeToFile(edu.ntnu.idatt2001.carljgu.battle.Army,java.lang.String)" class="member-name-link">writeToFile</a><wbr>(<a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> filePath)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Creates a file to write on or writes to an existing file.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>()">
+<h3>ArmyFileHandler</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">ArmyFileHandler</span>()</div>
+<div class="block">Constructor which initiates the readLinesSkipped arraylist
+ Sets the delimiter to a comma for comma seperated value.</div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="getReadLinesSkipped()">
+<h3>getReadLinesSkipped</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>></span> <span class="element-name">getReadLinesSkipped</span>()</div>
+<div class="block">Gets the amount of units
+ that were skipped when reading from file.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>readLinesSkipped - amount of lines skipped when
+ reading army from file because of invalid unit.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="writeToFile(edu.ntnu.idatt2001.carljgu.battle.Army,java.lang.String)">
+<h3>writeToFile</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">writeToFile</span><wbr><span class="parameters">(<a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> army,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> filePath)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a>,
+<a href="FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a>,
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
+<div class="block">Creates a file to write on or writes to an existing file.
+ The client should handle any exception that is thrown
+ with an error message the client creates.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>army</code> - Army - A collection of units that is written to a file</dd>
+<dd><code>filePath</code> - String - name of the file and its full path</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/NullPointerException.html" title="class or interface in java.lang" class="external-link">NullPointerException</a></code> - thrown if the army is a null object</dd>
+<dd><code><a href="FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a></code> - thrown if the file extension is not csv
+ because of the file name</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - thrown if an I/O error occurs</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="readArmyFromFile(java.lang.String)">
+<h3>readArmyFromFile</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">readArmyFromFile</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> filePath)</span>
+ throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/FileNotFoundException.html" title="class or interface in java.io" class="external-link">FileNotFoundException</a>,
+<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
+<div class="block">Finds a specified csv file
+ and converts it to an army if it can.
+ If there is a line which has an unreadable unit
+ it will continue on the next line
+ The client should handle any exception that is thrown
+ with an error message the client creates.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>filePath</code> - - String - name of the file path to read from</dd>
+<dt>Returns:</dt>
+<dd>army - Army - an army read from a csv file</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - thrown if an I/O error occurs</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/FileNotFoundException.html" title="class or interface in java.io" class="external-link">FileNotFoundException</a></code> - thrown if the filepath was not found</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - thrown if file extension is not csv or if army could not be created.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getFilePath(java.lang.String)">
+<h3>getFilePath</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">getFilePath</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> fileChooserType)</span></div>
+<div class="block">Uses the system default file explorer to get
+ a file path of the user's choice.
+ If a user closes the file chooser,
+ null is returned.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>fileChooserType</code> - String - OPEN or SAVE depending on whether
+ the user wants to open a file or write to a file</dd>
+<dt>Returns:</dt>
+<dd>filePath - String - the file path of a csv file for an army</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html
new file mode 100644
index 0000000000000000000000000000000000000000..b89d317f107d063e7c61faab7b7b83454a1c923d
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html
@@ -0,0 +1,165 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>FileExtensionException</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.filehandling, class: FileExtensionException">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Summary: </li>
+<li>Nested | </li>
+<li>Field | </li>
+<li><a href="#constructor-summary">Constr</a> | </li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail: </li>
+<li>Field | </li>
+<li><a href="#constructor-detail">Constr</a> | </li>
+<li>Method</li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="module-label-in-type">Module</span> <a href="../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<div class="sub-title"><span class="package-label-in-type">Package</span> <a href="package-summary.html">edu.ntnu.idatt2001.carljgu.filehandling</a></div>
+<h1 title="Class FileExtensionException" class="title">Class FileExtensionException</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">java.lang.Throwable</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">java.lang.Exception</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">java.lang.RuntimeException</a>
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">java.lang.IllegalArgumentException</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException</div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name type-name-label">FileExtensionException</span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></span></div>
+<div class="block">Thrown if an extension of a file is invalid
+ The exception thrown needs to have a message</div>
+<dl class="notes">
+<dt>Version:</dt>
+<dd>1.1 20.03.2022</dd>
+<dt>Author:</dt>
+<dd>Carl Gützkow</dd>
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../serialized-form.html#edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException">Serialized Form</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String)" class="member-name-link">FileExtensionException</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> message)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Constructs an exception with a detail message</div>
+</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Throwable">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#addSuppressed(java.lang.Throwable)" title="class or interface in java.lang" class="external-link">addSuppressed</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#fillInStackTrace()" title="class or interface in java.lang" class="external-link">fillInStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getCause()" title="class or interface in java.lang" class="external-link">getCause</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getLocalizedMessage()" title="class or interface in java.lang" class="external-link">getLocalizedMessage</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getMessage()" title="class or interface in java.lang" class="external-link">getMessage</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getStackTrace()" title="class or interface in java.lang" class="external-link">getStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#getSuppressed()" title="class or interface in java.lang" class="external-link">getSuppressed</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#initCause(java.lang.Throwable)" title="class or interface in java.lang" class="external-link">initCause</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#printStackTrace()" title="class or interface in java.lang" class="external-link">printStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#printStackTrace(java.io.PrintStream)" title="class or interface in java.lang" class="external-link">printStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#printStackTrace(java.io.PrintWriter)" title="class or interface in java.lang" class="external-link">printStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#setStackTrace(java.lang.StackTraceElement%5B%5D)" title="class or interface in java.lang" class="external-link">setStackTrace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html#toString()" title="class or interface in java.lang" class="external-link">toString</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="<init>(java.lang.String)">
+<h3>FileExtensionException</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="element-name">FileExtensionException</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> message)</span></div>
+<div class="block">Constructs an exception with a detail message</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>message</code> - the detail message to display</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html
new file mode 100644
index 0000000000000000000000000000000000000000..e5febfbe723c30c001a544be40db9ea70053a872
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html
@@ -0,0 +1,98 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>edu.ntnu.idatt2001.carljgu.filehandling</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.filehandling">
+<meta name="generator" content="javadoc/PackageWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-declaration-page">
+<script type="text/javascript">var evenRowColor = "even-row-color";
+var oddRowColor = "odd-row-color";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../module-summary.html">Module</a></li>
+<li class="nav-bar-cell1-rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#package">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div>
+<ul class="sub-nav-list">
+<li>Package: </li>
+<li>Description | </li>
+<li>Related Packages | </li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<div class="sub-title"><span class="module-label-in-package">Module</span> <a href="../../../../../module-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
+<h1 title="Package edu.ntnu.idatt2001.carljgu.filehandling" class="title">Package edu.ntnu.idatt2001.carljgu.filehandling</h1>
+</div>
+<hr>
+<div class="package-signature">package <span class="element-name">edu.ntnu.idatt2001.carljgu.filehandling</span></div>
+<section class="summary">
+<ul class="summary-list">
+<li>
+<div id="class-summary">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="class-summary-tab0" role="tab" aria-selected="true" aria-controls="class-summary.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="class-summary-tab2" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab2', 2)" class="table-tab">Classes</button><button id="class-summary-tab5" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab5', 2)" class="table-tab">Exceptions</button></div>
+<div id="class-summary.tabpanel" role="tabpanel">
+<div class="summary-table two-column-summary" aria-labelledby="class-summary-tab0">
+<div class="table-header col-first">Class</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="block">Handles writing, reading and importing
+ armies to and from a file.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab5"><a href="FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab5">
+<div class="block">Thrown if an extension of a file is invalid
+ The exception thrown needs to have a message</div>
+</div>
+</div>
+</div>
+</div>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html
new file mode 100644
index 0000000000000000000000000000000000000000..3a18bfd0643f124957556714cb084bcbd8dc7cea
--- /dev/null
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html
@@ -0,0 +1,89 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
+<title>edu.ntnu.idatt2001.carljgu.filehandling Class Hierarchy</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2022-05-19">
+<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.filehandling">
+<meta name="generator" content="javadoc/PackageTreeWriter">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.5.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-tree-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top">
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../module-summary.html">Module</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="nav-bar-cell1-rev">Tree</li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-files/index-1.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#tree">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div class="nav-list-search"><label for="search-input">SEARCH:</label>
+<input type="text" id="search-input" value="search" disabled="disabled">
+<input type="reset" id="reset-button" value="reset" disabled="disabled">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package edu.ntnu.idatt2001.carljgu.filehandling</h1>
+<span class="package-hierarchy-label">Package Hierarchies:</span>
+<ul class="horizontal">
+<li><a href="../../../../../../overview-tree.html">All Packages</a></li>
+</ul>
+</div>
+<section class="hierarchy">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.filehandling.<a href="ArmyFileHandler.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></li>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" class="type-name-link external-link" title="class or interface in java.lang">Throwable</a> (implements java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a>)
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" class="type-name-link external-link" title="class or interface in java.lang">Exception</a>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" class="type-name-link external-link" title="class or interface in java.lang">RuntimeException</a>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" class="type-name-link external-link" title="class or interface in java.lang">IllegalArgumentException</a>
+<ul>
+<li class="circle">edu.ntnu.idatt2001.carljgu.filehandling.<a href="FileExtensionException.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Army.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Army.html
index 959c0b90e76f065ce3c63f565a99e783222ab92b..d2754296dff5b11fcceba9a817193766714f0ee6 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Army.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Army.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class Army" class="title">Class Army</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.army.Army</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.Army</div>
</div>
<section class="class-description" id="class-description">
<hr>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html
index dafdbe8ccb545491029ebc492a2174cdfdb2f111..a59964bfdf0f50d5afc0666a4cf31a75c4add0db 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class Unit" class="title">Class Unit</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.units.Unit</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.Unit</div>
</div>
<section class="class-description" id="class-description">
<dl class="notes">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html
index d43bfaa9fb48c945ec6d952aa9874af33f341298..e3e5e230542c78dcb1712085b8d79e1e902aceec 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class UnitFactory" class="title">Class UnitFactory</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.units.UnitFactory</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory</div>
</div>
<section class="class-description" id="class-description">
<hr>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html
index c4ceb786fd1649fb4a0e8719316ee5a7be1fba2d..4f6fe6126417d5595f8f73a631fa0bda37205c92 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html
@@ -75,7 +75,7 @@ loadScripts(document, 'script');</script>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">java.lang.Enum</a><<a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a>>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.units.UnitType</div>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.UnitType</div>
</div>
</div>
<section class="class-description" id="class-description">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html
index 231ab24e9510f5fb4dbbf0a591fee19afb31540a..b0858f6916e929a7201fb2d071447890b38c16e7 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html
@@ -74,8 +74,8 @@ loadScripts(document, 'script');</script>
<h1 title="Class CavalryUnit" class="title">Class CavalryUnit</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">edu.ntnu.idatt2001.carljgu.units.Unit</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.units.specialized.CavalryUnit</div>
+<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">edu.ntnu.idatt2001.carljgu.battle.units.Unit</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit</div>
</div>
</div>
<section class="class-description" id="class-description">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html
index ede672d3ea7428edd24e13190f95c18f41290d31..d7f95b0579dbbf561311762743222c037f9d15c2 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html
@@ -70,9 +70,9 @@ loadScripts(document, 'script');</script>
<h1 title="Class CommanderUnit" class="title">Class CommanderUnit</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">edu.ntnu.idatt2001.carljgu.units.Unit</a>
-<div class="inheritance"><a href="CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">edu.ntnu.idatt2001.carljgu.units.specialized.CavalryUnit</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.units.specialized.CommanderUnit</div>
+<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">edu.ntnu.idatt2001.carljgu.battle.units.Unit</a>
+<div class="inheritance"><a href="CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.specialized.CommanderUnit</div>
</div>
</div>
</div>
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html
index 407bb13c1eebc1add5f5156a87c3b3b96c9eb148..29dc07fadde8c8dfaa5309b817ef8dc077c1687c 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html
@@ -74,8 +74,8 @@ loadScripts(document, 'script');</script>
<h1 title="Class InfantryUnit" class="title">Class InfantryUnit</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">edu.ntnu.idatt2001.carljgu.units.Unit</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit</div>
+<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">edu.ntnu.idatt2001.carljgu.battle.units.Unit</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit</div>
</div>
</div>
<section class="class-description" id="class-description">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html
index 166553ec22cb172399e42a266f24cdef61cf57fd..f21127ce9b707ddfdd64679443637f1d37f03f42 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html
@@ -74,8 +74,8 @@ loadScripts(document, 'script');</script>
<h1 title="Class RangedUnit" class="title">Class RangedUnit</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">edu.ntnu.idatt2001.carljgu.units.Unit</a>
-<div class="inheritance">edu.ntnu.idatt2001.carljgu.units.specialized.RangedUnit</div>
+<div class="inheritance"><a href="../Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">edu.ntnu.idatt2001.carljgu.battle.units.Unit</a>
+<div class="inheritance">edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit</div>
</div>
</div>
<section class="class-description" id="class-description">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
index 1462417310af1043d65302ed07e3ce8131ecf76e..9c20b304d356eea416a6fc3fcbd40e013717d544 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>edu.ntnu.idatt2001.carljgu.client</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -73,18 +73,8 @@ loadScripts(document, 'script');</script>
<div class="summary-table two-column-summary">
<div class="table-header col-first">Package</div>
<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="edu/ntnu/idatt2001/carljgu/package-summary.html">edu.ntnu.idatt2001.carljgu</a></div>
+<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="edu/ntnu/idatt2001/carljgu/client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>
-<div class="col-first odd-row-color package-summary-table package-summary-table-tab1"><a href="edu/ntnu/idatt2001/carljgu/army/package-summary.html">edu.ntnu.idatt2001.carljgu.army</a></div>
-<div class="col-last odd-row-color package-summary-table package-summary-table-tab1"> </div>
-<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="edu/ntnu/idatt2001/carljgu/battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a></div>
-<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>
-<div class="col-first odd-row-color package-summary-table package-summary-table-tab1"><a href="edu/ntnu/idatt2001/carljgu/client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></div>
-<div class="col-last odd-row-color package-summary-table package-summary-table-tab1"> </div>
-<div class="col-first even-row-color package-summary-table package-summary-table-tab1"><a href="edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a></div>
-<div class="col-last even-row-color package-summary-table package-summary-table-tab1"> </div>
-<div class="col-first odd-row-color package-summary-table package-summary-table-tab1"><a href="edu/ntnu/idatt2001/carljgu/units/package-summary.html">edu.ntnu.idatt2001.carljgu.units</a></div>
-<div class="col-last odd-row-color package-summary-table package-summary-table-tab1"> </div>
</div>
</div>
</section>
diff --git a/javadoc/element-list b/javadoc/element-list
index 7d5e4862e24f630782807119d0f4f22a871cd599..686182c233429d11909be0071fc4d0f015b819a0 100644
--- a/javadoc/element-list
+++ b/javadoc/element-list
@@ -1,8 +1,8 @@
module:edu.ntnu.idatt2001.carljgu.client
-edu.ntnu.idatt2001.carljgu
-edu.ntnu.idatt2001.carljgu.army
edu.ntnu.idatt2001.carljgu.battle
+edu.ntnu.idatt2001.carljgu.battle.units
+edu.ntnu.idatt2001.carljgu.battle.units.specialized
edu.ntnu.idatt2001.carljgu.client
+edu.ntnu.idatt2001.carljgu.client.controllers
edu.ntnu.idatt2001.carljgu.client.dialogs
-edu.ntnu.idatt2001.carljgu.units
-edu.ntnu.idatt2001.carljgu.units.specialized
+edu.ntnu.idatt2001.carljgu.filehandling
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index 6f3ab1fefcf78167277ef035875d5539a337f46b..fe443be0cffe8243312f98484d5accfdbd542ae0 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>API Help</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-1.html b/javadoc/index-files/index-1.html
index 01288e8915cb10ede4a0d082f8dd59d37eb93f83..dcda933e560d0c1f3870d529683babbbb8e6ea21 100644
--- a/javadoc/index-files/index-1.html
+++ b/javadoc/index-files/index-1.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>A-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,28 +54,28 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:A">A</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#addEventListenersToFieldsAndLists()" class="member-name-link">addEventListenersToFieldsAndLists()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#addEventListenersToFieldsAndLists()" class="member-name-link">addEventListenersToFieldsAndLists()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Adds event listeners to some fields to set
buttons to disabled if input is invalid.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#addUnit(edu.ntnu.idatt2001.carljgu.units.Unit)" class="member-name-link">addUnit(Unit)</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#addUnit(edu.ntnu.idatt2001.carljgu.battle.units.Unit)" class="member-name-link">addUnit(Unit)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Add unit if it does not exist from before.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#addUnits()" class="member-name-link">addUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#addUnits()" class="member-name-link">addUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Called for adding new units.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#addUnits(java.util.List)" class="member-name-link">addUnits(List<Unit>)</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#addUnits(java.util.List)" class="member-name-link">addUnits(List<Unit>)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Add units.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#addUnitsButton" class="member-name-link">addUnitsButton</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#addUnitsButton" class="member-name-link">addUnitsButton</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#allUnitsComboBox" class="member-name-link">allUnitsComboBox</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#allUnitsComboBox" class="member-name-link">allUnitsComboBox</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#amountOfUnitsSpinner" class="member-name-link">amountOfUnitsSpinner</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#amountOfUnitsSpinner" class="member-name-link">amountOfUnitsSpinner</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">App</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></dt>
<dd>
@@ -84,37 +84,37 @@ loadScripts(document, 'script');</script>
</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#%3Cinit%3E()" class="member-name-link">App()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html" title="class in edu.ntnu.idatt2001.carljgu.client">App</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-summary.html">edu.ntnu.idatt2001.carljgu.army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a></dt>
<dd>
<div class="block">public class Army.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#%3Cinit%3E(java.lang.String)" class="member-name-link">Army(String)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#%3Cinit%3E(java.lang.String)" class="member-name-link">Army(String)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Instantiates a new Army.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#%3Cinit%3E(java.lang.String,java.util.List)" class="member-name-link">Army(String, List<Unit>)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#%3Cinit%3E(java.lang.String,java.util.List)" class="member-name-link">Army(String, List<Unit>)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Instantiates a new Army.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.army">ArmyFileHandler</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-summary.html">edu.ntnu.idatt2001.carljgu.army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html">edu.ntnu.idatt2001.carljgu.filehandling</a></dt>
<dd>
<div class="block">Handles writing, reading and importing
armies to and from a file.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html#%3Cinit%3E()" class="member-name-link">ArmyFileHandler()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.army">ArmyFileHandler</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html#%3Cinit%3E()" class="member-name-link">ArmyFileHandler()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.filehandling.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></dt>
<dd>
<div class="block">Constructor which initiates the readLinesSkipped arraylist
Sets the delimiter to a comma for comma seperated value.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#armyToString" class="member-name-link">armyToString</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#armyToString" class="member-name-link">armyToString</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#armyUnitsListView" class="member-name-link">armyUnitsListView</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#armyUnitsListView" class="member-name-link">armyUnitsListView</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#attack(edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">attack(Unit, Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">attack(Unit, Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Method for dealing damage to another unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army)" class="member-name-link">attackStringRepresentation(int, Unit, Unit, Army, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">attackStringRepresentation(int, Unit, Unit, Army, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></dt>
<dd>
<div class="block">Information displayed is the
name of the attacking and defending army,
diff --git a/javadoc/index-files/index-10.html b/javadoc/index-files/index-10.html
index 7fe61558bd5da8ee137c5176079df110bfbe8f5f..7e24e9951a7df3cb5406c4224e4b0a415b24834c 100644
--- a/javadoc/index-files/index-10.html
+++ b/javadoc/index-files/index-10.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>M-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-11.html b/javadoc/index-files/index-11.html
index d08ae594f2ffd0ada4bd4f6b9a899dba3d398b9c..dca890d736607cae24d44916e2a43576b8b6b549 100644
--- a/javadoc/index-files/index-11.html
+++ b/javadoc/index-files/index-11.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>P-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/index-files/index-12.html b/javadoc/index-files/index-12.html
index eb1e30591fe9303498986fc821bb39b8b1161aba..bbfc24929841e9b062dac03353b3e78ea0f2b7ba 100644
--- a/javadoc/index-files/index-12.html
+++ b/javadoc/index-files/index-12.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>R-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,33 +54,33 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:R">R</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html#RANGED_UNIT" class="member-name-link">RANGED_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#RANGED_UNIT" class="member-name-link">RANGED_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">RangedUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.units.specialized</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></dt>
<dd>
<div class="block">Class RangedUnit that inherits from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html#%3Cinit%3E(java.lang.String,int)" class="member-name-link">RangedUnit(String, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">RangedUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#%3Cinit%3E(java.lang.String,int)" class="member-name-link">RangedUnit(String, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></dt>
<dd>
<div class="block">Instantiates a new Ranged unit with
a simplified constructor.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">RangedUnit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">RangedUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">RangedUnit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></dt>
<dd>
<div class="block">Instantiates a new Ranged unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html#readArmyFromFile(java.lang.String)" class="member-name-link">readArmyFromFile(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.army">ArmyFileHandler</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html#readArmyFromFile(java.lang.String)" class="member-name-link">readArmyFromFile(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.filehandling.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></dt>
<dd>
<div class="block">Finds a specified csv file
and converts it to an army if it can.</div>
</dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#recurringDialogMessage" class="member-name-link">recurringDialogMessage</a> - Static variable in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#remove(edu.ntnu.idatt2001.carljgu.units.Unit)" class="member-name-link">remove(Unit)</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#remove(edu.ntnu.idatt2001.carljgu.battle.units.Unit)" class="member-name-link">remove(Unit)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Remove a specified unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#resetArmies()" class="member-name-link">resetArmies()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#resetArmies()" class="member-name-link">resetArmies()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Run when clicking on reset armies.</div>
</dd>
@@ -89,7 +89,7 @@ loadScripts(document, 'script');</script>
<div class="block">Method called from Main when the program is run
Calls on launch in Application</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#runSimulation()" class="member-name-link">runSimulation()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#runSimulation()" class="member-name-link">runSimulation()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Run when clicking on the button reset and run.</div>
</dd>
diff --git a/javadoc/index-files/index-13.html b/javadoc/index-files/index-13.html
index 7866bc5f048b020788b2b996513ca02a5ff5a87f..b31855d00ea3c6297703b5fc99dab50ecc2ee852 100644
--- a/javadoc/index-files/index-13.html
+++ b/javadoc/index-files/index-13.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>S-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,7 +54,7 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:S">S</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#setArmyToEdit(edu.ntnu.idatt2001.carljgu.army.Army,int)" class="member-name-link">setArmyToEdit(Army, int)</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#setArmyToEdit(edu.ntnu.idatt2001.carljgu.battle.Army,int)" class="member-name-link">setArmyToEdit(Army, int)</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Sets army to edit.</div>
</dd>
@@ -62,7 +62,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Add header to the dialog box builder configuration.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#setHealth(int)" class="member-name-link">setHealth(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#setHealth(int)" class="member-name-link">setHealth(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Sets health.</div>
</dd>
@@ -78,11 +78,11 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Set message to the dialog box builder configuration.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#setName(java.lang.String)" class="member-name-link">setName(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#setName(java.lang.String)" class="member-name-link">setName(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Sets the army's name</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.army.Army)" class="member-name-link">setOriginalArmy(int, Army)</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setOriginalArmy(int, Army)</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Inserts an army into the originalArmies table
Useful for sending armies across controllers.</div>
@@ -102,7 +102,7 @@ loadScripts(document, 'script');</script>
Additionally, it had high unnecessary coupling with Army and Unit. 06.05.2022</div>
</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html#%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">SimulationAttack(Army, Unit, Army, Unit, Terrain)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html#%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">SimulationAttack(Army, Unit, Army, Unit, Terrain)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></dt>
<dd>
<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
<div class="block">The constructor for a simulation attack.</div>
@@ -111,7 +111,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Overridden from Application.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#strengthAndUnitRepresentation()" class="member-name-link">strengthAndUnitRepresentation()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#strengthAndUnitRepresentation()" class="member-name-link">strengthAndUnitRepresentation()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Another method for return a representation
of the army.</div>
diff --git a/javadoc/index-files/index-14.html b/javadoc/index-files/index-14.html
index 85b719bcf8a4f622c723ba08d36cbf440ecbe3c3..2ed2a7bbd2977de847b0bb85025e705a74efa0a8 100644
--- a/javadoc/index-files/index-14.html
+++ b/javadoc/index-files/index-14.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>T-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -59,7 +59,7 @@ loadScripts(document, 'script');</script>
<div class="block">An enum that represents the different terrains
that the battles can occur on.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#toString()" class="member-name-link">toString()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#toString()" class="member-name-link">toString()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Overrides the toString() method from Object.</div>
</dd>
@@ -74,7 +74,7 @@ loadScripts(document, 'script');</script>
and returns an output used in the
GUI.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#toString()" class="member-name-link">toString()</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#toString()" class="member-name-link">toString()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Overrides toString() method from Object.</div>
</dd>
diff --git a/javadoc/index-files/index-15.html b/javadoc/index-files/index-15.html
index 03cf038f5526f256d562e0e76d526a5a1a328a4e..f301e55f21b8236adae03af3b6a110244fbc5175 100644
--- a/javadoc/index-files/index-15.html
+++ b/javadoc/index-files/index-15.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>U-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,36 +54,36 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:U">U</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html">edu.ntnu.idatt2001.carljgu.units</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></dt>
<dd>
<div class="block">The abstract class Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">Unit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">Unit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Checks validity of name and health.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units">UnitFactory</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html">edu.ntnu.idatt2001.carljgu.units</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></dt>
<dd>
<div class="block">A class to simply and elegantly create units.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html#%3Cinit%3E()" class="member-name-link">UnitFactory()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.units">UnitFactory</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html#%3Cinit%3E()" class="member-name-link">UnitFactory()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#unitsHealthSpinner" class="member-name-link">unitsHealthSpinner</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#unitsHealthSpinner" class="member-name-link">unitsHealthSpinner</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#unitsNameField" class="member-name-link">unitsNameField</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#unitsNameField" class="member-name-link">unitsNameField</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#unitsTypeComboBox" class="member-name-link">unitsTypeComboBox</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#unitsTypeComboBox" class="member-name-link">unitsTypeComboBox</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" class="type-name-link" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a> - Enum Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html">edu.ntnu.idatt2001.carljgu.units</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" class="type-name-link" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a> - Enum Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></dt>
<dd>
<div class="block">An enum that represents the different unit types
that an army can contain.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#updateAllFields()" class="member-name-link">updateAllFields()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#updateAllFields()" class="member-name-link">updateAllFields()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Update all fields and labels with updated information.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Update army and go back.</div>
</dd>
diff --git a/javadoc/index-files/index-16.html b/javadoc/index-files/index-16.html
index c012167a34fb536e2edf3499dbbc6de5936591f1..473af093b9b83954baffe06d4ae8cea62e0a1a25 100644
--- a/javadoc/index-files/index-16.html
+++ b/javadoc/index-files/index-16.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>V-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -58,7 +58,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Returns the enum constant of this class with the specified name.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html#valueOf(java.lang.String)" class="member-name-link">valueOf(String)</a> - Static method in enum class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#valueOf(java.lang.String)" class="member-name-link">valueOf(String)</a> - Static method in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd>
<div class="block">Returns the enum constant of this class with the specified name.</div>
</dd>
@@ -67,7 +67,7 @@ loadScripts(document, 'script');</script>
<div class="block">Returns an array containing the constants of this enum class, in
the order they are declared.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html#values()" class="member-name-link">values()</a> - Static method in enum class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#values()" class="member-name-link">values()</a> - Static method in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd>
<div class="block">Returns an array containing the constants of this enum class, in
the order they are declared.</div>
diff --git a/javadoc/index-files/index-17.html b/javadoc/index-files/index-17.html
index 4c7d71b97be44b945c8a5f271f7b2e08a0569afb..3c5ce3f1203f0089d13657ac29e4459382ee0d51 100644
--- a/javadoc/index-files/index-17.html
+++ b/javadoc/index-files/index-17.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>W-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,11 +54,11 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:W">W</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#writeToCSV()" class="member-name-link">writeToCSV()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#writeToCSV()" class="member-name-link">writeToCSV()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Writes the changed army to a csv file.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html#writeToFile(edu.ntnu.idatt2001.carljgu.army.Army,java.lang.String)" class="member-name-link">writeToFile(Army, String)</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.army">ArmyFileHandler</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html#writeToFile(edu.ntnu.idatt2001.carljgu.battle.Army,java.lang.String)" class="member-name-link">writeToFile(Army, String)</a> - Method in class edu.ntnu.idatt2001.carljgu.filehandling.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></dt>
<dd>
<div class="block">Creates a file to write on or writes to an existing file.</div>
</dd>
diff --git a/javadoc/index-files/index-2.html b/javadoc/index-files/index-2.html
index 61ffb994cb4db7f0bc5601a5c5df745e57067c32..22cfdc94bd57cf384ec19c8e63c9243cf27cfdcd 100644
--- a/javadoc/index-files/index-2.html
+++ b/javadoc/index-files/index-2.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>B-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -58,16 +58,16 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Class Battle that simulates a battle between two armies.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">Battle(Army, Army, Terrain)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">Battle(Army, Army, Terrain)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></dt>
<dd>
<div class="block">Instantiates a new Battle.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a></dt>
<dd>
<div class="block">A controller class which
handles events in the fxml file battle-armies.fxml.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#%3Cinit%3E()" class="member-name-link">BattleController()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#%3Cinit%3E()" class="member-name-link">BattleController()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#build()" class="member-name-link">build()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></dt>
<dd>
diff --git a/javadoc/index-files/index-3.html b/javadoc/index-files/index-3.html
index 927a13d707170272fb7ada5d7bf91a4540b31527..c4a4869124157241d7c452073fd890d029425513 100644
--- a/javadoc/index-files/index-3.html
+++ b/javadoc/index-files/index-3.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>C-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,57 +54,57 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:C">C</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#cancelAllChanges()" class="member-name-link">cancelAllChanges()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#cancelAllChanges()" class="member-name-link">cancelAllChanges()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Cancel all changes and changes scene to the main page.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html#CAVALRY_UNIT" class="member-name-link">CAVALRY_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#CAVALRY_UNIT" class="member-name-link">CAVALRY_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CavalryUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.units.specialized</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></dt>
<dd>
<div class="block">Class CavalryUnit that inherits from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html#%3Cinit%3E(java.lang.String,int)" class="member-name-link">CavalryUnit(String, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CavalryUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#%3Cinit%3E(java.lang.String,int)" class="member-name-link">CavalryUnit(String, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></dt>
<dd>
<div class="block">Instantiates a new Cavalry unit with
a simplified constructor.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">CavalryUnit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CavalryUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">CavalryUnit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></dt>
<dd>
<div class="block">Instantiates a new Cavalry unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#changelogListView" class="member-name-link">changelogListView</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#changelogListView" class="member-name-link">changelogListView</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#changeScene(java.lang.String)" class="member-name-link">changeScene(String)</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html" title="class in edu.ntnu.idatt2001.carljgu.client">App</a></dt>
<dd>
<div class="block">Changes the scene of the stage.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html#COMMANDER_UNIT" class="member-name-link">COMMANDER_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#COMMANDER_UNIT" class="member-name-link">COMMANDER_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CommanderUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.units.specialized</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></dt>
<dd>
<div class="block">Class CommanderUnit that inherits from CavalryUnit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html#%3Cinit%3E(java.lang.String,int)" class="member-name-link">CommanderUnit(String, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CommanderUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html#%3Cinit%3E(java.lang.String,int)" class="member-name-link">CommanderUnit(String, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></dt>
<dd>
<div class="block">Instantiates a new CommanderUnit unit with
a simplified constructor.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">CommanderUnit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CommanderUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">CommanderUnit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></dt>
<dd>
<div class="block">Instantiates a new CommanderUnit unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#createArmy()" class="member-name-link">createArmy()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#createArmy()" class="member-name-link">createArmy()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Creates a dialog box with custom buttons
where the user can change which side to
create an army to.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html#createListOfUnits(int,edu.ntnu.idatt2001.carljgu.units.UnitType,java.lang.String,int)" class="member-name-link">createListOfUnits(int, UnitType, String, int)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.units">UnitFactory</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html#createListOfUnits(int,edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)" class="member-name-link">createListOfUnits(int, UnitType, String, int)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></dt>
<dd>
<div class="block">Returns a list of units.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html#createUnit(edu.ntnu.idatt2001.carljgu.units.UnitType,java.lang.String,int)" class="member-name-link">createUnit(UnitType, String, int)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.units">UnitFactory</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html#createUnit(edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)" class="member-name-link">createUnit(UnitType, String, int)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></dt>
<dd>
<div class="block">Creates a unit between
InfantryUnit, RangedUnit,
diff --git a/javadoc/index-files/index-4.html b/javadoc/index-files/index-4.html
index 8946b893e61ac1a33cefddd7b707f9f25a7967da..f223b66d1bc13e298dbf0de987aa6ebf311d35a8 100644
--- a/javadoc/index-files/index-4.html
+++ b/javadoc/index-files/index-4.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>D-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,16 +54,16 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:D">D</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html#deepCopyBasicUnits(java.util.List)" class="member-name-link">deepCopyBasicUnits(List<Unit>)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.units">UnitFactory</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html#deepCopyBasicUnits(java.util.List)" class="member-name-link">deepCopyBasicUnits(List<Unit>)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></dt>
<dd>
<div class="block">Deep copies units, but ignores overridden
attack and armor points.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#deleteUnit()" class="member-name-link">deleteUnit()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#deleteUnit()" class="member-name-link">deleteUnit()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Called for deleting a unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#deleteUnitsButton" class="member-name-link">deleteUnitsButton</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#deleteUnitsButton" class="member-name-link">deleteUnitsButton</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBox</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a></dt>
<dd>
@@ -85,12 +85,12 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Instantiates a new dialog box builder.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#displayArmy(int,edu.ntnu.idatt2001.carljgu.army.Army)" class="member-name-link">displayArmy(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#displayArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">displayArmy(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Updates the information about an army
in the chosen elements.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#displaySuccessfulPopupMessage(java.lang.String)" class="member-name-link">displaySuccessfulPopupMessage(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#displaySuccessfulPopupMessage(java.lang.String)" class="member-name-link">displaySuccessfulPopupMessage(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Display successful popup message.</div>
</dd>
diff --git a/javadoc/index-files/index-5.html b/javadoc/index-files/index-5.html
index d44be9140221150c8c3542e533a58e7814266405..2cae25788c292e9339c336045971c8842aecfe91 100644
--- a/javadoc/index-files/index-5.html
+++ b/javadoc/index-files/index-5.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>E-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,52 +54,52 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:E">E</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#editArmy(int)" class="member-name-link">editArmy(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#editArmy(int)" class="member-name-link">editArmy(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Goes to the edit page of an imported army.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a></dt>
<dd>
<div class="block">A controller class which
handles events in the fxml file edit-army.fxml.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#%3Cinit%3E()" class="member-name-link">EditArmyController()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#%3Cinit%3E()" class="member-name-link">EditArmyController()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#editArmyName()" class="member-name-link">editArmyName()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#editArmyName()" class="member-name-link">editArmyName()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Called for updating the army's name.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#editArmyNameButton" class="member-name-link">editArmyNameButton</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#editArmyNameButton" class="member-name-link">editArmyNameButton</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#editArmyOne()" class="member-name-link">editArmyOne()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#editArmyOne()" class="member-name-link">editArmyOne()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Edits the left army.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#editArmyTitle" class="member-name-link">editArmyTitle</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#editArmyTitle" class="member-name-link">editArmyTitle</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#editArmyTwo()" class="member-name-link">editArmyTwo()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#editArmyTwo()" class="member-name-link">editArmyTwo()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Edits the right army.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#editNameField" class="member-name-link">editNameField</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#editNameField" class="member-name-link">editNameField</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-summary.html">edu.ntnu.idatt2001.carljgu</a> - package edu.ntnu.idatt2001.carljgu</dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a> - package edu.ntnu.idatt2001.carljgu.battle</dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-summary.html">edu.ntnu.idatt2001.carljgu.army</a> - package edu.ntnu.idatt2001.carljgu.army</dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a> - package edu.ntnu.idatt2001.carljgu.battle.units</dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a> - package edu.ntnu.idatt2001.carljgu.battle</dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a> - package edu.ntnu.idatt2001.carljgu.battle.units.specialized</dt>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/module-summary.html">edu.ntnu.idatt2001.carljgu.client</a> - module edu.ntnu.idatt2001.carljgu.client</dt>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html">edu.ntnu.idatt2001.carljgu.client</a> - package edu.ntnu.idatt2001.carljgu.client</dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a> - package edu.ntnu.idatt2001.carljgu.client.dialogs</dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a> - package edu.ntnu.idatt2001.carljgu.client.controllers</dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html">edu.ntnu.idatt2001.carljgu.units</a> - package edu.ntnu.idatt2001.carljgu.units</dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a> - package edu.ntnu.idatt2001.carljgu.client.dialogs</dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.units.specialized</a> - package edu.ntnu.idatt2001.carljgu.units.specialized</dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html">edu.ntnu.idatt2001.carljgu.filehandling</a> - package edu.ntnu.idatt2001.carljgu.filehandling</dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#equals(java.lang.Object)" class="member-name-link">equals(Object)</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#equals(java.lang.Object)" class="member-name-link">equals(Object)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Checks if two armies are equal based on name and list of units.</div>
</dd>
diff --git a/javadoc/index-files/index-6.html b/javadoc/index-files/index-6.html
index 2ea3948cfe0cc6a316ed18a8d5957ad71ff90055..a50bcc5ece9f8f768c98ed8bdb108c45713aa4bd 100644
--- a/javadoc/index-files/index-6.html
+++ b/javadoc/index-files/index-6.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>F-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,12 +54,12 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:F">F</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu">FileExtensionException</a> - Exception in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-summary.html">edu.ntnu.idatt2001.carljgu</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a> - Exception in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html">edu.ntnu.idatt2001.carljgu.filehandling</a></dt>
<dd>
<div class="block">Thrown if an extension of a file is invalid
The exception thrown needs to have a message</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html#%3Cinit%3E(java.lang.String)" class="member-name-link">FileExtensionException(String)</a> - Constructor for exception edu.ntnu.idatt2001.carljgu.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu">FileExtensionException</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html#%3Cinit%3E(java.lang.String)" class="member-name-link">FileExtensionException(String)</a> - Constructor for exception edu.ntnu.idatt2001.carljgu.filehandling.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a></dt>
<dd>
<div class="block">Constructs an exception with a detail message</div>
</dd>
diff --git a/javadoc/index-files/index-7.html b/javadoc/index-files/index-7.html
index c14b9ab3aa19b372fec8bd8cd4e7dbc07dc66e50..60f6dfa7c1f145f0483e2c0ed441a42d082de7c4 100644
--- a/javadoc/index-files/index-7.html
+++ b/javadoc/index-files/index-7.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>G-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -58,31 +58,31 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets the alert type for the dialog box.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getAllUnits()" class="member-name-link">getAllUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getAllUnits()" class="member-name-link">getAllUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Gets all units.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#getArmor()" class="member-name-link">getArmor()</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#getArmor()" class="member-name-link">getArmor()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Gets armor.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#getAttack()" class="member-name-link">getAttack()</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#getAttack()" class="member-name-link">getAttack()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Gets attack.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CavalryUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></dt>
<dd>
<div class="block">Overrides the abstract method getAttackBonus from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">InfantryUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></dt>
<dd>
<div class="block">Overrides the abstract method getAttackBonus from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">RangedUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></dt>
<dd>
<div class="block">Overrides the abstract method getAttackBonus from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getAttackBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Gets attack bonus.</div>
</dd>
@@ -103,26 +103,26 @@ loadScripts(document, 'script');</script>
to easily hold the information
about each attack.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getCalculatedStrength()" class="member-name-link">getCalculatedStrength()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getCalculatedStrength()" class="member-name-link">getCalculatedStrength()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Calculates the strength of an army
by combining health, attack and armor
of every unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getCavalryUnits()" class="member-name-link">getCavalryUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getCavalryUnits()" class="member-name-link">getCavalryUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Returns a list of cavalry units
using stream and filter.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#getClassName()" class="member-name-link">getClassName()</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#getClassName()" class="member-name-link">getClassName()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Gets the name of the class.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html#getClassName()" class="member-name-link">getClassName()</a> - Method in enum class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#getClassName()" class="member-name-link">getClassName()</a> - Method in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd>
<div class="block">Gets the class name from the enum</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getCommanderUnits()" class="member-name-link">getCommanderUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getCommanderUnits()" class="member-name-link">getCommanderUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Returns a list of commander units
using stream and filter.</div>
@@ -144,7 +144,7 @@ loadScripts(document, 'script');</script>
<div class="block">Gets the defending army with the
defending unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html#getFilePath(java.lang.String)" class="member-name-link">getFilePath(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.army">ArmyFileHandler</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html#getFilePath(java.lang.String)" class="member-name-link">getFilePath(String)</a> - Method in class edu.ntnu.idatt2001.carljgu.filehandling.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></dt>
<dd>
<div class="block">Uses the system default file explorer to get
a file path of the user's choice.</div>
@@ -153,7 +153,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets the header for the dialog box.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#getHealth()" class="member-name-link">getHealth()</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#getHealth()" class="member-name-link">getHealth()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Gets health.</div>
</dd>
@@ -161,7 +161,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets the image for the dialog box.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getInfantryUnits()" class="member-name-link">getInfantryUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getInfantryUnits()" class="member-name-link">getInfantryUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Returns a list of infantry units
using stream and filter.</div>
@@ -174,19 +174,19 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets the message for the dialog box.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getName()" class="member-name-link">getName()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getName()" class="member-name-link">getName()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Gets the army's name.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#getName()" class="member-name-link">getName()</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#getName()" class="member-name-link">getName()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Gets name.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getRandom()" class="member-name-link">getRandom()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getRandom()" class="member-name-link">getRandom()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Gets a random unit from the list.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getRangedUnits()" class="member-name-link">getRangedUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#getRangedUnits()" class="member-name-link">getRangedUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Returns a list of ranged units
using stream and filter.</div>
@@ -195,24 +195,24 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets the name from the enum</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html#getReadLinesSkipped()" class="member-name-link">getReadLinesSkipped()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.army">ArmyFileHandler</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html#getReadLinesSkipped()" class="member-name-link">getReadLinesSkipped()</a> - Method in class edu.ntnu.idatt2001.carljgu.filehandling.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></dt>
<dd>
<div class="block">Gets the amount of units
that were skipped when reading from file.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CavalryUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a></dt>
<dd>
<div class="block">Overrides the abstract method getResistBonus from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">InfantryUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></dt>
<dd>
<div class="block">Overrides the abstract method getResistBonus from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">RangedUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></dt>
<dd>
<div class="block">Overrides the abstract method getAttackBonus from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)" class="member-name-link">getResistBonus(Terrain)</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a></dt>
<dd>
<div class="block">Gets resist bonus.</div>
</dd>
@@ -239,7 +239,7 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Gets the title of the dialog box.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html#getUnitType(java.lang.String)" class="member-name-link">getUnitType(String)</a> - Static method in enum class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#getUnitType(java.lang.String)" class="member-name-link">getUnitType(String)</a> - Static method in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd>
<div class="block">Gets a UnitType enum from a string.</div>
</dd>
diff --git a/javadoc/index-files/index-8.html b/javadoc/index-files/index-8.html
index 2151498027a125f8e094eda0526e3202703a702a..3bf229ce616b0bb7bc24dab62b513ea4c3970c00 100644
--- a/javadoc/index-files/index-8.html
+++ b/javadoc/index-files/index-8.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>H-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,15 +54,15 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:H">H</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#hashCode()" class="member-name-link">hashCode()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#hashCode()" class="member-name-link">hashCode()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Hashes name and units for the equals method</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#hasUnits()" class="member-name-link">hasUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#hasUnits()" class="member-name-link">hasUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></dt>
<dd>
<div class="block">Checks if the list of units is empty</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#hboxRoot" class="member-name-link">hboxRoot</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#hboxRoot" class="member-name-link">hboxRoot</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#HILLS" class="member-name-link">HILLS</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.battle.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></dt>
<dd> </dd>
diff --git a/javadoc/index-files/index-9.html b/javadoc/index-files/index-9.html
index 20e18668aeb6deb8c9aff26dc313f871386ac1cf..8732bd72e7a48170f434c6b6e13c76e205ea04bb 100644
--- a/javadoc/index-files/index-9.html
+++ b/javadoc/index-files/index-9.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>I-Index</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,34 +54,34 @@ loadScripts(document, 'script');</script>
<a href="index-1.html">A</a> <a href="index-2.html">B</a> <a href="index-3.html">C</a> <a href="index-4.html">D</a> <a href="index-5.html">E</a> <a href="index-6.html">F</a> <a href="index-7.html">G</a> <a href="index-8.html">H</a> <a href="index-9.html">I</a> <a href="index-10.html">M</a> <a href="index-11.html">P</a> <a href="index-12.html">R</a> <a href="index-13.html">S</a> <a href="index-14.html">T</a> <a href="index-15.html">U</a> <a href="index-16.html">V</a> <a href="index-17.html">W</a> <br><a href="../allclasses-index.html">All Classes and Interfaces</a><span class="vertical-separator">|</span><a href="../allpackages-index.html">All Packages</a><span class="vertical-separator">|</span><a href="../constant-values.html">Constant Field Values</a><span class="vertical-separator">|</span><a href="../serialized-form.html">Serialized Form</a>
<h2 class="title" id="I:I">I</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#importArmyOne()" class="member-name-link">importArmyOne()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#importArmyOne()" class="member-name-link">importArmyOne()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Imports an army for the first army.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#importArmyTwo()" class="member-name-link">importArmyTwo()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#importArmyTwo()" class="member-name-link">importArmyTwo()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Imports an army for the second army.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html#INFANTRY_UNIT" class="member-name-link">INFANTRY_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#INFANTRY_UNIT" class="member-name-link">INFANTRY_UNIT</a> - Enum constant in enum class edu.ntnu.idatt2001.carljgu.battle.units.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></dt>
<dd> </dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">InfantryUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.units.specialized</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a> - Class in <a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></dt>
<dd>
<div class="block">Class InfantryUnit that inherits from Unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html#%3Cinit%3E(java.lang.String,int)" class="member-name-link">InfantryUnit(String, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">InfantryUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#%3Cinit%3E(java.lang.String,int)" class="member-name-link">InfantryUnit(String, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></dt>
<dd>
<div class="block">Instantiates a new Infantry unit with
a simplified constructor.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">InfantryUnit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">InfantryUnit</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#%3Cinit%3E(java.lang.String,int,int,int)" class="member-name-link">InfantryUnit(String, int, int, int)</a> - Constructor for class edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></dt>
<dd>
<div class="block">Instantiates a new Infantry unit.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html#initialize(java.net.URL,java.util.ResourceBundle)" class="member-name-link">initialize(URL, ResourceBundle)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#initialize(java.net.URL,java.util.ResourceBundle)" class="member-name-link">initialize(URL, ResourceBundle)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a></dt>
<dd>
<div class="block">Run when the fxml file is first loaded.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#initialize(java.net.URL,java.util.ResourceBundle)" class="member-name-link">initialize(URL, ResourceBundle)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#initialize(java.net.URL,java.util.ResourceBundle)" class="member-name-link">initialize(URL, ResourceBundle)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.controllers.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a></dt>
<dd>
<div class="block">Run when the fxml file is first loaded.</div>
</dd>
diff --git a/javadoc/index.html b/javadoc/index.html
index a08a26ff2cc3df45239b6a2cd65a57e5f3e68a21..224599a9d684dfa27d931921280e05b4d463a484 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>Generated Documentation (Untitled)</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
diff --git a/javadoc/member-search-index.js b/javadoc/member-search-index.js
index 3f1dae9ba66bc4ebc4b278e15d82c08c81e4dea4..6431d5e93a836d46dd5310e8248fe129e6267db9 100644
--- a/javadoc/member-search-index.js
+++ b/javadoc/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addEventListenersToFieldsAndLists()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"addUnit(Unit)","u":"addUnit(edu.ntnu.idatt2001.carljgu.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"addUnits(List<Unit>)","u":"addUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"amountOfUnitsSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"App()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"Army(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"Army(String, List<Unit>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"ArmyFileHandler()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"attack(Unit, Terrain)","u":"attack(edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackStringRepresentation(int, Unit, Unit, Army, Army)","u":"attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"Battle(Army, Army, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"BattleController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"build()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"cancelAllChanges()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"CAVALRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"changelogListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"changeScene(String)","u":"changeScene(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"COMMANDER_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"createArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"createListOfUnits(int, UnitType, String, int)","u":"createListOfUnits(int,edu.ntnu.idatt2001.carljgu.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"createUnit(UnitType, String, int)","u":"createUnit(edu.ntnu.idatt2001.carljgu.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"deleteUnit()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"deleteUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"DialogBox(DialogBoxBuilder)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"DialogBoxBuilder(Alert.AlertType)","u":"%3Cinit%3E(javafx.scene.control.Alert.AlertType)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"displayArmy(int, Army)","u":"displayArmy(int,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"displaySuccessfulPopupMessage(String)","u":"displaySuccessfulPopupMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"EditArmyController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyName()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyNameButton"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyTitle"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editNameField"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"edu.ntnu.idatt2001.carljgu","c":"FileExtensionException","l":"FileExtensionException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getAlertType()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getAllUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getArmor()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getAttack()"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttacker()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttackingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getAttackLog()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getCalculatedStrength()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getCavalryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getCommanderUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDamageDealt()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefender()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefendingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"getFilePath(String)","u":"getFilePath(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getHeader()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getHealth()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getImage()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getInfantryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getListMessages()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getMessage()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getRandom()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getRangedUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getReadableName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"getReadLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"getStage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getTerrain(String)","u":"getTerrain(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getTitle()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"getUnitType(String)","u":"getUnitType(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getWinner()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"hashCode()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"hasUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"hboxRoot"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"importArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"importArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"INFANTRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"Main()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"RANGED_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"recurringDialogMessage"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"remove(Unit)","u":"remove(edu.ntnu.idatt2001.carljgu.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"run(String[])","u":"run(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"runSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"setArmyToEdit(Army, int)","u":"setArmyToEdit(edu.ntnu.idatt2001.carljgu.army.Army,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setHeader(String)","u":"setHeader(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"setHealth(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setMessage(String)","u":"setMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"setOriginalArmy(int, Army)","u":"setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setTitle(String)","u":"setTitle(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"simulate()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"SimulationAttack(Army, Unit, Army, Unit, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"start(Stage)","u":"start(javafx.stage.Stage)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"strengthAndUnitRepresentation()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"Unit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"UnitFactory()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsHealthSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsNameField"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsTypeComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"updateAllFields()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"writeToCSV()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"writeToFile(Army, String)","u":"writeToFile(edu.ntnu.idatt2001.carljgu.army.Army,java.lang.String)"}];updateSearchResults();
\ No newline at end of file
+memberSearchIndex = [{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addEventListenersToFieldsAndLists()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnit(Unit)","u":"addUnit(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"addUnits(List<Unit>)","u":"addUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"addUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"amountOfUnitsSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"App()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"Army(String, List<Unit>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"ArmyFileHandler()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"attack(Unit, Terrain)","u":"attack(edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackStringRepresentation(int, Unit, Unit, Army, Army)","u":"attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"Battle(Army, Army, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"BattleController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"build()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"cancelAllChanges()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"CAVALRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"changelogListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"changeScene(String)","u":"changeScene(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"COMMANDER_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"createArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createListOfUnits(int, UnitType, String, int)","u":"createListOfUnits(int,edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"createUnit(UnitType, String, int)","u":"createUnit(edu.ntnu.idatt2001.carljgu.battle.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnit()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"deleteUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"DialogBox(DialogBoxBuilder)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"DialogBoxBuilder(Alert.AlertType)","u":"%3Cinit%3E(javafx.scene.control.Alert.AlertType)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"displayArmy(int, Army)","u":"displayArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"displaySuccessfulPopupMessage(String)","u":"displaySuccessfulPopupMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"EditArmyController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyName()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyNameButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editArmyTitle"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"editArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"editNameField"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"FileExtensionException","l":"FileExtensionException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getAlertType()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getAllUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getArmor()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttacker()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttackingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getAttackLog()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCalculatedStrength()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCavalryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getCommanderUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDamageDealt()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefender()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefendingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getFilePath(String)","u":"getFilePath(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getHeader()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getHealth()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getImage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getInfantryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getListMessages()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getMessage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRandom()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"getRangedUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getReadableName()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"getReadLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"getStage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getTerrain(String)","u":"getTerrain(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getTitle()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"getUnitType(String)","u":"getUnitType(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getWinner()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hashCode()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"hasUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"hboxRoot"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"INFANTRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"Main()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"RANGED_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"recurringDialogMessage"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"remove(Unit)","u":"remove(edu.ntnu.idatt2001.carljgu.battle.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"run(String[])","u":"run(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"runSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"setArmyToEdit(Army, int)","u":"setArmyToEdit(edu.ntnu.idatt2001.carljgu.battle.Army,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setHeader(String)","u":"setHeader(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"setHealth(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setMessage(String)","u":"setMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"setOriginalArmy(int, Army)","u":"setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setTitle(String)","u":"setTitle(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"simulate()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"SimulationAttack(Army, Unit, Army, Unit, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Army,edu.ntnu.idatt2001.carljgu.battle.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"start(Stage)","u":"start(javafx.stage.Stage)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"strengthAndUnitRepresentation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"Unit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"UnitFactory()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsHealthSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsNameField"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"unitsTypeComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateAllFields()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"writeToCSV()"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"writeToFile(Army, String)","u":"writeToFile(edu.ntnu.idatt2001.carljgu.battle.Army,java.lang.String)"}];updateSearchResults();
\ No newline at end of file
diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html
index 7b63fb47db2d0525cb6f614ff3cde25f4f820d73..db34eb76600ad02273ce528d0132f00277b2b9e8 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>Class Hierarchy</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -52,13 +52,13 @@ loadScripts(document, 'script');</script>
<h1 class="title">Hierarchy For All Packages</h1>
<span class="package-hierarchy-label">Package Hierarchies:</span>
<ul class="horizontal">
-<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-tree.html">edu.ntnu.idatt2001.carljgu</a>, </li>
-<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-tree.html">edu.ntnu.idatt2001.carljgu.army</a>, </li>
<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html">edu.ntnu.idatt2001.carljgu.battle</a>, </li>
+<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/package-tree.html">edu.ntnu.idatt2001.carljgu.battle.units</a>, </li>
+<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-tree.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a>, </li>
<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html">edu.ntnu.idatt2001.carljgu.client</a>, </li>
+<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/package-tree.html">edu.ntnu.idatt2001.carljgu.client.controllers</a>, </li>
<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a>, </li>
-<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-tree.html">edu.ntnu.idatt2001.carljgu.units</a>, </li>
-<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-tree.html">edu.ntnu.idatt2001.carljgu.units.specialized</a></li>
+<li><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-tree.html">edu.ntnu.idatt2001.carljgu.filehandling</a></li>
</ul>
</div>
<section class="hierarchy">
@@ -71,10 +71,10 @@ loadScripts(document, 'script');</script>
<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">App</a></li>
</ul>
</li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.army.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.army.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.army">ArmyFileHandler</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.filehandling.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.filehandling">ArmyFileHandler</a></li>
<li class="circle">edu.ntnu.idatt2001.carljgu.battle.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">BattleController</a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.client.controllers.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">BattleController</a> (implements javafx.fxml.Initializable)</li>
<li class="circle">javafx.scene.control.Dialog<R> (implements javafx.event.EventTarget)
<ul>
<li class="circle">javafx.scene.control.Alert
@@ -85,7 +85,7 @@ loadScripts(document, 'script');</script>
</ul>
</li>
<li class="circle">edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBoxBuilder</a></li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a> (implements javafx.fxml.Initializable)</li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.client.controllers.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client.controllers">EditArmyController</a> (implements javafx.fxml.Initializable)</li>
<li class="circle">edu.ntnu.idatt2001.carljgu.client.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></li>
<li class="circle">edu.ntnu.idatt2001.carljgu.battle.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle">SimulationAttack</a></li>
<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" class="type-name-link external-link" title="class or interface in java.lang">Throwable</a> (implements java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a>)
@@ -96,7 +96,7 @@ loadScripts(document, 'script');</script>
<ul>
<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" class="type-name-link external-link" title="class or interface in java.lang">IllegalArgumentException</a>
<ul>
-<li class="circle">edu.ntnu.idatt2001.carljgu.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu">FileExtensionException</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.filehandling.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.filehandling">FileExtensionException</a></li>
</ul>
</li>
</ul>
@@ -105,18 +105,18 @@ loadScripts(document, 'script');</script>
</li>
</ul>
</li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.units.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units">Unit</a>
<ul>
-<li class="circle">edu.ntnu.idatt2001.carljgu.units.specialized.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CavalryUnit</a>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CavalryUnit</a>
<ul>
-<li class="circle">edu.ntnu.idatt2001.carljgu.units.specialized.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">CommanderUnit</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">CommanderUnit</a></li>
</ul>
</li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.units.specialized.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">InfantryUnit</a></li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.units.specialized.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units.specialized">RangedUnit</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">InfantryUnit</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.specialized.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units.specialized">RangedUnit</a></li>
</ul>
</li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.units.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.units">UnitFactory</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.battle.units">UnitFactory</a></li>
</ul>
</li>
</ul>
@@ -129,7 +129,7 @@ loadScripts(document, 'script');</script>
<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" class="type-name-link external-link" title="class or interface in java.lang">Enum</a><E> (implements java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a><T>, java.lang.constant.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/constant/Constable.html" title="class or interface in java.lang.constant" class="external-link">Constable</a>, java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a>)
<ul>
<li class="circle">edu.ntnu.idatt2001.carljgu.battle.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html" class="type-name-link" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></li>
-<li class="circle">edu.ntnu.idatt2001.carljgu.units.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html" class="type-name-link" title="enum class in edu.ntnu.idatt2001.carljgu.units">UnitType</a></li>
+<li class="circle">edu.ntnu.idatt2001.carljgu.battle.units.<a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html" class="type-name-link" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a></li>
</ul>
</li>
</ul>
diff --git a/javadoc/package-search-index.js b/javadoc/package-search-index.js
index ca618c8369683070a520f673a08edee8dc73ce21..9a9945b50d1eadd5914b2c1f98296268b59595d2 100644
--- a/javadoc/package-search-index.js
+++ b/javadoc/package-search-index.js
@@ -1 +1 @@
-packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.army"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.battle"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.client"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.client.dialogs"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.units"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.units.specialized"}];updateSearchResults();
\ No newline at end of file
+packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.battle"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.battle.units"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.battle.units.specialized"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.client"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.client.controllers"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.client.dialogs"},{"m":"edu.ntnu.idatt2001.carljgu.client","l":"edu.ntnu.idatt2001.carljgu.filehandling"}];updateSearchResults();
\ No newline at end of file
diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html
index 068c3e557a301230fee046a478e1d88273b45aee..c3ab246e19ab9397d8bd5b415a27ed94765374b5 100644
--- a/javadoc/serialized-form.html
+++ b/javadoc/serialized-form.html
@@ -1,7 +1,7 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Thu May 19 20:48:26 CEST 2022 -->
+<!-- Generated by javadoc (17) on Thu May 19 21:03:13 CEST 2022 -->
<title>Serialized Form</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
@@ -54,11 +54,11 @@ loadScripts(document, 'script');</script>
<ul class="block-list">
<li>
<section class="serialized-package-container">
-<h2 title="Package">Package <a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-summary.html">edu.ntnu.idatt2001.carljgu</a></h2>
+<h2 title="Package">Package <a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html">edu.ntnu.idatt2001.carljgu.filehandling</a></h2>
<ul class="block-list">
<li>
-<section class="serialized-class-details" id="edu.ntnu.idatt2001.carljgu.FileExtensionException">
-<h3>Exception <a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu">edu.ntnu.idatt2001.carljgu.FileExtensionException</a></h3>
+<section class="serialized-class-details" id="edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException">
+<h3>Exception <a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.html" title="class in edu.ntnu.idatt2001.carljgu.filehandling">edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException</a></h3>
<div class="type-signature">class FileExtensionException extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a> implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></div>
</section>
</li>
diff --git a/javadoc/type-search-index.js b/javadoc/type-search-index.js
index 3334fbf8cf6e0d79462317f4c808e09baf042aa7..14c6ad7b7864a85651c92a1cf3ae33fa11629aad 100644
--- a/javadoc/type-search-index.js
+++ b/javadoc/type-search-index.js
@@ -1 +1 @@
-typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"App"},{"p":"edu.ntnu.idatt2001.carljgu.army","l":"Army"},{"p":"edu.ntnu.idatt2001.carljgu.army","l":"ArmyFileHandler"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Battle"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"BattleController"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","l":"CavalryUnit"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","l":"CommanderUnit"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","l":"DialogBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","l":"DialogBoxBuilder"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"EditArmyController"},{"p":"edu.ntnu.idatt2001.carljgu","l":"FileExtensionException"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","l":"InfantryUnit"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"Main"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","l":"RangedUnit"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"SimulationAttack"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Terrain"},{"p":"edu.ntnu.idatt2001.carljgu.units","l":"Unit"},{"p":"edu.ntnu.idatt2001.carljgu.units","l":"UnitFactory"},{"p":"edu.ntnu.idatt2001.carljgu.units","l":"UnitType"}];updateSearchResults();
\ No newline at end of file
+typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"App"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Army"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","l":"ArmyFileHandler"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Battle"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","l":"BattleController"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"CavalryUnit"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"CommanderUnit"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","l":"DialogBox"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","l":"DialogBoxBuilder"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","l":"EditArmyController"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","l":"FileExtensionException"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"InfantryUnit"},{"p":"edu.ntnu.idatt2001.carljgu.client","l":"Main"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","l":"RangedUnit"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"SimulationAttack"},{"p":"edu.ntnu.idatt2001.carljgu.battle","l":"Terrain"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"Unit"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"UnitFactory"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","l":"UnitType"}];updateSearchResults();
\ No newline at end of file
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/army/Army.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Army.java
similarity index 95%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/army/Army.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/battle/Army.java
index 607a5c0c9747638e364b1220871c79e5aa31e80a..f5ce3a068bf552d3707bd0cb153492518d739ffa 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/army/Army.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Army.java
@@ -1,10 +1,10 @@
-package edu.ntnu.idatt2001.carljgu.army;
+package edu.ntnu.idatt2001.carljgu.battle;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CavalryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CommanderUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.RangedUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CommanderUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit;
import javafx.collections.FXCollections;
import java.util.ArrayList;
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Battle.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Battle.java
index ad1aeb0327fc4e877c105ce249e7e61e926a84df..cd637dc9810cee271d84447e1e54db7d223bfce8 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Battle.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/Battle.java
@@ -1,7 +1,6 @@
package edu.ntnu.idatt2001.carljgu.battle;
-import edu.ntnu.idatt2001.carljgu.army.Army;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.java
index e7ff73576ec042d553efc5f2c9f9e7925b7af8c5..d492e66941a19aa342f97b68041d83b478589c8b 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.java
@@ -1,7 +1,6 @@
package edu.ntnu.idatt2001.carljgu.battle;
-import edu.ntnu.idatt2001.carljgu.army.Army;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
/**
* This class is deprecated.
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/units/Unit.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/Unit.java
similarity index 99%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/units/Unit.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/Unit.java
index bb01ae3bc83a640088b1068f2e71f7b00140d386..a7b0b04409c00777b9a0cdc2c0bbf595e144facc 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/units/Unit.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/Unit.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu.units;
+package edu.ntnu.idatt2001.carljgu.battle.units;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/units/UnitFactory.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.java
similarity index 90%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/units/UnitFactory.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.java
index 3f0e7c980120a2f8848f77fe564fd6e97dcc202c..fcfa668565126a4d829a57eaceb79d5b5772abae 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/units/UnitFactory.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/UnitFactory.java
@@ -1,9 +1,9 @@
-package edu.ntnu.idatt2001.carljgu.units;
+package edu.ntnu.idatt2001.carljgu.battle.units;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CavalryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CommanderUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.RangedUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CommanderUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/units/UnitType.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.java
similarity index 96%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/units/UnitType.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.java
index e034266e47a252c34ff8cf1b87b16633428299b5..489465a1146019c0a9340e6fe3ea9f359e919c57 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/units/UnitType.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu.units;
+package edu.ntnu.idatt2001.carljgu.battle.units;
import java.util.Arrays;
import java.util.Map;
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.java
similarity index 96%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.java
index c0c54a8b43d3de82cd4108e2e23de823c7513907..1ff4b7a357f61c7fb1e117b3bd5c32fcaf6e7888 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.java
@@ -1,7 +1,7 @@
-package edu.ntnu.idatt2001.carljgu.units.specialized;
+package edu.ntnu.idatt2001.carljgu.battle.units.specialized;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
/**
* Class CavalryUnit that inherits from Unit.
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.java
similarity index 96%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.java
index 25aea43d7bbdbc1ae1db476e991f634a11ec97ec..1e5cd0b60895d5fe718c1937ac116a732c55f37e 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CommanderUnit.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu.units.specialized;
+package edu.ntnu.idatt2001.carljgu.battle.units.specialized;
/**
* Class CommanderUnit that inherits from CavalryUnit.
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.java
similarity index 96%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.java
index a23de689ff780de9031eb78b3da08f773ab32e98..4c04c9a866562751f3014d74390313d7be425877 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.java
@@ -1,7 +1,7 @@
-package edu.ntnu.idatt2001.carljgu.units.specialized;
+package edu.ntnu.idatt2001.carljgu.battle.units.specialized;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
/**
* Class InfantryUnit that inherits from Unit.
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.java b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.java
similarity index 97%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.java
index a239f0a1c1effc46b0344610550349c25fa0a537..fbf9c2e4bcc768691b0c686962930aae0010280b 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.java
@@ -1,7 +1,7 @@
-package edu.ntnu.idatt2001.carljgu.units.specialized;
+package edu.ntnu.idatt2001.carljgu.battle.units.specialized;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
/**
* Class RangedUnit that inherits from Unit.
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleController.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java
similarity index 96%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleController.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java
index 72a578235a765fe12e369020cdae6bf5ad96d9c0..929a3408cf9c68fb9290441e9b4b130a7269159b 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleController.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.java
@@ -1,14 +1,15 @@
-package edu.ntnu.idatt2001.carljgu.client;
+package edu.ntnu.idatt2001.carljgu.client.controllers;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
import edu.ntnu.idatt2001.carljgu.battle.Battle;
-import edu.ntnu.idatt2001.carljgu.FileExtensionException;
-import edu.ntnu.idatt2001.carljgu.army.ArmyFileHandler;
+import edu.ntnu.idatt2001.carljgu.client.App;
+import edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException;
+import edu.ntnu.idatt2001.carljgu.filehandling.ArmyFileHandler;
import edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBox;
import edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder;
-import edu.ntnu.idatt2001.carljgu.army.Army;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
-import edu.ntnu.idatt2001.carljgu.units.UnitFactory;
+import edu.ntnu.idatt2001.carljgu.battle.Army;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory;
import java.io.IOException;
import java.net.URL;
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/EditArmyController.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.java
similarity index 95%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/client/EditArmyController.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.java
index 6f0c4952ca6c0b116cb1e76580c3a93d30ed7b2d..7c2ef53adb3c3257e06b01ce44441389062ff368 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/EditArmyController.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.java
@@ -1,12 +1,13 @@
-package edu.ntnu.idatt2001.carljgu.client;
+package edu.ntnu.idatt2001.carljgu.client.controllers;
-import edu.ntnu.idatt2001.carljgu.army.ArmyFileHandler;
-import edu.ntnu.idatt2001.carljgu.FileExtensionException;
+import edu.ntnu.idatt2001.carljgu.client.App;
+import edu.ntnu.idatt2001.carljgu.filehandling.ArmyFileHandler;
+import edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException;
import edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder;
-import edu.ntnu.idatt2001.carljgu.army.Army;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
-import edu.ntnu.idatt2001.carljgu.units.UnitFactory;
-import edu.ntnu.idatt2001.carljgu.units.UnitType;
+import edu.ntnu.idatt2001.carljgu.battle.Army;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory;
+import edu.ntnu.idatt2001.carljgu.battle.units.UnitType;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.java b/src/main/java/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.java
similarity index 95%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.java
index e528047c3e84f409ba587bb9c98e04f0b9f77ccc..a4a1b6b0bceb6b5c1e8e37b9acce307a15d2c43a 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/filehandling/ArmyFileHandler.java
@@ -1,10 +1,10 @@
-package edu.ntnu.idatt2001.carljgu.army;
+package edu.ntnu.idatt2001.carljgu.filehandling;
-import edu.ntnu.idatt2001.carljgu.FileExtensionException;
+import edu.ntnu.idatt2001.carljgu.battle.Army;
import edu.ntnu.idatt2001.carljgu.client.App;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
-import edu.ntnu.idatt2001.carljgu.units.UnitFactory;
-import edu.ntnu.idatt2001.carljgu.units.UnitType;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory;
+import edu.ntnu.idatt2001.carljgu.battle.units.UnitType;
import javafx.stage.FileChooser;
import java.io.*;
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/FileExtensionException.java b/src/main/java/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.java
similarity index 89%
rename from src/main/java/edu/ntnu/idatt2001/carljgu/FileExtensionException.java
rename to src/main/java/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.java
index aa3d069bc20bd1121252881bfe4d7c5837cde946..2ef7e05acc21f125d0d64cafca6c071bd8a6a083 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/FileExtensionException.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/filehandling/FileExtensionException.java
@@ -1,4 +1,4 @@
-package edu.ntnu.idatt2001.carljgu;
+package edu.ntnu.idatt2001.carljgu.filehandling;
/**
* Thrown if an extension of a file is invalid
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index 4dab90a727564dead30b9516d0f46dc9bcd18bda..5920b29fa1c10e88cfb67e4b3d14c0589e6ec1e8 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -2,12 +2,6 @@ module edu.ntnu.idatt2001.carljgu.client {
requires javafx.controls;
requires javafx.fxml;
- opens edu.ntnu.idatt2001.carljgu.client to javafx.fxml;
- opens edu.ntnu.idatt2001.carljgu.client.dialogs to javafx.fxml;
+ opens edu.ntnu.idatt2001.carljgu.client.controllers to javafx.fxml;
exports edu.ntnu.idatt2001.carljgu.client ;
- exports edu.ntnu.idatt2001.carljgu.units ;
- exports edu.ntnu.idatt2001.carljgu ;
- exports edu.ntnu.idatt2001.carljgu.battle;
- exports edu.ntnu.idatt2001.carljgu.client.dialogs;
- exports edu.ntnu.idatt2001.carljgu.army;
}
diff --git a/src/main/resources/battle-armies.fxml b/src/main/resources/battle-armies.fxml
index bc4089fc01603337b3a16ee6d0e5e1a0aeeaa71d..0b3918faacf97627f4d1dd02887a5f4a0893b1c8 100644
--- a/src/main/resources/battle-armies.fxml
+++ b/src/main/resources/battle-armies.fxml
@@ -6,7 +6,7 @@
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
-<ScrollPane fitToHeight="true" fitToWidth="true" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="edu.ntnu.idatt2001.carljgu.client.BattleController">
+<ScrollPane fitToHeight="true" fitToWidth="true" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="edu.ntnu.idatt2001.carljgu.client.controllers.BattleController">
<HBox id="hboxRoot" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
<VBox alignment="CENTER" maxWidth="1.7976931348623157E308" minWidth="300.0" HBox.hgrow="ALWAYS">
<HBox.margin>
diff --git a/src/main/resources/edit-army.fxml b/src/main/resources/edit-army.fxml
index 16cc2201dc207e80e2b46fee50fcb613283e5ecd..9aed3a4f4dbf54e2a904e90e0945114e7c810cf5 100644
--- a/src/main/resources/edit-army.fxml
+++ b/src/main/resources/edit-army.fxml
@@ -5,7 +5,7 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.text.Font?>
-<ScrollPane fitToHeight="true" fitToWidth="true" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" fx:controller="edu.ntnu.idatt2001.carljgu.client.EditArmyController" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
+<ScrollPane fitToHeight="true" fitToWidth="true" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" fx:controller="edu.ntnu.idatt2001.carljgu.client.controllers.EditArmyController" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1">
<HBox fx:id="hboxRoot" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
<VBox alignment="CENTER" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS">
<HBox.margin>
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyFileHandlerTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyFileHandlerTest.java
index 1a022a0fb04f1f5d9961a9de2d1bbae54a918710..2bfe6d64d7c6b7fe04711c60b553a5542dc9e5b3 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyFileHandlerTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyFileHandlerTest.java
@@ -2,13 +2,14 @@ package edu.ntnu.idatt2001.carljgu;
import static org.junit.jupiter.api.Assertions.*;
-import edu.ntnu.idatt2001.carljgu.army.Army;
-import edu.ntnu.idatt2001.carljgu.army.ArmyFileHandler;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CavalryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CommanderUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.RangedUnit;
+import edu.ntnu.idatt2001.carljgu.battle.Army;
+import edu.ntnu.idatt2001.carljgu.filehandling.ArmyFileHandler;
+import edu.ntnu.idatt2001.carljgu.filehandling.FileExtensionException;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CommanderUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit;
import java.io.FileWriter;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyTest.java
index 66c0d0203b3eb53241155d77f37a3b6b91d98369..80dfad7694608609103c0b095f3372a73e440549 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyTest.java
@@ -2,12 +2,12 @@ package edu.ntnu.idatt2001.carljgu;
import static org.junit.jupiter.api.Assertions.*;
-import edu.ntnu.idatt2001.carljgu.army.Army;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CavalryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CommanderUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.RangedUnit;
+import edu.ntnu.idatt2001.carljgu.battle.Army;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CommanderUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/BattleTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/BattleTest.java
index 25894865c5f44aa730c7142f35d2e687eb8840e2..3aafcb5956b0250e69f2b06671e2a61e0a345abe 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/BattleTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/BattleTest.java
@@ -6,11 +6,11 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
-import edu.ntnu.idatt2001.carljgu.army.Army;
+import edu.ntnu.idatt2001.carljgu.battle.Army;
import edu.ntnu.idatt2001.carljgu.battle.Battle;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.*;
-import edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit;
import java.util.ArrayList;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayNameGeneration;
@@ -48,7 +48,7 @@ public class BattleTest {
@Test
public void exception_if_armies_are_equal() {
try {
- Battle battle = new Battle(armyWithUnit, armyWithUnit, Terrain.PLAINS);
+ new Battle(armyWithUnit, armyWithUnit, Terrain.PLAINS);
fail();
} catch (IllegalArgumentException exception) {
assertEquals("Armies can not be the same", exception.getMessage());
@@ -81,7 +81,7 @@ public class BattleTest {
Battle battle = new Battle(armyWithUnit, secondArmy, Terrain.PLAINS);
battle.simulate();
- assertThrows(UnsupportedOperationException.class, () -> battle.simulate());
+ assertThrows(UnsupportedOperationException.class, battle::simulate);
}
}
}
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/UnitFactoryTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/UnitFactoryTest.java
index 7d33354049997ea958a1bd30b5d3c05d80a4f9ab..2081268f7f6fa728b3681fbb6145660f2c4308c7 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/UnitFactoryTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/UnitFactoryTest.java
@@ -1,10 +1,10 @@
package edu.ntnu.idatt2001.carljgu;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
-import edu.ntnu.idatt2001.carljgu.units.UnitFactory;
-import edu.ntnu.idatt2001.carljgu.units.UnitType;
-import edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.RangedUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.UnitFactory;
+import edu.ntnu.idatt2001.carljgu.battle.units.UnitType;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.DisplayNameGeneration;
import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/UnitTypeTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/UnitTypeTest.java
index 88128404d70ffe2fee88256d79eb26c5b7816090..681825b1b3304da840fcea6dea974fe593928526 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/UnitTypeTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/UnitTypeTest.java
@@ -1,6 +1,6 @@
package edu.ntnu.idatt2001.carljgu;
-import edu.ntnu.idatt2001.carljgu.units.UnitType;
+import edu.ntnu.idatt2001.carljgu.battle.units.UnitType;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/WarUnitTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/WarUnitTest.java
index 31ec41a01d823582cc9dc70cf373cd121710950c..2362be2beee14e5fd3943dffd9e3f4ff8cc1f910 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/WarUnitTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/WarUnitTest.java
@@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.Unit;
-import edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.Unit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit;
import org.junit.jupiter.api.DisplayNameGeneration;
import org.junit.jupiter.api.DisplayNameGenerator;
import org.junit.jupiter.api.Nested;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CavalryTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CavalryTest.java
index df7f5584c58d3c63b99181755e04b5ef07260016..f2779d9f21fefc9990d545e3ccfda985f18f6d6d 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CavalryTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CavalryTest.java
@@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CavalryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayNameGeneration;
import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CommanderTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CommanderTest.java
index cb370ca2e77aff75f30eda9e3da300cc01d9dcfe..a26c3a8d14b6a97f694e675b3007d55c7ad82a9d 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CommanderTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/CommanderTest.java
@@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.specialized.CommanderUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.CommanderUnit;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayNameGeneration;
import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/InfantryTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/InfantryTest.java
index 54d6cf511a3fe0ef61bff7cd21c19e1bfae2031d..8e67c380951a94dcdc7533a5bcbc7569f607b964 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/InfantryTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/InfantryTest.java
@@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.specialized.InfantryUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayNameGeneration;
import org.junit.jupiter.api.DisplayNameGenerator;
diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/RangedTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/RangedTest.java
index d3a4f9cdc44d2eaf6ea0f226fbb9f943e5bc514c..e2f5a6a7d11317355f943bd4c803cef664041542 100644
--- a/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/RangedTest.java
+++ b/src/test/java/edu/ntnu/idatt2001/carljgu/specialized/RangedTest.java
@@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import edu.ntnu.idatt2001.carljgu.battle.Terrain;
-import edu.ntnu.idatt2001.carljgu.units.specialized.RangedUnit;
+import edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayNameGeneration;
import org.junit.jupiter.api.DisplayNameGenerator;