From ebb29e76752bfe7771386886088c8ee6e37439f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carl=20G=C3=BCtzkow?= <cjgutzkow@gmail.com>
Date: Mon, 23 May 2022 11:33:01 +0200
Subject: [PATCH] enhance: set methods for dialog box and generate javadoc for
it
---
javadoc/allclasses-index.html | 4 +-
javadoc/allpackages-index.html | 4 +-
javadoc/constant-values.html | 68 ++++-
javadoc/deprecated-list.html | 4 +-
.../ntnu/idatt2001/carljgu/battle/Army.html | 46 +++-
.../ntnu/idatt2001/carljgu/battle/Battle.html | 73 ++++-
.../carljgu/battle/SimulationAttack.html | 100 ++++++-
.../idatt2001/carljgu/battle/Terrain.html | 82 +++++-
.../carljgu/battle/package-summary.html | 4 +-
.../carljgu/battle/package-tree.html | 4 +-
.../idatt2001/carljgu/battle/units/Unit.html | 64 ++++-
.../carljgu/battle/units/UnitFactory.html | 4 +-
.../carljgu/battle/units/UnitType.html | 82 +++++-
.../carljgu/battle/units/package-summary.html | 4 +-
.../carljgu/battle/units/package-tree.html | 4 +-
.../battle/units/specialized/CavalryUnit.html | 105 ++++++-
.../units/specialized/CommanderUnit.html | 4 +-
.../units/specialized/InfantryUnit.html | 79 +++++-
.../battle/units/specialized/RangedUnit.html | 122 +++++++-
.../units/specialized/package-summary.html | 4 +-
.../units/specialized/package-tree.html | 4 +-
.../ntnu/idatt2001/carljgu/client/App.html | 29 +-
.../client/BattleSimulationSingleton.html | 148 +++++++++-
.../ntnu/idatt2001/carljgu/client/Main.html | 4 +-
.../client/controllers/BattleController.html | 260 +++++++++++++++++-
.../controllers/EditArmyController.html | 25 +-
.../client/controllers/package-summary.html | 4 +-
.../client/controllers/package-tree.html | 4 +-
.../carljgu/client/dialogs/DialogBox.html | 64 ++++-
.../client/dialogs/DialogBoxBuilder.html | 62 ++++-
.../client/dialogs/package-summary.html | 4 +-
.../carljgu/client/dialogs/package-tree.html | 4 +-
.../carljgu/client/package-summary.html | 4 +-
.../carljgu/client/package-tree.html | 4 +-
.../carljgu/filehandling/ArmyFileHandler.html | 46 +++-
.../filehandling/FileExtensionException.html | 4 +-
.../carljgu/filehandling/package-summary.html | 4 +-
.../carljgu/filehandling/package-tree.html | 4 +-
.../module-summary.html | 82 +++++-
javadoc/help-doc.html | 4 +-
javadoc/index-files/index-1.html | 60 +++-
javadoc/index-files/index-10.html | 27 +-
javadoc/index-files/index-11.html | 29 +-
javadoc/index-files/index-12.html | 57 +---
javadoc/index-files/index-13.html | 99 +------
javadoc/index-files/index-14.html | 42 +--
javadoc/index-files/index-15.html | 70 +++--
javadoc/index-files/index-16.html | 111 ++++++--
javadoc/index-files/index-17.html | 56 +++-
javadoc/index-files/index-18.html | 105 +++++++
javadoc/index-files/index-19.html | 80 ++++++
javadoc/index-files/index-2.html | 17 +-
javadoc/index-files/index-20.html | 72 +++++
javadoc/index-files/index-3.html | 14 +-
javadoc/index-files/index-4.html | 22 +-
javadoc/index-files/index-5.html | 14 +-
javadoc/index-files/index-6.html | 18 +-
javadoc/index-files/index-7.html | 8 +-
javadoc/index-files/index-8.html | 14 +-
javadoc/index-files/index-9.html | 20 +-
javadoc/index.html | 4 +-
javadoc/member-search-index.js | 2 +-
javadoc/overview-tree.html | 4 +-
javadoc/serialized-form.html | 4 +-
.../carljgu/client/dialogs/DialogBox.java | 37 ++-
65 files changed, 2179 insertions(+), 432 deletions(-)
create mode 100644 javadoc/index-files/index-18.html
create mode 100644 javadoc/index-files/index-19.html
create mode 100644 javadoc/index-files/index-20.html
diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html
index 13efdf8..7482913 100644
--- a/javadoc/allclasses-index.html
+++ b/javadoc/allclasses-index.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="class index">
<meta name="generator" content="javadoc/AllClassesIndexWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/allpackages-index.html b/javadoc/allpackages-index.html
index 1d77447..2f2c808 100644
--- a/javadoc/allpackages-index.html
+++ b/javadoc/allpackages-index.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="package index">
<meta name="generator" content="javadoc/AllPackagesIndexWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html
index 6fee193..7138cf1 100644
--- a/javadoc/constant-values.html
+++ b/javadoc/constant-values.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="summary of constants">
<meta name="generator" content="javadoc/ConstantsSummaryWriterImpl">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
@@ -57,10 +57,72 @@ loadScripts(document, 'script');</script>
</ul>
</section>
</div>
-<section class="constants-summary" id="edu.ntnu.idatt2001.carljgu.client.dialogs">
+<section class="constants-summary" id="edu.ntnu.idatt2001.carljgu.battle.units.specialized">
<h2 title="edu.ntnu">edu.ntnu.*</h2>
<ul class="block-list">
<li>
+<div class="caption"><span>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></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">Constant Field</div>
+<div class="table-header col-last">Value</div>
+<div class="col-first even-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit.FOREST_BONUS">private final int</code></div>
+<div class="col-second even-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#FOREST_BONUS">FOREST_BONUS</a></code></div>
+<div class="col-last even-row-color"><code>0</code></div>
+<div class="col-first odd-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit.MELEE_ATTACK_BONUS">private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#MELEE_ATTACK_BONUS">MELEE_ATTACK_BONUS</a></code></div>
+<div class="col-last odd-row-color"><code>2</code></div>
+<div class="col-first even-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit.PLAINS_BONUS">private final int</code></div>
+<div class="col-second even-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#PLAINS_BONUS">PLAINS_BONUS</a></code></div>
+<div class="col-last even-row-color"><code>5</code></div>
+<div class="col-first odd-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit.RESIST_BONUS">private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#RESIST_BONUS">RESIST_BONUS</a></code></div>
+<div class="col-last odd-row-color"><code>1</code></div>
+</div>
+</li>
+<li>
+<div class="caption"><span>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></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">Constant Field</div>
+<div class="table-header col-last">Value</div>
+<div class="col-first even-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit.ATTACK_BONUS">private final int</code></div>
+<div class="col-second even-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#ATTACK_BONUS">ATTACK_BONUS</a></code></div>
+<div class="col-last even-row-color"><code>2</code></div>
+<div class="col-first odd-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit.FOREST_BONUS">private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#FOREST_BONUS">FOREST_BONUS</a></code></div>
+<div class="col-last odd-row-color"><code>3</code></div>
+<div class="col-first even-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit.RESIST_BONUS">private final int</code></div>
+<div class="col-second even-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#RESIST_BONUS">RESIST_BONUS</a></code></div>
+<div class="col-last even-row-color"><code>1</code></div>
+</div>
+</li>
+<li>
+<div class="caption"><span>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></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">Constant Field</div>
+<div class="table-header col-last">Value</div>
+<div class="col-first even-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.ATTACK_BONUS">private final int</code></div>
+<div class="col-second even-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#ATTACK_BONUS">ATTACK_BONUS</a></code></div>
+<div class="col-last even-row-color"><code>3</code></div>
+<div class="col-first odd-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.FINAL_RESIST_BONUS">private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#FINAL_RESIST_BONUS">FINAL_RESIST_BONUS</a></code></div>
+<div class="col-last odd-row-color"><code>2</code></div>
+<div class="col-first even-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.FOREST_PENALTY">private final int</code></div>
+<div class="col-second even-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#FOREST_PENALTY">FOREST_PENALTY</a></code></div>
+<div class="col-last even-row-color"><code>2</code></div>
+<div class="col-first odd-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.HILL_BONUS">private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#HILL_BONUS">HILL_BONUS</a></code></div>
+<div class="col-last odd-row-color"><code>3</code></div>
+<div class="col-first even-row-color"><code id="edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.INITIAL_RESIST_BONUS">private final int</code></div>
+<div class="col-second even-row-color"><code><a href="edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#INITIAL_RESIST_BONUS">INITIAL_RESIST_BONUS</a></code></div>
+<div class="col-last even-row-color"><code>6</code></div>
+</div>
+</li>
+</ul>
+<ul class="block-list">
+<li>
<div class="caption"><span>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></span></div>
<div class="summary-table three-column-summary">
<div class="table-header col-first">Modifier and Type</div>
diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html
index b7e873c..9c57777 100644
--- a/javadoc/deprecated-list.html
+++ b/javadoc/deprecated-list.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="deprecated elements">
<meta name="generator" content="javadoc/DeprecatedListWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
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
index bc71dc8..18fc1b6 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -92,6 +92,24 @@ loadScripts(document, 'script');</script>
</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>private <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"><code><a href="#name" class="member-name-link">name</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final <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"><code><a href="#units" class="member-name-link">units</a></code></div>
+<div class="col-last odd-row-color"> </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -227,6 +245,26 @@ loadScripts(document, 'script');</script>
</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="name">
+<h3>name</h3>
+<div class="member-signature"><span class="modifiers">private</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">name</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="units">
+<h3>units</h3>
+<div class="member-signature"><span class="modifiers">private final</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">units</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
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 b1403b6..da69c5e 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle, class: Battle">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -90,6 +90,33 @@ loadScripts(document, 'script');</script>
</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>private final <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second even-row-color"><code><a href="#armyOne" class="member-name-link">armyOne</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second odd-row-color"><code><a href="#armyTwo" class="member-name-link">armyTwo</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private final <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 even-row-color"><code><a href="#attackLog" class="member-name-link">attackLog</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final <a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></code></div>
+<div class="col-second odd-row-color"><code><a href="#terrain" class="member-name-link">terrain</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second even-row-color"><code><a href="#winner" class="member-name-link">winner</a></code></div>
+<div class="col-last even-row-color"> </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -172,6 +199,44 @@ loadScripts(document, 'script');</script>
</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="armyOne">
+<h3>armyOne</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">armyOne</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyTwo">
+<h3>armyTwo</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">armyTwo</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="winner">
+<h3>winner</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">winner</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="terrain">
+<h3>terrain</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type"><a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></span> <span class="element-name">terrain</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="attackLog">
+<h3>attackLog</h3>
+<div class="member-signature"><span class="modifiers">private final</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">attackLog</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
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 f256dc5..81bc6a4 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle, class: SimulationAttack">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -98,6 +98,48 @@ loadScripts(document, 'script');</script>
</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>private final <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"><code><a href="#attacker" class="member-name-link">attacker</a></code></div>
+<div class="col-last even-row-color">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+ </div>
+<div class="col-first odd-row-color"><code>private final <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second odd-row-color"><code><a href="#attackingArmy" class="member-name-link">attackingArmy</a></code></div>
+<div class="col-last odd-row-color">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+ </div>
+<div class="col-first even-row-color"><code>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#damageDealt" class="member-name-link">damageDealt</a></code></div>
+<div class="col-last even-row-color">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+ </div>
+<div class="col-first odd-row-color"><code>private final <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"><code><a href="#defender" class="member-name-link">defender</a></code></div>
+<div class="col-last odd-row-color">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+ </div>
+<div class="col-first even-row-color"><code>private final <a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></code></div>
+<div class="col-second even-row-color"><code><a href="#defendingArmy" class="member-name-link">defendingArmy</a></code></div>
+<div class="col-last even-row-color">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+ </div>
+<div class="col-first odd-row-color"><code>private final <a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></code></div>
+<div class="col-second odd-row-color"><code><a href="#terrain" class="member-name-link">terrain</a></code></div>
+<div class="col-last odd-row-color">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+ </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -189,6 +231,56 @@ loadScripts(document, 'script');</script>
</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="attackingArmy">
+<h3>attackingArmy</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">attackingArmy</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="defendingArmy">
+<h3>defendingArmy</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type"><a href="Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a></span> <span class="element-name">defendingArmy</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="attacker">
+<h3>attacker</h3>
+<div class="member-signature"><span class="modifiers">private final</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">attacker</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="defender">
+<h3>defender</h3>
+<div class="member-signature"><span class="modifiers">private final</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">defender</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="terrain">
+<h3>terrain</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type"><a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a></span> <span class="element-name">terrain</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="damageDealt">
+<h3>damageDealt</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">damageDealt</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
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 5410162..2b58736 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle, enum: Terrain">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
@@ -47,13 +47,13 @@ loadScripts(document, 'script');</script>
<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="#field-summary">Field</a> | </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="#field-detail">Field</a> | </li>
<li><a href="#method-detail">Method</a></li>
</ul>
</div>
@@ -123,6 +123,41 @@ loadScripts(document, 'script');</script>
</div>
</section>
</li>
+<!-- =========== 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>private final <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"><code><a href="#readableName" class="member-name-link">readableName</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private static final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</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>,<wbr><a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a>></code></div>
+<div class="col-second odd-row-color"><code><a href="#terrains" class="member-name-link">terrains</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 three-column-summary">
+<div class="table-header col-first">Modifier</div>
+<div class="table-header col-second">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>private </code></div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String)" class="member-name-link">Terrain</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 even-row-color">
+<div class="block">The enum constructor</div>
+</div>
+</div>
+</section>
+</li>
<!-- ========== METHOD SUMMARY =========== -->
<li>
<section class="method-summary" id="method-summary">
@@ -196,6 +231,45 @@ the order they are declared.</div>
</ul>
</section>
</li>
+<!-- ============ FIELD DETAIL =========== -->
+<li>
+<section class="field-details" id="field-detail">
+<h2>Field Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="readableName">
+<h3>readableName</h3>
+<div class="member-signature"><span class="modifiers">private final</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">readableName</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="terrains">
+<h3>terrains</h3>
+<div class="member-signature"><span class="modifiers">private static final</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</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>,<wbr><a href="Terrain.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle">Terrain</a>></span> <span class="element-name">terrains</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>(java.lang.String)">
+<h3>Terrain</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="element-name">Terrain</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">The enum constructor</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>readableName</code> - String - the enum in PascalCase</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ============ METHOD DETAIL ========== -->
<li>
<section class="method-details" id="method-detail">
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 6be858a..f853f3d 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
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 348ea8b..a802c2a 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.battle">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
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
index 839f981..e3d1feb 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -97,6 +97,30 @@ loadScripts(document, 'script');</script>
</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>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#armor" class="member-name-link">armor</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="#attack" class="member-name-link">attack</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private int</code></div>
+<div class="col-second even-row-color"><code><a href="#health" class="member-name-link">health</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final <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="#name" class="member-name-link">name</a></code></div>
+<div class="col-last odd-row-color"> </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -189,6 +213,38 @@ loadScripts(document, 'script');</script>
</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="name">
+<h3>name</h3>
+<div class="member-signature"><span class="modifiers">private final</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">name</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="health">
+<h3>health</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">int</span> <span class="element-name">health</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="attack">
+<h3>attack</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">attack</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armor">
+<h3>armor</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">armor</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
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
index b75f110..f5069f7 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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
index 2be913f..78f168b 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -47,13 +47,13 @@ loadScripts(document, 'script');</script>
<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="#field-summary">Field</a> | </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="#field-detail">Field</a> | </li>
<li><a href="#method-detail">Method</a></li>
</ul>
</div>
@@ -125,6 +125,41 @@ loadScripts(document, 'script');</script>
</div>
</section>
</li>
+<!-- =========== 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>private final <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"><code><a href="#className" class="member-name-link">className</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private static final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</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>,<wbr><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"><code><a href="#unitTypes" class="member-name-link">unitTypes</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 three-column-summary">
+<div class="table-header col-first">Modifier</div>
+<div class="table-header col-second">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>private </code></div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String)" class="member-name-link">UnitType</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> className)</code></div>
+<div class="col-last even-row-color">
+<div class="block">The enum constructor</div>
+</div>
+</div>
+</section>
+</li>
<!-- ========== METHOD SUMMARY =========== -->
<li>
<section class="method-summary" id="method-summary">
@@ -204,6 +239,45 @@ the order they are declared.</div>
</ul>
</section>
</li>
+<!-- ============ FIELD DETAIL =========== -->
+<li>
+<section class="field-details" id="field-detail">
+<h2>Field Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="className">
+<h3>className</h3>
+<div class="member-signature"><span class="modifiers">private final</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">className</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="unitTypes">
+<h3>unitTypes</h3>
+<div class="member-signature"><span class="modifiers">private static final</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</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>,<wbr><a href="UnitType.html" title="enum class in edu.ntnu.idatt2001.carljgu.battle.units">UnitType</a>></span> <span class="element-name">unitTypes</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>(java.lang.String)">
+<h3>UnitType</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="element-name">UnitType</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> className)</span></div>
+<div class="block">The enum constructor</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>className</code> - String - the enum in PascalCase</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ============ METHOD DETAIL ========== -->
<li>
<section class="method-details" id="method-detail">
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
index 82d24eb..498829d 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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
index 95472f4..0cdd1d2 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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
index 8e6455f..fa4c546 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -98,6 +98,33 @@ loadScripts(document, 'script');</script>
</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>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#FOREST_BONUS" class="member-name-link">FOREST_BONUS</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="#MELEE_ATTACK_BONUS" class="member-name-link">MELEE_ATTACK_BONUS</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#PLAINS_BONUS" class="member-name-link">PLAINS_BONUS</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="#RESIST_BONUS" class="member-name-link">RESIST_BONUS</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private int</code></div>
+<div class="col-second even-row-color"><code><a href="#usedAttackBonus" class="member-name-link">usedAttackBonus</a></code></div>
+<div class="col-last even-row-color"> </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -158,6 +185,76 @@ loadScripts(document, 'script');</script>
</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="usedAttackBonus">
+<h3>usedAttackBonus</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">int</span> <span class="element-name">usedAttackBonus</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="MELEE_ATTACK_BONUS">
+<h3>MELEE_ATTACK_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">MELEE_ATTACK_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit.MELEE_ATTACK_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="RESIST_BONUS">
+<h3>RESIST_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">RESIST_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit.RESIST_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="PLAINS_BONUS">
+<h3>PLAINS_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">PLAINS_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit.PLAINS_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="FOREST_BONUS">
+<h3>FOREST_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">FOREST_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.CavalryUnit.FOREST_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
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
index 4a98085..4c24e63 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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
index 1578538..cc248e5 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -94,6 +94,27 @@ loadScripts(document, 'script');</script>
</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>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#ATTACK_BONUS" class="member-name-link">ATTACK_BONUS</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="#FOREST_BONUS" class="member-name-link">FOREST_BONUS</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#RESIST_BONUS" class="member-name-link">RESIST_BONUS</a></code></div>
+<div class="col-last even-row-color"> </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -154,6 +175,56 @@ loadScripts(document, 'script');</script>
</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="ATTACK_BONUS">
+<h3>ATTACK_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">ATTACK_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit.ATTACK_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="RESIST_BONUS">
+<h3>RESIST_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">RESIST_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit.RESIST_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="FOREST_BONUS">
+<h3>FOREST_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">FOREST_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.InfantryUnit.FOREST_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
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
index 1c6b405..70cc0b2 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -94,6 +94,36 @@ loadScripts(document, 'script');</script>
</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>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#ATTACK_BONUS" class="member-name-link">ATTACK_BONUS</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="#FINAL_RESIST_BONUS" class="member-name-link">FINAL_RESIST_BONUS</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#FOREST_PENALTY" class="member-name-link">FOREST_PENALTY</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final int</code></div>
+<div class="col-second odd-row-color"><code><a href="#HILL_BONUS" class="member-name-link">HILL_BONUS</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#INITIAL_RESIST_BONUS" class="member-name-link">INITIAL_RESIST_BONUS</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private int</code></div>
+<div class="col-second odd-row-color"><code><a href="#timesResisted" class="member-name-link">timesResisted</a></code></div>
+<div class="col-last odd-row-color"> </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -154,6 +184,90 @@ loadScripts(document, 'script');</script>
</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="ATTACK_BONUS">
+<h3>ATTACK_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">ATTACK_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.ATTACK_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="INITIAL_RESIST_BONUS">
+<h3>INITIAL_RESIST_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">INITIAL_RESIST_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.INITIAL_RESIST_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="FINAL_RESIST_BONUS">
+<h3>FINAL_RESIST_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">FINAL_RESIST_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.FINAL_RESIST_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="HILL_BONUS">
+<h3>HILL_BONUS</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">HILL_BONUS</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.HILL_BONUS">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="FOREST_PENALTY">
+<h3>FOREST_PENALTY</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">FOREST_PENALTY</span></div>
+<dl class="notes">
+<dt>See Also:</dt>
+<dd>
+<ul class="see-list">
+<li><a href="../../../../../../../../constant-values.html#edu.ntnu.idatt2001.carljgu.battle.units.specialized.RangedUnit.FOREST_PENALTY">Constant Field Values</a></li>
+</ul>
+</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="timesResisted">
+<h3>timesResisted</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">int</span> <span class="element-name">timesResisted</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
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
index f8f3058..d4c3780 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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
index 8e941e2..0664f2f 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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 a76a771..3c9756d 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client, class: App">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
@@ -52,7 +52,7 @@ loadScripts(document, 'script');</script>
</ul>
<ul class="sub-nav-list">
<li>Detail: </li>
-<li>Field | </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>
@@ -107,6 +107,15 @@ loadScripts(document, 'script');</script>
<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>private static javafx.stage.Stage</code></div>
+<div class="col-second even-row-color"><code><a href="#stage" class="member-name-link">stage</a></code></div>
+<div class="col-last even-row-color"> </div>
+</div>
<div class="inherited-list">
<h3 id="fields-inherited-from-class-javafx.application.Application">Fields inherited from class javafx.application.Application</h3>
<code>STYLESHEET_CASPIAN, STYLESHEET_MODENA</code></div>
@@ -172,6 +181,20 @@ loadScripts(document, 'script');</script>
</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="stage">
+<h3>stage</h3>
+<div class="member-signature"><span class="modifiers">private static</span> <span class="return-type">javafx.stage.Stage</span> <span class="element-name">stage</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
index 5025b34..d64e6e4 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 CEST 2022 -->
<title>BattleSimulationSingleton</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-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client, class: BattleSimulationSingleton">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
@@ -46,14 +46,14 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </li>
-<li>Constr | </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>Field | </li>
-<li>Constr | </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>
@@ -90,6 +90,63 @@ loadScripts(document, 'script');</script>
</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>private final int</code></div>
+<div class="col-second even-row-color"><code><a href="#amountOfArmies" class="member-name-link">amountOfArmies</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private <a href="../battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></code></div>
+<div class="col-second odd-row-color"><code><a href="#battle" class="member-name-link">battle</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private static final <a href="BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></code></div>
+<div class="col-second even-row-color"><code><a href="#battleSimulationSingleton" class="member-name-link">battleSimulationSingleton</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final <a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a>[]</code></div>
+<div class="col-second odd-row-color"><code><a href="#currentArmies" class="member-name-link">currentArmies</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private int</code></div>
+<div class="col-second even-row-color"><code><a href="#currentArmyNumber" class="member-name-link">currentArmyNumber</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final <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="#filePaths" class="member-name-link">filePaths</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private <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 even-row-color"><code><a href="#importedLinesSkipped" class="member-name-link">importedLinesSkipped</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final <a href="../battle/Army.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Army</a>[]</code></div>
+<div class="col-second odd-row-color"><code><a href="#originalArmies" class="member-name-link">originalArmies</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private final int[]</code></div>
+<div class="col-second even-row-color"><code><a href="#scores" class="member-name-link">scores</a></code></div>
+<div class="col-last even-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 three-column-summary">
+<div class="table-header col-first">Modifier</div>
+<div class="table-header col-second">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>private </code></div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">BattleSimulationSingleton</a>()</code></div>
+<div class="col-last even-row-color">
+<div class="block">Private constructor to uphold
+ singleton design pattern.</div>
+</div>
+</div>
+</section>
+</li>
<!-- ========== METHOD SUMMARY =========== -->
<li>
<section class="method-summary" id="method-summary">
@@ -217,6 +274,85 @@ loadScripts(document, 'script');</script>
</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="battleSimulationSingleton">
+<h3>battleSimulationSingleton</h3>
+<div class="member-signature"><span class="modifiers">private static final</span> <span class="return-type"><a href="BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></span> <span class="element-name">battleSimulationSingleton</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="battle">
+<h3>battle</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type"><a href="../battle/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></span> <span class="element-name">battle</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="originalArmies">
+<h3>originalArmies</h3>
+<div class="member-signature"><span class="modifiers">private final</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">originalArmies</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="currentArmies">
+<h3>currentArmies</h3>
+<div class="member-signature"><span class="modifiers">private final</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">currentArmies</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="scores">
+<h3>scores</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int[]</span> <span class="element-name">scores</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="filePaths">
+<h3>filePaths</h3>
+<div class="member-signature"><span class="modifiers">private final</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">filePaths</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="importedLinesSkipped">
+<h3>importedLinesSkipped</h3>
+<div class="member-signature"><span class="modifiers">private</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">importedLinesSkipped</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="amountOfArmies">
+<h3>amountOfArmies</h3>
+<div class="member-signature"><span class="modifiers">private final</span> <span class="return-type">int</span> <span class="element-name">amountOfArmies</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="currentArmyNumber">
+<h3>currentArmyNumber</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">int</span> <span class="element-name">currentArmyNumber</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>BattleSimulationSingleton</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="element-name">BattleSimulationSingleton</span>()</div>
+<div class="block">Private constructor to uphold
+ singleton design pattern.
+ initializes the arrays.</div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ============ METHOD DETAIL ========== -->
<li>
<section class="method-details" id="method-detail">
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 9296dec..8a60104 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client, class: Main">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
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
index 8f9de66..63f033d 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -98,6 +98,81 @@ implements javafx.fxml.Initializable</span></div>
</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>private javafx.scene.control.Label[]</code></div>
+<div class="col-second even-row-color"><code><a href="#armyImportPathLabels" class="member-name-link">armyImportPathLabels</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private javafx.scene.control.Label[]</code></div>
+<div class="col-second odd-row-color"><code><a href="#armyNameLabels" class="member-name-link">armyNameLabels</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.Label</code></div>
+<div class="col-second even-row-color"><code><a href="#armyOneImportPath" class="member-name-link">armyOneImportPath</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private javafx.scene.control.Label</code></div>
+<div class="col-second odd-row-color"><code><a href="#armyOneName" class="member-name-link">armyOneName</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.Label</code></div>
+<div class="col-second even-row-color"><code><a href="#armyOneToString" class="member-name-link">armyOneToString</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private 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 odd-row-color"><code><a href="#armyOneUnitsListView" class="member-name-link">armyOneUnitsListView</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.Label[]</code></div>
+<div class="col-second even-row-color"><code><a href="#armySummaryLabels" class="member-name-link">armySummaryLabels</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private javafx.scene.control.Label</code></div>
+<div class="col-second odd-row-color"><code><a href="#armyTwoImportPath" class="member-name-link">armyTwoImportPath</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.Label</code></div>
+<div class="col-second even-row-color"><code><a href="#armyTwoName" class="member-name-link">armyTwoName</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private javafx.scene.control.Label</code></div>
+<div class="col-second odd-row-color"><code><a href="#armyTwoToString" class="member-name-link">armyTwoToString</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private 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="#armyTwoUnitsListView" class="member-name-link">armyTwoUnitsListView</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private 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 odd-row-color"><code><a href="#armyUnitListViews" class="member-name-link">armyUnitListViews</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private 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 even-row-color"><code><a href="#attackList" class="member-name-link">attackList</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private javafx.scene.control.Button[]</code></div>
+<div class="col-second odd-row-color"><code><a href="#editArmyButtons" class="member-name-link">editArmyButtons</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.Button</code></div>
+<div class="col-second even-row-color"><code><a href="#editArmyOneButton" class="member-name-link">editArmyOneButton</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private javafx.scene.control.Button</code></div>
+<div class="col-second odd-row-color"><code><a href="#editArmyTwoButton" class="member-name-link">editArmyTwoButton</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.Label</code></div>
+<div class="col-second even-row-color"><code><a href="#lastSimulation" class="member-name-link">lastSimulation</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private javafx.scene.control.Button</code></div>
+<div class="col-second odd-row-color"><code><a href="#resetAndBattleButton" class="member-name-link">resetAndBattleButton</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.Button</code></div>
+<div class="col-second even-row-color"><code><a href="#resetArmiesButton" class="member-name-link">resetArmiesButton</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private javafx.scene.control.Label</code></div>
+<div class="col-second odd-row-color"><code><a href="#score" class="member-name-link">score</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.ChoiceBox<<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"><code><a href="#terrainChoiceBox" class="member-name-link">terrainChoiceBox</a></code></div>
+<div class="col-last even-row-color"> </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -160,30 +235,37 @@ implements javafx.fxml.Initializable</span></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-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>private void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#importArmy(int)" class="member-name-link">importArmy</a><wbr>(int armyNumber)</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 class="block">Helper method to import an army and
+ display its information in the
+ given label 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="#importArmyTwo()" class="member-name-link">importArmyTwo</a>()</code></div>
+<div class="col-second even-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 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 class="block">Imports an army for the first 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-second odd-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 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 class="block">Imports an army for the second 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="#resetArmies()" class="member-name-link">resetArmies</a>()</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 clicking on reset armies.</div>
+<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-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-second odd-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 odd-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 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="#runSimulation()" class="member-name-link">runSimulation</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 the button reset and run.</div>
</div>
</div>
@@ -198,6 +280,140 @@ implements javafx.fxml.Initializable</span></div>
</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="terrainChoiceBox">
+<h3>terrainChoiceBox</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.ChoiceBox<<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">terrainChoiceBox</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="resetArmiesButton">
+<h3>resetArmiesButton</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Button</span> <span class="element-name">resetArmiesButton</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="resetAndBattleButton">
+<h3>resetAndBattleButton</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Button</span> <span class="element-name">resetAndBattleButton</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="editArmyOneButton">
+<h3>editArmyOneButton</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Button</span> <span class="element-name">editArmyOneButton</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="editArmyTwoButton">
+<h3>editArmyTwoButton</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Button</span> <span class="element-name">editArmyTwoButton</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyOneImportPath">
+<h3>armyOneImportPath</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">armyOneImportPath</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyOneName">
+<h3>armyOneName</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">armyOneName</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyOneToString">
+<h3>armyOneToString</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">armyOneToString</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyOneUnitsListView">
+<h3>armyOneUnitsListView</h3>
+<div class="member-signature"><span class="modifiers">private</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">armyOneUnitsListView</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyTwoUnitsListView">
+<h3>armyTwoUnitsListView</h3>
+<div class="member-signature"><span class="modifiers">private</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">armyTwoUnitsListView</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyTwoImportPath">
+<h3>armyTwoImportPath</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">armyTwoImportPath</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyTwoName">
+<h3>armyTwoName</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">armyTwoName</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyTwoToString">
+<h3>armyTwoToString</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">armyTwoToString</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyImportPathLabels">
+<h3>armyImportPathLabels</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label[]</span> <span class="element-name">armyImportPathLabels</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyNameLabels">
+<h3>armyNameLabels</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label[]</span> <span class="element-name">armyNameLabels</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armySummaryLabels">
+<h3>armySummaryLabels</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label[]</span> <span class="element-name">armySummaryLabels</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="armyUnitListViews">
+<h3>armyUnitListViews</h3>
+<div class="member-signature"><span class="modifiers">private</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">armyUnitListViews</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="editArmyButtons">
+<h3>editArmyButtons</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Button[]</span> <span class="element-name">editArmyButtons</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="attackList">
+<h3>attackList</h3>
+<div class="member-signature"><span class="modifiers">private</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">attackList</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="lastSimulation">
+<h3>lastSimulation</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">lastSimulation</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="score">
+<h3>score</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Label</span> <span class="element-name">score</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
@@ -236,6 +452,20 @@ implements javafx.fxml.Initializable</span></div>
</section>
</li>
<li>
+<section class="detail" id="importArmy(int)">
+<h3>importArmy</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">void</span> <span class="element-name">importArmy</span><wbr><span class="parameters">(int armyNumber)</span></div>
+<div class="block">Helper method to import an army and
+ display its information in the
+ given label elements.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>armyNumber</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="deepCopyArmiesAndCreateBattle()">
<h3>deepCopyArmiesAndCreateBattle</h3>
<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">deepCopyArmiesAndCreateBattle</span>()
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
index 5469fc0..74ddf70 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -140,15 +140,18 @@ implements javafx.fxml.Initializable</span></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-first odd-row-color"><code>private javafx.collections.ObservableList<<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="#observableChangelog" class="member-name-link">observableChangelog</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-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="#unitsHealthSpinner" class="member-name-link">unitsHealthSpinner</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-first odd-row-color"><code>javafx.scene.control.TextField</code></div>
+<div class="col-second odd-row-color"><code><a href="#unitsNameField" class="member-name-link">unitsNameField</a></code></div>
<div class="col-last odd-row-color"> </div>
+<div class="col-first even-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 even-row-color"><code><a href="#unitsTypeComboBox" class="member-name-link">unitsTypeComboBox</a></code></div>
+<div class="col-last even-row-color"> </div>
</div>
</section>
</li>
@@ -329,6 +332,12 @@ implements javafx.fxml.Initializable</span></div>
<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>
+<li>
+<section class="detail" id="observableChangelog">
+<h3>observableChangelog</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.collections.ObservableList<<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">observableChangelog</span></div>
+</section>
+</li>
</ul>
</section>
</li>
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
index 196730b..12f4f55 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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
index 15d3e9f..35f8962 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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 61f1419..3b92982 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.dialogs, class: DialogBox">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
@@ -16,7 +16,11 @@
<script type="text/javascript" src="../../../../../../../script-dir/jquery-ui.min.js"></script>
</head>
<body class="class-declaration-page">
-<script type="text/javascript">var pathtoroot = "../../../../../../../";
+<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>
@@ -50,7 +54,7 @@ loadScripts(document, 'script');</script>
<li>Detail: </li>
<li>Field | </li>
<li><a href="#constructor-detail">Constr</a> | </li>
-<li>Method</li>
+<li><a href="#method-detail">Method</a></li>
</ul>
</div>
<div class="nav-list-search"><label for="search-input">SEARCH:</label>
@@ -88,7 +92,7 @@ loadScripts(document, 'script');</script>
a builder to build a dialog box.</div>
<dl class="notes">
<dt>Version:</dt>
-<dd>1.2 01.05.2022</dd>
+<dd>1.3 23.05.2022</dd>
<dt>Author:</dt>
<dd>Carl Gützkow</dd>
</dl>
@@ -137,6 +141,26 @@ loadScripts(document, 'script');</script>
<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="#setImage(javafx.scene.image.Image)" class="member-name-link">setImage</a><wbr>(javafx.scene.image.Image image)</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 graphic of the alert to a given image.</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="#setListMessage(java.util.List)" class="member-name-link">setListMessage</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="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>> listMessage)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Adds a list view node to the expandable content of the dialog.</div>
+</div>
+</div>
+</div>
+</div>
<div class="inherited-list">
<h3 id="methods-inherited-from-class-javafx.scene.control.Alert">Methods inherited from class javafx.scene.control.Alert</h3>
<code>alertTypeProperty, getAlertType, getButtonTypes, setAlertType</code></div>
@@ -178,6 +202,36 @@ loadScripts(document, 'script');</script>
</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="setImage(javafx.scene.image.Image)">
+<h3>setImage</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setImage</span><wbr><span class="parameters">(javafx.scene.image.Image image)</span></div>
+<div class="block">Sets the graphic of the alert to a given image.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>image</code> - Image - graphical image of the dialog box</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="setListMessage(java.util.List)">
+<h3>setListMessage</h3>
+<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">setListMessage</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="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>> listMessage)</span></div>
+<div class="block">Adds a list view node to the expandable content of the dialog.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>listMessage</code> - List - a list of strings.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
</ul>
</section>
<!-- ========= END OF CLASS DATA ========= -->
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 fcabfb7..8138737 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.dialogs, class: DialogBoxBuilder">
<meta name="generator" content="javadoc/ClassWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
@@ -103,8 +103,26 @@ loadScripts(document, 'script');</script>
<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>static final <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"><code><a href="#recurringDialogMessage" class="member-name-link">recurringDialogMessage</a></code></div>
+<div class="col-first even-row-color"><code>private javafx.scene.control.Alert.AlertType</code></div>
+<div class="col-second even-row-color"><code><a href="#alertType" class="member-name-link">alertType</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private <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="#header" class="member-name-link">header</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private javafx.scene.image.Image</code></div>
+<div class="col-second even-row-color"><code><a href="#image" class="member-name-link">image</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private <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"><code><a href="#listMessages" class="member-name-link">listMessages</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private <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"><code><a href="#message" class="member-name-link">message</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>static final <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="#recurringDialogMessage" class="member-name-link">recurringDialogMessage</a></code></div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"><code>private <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"><code><a href="#title" class="member-name-link">title</a></code></div>
<div class="col-last even-row-color"> </div>
</div>
</section>
@@ -228,6 +246,42 @@ loadScripts(document, 'script');</script>
</dl>
</section>
</li>
+<li>
+<section class="detail" id="alertType">
+<h3>alertType</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.control.Alert.AlertType</span> <span class="element-name">alertType</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="title">
+<h3>title</h3>
+<div class="member-signature"><span class="modifiers">private</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">title</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="header">
+<h3>header</h3>
+<div class="member-signature"><span class="modifiers">private</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">header</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="message">
+<h3>message</h3>
+<div class="member-signature"><span class="modifiers">private</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">message</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="image">
+<h3>image</h3>
+<div class="member-signature"><span class="modifiers">private</span> <span class="return-type">javafx.scene.image.Image</span> <span class="element-name">image</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="listMessages">
+<h3>listMessages</h3>
+<div class="member-signature"><span class="modifiers">private</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">listMessages</span></div>
+</section>
+</li>
</ul>
</section>
</li>
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 f34a883..0f6f047 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.dialogs">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
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 afd6187..3465314 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client.dialogs">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
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 70efd22..7198a5e 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client">
<meta name="generator" content="javadoc/PackageWriterImpl">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
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 0ee1cd9..8bed2ab 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,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="tree: module: edu.ntnu.idatt2001.carljgu.client, package: edu.ntnu.idatt2001.carljgu.client">
<meta name="generator" content="javadoc/PackageTreeWriter">
<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
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
index f2353d0..8298fb4 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
@@ -46,13 +46,13 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Summary: </li>
<li>Nested | </li>
-<li>Field | </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>Field | </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>
@@ -91,6 +91,24 @@ loadScripts(document, 'script');</script>
</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>private final <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"><code><a href="#DELIMITER" class="member-name-link">DELIMITER</a></code></div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"><code>private final <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"><code><a href="#readLinesSkipped" class="member-name-link">readLinesSkipped</a></code></div>
+<div class="col-last odd-row-color"> </div>
+</div>
+</section>
+</li>
<!-- ======== CONSTRUCTOR SUMMARY ======== -->
<li>
<section class="constructor-summary" id="constructor-summary">
@@ -154,6 +172,26 @@ loadScripts(document, 'script');</script>
</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="readLinesSkipped">
+<h3>readLinesSkipped</h3>
+<div class="member-signature"><span class="modifiers">private final</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">readLinesSkipped</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="DELIMITER">
+<h3>DELIMITER</h3>
+<div class="member-signature"><span class="modifiers">private final</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">DELIMITER</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
<!-- ========= CONSTRUCTOR DETAIL ======== -->
<li>
<section class="constructor-details" id="constructor-detail">
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
index ee8ac40..6343c3f 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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
index d4bf8d4..c00130f 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
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
index 4b98f09..aec06e5 100644
--- 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
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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-22">
+<meta name="dc.created" content="2022-05-23">
<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">
diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
index a4e29a6..04766be 100644
--- a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
+++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="declaration: module: edu.ntnu.idatt2001.carljgu.client">
<meta name="generator" content="javadoc/ModuleWriterImpl">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -16,7 +16,11 @@
<script type="text/javascript" src="../script-dir/jquery-ui.min.js"></script>
</head>
<body class="module-declaration-page">
-<script type="text/javascript">var pathtoroot = "../";
+<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>
@@ -42,7 +46,7 @@ loadScripts(document, 'script');</script>
<ul class="sub-nav-list">
<li>Module: </li>
<li>Description | </li>
-<li>Modules | </li>
+<li><a href="#modules-summary">Modules</a> | </li>
<li><a href="#packages-summary">Packages</a> | </li>
<li>Services</li>
</ul>
@@ -69,14 +73,76 @@ loadScripts(document, 'script');</script>
<!-- ============ PACKAGES SUMMARY =========== -->
<h2>Packages</h2>
<div id="package-summary-table">
-<div class="caption"><span>Exports</span></div>
-<div class="summary-table two-column-summary">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="package-summary-table-tab0" role="tab" aria-selected="true" aria-controls="package-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('package-summary-table', 'package-summary-table', 4)" class="active-table-tab">All Packages</button><button id="package-summary-table-tab1" role="tab" aria-selected="false" aria-controls="package-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('package-summary-table', 'package-summary-table-tab1', 4)" class="table-tab">Exports</button><button id="package-summary-table-tab2" role="tab" aria-selected="false" aria-controls="package-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('package-summary-table', 'package-summary-table-tab2', 4)" class="table-tab">Opens</button><button id="package-summary-table-tab3" role="tab" aria-selected="false" aria-controls="package-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('package-summary-table', 'package-summary-table-tab3', 4)" class="table-tab">Concealed</button></div>
+<div id="package-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table four-column-summary" aria-labelledby="package-summary-table-tab0">
<div class="table-header col-first">Package</div>
+<div class="table-header col-second">Exported To Modules</div>
+<div class="table-header col-second">Opened To Modules</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/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 even-row-color package-summary-table package-summary-table-tab3"><a href="edu/ntnu/idatt2001/carljgu/battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a></div>
+<div class="col-second even-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-second even-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-last even-row-color package-summary-table package-summary-table-tab3"> </div>
+<div class="col-first odd-row-color package-summary-table package-summary-table-tab3"><a href="edu/ntnu/idatt2001/carljgu/battle/units/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units</a></div>
+<div class="col-second odd-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-second odd-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-last odd-row-color package-summary-table package-summary-table-tab3"> </div>
+<div class="col-first even-row-color package-summary-table package-summary-table-tab3"><a href="edu/ntnu/idatt2001/carljgu/battle/units/specialized/package-summary.html">edu.ntnu.idatt2001.carljgu.battle.units.specialized</a></div>
+<div class="col-second even-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-second even-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-last even-row-color package-summary-table package-summary-table-tab3"> </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-second odd-row-color package-summary-table package-summary-table-tab1">All Modules</div>
+<div class="col-second odd-row-color package-summary-table package-summary-table-tab1">None</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-tab2"><a href="edu/ntnu/idatt2001/carljgu/client/controllers/package-summary.html">edu.ntnu.idatt2001.carljgu.client.controllers</a></div>
+<div class="col-second even-row-color package-summary-table package-summary-table-tab2">None</div>
+<div class="col-second even-row-color package-summary-table package-summary-table-tab2">javafx.fxml</div>
+<div class="col-last even-row-color package-summary-table package-summary-table-tab2"> </div>
+<div class="col-first odd-row-color package-summary-table package-summary-table-tab3"><a href="edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html">edu.ntnu.idatt2001.carljgu.client.dialogs</a></div>
+<div class="col-second odd-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-second odd-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-last odd-row-color package-summary-table package-summary-table-tab3"> </div>
+<div class="col-first even-row-color package-summary-table package-summary-table-tab3"><a href="edu/ntnu/idatt2001/carljgu/filehandling/package-summary.html">edu.ntnu.idatt2001.carljgu.filehandling</a></div>
+<div class="col-second even-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-second even-row-color package-summary-table package-summary-table-tab3">None</div>
+<div class="col-last even-row-color package-summary-table package-summary-table-tab3"> </div>
</div>
</div>
+</div>
+<div class="caption"><span>Indirect Exports</span></div>
+<div class="details-table two-column-summary">
+<div class="table-header col-first">From</div>
+<div class="table-header col-last">Packages</div>
+<div class="col-first even-row-color">java.base</div>
+<div class="col-last even-row-color">com.sun.crypto.provider com.sun.security.ntlm <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/package-summary.html">java.io</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/package-summary.html">java.lang</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/annotation/package-summary.html">java.lang.annotation</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/constant/package-summary.html">java.lang.constant</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/invoke/package-summary.html">java.lang.invoke</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/module/package-summary.html">java.lang.module</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/ref/package-summary.html">java.lang.ref</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/package-summary.html">java.lang.reflect</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/runtime/package-summary.html">java.lang.runtime</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/package-summary.html">java.math</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/package-summary.html">java.net</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/spi/package-summary.html">java.net.spi</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/package-summary.html">java.nio</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/channels/package-summary.html">java.nio.channels</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/channels/spi/package-summary.html">java.nio.channels.spi</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/charset/package-summary.html">java.nio.charset</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/charset/spi/package-summary.html">java.nio.charset.spi</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/package-summary.html">java.nio.file</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/attribute/package-summary.html">java.nio.file.attribute</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/spi/package-summary.html">java.nio.file.spi</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/package-summary.html">java.security</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/package-summary.html">java.security.cert</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/interfaces/package-summary.html">java.security.interfaces</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/spec/package-summary.html">java.security.spec</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/text/package-summary.html">java.text</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/text/spi/package-summary.html">java.text.spi</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/package-summary.html">java.time</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/chrono/package-summary.html">java.time.chrono</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/format/package-summary.html">java.time.format</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/temporal/package-summary.html">java.time.temporal</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/zone/package-summary.html">java.time.zone</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/package-summary.html">java.util</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/package-summary.html">java.util.concurrent</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/atomic/package-summary.html">java.util.concurrent.atomic</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/locks/package-summary.html">java.util.concurrent.locks</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/package-summary.html">java.util.function</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/jar/package-summary.html">java.util.jar</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/random/package-summary.html">java.util.random</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/regex/package-summary.html">java.util.regex</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/package-summary.html">java.util.spi</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/package-summary.html">java.util.stream</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/zip/package-summary.html">java.util.zip</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/crypto/package-summary.html">javax.crypto</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/crypto/interfaces/package-summary.html">javax.crypto.interfaces</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/crypto/spec/package-summary.html">javax.crypto.spec</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/package-summary.html">javax.net</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/package-summary.html">javax.net.ssl</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/security/auth/package-summary.html">javax.security.auth</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/security/auth/callback/package-summary.html">javax.security.auth.callback</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/security/auth/login/package-summary.html">javax.security.auth.login</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/security/auth/spi/package-summary.html">javax.security.auth.spi</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/security/auth/x500/package-summary.html">javax.security.auth.x500</a> <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/security/cert/package-summary.html">javax.security.cert</a> jdk.internal.access jdk.internal.access.foreign jdk.internal.event jdk.internal.invoke jdk.internal.javac jdk.internal.jimage jdk.internal.jimage.decompressor jdk.internal.jmod jdk.internal.loader jdk.internal.logger jdk.internal.misc jdk.internal.module jdk.internal.org.objectweb.asm jdk.internal.org.objectweb.asm.commons jdk.internal.org.objectweb.asm.tree jdk.internal.org.objectweb.asm.util jdk.internal.org.xml.sax jdk.internal.org.xml.sax.helpers jdk.internal.perf jdk.internal.platform jdk.internal.ref jdk.internal.reflect jdk.internal.util jdk.internal.util.jar jdk.internal.util.random jdk.internal.util.xml jdk.internal.util.xml.impl jdk.internal.vm jdk.internal.vm.annotation jdk.internal.vm.vector sun.invoke.util sun.net sun.net.dns sun.net.ext sun.net.util sun.net.www sun.net.www.protocol.http sun.nio.ch sun.nio.cs sun.nio.fs sun.reflect.annotation sun.reflect.generics.reflectiveObjects sun.reflect.misc sun.security.action sun.security.internal.interfaces sun.security.internal.spec sun.security.jca sun.security.pkcs sun.security.provider sun.security.provider.certpath sun.security.rsa sun.security.timestamp sun.security.tools sun.security.util sun.security.util.math sun.security.util.math.intpoly sun.security.validator sun.security.x509 sun.util.cldr sun.util.locale.provider sun.util.logging sun.util.resources</div>
+<div class="col-first odd-row-color">javafx.controls</div>
+<div class="col-last odd-row-color">com.sun.javafx.scene.control com.sun.javafx.scene.control.behavior com.sun.javafx.scene.control.inputmap com.sun.javafx.scene.control.skin javafx.scene.chart javafx.scene.control javafx.scene.control.cell javafx.scene.control.skin</div>
+<div class="col-first even-row-color">javafx.fxml</div>
+<div class="col-last even-row-color">javafx.fxml</div>
+</div>
+</section>
+</li>
+<li>
+<section class="modules-summary" id="modules-summary">
+<!-- ============ MODULES SUMMARY =========== -->
+<h2>Modules</h2>
+<div class="caption"><span>Requires</span></div>
+<div class="details-table three-column-summary">
+<div class="table-header col-first">Modifier</div>
+<div class="table-header col-second">Module</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"> </div>
+<div class="col-second even-row-color">java.base</div>
+<div class="col-last even-row-color"> </div>
+<div class="col-first odd-row-color"> </div>
+<div class="col-second odd-row-color">javafx.controls</div>
+<div class="col-last odd-row-color"> </div>
+<div class="col-first even-row-color"> </div>
+<div class="col-second even-row-color">javafx.fxml</div>
+<div class="col-last even-row-color"> </div>
+</div>
</section>
</li>
</ul>
diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html
index 8d41d3c..5ed22b0 100644
--- a/javadoc/help-doc.html
+++ b/javadoc/help-doc.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="help">
<meta name="generator" content="javadoc/HelpWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/index-files/index-1.html b/javadoc/index-files/index-1.html
index 97bdb4e..fb39f80 100644
--- a/javadoc/index-files/index-1.html
+++ b/javadoc/index-files/index-1.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: A">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,7 +51,7 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/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>
@@ -73,8 +73,12 @@ loadScripts(document, 'script');</script>
</dd>
<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/dialogs/DialogBoxBuilder.html#alertType" class="member-name-link">alertType</a> - 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/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/BattleSimulationSingleton.html#amountOfArmies" class="member-name-link">amountOfArmies</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
<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>
@@ -84,6 +88,8 @@ 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/battle/units/Unit.html#armor" class="member-name-link">armor</a> - Variable 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> </dd>
<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>
@@ -106,18 +112,64 @@ loadScripts(document, 'script');</script>
<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/controllers/BattleController.html#armyImportPathLabels" class="member-name-link">armyImportPathLabels</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyNameLabels" class="member-name-link">armyNameLabels</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#armyOne" class="member-name-link">armyOne</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyOneImportPath" class="member-name-link">armyOneImportPath</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyOneName" class="member-name-link">armyOneName</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyOneToString" class="member-name-link">armyOneToString</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyOneUnitsListView" class="member-name-link">armyOneUnitsListView</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armySummaryLabels" class="member-name-link">armySummaryLabels</a> - Variable 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> </dd>
<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/battle/Battle.html#armyTwo" class="member-name-link">armyTwo</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyTwoImportPath" class="member-name-link">armyTwoImportPath</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyTwoName" class="member-name-link">armyTwoName</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyTwoToString" class="member-name-link">armyTwoToString</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyTwoUnitsListView" class="member-name-link">armyTwoUnitsListView</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#armyUnitListViews" class="member-name-link">armyUnitListViews</a> - Variable 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> </dd>
<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/client/BattleSimulationSingleton.html#atLestOneOriginalArmyIsNull()" class="member-name-link">atLestOneOriginalArmyIsNull()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
<div class="block">Checks if more than one army is null</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#attack" class="member-name-link">attack</a> - Variable 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> </dd>
<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/units/specialized/InfantryUnit.html#ATTACK_BONUS" class="member-name-link">ATTACK_BONUS</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#ATTACK_BONUS" class="member-name-link">ATTACK_BONUS</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html#attacker" class="member-name-link">attacker</a> - Variable in 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>
+ </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html#attackingArmy" class="member-name-link">attackingArmy</a> - Variable in 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>
+ </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#attackList" class="member-name-link">attackList</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#attackLog" class="member-name-link">attackLog</a> - Variable 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> </dd>
<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
@@ -127,7 +179,7 @@ loadScripts(document, 'script');</script>
from the attack.</div>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-10.html b/javadoc/index-files/index-10.html
index 80e224d..e85e150 100644
--- a/javadoc/index-files/index-10.html
+++ b/javadoc/index-files/index-10.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
-<title>M-Index</title>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 CEST 2022 -->
+<title>L-Index</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-22">
-<meta name="description" content="index: M">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: L">
<meta name="generator" content="javadoc/IndexWriter">
<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">
@@ -51,22 +51,15 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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:M">M</h2>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:L">L</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html#main(java.lang.String%5B%5D)" class="member-name-link">main(String[])</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></dt>
-<dd>
-<div class="block">Method to first be launched when the program is run</div>
-</dd>
-<dt><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> - 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>
-<div class="block">The main class that is run when the application
- is called upon.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html#%3Cinit%3E()" class="member-name-link">Main()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></dt>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#lastSimulation" class="member-name-link">lastSimulation</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#listMessages" class="member-name-link">listMessages</a> - 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>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-11.html b/javadoc/index-files/index-11.html
index 2aba7c4..6b3bf2d 100644
--- a/javadoc/index-files/index-11.html
+++ b/javadoc/index-files/index-11.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
-<title>P-Index</title>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
-<meta name="description" content="index: P">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: M">
<meta name="generator" content="javadoc/IndexWriter">
<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">
@@ -51,13 +51,26 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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:P">P</h2>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:M">M</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#PLAINS" class="member-name-link">PLAINS</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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html#main(java.lang.String%5B%5D)" class="member-name-link">main(String[])</a> - Static method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></dt>
+<dd>
+<div class="block">Method to first be launched when the program is run</div>
+</dd>
+<dt><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> - 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>
+<div class="block">The main class that is run when the application
+ is called upon.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html#%3Cinit%3E()" class="member-name-link">Main()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html" title="class in edu.ntnu.idatt2001.carljgu.client">Main</a></dt>
+<dd> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#MELEE_ATTACK_BONUS" class="member-name-link">MELEE_ATTACK_BONUS</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#message" class="member-name-link">message</a> - 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>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-12.html b/javadoc/index-files/index-12.html
index ef65b71..aeeca4e 100644
--- a/javadoc/index-files/index-12.html
+++ b/javadoc/index-files/index-12.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
-<title>R-Index</title>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 CEST 2022 -->
+<title>N-Index</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-22">
-<meta name="description" content="index: R">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: N">
<meta name="generator" content="javadoc/IndexWriter">
<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">
@@ -51,54 +51,15 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:N">N</h2>
<dl class="index">
-<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Army.html#name" class="member-name-link">name</a> - Variable 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> </dd>
-<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/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/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/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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/Unit.html#name" class="member-name-link">name</a> - Variable 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> </dd>
-<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/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>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#resetScores()" class="member-name-link">resetScores()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
-<dd>
-<div class="block">Fills the array with scores with zeroes</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#run(java.lang.String%5B%5D)" class="member-name-link">run(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">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/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>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-13.html b/javadoc/index-files/index-13.html
index 30cb80c..5c0424c 100644
--- a/javadoc/index-files/index-13.html
+++ b/javadoc/index-files/index-13.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
-<title>S-Index</title>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 CEST 2022 -->
+<title>O-Index</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-22">
-<meta name="description" content="index: S">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: O">
<meta name="generator" content="javadoc/IndexWriter">
<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">
@@ -51,92 +51,15 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:O">O</h2>
<dl class="index">
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)" class="member-name-link">setBattle(Battle)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
-<dd>
-<div class="block">Sets the current battle.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setCurrentArmyByNumber(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
-<dd>
-<div class="block">Sets current army at an army index number.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setCurrentArmyNumber(int)" class="member-name-link">setCurrentArmyNumber(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
-<dd>
-<div class="block">Sets current army index number.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setFilePathByNumber(int,java.lang.String)" class="member-name-link">setFilePathByNumber(int, String)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
-<dd>
-<div class="block">Sets file path at an army index number.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setHeader(java.lang.String)" class="member-name-link">setHeader(String)</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>
-<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/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>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setImage(java.lang.String)" class="member-name-link">setImage(String)</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>
-<div class="block">Add image to the dialog box builder configuration.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setImportedLinesSkipped(java.util.List)" class="member-name-link">setImportedLinesSkipped(List<String>)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
-<dd>
-<div class="block">Sets which lines were skipped during import.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setListMessage(java.util.List)" class="member-name-link">setListMessage(List<String>)</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>
-<div class="block">Adds a list message for the dialog box.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setMessage(java.lang.String)" class="member-name-link">setMessage(String)</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>
-<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/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/BattleSimulationSingleton.html#setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setOriginalArmyByNumber(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
-<dd>
-<div class="block">Sets original army at an army index number.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setScoreByNumber(int,int)" class="member-name-link">setScoreByNumber(int, int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
-<dd>
-<div class="block">Sets score at an army index number.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setTitle(java.lang.String)" class="member-name-link">setTitle(String)</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>
-<div class="block">Set title to the dialog box builder configuration.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#simulate()" class="member-name-link">simulate()</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">Simulate a battle.</div>
-</dd>
-<dt><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> - 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="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Provided no extra functionality and made the program harder to read.
- 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.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>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#start(javafx.stage.Stage)" class="member-name-link">start(Stage)</a> - 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">Overridden from Application.</div>
-</dd>
-<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>
-</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#observableChangelog" class="member-name-link">observableChangelog</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/BattleSimulationSingleton.html#originalArmies" class="member-name-link">originalArmies</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-14.html b/javadoc/index-files/index-14.html
index 7503134..20b9855 100644
--- a/javadoc/index-files/index-14.html
+++ b/javadoc/index-files/index-14.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
-<title>T-Index</title>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
-<meta name="description" content="index: T">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: P">
<meta name="generator" content="javadoc/IndexWriter">
<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">
@@ -51,35 +51,15 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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:T">T</h2>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:P">P</h2>
<dl class="index">
-<dt><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> - Enum 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">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/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>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.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/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></dt>
-<dd>
-<div class="block">Overrides toString() method from Object.</div>
-</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.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/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">Overrides the toString() method
- and returns an output used in the
- GUI.</div>
-</dd>
-<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#PLAINS" class="member-name-link">PLAINS</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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#PLAINS_BONUS" class="member-name-link">PLAINS_BONUS</a> - Variable 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> </dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-15.html b/javadoc/index-files/index-15.html
index 684b334..5617950 100644
--- a/javadoc/index-files/index-15.html
+++ b/javadoc/index-files/index-15.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
-<title>U-Index</title>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
-<meta name="description" content="index: U">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: R">
<meta name="generator" content="javadoc/IndexWriter">
<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">
@@ -51,44 +51,66 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/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>
+<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/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">The abstract class Unit.</div>
+<div class="block">Class RangedUnit that inherits from Unit.</div>
</dd>
-<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>
+<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">Checks validity of name and health.</div>
+<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/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>
+<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">A class to simply and elegantly create units.</div>
+<div class="block">Instantiates a new Ranged unit.</div>
</dd>
-<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#readableName" class="member-name-link">readableName</a> - Variable 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>
-<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>
+<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/filehandling/ArmyFileHandler.html#readLinesSkipped" class="member-name-link">readLinesSkipped</a> - Variable 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> </dd>
-<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>
+<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/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/controllers/BattleController.html#resetAndBattleButton" class="member-name-link">resetAndBattleButton</a> - Variable 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> </dd>
-<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>
+<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#resetArmiesButton" class="member-name-link">resetArmiesButton</a> - Variable 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> </dd>
-<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#resetScores()" class="member-name-link">resetScores()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
-<div class="block">An enum that represents the different unit types
- that an army can contain.</div>
+<div class="block">Fills the array with scores with zeroes</div>
</dd>
-<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#RESIST_BONUS" class="member-name-link">RESIST_BONUS</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#RESIST_BONUS" class="member-name-link">RESIST_BONUS</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#run(java.lang.String%5B%5D)" class="member-name-link">run(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">Update army and go back.</div>
+<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/controllers/EditArmyController.html#updateComponentsWithInformation()" class="member-name-link">updateComponentsWithInformation()</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>
+<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">Update all fields and labels with updated information.</div>
+<div class="block">Run when clicking on the button reset and run.</div>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-16.html b/javadoc/index-files/index-16.html
index 8a29c9e..0935555 100644
--- a/javadoc/index-files/index-16.html
+++ b/javadoc/index-files/index-16.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
-<title>V-Index</title>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
-<meta name="description" content="index: V">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: S">
<meta name="generator" content="javadoc/IndexWriter">
<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">
@@ -51,29 +51,106 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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:V">V</h2>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/battle/Terrain.html#valueOf(java.lang.String)" class="member-name-link">valueOf(String)</a> - Static method 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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#score" class="member-name-link">score</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#scores" class="member-name-link">scores</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)" class="member-name-link">setBattle(Battle)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
-<div class="block">Returns the enum constant of this class with the specified name.</div>
+<div class="block">Sets the current battle.</div>
</dd>
-<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setCurrentArmyByNumber(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
-<div class="block">Returns the enum constant of this class with the specified name.</div>
+<div class="block">Sets current army at an army index number.</div>
</dd>
-<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#values()" class="member-name-link">values()</a> - Static method 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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setCurrentArmyNumber(int)" class="member-name-link">setCurrentArmyNumber(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
-<div class="block">Returns an array containing the constants of this enum class, in
-the order they are declared.</div>
+<div class="block">Sets current army index number.</div>
</dd>
-<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setFilePathByNumber(int,java.lang.String)" class="member-name-link">setFilePathByNumber(int, String)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
-<div class="block">Returns an array containing the constants of this enum class, in
-the order they are declared.</div>
+<div class="block">Sets file path at an army index number.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setHeader(java.lang.String)" class="member-name-link">setHeader(String)</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>
+<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/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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setImage(java.lang.String)" class="member-name-link">setImage(String)</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>
+<div class="block">Add image to the dialog box builder configuration.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html#setImage(javafx.scene.image.Image)" class="member-name-link">setImage(Image)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBox</a></dt>
+<dd>
+<div class="block">Sets the graphic of the alert to a given image.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setImportedLinesSkipped(java.util.List)" class="member-name-link">setImportedLinesSkipped(List<String>)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Sets which lines were skipped during import.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html#setListMessage(java.util.List)" class="member-name-link">setListMessage(List<String>)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.dialogs.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html" title="class in edu.ntnu.idatt2001.carljgu.client.dialogs">DialogBox</a></dt>
+<dd>
+<div class="block">Adds a list view node to the expandable content of the dialog.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setListMessage(java.util.List)" class="member-name-link">setListMessage(List<String>)</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>
+<div class="block">Adds a list message for the dialog box.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setMessage(java.lang.String)" class="member-name-link">setMessage(String)</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>
+<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/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/BattleSimulationSingleton.html#setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)" class="member-name-link">setOriginalArmyByNumber(int, Army)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Sets original army at an army index number.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#setScoreByNumber(int,int)" class="member-name-link">setScoreByNumber(int, int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Sets score at an army index number.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#setTitle(java.lang.String)" class="member-name-link">setTitle(String)</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>
+<div class="block">Set title to the dialog box builder configuration.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#simulate()" class="member-name-link">simulate()</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">Simulate a battle.</div>
+</dd>
+<dt><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> - 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="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Provided no extra functionality and made the program harder to read.
+ 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.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>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#stage" class="member-name-link">stage</a> - Static variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html#start(javafx.stage.Stage)" class="member-name-link">start(Stage)</a> - 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">Overridden from Application.</div>
+</dd>
+<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>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-17.html b/javadoc/index-files/index-17.html
index e67c9c6..de8fe5b 100644
--- a/javadoc/index-files/index-17.html
+++ b/javadoc/index-files/index-17.html
@@ -1,12 +1,12 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
-<title>W-Index</title>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
-<meta name="description" content="index: W">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: T">
<meta name="generator" content="javadoc/IndexWriter">
<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">
@@ -51,19 +51,53 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:T">T</h2>
<dl class="index">
-<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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html#terrain" class="member-name-link">terrain</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html#terrain" class="member-name-link">terrain</a> - Variable in 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="block">Writes the changed army to a csv file.</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+ </dd>
+<dt><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> - Enum 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">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/battle/Terrain.html#%3Cinit%3E(java.lang.String)" class="member-name-link">Terrain(String)</a> - Constructor for 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>
+<div class="block">The enum constructor</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#terrainChoiceBox" class="member-name-link">terrainChoiceBox</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#terrains" class="member-name-link">terrains</a> - Static variable 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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#timesResisted" class="member-name-link">timesResisted</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#title" class="member-name-link">title</a> - 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/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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.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/Battle.html" title="class in edu.ntnu.idatt2001.carljgu.battle">Battle</a></dt>
+<dd>
+<div class="block">Overrides toString() method from Object.</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.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/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">Overrides the toString() method
+ and returns an output used in the
+ GUI.</div>
</dd>
-<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>
+<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">Creates a file to write on or writes to an existing file.</div>
+<div class="block">Overrides toString() method from Object.</div>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-18.html b/javadoc/index-files/index-18.html
new file mode 100644
index 0000000..911a0e6
--- /dev/null
+++ b/javadoc/index-files/index-18.html
@@ -0,0 +1,105 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: U">
+<meta name="generator" content="javadoc/IndexWriter">
+<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="index-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="../edu.ntnu.idatt2001.carljgu.client/module-summary.html">Module</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="nav-bar-cell1-rev">Index</li>
+<li><a href="../help-doc.html#index">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>Index</h1>
+</div>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/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/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/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/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/battle/Army.html#units" class="member-name-link">units</a> - Variable 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> </dd>
+<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/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/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/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/battle/units/UnitType.html#%3Cinit%3E(java.lang.String)" class="member-name-link">UnitType(String)</a> - Constructor for 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">The enum constructor</div>
+</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#unitTypes" class="member-name-link">unitTypes</a> - Static variable 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/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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/EditArmyController.html#updateComponentsWithInformation()" class="member-name-link">updateComponentsWithInformation()</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/battle/units/specialized/CavalryUnit.html#usedAttackBonus" class="member-name-link">usedAttackBonus</a> - Variable 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> </dd>
+</dl>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/index-files/index-19.html b/javadoc/index-files/index-19.html
new file mode 100644
index 0000000..e6a3af8
--- /dev/null
+++ b/javadoc/index-files/index-19.html
@@ -0,0 +1,80 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: V">
+<meta name="generator" content="javadoc/IndexWriter">
+<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="index-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="../edu.ntnu.idatt2001.carljgu.client/module-summary.html">Module</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="nav-bar-cell1-rev">Index</li>
+<li><a href="../help-doc.html#index">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>Index</h1>
+</div>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:V">V</h2>
+<dl class="index">
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#valueOf(java.lang.String)" class="member-name-link">valueOf(String)</a> - Static method 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>
+<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/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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#values()" class="member-name-link">values()</a> - Static method 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>
+<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/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>
+</dd>
+</dl>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/index-files/index-2.html b/javadoc/index-files/index-2.html
index 3f6475a..4111256 100644
--- a/javadoc/index-files/index-2.html
+++ b/javadoc/index-files/index-2.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: B">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,9 +51,11 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:B">B</h2>
<dl class="index">
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#battle" class="member-name-link">battle</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
<dt><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> - 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">Class Battle that simulates a battle between two armies.</div>
@@ -69,10 +71,17 @@ loadScripts(document, 'script');</script>
</dd>
<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/BattleSimulationSingleton.html#battleSimulationSingleton" class="member-name-link">battleSimulationSingleton</a> - Static variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" class="type-name-link" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</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>
<div class="block">Singleton class to hold information for the controllers.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#%3Cinit%3E()" class="member-name-link">BattleSimulationSingleton()</a> - Constructor for class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd>
+<div class="block">Private constructor to uphold
+ singleton design pattern.</div>
+</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>
<div class="block">Create the dialog box with the
@@ -80,7 +89,7 @@ loadScripts(document, 'script');</script>
builder object.</div>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-20.html b/javadoc/index-files/index-20.html
new file mode 100644
index 0000000..6b23dc2
--- /dev/null
+++ b/javadoc/index-files/index-20.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
+<meta name="dc.created" content="2022-05-23">
+<meta name="description" content="index: W">
+<meta name="generator" content="javadoc/IndexWriter">
+<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="index-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="../edu.ntnu.idatt2001.carljgu.client/module-summary.html">Module</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="../overview-tree.html">Tree</a></li>
+<li><a href="../deprecated-list.html">Deprecated</a></li>
+<li class="nav-bar-cell1-rev">Index</li>
+<li><a href="../help-doc.html#index">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>Index</h1>
+</div>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/battle/Battle.html#winner" class="member-name-link">winner</a> - Variable 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> </dd>
+<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/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>
+</dl>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
+</div>
+</div>
+</body>
+</html>
diff --git a/javadoc/index-files/index-3.html b/javadoc/index-files/index-3.html
index e8b83b8..5542079 100644
--- a/javadoc/index-files/index-3.html
+++ b/javadoc/index-files/index-3.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: C">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,7 +51,7 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/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>
@@ -79,6 +79,8 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Changes the scene of the stage.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/UnitType.html#className" class="member-name-link">className</a> - Variable 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/client/controllers/BattleController.html#clearAttackListAndDisplayArmies()" class="member-name-link">clearAttackListAndDisplayArmies()</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">Clear the simulation attack log and displays to the armies.</div>
@@ -114,8 +116,12 @@ loadScripts(document, 'script');</script>
InfantryUnit, RangedUnit,
CavalryUnit or CommanderUnit.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#currentArmies" class="member-name-link">currentArmies</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#currentArmyNumber" class="member-name-link">currentArmyNumber</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-4.html b/javadoc/index-files/index-4.html
index 48bcc23..ba7b799 100644
--- a/javadoc/index-files/index-4.html
+++ b/javadoc/index-files/index-4.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: D">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,9 +51,13 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/battle/SimulationAttack.html#damageDealt" class="member-name-link">damageDealt</a> - Variable in 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>
+ </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#deepCopyArmiesAndCreateBattle()" class="member-name-link">deepCopyArmiesAndCreateBattle()</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 deep copies of the original armies and selects them as the current armies.</div>
@@ -63,12 +67,22 @@ loadScripts(document, 'script');</script>
<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/battle/SimulationAttack.html#defender" class="member-name-link">defender</a> - Variable in 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>
+ </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html#defendingArmy" class="member-name-link">defendingArmy</a> - Variable in 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>
+ </dd>
<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/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/filehandling/ArmyFileHandler.html#DELIMITER" class="member-name-link">DELIMITER</a> - Variable 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> </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>
<div class="block">A dialog box that extends alert to use
@@ -99,7 +113,7 @@ loadScripts(document, 'script');</script>
<div class="block">Display successful popup message.</div>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-5.html b/javadoc/index-files/index-5.html
index 7529113..14a3765 100644
--- a/javadoc/index-files/index-5.html
+++ b/javadoc/index-files/index-5.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: E">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,13 +51,15 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/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/controllers/BattleController.html#editArmyButtons" class="member-name-link">editArmyButtons</a> - Variable 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> </dd>
<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
@@ -75,12 +77,16 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Edits the left army.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/controllers/BattleController.html#editArmyOneButton" class="member-name-link">editArmyOneButton</a> - Variable 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> </dd>
<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/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/controllers/BattleController.html#editArmyTwoButton" class="member-name-link">editArmyTwoButton</a> - Variable 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> </dd>
<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/battle/package-summary.html">edu.ntnu.idatt2001.carljgu.battle</a> - package edu.ntnu.idatt2001.carljgu.battle</dt>
@@ -104,7 +110,7 @@ loadScripts(document, 'script');</script>
<div class="block">Checks if two armies are equal based on name and list of units.</div>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-6.html b/javadoc/index-files/index-6.html
index 4af42df..6eaade4 100644
--- a/javadoc/index-files/index-6.html
+++ b/javadoc/index-files/index-6.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: F">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,7 +51,7 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/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>
@@ -63,10 +63,20 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Constructs an exception with a detail message</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#filePaths" class="member-name-link">filePaths</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#FINAL_RESIST_BONUS" class="member-name-link">FINAL_RESIST_BONUS</a> - Variable 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> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html#FOREST" class="member-name-link">FOREST</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>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/CavalryUnit.html#FOREST_BONUS" class="member-name-link">FOREST_BONUS</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/InfantryUnit.html#FOREST_BONUS" class="member-name-link">FOREST_BONUS</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#FOREST_PENALTY" class="member-name-link">FOREST_PENALTY</a> - Variable 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> </dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-7.html b/javadoc/index-files/index-7.html
index 784f29c..7f18046 100644
--- a/javadoc/index-files/index-7.html
+++ b/javadoc/index-files/index-7.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: G">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,7 +51,7 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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:G">G</h2>
<dl class="index">
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html#getAlertType()" class="member-name-link">getAlertType()</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>
@@ -289,7 +289,7 @@ loadScripts(document, 'script');</script>
or a null object.</div>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-8.html b/javadoc/index-files/index-8.html
index 11c78ab..44aaa58 100644
--- a/javadoc/index-files/index-8.html
+++ b/javadoc/index-files/index-8.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: H">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,7 +51,7 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/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>
@@ -64,10 +64,16 @@ loadScripts(document, 'script');</script>
</dd>
<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/client/dialogs/DialogBoxBuilder.html#header" class="member-name-link">header</a> - 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/battle/units/Unit.html#health" class="member-name-link">health</a> - Variable 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> </dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#HILL_BONUS" class="member-name-link">HILL_BONUS</a> - Variable 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> </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>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index-files/index-9.html b/javadoc/index-files/index-9.html
index 86f0671..84b6848 100644
--- a/javadoc/index-files/index-9.html
+++ b/javadoc/index-files/index-9.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index: I">
<meta name="generator" content="javadoc/IndexWriter">
<link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
@@ -51,9 +51,17 @@ loadScripts(document, 'script');</script>
<div class="header">
<h1>Index</h1>
</div>
-<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>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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/dialogs/DialogBoxBuilder.html#image" class="member-name-link">image</a> - 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/client/controllers/BattleController.html#importArmy(int)" class="member-name-link">importArmy(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">Helper method to import an army and
+ display its information in the
+ given label elements.</div>
+</dd>
<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>
@@ -62,6 +70,8 @@ loadScripts(document, 'script');</script>
<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/client/BattleSimulationSingleton.html#importedLinesSkipped" class="member-name-link">importedLinesSkipped</a> - Variable in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
+<dd> </dd>
<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html#incrementScore(int)" class="member-name-link">incrementScore(int)</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleSimulationSingleton.html" title="class in edu.ntnu.idatt2001.carljgu.client">BattleSimulationSingleton</a></dt>
<dd>
<div class="block">Increment score at an army index number.</div>
@@ -81,6 +91,8 @@ loadScripts(document, 'script');</script>
<dd>
<div class="block">Instantiates a new Infantry unit.</div>
</dd>
+<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/units/specialized/RangedUnit.html#INITIAL_RESIST_BONUS" class="member-name-link">INITIAL_RESIST_BONUS</a> - Variable 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> </dd>
<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>
@@ -90,7 +102,7 @@ loadScripts(document, 'script');</script>
<div class="block">Run when the fxml file is first loaded.</div>
</dd>
</dl>
-<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></main>
+<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">L</a> <a href="index-11.html">M</a> <a href="index-12.html">N</a> <a href="index-13.html">O</a> <a href="index-14.html">P</a> <a href="index-15.html">R</a> <a href="index-16.html">S</a> <a href="index-17.html">T</a> <a href="index-18.html">U</a> <a href="index-19.html">V</a> <a href="index-20.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></main>
</div>
</div>
</body>
diff --git a/javadoc/index.html b/javadoc/index.html
index ea7ac22..6fd9fc9 100644
--- a/javadoc/index.html
+++ b/javadoc/index.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="index redirect">
<meta name="generator" content="javadoc/IndexRedirectWriter">
<link rel="canonical" href="edu.ntnu.idatt2001.carljgu.client/module-summary.html">
diff --git a/javadoc/member-search-index.js b/javadoc/member-search-index.js
index 947cefb..f87b55c 100644
--- a/javadoc/member-search-index.js
+++ b/javadoc/member-search-index.js
@@ -1 +1 @@
-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.client","c":"BattleSimulationSingleton","l":"atLestOneOriginalArmyIsNull()"},{"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.client.controllers","c":"BattleController","l":"clearAttackListAndDisplayArmies()"},{"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.client.controllers","c":"BattleController","l":"deepCopyArmiesAndCreateBattle()"},{"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)"},{"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.client","c":"BattleSimulationSingleton","l":"getArmiesAmount()"},{"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.client","c":"BattleSimulationSingleton","l":"getBattle()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getBattleSimulation()"},{"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.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByCurrentNumber()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyNumber()"},{"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","c":"BattleSimulationSingleton","l":"getFilePathByNumber(int)"},{"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.client","c":"BattleSimulationSingleton","l":"getImportedLinesSkipped()"},{"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.client","c":"BattleSimulationSingleton","l":"getOriginalArmyByNumber(int)"},{"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":"BattleSimulationSingleton","l":"getScoreByNumber(int)"},{"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.client","c":"BattleSimulationSingleton","l":"incrementScore(int)"},{"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":"BattleSimulationSingleton","l":"resetScores()"},{"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","c":"BattleSimulationSingleton","l":"setBattle(Battle)","u":"setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyByNumber(int, Army)","u":"setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setFilePathByNumber(int, String)","u":"setFilePathByNumber(int,java.lang.String)"},{"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","c":"BattleSimulationSingleton","l":"setImportedLinesSkipped(List<String>)","u":"setImportedLinesSkipped(java.util.List)"},{"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","c":"BattleSimulationSingleton","l":"setOriginalArmyByNumber(int, Army)","u":"setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setScoreByNumber(int, int)","u":"setScoreByNumber(int,int)"},{"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":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateComponentsWithInformation()"},{"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
+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.dialogs","c":"DialogBoxBuilder","l":"alertType"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"amountOfArmies"},{"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.units","c":"Unit","l":"armor"},{"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":"BattleController","l":"armyImportPathLabels"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyNameLabels"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"armyOne"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyOneImportPath"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyOneName"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyOneToString"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyOneUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armySummaryLabels"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"armyTwo"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyTwoImportPath"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyTwoName"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyTwoToString"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyTwoUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"armyUnitListViews"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"atLestOneOriginalArmyIsNull()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"attack"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"ATTACK_BONUS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"ATTACK_BONUS"},{"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":"SimulationAttack","l":"attacker"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"attackingArmy"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"attackList"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackLog"},{"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.client","c":"BattleSimulationSingleton","l":"battle"},{"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","c":"BattleSimulationSingleton","l":"battleSimulationSingleton"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"BattleSimulationSingleton()","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":"className"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"clearAttackListAndDisplayArmies()"},{"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.client","c":"BattleSimulationSingleton","l":"currentArmies"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"currentArmyNumber"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"damageDealt"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"deepCopyArmiesAndCreateBattle()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"defender"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"defendingArmy"},{"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.filehandling","c":"ArmyFileHandler","l":"DELIMITER"},{"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)"},{"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":"BattleController","l":"editArmyButtons"},{"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":"BattleController","l":"editArmyOneButton"},{"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":"BattleController","l":"editArmyTwoButton"},{"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.client","c":"BattleSimulationSingleton","l":"filePaths"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"FINAL_RESIST_BONUS"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"FOREST_BONUS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"FOREST_BONUS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"FOREST_PENALTY"},{"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.client","c":"BattleSimulationSingleton","l":"getArmiesAmount()"},{"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.client","c":"BattleSimulationSingleton","l":"getBattle()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getBattleSimulation()"},{"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.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByCurrentNumber()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyByNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"getCurrentArmyNumber()"},{"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","c":"BattleSimulationSingleton","l":"getFilePathByNumber(int)"},{"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.client","c":"BattleSimulationSingleton","l":"getImportedLinesSkipped()"},{"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.client","c":"BattleSimulationSingleton","l":"getOriginalArmyByNumber(int)"},{"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":"BattleSimulationSingleton","l":"getScoreByNumber(int)"},{"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.client.dialogs","c":"DialogBoxBuilder","l":"header"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"health"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"HILL_BONUS"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"image"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"importArmy(int)"},{"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.client","c":"BattleSimulationSingleton","l":"importedLinesSkipped"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"incrementScore(int)"},{"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.battle.units.specialized","c":"RangedUnit","l":"INITIAL_RESIST_BONUS"},{"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.controllers","c":"BattleController","l":"lastSimulation"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"listMessages"},{"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.units.specialized","c":"CavalryUnit","l":"MELEE_ATTACK_BONUS"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"message"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Army","l":"name"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"Unit","l":"name"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"observableChangelog"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"originalArmies"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"PLAINS_BONUS"},{"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.battle","c":"Terrain","l":"readableName"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.filehandling","c":"ArmyFileHandler","l":"readLinesSkipped"},{"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":"resetAndBattleButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"resetArmiesButton"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"resetScores()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"RESIST_BONUS"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"InfantryUnit","l":"RESIST_BONUS"},{"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":"BattleController","l":"score"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"scores"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setBattle(Battle)","u":"setBattle(edu.ntnu.idatt2001.carljgu.battle.Battle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyByNumber(int, Army)","u":"setCurrentArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setCurrentArmyNumber(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setFilePathByNumber(int, String)","u":"setFilePathByNumber(int,java.lang.String)"},{"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":"DialogBox","l":"setImage(Image)","u":"setImage(javafx.scene.image.Image)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setImportedLinesSkipped(List<String>)","u":"setImportedLinesSkipped(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"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","c":"BattleSimulationSingleton","l":"setOriginalArmyByNumber(int, Army)","u":"setOriginalArmyByNumber(int,edu.ntnu.idatt2001.carljgu.battle.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleSimulationSingleton","l":"setScoreByNumber(int, int)","u":"setScoreByNumber(int,int)"},{"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":"stage"},{"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":"Battle","l":"terrain"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"terrain"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"Terrain(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"BattleController","l":"terrainChoiceBox"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"terrains"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"RangedUnit","l":"timesResisted"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"title"},{"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.battle","c":"Army","l":"units"},{"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.battle.units","c":"UnitType","l":"UnitType(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units","c":"UnitType","l":"unitTypes"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.client.controllers","c":"EditArmyController","l":"updateComponentsWithInformation()"},{"p":"edu.ntnu.idatt2001.carljgu.battle.units.specialized","c":"CavalryUnit","l":"usedAttackBonus"},{"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.battle","c":"Battle","l":"winner"},{"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 f19d5c2..15ee80a 100644
--- a/javadoc/overview-tree.html
+++ b/javadoc/overview-tree.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="class tree">
<meta name="generator" content="javadoc/TreeWriter">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html
index 2feed77..2b480c7 100644
--- a/javadoc/serialized-form.html
+++ b/javadoc/serialized-form.html
@@ -1,11 +1,11 @@
<!DOCTYPE HTML>
<html lang="en">
<head>
-<!-- Generated by javadoc (17) on Sun May 22 19:12:08 CEST 2022 -->
+<!-- Generated by javadoc (17) on Mon May 23 11:31:52 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">
-<meta name="dc.created" content="2022-05-22">
+<meta name="dc.created" content="2022-05-23">
<meta name="description" content="serialized forms">
<meta name="generator" content="javadoc/SerializedFormWriterImpl">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.java
index 0375929..ee03640 100644
--- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.java
+++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.java
@@ -3,15 +3,18 @@ package edu.ntnu.idatt2001.carljgu.client.dialogs;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.control.ListView;
+import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.stage.Stage;
+import java.util.List;
+
/**
* A dialog box that extends alert to use
* a builder to build a dialog box.
*
* @author Carl Gützkow
- * @version 1.2 01.05.2022
+ * @version 1.3 23.05.2022
*/
public class DialogBox extends Alert {
@@ -36,17 +39,33 @@ public class DialogBox extends Alert {
if (builder.getAlertType() == AlertType.NONE) {
this.getDialogPane().getButtonTypes().add(ButtonType.OK);
}
-
if (builder.getImage() != null) {
- Stage stage = (Stage) this.getDialogPane().getScene().getWindow();
- stage.getIcons().add(builder.getImage());
- this.setGraphic(new ImageView(builder.getImage()));
+ setImage(builder.getImage());
}
-
if (builder.getListMessages() != null) {
- ListView<String> list = new ListView<>();
- list.getItems().addAll(builder.getListMessages());
- getDialogPane().setExpandableContent(list);
+ setListMessage(builder.getListMessages());
}
}
+
+ /**
+ * Sets the graphic of the alert to a given image.
+ *
+ * @param image Image - graphical image of the dialog box
+ */
+ public void setImage(Image image) {
+ Stage stage = (Stage) this.getDialogPane().getScene().getWindow();
+ stage.getIcons().add(image);
+ this.setGraphic(new ImageView(image));
+ }
+
+ /**
+ * Adds a list view node to the expandable content of the dialog.
+ *
+ * @param listMessage List - a list of strings.
+ */
+ public void setListMessage(List<String> listMessage) {
+ ListView<String> list = new ListView<>();
+ list.getItems().addAll(listMessage);
+ getDialogPane().setExpandableContent(list);
+ }
}
--
GitLab