From 3d9ff71d8b6f10f87a686bd265be09fbd6101b76 Mon Sep 17 00:00:00 2001 From: lauravillalba Date: Fri, 17 Jan 2020 16:37:55 +0100 Subject: [PATCH 1/7] testSoldier-OK --- vikingsClases.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/vikingsClases.py b/vikingsClases.py index b51cd5f..e5ef22c 100644 --- a/vikingsClases.py +++ b/vikingsClases.py @@ -3,15 +3,23 @@ class Soldier: - pass + def __init__(self, health, strength): + self.health = health + self.strength = strength + + def attack(self): + return self.strength + + def receiveDamage(self, damage): + self.health -= damage + # Viking class Viking: - pass -# Saxon + # Saxon class Saxon: From e4fe1222e9d22d16062ce7bfef833d25edcb8dd6 Mon Sep 17 00:00:00 2001 From: lauravillalba Date: Fri, 17 Jan 2020 17:24:29 +0100 Subject: [PATCH 2/7] testViking-OK --- vikingsClases.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/vikingsClases.py b/vikingsClases.py index e5ef22c..e983ea1 100644 --- a/vikingsClases.py +++ b/vikingsClases.py @@ -17,9 +17,25 @@ def receiveDamage(self, damage): # Viking -class Viking: +class Viking(Soldier): + def __init__(self, name, health, strength): + self.name = name + super().__init__(health, strength) - # Saxon + def attack(self): + return super().attack() + + def receiveDamage(self, damage): + self.health -= damage + if self.health > 0: + return self.name + " has received " + str(damage) + " points of damage" + else: + return self.name + " has died in act of combat" + + def battleCry(self): + return "Odin Owns You All!" + +# Saxon class Saxon: From 6f13b1a26f230b7c187276eda552ae7e83965a9d Mon Sep 17 00:00:00 2001 From: lauravillalba Date: Fri, 17 Jan 2020 18:15:11 +0100 Subject: [PATCH 3/7] testSaxon-ok --- vikingsClases.py | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/vikingsClases.py b/vikingsClases.py index e983ea1..8ad4256 100644 --- a/vikingsClases.py +++ b/vikingsClases.py @@ -38,11 +38,32 @@ def battleCry(self): # Saxon -class Saxon: - pass +class Saxon(Soldier): + def __init__(self, health, strength): + super().__init__(health, strength) + + def attack(self): + return super().attack() + + def receiveDamage(self, damage): + self.health -= damage + if self.health > 0: + return "A Saxon has received " + str(damage) + " points of damage" + else: + return "A Saxon has died in combat" + # War +'''class War: + def __init__(self): + self.vikingArmy = [] + self.saxonArmy = [] + + def addViking(self, viking == 1): + self.vikingArmy.append(viking) + def addSaxon(self, saxon == 1): + self.saxonArmy.append(saxon) -class War: - pass + def vikingAttack() +''' From 097ac9ffcfc9321a5132591f088e99540a8cf431 Mon Sep 17 00:00:00 2001 From: lauravillalba Date: Sun, 19 Jan 2020 13:59:38 +0100 Subject: [PATCH 4/7] inteno de bonus --- vikingsClases.py | 50 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/vikingsClases.py b/vikingsClases.py index 8ad4256..4f0eb65 100644 --- a/vikingsClases.py +++ b/vikingsClases.py @@ -27,6 +27,7 @@ def attack(self): def receiveDamage(self, damage): self.health -= damage + print('HOLA K ASE vikingo dañado ', self.health) if self.health > 0: return self.name + " has received " + str(damage) + " points of damage" else: @@ -46,6 +47,7 @@ def attack(self): return super().attack() def receiveDamage(self, damage): + print('HOLA K ASE saxon dañado ', self.health) self.health -= damage if self.health > 0: return "A Saxon has received " + str(damage) + " points of damage" @@ -54,16 +56,52 @@ def receiveDamage(self, damage): # War -'''class War: + +class War: def __init__(self): self.vikingArmy = [] self.saxonArmy = [] - def addViking(self, viking == 1): + def addViking(self, viking): + print('Se va a crear un Viking: ', len(self.vikingArmy)) self.vikingArmy.append(viking) + print('Creado un Viking: ', len(self.vikingArmy)) - def addSaxon(self, saxon == 1): + def addSaxon(self, saxon): + print('Se va a crear un Saxon: ', len(self.saxonArmy)) self.saxonArmy.append(saxon) - - def vikingAttack() -''' + print('Creado un Saxon: ', len(self.saxonArmy)) + + def vikingAttack(self): + import random + randomSaxon = random.choice(self.saxonArmy) + randomViking = random.choice(self.saxonArmy) + randomSaxon.receiveDamage(randomViking.strength) + + if randomSaxon.health < 0: + print('Se va a eliminar saxon', randomSaxon.health) + print('Longitud saxonArmy antes: ', len(self.saxonArmy)) + self.saxonArmy.remove(randomSaxon) + print('ELIMINADO saxon') + print('Longitud saxonArmy después: ', len(self.saxonArmy)) + + def saxonAttack(self): + import random + randomViking = random.choice(self.vikingArmy) + randomSaxon = random.choice(self.saxonArmy) + randomViking.receiveDamage(randomSaxon.strength) + + if randomViking.health <= 0: + print('Se va a eliminar al vikingo', randomViking.health) + print('Longitud vikingArmy antes: ', len(self.vikingArmy)) + self.vikingArmy.remove(randomViking) + print('Vikingo eliminado') + print('Longitud vikingArmy después: ', len(self.vikingArmy)) + + def showStatus(self): + if len(self.saxonArmy) == 0: + return "Vikings have won the war of the century!" + elif len(self.vikingArmy) == 0: + return "Saxons have fought for their lives and survive another day..." + elif len(self.saxonArmy) == len(self.vikingArmy) and len(self.saxonArmy) == 1: + return "Vikings and Saxons are still in the thick of battle." From 86bca735c6f2ac6e19a7362a9ea0fc555b80610a Mon Sep 17 00:00:00 2001 From: lauravillalba Date: Sun, 19 Jan 2020 14:30:52 +0100 Subject: [PATCH 5/7] intentoBonus2 --- vikingsClases.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vikingsClases.py b/vikingsClases.py index 4f0eb65..cbb9bc3 100644 --- a/vikingsClases.py +++ b/vikingsClases.py @@ -62,14 +62,14 @@ def __init__(self): self.vikingArmy = [] self.saxonArmy = [] - def addViking(self, viking): + def addViking(self, Viking): print('Se va a crear un Viking: ', len(self.vikingArmy)) - self.vikingArmy.append(viking) + self.vikingArmy.append(Viking) print('Creado un Viking: ', len(self.vikingArmy)) - def addSaxon(self, saxon): + def addSaxon(self, Saxon): print('Se va a crear un Saxon: ', len(self.saxonArmy)) - self.saxonArmy.append(saxon) + self.saxonArmy.append(Saxon) print('Creado un Saxon: ', len(self.saxonArmy)) def vikingAttack(self): @@ -78,7 +78,7 @@ def vikingAttack(self): randomViking = random.choice(self.saxonArmy) randomSaxon.receiveDamage(randomViking.strength) - if randomSaxon.health < 0: + if randomSaxon.health <= 0: print('Se va a eliminar saxon', randomSaxon.health) print('Longitud saxonArmy antes: ', len(self.saxonArmy)) self.saxonArmy.remove(randomSaxon) @@ -103,5 +103,5 @@ def showStatus(self): return "Vikings have won the war of the century!" elif len(self.vikingArmy) == 0: return "Saxons have fought for their lives and survive another day..." - elif len(self.saxonArmy) == len(self.vikingArmy) and len(self.saxonArmy) == 1: + else: return "Vikings and Saxons are still in the thick of battle." From 5d95f31fd8d588daa721739a5ae1d07748882d71 Mon Sep 17 00:00:00 2001 From: lauravillalba Date: Sun, 19 Jan 2020 14:56:13 +0100 Subject: [PATCH 6/7] Bonus Finalizado --- vikingsClases.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/vikingsClases.py b/vikingsClases.py index cbb9bc3..1e45530 100644 --- a/vikingsClases.py +++ b/vikingsClases.py @@ -27,7 +27,6 @@ def attack(self): def receiveDamage(self, damage): self.health -= damage - print('HOLA K ASE vikingo dañado ', self.health) if self.health > 0: return self.name + " has received " + str(damage) + " points of damage" else: @@ -47,7 +46,6 @@ def attack(self): return super().attack() def receiveDamage(self, damage): - print('HOLA K ASE saxon dañado ', self.health) self.health -= damage if self.health > 0: return "A Saxon has received " + str(damage) + " points of damage" @@ -63,40 +61,32 @@ def __init__(self): self.saxonArmy = [] def addViking(self, Viking): - print('Se va a crear un Viking: ', len(self.vikingArmy)) self.vikingArmy.append(Viking) - print('Creado un Viking: ', len(self.vikingArmy)) def addSaxon(self, Saxon): - print('Se va a crear un Saxon: ', len(self.saxonArmy)) self.saxonArmy.append(Saxon) - print('Creado un Saxon: ', len(self.saxonArmy)) def vikingAttack(self): import random randomSaxon = random.choice(self.saxonArmy) - randomViking = random.choice(self.saxonArmy) - randomSaxon.receiveDamage(randomViking.strength) + randomViking = random.choice(self.vikingArmy) + status_saxon = randomSaxon.receiveDamage(randomViking.strength) if randomSaxon.health <= 0: - print('Se va a eliminar saxon', randomSaxon.health) - print('Longitud saxonArmy antes: ', len(self.saxonArmy)) self.saxonArmy.remove(randomSaxon) - print('ELIMINADO saxon') - print('Longitud saxonArmy después: ', len(self.saxonArmy)) + + return status_saxon def saxonAttack(self): import random randomViking = random.choice(self.vikingArmy) randomSaxon = random.choice(self.saxonArmy) - randomViking.receiveDamage(randomSaxon.strength) + status_viking = randomViking.receiveDamage(randomSaxon.strength) if randomViking.health <= 0: - print('Se va a eliminar al vikingo', randomViking.health) - print('Longitud vikingArmy antes: ', len(self.vikingArmy)) self.vikingArmy.remove(randomViking) - print('Vikingo eliminado') - print('Longitud vikingArmy después: ', len(self.vikingArmy)) + + return status_viking def showStatus(self): if len(self.saxonArmy) == 0: From 71864dbf726e5e8dd51d23a580d7fc356baa0513 Mon Sep 17 00:00:00 2001 From: lauravillalba Date: Sun, 19 Jan 2020 15:06:24 +0100 Subject: [PATCH 7/7] Bonus Finalizado v2 --- vikingsClases.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/vikingsClases.py b/vikingsClases.py index 1e45530..c9fcbe3 100644 --- a/vikingsClases.py +++ b/vikingsClases.py @@ -22,11 +22,8 @@ def __init__(self, name, health, strength): self.name = name super().__init__(health, strength) - def attack(self): - return super().attack() - def receiveDamage(self, damage): - self.health -= damage + super().receiveDamage(damage) if self.health > 0: return self.name + " has received " + str(damage) + " points of damage" else: @@ -42,11 +39,8 @@ class Saxon(Soldier): def __init__(self, health, strength): super().__init__(health, strength) - def attack(self): - return super().attack() - def receiveDamage(self, damage): - self.health -= damage + super().receiveDamage(damage) if self.health > 0: return "A Saxon has received " + str(damage) + " points of damage" else: