From 782e9dbb136b98c71efc7fe87628ec1d79e35b39 Mon Sep 17 00:00:00 2001
From: Achim <achim.retzbach@outlook.de>
Date: Tue, 31 May 2016 09:16:19 +0200
Subject: [PATCH 1/3] Add files via upload

---
 ArmySchubser.java | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 ArmySchubser.java

diff --git a/ArmySchubser.java b/ArmySchubser.java
new file mode 100644
index 0000000..af0d55f
--- /dev/null
+++ b/ArmySchubser.java
@@ -0,0 +1,27 @@
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+import greenfoot.MouseInfo.*;
+
+/**
+ * Schubst Einheiten.
+ * 
+ * @author MaxiJohl, GruenerWal
+ * @version 0.0.1
+ */
+public class ArmySchubser extends Map_World
+{
+
+    /**
+     * Constructor for objects of class ArmySchubser.
+     * 
+     */
+    public ArmySchubser()
+    {
+        // Hi.
+    }
+    
+    public void act()
+    {
+        MouseInfo m = Greenfoot.getMouseInfo();
+        Actor startProvince = m.getActor();
+    }
+}

From 7fc1952bdac189c6e4d5084e489669e1b6334572 Mon Sep 17 00:00:00 2001
From: Achim <achim.retzbach@outlook.de>
Date: Sat, 4 Jun 2016 17:12:41 +0200
Subject: [PATCH 2/3] ArmySchubser V1

- Schubst Einheiten umher, leider noch nicht erfolgreich
---
 ArmySchubser.java | 99 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 72 insertions(+), 27 deletions(-)

diff --git a/ArmySchubser.java b/ArmySchubser.java
index af0d55f..5f18a68 100644
--- a/ArmySchubser.java
+++ b/ArmySchubser.java
@@ -1,27 +1,72 @@
-import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
-import greenfoot.MouseInfo.*;
-
-/**
- * Schubst Einheiten.
- * 
- * @author MaxiJohl, GruenerWal
- * @version 0.0.1
- */
-public class ArmySchubser extends Map_World
-{
-
-    /**
-     * Constructor for objects of class ArmySchubser.
-     * 
-     */
-    public ArmySchubser()
-    {
-        // Hi.
-    }
-    
-    public void act()
-    {
-        MouseInfo m = Greenfoot.getMouseInfo();
-        Actor startProvince = m.getActor();
-    }
-}
+import greenfoot.*;  // (World, Actor, GreenfootImage, Greenfoot and MouseInfo)
+import greenfoot.MouseInfo.*;
+import javax.swing.JOptionPane;
+
+/**
+ * Schubst Einheiten umher.
+ * 
+ * @author MaxiJohl, GruenerWal
+ * @version 0.1.0
+ */
+public class ArmySchubser extends Map_World
+{
+
+    /**
+     * Constructor for objects of class ArmySchubser.
+     * 
+     */
+    public ArmySchubser()
+    {
+        // Hi.
+    }
+
+    /*
+    public void act()
+    {
+    MouseInfo m = Greenfoot.getMouseInfo();
+    Actor mouseActor = m.getActor();
+
+    if (mouseActor.getClass().equals(Province.class))
+    {
+    Actor firstProvince = mouseActor;    
+    }
+    }
+     */
+
+    public void act() {
+        Province firstProvince = null;
+        Province secondProvince = null;
+
+        for ( int i = 0; i <= provinceCount; i++)
+        {
+            if (provinces[i].hasClicked() == true)
+            {
+                provinces[i] = firstProvince;
+                break;
+            }
+        }
+
+        for ( int i = 0; i <= provinceCount; i++)
+        {
+            if (provinces[i].hasClicked() == true && provinces[i] != firstProvince)
+            {
+                provinces[i] = secondProvince;
+                break;
+            }
+        }
+
+        String toMove = JOptionPane.showInputDialog(null, "Wieviele Einheiten willst du verschieben?");
+        Integer entitiesToMove = Integer.valueOf(toMove);
+
+        if ( (firstProvince.getEntityCount() - entitiesToMove) > 0 && firstProvince.isProvinceNear(secondProvince.getID()) == true )
+        {
+            firstProvince.removeFromEntities(entitiesToMove);
+            secondProvince.addToEntities(entitiesToMove);
+        }
+
+        else
+        {
+            System.out.println("Du hast nicht genügend Einheiten, um die gewünschte Anzahl von " + firstProvince.getDisplayName() + " nach " + secondProvince.getDisplayName() + " zu verschieben, Köhler.");
+        }
+    }
+}

From e26f927c933039a6666d85ca5655826e6a8c4a8f Mon Sep 17 00:00:00 2001
From: Achim <achim.retzbach@outlook.de>
Date: Sat, 4 Jun 2016 17:14:24 +0200
Subject: [PATCH 3/3] ArmySchubser V1.1

- Schubst erneut Einheiten umher, leider nach wie vor ohne Erfolg
---
 ArmySchubser.java | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/ArmySchubser.java b/ArmySchubser.java
index 5f18a68..4691f74 100644
--- a/ArmySchubser.java
+++ b/ArmySchubser.java
@@ -6,7 +6,7 @@ import javax.swing.JOptionPane;
  * Schubst Einheiten umher.
  * 
  * @author MaxiJohl, GruenerWal
- * @version 0.1.0
+ * @version 0.1.1
  */
 public class ArmySchubser extends Map_World
 {
@@ -20,20 +20,8 @@ public class ArmySchubser extends Map_World
         // Hi.
     }
 
-    /*
-    public void act()
+    public void act() 
     {
-    MouseInfo m = Greenfoot.getMouseInfo();
-    Actor mouseActor = m.getActor();
-
-    if (mouseActor.getClass().equals(Province.class))
-    {
-    Actor firstProvince = mouseActor;    
-    }
-    }
-     */
-
-    public void act() {
         Province firstProvince = null;
         Province secondProvince = null;