diff --git a/GT_Modulsicht/GalaxyTrucker.vpp b/GT_Modulsicht/GalaxyTrucker.vpp
index 26c7bc03931d6b1fb9e2f4b903781bb97f625f61..1ee0472b8469918460f0ef354f8ddbd973ef60a4 100644
Binary files a/GT_Modulsicht/GalaxyTrucker.vpp and b/GT_Modulsicht/GalaxyTrucker.vpp differ
diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d
new file mode 100644
index 0000000000000000000000000000000000000000..556d186b4a376ef22ba5716002778d441fd093dc
Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_002d differ
diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d
new file mode 100644
index 0000000000000000000000000000000000000000..c65918c439041efc2a6a2a27cfa980bac9219372
Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_003d differ
diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_004d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_004d
new file mode 100644
index 0000000000000000000000000000000000000000..0adb62fbfd431c6a82a67870eb3759e8bbc2b938
Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_004d differ
diff --git a/GT_Modulsicht/GalaxyTrucker.vpp.bak_005d b/GT_Modulsicht/GalaxyTrucker.vpp.bak_005d
new file mode 100644
index 0000000000000000000000000000000000000000..3be11fe0209068298df8a6d32a2a49ef8ceb05e5
Binary files /dev/null and b/GT_Modulsicht/GalaxyTrucker.vpp.bak_005d differ
diff --git a/GT_Modulsicht/Gt Model.png b/GT_Modulsicht/Gt Model.png
index 930515f2559b183b5f487697e9ef926acbd7fcb4..43961e58e07e2b7f1997710e943e80d67eb0ccbd 100644
Binary files a/GT_Modulsicht/Gt Model.png and b/GT_Modulsicht/Gt Model.png differ
diff --git a/core/out/production/classes/META-INF/galaxytrucker.core.main.kotlin_module b/core/out/production/classes/META-INF/galaxytrucker.core.main.kotlin_module
new file mode 100644
index 0000000000000000000000000000000000000000..8fb60192d378759239a3ecbf60eac8c8de446e9c
Binary files /dev/null and b/core/out/production/classes/META-INF/galaxytrucker.core.main.kotlin_module differ
diff --git a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Main.class b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Main.class
index d5cc4568e2a29b977036f1e9d00efe58f23235d6..9afada3d3d0550b2e9deee502e2304487093c4ac 100644
Binary files a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Main.class and b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Main.class differ
diff --git a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class
index d747ed5706705b8fde195a6e58ad71c75f6fe2b0..81ffac05cb55766ec492c653d7ccbebe155caa5d 100644
Binary files a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class and b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.class differ
diff --git a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.class b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.class
index c4c35a7261c134ff2926052f1dd397b28832f1a7..6b35adb476d7d9989e6c8abb3a52810d92d671ca 100644
Binary files a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.class and b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.class differ
diff --git a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class
index b9a6e5da01893d9ec802893c7bd78ca920d3448b..e2c50b85d9abff4227b5768639742cc5d5ed7eeb 100644
Binary files a/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class and b/core/out/production/classes/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.class differ
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Attack.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Attack.java
new file mode 100644
index 0000000000000000000000000000000000000000..9d080aacf1c755afe365ff568eccad3d023d0fff
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Attack.java
@@ -0,0 +1,7 @@
+package com.galaxytrucker.galaxytruckerreloaded.Controller.Actions;
+
+public class Attack {
+
+
+
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Move.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Move.java
new file mode 100644
index 0000000000000000000000000000000000000000..90c2a67850dec58ba782726844fbe56e142a7690
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Controller/Actions/Move.java
@@ -0,0 +1,5 @@
+package com.galaxytrucker.galaxytruckerreloaded.Controller.Actions;
+
+public class Move {
+
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
new file mode 100644
index 0000000000000000000000000000000000000000..27ca5240b6cf3757500f15610501f5601409fd14
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Overworld.java
@@ -0,0 +1,12 @@
+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
+
+
+import java.util.HashMap;
+
+public class Overworld {
+ private HashMap<float[],Planet> planetMap;
+
+ public Overworld(int seed) {
+ planetMap = new HashMap<>();
+ }
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
similarity index 92%
rename from core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
rename to core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
index 74efee93c43e483a73fd8e3422a19801349c7cd1..c0ab5064208708414a512dd9f1bf6cd46cab83a3 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/Planet.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/Planet.java
@@ -1,4 +1,4 @@
-package com.galaxytrucker.galaxytruckerreloaded.Model.Planet;
+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
import com.j256.ormlite.field.DatabaseField;
import lombok.*;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/PlanetEvent.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/PlanetEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..e700d4368208c011ba19229d86513a6f9318c500
--- /dev/null
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Map/PlanetEvent.java
@@ -0,0 +1,5 @@
+package com.galaxytrucker.galaxytruckerreloaded.Model.Map;
+
+public enum PlanetEvent {
+
+}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/PlanetEvent.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/PlanetEvent.java
deleted file mode 100644
index a7220bafe1dce9fa842cfdeb5e9c5f74b57acc4a..0000000000000000000000000000000000000000
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Planet/PlanetEvent.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.galaxytrucker.galaxytruckerreloaded.Model.Planet;
-
-public enum PlanetEvent {
-
-}
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
index ac04de8de12024dd50c3026375163a83e6bf4cc6..f5eb664e56191728205c512d10607d8787900316 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Ship.java
@@ -1,5 +1,6 @@
package com.galaxytrucker.galaxytruckerreloaded.Model;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Map.Planet;
import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
import lombok.*;
@@ -26,15 +27,50 @@ public class Ship implements Serializable {
*/
@NonNull
@DatabaseField(columnName = "HP")
- private int hp;
+
+
+ /**
+ * Resources are stored in ship
+ */
+ private int money;
+ private int missiles;
+ private int fuel;
/**
- * Shields
+ * Energy to be distributed
+ */
+ private int energy;
+
+ /**
+ * Shields that are currently active
+ */
+ private int shieldCharge;
+
+ /**
+ * Total number of Shields that are powered. Possibly redundant through Shield.getEnergy/2
+ */
+ private int maxShieldCharge;
+
+ /**
+ * chance for the ship to dodge incoming attacks
+ */
+ private float evasion;
+
+ /**
+ * X and Y coordinates on the map
+ */
+ private Planet position;
+
+ /**
+ * time needed until position can be changed again
*/
@NonNull
@DatabaseField(columnName = "SHIELDS")
private int shields;
+ private int FTLcharge;
+
+
/**
* Take damage
*/
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
index 7a1e3f05f64bdb4df39b1741450e2ba9f2f64ed3..714925075aedca21d4b2217869f5badde91792b6 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/ShipLayout/Room.java
@@ -1,5 +1,6 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.ShipLayout;
+
import com.j256.ormlite.field.DatabaseField;
import lombok.*;
diff --git a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
index 32c66c11feed0027aa96a0fc67e05ddb917c767a..99e30301eb9105b6a55ca0df450a1eed21fd75d0 100644
--- a/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
+++ b/core/src/com/galaxytrucker/galaxytruckerreloaded/Model/Weapons/Weapon.java
@@ -1,22 +1,55 @@
package com.galaxytrucker.galaxytruckerreloaded.Model.Weapons;
+import com.galaxytrucker.galaxytruckerreloaded.Model.Ship;
+
public abstract class Weapon {
/** Weapon damage */
private int damage;
- /** Weapon coolDown */
+ /** Amount of rounds for the weapon to be used again */
private int cooldown;
/** Weapon energy */
private int energy;
+ /** Amount of missiles spent per attack */
private int missileCost;
- private float dropchance;
- private int crewdamage;
- /**
- * How many projectiles are fired per burst
- */
- private int burst;
private float precision;
+ /** probability of randomly finding this weapon */
+ private float dropChance;
+ /** Amount of shield bars this Weapon can ignore */
+ private int shieldPiercing;
+ /** Probability of causing a breach in the section on hit */
+ private float breachChance;
+ /** Damage taken by crew in the hit section */
+ private int crewDamage;
+ /** How many projectiles are fired per burst */
+ private int burst;
+
+ public int getCooldown() {
+ return cooldown;
+ }
+
+ public void setCooldown(int cooldown) {
+ this.cooldown = cooldown;
+ }
+
+ public int getEnergy() {
+ return energy;
+ }
+
+ public void setEnergy(int energy) {
+ this.energy = energy;
+ }
+
+ public float getDropChance() {
+ return dropChance;
+ }
+
+ public void setDropChance(float dropChance) {
+ this.dropChance = dropChance;
+ }
+
+ public void attack(Ship target){}
}
diff --git a/doc/Architekturbeschreibung.tex b/doc/Architekturbeschreibung.tex
index 9a9979ce3d4bafc99c50a4c7b819cecb9ce51727..0f44c169c2d0c84c1bc65da21d567cca7d7820ae 100644
--- a/doc/Architekturbeschreibung.tex
+++ b/doc/Architekturbeschreibung.tex
@@ -1201,6 +1201,16 @@ in die Details von spezifischen Technologien abzugleiten. Sie wird in den
nachfolgenden Sichten konkretisiert und verfeinert. Die konzeptionelle Sicht
wird mit {UML}-Komponentendiagrammen visualisiert.}
+\newpage
+
+\begin{figure}[H]
+\begin{center}
+ \includegraphics[width=340px]{UML/KonzeptioneleSicht.pdf}
+ \caption{Die konzeptionelle Sicht}
+ \label{fig:boat1}
+\end{center}
+\end{figure}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\section{Modulsicht} \label{sec:modulsicht}
diff --git a/doc/UML/KonzeptioneleSicht.pdf b/doc/UML/KonzeptioneleSicht.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..0fda59d945bd6a3bfe73415fefd69edc25b92df7
Binary files /dev/null and b/doc/UML/KonzeptioneleSicht.pdf differ
diff --git a/doc/UML/KonzeptioneleSicht.xml b/doc/UML/KonzeptioneleSicht.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ac0a8ee1d2327bc051b1ad87c4e349e235918819
--- /dev/null
+++ b/doc/UML/KonzeptioneleSicht.xml
@@ -0,0 +1 @@
+<mxfile host="app.diagrams.net" modified="2020-05-26T13:35:49.436Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36" etag="DEyTdgCNTRHLzs5Yjxnl" version="13.1.3" type="device"><diagram name="Page-1" id="5f0bae14-7c28-e335-631c-24af17079c00">7V1Zc9s4Ev41rtp9EAqNG4+xncyxmZ1UMptJnrYUi7a1I4seWU7s+fXboHiBgCRKIiU5IyWViCAFkt0f+kKjccYv7p5+mA3vb39JR8nkjNHR0xm/PGMMFJf4n2t5zls0qEXLzWw8ytuqhg/jv5K8keatj+NR8uBdOE/TyXx87zdepdNpcjX32oazWfrNv+w6nfh3vR/eJEHDh6vhJGz9fTya3+atQGl14sdkfHOb39rI/MSX4dUfN7P0cZrf74zx6+yzOH03LPrKr3+4HY7Sb7Um/vqMX8zSdL74dvd0kUwccQuyLX73ZsnZ8rlnyXTe5geD29d3T+zx2X5KL7/9Zb5O3w1+GbBFL1+Hk8ekeI3sYefPBYFu53cT/AZn/Px6PJlcpJN0hsfTdIoXnOe/T2bz5Gnpg0H5uoijJL1L5rNnvKT4QUHq58bxt4ofRudtt3VWFI3DHAM3Zd8VHfBLToo4Wf71Z/Lz7PFjci9++zj7YfJWjm70AKhYTxjH/PslLxslSQ7h4ZeiB7oRXQbCMCID0jALxIDVglPgoKkMCQW9EYrbrem0hvDbk+9YaAMtBtcmtClp/R2QBrolTUnql0+ajkEDu4ujA1CGW5A0McJcgzSCXg1a4MW94Rj1+qvJ+GaKTfP0HvXTMD+aJNf4gOcP98Or8fTmN3fu0lQNb7PTl6xqeZ+/EmRtt8N7d5urxy9O6T0srBg0Yfj5aDxDIo5Td5OH9NFR6vw6nc4/5E8m8LimQjODIXGvSRf9LmwCd3CV3o2v8u+T4Zdkcl5aGA2l+zCfpX+U5grkd3wzvBtPnK74mMxGw+mweJD8YVlLxCwbSquBoSkBqijVVGngWosIMqQkhtc+ogegyPVAKZmZ3t0jPR0xlsAkRwVXB2ach6DO2ZifZVQQxaRWzDKrhDWe8QGCgKp/TGCICEvQbAbDgXIAaSPCgUsi6t3ovvRLgILL4XSeTM+H0z/OmJo4Hn+Z4bebeUZRNbxzwmISHn14fpgnd2Wbf31x1OjvxxBzyIO5z8YFFBr4iBjYBTKvkN0Jtp835dzdeDRytzn/djueJx8Que6e39BdC1DbF3Q0I6gQgDKL7KdWWg86Ima1orAggkpulWZcgLYQokVrYveBFr1eZvh0jFHak/HzYa4R+qQ6UE2o0UClMhIFq2oMWBshO1cogpnimjONv7AqIqaXjPTufYcWdG/jfLZxvpYSUeDrcu5RbsCNJCyknVKSFBj0hVpftmDBnoN6oRbFuq8LJA8ddKbRMjQxc5ARKpikeIW1rERc97RqgaZNDOeS9t0YzocmDwrnjumjd6ZPMd50LKqxlGAo1vaCJxOh10LTo3U49Qin/nx0UTw0BDPx9ApPzm6+DP+B741/8f40+u2f7quTYtSZe4Pr3Ax0P79Lp+lDpmC8SxaOh7uA3j+Vp5xxMRglV+ksVzvugkxElk9WmTqyGcyVSBTXmkUiy6OCSDIjE7Zcuu/u0aUjhETarrsWymsLNG3VDau6WfCiPFOdWLCiPJHjuPzZAqKxB6tDNfJ0wYOXPy2fucKzdDKzvJLrWjfPVbuytfYF4KtXzUFfnM6BX90d3W9Ze20EffXOtedoUjY7LMm7mtz8mMhd3jNO7iMkn9icfL5B75pd6AL/z21/15L5pa6pFsBw7abe+Da/6JLVW9+XRIC8PfN/XUMWzsianFzJLqHZcRXUcI2LsIZrrwIbrl1kbZmJlv02OywsZddCi/s5X7lqWPjL1XHUZ3anFzJM+n5zdaua7+waC++5fNDypeoiZDk4m+ArR0IcfLUxLXYY0rJ/TMqVmHQ6zZHM+a8yUxPuKPvuvNyMQcvbLsogSv1krJN6W/SWPzkH9zrTeUtGSuZFRzBX96U93FQ+g9dcjavcq3aN4TDMPWt3subxuTOZzxdHex9Qq3ViKDpw6J9xZi3+W5PWNTxKRhg6eOWfmlBqwNP5kIAGaPlnOVKtJFr1C9Ra922FZ02Y1ZC4SnSWUtI5zEcssAKU94yszDSNGSzLhZuwRNQQ2EQMr/1yJ7hkjb59ml8XGLIqj+G9WRjphdXbcHROcwXdzBVUXuWGswVLnDtZuoI9OMB0vQP895ga2IRr5eSAn4vAKNHGci60AGYM06EHnwuHIFoGBIyglAGA5UzA7vz+2Vywmf33h//Oxl/TS/n11/Hb6WC5+94u8F8zbDaJ/V8gd2bpZOKMiga4XtQcwBYYMYxwWzNNmIcYgYaLklQYF0hFAcBEgJiIMdJEj14YIf1ICNkiRFZIiPtZ+nWMVH2f/PmIUn1UGa8ehwtGvXVj/136MM6l/5d0Pk/v/LkCG2fPxiFtziQBn/iaKcJ4GGSLJFUVbT2Qt0VOVTIdvXJJfRX2g+FSF5FIpNnzJ3dAUKIUDZ8d1ImbwcwbLp9y8C+OnutH75LZGF/QDasl4yNnACrs2VXSBj/z4ewmWRk7zYVTMvJyE1fqTBnhVdE2SyYIoq+J97wxBuZ3eJeOnVyrAGMDwKgGDBZvn/+wQkLYlw77gkZfC/oEfWWoKl9+F6C1SALYGmg+yOQ2EEuexvNP2c9z0OJx3l15XPXnDp5rB1sBNp78WeTbrsNriexjAWyRdVwgzLIt0cpDUVnMXnePVvE/+Dyf387evbn//fbi1fnd77evBxAzVPandIDLjiZSVcNCLHi9B30TJ2yL1NRDSoHtFU2hPurjdiW2jmXYCnTvGEXdsviABxgOaD8K1vD/Wo9kJQktOnYfPxuC2Uot7WlgF3DbGn+lmvBVxMYKokRtDaif6yBegtpWAN0Edz5ioyoJ5GEBGhgvrJnO2hqQwgR90T0bQjo0hH59/8tggj5iAMVj9U43VkRgLKF+wsoAhCRCBfrIUMKjYShC7XLs7KSV+EG1fUe6noElCv8RXChmrJZNcmskbEhu/BWznBn3U2qARXKperMGdnUJthWila0PVnuCnHHTj62/CndrTX19XBaDNUQYFxKizDBlihBCCbSma9lWOguhiAauuJVo8GtoArjp/vZsK7TI82uHTiCUNYxTAWsxutJJ3cD62B6ekcjJKhgfCzwZDmOhGTUIUqlkwy0d8G1tB7Ua9ma/6GxhyG6UH92BBuKWEyFBIPEttZw25YJ2GbwUzxiOCodTHSgjrok16DVoJrgBxSKrFZgl2hguik4M3105RecqYIOpqR6sArTXO7K9tPCDAFKFhO8rCBCnbIuFY31StquYvtQQeBOowoqmg5G3Mx+31Cyfa2eWGEZ7j8KscFV9nbUSg0eitKQMndxtFZWiQV/Qn3KKU7dF3n9byx6M9iHlNO8OttPARfjhzDOgRE9Wf5Q4+mVCVIVxGN6UYa0hatfHdPqG6K6R6BpEXYaxB1Ew6vDR55cAKi6BGE1d7sni49uMLvxsQFYB5C0D0TKcTC3fYE/2eqQox+VwPgww992E/LihTYKT2lRAMdFQj/xVwVkv8lelSXRuK7EWRn7fi/kUhIK1cD7a5Oc1wyKdEWf7cjurad3v4r3eyNEiWrkJObqtqbN3amy/CnYlcV8oNVrYu6f05o3Tm1cCr5vk5t4Q0cK8/O4Sm3fk17K0ZiB5VrILCSrnDzZ147K0ZkkUaC0oeipoSsoOklTjU+sxYbiHvOZ8jcULsSC7QUcjoZk1Uko0EUJbqqTR2oIO02tb5DMDlVnRHM2tAsa56gA3cYuoRZpZWx/UWm8K1KXa7pgHyaAe/qPEFFOl+wiSFAbwWof2uOZGtUQfRgROThF51+jOSlt9/O7berNaorgDSk30JkJponR1D9Oo6NVzXIXtHFcpAciFn4jrogNb51kdX3bgStwfCZ5l6JvKZiy5dRBGhX01Y9w9J1+ZNor6QzL76lYKhQr8hSjajUM1FjljrUbNqTigoeXr1EXpJSEV1VYYlDqhUlXCpThYEEwricrXhoDES5Q1VIK7gVOtPdlivIVj+t0Z3pvn41G3+EiiASUl6iswTZYju5jiRltJJQ7TkOUii3JbkMZoI6nQsbl6QyzXaLZzhcCwaJLtzvRfphP6bjS4v/jEBrPz4cUr+fZjJIEvX/L3/Y7ZyOSzLDKmPDZF2NKBzxtlQxgw/M/9aPg957Wqpq8an//viwvxDGPB1ovAvoPaLpePKm5tnlzaqObHDETri7UoWFtVruyBci0ygTcq9FyyoqO45qHps/2UwBqCd1GwDj0icKVLgQOIyOL3duSzRNb66Y+UsemEUym7WPmRUym7+amUXS/kLu8ZJ/cRku9Uyu5IK0OtB+eplB07lbI7lbI7lbI7DoF1KmXnN55K2R1hKbvS4VwfkSk3ZCOVCyhoOf218b44hhjJhLQUFLdc9LXhAj7mep/6uwtY78ztciMERiKrl4uyMSSSZSoMKi/uNj4SWlMO0cC1JSD6YviBiuC9S2YP44d5Mv3rBU9tdYUb9NSUlICQ4ZbJRl0SbgiO93L0hwLEKOLm3lHAUGW4iO245mb6qUbZQoUFQ3kHcaTogqdYQC4ofzgZJ/l86rHyeKe9So30py/9Bb+oCIi2AvlMJXroNsweO8zsZZSdf5ed0nbit4VVc5fA0ZHQChiOPKGFUmHNi0PNXUZZvoH677e+5U48kS5ubn1GuFFZy0OS4ewk40RG8ja7mBqL0nrXfLu91SD0Mu/O1pd3CIo6dbV4djlkD5Zi56z3MIkuB52xRIvaycaobZ1ihzeh0igoPt5NxOqbdJfEFKV+jyX03FJGD8iuhKveCcp1IG9RJ61DeEfW3a7YAu9Q8EZPhnDZMGHQyTGiifiNF92itBWNeXguiKwjWTbs1J6hHKmx8dvFO+zKabjkYZ59e0Az5+G4c0h2U50FcsqyiGv1JujIWpbetOaGG4O3nsvfzL5Aj01prmLy2Ei3pF9JBXgJxCw+bglf4uh3Xk0mTkO2DxquYN9KeXZ48myWeNMpedgLIM9meTedkoe/APK0cJu3KIa1Rqqv4NTRkCueIh26nD9NUXk+Xh13kGjHDRgUYVCrP+BXmlhsxnC46gQra8GfcsROOWKRn55yxPZB7vKepxyxU47YKUfslCN2yhE75YidcsROOWKnHLF95IjtFFoFV2fSLyOvi+Xr+9v6NO7bsYhv14DIaaqfhww04G9zGlmavLdNTuOcjcUy95DgVbNd3nwcJ9+OOpazEyqy1aPas0DqAGGNXU0DgOxvT9N4zlY469VDNHdNzhRFIsGyWfSB24MvsugfpCQqFgQDRQzri1x7mX5awamV0dzDkKSF8uiLJOtnkw5DksPNIC24cYQkaTFrdLJCu7BCVyByO1g0N6XrDhOnDNPNOVZ0A4IIrayWwBU1tploLIkAq4WSCm1UayCyzYohzDJrhEDrxAhJY7utKUKpFJRJowE0o30lnopT1crtjNNtsCO0S1pEj8VK5DynzMcOmqwUMUGZdteA4GH1CgWEI2rKPxHoaEU0/lRJrbgQUvemWFrk0fZtwGpLS81Z7jAV8e1BLdO8vYnYFgmafVkiZr3KWU4Przw/7cs9lnvxflZw5sjJczhvR7bwdg5Onhaez8mm7c2mlS28v4NDZIPtfP92Ju4yBhbdMCCGc1CgjLGGFi5kYeIKItGC4ZJrYZQpk6jq2W2UALJaSevMGJAQM3HRjkbj1ipBrQZheltN12Z1ZA8WrqsgO7560Snr24BHuv2UKRgBaOBK21zEYNxOT2ieusLsVMXcI+XqzNbCshEpopmrS4pXSWu4MF3UZ4u/amd7U7v95nhjdRhX/Gyn9WFG8LNqYY23pV3fa2tWl7Nbu3ZMrTcy+lw8VhhDSzeVbr1CrLG9VRnV39PSGbnz9tQlmFAKn/Hjq7O+b2CygwJThu4sa0KqLTazyZ1mZ3a/+FQt3Lwe1zVDR1ONmhvCfCNoAFIQXs8Vj5Qa3fPCZtXCa2y7k4iwZ40VoDsuZt6zslo70uVhR7rK/KCyAFEzhoWAs7asG8IatnF79QTEaqO50kYagCaEmSJAmdXU4H+ylJL7Eg4tvPg+dwB3eWbdiIfG2s0BU41dLiOTAPuWDS384baywa2trAuHnQSDZ3QcdGl4gce1okOsX97V59pw20RbM4jdWjyIELcdSYCzPE2ydnmVIMlf/x8=</diagram></mxfile>
\ No newline at end of file