From c7723af2139b898ad30eed468aef95ccc392206a Mon Sep 17 00:00:00 2001
From: fabianlojo <59798704+fabianlojo@users.noreply.github.com>
Date: Fri, 17 Jan 2020 16:13:16 +0100
Subject: [PATCH 1/4] done

---
 vikingsClases.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vikingsClases.py b/vikingsClases.py
index b51cd5f..1650ba4 100644
--- a/vikingsClases.py
+++ b/vikingsClases.py
@@ -3,6 +3,7 @@
 
 
 class Soldier:
+    def
     pass
 
 # Viking

From ab68ea543e538242eb4ede0400aad8675f1ab969 Mon Sep 17 00:00:00 2001
From: fabianlojo <59798704+fabianlojo@users.noreply.github.com>
Date: Mon, 20 Jan 2020 07:46:11 +0100
Subject: [PATCH 2/4] done

---
 vikingsClases.py | 70 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/vikingsClases.py b/vikingsClases.py
index 1650ba4..a934f37 100644
--- a/vikingsClases.py
+++ b/vikingsClases.py
@@ -3,23 +3,79 @@
 
 
 class Soldier:
-    def
-    pass
+    def __init__(self, health, strength):
+        self.health=health
+        self.strength=strength
+    
+    def attack(self):
+        return self.strength
+        
+    def receiveDamage(self, damage):
+        self.damage=damage
+        self.health = (self.health)-(damage)
+
 
 # Viking
 
 
-class Viking:
-    pass
+class Viking(Soldier):
+    def __init__(self, name, health, strength):
+        self.name=name
+        super().__init__(health, strength)
+
+    def __init__attack(Soldier):
+        return self.strength
+
+    def receiveDamage(self, damage):
+        self.damage=damage
+        self.health=(self.health)-(damage)
+        if self.health<=0:
+            return ("Harald has died in act of combat")
+        else:
+            return ("Harald has received 70 points of damage")
+
+    def battleCry(self):
+        return ("Odin Owns You All!")
+
+
 
 # Saxon
 
 
-class Saxon:
-    pass
+class Saxon(Soldier):
+    def __init__(self, health, strength):
+        self.health=health
+        self.strength=strength
+
+    def __init__atack(Soldier):
+        return self.strength
+
+    def receiveDamage(self, damage):
+        self.damage=damage
+        self.health=(self.health)-(damage)
+        if self.health>0:
+            return ("A Saxon has received 45 points of damage")
+        else:
+            return ("A Saxon has died in combat")
+
 
 # War
 
 
 class War:
-    pass
+    def __init__(self, vikingArmy, saxonArmy):
+        self.vikingArmy()
+        self.saxonArmy()
+    
+    def addViking(self, Viking):
+        self.Viking=Viking
+        append.self.vikingArmy(n+1)
+
+    def addSaxon():
+
+    def vikingAttack():
+
+    def saxonAttack():
+
+    def showStatus():
+

From 2d55497ff80a5756009f93de4c8c78eba4bfb289 Mon Sep 17 00:00:00 2001
From: fabianlojo <59798704+fabianlojo@users.noreply.github.com>
Date: Mon, 20 Jan 2020 09:49:56 +0100
Subject: [PATCH 3/4] done

---
 vikingsClases.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/vikingsClases.py b/vikingsClases.py
index a934f37..95f3409 100644
--- a/vikingsClases.py
+++ b/vikingsClases.py
@@ -71,9 +71,11 @@ def addViking(self, Viking):
         self.Viking=Viking
         append.self.vikingArmy(n+1)
 
-    def addSaxon():
+    def addSaxon(self, Saxon):
+        append.self.saxonArmy(n+1)
 
-    def vikingAttack():
+    def vikingAttack(saxonArmy):
+        random.sample.self.saxonArmy
 
     def saxonAttack():
 

From ebf1c346e17d37461414dc0d08cb80eb735b54a7 Mon Sep 17 00:00:00 2001
From: fabianlojo <59798704+fabianlojo@users.noreply.github.com>
Date: Mon, 20 Jan 2020 17:21:09 +0100
Subject: [PATCH 4/4] act

---
 vikingsClases.py | 33 ++++++++-------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/vikingsClases.py b/vikingsClases.py
index 95f3409..372b683 100644
--- a/vikingsClases.py
+++ b/vikingsClases.py
@@ -12,7 +12,7 @@ def attack(self):
         
     def receiveDamage(self, damage):
         self.damage=damage
-        self.health = (self.health)-(damage)
+        self.health -= damage
 
 
 # Viking
@@ -28,12 +28,12 @@ def __init__attack(Soldier):
 
     def receiveDamage(self, damage):
         self.damage=damage
-        self.health=(self.health)-(damage)
-        if self.health<=0:
-            return ("Harald has died in act of combat")
+        self.health=-(damage)
+        if self.health>0:
+            return ((str(self.name) + " has received " ((str(self.damage)) + "points of damage")
         else:
-            return ("Harald has received 70 points of damage")
-
+            return ((str(self.name) + " has died in act of combat")
+    
     def battleCry(self):
         return ("Odin Owns You All!")
 
@@ -52,9 +52,9 @@ def __init__atack(Soldier):
 
     def receiveDamage(self, damage):
         self.damage=damage
-        self.health=(self.health)-(damage)
+        self.health-=(damage)
         if self.health>0:
-            return ("A Saxon has received 45 points of damage")
+            return ("A Saxon has received "((str(self.damage) + "points of damage")
         else:
             return ("A Saxon has died in combat")
 
@@ -63,21 +63,4 @@ def receiveDamage(self, damage):
 
 
 class War:
-    def __init__(self, vikingArmy, saxonArmy):
-        self.vikingArmy()
-        self.saxonArmy()
     
-    def addViking(self, Viking):
-        self.Viking=Viking
-        append.self.vikingArmy(n+1)
-
-    def addSaxon(self, Saxon):
-        append.self.saxonArmy(n+1)
-
-    def vikingAttack(saxonArmy):
-        random.sample.self.saxonArmy
-
-    def saxonAttack():
-
-    def showStatus():
-