diff --git a/javadoc/allclasses-index.html b/javadoc/allclasses-index.html index cacee93b3b9191a95de64245224e9cd84669b0dc..a1f2ac83143bdbfdd93738eb9d5bd2f77a4d67d6 100644 --- a/javadoc/allclasses-index.html +++ b/javadoc/allclasses-index.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/allpackages-index.html b/javadoc/allpackages-index.html index 1bf92176ad56dd2ff54f14a9100877b6259b30f7..4eaff974eac8c9c9cb87c5d5a29158e7a04573fc 100644 --- a/javadoc/allpackages-index.html +++ b/javadoc/allpackages-index.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/constant-values.html b/javadoc/constant-values.html index 6f8e1c99859401f9eb9ed7942f91132f03c022c0..9463d33a3574f0301cbd0b24a55c751d1e478909 100644 --- a/javadoc/constant-values.html +++ b/javadoc/constant-values.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>Constant Field Values</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/deprecated-list.html b/javadoc/deprecated-list.html index 8e1a11a8abf6a76de79fc2cb38f711f996d4b4bb..11762ad5c094e53d1028a5385c779b068870aaa1 100644 --- a/javadoc/deprecated-list.html +++ b/javadoc/deprecated-list.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>Deprecated List</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html index 20436effe4d8481f214e271e18d526b6801ec479..3adcd05819bff9eab6498dae42a8a47de9d4d750 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/FileExtensionException.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html index 57c28c731f8d00f21848b1f708956de25d9a0c64..1876c1bc86e9f0b448b3fbc2ececccc9e36cca34 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> @@ -85,7 +85,7 @@ loadScripts(document, 'script');</script> meant to fight another army.</div> <dl class="notes"> <dt>Version:</dt> -<dd>1.3 17.05.2022</dd> +<dd>1.4 18.05.2022</dd> <dt>Author:</dt> <dd>Carl Gützkow</dd> </dl> @@ -143,59 +143,72 @@ loadScripts(document, 'script');</script> <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> <div class="block">Gets all units.</div> </div> -<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><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.units">Unit</a>></code></div> -<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCavalryUnits()" class="member-name-link">getCavalryUnits</a>()</code></div> +<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div> +<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCalculatedStrength()" class="member-name-link">getCalculatedStrength</a>()</code></div> <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Returns a list of cavalry units - using stream and filter.</div> +<div class="block">Calculates the strength of an army + by combining health, attack and armor + of every unit.</div> </div> <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a>></code></div> -<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCommanderUnits()" class="member-name-link">getCommanderUnits</a>()</code></div> +<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCavalryUnits()" class="member-name-link">getCavalryUnits</a>()</code></div> <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Returns a list of commander units +<div class="block">Returns a list of cavalry units using stream and filter.</div> </div> <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a>></code></div> -<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getInfantryUnits()" class="member-name-link">getInfantryUnits</a>()</code></div> +<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCommanderUnits()" class="member-name-link">getCommanderUnits</a>()</code></div> <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Returns a list of infantry units +<div class="block">Returns a list of commander units using stream and filter.</div> </div> -<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div> -<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getName()" class="member-name-link">getName</a>()</code></div> +<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a>></code></div> +<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getInfantryUnits()" class="member-name-link">getInfantryUnits</a>()</code></div> <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Gets the army's name.</div> +<div class="block">Returns a list of infantry units + using stream and filter.</div> </div> -<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></code></div> -<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getRandom()" class="member-name-link">getRandom</a>()</code></div> +<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div> +<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getName()" class="member-name-link">getName</a>()</code></div> <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Gets a random unit from the list.</div> +<div class="block">Gets the army's name.</div> </div> -<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="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.units">Unit</a>></code></div> -<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getRangedUnits()" class="member-name-link">getRangedUnits</a>()</code></div> +<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a></code></div> +<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getRandom()" class="member-name-link">getRandom</a>()</code></div> <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> +<div class="block">Gets a random unit from the list.</div> +</div> +<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><<a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a>></code></div> +<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getRangedUnits()" class="member-name-link">getRangedUnits</a>()</code></div> +<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> <div class="block">Returns a list of ranged units using stream and filter.</div> </div> -<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div> -<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#hashCode()" class="member-name-link">hashCode</a>()</code></div> -<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> +<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div> +<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#hashCode()" class="member-name-link">hashCode</a>()</code></div> +<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> <div class="block">Hashes name and units for the equals method</div> </div> +<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div> +<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#hasUnits()" class="member-name-link">hasUnits</a>()</code></div> +<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> +<div class="block">Checks if the list of units is empty</div> +</div> <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div> -<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#hasUnits()" class="member-name-link">hasUnits</a>()</code></div> +<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#remove(edu.ntnu.idatt2001.carljgu.units.Unit)" class="member-name-link">remove</a><wbr>(<a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> unit)</code></div> <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Checks if the list of units is empty</div> +<div class="block">Remove a specified unit.</div> </div> -<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div> -<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#remove(edu.ntnu.idatt2001.carljgu.units.Unit)" class="member-name-link">remove</a><wbr>(<a href="../units/Unit.html" title="class in edu.ntnu.idatt2001.carljgu.units">Unit</a> unit)</code></div> +<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div> +<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setName(java.lang.String)" class="member-name-link">setName</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name)</code></div> <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Remove a specified unit.</div> +<div class="block">Sets the army's name</div> </div> -<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div> -<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#setName(java.lang.String)" class="member-name-link">setName</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> name)</code></div> +<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div> +<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#strengthAndUnitRepresentation()" class="member-name-link">strengthAndUnitRepresentation</a>()</code></div> <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Sets the army's name</div> +<div class="block">Another method for return a representation + of the army.</div> </div> <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div> <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#toString()" class="member-name-link">toString</a>()</code></div> @@ -403,6 +416,38 @@ loadScripts(document, 'script');</script> </section> </li> <li> +<section class="detail" id="getCalculatedStrength()"> +<h3>getCalculatedStrength</h3> +<div class="member-signature"><span class="modifiers">public</span> <span class="return-type">int</span> <span class="element-name">getCalculatedStrength</span>()</div> +<div class="block">Calculates the strength of an army + by combining health, attack and armor + of every unit.</div> +<dl class="notes"> +<dt>Returns:</dt> +<dd>int - the army's calculated strength</dd> +</dl> +</section> +</li> +<li> +<section class="detail" id="strengthAndUnitRepresentation()"> +<h3>strengthAndUnitRepresentation</h3> +<div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">strengthAndUnitRepresentation</span>()</div> +<div class="block">Another method for return a representation + of the army. Includes the calculated strength + and how many of each unit type. + Example of a string representation: + Strength: 302 + Infantry: 1 + Ranged: 5 + Cavalry: 1 + Commander: 0</div> +<dl class="notes"> +<dt>Returns:</dt> +<dd>String - representation of the army.</dd> +</dl> +</section> +</li> +<li> <section class="detail" id="toString()"> <h3>toString</h3> <div class="member-signature"><span class="modifiers">public</span> <span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span> <span class="element-name">toString</span>()</div> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html index 95c8e6807a30a187d3cb34231d722e2382de3497..8ccd92416844811285e57c132ed65c198e102e2d 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/ArmyFileHandler.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-summary.html index 40e5e7d5412196f9172fd01f34c641d4d56edbba..2972aa24f961318be498155ec452784f6555e2c5 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-summary.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-summary.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu.army</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-tree.html index ab3f4079d2ed00cc84a6506edee24a6b0cd38738..7cd3a9fb67224fde32c3a2559d88dae14fdcbccc 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-tree.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/package-tree.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu.army Class Hierarchy</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html index a36a691f031c753c80b722eb4dd6872364be4cb2..bd80aeade5bd8014d3e6b573df598ae43e4d9c26 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Battle.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> 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 12517c340f52dfa23c0fbae4b08175a18fcff1df..98dd3e9356569a0c67e9c88d78e744be07140f1e 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/SimulationAttack.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> 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 2ae2e57acb893056609699cf2e663d6a9d8ad5fc..f35774d7d4b9640244ffa3649defa0fcc2a9df68 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/Terrain.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>Terrain</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html index 1bc3d8f4470efa9add0303cb3c62161f71bd030b..e4a617f488465f00ee78ddd069bea8e10a7c8d6d 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-summary.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> 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 124eaf0f1e68fddb51a8ceec1583bc4e294da18b..3f720b6c136774e0bb1ecb8cdf5b2de60e63d0b9 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/battle/package-tree.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> 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 0ede3fc5cbbbdb56861246fcb247efadc1c59fac..0482afa6224ffc61d796203368abbde4b0df4302 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/App.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>App</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html index afc8e72504f9794897413d26a9614d039202f738..e8d6bb96e3a6ed89c2d07ec7b864ea8e54cb2a81 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/BattleController.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html index e864e7d54f45bd1cefc537b710e538373fa57d11..5731ab66050d43f0dceb5d7ee7a84342d127b3fb 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> @@ -219,7 +219,7 @@ implements javafx.fxml.Initializable</span></div> <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div> <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateAllFields()" class="member-name-link">updateAllFields</a>()</code></div> <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"> -<div class="block">Update all fields.</div> +<div class="block">Update all fields and labels with updated information.</div> </div> <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div> <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack</a>()</code></div> @@ -428,7 +428,7 @@ implements javafx.fxml.Initializable</span></div> <section class="detail" id="updateAllFields()"> <h3>updateAllFields</h3> <div class="member-signature"><span class="modifiers">public</span> <span class="return-type">void</span> <span class="element-name">updateAllFields</span>()</div> -<div class="block">Update all fields.</div> +<div class="block">Update all fields and labels with updated information.</div> </section> </li> <li> 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 4cb2d0e8b957df09a58239f08a04e7e15142b0e7..b1f492ccb35d16c47f006f078b693a60dd9a085f 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/Main.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>Main</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html index b27d186cf27dfacbcc4a4672c12c4674d949a6a3..d130510227332083c9a4d8c0e73cd6f64c8472f8 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBox.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>DialogBox</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html index 07410c657e3054ecaf19b8233caa91db3016ef6b..f942b24ffe006bf1bf44b576c325aeaf04833a14 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/DialogBoxBuilder.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>DialogBoxBuilder</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html index 0026f3d54e81d51a4e8cefd24707e89a72224927..d355e2f2d08a04917e962603d297a78b9d01639a 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-summary.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> 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 5935fb8b25c50d99ec5bacc06e6748e253fec519..9b32042c4ecdef95656c8920058bd9242c35b8a5 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/dialogs/package-tree.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu.client.dialogs Class Hierarchy</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html index 3bee09bab512f8bffae66a69a21744c377681c0d..ce397b7395aad11f37cab26204a6b06a26da869b 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-summary.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> 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 9b166f20cea778e78c791005b64c8c3063e7b819..ed76e6927271ce44b824fe34d561fee0d620287c 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/package-tree.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-summary.html index 95759927bf0afa3479053dd7c4d982bbaa3c6e95..146596fc9aa4739e1fc99bee7a0461c54493e0c2 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-summary.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-summary.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-tree.html index 93b366ec2ed3c9e6d768b19c054ac78f48cc1486..306676f0ff8c72dce043eaa9157497c5229dd391 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-tree.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/package-tree.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu Class Hierarchy</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html index 3afb76794ebc64c9bb11617beb685080fa55f817..bb421c00f84c4219d251545336db32ce2462f7f7 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/Unit.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html index 16791e7c534fbc7557c4ba4c2bc73f1924797e90..fcc31fbebf36762cc8a5ce315a5752d8731c5d5f 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitFactory.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html index ff022c78392ebb965d8625eae297d6886c6a9e80..a60d82cd14d2a5bce1ad47d7dcd1325f43848989 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/UnitType.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html index 4ed7a93f03e81f1aed37230e5ace741aa966d0e3..39a3b981ac3701320a9c631a48366837819ba92d 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-summary.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu.units</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-tree.html index 31a31603219cf7cba3226e5da9cb2ee1d39a471b..246a266f3bcc85866e3cd7ae8c8c95ffbe187d9d 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-tree.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/package-tree.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu.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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html index 78021aadb62ebbe3c99619ee8b9a13b8472b28ae..1de398eee05feb19c62dfda8fe82fceca2fefb75 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CavalryUnit.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html index c90982ad1311f77cfae5a76517e88e20f5fcc5da..5d666a7e21e575f4517363d7aa46718dae6631e6 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/CommanderUnit.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html index 4ad8da894319abd4c4b4c392c9db6a5fc30bf072..fddd2a57d7d0d3670956f0aa91ddf005a515c278 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/InfantryUnit.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html index 7ed9604bcbea297ffd37d1266bf1fa6a655697b7..cb383983770d2d82f42d6e77f50672410c987408 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/RangedUnit.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html index ce71d99326777bfd96cbe6259eeea8e5736d2a42..badc8790c7dc188600f669e01fb990468132e70c 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-summary.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu.units.specialized</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-tree.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-tree.html index 8e4edeb1e663d857c6a521d240df8eedcc755156..95cde2ad82ce5d5c7ce96676160dd3d15e596172 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-tree.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/units/specialized/package-tree.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>edu.ntnu.idatt2001.carljgu.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"> diff --git a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html index fbaddf8e425d84bd4895286de07ef9e22a875d16..4ae12504aeb3c7e9de7c11a812fd61aa8f85e34f 100644 --- a/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html +++ b/javadoc/edu.ntnu.idatt2001.carljgu.client/module-summary.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/help-doc.html b/javadoc/help-doc.html index 3d08719de7ba72e5419366239e00ff62d6579d62..bc8ddd42b99800c4a33d85ceef0e0a7ffa46be8c 100644 --- a/javadoc/help-doc.html +++ b/javadoc/help-doc.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>API Help</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/index-files/index-1.html b/javadoc/index-files/index-1.html index 05b6beeed0531736470a7ca70b05f99cdb37ce66..c63363ebc70439bf0aae7cdb351a9a6102dad2b1 100644 --- a/javadoc/index-files/index-1.html +++ b/javadoc/index-files/index-1.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-10.html b/javadoc/index-files/index-10.html index 86bbb769c193b898c744b44592c6d27fbd89f680..96a42f77e1dd2d24531a7c5d6844e3323208ddf2 100644 --- a/javadoc/index-files/index-10.html +++ b/javadoc/index-files/index-10.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>M-Index</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/index-files/index-11.html b/javadoc/index-files/index-11.html index 4b9a3d6288290b672f20d4f804964979afdd3c69..1dede2d021b3f36bcdc1052692e8f8e3d0a96f41 100644 --- a/javadoc/index-files/index-11.html +++ b/javadoc/index-files/index-11.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>P-Index</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/index-files/index-12.html b/javadoc/index-files/index-12.html index 941fdd441e01f14e057cab6913116251f6de8324..5dfa50d5f721d6722b96c5e772b0caaf75bd49ca 100644 --- a/javadoc/index-files/index-12.html +++ b/javadoc/index-files/index-12.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-13.html b/javadoc/index-files/index-13.html index e5c4b3a2fa29e1757c79df27438952884865b779..56a24f4b89967f0095b81dd1a5abbe61b7ce29dc 100644 --- a/javadoc/index-files/index-13.html +++ b/javadoc/index-files/index-13.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> @@ -111,6 +111,11 @@ loadScripts(document, 'script');</script> <dd> <div class="block">Overridden from Application.</div> </dd> +<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#strengthAndUnitRepresentation()" class="member-name-link">strengthAndUnitRepresentation()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt> +<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> </div> diff --git a/javadoc/index-files/index-14.html b/javadoc/index-files/index-14.html index 74e3b6f7de487b6b6429dff4c8f772ef6eb70cf7..7571adbe89153c80d0b9e8416c760977a8b9e6c2 100644 --- a/javadoc/index-files/index-14.html +++ b/javadoc/index-files/index-14.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-15.html b/javadoc/index-files/index-15.html index 0b7aeafde7a888c9b5ad9035056b270375c26c97..56076faeac1f2d935e370eaf7d363e6db6bed045 100644 --- a/javadoc/index-files/index-15.html +++ b/javadoc/index-files/index-15.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> @@ -81,7 +81,7 @@ loadScripts(document, 'script');</script> </dd> <dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#updateAllFields()" class="member-name-link">updateAllFields()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt> <dd> -<div class="block">Update all fields.</div> +<div class="block">Update all fields and labels with updated information.</div> </dd> <dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html#updateArmyAndGoBack()" class="member-name-link">updateArmyAndGoBack()</a> - Method in class edu.ntnu.idatt2001.carljgu.client.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/client/EditArmyController.html" title="class in edu.ntnu.idatt2001.carljgu.client">EditArmyController</a></dt> <dd> diff --git a/javadoc/index-files/index-16.html b/javadoc/index-files/index-16.html index d512ba48c69c1f7dbe892cae93ee4cf4173cdc09..566d4a1528596339608980b5cc985f56037f9971 100644 --- a/javadoc/index-files/index-16.html +++ b/javadoc/index-files/index-16.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-17.html b/javadoc/index-files/index-17.html index e60fdc306d7b7037c12d84ba22be4117387bd3f6..88810e8f04783ec8ebd5d7af4ec7073616d3632b 100644 --- a/javadoc/index-files/index-17.html +++ b/javadoc/index-files/index-17.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-2.html b/javadoc/index-files/index-2.html index f11197053e05dea72873057ddf9d56d7b029dd7d..d52821c8341bc12bd3d13533c41e576722c7d5d9 100644 --- a/javadoc/index-files/index-2.html +++ b/javadoc/index-files/index-2.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-3.html b/javadoc/index-files/index-3.html index 620be774959152c456f4e7a1184b7eed3845ec2a..8024d1bcaa934af0ef30b7ab08ce35b59ad5fa25 100644 --- a/javadoc/index-files/index-3.html +++ b/javadoc/index-files/index-3.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-4.html b/javadoc/index-files/index-4.html index d69261ff5bc72a1d5ed3811d97d7608cc3ea6ef2..13dae3c6d07c0fc9f2bcbaefdf6cca17ff6ed38a 100644 --- a/javadoc/index-files/index-4.html +++ b/javadoc/index-files/index-4.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-5.html b/javadoc/index-files/index-5.html index 658f88a1a55ca0de2c37f4a96e65ae727f0321a9..70640cc3848411eb384be696164d7bda3657569d 100644 --- a/javadoc/index-files/index-5.html +++ b/javadoc/index-files/index-5.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-6.html b/javadoc/index-files/index-6.html index 0dc6e5110ca4787ac843c305e44dd4066c69551f..3f687b1033bb80cc9e1db18bc796f82b24de3475 100644 --- a/javadoc/index-files/index-6.html +++ b/javadoc/index-files/index-6.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-7.html b/javadoc/index-files/index-7.html index 0772d81d5dafba6bcb2bf7169a9c7fba5c02025a..ea011f8d846df73a55f0c27440a94564b325754d 100644 --- a/javadoc/index-files/index-7.html +++ b/javadoc/index-files/index-7.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> @@ -103,6 +103,12 @@ loadScripts(document, 'script');</script> to easily hold the information about each attack.</div> </dd> +<dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getCalculatedStrength()" class="member-name-link">getCalculatedStrength()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt> +<dd> +<div class="block">Calculates the strength of an army + by combining health, attack and armor + of every unit.</div> +</dd> <dt><a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html#getCavalryUnits()" class="member-name-link">getCavalryUnits()</a> - Method in class edu.ntnu.idatt2001.carljgu.army.<a href="../edu.ntnu.idatt2001.carljgu.client/edu/ntnu/idatt2001/carljgu/army/Army.html" title="class in edu.ntnu.idatt2001.carljgu.army">Army</a></dt> <dd> <div class="block">Returns a list of cavalry units diff --git a/javadoc/index-files/index-8.html b/javadoc/index-files/index-8.html index 23a6e11c6952a2a7b5b85df0997bba958c705b01..092ed6744fbe346695f4b490d54a201859c3539e 100644 --- a/javadoc/index-files/index-8.html +++ b/javadoc/index-files/index-8.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index-files/index-9.html b/javadoc/index-files/index-9.html index 31e07c607532c5ce380fa173b7b3c1ace90c4248..1f95be9f69d7fb05d5d63a7f816429f96c37ed28 100644 --- a/javadoc/index-files/index-9.html +++ b/javadoc/index-files/index-9.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/index.html b/javadoc/index.html index 3ceee02a81ba003cb2df53d92086abff58e5397a..9fc591d937fb6989ac71d7a05501054870ad047a 100644 --- a/javadoc/index.html +++ b/javadoc/index.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 CEST 2022 --> <title>Generated Documentation (Untitled)</title> <meta name="viewport" content="width=device-width, initial-scale=1"> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> diff --git a/javadoc/member-search-index.js b/javadoc/member-search-index.js index b42c9a6ead26c26c42d139e6ebed5719f1bccb00..120f69da3027ab9b1020e5c44628a151b2cb6813 100644 --- a/javadoc/member-search-index.js +++ b/javadoc/member-search-index.js @@ -1 +1 @@ -memberSearchIndex = [{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addEventListenersToFieldsAndLists()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"addUnit(Unit)","u":"addUnit(edu.ntnu.idatt2001.carljgu.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"addUnits(List<Unit>)","u":"addUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"amountOfUnitsSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"App()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"Army(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"Army(String, List<Unit>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"ArmyFileHandler()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"attack(Unit, Terrain)","u":"attack(edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackStringRepresentation(int, Unit, Unit, Army, Army)","u":"attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"Battle(Army, Army, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"BattleController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"build()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"cancelAllChanges()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"CAVALRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"changelogListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"changeScene(String)","u":"changeScene(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"COMMANDER_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"createArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"createListOfUnits(int, UnitType, String, int)","u":"createListOfUnits(int,edu.ntnu.idatt2001.carljgu.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"createUnit(UnitType, String, int)","u":"createUnit(edu.ntnu.idatt2001.carljgu.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"deleteUnit()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"deleteUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"DialogBox(DialogBoxBuilder)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"DialogBoxBuilder(Alert.AlertType)","u":"%3Cinit%3E(javafx.scene.control.Alert.AlertType)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"displayArmy(int, Army)","u":"displayArmy(int,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"displaySuccessfulPopupMessage(String)","u":"displaySuccessfulPopupMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"EditArmyController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyName()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyNameButton"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyTitle"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editNameField"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"edu.ntnu.idatt2001.carljgu","c":"FileExtensionException","l":"FileExtensionException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getAlertType()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getAllUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getArmor()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getAttack()"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttacker()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttackingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getAttackLog()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getCavalryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getCommanderUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDamageDealt()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefender()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefendingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"getFilePath(String)","u":"getFilePath(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getHeader()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getHealth()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getImage()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getInfantryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getListMessages()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getMessage()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getRandom()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getRangedUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getReadableName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"getReadLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"getStage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getTerrain(String)","u":"getTerrain(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getTitle()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"getUnitType(String)","u":"getUnitType(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getWinner()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"hashCode()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"hasUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"importArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"importArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"INFANTRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"Main()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"RANGED_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"recurringDialogMessage"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"remove(Unit)","u":"remove(edu.ntnu.idatt2001.carljgu.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"run(String[])","u":"run(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"runSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"setArmyToEdit(Army, int)","u":"setArmyToEdit(edu.ntnu.idatt2001.carljgu.army.Army,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setHeader(String)","u":"setHeader(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"setHealth(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setMessage(String)","u":"setMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"setOriginalArmy(int, Army)","u":"setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setTitle(String)","u":"setTitle(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"simulate()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"SimulationAttack(Army, Unit, Army, Unit, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"start(Stage)","u":"start(javafx.stage.Stage)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"Unit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"UnitFactory()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsHealthSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsNameField"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsTypeComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"updateAllFields()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"writeToCSV()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"writeToFile(Army, String)","u":"writeToFile(edu.ntnu.idatt2001.carljgu.army.Army,java.lang.String)"}];updateSearchResults(); \ No newline at end of file +memberSearchIndex = [{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addEventListenersToFieldsAndLists()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"addUnit(Unit)","u":"addUnit(edu.ntnu.idatt2001.carljgu.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"addUnits(List<Unit>)","u":"addUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"addUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"allUnitsComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"amountOfUnitsSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"App()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"Army(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"Army(String, List<Unit>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"ArmyFileHandler()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"armyToString"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"armyUnitsListView"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"attack(Unit, Terrain)","u":"attack(edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"attackStringRepresentation(int, Unit, Unit, Army, Army)","u":"attackStringRepresentation(int,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"Battle(Army, Army, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"BattleController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"build()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"cancelAllChanges()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"CAVALRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"CavalryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"changelogListView"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"changeScene(String)","u":"changeScene(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"COMMANDER_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CommanderUnit","l":"CommanderUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"createArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"createListOfUnits(int, UnitType, String, int)","u":"createListOfUnits(int,edu.ntnu.idatt2001.carljgu.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"createUnit(UnitType, String, int)","u":"createUnit(edu.ntnu.idatt2001.carljgu.units.UnitType,java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"deepCopyBasicUnits(List<Unit>)","u":"deepCopyBasicUnits(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"deleteUnit()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"deleteUnitsButton"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBox","l":"DialogBox(DialogBoxBuilder)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.client.dialogs.DialogBoxBuilder)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"DialogBoxBuilder(Alert.AlertType)","u":"%3Cinit%3E(javafx.scene.control.Alert.AlertType)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"displayArmy(int, Army)","u":"displayArmy(int,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"displaySuccessfulPopupMessage(String)","u":"displaySuccessfulPopupMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmy(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"EditArmyController()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyName()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyNameButton"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editArmyTitle"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"editArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"editNameField"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"edu.ntnu.idatt2001.carljgu","c":"FileExtensionException","l":"FileExtensionException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"FOREST"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getAlertType()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getAllUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getArmor()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getAttack()"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getAttackBonus(Terrain)","u":"getAttackBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttacker()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getAttackingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getAttackLog()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getCalculatedStrength()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getCavalryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"getClassName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getCommanderUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDamageDealt()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefender()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getDefendingArmy()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"getFilePath(String)","u":"getFilePath(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getHeader()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getHealth()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getImage()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getInfantryUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getListMessages()"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getMessage()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getRandom()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"getRangedUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getReadableName()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"getReadLinesSkipped()"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"CavalryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"getResistBonus(Terrain)","u":"getResistBonus(edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"getStage()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"getTerrain()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"getTerrain(String)","u":"getTerrain(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"getTitle()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"getUnitType(String)","u":"getUnitType(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"getWinner()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"hashCode()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"hasUnits()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"HILLS"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"importArmyOne()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"importArmyTwo()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"INFANTRY_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"InfantryUnit","l":"InfantryUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"initialize(URL, ResourceBundle)","u":"initialize(java.net.URL,java.util.ResourceBundle)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"Main()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"Main","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"PLAINS"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"RANGED_UNIT"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int)","u":"%3Cinit%3E(java.lang.String,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units.specialized","c":"RangedUnit","l":"RangedUnit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"readArmyFromFile(String)","u":"readArmyFromFile(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"recurringDialogMessage"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"remove(Unit)","u":"remove(edu.ntnu.idatt2001.carljgu.units.Unit)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"resetArmies()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"run(String[])","u":"run(java.lang.String[])"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"runSimulation()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"setArmyToEdit(Army, int)","u":"setArmyToEdit(edu.ntnu.idatt2001.carljgu.army.Army,int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setHeader(String)","u":"setHeader(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"setHealth(int)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setImage(String)","u":"setImage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setListMessage(List<String>)","u":"setListMessage(java.util.List)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setMessage(String)","u":"setMessage(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"setName(String)","u":"setName(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"BattleController","l":"setOriginalArmy(int, Army)","u":"setOriginalArmy(int,edu.ntnu.idatt2001.carljgu.army.Army)"},{"p":"edu.ntnu.idatt2001.carljgu.client.dialogs","c":"DialogBoxBuilder","l":"setTitle(String)","u":"setTitle(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"simulate()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"SimulationAttack(Army, Unit, Army, Unit, Terrain)","u":"%3Cinit%3E(edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.army.Army,edu.ntnu.idatt2001.carljgu.units.Unit,edu.ntnu.idatt2001.carljgu.battle.Terrain)"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"App","l":"start(Stage)","u":"start(javafx.stage.Stage)"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"strengthAndUnitRepresentation()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"Army","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Battle","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"SimulationAttack","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"toString()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"Unit","l":"Unit(String, int, int, int)","u":"%3Cinit%3E(java.lang.String,int,int,int)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitFactory","l":"UnitFactory()","u":"%3Cinit%3E()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsHealthSpinner"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsNameField"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"unitsTypeComboBox"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"updateAllFields()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"updateArmyAndGoBack()"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"edu.ntnu.idatt2001.carljgu.battle","c":"Terrain","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.units","c":"UnitType","l":"values()"},{"p":"edu.ntnu.idatt2001.carljgu.client","c":"EditArmyController","l":"writeToCSV()"},{"p":"edu.ntnu.idatt2001.carljgu.army","c":"ArmyFileHandler","l":"writeToFile(Army, String)","u":"writeToFile(edu.ntnu.idatt2001.carljgu.army.Army,java.lang.String)"}];updateSearchResults(); \ No newline at end of file diff --git a/javadoc/overview-tree.html b/javadoc/overview-tree.html index ce25059fcdcf35ba95d24ad4c2e8f78a5208a239..dc03b571a2977f21548244b990a127a3027467d2 100644 --- a/javadoc/overview-tree.html +++ b/javadoc/overview-tree.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/javadoc/serialized-form.html b/javadoc/serialized-form.html index 273460cd7d2eb8a09bfdb67796461f59d8e0adba..17c8390b71968cce64084c3ded3bb9ecab9ca27b 100644 --- a/javadoc/serialized-form.html +++ b/javadoc/serialized-form.html @@ -1,7 +1,7 @@ <!DOCTYPE HTML> <html lang="en"> <head> -<!-- Generated by javadoc (17) on Wed May 18 17:57:50 CEST 2022 --> +<!-- Generated by javadoc (17) on Wed May 18 19:21:03 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"> diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/army/Army.java b/src/main/java/edu/ntnu/idatt2001/carljgu/army/Army.java index 1101636be6e77aa4e7404a5ee2310ab86e5b19f8..607a5c0c9747638e364b1220871c79e5aa31e80a 100644 --- a/src/main/java/edu/ntnu/idatt2001/carljgu/army/Army.java +++ b/src/main/java/edu/ntnu/idatt2001/carljgu/army/Army.java @@ -18,11 +18,11 @@ import java.util.Random; * meant to fight another army. * * @author Carl Gützkow - * @version 1.3 17.05.2022 + * @version 1.4 18.05.2022 */ public class Army { - /* Chose list because several + /* Chose list for units because several units are added and removed from the list and the units inside can be indexed. */ private String name; @@ -177,6 +177,38 @@ public class Army { return null; } + /** + * Calculates the strength of an army + * by combining health, attack and armor + * of every unit. + * + * @return int - the army's calculated strength + */ + public int getCalculatedStrength() { + return units.stream().mapToInt(s -> s.getHealth() + s.getAttack() + s.getArmor()).sum(); + } + + /** + * Another method for return a representation + * of the army. Includes the calculated strength + * and how many of each unit type. + * Example of a string representation: + * Strength: 302 + * Infantry: 1 + * Ranged: 5 + * Cavalry: 1 + * Commander: 0 + * + * @return String - representation of the army. + */ + public String strengthAndUnitRepresentation() { + return "Strength: " + getCalculatedStrength() + "\n" + + "Infantry units: " + getInfantryUnits().size() + "\n" + + "Ranged units: " + getRangedUnits().size() + "\n" + + "Cavalry units: " + getCavalryUnits().size() + "\n" + + "Commander units: " + getCommanderUnits().size() + "\n"; + } + /** * Overrides the toString() method from Object. * iterates over all units and calls their toString() method. diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleController.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleController.java index 6db8289092e342b77ffd6ee8079992c8a78a144d..72a578235a765fe12e369020cdae6bf5ad96d9c0 100644 --- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleController.java +++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/BattleController.java @@ -49,7 +49,7 @@ public class BattleController implements Initializable { @FXML private ListView<String> attackList; @FXML private Label lastSimulation, score; - private final String[] filePaths = new String[2]; + private final static String[] filePaths = new String[2]; private final int[] scores = new int[2]; private Army armyOne, armyTwo; @@ -236,13 +236,7 @@ public class BattleController implements Initializable { armyNameLabels[armyNumber].setText(army.getName()); - String armyRepresentation = - "Infantry units: " + army.getInfantryUnits().size() + "\n" + - "Ranged units: " + army.getRangedUnits().size() + "\n" + - "Cavalry units: " + army.getCavalryUnits().size() + "\n" + - "Commander units: " + army.getCommanderUnits().size() + "\n"; - - armySummaryLabels[armyNumber].setText(armyRepresentation); + armySummaryLabels[armyNumber].setText(army.strengthAndUnitRepresentation()); armyImportPathLabels[armyNumber].setText(filePaths[armyNumber]); editArmyButtons[armyNumber].setDisable(originalArmies[armyNumber] == null); diff --git a/src/main/java/edu/ntnu/idatt2001/carljgu/client/EditArmyController.java b/src/main/java/edu/ntnu/idatt2001/carljgu/client/EditArmyController.java index 2087c033880fc4c89f6dbca9dbcd5ebcf01a81c8..8ca30ed5fc4334688f29183d0c7941d4df722d14 100644 --- a/src/main/java/edu/ntnu/idatt2001/carljgu/client/EditArmyController.java +++ b/src/main/java/edu/ntnu/idatt2001/carljgu/client/EditArmyController.java @@ -195,7 +195,7 @@ public class EditArmyController implements Initializable { } /** - * Update all fields. + * Update all fields and labels with updated information. */ public void updateAllFields() { editArmyTitle.setText("Editing " + deepCopiedArmy.getName()); @@ -205,15 +205,7 @@ public class EditArmyController implements Initializable { Arrays.stream(UnitType.values()).forEach(s -> unitsTypeComboBox.getItems().add(s.getClassName())); unitsTypeComboBox.setValue(UnitType.INFANTRY_UNIT.getClassName()); - String armyRepresentation = - "Infantry units: " + deepCopiedArmy.getInfantryUnits().size() + "\n" + - "Ranged units: " + deepCopiedArmy.getRangedUnits().size() + "\n" + - "Cavalry units: " + deepCopiedArmy.getCavalryUnits().size() + "\n" + - "Commander units: " + deepCopiedArmy.getCommanderUnits().size() + "\n"; - armyToString.setText(armyRepresentation); - - - + armyToString.setText(deepCopiedArmy.strengthAndUnitRepresentation()); } /** diff --git a/src/main/resources/edit-army.fxml b/src/main/resources/edit-army.fxml index acde2d71caf45e9ea22fc438c890bd635ef2b795..f7bef1dfd838ef6d6bfe8da564b2d09477e7914b 100644 --- a/src/main/resources/edit-army.fxml +++ b/src/main/resources/edit-army.fxml @@ -181,7 +181,7 @@ <HBox.margin> <Insets bottom="50.0" left="25.0" right="25.0" top="40.0" /> </HBox.margin> - <Label alignment="CENTER" maxWidth="300" text="Units of army" textAlignment="CENTER" wrapText="true" minHeight="-Infinity"> + <Label alignment="CENTER" maxWidth="300" text="Current army with changes" textAlignment="CENTER" wrapText="true" minHeight="-Infinity"> <font> <Font name="Arial" size="36.0" /> </font> diff --git a/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyTest.java b/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyTest.java index 173f5b59fb7df7a0c86affaa72b10ced6f5e41a7..66c0d0203b3eb53241155d77f37a3b6b91d98369 100644 --- a/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyTest.java +++ b/src/test/java/edu/ntnu/idatt2001/carljgu/ArmyTest.java @@ -50,27 +50,43 @@ public class ArmyTest { } } - @Test - public void getting_random_unit_from_army_when_units_is_empty_returns_null() { - army = new Army("Valid name"); + @Nested + public class Retrival_and_adding_to_unit_list { - Unit randomUnit = army.getRandom(); + @Test + public void getting_random_unit_from_army_when_units_is_empty_returns_null() { + army = new Army("Valid name"); - assertNull(randomUnit); - } + Unit randomUnit = army.getRandom(); - @Test - public void units_with_duplicate_in_army_are_not_added() { - ArrayList<Unit> units = new ArrayList<>(); - InfantryUnit duplicate = new InfantryUnit("Infantry", 10); - army = new Army("Army"); + assertNull(randomUnit); + } + + @Test + public void units_with_duplicate_in_army_are_not_added() { + ArrayList<Unit> units = new ArrayList<>(); + InfantryUnit duplicate = new InfantryUnit("Infantry", 10); + army = new Army("Army"); - for (int i = 0; i < 10; i++) units.add(duplicate); - army.addUnits(units); + for (int i = 0; i < 10; i++) units.add(duplicate); + army.addUnits(units); + + assertEquals(1, army.getAllUnits().size()); + } - assertEquals(1, army.getAllUnits().size()); + @Test + public void all_units_in_list_are_transferred_to_observable_list() { + List<Unit> units = new ArrayList<>(); + units.add(new InfantryUnit("Infantry", 10)); + units.add(new RangedUnit("Ranged", 10)); + + Army army = new Army("New army", units); + + assertEquals(units, army.getAllUnits()); + } } + @Test public void armies_with_the_same_name_and_contains_the_same_units_but_different_arraylist_objects_have_equal_hash_codes() { String armyName = "army"; @@ -87,16 +103,7 @@ public class ArmyTest { assertEquals(armyOne.hashCode(), armyTwo.hashCode()); } - @Test - public void all_units_in_list_are_transferred_to_observable_list() { - List<Unit> units = new ArrayList<>(); - units.add(new InfantryUnit("Infantry", 10)); - units.add(new RangedUnit("Ranged", 10)); - Army army = new Army("New army", units); - - assertEquals(units, army.getAllUnits()); - } @Nested public class Army_returns_a_filtered_list { @@ -145,4 +152,31 @@ public class ArmyTest { assertTrue(infantries.size() > 0); } } + + @Nested + public class Army_strength { + + @Test + public void army_with_no_units_has_zero_strength() { + Army army = new Army("Valid name"); + assertEquals(0, army.getCalculatedStrength()); + } + + @Test + public void army_with_one_basic_infantry_with_ten_health_has_thirty_five_strength() { + Army army = new Army("Valid name"); + army.addUnit(new InfantryUnit("Infantry with 10 health", 10)); + assertEquals(35, army.getCalculatedStrength()); + } + + @Test + public void army_with_ten_equal_units_has_strength_divisible_by_ten() { + Army army = new Army("Valid name"); + int amountOfUnits = 10; + for (int i = 0; i < amountOfUnits; i++) + new InfantryUnit("infantry", 1); + assertEquals(0, army.getCalculatedStrength() % amountOfUnits); + } + + } }