From 2059de38b3054bd705a948477ddd34b40d534db6 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 5 Apr 2024 17:12:22 -0300
Subject: [PATCH 001/128] FEAT add Personaje class

---
 src/main/scala/model/pj/Personaje.scala | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/main/scala/model/pj/Personaje.scala

diff --git a/src/main/scala/model/pj/Personaje.scala b/src/main/scala/model/pj/Personaje.scala
new file mode 100644
index 0000000..7b09f95
--- /dev/null
+++ b/src/main/scala/model/pj/Personaje.scala
@@ -0,0 +1,5 @@
+package model.pj
+
+class Personaje {
+
+}

From ccf69e95492dd0eeff92c0f02730c3509d8d4e9b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sat, 6 Apr 2024 18:55:14 -0300
Subject: [PATCH 002/128] REFACTOR: changed class 'PersonajeTest2' for
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/test/scala/PlayableTest.scala

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
new file mode 100644
index 0000000..692fa81
--- /dev/null
+++ b/src/test/scala/PlayableTest.scala
@@ -0,0 +1,5 @@
+import munit.FunSuite
+
+class PlayableTest extends FunSuite{
+
+}

From 876d063e768f9ffbf856731a202e1c373da6e373 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sat, 6 Apr 2024 19:05:02 -0300
Subject: [PATCH 003/128] REFACTOR: changed the package 'pj' for 'playable'

---
 src/main/scala/model/pj/Personaje.scala       | 5 -----
 src/main/scala/model/playable/Character.scala | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 src/main/scala/model/pj/Personaje.scala
 create mode 100644 src/main/scala/model/playable/Character.scala

diff --git a/src/main/scala/model/pj/Personaje.scala b/src/main/scala/model/pj/Personaje.scala
deleted file mode 100644
index 7b09f95..0000000
--- a/src/main/scala/model/pj/Personaje.scala
+++ /dev/null
@@ -1,5 +0,0 @@
-package model.pj
-
-class Personaje {
-
-}
diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
new file mode 100644
index 0000000..6d434d1
--- /dev/null
+++ b/src/main/scala/model/playable/Character.scala
@@ -0,0 +1,5 @@
+package model.playable
+
+class Character {
+
+}

From 6e8121db026e15961162213b7b6e6fcee77bfa62 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sat, 6 Apr 2024 19:08:59 -0300
Subject: [PATCH 004/128] FEAT: added nonplayable trait

---
 src/main/scala/model/nonplayable/Nonplayable.scala | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/main/scala/model/nonplayable/Nonplayable.scala

diff --git a/src/main/scala/model/nonplayable/Nonplayable.scala b/src/main/scala/model/nonplayable/Nonplayable.scala
new file mode 100644
index 0000000..2adb4b1
--- /dev/null
+++ b/src/main/scala/model/nonplayable/Nonplayable.scala
@@ -0,0 +1,5 @@
+package model.nonplayable
+
+trait Nonplayable {
+
+}

From 37732b4b566e098d5a849d75c579825eb8ab4d0e Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sat, 6 Apr 2024 19:11:45 -0300
Subject: [PATCH 005/128] FEAT: added playable trait

---
 src/main/scala/model/playable/Playable.scala | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/main/scala/model/playable/Playable.scala

diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
new file mode 100644
index 0000000..e601f4f
--- /dev/null
+++ b/src/main/scala/model/playable/Playable.scala
@@ -0,0 +1,5 @@
+package model.playable
+
+trait Playable {
+
+}

From 6ff4bb4d134e16098b3f536befaec7c98d653786 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sat, 6 Apr 2024 19:19:46 -0300
Subject: [PATCH 006/128] DOC: added methods
 'sayName','sayLife','sayDefence','sayWeight','sayKind','checkWeapon' in trait
 Playable

---
 src/main/scala/model/playable/Playable.scala | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index e601f4f..56dfa7b 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -1,5 +1,13 @@
 package model.playable
 
 trait Playable {
+  def sayname(name: String) : Unit
+  def saylife(life: Int): Unit
+  def saydefence(defence: Int): Unit
+  def sayweight(weight: Int): Unit
+  def saykind(kind: String): Unit
+  def checkWeapon(player:Playable): Unit
+
+
 
 }

From d8e3fc4d883328aaf7c1ce40ca5cbabe5c294b85 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sat, 6 Apr 2024 19:26:28 -0300
Subject: [PATCH 007/128] DOC: added methods
 'sayName','sayLife','sayDefence','sayWeight','sayKind','checkWeapon' in trait
 Playable

---
 src/main/scala/model/playable/Playable.scala | 10 +++++-----
 src/test/scala/PlayableTest.scala            |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index 56dfa7b..a2d694c 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -1,11 +1,11 @@
 package model.playable
 
 trait Playable {
-  def sayname(name: String) : Unit
-  def saylife(life: Int): Unit
-  def saydefence(defence: Int): Unit
-  def sayweight(weight: Int): Unit
-  def saykind(kind: String): Unit
+  def sayName(name: String) : Unit
+  def sayLife(life: Int): Unit
+  def sayDefence(defence: Int): Unit
+  def sayWeight(weight: Int): Unit
+  def sayKind(kind: String): Unit
   def checkWeapon(player:Playable): Unit
 
 
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 692fa81..6bb0272 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -1,5 +1,7 @@
 import munit.FunSuite
 
 class PlayableTest extends FunSuite{
+  var Cristiano: Character = _
+
 
 }

From 8ef9df80004c6ef85f120745c99e7bb35a11d663 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sat, 6 Apr 2024 19:36:03 -0300
Subject: [PATCH 008/128] TEST: added test 'equalsName' in class 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 6bb0272..4d1036e 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -2,6 +2,19 @@ import munit.FunSuite
 
 class PlayableTest extends FunSuite{
   var Cristiano: Character = _
+  var Messi: Character = _
+
+  override def beforeEach(context: BeforeEach): Unit = {
+    var Cristiano = Character()
+    var Messi = Character()
+  }
+
+  test("equalsname"){
+    val nombre = Cristiano.sayName("Cristiano")
+    val expected = "Cristiano"
+    assertEquals(nombre,expected)
+
+  }
 
 
 }

From 4da32ebadd211fa88eee03fd4233b52e67f33ad8 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 06:21:19 -0400
Subject: [PATCH 009/128] DOC: added method 'sayName' in class 'Character'

---
 src/main/scala/model/playable/Character.scala | 7 ++++++-
 src/test/scala/PlayableTest.scala             | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 6d434d1..307d8da 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -1,5 +1,10 @@
 package model.playable
 
-class Character {
+
+class Character extends Playable {
+  def sayName(name: String): Unit = {
+    println(name)
+
+  }
 
 }
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 4d1036e..8ff6fd3 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -9,7 +9,7 @@ class PlayableTest extends FunSuite{
     var Messi = Character()
   }
 
-  test("equalsname"){
+  test("equalsName"){
     val nombre = Cristiano.sayName("Cristiano")
     val expected = "Cristiano"
     assertEquals(nombre,expected)

From 7bca4c0cbda03068ffcad06b14fb4b5c06001ef3 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 06:22:20 -0400
Subject: [PATCH 010/128] DOC: added method 'sayLife' in class 'Character'

---
 src/main/scala/model/playable/Character.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 307d8da..de14ffe 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -4,7 +4,11 @@ package model.playable
 class Character extends Playable {
   def sayName(name: String): Unit = {
     println(name)
+  }
 
+  def sayLife(life: Int): Unit = {
+    println(life)
   }
 
+
 }

From c752b778f583eefcc827bceaeaab76e6112f377a Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 06:24:12 -0400
Subject: [PATCH 011/128] DOC: added method 'sayDefence' in class 'Character'

---
 src/main/scala/model/playable/Character.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index de14ffe..8b7679a 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -10,5 +10,9 @@ class Character extends Playable {
     println(life)
   }
 
+  def sayDefence(defence: Int): Unit = {
+    println(defence)
+  }
+
 
 }

From 435dc0fd0861a48d3f5568bcbd6d9ef094e2c262 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 06:25:17 -0400
Subject: [PATCH 012/128] DOC: added method 'sayWeight' in class 'Character'

---
 src/main/scala/model/playable/Character.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 8b7679a..c6526cf 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -14,5 +14,9 @@ class Character extends Playable {
     println(defence)
   }
 
+  def sayWeight(weight: Int): Unit = {
+    println(weight)
+  }
+
 
 }

From ca2ac3ed64de393a724b80e7834a47dab07c68ff Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 06:46:06 -0400
Subject: [PATCH 013/128] REFACTOR: changed all instances of method
 'checkWeapon' for put 'putWeapon' in trait 'Playable'

---
 src/main/scala/model/playable/Character.scala | 11 ++++++++++-
 src/main/scala/model/playable/Playable.scala  |  2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index c6526cf..05fbefa 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -1,5 +1,5 @@
 package model.playable
-
+import model.playable.Playable
 
 class Character extends Playable {
   def sayName(name: String): Unit = {
@@ -18,5 +18,14 @@ class Character extends Playable {
     println(weight)
   }
 
+  def sayKind(kind: String): Unit = {
+    println(kind)
+  }
+
+  def checkWeapon(player: Playable): Unit = {
+    // if player.
+
+  }
+
 
 }
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index a2d694c..c912afc 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -6,7 +6,7 @@ trait Playable {
   def sayDefence(defence: Int): Unit
   def sayWeight(weight: Int): Unit
   def sayKind(kind: String): Unit
-  def checkWeapon(player:Playable): Unit
+  def putWeapon(player:Playable): Unit
 
 
 

From c898f9b89bebdf22ca98a724a55b0fb0f5d58e6e Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:25:31 -0400
Subject: [PATCH 014/128] TEST: added test 'NotequalsName' in class
 'PlayableTest'

---
 src/main/scala/model/playable/Character.scala | 22 ++++++++++++----
 src/main/scala/model/playable/Playable.scala  |  4 +--
 src/test/scala/PlayableTest.scala             | 25 ++++++++++++-------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 05fbefa..0af17e6 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -2,8 +2,9 @@ package model.playable
 import model.playable.Playable
 
 class Character extends Playable {
-  def sayName(name: String): Unit = {
-    println(name)
+  def sayName(name: String): String = {
+    return name
+
   }
 
   def sayLife(life: Int): Unit = {
@@ -22,10 +23,21 @@ class Character extends Playable {
     println(kind)
   }
 
-  def checkWeapon(player: Playable): Unit = {
-    // if player.
+  def putWeapon(weapon: String): Unit = {
+    val arma: Unit = println(weapon)
 
   }
+}
 
+  object HelloWorld {
+    def main(args: Array[String]): Unit = {
+
+      var Cris: Playable = new Character()
+      Cris.sayName("Mercedes Benz")
+      Cris.sayLife(2019)
+      Cris.sayDefence(2015)
+
+
+    }
+  }
 
-}
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index c912afc..06481f2 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -1,12 +1,12 @@
 package model.playable
 
 trait Playable {
-  def sayName(name: String) : Unit
+  def sayName(name: String) : String
   def sayLife(life: Int): Unit
   def sayDefence(defence: Int): Unit
   def sayWeight(weight: Int): Unit
   def sayKind(kind: String): Unit
-  def putWeapon(player:Playable): Unit
+  def putWeapon(weapon: String): Unit
 
 
 
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 8ff6fd3..6c542d8 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -1,18 +1,25 @@
 import munit.FunSuite
-
+import model.playable.Playable
+import model.playable.Character
 class PlayableTest extends FunSuite{
-  var Cristiano: Character = _
-  var Messi: Character = _
+  var Cristiano: Playable = _
+  var Messi: Playable = _
 
   override def beforeEach(context: BeforeEach): Unit = {
-    var Cristiano = Character()
-    var Messi = Character()
+     Cristiano = new Character()
+     Messi  = new Character()
+  }
+
+  test("equalsName") {
+    var nombre = Cristiano.sayName("Cristiano")
+    val expected: String = "Cristiano"
+    assertEquals(nombre, expected)
   }
 
-  test("equalsName"){
-    val nombre = Cristiano.sayName("Cristiano")
-    val expected = "Cristiano"
-    assertEquals(nombre,expected)
+    test("NotequalsName"){
+      var nombre1 = Cristiano.sayName("Cristiano")
+      var nombre2 = Messi.sayName("Messi")
+      assertNotEquals(nombre1,nombre2)
 
   }
 

From 0ee178ef2343f9c2d35a1f742872c84f21ba78a5 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:29:12 -0400
Subject: [PATCH 015/128] TEST: added test 'equalsLife' in class 'PlayableTest'

---
 src/main/scala/model/playable/Character.scala | 4 ++--
 src/main/scala/model/playable/Playable.scala  | 2 +-
 src/test/scala/PlayableTest.scala             | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 0af17e6..541211b 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -7,8 +7,8 @@ class Character extends Playable {
 
   }
 
-  def sayLife(life: Int): Unit = {
-    println(life)
+  def sayLife(life: Int): Int = {
+    return life
   }
 
   def sayDefence(defence: Int): Unit = {
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index 06481f2..6354295 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -2,7 +2,7 @@ package model.playable
 
 trait Playable {
   def sayName(name: String) : String
-  def sayLife(life: Int): Unit
+  def sayLife(life: Int): Int
   def sayDefence(defence: Int): Unit
   def sayWeight(weight: Int): Unit
   def sayKind(kind: String): Unit
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 6c542d8..899b2e2 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -22,6 +22,12 @@ class PlayableTest extends FunSuite{
       assertNotEquals(nombre1,nombre2)
 
   }
+  test("equalsLife"){
+    var vida = Cristiano.sayLife(100)
+    var expected: Int = 100
+    assertEquals(vida,expected)
+
+  }
 
 
 }

From 945630b39d9863385ac8aa60bf8dfeab627bc86a Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:32:42 -0400
Subject: [PATCH 016/128] TEST: added test 'NotEqualsLife' in class
 'PlayableTest'

---
 src/main/scala/model/playable/Character.scala |  4 +--
 src/main/scala/model/playable/Playable.scala  |  2 +-
 src/test/scala/PlayableTest.scala             | 26 +++++++++++--------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 541211b..ce6be58 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -11,8 +11,8 @@ class Character extends Playable {
     return life
   }
 
-  def sayDefence(defence: Int): Unit = {
-    println(defence)
+  def sayDefence(defence: Int): Int = {
+    return defence
   }
 
   def sayWeight(weight: Int): Unit = {
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index 6354295..c437410 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -3,7 +3,7 @@ package model.playable
 trait Playable {
   def sayName(name: String) : String
   def sayLife(life: Int): Int
-  def sayDefence(defence: Int): Unit
+  def sayDefence(defence: Int): Int
   def sayWeight(weight: Int): Unit
   def sayKind(kind: String): Unit
   def putWeapon(weapon: String): Unit
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 899b2e2..8998630 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -1,13 +1,13 @@
 import munit.FunSuite
 import model.playable.Playable
 import model.playable.Character
-class PlayableTest extends FunSuite{
+class PlayableTest extends FunSuite {
   var Cristiano: Playable = _
   var Messi: Playable = _
 
   override def beforeEach(context: BeforeEach): Unit = {
-     Cristiano = new Character()
-     Messi  = new Character()
+    Cristiano = new Character()
+    Messi = new Character()
   }
 
   test("equalsName") {
@@ -16,18 +16,22 @@ class PlayableTest extends FunSuite{
     assertEquals(nombre, expected)
   }
 
-    test("NotequalsName"){
-      var nombre1 = Cristiano.sayName("Cristiano")
-      var nombre2 = Messi.sayName("Messi")
-      assertNotEquals(nombre1,nombre2)
+  test("NotEqualsName") {
+    var nombre1 = Cristiano.sayName("Cristiano")
+    var nombre2 = Messi.sayName("Messi")
+    assertNotEquals(nombre1, nombre2)
 
   }
-  test("equalsLife"){
+  test("equalsLife") {
     var vida = Cristiano.sayLife(100)
     var expected: Int = 100
-    assertEquals(vida,expected)
+    assertEquals(vida, expected)
 
   }
+  test("NotEqualsLife") {
+    var vida1 = Cristiano.sayLife(100)
+    var vida2 = Messi.sayLife(90)
+    assertNotEquals(vida1, vida2)
 
-
-}
+  }
+}
\ No newline at end of file

From b3c60892eca36ca4fb9acc10da792e4b94bc7729 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:34:07 -0400
Subject: [PATCH 017/128] TEST: added test 'equalsDefence' in class
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 8998630..67b0748 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -34,4 +34,9 @@ class PlayableTest extends FunSuite {
     assertNotEquals(vida1, vida2)
 
   }
+  test("equalsDefence") {
+    var defensa = Cristiano.sayDefence(10)
+    var expected: Int = 10
+    assertEquals(defensa, expected)
+  }
 }
\ No newline at end of file

From 7167c40fcaaaa5ba982f5f8dd5ebbfc004d9a41b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:35:33 -0400
Subject: [PATCH 018/128] TEST: added test NotEqualsDefence' in class
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 67b0748..31f59fd 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -39,4 +39,9 @@ class PlayableTest extends FunSuite {
     var expected: Int = 10
     assertEquals(defensa, expected)
   }
+  test("NotEqualsDefence") {
+    var defensa1 = Cristiano.sayDefence(10)
+    var defensa2 = Messi.sayDefence(5)
+    assertNotEquals(defensa1, defensa2)
+  }
 }
\ No newline at end of file

From 51c9bd3a88460323e21090e744416bb47a97399a Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:36:58 -0400
Subject: [PATCH 019/128] TEST: added test 'equalsWeight' in class
 'PlayableTest'

---
 src/main/scala/model/playable/Character.scala | 4 ++--
 src/main/scala/model/playable/Playable.scala  | 2 +-
 src/test/scala/PlayableTest.scala             | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index ce6be58..cc885f2 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -15,8 +15,8 @@ class Character extends Playable {
     return defence
   }
 
-  def sayWeight(weight: Int): Unit = {
-    println(weight)
+  def sayWeight(weight: Int): Int = {
+    return weight
   }
 
   def sayKind(kind: String): Unit = {
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index c437410..4223c4b 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -4,7 +4,7 @@ trait Playable {
   def sayName(name: String) : String
   def sayLife(life: Int): Int
   def sayDefence(defence: Int): Int
-  def sayWeight(weight: Int): Unit
+  def sayWeight(weight: Int): Int
   def sayKind(kind: String): Unit
   def putWeapon(weapon: String): Unit
 
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 31f59fd..1dd08fb 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -44,4 +44,9 @@ class PlayableTest extends FunSuite {
     var defensa2 = Messi.sayDefence(5)
     assertNotEquals(defensa1, defensa2)
   }
+  test("equalsWeight") {
+    var peso = Cristiano.sayWeight(50)
+    var expected: Int = 50
+    assertEquals(peso, expected)
+  }
 }
\ No newline at end of file

From bb62954a18e38625b41ce0a29dbb4e24d446eace Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:39:48 -0400
Subject: [PATCH 020/128] TEST: added test NotEqualsWeight' in class
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 1dd08fb..89b4b92 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -49,4 +49,9 @@ class PlayableTest extends FunSuite {
     var expected: Int = 50
     assertEquals(peso, expected)
   }
+  test("NotEqualsWeight") {
+    var peso1 = Cristiano.sayWeight(50)
+    var peso2 = Messi.sayWeight(40)
+    assertNotEquals(peso1, peso2)
+  }
 }
\ No newline at end of file

From 00cadf0fed0e1d9076038237a179dec98064716f Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:41:42 -0400
Subject: [PATCH 021/128] TEST: added test 'equalsKind' in class 'PlayableTest'

---
 src/main/scala/model/playable/Character.scala | 4 ++--
 src/main/scala/model/playable/Playable.scala  | 2 +-
 src/test/scala/PlayableTest.scala             | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index cc885f2..8f958a4 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -19,8 +19,8 @@ class Character extends Playable {
     return weight
   }
 
-  def sayKind(kind: String): Unit = {
-    println(kind)
+  def sayKind(kind: String): String = {
+    return kind
   }
 
   def putWeapon(weapon: String): Unit = {
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index 4223c4b..aa6de5a 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -5,7 +5,7 @@ trait Playable {
   def sayLife(life: Int): Int
   def sayDefence(defence: Int): Int
   def sayWeight(weight: Int): Int
-  def sayKind(kind: String): Unit
+  def sayKind(kind: String): String
   def putWeapon(weapon: String): Unit
 
 
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 89b4b92..7ed74de 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -54,4 +54,9 @@ class PlayableTest extends FunSuite {
     var peso2 = Messi.sayWeight(40)
     assertNotEquals(peso1, peso2)
   }
+  test("equalsKind") {
+    var clase = Cristiano.sayKind("Paladin")
+    var expected: String = "Paladin"
+    assertEquals(clase, expected)
+  }
 }
\ No newline at end of file

From 6badacf697e0969ef4a59b624bcad06eb8638d54 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:42:56 -0400
Subject: [PATCH 022/128] TEST: added test NotEqualsKind' in class
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 7ed74de..1b87c16 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -59,4 +59,9 @@ class PlayableTest extends FunSuite {
     var expected: String = "Paladin"
     assertEquals(clase, expected)
   }
+  test("NotEqualsKind") {
+    var clase1 = Cristiano.sayKind("Paladin")
+    var clase2 = Messi.sayKind("Guerrero")
+    assertNotEquals(clase1, clase2)
+  }
 }
\ No newline at end of file

From 02dc7370c11c1ccc80dbfcd07fb500c1ad9bc15f Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:46:53 -0400
Subject: [PATCH 023/128] TEST: added test 'equalsWeapon' in class
 'PlayableTest'

---
 src/main/scala/model/playable/Character.scala | 4 ++--
 src/main/scala/model/playable/Playable.scala  | 2 +-
 src/test/scala/PlayableTest.scala             | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 8f958a4..da1c3b5 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -23,8 +23,8 @@ class Character extends Playable {
     return kind
   }
 
-  def putWeapon(weapon: String): Unit = {
-    val arma: Unit = println(weapon)
+  def putWeapon(weapon: String): String = {
+    return weapon
 
   }
 }
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index aa6de5a..d5ddc78 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -6,7 +6,7 @@ trait Playable {
   def sayDefence(defence: Int): Int
   def sayWeight(weight: Int): Int
   def sayKind(kind: String): String
-  def putWeapon(weapon: String): Unit
+  def putWeapon(weapon: String): String
 
 
 
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 1b87c16..d329215 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -64,4 +64,9 @@ class PlayableTest extends FunSuite {
     var clase2 = Messi.sayKind("Guerrero")
     assertNotEquals(clase1, clase2)
   }
+  test("equalsWeapon") {
+    var arma = Cristiano.putWeapon("Hacha")
+    var expected: String = "Hacha"
+    assertEquals(arma, expected)
+  }
 }
\ No newline at end of file

From e2299ce743ee21250e45c1c586095f8d2eb4ed31 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:47:57 -0400
Subject: [PATCH 024/128] TEST: added test NotEqualsWeapon' in class
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index d329215..6021188 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -69,4 +69,9 @@ class PlayableTest extends FunSuite {
     var expected: String = "Hacha"
     assertEquals(arma, expected)
   }
+  test("NotEqualsWeapon") {
+    var arma1 = Cristiano.putWeapon("Hacha")
+    var arma2 = Messi.putWeapon("Arco")
+    assertNotEquals(arma1, arma2)
+  }
 }
\ No newline at end of file

From fc5d741e871307b91ae962540c35fb8a57e43f99 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:50:50 -0400
Subject: [PATCH 025/128] FEAT: added class 'MagicCharacter' in package
 'playable'

---
 src/main/scala/model/playable/Character.scala      | 10 ----------
 src/main/scala/model/playable/MagicCharacter.scala |  5 +++++
 2 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 src/main/scala/model/playable/MagicCharacter.scala

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index da1c3b5..3b9f15c 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -29,15 +29,5 @@ class Character extends Playable {
   }
 }
 
-  object HelloWorld {
-    def main(args: Array[String]): Unit = {
 
-      var Cris: Playable = new Character()
-      Cris.sayName("Mercedes Benz")
-      Cris.sayLife(2019)
-      Cris.sayDefence(2015)
-
-
-    }
-  }
 
diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
new file mode 100644
index 0000000..29d8b63
--- /dev/null
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -0,0 +1,5 @@
+package model.playable
+
+class MagicCharacter {
+
+}

From 3dbd21fce2644c9e0a8d1abed5d39a69362975d3 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:52:09 -0400
Subject: [PATCH 026/128] DOC: added methods
 'sayName','sayLife','sayDefence','sayWeight','sayKind','putWeapon' in class
 'MagicCharacter'

---
 .../scala/model/playable/MagicCharacter.scala | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index 29d8b63..4936306 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -1,5 +1,30 @@
 package model.playable
 
 class MagicCharacter {
+  def sayName(name: String): String = {
+    return name
+
+  }
+
+  def sayLife(life: Int): Int = {
+    return life
+  }
+
+  def sayDefence(defence: Int): Int = {
+    return defence
+  }
+
+  def sayWeight(weight: Int): Int = {
+    return weight
+  }
+
+  def sayKind(kind: String): String = {
+    return kind
+  }
+
+  def putWeapon(weapon: String): String = {
+    return weapon
+
+  }
 
 }

From 6aca872d2b3f52b7cde50274b7f97cb4964aa667 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:53:07 -0400
Subject: [PATCH 027/128] DOC: added method 'sayMana' in class 'MagicCharacter'

---
 src/main/scala/model/playable/MagicCharacter.scala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index 4936306..31b01f3 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -26,5 +26,8 @@ class MagicCharacter {
     return weapon
 
   }
+  def sayMana(mana: Int): Int = {
+    return mana
+  }
 
 }

From ba1312f3ab3e35eca17d371402aa59c47b478b26 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 08:58:14 -0400
Subject: [PATCH 028/128] TEST: added test 'equalsMana' in class 'PlayableTest'

---
 src/main/scala/model/playable/MagicCharacter.scala | 11 ++++++-----
 src/test/scala/PlayableTest.scala                  | 11 +++++++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index 31b01f3..323af35 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -1,6 +1,9 @@
 package model.playable
-
-class MagicCharacter {
+import model.playable.Playable
+class MagicCharacter extends Playable {
+  def sayMana(mana: Int): Int = {
+    return mana
+  }
   def sayName(name: String): String = {
     return name
 
@@ -26,8 +29,6 @@ class MagicCharacter {
     return weapon
 
   }
-  def sayMana(mana: Int): Int = {
-    return mana
-  }
+
 
 }
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 6021188..d6ff815 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -1,13 +1,15 @@
 import munit.FunSuite
-import model.playable.Playable
-import model.playable.Character
+import model.playable.{Character, MagicCharacter, Playable}
 class PlayableTest extends FunSuite {
   var Cristiano: Playable = _
   var Messi: Playable = _
+  var Alexis: MagicCharacter = _
 
   override def beforeEach(context: BeforeEach): Unit = {
     Cristiano = new Character()
     Messi = new Character()
+    Alexis = new MagicCharacter()
+
   }
 
   test("equalsName") {
@@ -74,4 +76,9 @@ class PlayableTest extends FunSuite {
     var arma2 = Messi.putWeapon("Arco")
     assertNotEquals(arma1, arma2)
   }
+  test("equalsMana") {
+    var mana = Alexis.sayMana(90)
+    var expected: Int = 90
+    assertEquals(mana, expected)
+  }
 }
\ No newline at end of file

From 4b737d5be0f46f222e2c0c5432365f0083c9cd75 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 09:00:12 -0400
Subject: [PATCH 029/128] TEST: added test NotEqualsMana' in class
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index d6ff815..c6ff7ff 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -4,11 +4,12 @@ class PlayableTest extends FunSuite {
   var Cristiano: Playable = _
   var Messi: Playable = _
   var Alexis: MagicCharacter = _
-
+  var Vidal: MagicCharacter = _
   override def beforeEach(context: BeforeEach): Unit = {
     Cristiano = new Character()
     Messi = new Character()
     Alexis = new MagicCharacter()
+    Vidal = new MagicCharacter()
 
   }
 
@@ -81,4 +82,9 @@ class PlayableTest extends FunSuite {
     var expected: Int = 90
     assertEquals(mana, expected)
   }
+  test("NotEqualsMana") {
+    var mana1 = Alexis.sayMana(90)
+    var mana2 = Vidal.sayMana(80)
+    assertNotEquals(mana1, mana2)
+  }
 }
\ No newline at end of file

From d9f36d3c70036b62b418dddb7d7c06b233059ec4 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 09:02:37 -0400
Subject: [PATCH 030/128] TEST: added test 'equalsMagicKind' in class
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index c6ff7ff..e435682 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -87,4 +87,9 @@ class PlayableTest extends FunSuite {
     var mana2 = Vidal.sayMana(80)
     assertNotEquals(mana1, mana2)
   }
+  test("equalsMagicKind") {
+    var clase = Alexis.sayKind("Mago Blanco")
+    var expected: String = "Mago Blanco"
+    assertEquals(clase, expected)
+  }
 }
\ No newline at end of file

From 82d97d18909377f2c73357351e2f04149dfd43cb Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 09:03:59 -0400
Subject: [PATCH 031/128] TEST: added test NotEqualsMagicKind' in class
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index e435682..4c39cec 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -92,4 +92,9 @@ class PlayableTest extends FunSuite {
     var expected: String = "Mago Blanco"
     assertEquals(clase, expected)
   }
+  test("NotEqualsKind") {
+    var clase1 = Alexis.sayKind("Mago Blanco")
+    var clase2 = Vidal.sayKind("Mago Negro")
+    assertNotEquals(clase1, clase2)
+  }
 }
\ No newline at end of file

From b389ec73333eb975afcd9ea68369076db9cfd365 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:02:20 -0400
Subject: [PATCH 032/128] FEAT: deleted methods
 'sayName','sayLife','sayDefence','sayWeight','sayKind','putWeapon' in class
 'MagicCharacter' in package 'playable'

---
 .../scala/model/nonplayable/Nonplayable.scala |  1 +
 .../scala/model/playable/MagicCharacter.scala | 31 ++-----------------
 src/test/scala/PlayableTest.scala             |  2 +-
 3 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/src/main/scala/model/nonplayable/Nonplayable.scala b/src/main/scala/model/nonplayable/Nonplayable.scala
index 2adb4b1..258e3b0 100644
--- a/src/main/scala/model/nonplayable/Nonplayable.scala
+++ b/src/main/scala/model/nonplayable/Nonplayable.scala
@@ -2,4 +2,5 @@ package model.nonplayable
 
 trait Nonplayable {
 
+
 }
diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index 323af35..7db7b41 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -1,34 +1,7 @@
 package model.playable
-import model.playable.Playable
-class MagicCharacter extends Playable {
+import model.playable.Character
+class MagicCharacter extends Character {
   def sayMana(mana: Int): Int = {
     return mana
   }
-  def sayName(name: String): String = {
-    return name
-
-  }
-
-  def sayLife(life: Int): Int = {
-    return life
-  }
-
-  def sayDefence(defence: Int): Int = {
-    return defence
-  }
-
-  def sayWeight(weight: Int): Int = {
-    return weight
-  }
-
-  def sayKind(kind: String): String = {
-    return kind
-  }
-
-  def putWeapon(weapon: String): String = {
-    return weapon
-
-  }
-
-
 }
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 4c39cec..fe108c0 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -92,7 +92,7 @@ class PlayableTest extends FunSuite {
     var expected: String = "Mago Blanco"
     assertEquals(clase, expected)
   }
-  test("NotEqualsKind") {
+  test("NotEqualsMagicKind") {
     var clase1 = Alexis.sayKind("Mago Blanco")
     var clase2 = Vidal.sayKind("Mago Negro")
     assertNotEquals(clase1, clase2)

From 5dd75c7ae31043d0039137c95f618fb4f559fd43 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:04:06 -0400
Subject: [PATCH 033/128] FEAT: added  method 'sayName' in trait 'NonPlayable'
 in package 'nonplayable'

---
 src/main/scala/model/nonplayable/Nonplayable.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/model/nonplayable/Nonplayable.scala b/src/main/scala/model/nonplayable/Nonplayable.scala
index 258e3b0..8ba41c7 100644
--- a/src/main/scala/model/nonplayable/Nonplayable.scala
+++ b/src/main/scala/model/nonplayable/Nonplayable.scala
@@ -1,6 +1,7 @@
 package model.nonplayable
 
 trait Nonplayable {
+  def sayName(name: String) : String
 
 
 }

From d51f9167771327caa42c7c1216ce5cad13c53fb6 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:04:34 -0400
Subject: [PATCH 034/128] FEAT: added  method 'sayWeight' in trait
 'NonPlayable' in package 'nonplayable'

---
 src/main/scala/model/nonplayable/Nonplayable.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/model/nonplayable/Nonplayable.scala b/src/main/scala/model/nonplayable/Nonplayable.scala
index 8ba41c7..dd55531 100644
--- a/src/main/scala/model/nonplayable/Nonplayable.scala
+++ b/src/main/scala/model/nonplayable/Nonplayable.scala
@@ -2,6 +2,7 @@ package model.nonplayable
 
 trait Nonplayable {
   def sayName(name: String) : String
+  def sayWeight(weight: Int): Int
 
 
 }

From f3beff6627ddf957e3c9e4fb97f69954861dedea Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:05:10 -0400
Subject: [PATCH 035/128] FEAT: added  method 'sayAttack' in trait
 'NonPlayable' in package 'nonplayable'

---
 src/main/scala/model/nonplayable/Nonplayable.scala | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/scala/model/nonplayable/Nonplayable.scala b/src/main/scala/model/nonplayable/Nonplayable.scala
index dd55531..ddfa60f 100644
--- a/src/main/scala/model/nonplayable/Nonplayable.scala
+++ b/src/main/scala/model/nonplayable/Nonplayable.scala
@@ -3,6 +3,7 @@ package model.nonplayable
 trait Nonplayable {
   def sayName(name: String) : String
   def sayWeight(weight: Int): Int
+  def sayAttack(attack: Int): Int
 
 
 }

From 89732fc61f2e2d2f404670424ccc08ec7282247e Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:07:39 -0400
Subject: [PATCH 036/128] FEAT: added class 'weapon' in package 'nonplayable'

---
 src/main/scala/model/nonplayable/weapon.scala | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 src/main/scala/model/nonplayable/weapon.scala

diff --git a/src/main/scala/model/nonplayable/weapon.scala b/src/main/scala/model/nonplayable/weapon.scala
new file mode 100644
index 0000000..a59bb39
--- /dev/null
+++ b/src/main/scala/model/nonplayable/weapon.scala
@@ -0,0 +1,6 @@
+package model.nonplayable
+import model.nonplayable.Nonplayable
+class weapon  {
+
+
+}

From 4e174415a242e874e5099a2adb208230ef98b0cb Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:10:09 -0400
Subject: [PATCH 037/128] REFACTOR: changed all instances of class 'weapon' for
 put 'Weapon' in package 'nonplayable'

---
 src/main/scala/model/nonplayable/{weapon.scala => Weapon.scala} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/main/scala/model/nonplayable/{weapon.scala => Weapon.scala} (80%)

diff --git a/src/main/scala/model/nonplayable/weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
similarity index 80%
rename from src/main/scala/model/nonplayable/weapon.scala
rename to src/main/scala/model/nonplayable/Weapon.scala
index a59bb39..0bfae0a 100644
--- a/src/main/scala/model/nonplayable/weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -1,6 +1,6 @@
 package model.nonplayable
 import model.nonplayable.Nonplayable
-class weapon  {
+class Weapon  {
 
 
 }

From 6695efb3de177af615853a8ea2c16a98aca18b10 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:11:53 -0400
Subject: [PATCH 038/128] FEAT: added  method 'sayName' in class 'Weapon' in
 package 'nonplayable'

---
 src/main/scala/model/nonplayable/Weapon.scala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index 0bfae0a..27af0d6 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -1,6 +1,9 @@
 package model.nonplayable
 import model.nonplayable.Nonplayable
 class Weapon  {
+  def sayName(name: String) : String = {
+    return name
+  }
 
 
 }

From 7dbfe9351ad50fbbf1a3a48b9083624eda4c663c Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:12:59 -0400
Subject: [PATCH 039/128] FEAT: added  method 'sayWeight' in class 'Weapon' in
 package 'nonplayable'

---
 src/main/scala/model/nonplayable/Weapon.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index 27af0d6..8b87232 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -1,9 +1,13 @@
 package model.nonplayable
 import model.nonplayable.Nonplayable
-class Weapon  {
+class Weapon extends Nonplayable {
   def sayName(name: String) : String = {
     return name
   }
+  def sayWeight(weight: Int): Int = {
+    return weight
+  }
+
 
 
 }

From a5e362b634555a638c684f4f19da2fe8abeedafa Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:13:32 -0400
Subject: [PATCH 040/128] FEAT: added  method 'sayAttack' in class 'Weapon' in
 package 'nonplayable'

---
 src/main/scala/model/nonplayable/Weapon.scala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index 8b87232..2b4a59f 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -7,6 +7,9 @@ class Weapon extends Nonplayable {
   def sayWeight(weight: Int): Int = {
     return weight
   }
+  def sayAttack(attack: Int): Int = {
+    return attack
+  }
 
 
 

From 5c80b54d6035ead209f17e3d1db8e53ae272b717 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:19:34 -0400
Subject: [PATCH 041/128] REFACTOR: changed all instances of trait
 'Nonplayable' for put 'NonPlayable' in package 'nonplayable'

---
 .../{Nonplayable.scala => NonPlayable.scala}       |  2 +-
 src/main/scala/model/nonplayable/Weapon.scala      |  4 ++--
 src/test/scala/NonPlayableTest.scala               | 14 ++++++++++++++
 3 files changed, 17 insertions(+), 3 deletions(-)
 rename src/main/scala/model/nonplayable/{Nonplayable.scala => NonPlayable.scala} (87%)
 create mode 100644 src/test/scala/NonPlayableTest.scala

diff --git a/src/main/scala/model/nonplayable/Nonplayable.scala b/src/main/scala/model/nonplayable/NonPlayable.scala
similarity index 87%
rename from src/main/scala/model/nonplayable/Nonplayable.scala
rename to src/main/scala/model/nonplayable/NonPlayable.scala
index ddfa60f..c5c42e3 100644
--- a/src/main/scala/model/nonplayable/Nonplayable.scala
+++ b/src/main/scala/model/nonplayable/NonPlayable.scala
@@ -1,6 +1,6 @@
 package model.nonplayable
 
-trait Nonplayable {
+trait NonPlayable {
   def sayName(name: String) : String
   def sayWeight(weight: Int): Int
   def sayAttack(attack: Int): Int
diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index 2b4a59f..74d507c 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -1,6 +1,6 @@
 package model.nonplayable
-import model.nonplayable.Nonplayable
-class Weapon extends Nonplayable {
+import model.nonplayable.NonPlayable
+class Weapon extends NonPlayable {
   def sayName(name: String) : String = {
     return name
   }
diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
new file mode 100644
index 0000000..b444178
--- /dev/null
+++ b/src/test/scala/NonPlayableTest.scala
@@ -0,0 +1,14 @@
+import munit.FunSuite
+import model.nonplayable.{Weapon,NonPlayable}
+class NonPlayableTest extends FunSuite {
+  var Sword: NonPlayable = _
+  var Bow: NonPlayable = _
+  var Alexis: MagicCharacter = _
+  var Vidal: MagicCharacter = _
+  override def beforeEach(context: BeforeEach): Unit = {
+    Cristiano = new Character()
+    Messi = new Character()
+    Alexis = new MagicCharacter()
+    Vidal = new MagicCharacter()
+
+  }

From 07aafc6aa81d9dfe26908f196e75b068d237c5f2 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:21:48 -0400
Subject: [PATCH 042/128] FEAT: added  class 'NonPlayableTest' in package
 'test'

---
 src/test/scala/NonPlayableTest.scala | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index b444178..a7f2c49 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -3,12 +3,9 @@ import model.nonplayable.{Weapon,NonPlayable}
 class NonPlayableTest extends FunSuite {
   var Sword: NonPlayable = _
   var Bow: NonPlayable = _
-  var Alexis: MagicCharacter = _
-  var Vidal: MagicCharacter = _
+
   override def beforeEach(context: BeforeEach): Unit = {
-    Cristiano = new Character()
-    Messi = new Character()
-    Alexis = new MagicCharacter()
-    Vidal = new MagicCharacter()
+    Sword = new Weapon()
+    Bow = new Weapon()
 
   }

From 932c0b0e829e70ad52a204ba9cf6ec8e5a7ac4f6 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:35:15 -0400
Subject: [PATCH 043/128] TEST: added test 'equalsName' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index a7f2c49..2e2f646 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -7,5 +7,12 @@ class NonPlayableTest extends FunSuite {
   override def beforeEach(context: BeforeEach): Unit = {
     Sword = new Weapon()
     Bow = new Weapon()
+  }
+  test("equalsName"){
+    var nombre: String = Sword.sayName("Espada")
+    var expected  = "Espada"
+    assertEquals(nombre,expected)
+  }
 
   }
+

From a8d84f3cc7eca0f1e9f82c6c5e93de577fb42769 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:36:31 -0400
Subject: [PATCH 044/128] TEST: added test 'NotEqualsName' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 2e2f646..0a1190d 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -8,11 +8,15 @@ class NonPlayableTest extends FunSuite {
     Sword = new Weapon()
     Bow = new Weapon()
   }
-  test("equalsName"){
+
+  test("equalsName") {
     var nombre: String = Sword.sayName("Espada")
-    var expected  = "Espada"
-    assertEquals(nombre,expected)
+    var expected = "Espada"
+    assertEquals(nombre, expected)
   }
-
+  test("NotEqualsName") {
+    var nombre1 = Sword.sayName("Espada")
+    var nombre2 = Bow.sayName("Arco")
+    assertNotEquals(nombre1, nombre2)
   }
-
+}

From d75be85a953472b6780593c4fb28be3871bec6eb Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:37:43 -0400
Subject: [PATCH 045/128] TEST: added test 'equalsWeight' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 0a1190d..e2fe1b8 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -19,4 +19,9 @@ class NonPlayableTest extends FunSuite {
     var nombre2 = Bow.sayName("Arco")
     assertNotEquals(nombre1, nombre2)
   }
+  test("equalsWeight") {
+    var peso = Sword.sayWeight(5)
+    var expected: Int = 5
+    assertEquals(peso, expected)
+  }
 }

From cb4ca059bab79d81ff0bde4f06ada3ead137c066 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:38:38 -0400
Subject: [PATCH 046/128] TEST: added test 'NotEqualsWeight' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index e2fe1b8..0e192f1 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -24,4 +24,9 @@ class NonPlayableTest extends FunSuite {
     var expected: Int = 5
     assertEquals(peso, expected)
   }
+  test("NotEqualsWeight") {
+    var peso1 = Sword.sayWeight(5)
+    var peso2 = Bow.sayWeight(3)
+    assertNotEquals(peso1, peso2)
+  }
 }

From 3ef428159c3895581babf1a2c0e260904d2f545a Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:40:23 -0400
Subject: [PATCH 047/128] TEST: added test 'equalsAttack' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 0e192f1..373264b 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -29,4 +29,10 @@ class NonPlayableTest extends FunSuite {
     var peso2 = Bow.sayWeight(3)
     assertNotEquals(peso1, peso2)
   }
+  test("equalsAttack") {
+    var ataque = Sword.sayAttack(25)
+    var expected: Int = 25
+    assertEquals(ataque, expected)
+
+  }
 }

From 39524ee341f27d4a95a0c6e7e6c3f4a0c1770e45 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:42:11 -0400
Subject: [PATCH 048/128] TEST: added test 'NotEqualsAttack' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 373264b..ed74729 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -35,4 +35,10 @@ class NonPlayableTest extends FunSuite {
     assertEquals(ataque, expected)
 
   }
+  test("NotEqualsAttack") {
+    var vida1 = Sword.sayAttack(25)
+    var vida2 = Bow.sayAttack(20)
+    assertNotEquals(vida1, vida2)
+
+  }
 }

From 897515883edca67697d0f32ed1fdef8d73883f78 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:44:36 -0400
Subject: [PATCH 049/128] FEAT: added class 'MagicWeapon' in package
 'nonplayable'

---
 src/main/scala/model/nonplayable/MagicWeapon.scala | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 src/main/scala/model/nonplayable/MagicWeapon.scala

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
new file mode 100644
index 0000000..9006d2d
--- /dev/null
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -0,0 +1,6 @@
+package model.nonplayable
+import model.nonplayable.Weapon
+
+class MagicWeapon {
+
+}

From 08f907afd3e002b79baf7e887d4ef3065523aa29 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:48:58 -0400
Subject: [PATCH 050/128] FEAT: added method 'sayMana' in  class 'MagicWeapon'
 in package 'nonplayable'

---
 src/main/scala/model/nonplayable/MagicWeapon.scala |  5 ++++-
 src/test/scala/NonPlayableTest.scala               | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
index 9006d2d..0ed4be9 100644
--- a/src/main/scala/model/nonplayable/MagicWeapon.scala
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -1,6 +1,9 @@
 package model.nonplayable
 import model.nonplayable.Weapon
 
-class MagicWeapon {
+class MagicWeapon extends Weapon {
+  def sayMana(mana:Int): Int = {
+    return mana
+  }
 
 }
diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index ed74729..eee00a1 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -1,8 +1,10 @@
 import munit.FunSuite
-import model.nonplayable.{Weapon,NonPlayable}
+import model.nonplayable.{MagicWeapon, NonPlayable, Weapon}
 class NonPlayableTest extends FunSuite {
   var Sword: NonPlayable = _
   var Bow: NonPlayable = _
+  var Wand: MagicWeapon = _
+  var Staff: MagicWeapon = _
 
   override def beforeEach(context: BeforeEach): Unit = {
     Sword = new Weapon()
@@ -41,4 +43,10 @@ class NonPlayableTest extends FunSuite {
     assertNotEquals(vida1, vida2)
 
   }
+  test("equalsMana") {
+    var ataque = Wand.sayMana(20)
+    var expected: Int = 20
+    assertEquals(ataque, expected)
+
+  }
 }

From a78e4b8e5e0a3d9fa3010af7174ccb3750bbadb3 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:50:30 -0400
Subject: [PATCH 051/128] TEST: added test 'equalsMana' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index eee00a1..a6b3c57 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -9,6 +9,8 @@ class NonPlayableTest extends FunSuite {
   override def beforeEach(context: BeforeEach): Unit = {
     Sword = new Weapon()
     Bow = new Weapon()
+    Wand = new MagicWeapon()
+    Staff = new MagicWeapon()
   }
 
   test("equalsName") {

From 9b7f7f9ea29ad964aebdec3d54da279c6078c064 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:52:36 -0400
Subject: [PATCH 052/128] TEST: added test 'NotEqualsMana' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index a6b3c57..b2f10ee 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -49,6 +49,10 @@ class NonPlayableTest extends FunSuite {
     var ataque = Wand.sayMana(20)
     var expected: Int = 20
     assertEquals(ataque, expected)
-
+  }
+  test("NotEqualsMana") {
+    var mana1 = Wand.sayMana(20)
+    var mana2 = Staff.sayAttack(30)
+    assertNotEquals(mana1, mana2)
   }
 }

From 71da2ac7c8c13b642869d139f3b80f42df34b827 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 13:53:48 -0400
Subject: [PATCH 053/128] REFACTOR: changed all instances of var 'ataque' for
 put 'mana' in test 'equalsMana' in class 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index b2f10ee..3b16b25 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -46,9 +46,9 @@ class NonPlayableTest extends FunSuite {
 
   }
   test("equalsMana") {
-    var ataque = Wand.sayMana(20)
+    var mana = Wand.sayMana(20)
     var expected: Int = 20
-    assertEquals(ataque, expected)
+    assertEquals(mana, expected)
   }
   test("NotEqualsMana") {
     var mana1 = Wand.sayMana(20)

From 70294c6a26b16159dfa24dbb84f026d9406c97b1 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 14:18:37 -0400
Subject: [PATCH 054/128] FEAT: added  method 'sayOwner' in class 'Weapon' in
 package 'nonplayable'

---
 src/main/scala/model/nonplayable/Weapon.scala | 9 ++++++++-
 src/test/scala/NonPlayableTest.scala          | 7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index 74d507c..4dfb098 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -1,16 +1,23 @@
 package model.nonplayable
 import model.nonplayable.NonPlayable
+import model.playable.Character
 class Weapon extends NonPlayable {
-  def sayName(name: String) : String = {
+  def sayOwner(owner : Character): Character = {
+    return owner
+  }
+  def sayName(name: String): String = {
     return name
   }
+
   def sayWeight(weight: Int): Int = {
     return weight
   }
+
   def sayAttack(attack: Int): Int = {
     return attack
   }
 
 
 
+
 }
diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 3b16b25..27d9494 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -1,16 +1,19 @@
 import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon}
+import model.playable.{Character,Playable}
 class NonPlayableTest extends FunSuite {
-  var Sword: NonPlayable = _
+  var Sword: Weapon = _
   var Bow: NonPlayable = _
   var Wand: MagicWeapon = _
   var Staff: MagicWeapon = _
+  var Cristiano: Character = _
 
   override def beforeEach(context: BeforeEach): Unit = {
     Sword = new Weapon()
     Bow = new Weapon()
     Wand = new MagicWeapon()
     Staff = new MagicWeapon()
+    Cristiano = new Character()
   }
 
   test("equalsName") {
@@ -45,6 +48,8 @@ class NonPlayableTest extends FunSuite {
     assertNotEquals(vida1, vida2)
 
   }
+
+
   test("equalsMana") {
     var mana = Wand.sayMana(20)
     var expected: Int = 20

From 11061c4fe74d1c06cf8dff740b7ff7eb9890e174 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 14:19:11 -0400
Subject: [PATCH 055/128] TEST: added test 'equalsOwner' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 27d9494..c18227d 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -48,6 +48,11 @@ class NonPlayableTest extends FunSuite {
     assertNotEquals(vida1, vida2)
 
   }
+  test("equalsOwner") {
+    var dueño: Character = Sword.sayOwner(Cristiano)
+    var expected : Character = Cristiano
+    assertEquals(dueño, expected)
+  }
 
 
   test("equalsMana") {

From 89be0f2ed899aef531a6f871edf68f30f1ce3a6f Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 14:30:19 -0400
Subject: [PATCH 056/128] FEAT: override  method 'sayOwner' in class
 'MagicWeapon' in package 'nonplayable'

---
 src/main/scala/model/nonplayable/MagicWeapon.scala | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
index 0ed4be9..f4e4a9c 100644
--- a/src/main/scala/model/nonplayable/MagicWeapon.scala
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -1,9 +1,13 @@
 package model.nonplayable
 import model.nonplayable.Weapon
+import model.playable.MagicCharacter
 
 class MagicWeapon extends Weapon {
   def sayMana(mana:Int): Int = {
     return mana
   }
+  override def sayOwner(magicOwner : MagicCharacter): MagicCharacter = {
+    return magicOwner
+  }
 
 }

From 6668b275433de665a270d2d6c48f58c529cf134b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:16:25 -0400
Subject: [PATCH 057/128] FEAT: deleted  method 'sayOwner' in class
 'MagicWeapon' in package 'nonplayable'

---
 src/main/scala/model/nonplayable/MagicWeapon.scala | 4 +---
 src/test/scala/NonPlayableTest.scala               | 9 ++++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
index f4e4a9c..cc632e5 100644
--- a/src/main/scala/model/nonplayable/MagicWeapon.scala
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -6,8 +6,6 @@ class MagicWeapon extends Weapon {
   def sayMana(mana:Int): Int = {
     return mana
   }
-  override def sayOwner(magicOwner : MagicCharacter): MagicCharacter = {
-    return magicOwner
-  }
+
 
 }
diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index c18227d..2296da2 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -7,13 +7,14 @@ class NonPlayableTest extends FunSuite {
   var Wand: MagicWeapon = _
   var Staff: MagicWeapon = _
   var Cristiano: Character = _
-
+  var Messi: Character = _
   override def beforeEach(context: BeforeEach): Unit = {
     Sword = new Weapon()
     Bow = new Weapon()
     Wand = new MagicWeapon()
     Staff = new MagicWeapon()
     Cristiano = new Character()
+    Messi = new Character()
   }
 
   test("equalsName") {
@@ -54,6 +55,12 @@ class NonPlayableTest extends FunSuite {
     assertEquals(dueño, expected)
   }
 
+  test("NotEqualsOwner") {
+    var dueño1: Character = Sword.sayOwner(Cristiano)
+    var dueño2: Character = Bow.sayOwner(Messi)
+    assertEquals(dueño1, dueño2)
+  }
+
 
   test("equalsMana") {
     var mana = Wand.sayMana(20)

From 589f2808ebfc3ab44e8935ef3a6a1710bf087bed Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:24:07 -0400
Subject: [PATCH 058/128] FEAT: added  methods
 'sayMagicOwner','sayMana','sayName','sayWeight','sayAttack' in class
 'MagicWeapon' in package 'nonplayable'

---
 .../scala/model/nonplayable/MagicWeapon.scala | 20 +++++++++++++++++--
 src/main/scala/model/nonplayable/Weapon.scala |  1 +
 src/test/scala/NonPlayableTest.scala          |  5 ++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
index cc632e5..9bc8988 100644
--- a/src/main/scala/model/nonplayable/MagicWeapon.scala
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -1,11 +1,27 @@
 package model.nonplayable
-import model.nonplayable.Weapon
+import model.nonplayable.NonPlayable
 import model.playable.MagicCharacter
 
-class MagicWeapon extends Weapon {
+class MagicWeapon extends NonPlayable {
   def sayMana(mana:Int): Int = {
     return mana
   }
+  def sayMagicOwner(magicOwner: MagicCharacter): MagicCharacter ={
+    return magicOwner
+  }
+
+  def sayName(name: String): String = {
+    return name
+  }
+
+  def sayWeight(weight: Int): Int = {
+    return weight
+  }
+
+  def sayAttack(attack: Int): Int = {
+    return attack
+  }
+
 
 
 }
diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index 4dfb098..be0bfb0 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -5,6 +5,7 @@ class Weapon extends NonPlayable {
   def sayOwner(owner : Character): Character = {
     return owner
   }
+
   def sayName(name: String): String = {
     return name
   }
diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 2296da2..4e1694d 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -3,7 +3,7 @@ import model.nonplayable.{MagicWeapon, NonPlayable, Weapon}
 import model.playable.{Character,Playable}
 class NonPlayableTest extends FunSuite {
   var Sword: Weapon = _
-  var Bow: NonPlayable = _
+  var Bow: Weapon = _
   var Wand: MagicWeapon = _
   var Staff: MagicWeapon = _
   var Cristiano: Character = _
@@ -58,10 +58,9 @@ class NonPlayableTest extends FunSuite {
   test("NotEqualsOwner") {
     var dueño1: Character = Sword.sayOwner(Cristiano)
     var dueño2: Character = Bow.sayOwner(Messi)
-    assertEquals(dueño1, dueño2)
+    assertNotEquals(dueño1, dueño2)
   }
 
-
   test("equalsMana") {
     var mana = Wand.sayMana(20)
     var expected: Int = 20

From 65274425ecd22451aab89848c7acaa8f16cc11d4 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:31:48 -0400
Subject: [PATCH 059/128] TEST: added test 'equalsMagicOwner' in class
 'NonPlayableTest'

---
 src/main/scala/model/nonplayable/MagicWeapon.scala | 10 ++++------
 src/test/scala/NonPlayableTest.scala               | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
index 9bc8988..e57e559 100644
--- a/src/main/scala/model/nonplayable/MagicWeapon.scala
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -3,12 +3,13 @@ import model.nonplayable.NonPlayable
 import model.playable.MagicCharacter
 
 class MagicWeapon extends NonPlayable {
+  def sayMagicOwner(magicOwner : MagicCharacter): MagicCharacter = {
+    return magicOwner
+  }
+
   def sayMana(mana:Int): Int = {
     return mana
   }
-  def sayMagicOwner(magicOwner: MagicCharacter): MagicCharacter ={
-    return magicOwner
-  }
 
   def sayName(name: String): String = {
     return name
@@ -21,7 +22,4 @@ class MagicWeapon extends NonPlayable {
   def sayAttack(attack: Int): Int = {
     return attack
   }
-
-
-
 }
diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 4e1694d..17b8c44 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -1,6 +1,6 @@
 import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon}
-import model.playable.{Character,Playable}
+import model.playable.{Character, MagicCharacter, Playable}
 class NonPlayableTest extends FunSuite {
   var Sword: Weapon = _
   var Bow: Weapon = _
@@ -8,6 +8,8 @@ class NonPlayableTest extends FunSuite {
   var Staff: MagicWeapon = _
   var Cristiano: Character = _
   var Messi: Character = _
+  var Alexis: MagicCharacter = _
+  var Vidal: MagicCharacter = _
   override def beforeEach(context: BeforeEach): Unit = {
     Sword = new Weapon()
     Bow = new Weapon()
@@ -15,6 +17,9 @@ class NonPlayableTest extends FunSuite {
     Staff = new MagicWeapon()
     Cristiano = new Character()
     Messi = new Character()
+    Alexis = new MagicCharacter()
+    Vidal = new MagicCharacter()
+
   }
 
   test("equalsName") {
@@ -61,6 +66,12 @@ class NonPlayableTest extends FunSuite {
     assertNotEquals(dueño1, dueño2)
   }
 
+  test("equalsMagicOwner") {
+    var dueño: MagicCharacter = Wand.sayMagicOwner(Alexis)
+    var expected : MagicCharacter = Alexis
+    assertEquals(dueño, expected)
+  }
+
   test("equalsMana") {
     var mana = Wand.sayMana(20)
     var expected: Int = 20

From faa0bc7500b8c23396ed1cd6319ef5d2d0515fdc Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:33:28 -0400
Subject: [PATCH 060/128] TEST: added test 'NotEqualsMagicOwner' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 17b8c44..a6e2e9c 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -72,6 +72,12 @@ class NonPlayableTest extends FunSuite {
     assertEquals(dueño, expected)
   }
 
+  test("NotEqualsMagicOwner") {
+    var dueño1: Character = Wand.sayMagicOwner(Alexis)
+    var dueño2: Character = Staff.sayMagicOwner(Vidal)
+    assertNotEquals(dueño1, dueño2)
+  }
+
   test("equalsMana") {
     var mana = Wand.sayMana(20)
     var expected: Int = 20

From e6f2879707d49cef58b017dff44a812dd9583384 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:34:27 -0400
Subject: [PATCH 061/128] FEAT: added  class 'Enemy' in package 'nonplayable'

---
 src/main/scala/model/nonplayable/Enemy.scala | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/main/scala/model/nonplayable/Enemy.scala

diff --git a/src/main/scala/model/nonplayable/Enemy.scala b/src/main/scala/model/nonplayable/Enemy.scala
new file mode 100644
index 0000000..e238380
--- /dev/null
+++ b/src/main/scala/model/nonplayable/Enemy.scala
@@ -0,0 +1,5 @@
+package model.nonplayable
+import model.nonplayable
+class Enemy {
+
+}

From 9eecf39a3aa1fabb0b987443620c1d0de4f03dce Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:37:05 -0400
Subject: [PATCH 062/128] FEAT: added  methods
 'sayLife','sayDefence','sayName','sayWeight','sayAttack' in class 'Enemy' in
 package 'nonplayable'

---
 src/main/scala/model/nonplayable/Enemy.scala | 23 ++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/model/nonplayable/Enemy.scala b/src/main/scala/model/nonplayable/Enemy.scala
index e238380..c152f09 100644
--- a/src/main/scala/model/nonplayable/Enemy.scala
+++ b/src/main/scala/model/nonplayable/Enemy.scala
@@ -1,5 +1,24 @@
 package model.nonplayable
-import model.nonplayable
-class Enemy {
+import model.nonplayable.NonPlayable
+class Enemy extends NonPlayable{
 
+  def sayName(name: String): String = {
+    return name
+  }
+
+  def sayWeight(weight: Int): Int = {
+    return weight
+  }
+
+  def sayAttack(attack: Int): Int = {
+    return attack
+  }
+
+  def sayLife(life: Int): Int = {
+    return life
+  }
+
+  def sayDefence(defence: Int): Int = {
+    return defence
+  }
 }

From 353a2e8f462be6a0013d38ae1c052e769e11ff0c Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:41:28 -0400
Subject: [PATCH 063/128] TEST: added test 'EqualsEnemyName' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index a6e2e9c..44e5535 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -1,5 +1,5 @@
 import munit.FunSuite
-import model.nonplayable.{MagicWeapon, NonPlayable, Weapon}
+import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
 class NonPlayableTest extends FunSuite {
   var Sword: Weapon = _
@@ -10,6 +10,7 @@ class NonPlayableTest extends FunSuite {
   var Messi: Character = _
   var Alexis: MagicCharacter = _
   var Vidal: MagicCharacter = _
+  var Neymar: Enemy = _
   override def beforeEach(context: BeforeEach): Unit = {
     Sword = new Weapon()
     Bow = new Weapon()
@@ -19,6 +20,7 @@ class NonPlayableTest extends FunSuite {
     Messi = new Character()
     Alexis = new MagicCharacter()
     Vidal = new MagicCharacter()
+    Neymar = new Enemy()
 
   }
 
@@ -88,4 +90,10 @@ class NonPlayableTest extends FunSuite {
     var mana2 = Staff.sayAttack(30)
     assertNotEquals(mana1, mana2)
   }
+  test("EqualsEnemyName"){
+    var nombre: String = Neymar.sayName("Neymar")
+    var expected: String = "Neymar"
+    assertEquals(nombre,expected)
+  }
 }
+

From e0afa605c3713dc65f8dacf6745a19d54a0f7259 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:42:16 -0400
Subject: [PATCH 064/128] REFACTOR: changed test 'EqualsEnemyName for
 'equalsEnemyName' in class 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 44e5535..9b5e38b 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -90,7 +90,7 @@ class NonPlayableTest extends FunSuite {
     var mana2 = Staff.sayAttack(30)
     assertNotEquals(mana1, mana2)
   }
-  test("EqualsEnemyName"){
+  test("equalsEnemyName"){
     var nombre: String = Neymar.sayName("Neymar")
     var expected: String = "Neymar"
     assertEquals(nombre,expected)

From 048249e00457393959a183b3f59230c1997367ed Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:44:10 -0400
Subject: [PATCH 065/128] TEST: added test 'NotEqualsEnemyName' in class
 'NonPlayableTest'

---
 src/test/scala/NonPlayableTest.scala | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/NonPlayableTest.scala
index 9b5e38b..2980230 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/NonPlayableTest.scala
@@ -11,6 +11,7 @@ class NonPlayableTest extends FunSuite {
   var Alexis: MagicCharacter = _
   var Vidal: MagicCharacter = _
   var Neymar: Enemy = _
+  var Bale: Enemy = _
   override def beforeEach(context: BeforeEach): Unit = {
     Sword = new Weapon()
     Bow = new Weapon()
@@ -21,6 +22,7 @@ class NonPlayableTest extends FunSuite {
     Alexis = new MagicCharacter()
     Vidal = new MagicCharacter()
     Neymar = new Enemy()
+    Bale = new Enemy()
 
   }
 
@@ -95,5 +97,10 @@ class NonPlayableTest extends FunSuite {
     var expected: String = "Neymar"
     assertEquals(nombre,expected)
   }
+  test("NotEqualsEnemyName"){
+    var nombre1: String = Neymar.sayName("Neymar")
+    var nombre2: String = Bale.sayName("Bale")
+    assertNotEquals(nombre1,nombre2)
+  }
 }
 

From 0036a5f6ab93d6a8c84e21c8099042d3c8f43ab7 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:45:57 -0400
Subject: [PATCH 066/128] FEAT: added  class 'WeaponTest' in package 'test'

---
 src/test/scala/WeaponTest.scala | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/test/scala/WeaponTest.scala

diff --git a/src/test/scala/WeaponTest.scala b/src/test/scala/WeaponTest.scala
new file mode 100644
index 0000000..28f6f8a
--- /dev/null
+++ b/src/test/scala/WeaponTest.scala
@@ -0,0 +1,3 @@
+class WeaponTest {
+
+}

From 1570b1121e36d8a3c3a1d06687a0d1bb3cb5ff4b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:46:19 -0400
Subject: [PATCH 067/128] FEAT: added  class 'MagicWeaponTest' in package
 'test'

---
 src/test/scala/MagicWeaponTest.scala | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/test/scala/MagicWeaponTest.scala

diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
new file mode 100644
index 0000000..a57bd69
--- /dev/null
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -0,0 +1,3 @@
+class MagicWeaponTest {
+
+}

From ecdda6b4aa0d20f9c6e49eb049c3d769c836056c Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:48:00 -0400
Subject: [PATCH 068/128] REFACTOR: changed class 'NonPlayableTest' for
 'EnemyTest' in package 'Test'

---
 src/test/scala/{NonPlayableTest.scala => EnemyTest.scala} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/test/scala/{NonPlayableTest.scala => EnemyTest.scala} (98%)

diff --git a/src/test/scala/NonPlayableTest.scala b/src/test/scala/EnemyTest.scala
similarity index 98%
rename from src/test/scala/NonPlayableTest.scala
rename to src/test/scala/EnemyTest.scala
index 2980230..c91253e 100644
--- a/src/test/scala/NonPlayableTest.scala
+++ b/src/test/scala/EnemyTest.scala
@@ -1,7 +1,7 @@
 import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
-class NonPlayableTest extends FunSuite {
+class EnemyTest extends FunSuite {
   var Sword: Weapon = _
   var Bow: Weapon = _
   var Wand: MagicWeapon = _

From 4a7cb9595c4703028c1b418107bcd506cd1bf5b4 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 15:58:14 -0400
Subject: [PATCH 069/128] FEAT: added test 'equalsName','NotEqualsName',
 'equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack',
 'equalOwner', 'NotEqualsOwner' in class 'WeaponTest'

---
 src/test/scala/EnemyTest.scala  | 52 -----------------------------
 src/test/scala/WeaponTest.scala | 59 ++++++++++++++++++++++++++++++++-
 2 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/src/test/scala/EnemyTest.scala b/src/test/scala/EnemyTest.scala
index c91253e..35922e7 100644
--- a/src/test/scala/EnemyTest.scala
+++ b/src/test/scala/EnemyTest.scala
@@ -2,23 +2,15 @@ import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
 class EnemyTest extends FunSuite {
-  var Sword: Weapon = _
-  var Bow: Weapon = _
   var Wand: MagicWeapon = _
   var Staff: MagicWeapon = _
-  var Cristiano: Character = _
-  var Messi: Character = _
   var Alexis: MagicCharacter = _
   var Vidal: MagicCharacter = _
   var Neymar: Enemy = _
   var Bale: Enemy = _
   override def beforeEach(context: BeforeEach): Unit = {
-    Sword = new Weapon()
-    Bow = new Weapon()
     Wand = new MagicWeapon()
     Staff = new MagicWeapon()
-    Cristiano = new Character()
-    Messi = new Character()
     Alexis = new MagicCharacter()
     Vidal = new MagicCharacter()
     Neymar = new Enemy()
@@ -26,50 +18,6 @@ class EnemyTest extends FunSuite {
 
   }
 
-  test("equalsName") {
-    var nombre: String = Sword.sayName("Espada")
-    var expected = "Espada"
-    assertEquals(nombre, expected)
-  }
-  test("NotEqualsName") {
-    var nombre1 = Sword.sayName("Espada")
-    var nombre2 = Bow.sayName("Arco")
-    assertNotEquals(nombre1, nombre2)
-  }
-  test("equalsWeight") {
-    var peso = Sword.sayWeight(5)
-    var expected: Int = 5
-    assertEquals(peso, expected)
-  }
-  test("NotEqualsWeight") {
-    var peso1 = Sword.sayWeight(5)
-    var peso2 = Bow.sayWeight(3)
-    assertNotEquals(peso1, peso2)
-  }
-  test("equalsAttack") {
-    var ataque = Sword.sayAttack(25)
-    var expected: Int = 25
-    assertEquals(ataque, expected)
-
-  }
-  test("NotEqualsAttack") {
-    var vida1 = Sword.sayAttack(25)
-    var vida2 = Bow.sayAttack(20)
-    assertNotEquals(vida1, vida2)
-
-  }
-  test("equalsOwner") {
-    var dueño: Character = Sword.sayOwner(Cristiano)
-    var expected : Character = Cristiano
-    assertEquals(dueño, expected)
-  }
-
-  test("NotEqualsOwner") {
-    var dueño1: Character = Sword.sayOwner(Cristiano)
-    var dueño2: Character = Bow.sayOwner(Messi)
-    assertNotEquals(dueño1, dueño2)
-  }
-
   test("equalsMagicOwner") {
     var dueño: MagicCharacter = Wand.sayMagicOwner(Alexis)
     var expected : MagicCharacter = Alexis
diff --git a/src/test/scala/WeaponTest.scala b/src/test/scala/WeaponTest.scala
index 28f6f8a..bf0d0e5 100644
--- a/src/test/scala/WeaponTest.scala
+++ b/src/test/scala/WeaponTest.scala
@@ -1,3 +1,60 @@
-class WeaponTest {
+import munit.FunSuite
+import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
+import model.playable.{Character, MagicCharacter, Playable}
+class WeaponTest extends FunSuite {
+  var Sword: Weapon = _
+  var Bow: Weapon = _
+  var Cristiano: Character = _
+  var Messi: Character = _
 
+  override def beforeEach(context: BeforeEach): Unit = {
+    Sword = new Weapon()
+    Bow = new Weapon()
+    Cristiano = new Character()
+    Messi = new Character()
+  }
+
+  test("equalsName") {
+    var nombre: String = Sword.sayName("Espada")
+    var expected = "Espada"
+    assertEquals(nombre, expected)
+  }
+  test("NotEqualsName") {
+    var nombre1 = Sword.sayName("Espada")
+    var nombre2 = Bow.sayName("Arco")
+    assertNotEquals(nombre1, nombre2)
+  }
+  test("equalsWeight") {
+    var peso = Sword.sayWeight(5)
+    var expected: Int = 5
+    assertEquals(peso, expected)
+  }
+  test("NotEqualsWeight") {
+    var peso1 = Sword.sayWeight(5)
+    var peso2 = Bow.sayWeight(3)
+    assertNotEquals(peso1, peso2)
+  }
+  test("equalsAttack") {
+    var ataque = Sword.sayAttack(25)
+    var expected: Int = 25
+    assertEquals(ataque, expected)
+
+  }
+  test("NotEqualsAttack") {
+    var vida1 = Sword.sayAttack(25)
+    var vida2 = Bow.sayAttack(20)
+    assertNotEquals(vida1, vida2)
+
+  }
+  test("equalsOwner") {
+    var dueño: Character = Sword.sayOwner(Cristiano)
+    var expected: Character = Cristiano
+    assertEquals(dueño, expected)
+  }
+
+  test("NotEqualsOwner") {
+    var dueño1: Character = Sword.sayOwner(Cristiano)
+    var dueño2: Character = Bow.sayOwner(Messi)
+    assertNotEquals(dueño1, dueño2)
+  }
 }

From d96e7868d8623eb97e62dede0f89b84634414b44 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 16:00:41 -0400
Subject: [PATCH 070/128] FEAT: added test 'equalsMana','NotEqualsMana',
 'equalMagicOwner', 'NotEqualsMagicOwner' in class 'MagicWeaponTest'

---
 src/test/scala/EnemyTest.scala       |  8 ------
 src/test/scala/MagicWeaponTest.scala | 41 ++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/src/test/scala/EnemyTest.scala b/src/test/scala/EnemyTest.scala
index 35922e7..fde0ee0 100644
--- a/src/test/scala/EnemyTest.scala
+++ b/src/test/scala/EnemyTest.scala
@@ -2,17 +2,9 @@ import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
 class EnemyTest extends FunSuite {
-  var Wand: MagicWeapon = _
-  var Staff: MagicWeapon = _
-  var Alexis: MagicCharacter = _
-  var Vidal: MagicCharacter = _
   var Neymar: Enemy = _
   var Bale: Enemy = _
   override def beforeEach(context: BeforeEach): Unit = {
-    Wand = new MagicWeapon()
-    Staff = new MagicWeapon()
-    Alexis = new MagicCharacter()
-    Vidal = new MagicCharacter()
     Neymar = new Enemy()
     Bale = new Enemy()
 
diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
index a57bd69..aa9d548 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -1,3 +1,40 @@
-class MagicWeaponTest {
+import munit.FunSuite
+import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
+import model.playable.{Character, MagicCharacter, Playable}
+class MagicWeaponTest extends FunSuite {
+  var Wand: MagicWeapon = _
+  var Staff: MagicWeapon = _
+  var Alexis: MagicCharacter = _
+  var Vidal: MagicCharacter = _
 
-}
+  override def beforeEach(context: BeforeEach): Unit = {
+    Wand = new MagicWeapon()
+    Staff = new MagicWeapon()
+    Alexis = new MagicCharacter()
+    Vidal = new MagicCharacter()
+
+  }
+
+  test("equalsMagicOwner") {
+    var dueño: MagicCharacter = Wand.sayMagicOwner(Alexis)
+    var expected: MagicCharacter = Alexis
+    assertEquals(dueño, expected)
+  }
+
+  test("NotEqualsMagicOwner") {
+    var dueño1: Character = Wand.sayMagicOwner(Alexis)
+    var dueño2: Character = Staff.sayMagicOwner(Vidal)
+    assertNotEquals(dueño1, dueño2)
+  }
+
+  test("equalsMana") {
+    var mana = Wand.sayMana(20)
+    var expected: Int = 20
+    assertEquals(mana, expected)
+  }
+  test("NotEqualsMana") {
+    var mana1 = Wand.sayMana(20)
+    var mana2 = Staff.sayAttack(30)
+    assertNotEquals(mana1, mana2)
+  }
+}
\ No newline at end of file

From 5e8172e6745061f05f686ee21488f130974447a3 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 16:01:25 -0400
Subject: [PATCH 071/128] FEAT: deleted test 'equalsMana','NotEqualsMana',
 'equalMagicOwner', 'NotEqualsMagicOwner' in class 'EnemyTest'

---
 src/test/scala/EnemyTest.scala | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/src/test/scala/EnemyTest.scala b/src/test/scala/EnemyTest.scala
index fde0ee0..39c35bb 100644
--- a/src/test/scala/EnemyTest.scala
+++ b/src/test/scala/EnemyTest.scala
@@ -10,28 +10,6 @@ class EnemyTest extends FunSuite {
 
   }
 
-  test("equalsMagicOwner") {
-    var dueño: MagicCharacter = Wand.sayMagicOwner(Alexis)
-    var expected : MagicCharacter = Alexis
-    assertEquals(dueño, expected)
-  }
-
-  test("NotEqualsMagicOwner") {
-    var dueño1: Character = Wand.sayMagicOwner(Alexis)
-    var dueño2: Character = Staff.sayMagicOwner(Vidal)
-    assertNotEquals(dueño1, dueño2)
-  }
-
-  test("equalsMana") {
-    var mana = Wand.sayMana(20)
-    var expected: Int = 20
-    assertEquals(mana, expected)
-  }
-  test("NotEqualsMana") {
-    var mana1 = Wand.sayMana(20)
-    var mana2 = Staff.sayAttack(30)
-    assertNotEquals(mana1, mana2)
-  }
   test("equalsEnemyName"){
     var nombre: String = Neymar.sayName("Neymar")
     var expected: String = "Neymar"

From aa96c51ec5eb2df868efd21c7f6023a6a9db812b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 16:04:03 -0400
Subject: [PATCH 072/128] FEAT: added test 'equalsName','NotEqualsName',
 'equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack' in class
 'MagicWeaponTest'

---
 src/test/scala/MagicWeaponTest.scala | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
index aa9d548..aaedc29 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -15,6 +15,39 @@ class MagicWeaponTest extends FunSuite {
 
   }
 
+  test("equalsName") {
+    var nombre: String = Wand.sayName("Barita")
+    var expected = "Barita"
+    assertEquals(nombre, expected)
+  }
+  test("NotEqualsName") {
+    var nombre1 = Wand.sayName("Barita")
+    var nombre2 = Staff.sayName("Baston")
+    assertNotEquals(nombre1, nombre2)
+  }
+  test("equalsWeight") {
+    var peso = Wand.sayWeight(5)
+    var expected: Int = 5
+    assertEquals(peso, expected)
+  }
+  test("NotEqualsWeight") {
+    var peso1 = Wand.sayWeight(5)
+    var peso2 = Staff.sayWeight(3)
+    assertNotEquals(peso1, peso2)
+  }
+  test("equalsAttack") {
+    var ataque = Wand.sayAttack(25)
+    var expected: Int = 25
+    assertEquals(ataque, expected)
+
+  }
+  test("NotEqualsAttack") {
+    var vida1 = Wand.sayAttack(25)
+    var vida2 = Staff.sayAttack(20)
+    assertNotEquals(vida1, vida2)
+
+  }
+
   test("equalsMagicOwner") {
     var dueño: MagicCharacter = Wand.sayMagicOwner(Alexis)
     var expected: MagicCharacter = Alexis

From f6b076277cf7552350d9f66616c02a177deeaadc Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Sun, 7 Apr 2024 16:09:11 -0400
Subject: [PATCH 073/128] FEAT: added test 'equalsName','NotEqualsName',
 'equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack','equalsAttack',
 'NotEqualsAttack','equalsDefence','NotEqualsdefence' in class 'EnemyTest'

---
 src/test/scala/EnemyTest.scala | 44 ++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/src/test/scala/EnemyTest.scala b/src/test/scala/EnemyTest.scala
index 39c35bb..6fd2e6e 100644
--- a/src/test/scala/EnemyTest.scala
+++ b/src/test/scala/EnemyTest.scala
@@ -20,5 +20,49 @@ class EnemyTest extends FunSuite {
     var nombre2: String = Bale.sayName("Bale")
     assertNotEquals(nombre1,nombre2)
   }
+  test("equalsWeight") {
+    var peso = Neymar.sayWeight(5)
+    var expected: Int = 5
+    assertEquals(peso, expected)
+  }
+  test("NotEqualsWeight") {
+    var peso1 = Neymar.sayWeight(5)
+    var peso2 = Bale.sayWeight(3)
+    assertNotEquals(peso1, peso2)
+  }
+  test("equalsAttack") {
+    var ataque = Neymar.sayAttack(25)
+    var expected: Int = 25
+    assertEquals(ataque, expected)
+
+  }
+  test("NotEqualsAttack") {
+    var vida1 = Neymar.sayAttack(25)
+    var vida2 = Bale.sayAttack(20)
+    assertNotEquals(vida1, vida2)
+
+  }
+  test("equalsLife") {
+    var vida = Neymar.sayLife(100)
+    var expected: Int = 100
+    assertEquals(vida, expected)
+
+  }
+  test("NotEqualsLife") {
+    var vida1 = Neymar.sayLife(100)
+    var vida2 = Bale.sayLife(90)
+    assertNotEquals(vida1, vida2)
+
+  }
+  test("equalsDefence") {
+    var defensa = Neymar.sayDefence(10)
+    var expected: Int = 10
+    assertEquals(defensa, expected)
+  }
+  test("NotEqualsDefence") {
+    var defensa1 = Neymar.sayDefence(10)
+    var defensa2 = Bale.sayDefence(5)
+    assertNotEquals(defensa1, defensa2)
+  }
 }
 

From 1fb9131914a1c97361225bc332cd955ccae924fb Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 11:16:36 -0400
Subject: [PATCH 074/128] REFACTOR: edited methods 'sayName',
 'sayLife','sayDefence', 'sayWeight', 'sayKind' and renamed 'putWeapon' for
 'havWeapon'in trait 'Playable' in package 'playable'

---
 src/main/scala/model/party/Party.scala       | 15 +++++++++++++++
 src/main/scala/model/playable/Playable.scala | 12 ++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 src/main/scala/model/party/Party.scala

diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
new file mode 100644
index 0000000..566969e
--- /dev/null
+++ b/src/main/scala/model/party/Party.scala
@@ -0,0 +1,15 @@
+package model.party
+import model.playable.{Character, MagicCharacter, Playable}
+
+import scala.collection.mutable.Map
+//class Party {
+  //val allies : Map[String, Playable] = Map()
+  //def this(troops: Set[Playable]) = {
+    //this()
+    //for(m <- troops) {appendPlayable(p)}
+  //}
+  //def this (p1: Playable,p2:Playable) = {
+    //this (Set(p1,p2))
+  //}
+
+//}
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index d5ddc78..c882115 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -1,12 +1,12 @@
 package model.playable
 
 trait Playable {
-  def sayName(name: String) : String
-  def sayLife(life: Int): Int
-  def sayDefence(defence: Int): Int
-  def sayWeight(weight: Int): Int
-  def sayKind(kind: String): String
-  def putWeapon(weapon: String): String
+  def sayName() : String
+  def sayLife(): Int
+  def sayDefence(): Int
+  def sayWeight(): Int
+  def sayKind(): String
+  def havWeapon(): String
 
 
 

From d2834ad2304ec238fe12a8629ef9937f7048367f Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 11:21:01 -0400
Subject: [PATCH 075/128] REFACTOR: edited methods 'sayName',
 'sayLife','sayDefence', 'sayWeight', 'sayKind' and renamed 'putWeapon' for
 'havWeapon'in class 'Character' in package 'playable'

---
 src/main/scala/model/playable/Character.scala | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 3b9f15c..da68724 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -1,32 +1,19 @@
 package model.playable
 import model.playable.Playable
 
-class Character extends Playable {
-  def sayName(name: String): String = {
-    return name
+class Character(name:String, life:Int,
+                defence:Int,weight:Int,
+                kind:String,weapon:Boolean) extends Playable {
+  def sayName() = {name}
+  def sayLife()= {life}
 
-  }
+  def sayDefence()= {defence}
 
-  def sayLife(life: Int): Int = {
-    return life
-  }
+  def sayWeight()={weight}
+  def sayKind()={kind}
 
-  def sayDefence(defence: Int): Int = {
-    return defence
-  }
+  def havWeapon()={weapon}
 
-  def sayWeight(weight: Int): Int = {
-    return weight
-  }
-
-  def sayKind(kind: String): String = {
-    return kind
-  }
-
-  def putWeapon(weapon: String): String = {
-    return weapon
-
-  }
 }
 
 

From 0e2f6448b9244c0238a3bebe963484f4c13f509d Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 11:24:23 -0400
Subject: [PATCH 076/128] REFACTOR: added methods 'sayName',
 'sayLife','sayDefence', 'sayWeight', 'sayKind', 'putWeapon' and edited
 'sayMana' in class 'MagicCharacter' in package 'playable'

---
 .../scala/model/playable/MagicCharacter.scala | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index 7db7b41..fe236fc 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -1,7 +1,20 @@
 package model.playable
 import model.playable.Character
-class MagicCharacter extends Character {
-  def sayMana(mana: Int): Int = {
-    return mana
-  }
+class MagicCharacter(name:String, life:Int,
+                      defence:Int,weight:Int,
+                      kind:String,weapon:Boolean,
+                      mana:Int) extends Playable {
+  def sayName() = {name}
+  def sayLife()= {life}
+
+  def sayDefence()= {defence}
+
+  def sayWeight()={weight}
+  def sayKind()={kind}
+
+  def havWeapon()={weapon}
+
+  def sayMana()={mana}
+
+
 }

From 28609255a8eb16835090701f35782d893d9be253 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 11:39:41 -0400
Subject: [PATCH 077/128] REFACTOR: edited test
 'equalsName','NotequalsName','equalsLife','NotequalsLife','equalsDefence','NotEqualsDefence','equalsWeight','NotEqualsWeight','equalsKind','NotEqualsKind','equalsWeapon','NotEqualsWeapon','equalsMana'
 and 'NotEqualsMana' in Test 'PlayableTest'

---
 src/main/scala/model/playable/Character.scala | 26 ++++++--
 .../scala/model/playable/MagicCharacter.scala | 19 ++++--
 src/main/scala/model/playable/Playable.scala  |  2 +-
 src/test/scala/PlayableTest.scala             | 66 +++++++++----------
 4 files changed, 68 insertions(+), 45 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index da68724..f22308a 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -4,15 +4,29 @@ import model.playable.Playable
 class Character(name:String, life:Int,
                 defence:Int,weight:Int,
                 kind:String,weapon:Boolean) extends Playable {
-  def sayName() = {name}
-  def sayLife()= {life}
+  def sayName(): String = {
+    name
+  }
 
-  def sayDefence()= {defence}
+  def sayLife(): Int = {
+    life
+  }
 
-  def sayWeight()={weight}
-  def sayKind()={kind}
+  def sayDefence(): Int = {
+    defence
+  }
+
+  def sayWeight(): Int = {
+    weight
+  }
+
+  def sayKind(): String = {
+    kind
+  }
+
+  def havWeapon(): Boolean = {
+    weapon}
 
-  def havWeapon()={weapon}
 
 }
 
diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index fe236fc..3c1dc2b 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -5,14 +5,23 @@ class MagicCharacter(name:String, life:Int,
                       kind:String,weapon:Boolean,
                       mana:Int) extends Playable {
   def sayName() = {name}
-  def sayLife()= {life}
 
-  def sayDefence()= {defence}
+  def sayLife(): Int = {
+    life
+  }
 
-  def sayWeight()={weight}
-  def sayKind()={kind}
+  def sayDefence(): Int = {
+    defence
+  }
 
-  def havWeapon()={weapon}
+  def sayWeight(): Int = {
+    weight
+  }
+  def sayKind():String={kind}
+
+  def havWeapon(): Boolean = {
+    weapon
+  }
 
   def sayMana()={mana}
 
diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index c882115..3888d4d 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -6,7 +6,7 @@ trait Playable {
   def sayDefence(): Int
   def sayWeight(): Int
   def sayKind(): String
-  def havWeapon(): String
+  def havWeapon(): Boolean
 
 
 
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index fe108c0..070b80c 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -3,98 +3,98 @@ import model.playable.{Character, MagicCharacter, Playable}
 class PlayableTest extends FunSuite {
   var Cristiano: Playable = _
   var Messi: Playable = _
-  var Alexis: MagicCharacter = _
-  var Vidal: MagicCharacter = _
+  var Alexis: Playable = _
+  var Vidal: Playable = _
   override def beforeEach(context: BeforeEach): Unit = {
-    Cristiano = new Character()
-    Messi = new Character()
-    Alexis = new MagicCharacter()
-    Vidal = new MagicCharacter()
+    Cristiano = new Character("Cristiano",100,50,70,"Paladin",false)
+    Messi = new Character("Messi",90,40,60,"Guerrero",true)
+    Alexis = new MagicCharacter("Alexis",80,55,65,"Mago Blanco",false,90)
+    Vidal = new MagicCharacter("Vidal",90,100,70,"Mago Negro",true,50)
 
   }
 
   test("equalsName") {
-    var nombre = Cristiano.sayName("Cristiano")
+    var nombre = Cristiano.sayName()
     val expected: String = "Cristiano"
     assertEquals(nombre, expected)
   }
 
   test("NotEqualsName") {
-    var nombre1 = Cristiano.sayName("Cristiano")
-    var nombre2 = Messi.sayName("Messi")
+    var nombre1 = Cristiano.sayName()
+    var nombre2 = Messi.sayName()
     assertNotEquals(nombre1, nombre2)
 
   }
   test("equalsLife") {
-    var vida = Cristiano.sayLife(100)
+    var vida = Cristiano.sayLife()
     var expected: Int = 100
     assertEquals(vida, expected)
 
   }
   test("NotEqualsLife") {
-    var vida1 = Cristiano.sayLife(100)
-    var vida2 = Messi.sayLife(90)
+    var vida1 = Cristiano.sayLife()
+    var vida2 = Messi.sayLife()
     assertNotEquals(vida1, vida2)
 
   }
   test("equalsDefence") {
-    var defensa = Cristiano.sayDefence(10)
-    var expected: Int = 10
+    var defensa = Cristiano.sayDefence()
+    var expected: Int = 50
     assertEquals(defensa, expected)
   }
   test("NotEqualsDefence") {
-    var defensa1 = Cristiano.sayDefence(10)
-    var defensa2 = Messi.sayDefence(5)
+    var defensa1 = Cristiano.sayDefence()
+    var defensa2 = Messi.sayDefence()
     assertNotEquals(defensa1, defensa2)
   }
   test("equalsWeight") {
-    var peso = Cristiano.sayWeight(50)
-    var expected: Int = 50
+    var peso = Cristiano.sayWeight()
+    var expected: Int = 70
     assertEquals(peso, expected)
   }
   test("NotEqualsWeight") {
-    var peso1 = Cristiano.sayWeight(50)
-    var peso2 = Messi.sayWeight(40)
+    var peso1 = Cristiano.sayWeight()
+    var peso2 = Messi.sayWeight()
     assertNotEquals(peso1, peso2)
   }
   test("equalsKind") {
-    var clase = Cristiano.sayKind("Paladin")
+    var clase = Cristiano.sayKind()
     var expected: String = "Paladin"
     assertEquals(clase, expected)
   }
   test("NotEqualsKind") {
-    var clase1 = Cristiano.sayKind("Paladin")
-    var clase2 = Messi.sayKind("Guerrero")
+    var clase1 = Cristiano.sayKind()
+    var clase2 = Messi.sayKind()
     assertNotEquals(clase1, clase2)
   }
   test("equalsWeapon") {
-    var arma = Cristiano.putWeapon("Hacha")
-    var expected: String = "Hacha"
+    var arma = Cristiano.havWeapon()
+    var expected: Boolean = false
     assertEquals(arma, expected)
   }
   test("NotEqualsWeapon") {
-    var arma1 = Cristiano.putWeapon("Hacha")
-    var arma2 = Messi.putWeapon("Arco")
+    var arma1 = Cristiano.havWeapon()
+    var arma2 = Messi.havWeapon()
     assertNotEquals(arma1, arma2)
   }
   test("equalsMana") {
-    var mana = Alexis.sayMana(90)
+    var mana = Alexis.sayMana()
     var expected: Int = 90
     assertEquals(mana, expected)
   }
   test("NotEqualsMana") {
-    var mana1 = Alexis.sayMana(90)
-    var mana2 = Vidal.sayMana(80)
+    var mana1 = Alexis.sayMana()
+    var mana2 = Vidal.sayMana()
     assertNotEquals(mana1, mana2)
   }
   test("equalsMagicKind") {
-    var clase = Alexis.sayKind("Mago Blanco")
+    var clase = Alexis.sayKind()
     var expected: String = "Mago Blanco"
     assertEquals(clase, expected)
   }
   test("NotEqualsMagicKind") {
-    var clase1 = Alexis.sayKind("Mago Blanco")
-    var clase2 = Vidal.sayKind("Mago Negro")
+    var clase1 = Alexis.sayKind()
+    var clase2 = Vidal.sayKind()
     assertNotEquals(clase1, clase2)
   }
 }
\ No newline at end of file

From c0839f0e82110c9c0e844d4f9228e5fd3852ee8e Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 11:41:01 -0400
Subject: [PATCH 078/128] REFACTOR: edited test
 'equalsMagicKind','NotequalsMagicKind'and deleted 'equalsWeapon' and
 'NotEqualsWeapon' in Test 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 070b80c..b1cf779 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -72,16 +72,7 @@ class PlayableTest extends FunSuite {
     var expected: Boolean = false
     assertEquals(arma, expected)
   }
-  test("NotEqualsWeapon") {
-    var arma1 = Cristiano.havWeapon()
-    var arma2 = Messi.havWeapon()
-    assertNotEquals(arma1, arma2)
-  }
-  test("equalsMana") {
-    var mana = Alexis.sayMana()
-    var expected: Int = 90
-    assertEquals(mana, expected)
-  }
+
   test("NotEqualsMana") {
     var mana1 = Alexis.sayMana()
     var mana2 = Vidal.sayMana()

From 324f3f3a1932dd0c10c13a9e8e59c0e121ee0821 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 11:52:17 -0400
Subject: [PATCH 079/128] REFACTOR: edited methods 'sayName' 'sayWeight' and
 'sayAttack' in trait 'NonPlayable' in package 'nonplayable'

---
 src/main/scala/model/nonplayable/NonPlayable.scala |  6 +++---
 src/main/scala/model/playable/MagicCharacter.scala |  4 +++-
 src/test/scala/PlayableTest.scala                  | 10 +++++-----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/model/nonplayable/NonPlayable.scala b/src/main/scala/model/nonplayable/NonPlayable.scala
index c5c42e3..906ea6e 100644
--- a/src/main/scala/model/nonplayable/NonPlayable.scala
+++ b/src/main/scala/model/nonplayable/NonPlayable.scala
@@ -1,9 +1,9 @@
 package model.nonplayable
 
 trait NonPlayable {
-  def sayName(name: String) : String
-  def sayWeight(weight: Int): Int
-  def sayAttack(attack: Int): Int
+  def sayName(): String
+  def sayWeight(): Int
+  def sayAttack(): Int
 
 
 }
diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index 3c1dc2b..4bf8db8 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -4,7 +4,9 @@ class MagicCharacter(name:String, life:Int,
                       defence:Int,weight:Int,
                       kind:String,weapon:Boolean,
                       mana:Int) extends Playable {
-  def sayName() = {name}
+  def sayName(): String = {
+    name
+  }
 
   def sayLife(): Int = {
     life
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index b1cf779..a0f85cd 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -67,12 +67,12 @@ class PlayableTest extends FunSuite {
     var clase2 = Messi.sayKind()
     assertNotEquals(clase1, clase2)
   }
-  test("equalsWeapon") {
-    var arma = Cristiano.havWeapon()
-    var expected: Boolean = false
-    assertEquals(arma, expected)
-  }
 
+  test("equalsMana") {
+    var mana = Alexis.sayMana()
+    var expected: Int = 90
+    assertEquals(mana, expected)
+  }
   test("NotEqualsMana") {
     var mana1 = Alexis.sayMana()
     var mana2 = Vidal.sayMana()

From 87be12bb796178e7369df13fd1206e5a27abb90a Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 11:55:00 -0400
Subject: [PATCH 080/128] REFACTOR: edited methods 'sayName',
 'sayLife','sayDefence', 'sayWeight', 'sayAttack' in class 'Enemy' in package
 'nonplayable'

---
 src/main/scala/model/nonplayable/Enemy.scala | 24 +++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/model/nonplayable/Enemy.scala b/src/main/scala/model/nonplayable/Enemy.scala
index c152f09..e60c442 100644
--- a/src/main/scala/model/nonplayable/Enemy.scala
+++ b/src/main/scala/model/nonplayable/Enemy.scala
@@ -1,24 +1,26 @@
 package model.nonplayable
 import model.nonplayable.NonPlayable
-class Enemy extends NonPlayable{
+class Enemy(name:String,weight:Int,
+            attack:Int,life:Int,
+            defence:Int) extends NonPlayable{
 
-  def sayName(name: String): String = {
-    return name
+  def sayName():String= {
+    name
   }
 
-  def sayWeight(weight: Int): Int = {
-    return weight
+  def sayWeight(): Int ={
+    weight
   }
 
-  def sayAttack(attack: Int): Int = {
-    return attack
+  def sayAttack(): Int = {
+    attack
   }
 
-  def sayLife(life: Int): Int = {
-    return life
+  def sayLife() : Int = {
+    life
   }
 
-  def sayDefence(defence: Int): Int = {
-    return defence
+  def sayDefence() : Int = {
+    defence
   }
 }

From 369e30faff573fbefbb6b64741b232dce9b27ecc Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 12:00:51 -0400
Subject: [PATCH 081/128] REFACTOR: edited methods 'sayName',
 'sayAttack','sayDefence', 'sayWeight', 'sayOwner' and 'sayMana' in class
 'MagicWeapon' in package 'nonplayable'

---
 .../scala/model/nonplayable/MagicWeapon.scala | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
index e57e559..0a7152d 100644
--- a/src/main/scala/model/nonplayable/MagicWeapon.scala
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -2,24 +2,25 @@ package model.nonplayable
 import model.nonplayable.NonPlayable
 import model.playable.MagicCharacter
 
-class MagicWeapon extends NonPlayable {
-  def sayMagicOwner(magicOwner : MagicCharacter): MagicCharacter = {
-    return magicOwner
+class MagicWeapon(name:String,weight:Int,
+                  attack:Int,mana:Int,
+                  owner: MagicCharacter) extends NonPlayable {
+  def sayMana(): Int ={
+    mana
   }
 
-  def sayMana(mana:Int): Int = {
-    return mana
+  def sayName(): String = {
+    name
   }
 
-  def sayName(name: String): String = {
-    return name
+  def sayWeight(): Int = {
+    weight
   }
 
-  def sayWeight(weight: Int): Int = {
-    return weight
+  def sayAttack() : Int = {
+    attack
   }
-
-  def sayAttack(attack: Int): Int = {
-    return attack
+  def sayOwner(): MagicCharacter = {
+    owner
   }
 }

From 91c9bb8a9b5f7429349c9111c2f60f11f1359ef0 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 12:02:19 -0400
Subject: [PATCH 082/128] REFACTOR: edited methods 'sayName',
 'sayAttack','sayDefence', 'sayWeight', 'sayOwner'  in class 'Weapon' in
 package 'nonplayable'

---
 src/main/scala/model/nonplayable/Weapon.scala | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index be0bfb0..99e95e4 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -1,21 +1,22 @@
 package model.nonplayable
 import model.nonplayable.NonPlayable
 import model.playable.Character
-class Weapon extends NonPlayable {
-  def sayOwner(owner : Character): Character = {
-    return owner
+class Weapon(name:String,weight:Int,
+             attack:Int,owner:Character) extends NonPlayable {
+  def sayOwner() : Character = {
+    owner
   }
 
-  def sayName(name: String): String = {
-    return name
+  def sayName(): String = {
+     name
   }
 
-  def sayWeight(weight: Int): Int = {
-    return weight
+  def sayWeight(): Int = {
+    weight
   }
 
-  def sayAttack(attack: Int): Int = {
-    return attack
+  def sayAttack(): Int = {
+    attack
   }
 
 

From ed6da5e22ca69cd32223b7a47fbf43d0393e8222 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 14:11:11 -0400
Subject: [PATCH 083/128] REFACTOR: edited test
 'equalsName','NotequalsName','equalsLife','NotequalsLife','equalsDefence','NotEqualsDefence','equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack'
 in Test 'EnemyTest'

---
 src/test/scala/EnemyTest.scala | 46 +++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/test/scala/EnemyTest.scala b/src/test/scala/EnemyTest.scala
index 6fd2e6e..602b907 100644
--- a/src/test/scala/EnemyTest.scala
+++ b/src/test/scala/EnemyTest.scala
@@ -2,66 +2,66 @@ import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
 class EnemyTest extends FunSuite {
-  var Neymar: Enemy = _
-  var Bale: Enemy = _
+  var Neymar: NonPlayable = _
+  var Bale: NonPlayable = _
   override def beforeEach(context: BeforeEach): Unit = {
-    Neymar = new Enemy()
-    Bale = new Enemy()
+    Neymar = new Enemy("Neymar",60,90,70,30)
+    Bale = new Enemy("Bale",70,85,75,50)
 
   }
 
   test("equalsEnemyName"){
-    var nombre: String = Neymar.sayName("Neymar")
+    var nombre: String = Neymar.sayName()
     var expected: String = "Neymar"
     assertEquals(nombre,expected)
   }
   test("NotEqualsEnemyName"){
-    var nombre1: String = Neymar.sayName("Neymar")
-    var nombre2: String = Bale.sayName("Bale")
+    var nombre1: String = Neymar.sayName()
+    var nombre2: String = Bale.sayName()
     assertNotEquals(nombre1,nombre2)
   }
   test("equalsWeight") {
-    var peso = Neymar.sayWeight(5)
-    var expected: Int = 5
+    var peso = Neymar.sayWeight()
+    var expected: Int = 60
     assertEquals(peso, expected)
   }
   test("NotEqualsWeight") {
-    var peso1 = Neymar.sayWeight(5)
-    var peso2 = Bale.sayWeight(3)
+    var peso1 = Neymar.sayWeight()
+    var peso2 = Bale.sayWeight()
     assertNotEquals(peso1, peso2)
   }
   test("equalsAttack") {
-    var ataque = Neymar.sayAttack(25)
-    var expected: Int = 25
+    var ataque = Neymar.sayAttack()
+    var expected: Int = 90
     assertEquals(ataque, expected)
 
   }
   test("NotEqualsAttack") {
-    var vida1 = Neymar.sayAttack(25)
-    var vida2 = Bale.sayAttack(20)
+    var vida1 = Neymar.sayAttack()
+    var vida2 = Bale.sayAttack()
     assertNotEquals(vida1, vida2)
 
   }
   test("equalsLife") {
-    var vida = Neymar.sayLife(100)
-    var expected: Int = 100
+    var vida = Neymar.sayLife()
+    var expected: Int = 70
     assertEquals(vida, expected)
 
   }
   test("NotEqualsLife") {
-    var vida1 = Neymar.sayLife(100)
-    var vida2 = Bale.sayLife(90)
+    var vida1 = Neymar.sayLife()
+    var vida2 = Bale.sayLife()
     assertNotEquals(vida1, vida2)
 
   }
   test("equalsDefence") {
-    var defensa = Neymar.sayDefence(10)
-    var expected: Int = 10
+    var defensa = Neymar.sayDefence()
+    var expected: Int = 30
     assertEquals(defensa, expected)
   }
   test("NotEqualsDefence") {
-    var defensa1 = Neymar.sayDefence(10)
-    var defensa2 = Bale.sayDefence(5)
+    var defensa1 = Neymar.sayDefence()
+    var defensa2 = Bale.sayDefence()
     assertNotEquals(defensa1, defensa2)
   }
 }

From ae3d9275f46a04533c72ed435b06578070425053 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 14:15:22 -0400
Subject: [PATCH 084/128] REFACTOR: edited test
 'equalsName','NotequalsName','equalsMana','NotequalsMana','equalsMagicOwner','NotEqualsMagicOwner','equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack'
 in Test 'EnemyTest'

---
 src/test/scala/MagicWeaponTest.scala | 44 ++++++++++++++--------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
index aaedc29..7e83326 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -8,66 +8,66 @@ class MagicWeaponTest extends FunSuite {
   var Vidal: MagicCharacter = _
 
   override def beforeEach(context: BeforeEach): Unit = {
-    Wand = new MagicWeapon()
-    Staff = new MagicWeapon()
-    Alexis = new MagicCharacter()
-    Vidal = new MagicCharacter()
+    Wand = new MagicWeapon("Barita",10,50,50,Alexis)
+    Staff = new MagicWeapon("Baston",15,60,45,Vidal)
+    //Alexis = new MagicCharacter()
+    //Vidal = new MagicCharacter()
 
   }
 
   test("equalsName") {
-    var nombre: String = Wand.sayName("Barita")
+    var nombre: String = Wand.sayName()
     var expected = "Barita"
     assertEquals(nombre, expected)
   }
   test("NotEqualsName") {
-    var nombre1 = Wand.sayName("Barita")
-    var nombre2 = Staff.sayName("Baston")
+    var nombre1 = Wand.sayName()
+    var nombre2 = Staff.sayName()
     assertNotEquals(nombre1, nombre2)
   }
   test("equalsWeight") {
-    var peso = Wand.sayWeight(5)
-    var expected: Int = 5
+    var peso = Wand.sayWeight()
+    var expected: Int = 10
     assertEquals(peso, expected)
   }
   test("NotEqualsWeight") {
-    var peso1 = Wand.sayWeight(5)
-    var peso2 = Staff.sayWeight(3)
+    var peso1 = Wand.sayWeight()
+    var peso2 = Staff.sayWeight()
     assertNotEquals(peso1, peso2)
   }
   test("equalsAttack") {
-    var ataque = Wand.sayAttack(25)
-    var expected: Int = 25
+    var ataque = Wand.sayAttack()
+    var expected: Int = 50
     assertEquals(ataque, expected)
 
   }
   test("NotEqualsAttack") {
-    var vida1 = Wand.sayAttack(25)
-    var vida2 = Staff.sayAttack(20)
+    var vida1 = Wand.sayAttack()
+    var vida2 = Staff.sayAttack()
     assertNotEquals(vida1, vida2)
 
   }
 
   test("equalsMagicOwner") {
-    var dueño: MagicCharacter = Wand.sayMagicOwner(Alexis)
+    var dueño: MagicCharacter = Wand.sayOwner()
     var expected: MagicCharacter = Alexis
     assertEquals(dueño, expected)
   }
 
   test("NotEqualsMagicOwner") {
-    var dueño1: Character = Wand.sayMagicOwner(Alexis)
-    var dueño2: Character = Staff.sayMagicOwner(Vidal)
+    var dueño1: Character = Wand.sayOwner(Alexis)
+    var dueño2: Character = Staff.sayOwner(Vidal)
     assertNotEquals(dueño1, dueño2)
   }
 
   test("equalsMana") {
-    var mana = Wand.sayMana(20)
-    var expected: Int = 20
+    var mana = Wand.sayMana()
+    var expected: Int = 50
     assertEquals(mana, expected)
   }
   test("NotEqualsMana") {
-    var mana1 = Wand.sayMana(20)
-    var mana2 = Staff.sayAttack(30)
+    var mana1 = Wand.sayMana()
+    var mana2 = Staff.sayAttack()
     assertNotEquals(mana1, mana2)
   }
 }
\ No newline at end of file

From d0f854aca486d8a292fb1145bb8c552ae3ecd65c Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 14:17:56 -0400
Subject: [PATCH 085/128] REFACTOR: edited test
 'equalsName','NotequalsName',,'equalsOwner','NotEqualsOwner','equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack'
 in Test 'WeaponTest'

---
 src/test/scala/WeaponTest.scala | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/test/scala/WeaponTest.scala b/src/test/scala/WeaponTest.scala
index bf0d0e5..d6c2e02 100644
--- a/src/test/scala/WeaponTest.scala
+++ b/src/test/scala/WeaponTest.scala
@@ -8,53 +8,53 @@ class WeaponTest extends FunSuite {
   var Messi: Character = _
 
   override def beforeEach(context: BeforeEach): Unit = {
-    Sword = new Weapon()
-    Bow = new Weapon()
-    Cristiano = new Character()
-    Messi = new Character()
+    Sword = new Weapon("Espada",70,100,Cristiano)
+    Bow = new Weapon("Arco",25,50,Messi)
+    //Cristiano = new Character()
+    //Messi = new Character()
   }
 
   test("equalsName") {
-    var nombre: String = Sword.sayName("Espada")
+    var nombre: String = Sword.sayName()
     var expected = "Espada"
     assertEquals(nombre, expected)
   }
   test("NotEqualsName") {
-    var nombre1 = Sword.sayName("Espada")
-    var nombre2 = Bow.sayName("Arco")
+    var nombre1 = Sword.sayName()
+    var nombre2 = Bow.sayName()
     assertNotEquals(nombre1, nombre2)
   }
   test("equalsWeight") {
-    var peso = Sword.sayWeight(5)
-    var expected: Int = 5
+    var peso = Sword.sayWeight()
+    var expected: Int = 70
     assertEquals(peso, expected)
   }
   test("NotEqualsWeight") {
-    var peso1 = Sword.sayWeight(5)
-    var peso2 = Bow.sayWeight(3)
+    var peso1 = Sword.sayWeight()
+    var peso2 = Bow.sayWeight()
     assertNotEquals(peso1, peso2)
   }
   test("equalsAttack") {
-    var ataque = Sword.sayAttack(25)
-    var expected: Int = 25
+    var ataque = Sword.sayAttack()
+    var expected: Int = 100
     assertEquals(ataque, expected)
 
   }
   test("NotEqualsAttack") {
-    var vida1 = Sword.sayAttack(25)
-    var vida2 = Bow.sayAttack(20)
+    var vida1 = Sword.sayAttack()
+    var vida2 = Bow.sayAttack()
     assertNotEquals(vida1, vida2)
 
   }
   test("equalsOwner") {
-    var dueño: Character = Sword.sayOwner(Cristiano)
+    var dueño: Character = Sword.sayOwner()
     var expected: Character = Cristiano
     assertEquals(dueño, expected)
   }
 
   test("NotEqualsOwner") {
-    var dueño1: Character = Sword.sayOwner(Cristiano)
-    var dueño2: Character = Bow.sayOwner(Messi)
+    var dueño1: Character = Sword.sayOwner()
+    var dueño2: Character = Bow.sayOwner()
     assertNotEquals(dueño1, dueño2)
   }
 }

From 36107c031e44d460d10a1ed4e69f733d79ea63b5 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 15:37:19 -0400
Subject: [PATCH 086/128] REFACTOR: override method equals in class 'Character'
 in 'playable' package

---
 src/main/scala/model/playable/Character.scala | 8 +++++++-
 src/test/scala/EnemyTest.scala                | 4 ++--
 src/test/scala/MagicWeaponTest.scala          | 7 ++++---
 src/test/scala/PlayableTest.scala             | 4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index f22308a..c63d9d3 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -27,7 +27,13 @@ class Character(name:String, life:Int,
   def havWeapon(): Boolean = {
     weapon}
 
-
+  override def equals(other: Any): Boolean = {
+    if (other.isInstanceOf[Playable]) {
+      val otherCast = other.asInstanceOf[Character]
+      sayName() == otherCast.sayName() &&
+        sayKind() == otherCast.sayKind()
+    } else false
+  }
 }
 
 
diff --git a/src/test/scala/EnemyTest.scala b/src/test/scala/EnemyTest.scala
index 602b907..1e151e3 100644
--- a/src/test/scala/EnemyTest.scala
+++ b/src/test/scala/EnemyTest.scala
@@ -2,8 +2,8 @@ import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
 class EnemyTest extends FunSuite {
-  var Neymar: NonPlayable = _
-  var Bale: NonPlayable = _
+  var Neymar: Enemy = _
+  var Bale: Enemy = _
   override def beforeEach(context: BeforeEach): Unit = {
     Neymar = new Enemy("Neymar",60,90,70,30)
     Bale = new Enemy("Bale",70,85,75,50)
diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
index 7e83326..88c05fc 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -55,8 +55,8 @@ class MagicWeaponTest extends FunSuite {
   }
 
   test("NotEqualsMagicOwner") {
-    var dueño1: Character = Wand.sayOwner(Alexis)
-    var dueño2: Character = Staff.sayOwner(Vidal)
+    var dueño1: MagicCharacter = Wand.sayOwner()
+    var dueño2: MagicCharacter = Staff.sayOwner()
     assertNotEquals(dueño1, dueño2)
   }
 
@@ -70,4 +70,5 @@ class MagicWeaponTest extends FunSuite {
     var mana2 = Staff.sayAttack()
     assertNotEquals(mana1, mana2)
   }
-}
\ No newline at end of file
+}
+/////probar las clases de los pj con equals nuevo
\ No newline at end of file
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index a0f85cd..571c5a7 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -3,8 +3,8 @@ import model.playable.{Character, MagicCharacter, Playable}
 class PlayableTest extends FunSuite {
   var Cristiano: Playable = _
   var Messi: Playable = _
-  var Alexis: Playable = _
-  var Vidal: Playable = _
+  var Alexis: MagicCharacter = _
+  var Vidal: MagicCharacter = _
   override def beforeEach(context: BeforeEach): Unit = {
     Cristiano = new Character("Cristiano",100,50,70,"Paladin",false)
     Messi = new Character("Messi",90,40,60,"Guerrero",true)

From 0e57eb8f2ee3f85d237f58da086d08d489632e7a Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 15:38:09 -0400
Subject: [PATCH 087/128] REFACTOR: override method equals in class
 'MagicCharacter' in 'playable' package

---
 src/main/scala/model/playable/MagicCharacter.scala | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index 4bf8db8..be22ea8 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -25,7 +25,16 @@ class MagicCharacter(name:String, life:Int,
     weapon
   }
 
-  def sayMana()={mana}
+  def sayMana()={
+    mana
+  }
+  override def equals(other: Any): Boolean = {
+    if (other.isInstanceOf[Playable]) {
+      val otherCast = other.asInstanceOf[MagicCharacter]
+      sayName() == otherCast.sayName() &&
+        sayKind() == otherCast.sayKind()
+    } else false
+  }
 
 
 }

From 9de2508621c30ac3d9c1dc6411e92de91270573a Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 15:44:10 -0400
Subject: [PATCH 088/128] REFACTOR: added test 'equals' and 'NotEquals' in Test
 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 571c5a7..4b44a11 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -1,8 +1,8 @@
 import munit.FunSuite
 import model.playable.{Character, MagicCharacter, Playable}
 class PlayableTest extends FunSuite {
-  var Cristiano: Playable = _
-  var Messi: Playable = _
+  var Cristiano: Character = _
+  var Messi: Character = _
   var Alexis: MagicCharacter = _
   var Vidal: MagicCharacter = _
   override def beforeEach(context: BeforeEach): Unit = {
@@ -12,7 +12,16 @@ class PlayableTest extends FunSuite {
     Vidal = new MagicCharacter("Vidal",90,100,70,"Mago Negro",true,50)
 
   }
-
+  test("equals") {
+    val pj : Character = Cristiano
+    var expected = Cristiano
+    assertEquals(pj, expected)
+  }
+  test("NotEquals") {
+    val pj1 : Character = Cristiano
+    val pj2 : Character = Messi
+    assertNotEquals(pj1, pj2)
+  }
   test("equalsName") {
     var nombre = Cristiano.sayName()
     val expected: String = "Cristiano"

From 06db54ee73a943f04458fbd2e417575ecf0e339b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 15:46:57 -0400
Subject: [PATCH 089/128] REFACTOR: added test 'equalsMagicCharacter' and
 'NotEqualsMagicCharacter' in Test 'PlayableTest'

---
 src/test/scala/PlayableTest.scala | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 4b44a11..f8d2e88 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -97,4 +97,14 @@ class PlayableTest extends FunSuite {
     var clase2 = Vidal.sayKind()
     assertNotEquals(clase1, clase2)
   }
+  test("equalsMagicCharacter") {
+    val pjm: MagicCharacter = Alexis
+    var expected = Alexis
+    assertEquals(pjm, expected)
+  }
+  test("NotEqualsMagicCharacter") {
+    val pjm1: MagicCharacter = Alexis
+    val pjm2 : MagicCharacter = Vidal
+    assertNotEquals(pjm1, pjm2)
+  }
 }
\ No newline at end of file

From 09dd495f26c9e6eb76481cb4382be5baca935cdf Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 16:17:07 -0400
Subject: [PATCH 090/128] REFACTOR: added 4 cast in method equals in class
 'Character' in 'playable' package

---
 src/main/scala/model/playable/Character.scala |  6 +++++-
 src/test/scala/MagicWeaponTest.scala          | 14 +-------------
 src/test/scala/WeaponTest.scala               |  5 -----
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index c63d9d3..14bba87 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -31,7 +31,11 @@ class Character(name:String, life:Int,
     if (other.isInstanceOf[Playable]) {
       val otherCast = other.asInstanceOf[Character]
       sayName() == otherCast.sayName() &&
-        sayKind() == otherCast.sayKind()
+        sayKind() == otherCast.sayKind() &&
+        sayWeight() == otherCast.sayWeight() &&
+        sayLife() == otherCast.sayLife() &&
+        sayDefence() == otherCast.sayDefence()
+
     } else false
   }
 }
diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
index 88c05fc..f9e2404 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -6,6 +6,7 @@ class MagicWeaponTest extends FunSuite {
   var Staff: MagicWeapon = _
   var Alexis: MagicCharacter = _
   var Vidal: MagicCharacter = _
+  var Cristiano: Character = _
 
   override def beforeEach(context: BeforeEach): Unit = {
     Wand = new MagicWeapon("Barita",10,50,50,Alexis)
@@ -47,19 +48,6 @@ class MagicWeaponTest extends FunSuite {
     assertNotEquals(vida1, vida2)
 
   }
-
-  test("equalsMagicOwner") {
-    var dueño: MagicCharacter = Wand.sayOwner()
-    var expected: MagicCharacter = Alexis
-    assertEquals(dueño, expected)
-  }
-
-  test("NotEqualsMagicOwner") {
-    var dueño1: MagicCharacter = Wand.sayOwner()
-    var dueño2: MagicCharacter = Staff.sayOwner()
-    assertNotEquals(dueño1, dueño2)
-  }
-
   test("equalsMana") {
     var mana = Wand.sayMana()
     var expected: Int = 50
diff --git a/src/test/scala/WeaponTest.scala b/src/test/scala/WeaponTest.scala
index d6c2e02..09f2512 100644
--- a/src/test/scala/WeaponTest.scala
+++ b/src/test/scala/WeaponTest.scala
@@ -52,9 +52,4 @@ class WeaponTest extends FunSuite {
     assertEquals(dueño, expected)
   }
 
-  test("NotEqualsOwner") {
-    var dueño1: Character = Sword.sayOwner()
-    var dueño2: Character = Bow.sayOwner()
-    assertNotEquals(dueño1, dueño2)
-  }
 }

From 61dab3e21827a61b1e34496c9fd02ccd69d4041b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 20:36:38 -0400
Subject: [PATCH 091/128] DOC: splited 'PlayableTest' in 'CharacterTest' and
 'MagicCharacterTest'

---
 src/test/scala/MagicCharacterTest.scala | 3 +++
 src/test/scala/PlayableTest.scala       | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 src/test/scala/MagicCharacterTest.scala

diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/MagicCharacterTest.scala
new file mode 100644
index 0000000..0e9dd9f
--- /dev/null
+++ b/src/test/scala/MagicCharacterTest.scala
@@ -0,0 +1,3 @@
+class MagicCharacterTest {
+
+}
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index f8d2e88..12ca415 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -1,6 +1,6 @@
 import munit.FunSuite
 import model.playable.{Character, MagicCharacter, Playable}
-class PlayableTest extends FunSuite {
+class CharacterTest extends FunSuite {
   var Cristiano: Character = _
   var Messi: Character = _
   var Alexis: MagicCharacter = _

From 9736143cbe1b16b10cce3b1b9f7a7b5431ea5dec Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 20:41:02 -0400
Subject: [PATCH 092/128] TEST: added test 'equalsMana','NotEqualsMana',
 'equalsMagicKind',
 'NotEqualsMagicKind','equalsMagicCharacter','NotEqualsMagicCharacter' in
 class 'MagicCharacterTest'

---
 src/test/scala/MagicCharacterTest.scala | 44 +++++++++++++++++++++++--
 src/test/scala/PlayableTest.scala       | 35 +-------------------
 2 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/MagicCharacterTest.scala
index 0e9dd9f..17706f8 100644
--- a/src/test/scala/MagicCharacterTest.scala
+++ b/src/test/scala/MagicCharacterTest.scala
@@ -1,3 +1,43 @@
-class MagicCharacterTest {
+import model.playable.{Character, MagicCharacter}
+import munit.FunSuite
+class MagicCharacterTest extends FunSuite {
+  var Alexis: MagicCharacter = _
+  var Vidal: MagicCharacter = _
 
-}
+  override def beforeEach(context: BeforeEach): Unit = {
+    Alexis = new MagicCharacter("Alexis", 80, 55, 65, "Mago Blanco", false, 90)
+    Vidal = new MagicCharacter("Vidal", 90, 100, 70, "Mago Negro", true, 50)
+
+  }
+
+  test("equalsMana") {
+    var mana = Alexis.sayMana()
+    var expected: Int = 90
+    assertEquals(mana, expected)
+  }
+  test("NotEqualsMana") {
+    var mana1 = Alexis.sayMana()
+    var mana2 = Vidal.sayMana()
+    assertNotEquals(mana1, mana2)
+  }
+  test("equalsMagicKind") {
+    var clase = Alexis.sayKind()
+    var expected: String = "Mago Blanco"
+    assertEquals(clase, expected)
+  }
+  test("NotEqualsMagicKind") {
+    var clase1 = Alexis.sayKind()
+    var clase2 = Vidal.sayKind()
+    assertNotEquals(clase1, clase2)
+  }
+  test("equalsMagicCharacter") {
+    val pjm: MagicCharacter = Alexis
+    var expected = Alexis
+    assertEquals(pjm, expected)
+  }
+  test("NotEqualsMagicCharacter") {
+    val pjm1: MagicCharacter = Alexis
+    val pjm2: MagicCharacter = Vidal
+    assertNotEquals(pjm1, pjm2)
+  }
+}
\ No newline at end of file
diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/PlayableTest.scala
index 12ca415..d278d42 100644
--- a/src/test/scala/PlayableTest.scala
+++ b/src/test/scala/PlayableTest.scala
@@ -3,13 +3,10 @@ import model.playable.{Character, MagicCharacter, Playable}
 class CharacterTest extends FunSuite {
   var Cristiano: Character = _
   var Messi: Character = _
-  var Alexis: MagicCharacter = _
-  var Vidal: MagicCharacter = _
+
   override def beforeEach(context: BeforeEach): Unit = {
     Cristiano = new Character("Cristiano",100,50,70,"Paladin",false)
     Messi = new Character("Messi",90,40,60,"Guerrero",true)
-    Alexis = new MagicCharacter("Alexis",80,55,65,"Mago Blanco",false,90)
-    Vidal = new MagicCharacter("Vidal",90,100,70,"Mago Negro",true,50)
 
   }
   test("equals") {
@@ -77,34 +74,4 @@ class CharacterTest extends FunSuite {
     assertNotEquals(clase1, clase2)
   }
 
-  test("equalsMana") {
-    var mana = Alexis.sayMana()
-    var expected: Int = 90
-    assertEquals(mana, expected)
-  }
-  test("NotEqualsMana") {
-    var mana1 = Alexis.sayMana()
-    var mana2 = Vidal.sayMana()
-    assertNotEquals(mana1, mana2)
-  }
-  test("equalsMagicKind") {
-    var clase = Alexis.sayKind()
-    var expected: String = "Mago Blanco"
-    assertEquals(clase, expected)
-  }
-  test("NotEqualsMagicKind") {
-    var clase1 = Alexis.sayKind()
-    var clase2 = Vidal.sayKind()
-    assertNotEquals(clase1, clase2)
-  }
-  test("equalsMagicCharacter") {
-    val pjm: MagicCharacter = Alexis
-    var expected = Alexis
-    assertEquals(pjm, expected)
-  }
-  test("NotEqualsMagicCharacter") {
-    val pjm1: MagicCharacter = Alexis
-    val pjm2 : MagicCharacter = Vidal
-    assertNotEquals(pjm1, pjm2)
-  }
 }
\ No newline at end of file

From 569f5e0b07ff46ebc8626053547705a89948a9a1 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 20:42:18 -0400
Subject: [PATCH 093/128] REFACTOR: changed name of 'PlayableTest' for
 'CharacterTest' in package test.scala

---
 src/test/scala/{PlayableTest.scala => CharacterTest.scala} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/test/scala/{PlayableTest.scala => CharacterTest.scala} (100%)

diff --git a/src/test/scala/PlayableTest.scala b/src/test/scala/CharacterTest.scala
similarity index 100%
rename from src/test/scala/PlayableTest.scala
rename to src/test/scala/CharacterTest.scala

From 27888b08b85090bdbd406d4f42a3030ec626831d Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 20:48:02 -0400
Subject: [PATCH 094/128] TEST: added test 'equalsName','NotEqualsName' in
 class 'MagicCharacterTest'

---
 src/test/scala/MagicCharacterTest.scala | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/MagicCharacterTest.scala
index 17706f8..5c3413c 100644
--- a/src/test/scala/MagicCharacterTest.scala
+++ b/src/test/scala/MagicCharacterTest.scala
@@ -9,7 +9,18 @@ class MagicCharacterTest extends FunSuite {
     Vidal = new MagicCharacter("Vidal", 90, 100, 70, "Mago Negro", true, 50)
 
   }
+  test("equalsName") {
+    var nombre = Alexis.sayName()
+    val expected: String = "Alexis"
+    assertEquals(nombre, expected)
+  }
+
+  test("NotEqualsName") {
+    var nombre1 = Alexis.sayName()
+    var nombre2 = Vidal.sayName()
+    assertNotEquals(nombre1, nombre2)
 
+  }
   test("equalsMana") {
     var mana = Alexis.sayMana()
     var expected: Int = 90

From f937dde5a6ff6fd7b09d4db54aec4fa909d2e7ce Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 20:49:41 -0400
Subject: [PATCH 095/128] TEST: added test 'equalsLife','NotEqualsLife' in
 class 'MagicCharacterTest'

---
 src/test/scala/MagicCharacterTest.scala | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/MagicCharacterTest.scala
index 5c3413c..1146b71 100644
--- a/src/test/scala/MagicCharacterTest.scala
+++ b/src/test/scala/MagicCharacterTest.scala
@@ -21,6 +21,19 @@ class MagicCharacterTest extends FunSuite {
     assertNotEquals(nombre1, nombre2)
 
   }
+  test("equalsLife") {
+    var vida = Alexis.sayLife()
+    var expected: Int = 80
+    assertEquals(vida, expected)
+
+  }
+  test("NotEqualsLife") {
+    var vida1 = Alexis.sayLife()
+    var vida2 = Vidal.sayLife()
+    assertNotEquals(vida1, vida2)
+
+  }
+
   test("equalsMana") {
     var mana = Alexis.sayMana()
     var expected: Int = 90

From 3987ad6e69ee30e5d39c9a50c82a50d3fcf7ee01 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 20:52:53 -0400
Subject: [PATCH 096/128] TEST: added test 'equalsDefence','NotEqualsDefence',
 'equalsWeight','NotEqualsWeight' in class 'MagicCharacterTest'

---
 src/test/scala/MagicCharacterTest.scala | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/MagicCharacterTest.scala
index 1146b71..fcc9d61 100644
--- a/src/test/scala/MagicCharacterTest.scala
+++ b/src/test/scala/MagicCharacterTest.scala
@@ -33,6 +33,28 @@ class MagicCharacterTest extends FunSuite {
     assertNotEquals(vida1, vida2)
 
   }
+  test("equalsDefence") {
+    var defensa = Alexis.sayDefence()
+    var expected: Int = 55
+    assertEquals(defensa, expected)
+  }
+  test("NotEqualsDefence") {
+    var defensa1 = Alexis.sayDefence()
+    var defensa2 = Vidal.sayDefence()
+    assertNotEquals(defensa1, defensa2)
+  }
+  test("equalsWeight") {
+    var peso = Alexis.sayWeight()
+    var expected: Int = 65
+    assertEquals(peso, expected)
+  }
+  test("NotEqualsWeight") {
+    var peso1 = Alexis.sayWeight()
+    var peso2 = Vidal.sayWeight()
+    assertNotEquals(peso1, peso2)
+  }
+
+
 
   test("equalsMana") {
     var mana = Alexis.sayMana()

From 38554b6970c532302c41074e2bde82fb0a1a0170 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 20:57:07 -0400
Subject: [PATCH 097/128] TEST: added test 'haveWeapon', 'haveNotWeapon' in
 class 'MagicCharacterTest'

---
 src/test/scala/MagicCharacterTest.scala | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/MagicCharacterTest.scala
index fcc9d61..2c5b908 100644
--- a/src/test/scala/MagicCharacterTest.scala
+++ b/src/test/scala/MagicCharacterTest.scala
@@ -54,7 +54,16 @@ class MagicCharacterTest extends FunSuite {
     assertNotEquals(peso1, peso2)
   }
 
-
+  test("haveWeapon") {
+    val w = Vidal.havWeapon()
+    var expected = true
+    assertEquals(w, expected)
+  }
+  test("haveNotWeapon") {
+    val w = Alexis.havWeapon()
+    var expected = false
+    assertEquals(w, expected)
+  }
 
   test("equalsMana") {
     var mana = Alexis.sayMana()

From 5510302bc5d9ec1f553267d67865e4152966b15b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 20:59:02 -0400
Subject: [PATCH 098/128] TEST: added test 'haveWeapon', 'haveNotWeapon' in
 class 'CharacterTest'

---
 src/test/scala/CharacterTest.scala | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/test/scala/CharacterTest.scala b/src/test/scala/CharacterTest.scala
index d278d42..474781b 100644
--- a/src/test/scala/CharacterTest.scala
+++ b/src/test/scala/CharacterTest.scala
@@ -73,5 +73,15 @@ class CharacterTest extends FunSuite {
     var clase2 = Messi.sayKind()
     assertNotEquals(clase1, clase2)
   }
+  test("haveWeapon") {
+    val w = Messi.havWeapon()
+    var expected = true
+    assertEquals(w, expected)
+  }
+  test("haveNotWeapon") {
+    val w = Cristiano.havWeapon()
+    var expected = false
+    assertEquals(w, expected)
+  }
 
 }
\ No newline at end of file

From 46f75bb1e42cbd975bc12d65e5bf917eaebeb3e7 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:01:45 -0400
Subject: [PATCH 099/128] TEST: added test 'equalsMagicOwner' in class
 'MagicWeaponTest'

---
 src/test/scala/MagicWeaponTest.scala | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
index f9e2404..ce04e24 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -15,7 +15,6 @@ class MagicWeaponTest extends FunSuite {
     //Vidal = new MagicCharacter()
 
   }
-
   test("equalsName") {
     var nombre: String = Wand.sayName()
     var expected = "Barita"
@@ -58,5 +57,10 @@ class MagicWeaponTest extends FunSuite {
     var mana2 = Staff.sayAttack()
     assertNotEquals(mana1, mana2)
   }
+
+  test("equalsMagicOwner") {
+    var dueño: MagicCharacter = Wand.sayOwner()
+    var expected: MagicCharacter = Alexis
+    assertEquals(dueño, expected)
+  }
 }
-/////probar las clases de los pj con equals nuevo
\ No newline at end of file

From b032b363bc94c00da1e771e6c9488825e1f17ccd Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:16:47 -0400
Subject: [PATCH 100/128] REFACTOR: added method 'addCharacter' in class
 'Party' in package model

---
 src/main/scala/model/party/Party.scala | 17 +++++++----------
 src/test/scala/MagicWeaponTest.scala   |  3 +--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
index 566969e..053ebd8 100644
--- a/src/main/scala/model/party/Party.scala
+++ b/src/main/scala/model/party/Party.scala
@@ -2,14 +2,11 @@ package model.party
 import model.playable.{Character, MagicCharacter, Playable}
 
 import scala.collection.mutable.Map
-//class Party {
-  //val allies : Map[String, Playable] = Map()
-  //def this(troops: Set[Playable]) = {
-    //this()
-    //for(m <- troops) {appendPlayable(p)}
-  //}
-  //def this (p1: Playable,p2:Playable) = {
-    //this (Set(p1,p2))
-  //}
+class Party {
+  val allies: Map[String, Playable] = Map()
 
-//}
+  // Método para añadir un personaje a la party
+  def addCharacter(character: Playable): Unit = {
+    allies.put(character.sayKind(), character)
+  }
+}
\ No newline at end of file
diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
index ce04e24..22391f0 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -11,8 +11,7 @@ class MagicWeaponTest extends FunSuite {
   override def beforeEach(context: BeforeEach): Unit = {
     Wand = new MagicWeapon("Barita",10,50,50,Alexis)
     Staff = new MagicWeapon("Baston",15,60,45,Vidal)
-    //Alexis = new MagicCharacter()
-    //Vidal = new MagicCharacter()
+
 
   }
   test("equalsName") {

From 8a4edf5d26ab0d9ddb9ee33d13aa29b14d3be0ab Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:17:46 -0400
Subject: [PATCH 101/128] REFACTOR: changed method 'addCharacter' for
 'addPlayable' in class 'Party' in package model

---
 src/main/scala/model/party/Party.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
index 053ebd8..99c514e 100644
--- a/src/main/scala/model/party/Party.scala
+++ b/src/main/scala/model/party/Party.scala
@@ -6,7 +6,7 @@ class Party {
   val allies: Map[String, Playable] = Map()
 
   // Método para añadir un personaje a la party
-  def addCharacter(character: Playable): Unit = {
+  def addPlayable(character: Playable): Unit = {
     allies.put(character.sayKind(), character)
   }
-}
\ No newline at end of file
+  }
\ No newline at end of file

From d1311c13cd2d6f825c3d70d55fba160fd2ba14d4 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:19:07 -0400
Subject: [PATCH 102/128] REFACTOR: changed all instance of var 'character' for
 'pj' in  method 'addCharacter' in class 'Party' in package model

---
 src/main/scala/model/party/Party.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
index 99c514e..298fa7f 100644
--- a/src/main/scala/model/party/Party.scala
+++ b/src/main/scala/model/party/Party.scala
@@ -6,7 +6,7 @@ class Party {
   val allies: Map[String, Playable] = Map()
 
   // Método para añadir un personaje a la party
-  def addPlayable(character: Playable): Unit = {
-    allies.put(character.sayKind(), character)
+  def addPlayable(pj: Playable): Unit = {
+    allies.put(pj.sayKind(), pj)
   }
   }
\ No newline at end of file

From b1abc31d0dfb30187552b2f9027fe0742e9e290b Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:19:57 -0400
Subject: [PATCH 103/128] DOC: added 'PartyTest' in scala.test

---
 src/test/scala/PartyTest.scala | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 src/test/scala/PartyTest.scala

diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
new file mode 100644
index 0000000..094c846
--- /dev/null
+++ b/src/test/scala/PartyTest.scala
@@ -0,0 +1,3 @@
+class PartyTest {
+
+}

From 1759fe3616c7799708cdbfbad0eeb7612c4d4102 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:23:24 -0400
Subject: [PATCH 104/128] FEAT: added var Team1 in PartyTest class

---
 src/test/scala/PartyTest.scala | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index 094c846..9316ab1 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -1,3 +1,10 @@
-class PartyTest {
+import munit.FunSuite
+import model.party.Party
+class PartyTest extends FunSuite {
+  var Team1: Party = _
+
+  override def beforeEach(context: BeforeEach): Unit = {
+    var Team1 = new Party()
+  }
 
 }

From e071223481925de6333267300d881a43d9f42507 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:26:46 -0400
Subject: [PATCH 105/128] FEAT: added var 'Cristiano' and ' Alexis' in
 PartyTest class

---
 src/test/scala/PartyTest.scala | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index 9316ab1..f9d8023 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -1,10 +1,18 @@
 import munit.FunSuite
 import model.party.Party
+import model.playable.{Character,MagicCharacter}
+import model.nonplayable.{Enemy,Weapon,MagicWeapon}
 class PartyTest extends FunSuite {
   var Team1: Party = _
+  var Cristiano: Character = _
+  var Alexis: MagicCharacter = _
 
   override def beforeEach(context: BeforeEach): Unit = {
-    var Team1 = new Party()
+    Team1 = new Party()
+    Cristiano = new Character("Cristiano",100,50,70,"Paladin",false)
+    Alexis = new MagicCharacter("Alexis", 80, 55, 65, "Mago Blanco", false, 90)
+
   }
 
+
 }

From 8d56dc9dad3c9e90568614a51a4ececeee2b1148 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:35:14 -0400
Subject: [PATCH 106/128] TEST: added test 'addPersonaje' in class 'PartyTest'

---
 src/test/scala/PartyTest.scala | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index f9d8023..5924133 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -1,10 +1,10 @@
 import munit.FunSuite
 import model.party.Party
-import model.playable.{Character,MagicCharacter}
+import model.playable.{Character,MagicCharacter,Playable}
 import model.nonplayable.{Enemy,Weapon,MagicWeapon}
 class PartyTest extends FunSuite {
   var Team1: Party = _
-  var Cristiano: Character = _
+  var Cristiano: Playable = _
   var Alexis: MagicCharacter = _
 
   override def beforeEach(context: BeforeEach): Unit = {
@@ -13,6 +13,11 @@ class PartyTest extends FunSuite {
     Alexis = new MagicCharacter("Alexis", 80, 55, 65, "Mago Blanco", false, 90)
 
   }
+  test("addPersonaje") {
+    Team1.addPlayable(Cristiano)
+    val expected: Map[String, Playable] = Map("Paladin" -> Cristiano)
+    assertEquals(Team1.allies.toMap, expected)
+  }
 
 
 }

From 91759f15488d44b58dcb71070e6c6b05e6a6d5cd Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:37:33 -0400
Subject: [PATCH 107/128] TEST: added test 'addMagicCharacter' in class
 'PartyTest' REFACTOR: renamed test 'addPersonaje' for 'addCharacter'

---
 src/test/scala/PartyTest.scala | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index 5924133..25c62ef 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -13,11 +13,15 @@ class PartyTest extends FunSuite {
     Alexis = new MagicCharacter("Alexis", 80, 55, 65, "Mago Blanco", false, 90)
 
   }
-  test("addPersonaje") {
+  test("addCharacter") {
     Team1.addPlayable(Cristiano)
     val expected: Map[String, Playable] = Map("Paladin" -> Cristiano)
     assertEquals(Team1.allies.toMap, expected)
   }
-
+  test("addMagicCharacter") {
+    Team1.addPlayable(Alexis)
+    val expected: Map[String, Playable] = Map("Mago Blanco" -> Alexis)
+    assertEquals(Team1.allies.toMap, expected)
+  }
 
 }

From 652e3d188cec7cf88f4abce7b8077a16009701f3 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:48:42 -0400
Subject: [PATCH 108/128] TEST: added test 'isEmpty' in class 'PartyTest' FEAT:
 added method 'isDefeated'in class 'Party'

---
 src/main/scala/model/party/Party.scala | 11 ++++++++++-
 src/test/scala/PartyTest.scala         |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
index 298fa7f..7018fb4 100644
--- a/src/main/scala/model/party/Party.scala
+++ b/src/main/scala/model/party/Party.scala
@@ -9,4 +9,13 @@ class Party {
   def addPlayable(pj: Playable): Unit = {
     allies.put(pj.sayKind(), pj)
   }
-  }
\ No newline at end of file
+  // Método para verificar si la party está derrotada
+  def isDefeated: Boolean = if (allies.isEmpty) {
+    println("Party Empty")
+    true // La party está vacía, por lo tanto se considera derrotada
+  } else {
+    allies.values.forall(_.sayLife() == 0)
+  }
+
+
+}
\ No newline at end of file
diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index 25c62ef..ad39080 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -23,5 +23,11 @@ class PartyTest extends FunSuite {
     val expected: Map[String, Playable] = Map("Mago Blanco" -> Alexis)
     assertEquals(Team1.allies.toMap, expected)
   }
+  test("isEmpty"){
+    val expected: Boolean = true
+    var state: Boolean = Team1.isDefeated
+    assertEquals(state,expected)
+
+  }
 
 }

From 180262174ab04ea696bad6182bd2dd4baf099c90 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:50:52 -0400
Subject: [PATCH 109/128] TEST: added test 'isDefeat' in class 'PartyTest'

---
 src/test/scala/PartyTest.scala | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index ad39080..94ef7af 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -9,8 +9,8 @@ class PartyTest extends FunSuite {
 
   override def beforeEach(context: BeforeEach): Unit = {
     Team1 = new Party()
-    Cristiano = new Character("Cristiano",100,50,70,"Paladin",false)
-    Alexis = new MagicCharacter("Alexis", 80, 55, 65, "Mago Blanco", false, 90)
+    Cristiano = new Character("Cristiano",0,50,70,"Paladin",false)
+    Alexis = new MagicCharacter("Alexis", 0, 55, 65, "Mago Blanco", false, 90)
 
   }
   test("addCharacter") {
@@ -29,5 +29,10 @@ class PartyTest extends FunSuite {
     assertEquals(state,expected)
 
   }
+  test("isDefeat"){
+    Team1.addPlayable((Cristiano))
+    Team1.addPlayable(Alexis)
+    assertEquals(Team1.isDefeated,true)
+  }
 
 }

From 9a5b5ada59fae14f21de2f88ffa7b87322f0bfbf Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 21:52:41 -0400
Subject: [PATCH 110/128] TEST: added test 'isNotDefeat' in class 'PartyTest'

---
 src/test/scala/PartyTest.scala | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index 94ef7af..84e1460 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -24,9 +24,8 @@ class PartyTest extends FunSuite {
     assertEquals(Team1.allies.toMap, expected)
   }
   test("isEmpty"){
-    val expected: Boolean = true
     var state: Boolean = Team1.isDefeated
-    assertEquals(state,expected)
+    assertEquals(state,true)
 
   }
   test("isDefeat"){
@@ -34,5 +33,11 @@ class PartyTest extends FunSuite {
     Team1.addPlayable(Alexis)
     assertEquals(Team1.isDefeated,true)
   }
+  test("isNotDefeat"){
+    Team1.addPlayable((Cristiano))
+    Alexis = new MagicCharacter("Alexis",100,90,10,"Mago Blanco",false,50)
+    Team1.addPlayable(Alexis)
+    assertEquals(Team1.isDefeated,false)
+  }
 
 }

From 8432f0ebe857c2d837a4185199381b07c1ba7dc7 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:10:19 -0400
Subject: [PATCH 111/128] DOC: Document all my code of 'PartyTest in English.

---
 src/test/scala/PartyTest.scala | 65 ++++++++++++++++++++--------------
 1 file changed, 39 insertions(+), 26 deletions(-)

diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index 84e1460..2bb580a 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -3,41 +3,54 @@ import model.party.Party
 import model.playable.{Character,MagicCharacter,Playable}
 import model.nonplayable.{Enemy,Weapon,MagicWeapon}
 class PartyTest extends FunSuite {
-  var Team1: Party = _
-  var Cristiano: Playable = _
-  var Alexis: MagicCharacter = _
+  var Team1: Party = _ // We declare a variable Team1 of type Party
+  var Cristiano: Playable = _ // We declare a variable Cristiano of type Playable
+  var Alexis: Playable = _ // We declare a variable Alexis of type Playable
+
 
   override def beforeEach(context: BeforeEach): Unit = {
-    Team1 = new Party()
-    Cristiano = new Character("Cristiano",0,50,70,"Paladin",false)
-    Alexis = new MagicCharacter("Alexis", 0, 55, 65, "Mago Blanco", false, 90)
+    Team1 = new Party() // Creates a new instance of the Party class and assigns it to the variable Team1.
+    // Creates a new instance of the Character class with the specified parameters:
+    Cristiano = new Character("Cristiano",0, // - Name: "Cristiano" // - Life: 0
+                                       50,70, // - Defence : 50 // - Weight: 70
+                                       "Paladin",false)  // - Kind: Paladin // - Weapon: false
+
+    // Creates a new instance of the MagicCharacter class with the specified parameters:
+    Alexis = new MagicCharacter("Alexis", 0, // - Name: "Alexis" // - Life: 0
+                                    55, 65, // - Defence : 55 // - Weight: 65
+                                    "Mago Blanco", false, 90) // - Kind: Mago Blanco // - Weapon: false
 
   }
-  test("addCharacter") {
-    Team1.addPlayable(Cristiano)
-    val expected: Map[String, Playable] = Map("Paladin" -> Cristiano)
-    assertEquals(Team1.allies.toMap, expected)
+  test("addCharacter") { // Test the method to add a character
+    Team1.addPlayable(Cristiano) // Add the character Cristiano
+    val expected: Map[String, Playable] = Map("Paladin" -> Cristiano) // The expected variable will be a map with the type and name of the character
+    assertEquals(Team1.allies.toMap, expected) // Compare the result with the Map
   }
-  test("addMagicCharacter") {
-    Team1.addPlayable(Alexis)
-    val expected: Map[String, Playable] = Map("Mago Blanco" -> Alexis)
-    assertEquals(Team1.allies.toMap, expected)
+
+  test("addMagicCharacter") { // Test if the method also works for adding a magic character
+    Team1.addPlayable(Alexis) // Add a magic character, Alexis
+    val expected: Map[String, Playable] = Map("Mago Blanco" -> Alexis) // The expected variable will be a map with the type and name of the character
+    assertEquals(Team1.allies.toMap, expected) // Compare the result with the Map
   }
-  test("isEmpty"){
-    var state: Boolean = Team1.isDefeated
-    assertEquals(state,true)
 
+  test("isEmpty") { // Test if the team is initially empty
+    var state: Boolean = Team1.isDefeated // Create a variable 'state' that stores the result of checking if a party is defeated
+    assertEquals(state, true) // Compare the results
   }
-  test("isDefeat"){
-    Team1.addPlayable((Cristiano))
-    Team1.addPlayable(Alexis)
-    assertEquals(Team1.isDefeated,true)
+  test("isDefeat") { // Test if a party is defeated or not
+    Team1.addPlayable(Cristiano) // Add a character with zero health
+    Team1.addPlayable(Alexis) // Add a magic character with zero health
+    assertEquals(Team1.isDefeated, true) // Check if they are defeated or not (a team with no health is defeated) -> true
   }
-  test("isNotDefeat"){
-    Team1.addPlayable((Cristiano))
-    Alexis = new MagicCharacter("Alexis",100,90,10,"Mago Blanco",false,50)
-    Team1.addPlayable(Alexis)
-    assertEquals(Team1.isDefeated,false)
+  test("isNotDefeat") { // Test if a party is not defeated
+    Team1.addPlayable(Cristiano) // Add a character with zero health
+    Alexis = new MagicCharacter("Alexis", 100, 90, 10, "Mago Blanco", false, 50) // Create a magic character with health not equal to zero
+    Team1.addPlayable(Alexis) // Add that living character
+    assertEquals(Team1.isDefeated, false) // Check that the team is alive (false)
   }
 
+
+
+
+
 }

From a44f810643085f6fc0c2e423408e44533e25f7bb Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:28:38 -0400
Subject: [PATCH 112/128] DOC: Document all my code of 'MagicCharacterTest' and
 'CharacterTest' in English.

---
 src/test/scala/CharacterTest.scala      | 135 +++++++++++---------
 src/test/scala/MagicCharacterTest.scala | 162 +++++++++++++-----------
 src/test/scala/PartyTest.scala          |   4 +-
 3 files changed, 165 insertions(+), 136 deletions(-)

diff --git a/src/test/scala/CharacterTest.scala b/src/test/scala/CharacterTest.scala
index 474781b..d03c167 100644
--- a/src/test/scala/CharacterTest.scala
+++ b/src/test/scala/CharacterTest.scala
@@ -1,87 +1,100 @@
 import munit.FunSuite
 import model.playable.{Character, MagicCharacter, Playable}
 class CharacterTest extends FunSuite {
-  var Cristiano: Character = _
-  var Messi: Character = _
+  var Cristiano: Character = _ // We declare a variable Cristiano of type Character
+  var Messi: Character = _ // We declare a variable Messi of type Character
 
   override def beforeEach(context: BeforeEach): Unit = {
-    Cristiano = new Character("Cristiano",100,50,70,"Paladin",false)
-    Messi = new Character("Messi",90,40,60,"Guerrero",true)
+    // Creates a new instance of the Character class with the specified parameters:
+    Cristiano = new Character("Cristiano",100,50 // - Name: Cristiano // - Life: 100 // - Defence : 50
+                             ,70,"Paladin",false) // - Weight: 70 // - Kind: Paladin // - Weapon: false
+    // Creates a new instance of the Character class with the specified parameters:
+    Messi = new Character("Messi",90,40, // - Name: Messi // - Life: 90 // - Defence : 40
+                         60,"Guerrero",true) // - Weight: 60 // - Kind: Guerrero // - Weapon: true
 
   }
-  test("equals") {
-    val pj : Character = Cristiano
-    var expected = Cristiano
-    assertEquals(pj, expected)
+  test("equals") { // Test if two references to the same character are equal
+    val character: Character = Cristiano // Create a reference to the character Cristiano and assign it to the variable 'character'
+    var expected = Cristiano // Define the expected value as the character Cristiano
+    assertEquals(character, expected) // Compare the actual reference with the expected value
   }
-  test("NotEquals") {
-    val pj1 : Character = Cristiano
-    val pj2 : Character = Messi
-    assertNotEquals(pj1, pj2)
-  }
-  test("equalsName") {
-    var nombre = Cristiano.sayName()
-    val expected: String = "Cristiano"
-    assertEquals(nombre, expected)
+
+  test("NotEquals") { // Test if two references to different characters are not equal
+    val character1: Character = Cristiano // Create a reference to the character Cristiano and assign it to the variable 'character1'
+    val character2: Character = Messi // Create a reference to the character Messi and assign it to the variable 'character2'
+    assertNotEquals(character1, character2) // Assert that the references to Cristiano and Messi are not equal
   }
 
-  test("NotEqualsName") {
-    var nombre1 = Cristiano.sayName()
-    var nombre2 = Messi.sayName()
-    assertNotEquals(nombre1, nombre2)
+  test("equalsName") { // Test if the returned name value for a character matches the expected value
+    var name = Cristiano.sayName() // Retrieve the name value of the character Cristiano and store it in the 'name' variable
+    val expected: String = "Cristiano" // Define the expected name value
+    assertEquals(name, expected) // Compare the actual name value with the expected value
+  }
 
+  test("NotEqualsName") { // Test if the name values of two different characters are not equal
+    var name1 = Cristiano.sayName() // Retrieve the name value of the character Cristiano and store it in the 'name1' variable
+    var name2 = Messi.sayName() // Retrieve the name value of the character Messi and store it in the 'name2' variable
+    assertNotEquals(name1, name2) // Assert that the name values of Cristiano and Messi are not equal
   }
-  test("equalsLife") {
-    var vida = Cristiano.sayLife()
-    var expected: Int = 100
-    assertEquals(vida, expected)
 
+  test("equalsLife") { // Test if the returned life value for a character matches the expected value
+    var life = Cristiano.sayLife() // Retrieve the life value of the character Cristiano and store it in the 'life' variable
+    var expected: Int = 100 // Define the expected life value
+    assertEquals(life, expected) // Compare the actual life value with the expected value
   }
-  test("NotEqualsLife") {
-    var vida1 = Cristiano.sayLife()
-    var vida2 = Messi.sayLife()
-    assertNotEquals(vida1, vida2)
 
+  test("NotEqualsLife") { // Test if the life values of two different characters are not equal
+    var life1 = Cristiano.sayLife() // Retrieve the life value of the character Cristiano and store it in the 'life1' variable
+    var life2 = Messi.sayLife() // Retrieve the life value of the character Messi and store it in the 'life2' variable
+    assertNotEquals(life1, life2) // Assert that the life values of Cristiano and Messi are not equal
   }
-  test("equalsDefence") {
-    var defensa = Cristiano.sayDefence()
-    var expected: Int = 50
-    assertEquals(defensa, expected)
+  test("equalsDefence") { // Test if the returned defense value for a character matches the expected value
+    var defense = Cristiano.sayDefence() // Retrieve the defense value of the character Cristiano and store it in the 'defense' variable
+    var expected: Int = 50 // Define the expected defense value
+    assertEquals(defense, expected) // Compare the actual defense value with the expected value
   }
-  test("NotEqualsDefence") {
-    var defensa1 = Cristiano.sayDefence()
-    var defensa2 = Messi.sayDefence()
-    assertNotEquals(defensa1, defensa2)
+
+  test("NotEqualsDefence") { // Test if the defense values of two different characters are not equal
+    var defense1 = Cristiano.sayDefence() // Retrieve the defense value of the character Cristiano and store it in the 'defense1' variable
+    var defense2 = Messi.sayDefence() // Retrieve the defense value of the character Messi and store it in the 'defense2' variable
+    assertNotEquals(defense1, defense2) // Assert that the defense values of Cristiano and Messi are not equal
   }
-  test("equalsWeight") {
-    var peso = Cristiano.sayWeight()
-    var expected: Int = 70
-    assertEquals(peso, expected)
+
+  test("equalsWeight") { // Test if the returned weight value for a character matches the expected value
+    var weight = Cristiano.sayWeight() // Retrieve the weight value of the character Cristiano and store it in the 'weight' variable
+    var expected: Int = 70 // Define the expected weight value
+    assertEquals(weight, expected) // Compare the actual weight value with the expected value
   }
-  test("NotEqualsWeight") {
-    var peso1 = Cristiano.sayWeight()
-    var peso2 = Messi.sayWeight()
-    assertNotEquals(peso1, peso2)
+
+  test("NotEqualsWeight") { // Test if the weight values of two different characters are not equal
+    var weight1 = Cristiano.sayWeight() // Retrieve the weight value of the character Cristiano and store it in the 'weight1' variable
+    var weight2 = Messi.sayWeight() // Retrieve the weight value of the character Messi and store it in the 'weight2' variable
+    assertNotEquals(weight1, weight2) // Assert that the weight values of Cristiano and Messi are not equal
   }
-  test("equalsKind") {
-    var clase = Cristiano.sayKind()
-    var expected: String = "Paladin"
-    assertEquals(clase, expected)
+
+  test("equalsKind") { // Test if the returned kind value for a character matches the expected value
+    var kind = Cristiano.sayKind() // Retrieve the kind value of the character Cristiano and store it in the 'kind' variable
+    var expected: String = "Paladin" // Define the expected kind value
+    assertEquals(kind, expected) // Compare the actual kind value with the expected value
   }
-  test("NotEqualsKind") {
-    var clase1 = Cristiano.sayKind()
-    var clase2 = Messi.sayKind()
-    assertNotEquals(clase1, clase2)
+
+  test("NotEqualsKind") { // Test if the kind values of two different characters are not equal
+    var kind1 = Cristiano.sayKind() // Retrieve the kind value of the character Cristiano and store it in the 'kind1' variable
+    var kind2 = Messi.sayKind() // Retrieve the kind value of the character Messi and store it in the 'kind2' variable
+    assertNotEquals(kind1, kind2) // Assert that the kind values of Cristiano and Messi are not equal
   }
-  test("haveWeapon") {
-    val w = Messi.havWeapon()
-    var expected = true
-    assertEquals(w, expected)
+
+  test("haveWeapon") { // Test if the character Messi has a weapon
+    val hasWeapon = Messi.havWeapon() // Check if the character Messi has a weapon and store the result in the 'hasWeapon' variable
+    var expected = true // Define the expected value indicating that Messi has a weapon
+    assertEquals(hasWeapon, expected) // Compare the actual result with the expected value
   }
-  test("haveNotWeapon") {
-    val w = Cristiano.havWeapon()
-    var expected = false
-    assertEquals(w, expected)
+
+  test("haveNotWeapon") { // Test if the character Cristiano doesn't have a weapon
+    val hasWeapon = Cristiano.havWeapon() // Check if the character Cristiano has a weapon and store the result in the 'hasWeapon' variable
+    var expected = false // Define the expected value indicating that Cristiano doesn't have a weapon
+    assertEquals(hasWeapon, expected) // Compare the actual result with the expected value
   }
 
+
 }
\ No newline at end of file
diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/MagicCharacterTest.scala
index 2c5b908..8b64a75 100644
--- a/src/test/scala/MagicCharacterTest.scala
+++ b/src/test/scala/MagicCharacterTest.scala
@@ -1,98 +1,114 @@
-import model.playable.{Character, MagicCharacter}
+import model.playable.{Character, MagicCharacter,Playable}
 import munit.FunSuite
 class MagicCharacterTest extends FunSuite {
-  var Alexis: MagicCharacter = _
-  var Vidal: MagicCharacter = _
+  var Alexis: MagicCharacter = _ // We declare a variable Cristiano of type MagicCharacter
+  var Vidal: MagicCharacter = _ // We declare a variable Cristiano of type MagicCharacter
 
   override def beforeEach(context: BeforeEach): Unit = {
-    Alexis = new MagicCharacter("Alexis", 80, 55, 65, "Mago Blanco", false, 90)
-    Vidal = new MagicCharacter("Vidal", 90, 100, 70, "Mago Negro", true, 50)
+    // Creates a new instance of the Magic Character class with the specified parameters:
+    Alexis = new MagicCharacter("Alexis", 80, // - Name: Alexis // - Life: 80
+                                      55, 65, // - Defence : 55 // - Weight: 65
+                                      "Mago Blanco", false, 90) // - Kind: Mago Blanco // - Weapon: false
+    // Creates a new instance of the Magic Character class with the specified parameters:
+    Vidal = new MagicCharacter("Vidal", 90, // - Name: Vidal // - Life: 90
+                                   100, 70, // - Defence : 100 // - Weight: 70
+                                   "Mago Negro", true, 50) // - Kind: Mago Negro // - Weapon: true
 
   }
-  test("equalsName") {
-    var nombre = Alexis.sayName()
-    val expected: String = "Alexis"
-    assertEquals(nombre, expected)
+  test("equalsName") { // Test if the sayName method behaves correctly
+    var name = Alexis.sayName() // Store the name of the character in the 'name' variable
+    val expected: String = "Alexis" // Declare the variable for comparison
+    assertEquals(name, expected) // Compare the results
   }
 
-  test("NotEqualsName") {
-    var nombre1 = Alexis.sayName()
-    var nombre2 = Vidal.sayName()
-    assertNotEquals(nombre1, nombre2)
 
+  test("NotEqualsName") { // Test if the names returned by the sayName method for two different characters are not equal
+    var name1 = Alexis.sayName() // Store the name of the first character in the 'name1' variable
+    var name2 = Vidal.sayName() // Store the name of the second character in the 'name2' variable
+    assertNotEquals(name1, name2) // Assert that the two names are not equal
+  }
+  test("equalsLife") { // Test if the returned life value for a character matches the expected value
+    var life = Alexis.sayLife() // Retrieve the life value of the character Alexis and store it in the 'life' variable
+    var expected: Int = 80 // Define the expected life value
+    assertEquals(life, expected) // Compare the actual life value with the expected value
+  }
+  test("NotEqualsLife") { // Test if the life values of two different characters are not equal
+    var life1 = Alexis.sayLife() // Retrieve the life value of the character Alexis and store it in the 'life1' variable
+    var life2 = Vidal.sayLife() // Retrieve the life value of the character Vidal and store it in the 'life2' variable
+    assertNotEquals(life1, life2) // Assert that the life values of Alexis and Vidal are not equal
+  }
+  test("equalsDefence") { // Test if the returned defense value for a character matches the expected value
+    var defense = Alexis.sayDefence() // Retrieve the defense value of the character Alexis and store it in the 'defense' variable
+    var expected: Int = 55 // Define the expected defense value
+    assertEquals(defense, expected) // Compare the actual defense value with the expected value
+  }
+  test("NotEqualsDefence") { // Test if the defense values of two different characters are not equal
+    var defense1 = Alexis.sayDefence() // Retrieve the defense value of the character Alexis and store it in the 'defense1' variable
+    var defense2 = Vidal.sayDefence() // Retrieve the defense value of the character Vidal and store it in the 'defense2' variable
+    assertNotEquals(defense1, defense2) // Assert that the defense values of Alexis and Vidal are not equal
   }
-  test("equalsLife") {
-    var vida = Alexis.sayLife()
-    var expected: Int = 80
-    assertEquals(vida, expected)
 
+  test("equalsWeight") { // Test if the returned weight value for a character matches the expected value
+    var weight = Alexis.sayWeight() // Retrieve the weight value of the character Alexis and store it in the 'weight' variable
+    var expected: Int = 65 // Define the expected weight value
+    assertEquals(weight, expected) // Compare the actual weight value with the expected value
   }
-  test("NotEqualsLife") {
-    var vida1 = Alexis.sayLife()
-    var vida2 = Vidal.sayLife()
-    assertNotEquals(vida1, vida2)
 
-  }
-  test("equalsDefence") {
-    var defensa = Alexis.sayDefence()
-    var expected: Int = 55
-    assertEquals(defensa, expected)
-  }
-  test("NotEqualsDefence") {
-    var defensa1 = Alexis.sayDefence()
-    var defensa2 = Vidal.sayDefence()
-    assertNotEquals(defensa1, defensa2)
-  }
-  test("equalsWeight") {
-    var peso = Alexis.sayWeight()
-    var expected: Int = 65
-    assertEquals(peso, expected)
-  }
-  test("NotEqualsWeight") {
-    var peso1 = Alexis.sayWeight()
-    var peso2 = Vidal.sayWeight()
-    assertNotEquals(peso1, peso2)
+  test("NotEqualsWeight") { // Test if the weight values of two different characters are not equal
+    var weight1 = Alexis.sayWeight() // Retrieve the weight value of the character Alexis and store it in the 'weight1' variable
+    var weight2 = Vidal.sayWeight() // Retrieve the weight value of the character Vidal and store it in the 'weight2' variable
+    assertNotEquals(weight1, weight2) // Assert that the weight values of Alexis and Vidal are not equal
   }
 
-  test("haveWeapon") {
-    val w = Vidal.havWeapon()
-    var expected = true
-    assertEquals(w, expected)
+  test("haveWeapon") { // Test if the character Vidal has a weapon
+    val hasWeapon = Vidal.havWeapon() // Check if the character Vidal has a weapon and store the result in the 'hasWeapon' variable
+    var expected = true // Define the expected value indicating that Vidal has a weapon
+    assertEquals(hasWeapon, expected) // Compare the actual result with the expected value
   }
-  test("haveNotWeapon") {
-    val w = Alexis.havWeapon()
-    var expected = false
-    assertEquals(w, expected)
+
+  test("haveNotWeapon") { // Test if the character Alexis doesn't have a weapon
+    val hasWeapon = Alexis.havWeapon() // Check if the character Alexis has a weapon and store the result in the 'hasWeapon' variable
+    var expected = false // Define the expected value indicating that Alexis doesn't have a weapon
+    assertEquals(hasWeapon, expected) // Compare the actual result with the expected value
   }
 
-  test("equalsMana") {
-    var mana = Alexis.sayMana()
-    var expected: Int = 90
-    assertEquals(mana, expected)
+  test("equalsMana") { // Test if the returned mana value for a character matches the expected value
+    var mana = Alexis.sayMana() // Retrieve the mana value of the character Alexis and store it in the 'mana' variable
+    var expected: Int = 90 // Define the expected mana value
+    assertEquals(mana, expected) // Compare the actual mana value with the expected value
   }
-  test("NotEqualsMana") {
-    var mana1 = Alexis.sayMana()
-    var mana2 = Vidal.sayMana()
-    assertNotEquals(mana1, mana2)
+
+  test("NotEqualsMana") { // Test if the mana values of two different characters are not equal
+    var mana1 = Alexis.sayMana() // Retrieve the mana value of the character Alexis and store it in the 'mana1' variable
+    var mana2 = Vidal.sayMana() // Retrieve the mana value of the character Vidal and store it in the 'mana2' variable
+    assertNotEquals(mana1, mana2) // Assert that the mana values of Alexis and Vidal are not equal
   }
-  test("equalsMagicKind") {
-    var clase = Alexis.sayKind()
-    var expected: String = "Mago Blanco"
-    assertEquals(clase, expected)
+
+  test("equalsMagicKind") { // Test if the returned magic kind for a character matches the expected value
+    var magicKind = Alexis.sayKind() // Retrieve the magic kind of the character Alexis and store it in the 'magicKind' variable
+    var expected: String = "Mago Blanco" // Define the expected magic kind
+    assertEquals(magicKind, expected) // Compare the actual magic kind with the expected value
   }
-  test("NotEqualsMagicKind") {
-    var clase1 = Alexis.sayKind()
-    var clase2 = Vidal.sayKind()
-    assertNotEquals(clase1, clase2)
+
+  test("NotEqualsMagicKind") { // Test if the magic kinds of two different characters are not equal
+    var magicKind1 = Alexis.sayKind() // Retrieve the magic kind of the character Alexis and store it in the 'magicKind1' variable
+    var magicKind2 = Vidal.sayKind() // Retrieve the magic kind of the character Vidal and store it in the 'magicKind2' variable
+    assertNotEquals(magicKind1, magicKind2) // Assert that the magic kinds of Alexis and Vidal are not equal
   }
-  test("equalsMagicCharacter") {
-    val pjm: MagicCharacter = Alexis
-    var expected = Alexis
-    assertEquals(pjm, expected)
+
+  test("equalsMagicCharacter") { // Test if two references to the same magic character are equal
+    val pmc: MagicCharacter = Alexis // Create a reference to the character Alexis and assign it to the variable 'pmc'
+    var expected = Alexis // Define the expected value as the character Alexis
+    assertEquals(pmc, expected) // Compare the actual reference with the expected value
   }
-  test("NotEqualsMagicCharacter") {
-    val pjm1: MagicCharacter = Alexis
-    val pjm2: MagicCharacter = Vidal
-    assertNotEquals(pjm1, pjm2)
+
+  test("NotEqualsMagicCharacter") { // Test if two references to different magic characters are not equal
+    val pmc1: MagicCharacter = Alexis // Create a reference to the character Alexis and assign it to the variable 'pmc1'
+    val pmc2: MagicCharacter = Vidal // Create a reference to the character Vidal and assign it to the variable 'pmc2'
+    assertNotEquals(pmc1, pmc2) // Assert that the references to Alexis and Vidal are not equal
   }
+
+
+
+
 }
\ No newline at end of file
diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index 2bb580a..bd965a2 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -11,12 +11,12 @@ class PartyTest extends FunSuite {
   override def beforeEach(context: BeforeEach): Unit = {
     Team1 = new Party() // Creates a new instance of the Party class and assigns it to the variable Team1.
     // Creates a new instance of the Character class with the specified parameters:
-    Cristiano = new Character("Cristiano",0, // - Name: "Cristiano" // - Life: 0
+    Cristiano = new Character("Cristiano",0, // - Name: Cristiano // - Life: 0
                                        50,70, // - Defence : 50 // - Weight: 70
                                        "Paladin",false)  // - Kind: Paladin // - Weapon: false
 
     // Creates a new instance of the MagicCharacter class with the specified parameters:
-    Alexis = new MagicCharacter("Alexis", 0, // - Name: "Alexis" // - Life: 0
+    Alexis = new MagicCharacter("Alexis", 0, // - Name: Alexis // - Life: 0
                                     55, 65, // - Defence : 55 // - Weight: 65
                                     "Mago Blanco", false, 90) // - Kind: Mago Blanco // - Weapon: false
 

From 1f336d77e4d4f90a56946ca331319f14f46dbe69 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:32:47 -0400
Subject: [PATCH 113/128] DOC: Document all my code of 'WeaponTest' in English.

---
 src/test/scala/WeaponTest.scala | 80 ++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/test/scala/WeaponTest.scala b/src/test/scala/WeaponTest.scala
index 09f2512..64208dc 100644
--- a/src/test/scala/WeaponTest.scala
+++ b/src/test/scala/WeaponTest.scala
@@ -2,54 +2,60 @@ import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
 class WeaponTest extends FunSuite {
-  var Sword: Weapon = _
-  var Bow: Weapon = _
-  var Cristiano: Character = _
-  var Messi: Character = _
+  var Sword: Weapon = _ // We declare a variable Sword of type Weapon
+  var Bow: Weapon = _ // We declare a variable Bow of type Weapon
+  var Cristiano: Character = _ // We declare a variable Cristiano of type Character
+  var Messi: Character = _ // We declare a variable Messi of type Character
 
   override def beforeEach(context: BeforeEach): Unit = {
-    Sword = new Weapon("Espada",70,100,Cristiano)
-    Bow = new Weapon("Arco",25,50,Messi)
-    //Cristiano = new Character()
-    //Messi = new Character()
-  }
+    // Creates a new instance of the Weapon class with the specified parameters:
+    Sword = new Weapon("Espada",70,100,Cristiano) // -Name : Espada // - Weight: 70 // - Attack: 100 // - Owner : Cristiano
+    // Creates a new instance of the Weapon class with the specified parameters:
+    Bow = new Weapon("Arco",25,50,Messi) // -Name : Arco // - Weight: 25 // - Attack: 50 // - Owner : Messi
 
-  test("equalsName") {
-    var nombre: String = Sword.sayName()
-    var expected = "Espada"
-    assertEquals(nombre, expected)
   }
-  test("NotEqualsName") {
-    var nombre1 = Sword.sayName()
-    var nombre2 = Bow.sayName()
-    assertNotEquals(nombre1, nombre2)
+  test("equalsName") { // Test if the returned name value for a sword matches the expected value
+    var name: String = Sword.sayName() // Retrieve the name value of the sword and store it in the 'name' variable
+    var expected = "Espada" // Define the expected name value
+    assertEquals(name, expected) // Compare the actual name value with the expected value
+  }
+
+  test("NotEqualsName") { // Test if the name values of two different weapons are not equal
+    var name1 = Sword.sayName() // Retrieve the name value of the sword and store it in the 'name1' variable
+    var name2 = Bow.sayName() // Retrieve the name value of the bow and store it in the 'name2' variable
+    assertNotEquals(name1, name2) // Assert that the name values of the sword and the bow are not equal
   }
-  test("equalsWeight") {
-    var peso = Sword.sayWeight()
-    var expected: Int = 70
-    assertEquals(peso, expected)
+
+  test("equalsWeight") { // Test if the returned weight value for a sword matches the expected value
+    var weight = Sword.sayWeight() // Retrieve the weight value of the sword and store it in the 'weight' variable
+    var expected: Int = 70 // Define the expected weight value
+    assertEquals(weight, expected) // Compare the actual weight value with the expected value
   }
-  test("NotEqualsWeight") {
-    var peso1 = Sword.sayWeight()
-    var peso2 = Bow.sayWeight()
-    assertNotEquals(peso1, peso2)
+
+  test("NotEqualsWeight") { // Test if the weight values of two different weapons are not equal
+    var weight1 = Sword.sayWeight() // Retrieve the weight value of the sword and store it in the 'weight1' variable
+    var weight2 = Bow.sayWeight() // Retrieve the weight value of the bow and store it in the 'weight2' variable
+    assertNotEquals(weight1, weight2) // Assert that the weight values of the sword and the bow are not equal
   }
-  test("equalsAttack") {
-    var ataque = Sword.sayAttack()
-    var expected: Int = 100
-    assertEquals(ataque, expected)
 
+  test("equalsAttack") { // Test if the returned attack value for a sword matches the expected value
+    var attack = Sword.sayAttack() // Retrieve the attack value of the sword and store it in the 'attack' variable
+    var expected: Int = 100 // Define the expected attack value
+    assertEquals(attack, expected) // Compare the actual attack value with the expected value
   }
-  test("NotEqualsAttack") {
-    var vida1 = Sword.sayAttack()
-    var vida2 = Bow.sayAttack()
-    assertNotEquals(vida1, vida2)
 
+  test("NotEqualsAttack") { // Test if the attack values of two different weapons are not equal
+    var attack1 = Sword.sayAttack() // Retrieve the attack value of the sword and store it in the 'attack1' variable
+    var attack2 = Bow.sayAttack() // Retrieve the attack value of the bow and store it in the 'attack2' variable
+    assertNotEquals(attack1, attack2) // Assert that the attack values of the sword and the bow are not equal
   }
-  test("equalsOwner") {
-    var dueño: Character = Sword.sayOwner()
-    var expected: Character = Cristiano
-    assertEquals(dueño, expected)
+
+  test("equalsOwner") { // Test if the returned owner character for a sword matches the expected character
+    var owner: Character = Sword.sayOwner() // Retrieve the owner character of the sword and store it in the 'owner' variable
+    var expected: Character = Cristiano // Define the expected owner character
+    assertEquals(owner, expected) // Compare the actual owner character with the expected character
   }
 
+
+
 }

From abff0e61e24662d4da6da9379ff2f5f3511665bb Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:36:43 -0400
Subject: [PATCH 114/128] DOC: Document all my code of 'EnemyTest' in English.

---
 src/test/scala/EnemyTest.scala | 97 ++++++++++++++++++----------------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/src/test/scala/EnemyTest.scala b/src/test/scala/EnemyTest.scala
index 1e151e3..d6ce2c9 100644
--- a/src/test/scala/EnemyTest.scala
+++ b/src/test/scala/EnemyTest.scala
@@ -2,67 +2,74 @@ import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
 class EnemyTest extends FunSuite {
-  var Neymar: Enemy = _
-  var Bale: Enemy = _
+  var Neymar: Enemy = _ // We declare a variable Neymar of type Enemy
+  var Bale: Enemy = _ // We declare a variable Bale of type Enemy
+
   override def beforeEach(context: BeforeEach): Unit = {
-    Neymar = new Enemy("Neymar",60,90,70,30)
-    Bale = new Enemy("Bale",70,85,75,50)
+    // Creates a new instance of the Enemy class with the specified parameters:
+    Neymar = new Enemy("Neymar", 60, 90, 70, 30) // -Name : Neymar // - Weight: 60 // - Attack: 90 // - Life: 70 // - Defence: 30
+    // Creates a new instance of the Enemy class with the specified parameters:
+    Bale = new Enemy("Bale", 70, 85, 75, 50) // -Name : Bale // - Weight: 70 // - Attack: 85 // - Life: 75 // - Defence: 50
 
   }
 
-  test("equalsEnemyName"){
-    var nombre: String = Neymar.sayName()
-    var expected: String = "Neymar"
-    assertEquals(nombre,expected)
+  test("equalsEnemyName") { // Test if the returned name value for an enemy matches the expected value
+    var name: String = Neymar.sayName() // Retrieve the name value of the enemy Neymar and store it in the 'name' variable
+    var expected: String = "Neymar" // Define the expected name value
+    assertEquals(name, expected) // Compare the actual name value with the expected value
   }
-  test("NotEqualsEnemyName"){
-    var nombre1: String = Neymar.sayName()
-    var nombre2: String = Bale.sayName()
-    assertNotEquals(nombre1,nombre2)
+
+  test("NotEqualsEnemyName") { // Test if the name values of two different enemies are not equal
+    var name1: String = Neymar.sayName() // Retrieve the name value of the enemy Neymar and store it in the 'name1' variable
+    var name2: String = Bale.sayName() // Retrieve the name value of the enemy Bale and store it in the 'name2' variable
+    assertNotEquals(name1, name2) // Assert that the name values of Neymar and Bale are not equal
   }
-  test("equalsWeight") {
-    var peso = Neymar.sayWeight()
-    var expected: Int = 60
-    assertEquals(peso, expected)
+
+  test("equalsWeight") { // Test if the returned weight value for an enemy matches the expected value
+    var weight = Neymar.sayWeight() // Retrieve the weight value of the enemy Neymar and store it in the 'weight' variable
+    var expected: Int = 60 // Define the expected weight value
+    assertEquals(weight, expected) // Compare the actual weight value with the expected value
   }
-  test("NotEqualsWeight") {
-    var peso1 = Neymar.sayWeight()
-    var peso2 = Bale.sayWeight()
-    assertNotEquals(peso1, peso2)
+
+  test("NotEqualsWeight") { // Test if the weight values of two different enemies are not equal
+    var weight1 = Neymar.sayWeight() // Retrieve the weight value of the enemy Neymar and store it in the 'weight1' variable
+    var weight2 = Bale.sayWeight() // Retrieve the weight value of the enemy Bale and store it in the 'weight2' variable
+    assertNotEquals(weight1, weight2) // Assert that the weight values of Neymar and Bale are not equal
   }
-  test("equalsAttack") {
-    var ataque = Neymar.sayAttack()
-    var expected: Int = 90
-    assertEquals(ataque, expected)
 
+  test("equalsAttack") { // Test if the returned attack value for an enemy matches the expected value
+    var attack = Neymar.sayAttack() // Retrieve the attack value of the enemy Neymar and store it in the 'attack' variable
+    var expected: Int = 90 // Define the expected attack value
+    assertEquals(attack, expected) // Compare the actual attack value with the expected value
   }
-  test("NotEqualsAttack") {
-    var vida1 = Neymar.sayAttack()
-    var vida2 = Bale.sayAttack()
-    assertNotEquals(vida1, vida2)
 
+  test("NotEqualsAttack") { // Test if the attack values of two different enemies are not equal
+    var attack1 = Neymar.sayAttack() // Retrieve the attack value of the enemy Neymar and store it in the 'attack1' variable
+    var attack2 = Bale.sayAttack() // Retrieve the attack value of the enemy Bale and store it in the 'attack2' variable
+    assertNotEquals(attack1, attack2) // Assert that the attack values of Neymar and Bale are not equal
   }
-  test("equalsLife") {
-    var vida = Neymar.sayLife()
-    var expected: Int = 70
-    assertEquals(vida, expected)
 
+  test("equalsLife") { // Test if the returned life value for an enemy matches the expected value
+    var life = Neymar.sayLife() // Retrieve the life value of the enemy Neymar and store it in the 'life' variable
+    var expected: Int = 70 // Define the expected life value
+    assertEquals(life, expected) // Compare the actual life value with the expected value
   }
-  test("NotEqualsLife") {
-    var vida1 = Neymar.sayLife()
-    var vida2 = Bale.sayLife()
-    assertNotEquals(vida1, vida2)
 
+  test("NotEqualsLife") { // Test if the life values of two different enemies are not equal
+    var life1 = Neymar.sayLife() // Retrieve the life value of the enemy Neymar and store it in the 'life1' variable
+    var life2 = Bale.sayLife() // Retrieve the life value of the enemy Bale and store it in the 'life2' variable
+    assertNotEquals(life1, life2) // Assert that the life values of Neymar and Bale are not equal
   }
-  test("equalsDefence") {
-    var defensa = Neymar.sayDefence()
-    var expected: Int = 30
-    assertEquals(defensa, expected)
+
+  test("equalsDefence") { // Test if the returned defense value for an enemy matches the expected value
+    var defense = Neymar.sayDefence() // Retrieve the defense value of the enemy Neymar and store it in the 'defense' variable
+    var expected: Int = 30 // Define the expected defense value
+    assertEquals(defense, expected) // Compare the actual defense value with the expected value
   }
-  test("NotEqualsDefence") {
-    var defensa1 = Neymar.sayDefence()
-    var defensa2 = Bale.sayDefence()
-    assertNotEquals(defensa1, defensa2)
+
+  test("NotEqualsDefence") { // Test if the defense values of two different enemies are not equal
+    var defense1 = Neymar.sayDefence() // Retrieve the defense value of the enemy Neymar and store it in the 'defense1' variable
+    var defense2 = Bale.sayDefence() // Retrieve the de
+
   }
 }
-

From 792372f01ed99b1d5fddc17fc710de064e9e2961 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:42:15 -0400
Subject: [PATCH 115/128] DOC: Document all my code of 'MagicWeaponTest' in
 English. DOC: Document all my code of Trait 'Playable' in English

---
 src/main/scala/model/playable/Playable.scala | 15 +++-
 src/test/scala/MagicCharacterTest.scala      |  4 +-
 src/test/scala/MagicWeaponTest.scala         | 94 +++++++++++---------
 3 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/src/main/scala/model/playable/Playable.scala b/src/main/scala/model/playable/Playable.scala
index 3888d4d..69a815d 100644
--- a/src/main/scala/model/playable/Playable.scala
+++ b/src/main/scala/model/playable/Playable.scala
@@ -1,13 +1,22 @@
 package model.playable
 
 trait Playable {
-  def sayName() : String
+  // Abstract method to get the name of the playable entity
+  def sayName(): String
+
+  // Abstract method to get the life points of the playable entity
   def sayLife(): Int
+
+  // Abstract method to get the defense points of the playable entity
   def sayDefence(): Int
+
+  // Abstract method to get the weight of the playable entity
   def sayWeight(): Int
-  def sayKind(): String
-  def havWeapon(): Boolean
 
+  // Abstract method to get the kind/type of the playable entity
+  def sayKind(): String
 
+  // Abstract method to check if the playable entity has a weapon
+  def havWeapon(): Boolean
 
 }
diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/MagicCharacterTest.scala
index 8b64a75..739b397 100644
--- a/src/test/scala/MagicCharacterTest.scala
+++ b/src/test/scala/MagicCharacterTest.scala
@@ -1,8 +1,8 @@
 import model.playable.{Character, MagicCharacter,Playable}
 import munit.FunSuite
 class MagicCharacterTest extends FunSuite {
-  var Alexis: MagicCharacter = _ // We declare a variable Cristiano of type MagicCharacter
-  var Vidal: MagicCharacter = _ // We declare a variable Cristiano of type MagicCharacter
+  var Alexis: MagicCharacter = _ // We declare a variable Alexis of type MagicCharacter
+  var Vidal: MagicCharacter = _ // We declare a variable Vidal of type MagicCharacter
 
   override def beforeEach(context: BeforeEach): Unit = {
     // Creates a new instance of the Magic Character class with the specified parameters:
diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/MagicWeaponTest.scala
index 22391f0..50c1898 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/MagicWeaponTest.scala
@@ -2,64 +2,72 @@ import munit.FunSuite
 import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
 import model.playable.{Character, MagicCharacter, Playable}
 class MagicWeaponTest extends FunSuite {
-  var Wand: MagicWeapon = _
-  var Staff: MagicWeapon = _
-  var Alexis: MagicCharacter = _
-  var Vidal: MagicCharacter = _
-  var Cristiano: Character = _
+  var Wand: MagicWeapon = _ // We declare a variable Wand of type MagicWeapon
+  var Staff: MagicWeapon = _ // We declare a variable Staff of type MagicWeapon
+  var Alexis: MagicCharacter = _ // We declare a variable Alexis of type MagicCharacter
+  var Vidal: MagicCharacter = _ // We declare a variable Vidal of type MagicCharacter
+  var Cristiano: Character = _ // We declare a variable Cristiano of type Character
 
   override def beforeEach(context: BeforeEach): Unit = {
-    Wand = new MagicWeapon("Barita",10,50,50,Alexis)
-    Staff = new MagicWeapon("Baston",15,60,45,Vidal)
+    // Creates a new instance of the MagicWeapon class with the specified parameters:
+    Wand = new MagicWeapon("Barita",10,50,50,Alexis) // -Name : Barita // - Weight: 10 // - Attack: 50 // - Mana: 50 //- Owner : Alexis
+    // Creates a new instance of the MagicWeapon class with the specified parameters:
+    Staff = new MagicWeapon("Baston",15,60,45,Vidal) // -Name : Baston // - Weight: 15 // - Attack: 60 // - Mana: 45 //- Owner : Vidal
 
 
   }
-  test("equalsName") {
-    var nombre: String = Wand.sayName()
-    var expected = "Barita"
-    assertEquals(nombre, expected)
+  test("equalsName") { // Test if the returned name value for a wand matches the expected value
+    var name: String = Wand.sayName() // Retrieve the name value of the wand and store it in the 'name' variable
+    var expected = "Barita" // Define the expected name value
+    assertEquals(name, expected) // Compare the actual name value with the expected value
   }
-  test("NotEqualsName") {
-    var nombre1 = Wand.sayName()
-    var nombre2 = Staff.sayName()
-    assertNotEquals(nombre1, nombre2)
+
+  test("NotEqualsName") { // Test if the name values of two different magical items are not equal
+    var name1 = Wand.sayName() // Retrieve the name value of the wand and store it in the 'name1' variable
+    var name2 = Staff.sayName() // Retrieve the name value of the staff and store it in the 'name2' variable
+    assertNotEquals(name1, name2) // Assert that the name values of the wand and the staff are not equal
   }
-  test("equalsWeight") {
-    var peso = Wand.sayWeight()
-    var expected: Int = 10
-    assertEquals(peso, expected)
+
+  test("equalsWeight") { // Test if the returned weight value for a wand matches the expected value
+    var weight = Wand.sayWeight() // Retrieve the weight value of the wand and store it in the 'weight' variable
+    var expected: Int = 10 // Define the expected weight value
+    assertEquals(weight, expected) // Compare the actual weight value with the expected value
   }
-  test("NotEqualsWeight") {
-    var peso1 = Wand.sayWeight()
-    var peso2 = Staff.sayWeight()
-    assertNotEquals(peso1, peso2)
+
+  test("NotEqualsWeight") { // Test if the weight values of two different magical items are not equal
+    var weight1 = Wand.sayWeight() // Retrieve the weight value of the wand and store it in the 'weight1' variable
+    var weight2 = Staff.sayWeight() // Retrieve the weight value of the staff and store it in the 'weight2' variable
+    assertNotEquals(weight1, weight2) // Assert that the weight values of the wand and the staff are not equal
   }
-  test("equalsAttack") {
-    var ataque = Wand.sayAttack()
-    var expected: Int = 50
-    assertEquals(ataque, expected)
 
+  test("equalsAttack") { // Test if the returned attack value for a wand matches the expected value
+    var attack = Wand.sayAttack() // Retrieve the attack value of the wand and store it in the 'attack' variable
+    var expected: Int = 50 // Define the expected attack value
+    assertEquals(attack, expected) // Compare the actual attack value with the expected value
   }
-  test("NotEqualsAttack") {
-    var vida1 = Wand.sayAttack()
-    var vida2 = Staff.sayAttack()
-    assertNotEquals(vida1, vida2)
 
+  test("NotEqualsAttack") { // Test if the attack values of two different magical items are not equal
+    var attack1 = Wand.sayAttack() // Retrieve the attack value of the wand and store it in the 'attack1' variable
+    var attack2 = Staff.sayAttack() // Retrieve the attack value of the staff and store it in the 'attack2' variable
+    assertNotEquals(attack1, attack2) // Assert that the attack values of the wand and the staff are not equal
   }
-  test("equalsMana") {
-    var mana = Wand.sayMana()
-    var expected: Int = 50
-    assertEquals(mana, expected)
+
+  test("equalsMana") { // Test if the returned mana value for a wand matches the expected value
+    var mana = Wand.sayMana() // Retrieve the mana value of the wand and store it in the 'mana' variable
+    var expected: Int = 50 // Define the expected mana value
+    assertEquals(mana, expected) // Compare the actual mana value with the expected value
   }
-  test("NotEqualsMana") {
-    var mana1 = Wand.sayMana()
-    var mana2 = Staff.sayAttack()
-    assertNotEquals(mana1, mana2)
+
+  test("NotEqualsMana") { // Test if the mana values of two different magical items are not equal
+    var mana1 = Wand.sayMana() // Retrieve the mana value of the wand and store it in the 'mana1' variable
+    var mana2 = Staff.sayAttack() // Retrieve the mana value of the staff and store it in the 'mana2' variable
+    assertNotEquals(mana1, mana2) // Assert that the mana values of the wand and the staff are not equal
   }
 
-  test("equalsMagicOwner") {
-    var dueño: MagicCharacter = Wand.sayOwner()
-    var expected: MagicCharacter = Alexis
-    assertEquals(dueño, expected)
+  test("equalsMagicOwner") { // Test if the returned owner character for a wand matches the expected character
+    var owner: MagicCharacter = Wand.sayOwner() // Retrieve the owner character of the wand and store it in the 'owner' variable
+    var expected: MagicCharacter = Alexis // Define the expected owner character
+    assertEquals(owner, expected) // Compare the actual owner character with the expected character
   }
+
 }

From a2ebacc2803b10d8660e5d7cc33a7958e9b21e33 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:43:50 -0400
Subject: [PATCH 116/128] DOC: Document all my code of class 'MagicCharacter'
 in English.

---
 .../scala/model/playable/MagicCharacter.scala | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index be22ea8..14837c4 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -1,40 +1,52 @@
 package model.playable
 import model.playable.Character
-class MagicCharacter(name:String, life:Int,
-                      defence:Int,weight:Int,
-                      kind:String,weapon:Boolean,
-                      mana:Int) extends Playable {
+
+// MagicCharacter class extends the Playable trait
+class MagicCharacter(name: String, life: Int,
+                     defence: Int, weight: Int,
+                     kind: String, weapon: Boolean,
+                     mana: Int) extends Playable {
+
+  // Method to return the name of the magic character
   def sayName(): String = {
     name
   }
 
+  // Method to return the life points of the magic character
   def sayLife(): Int = {
     life
   }
 
+  // Method to return the defense points of the magic character
   def sayDefence(): Int = {
     defence
   }
 
+  // Method to return the weight of the magic character
   def sayWeight(): Int = {
     weight
   }
-  def sayKind():String={kind}
 
+  // Method to return the kind/type of the magic character
+  def sayKind(): String = {
+    kind
+  }
+
+  // Method to check if the magic character has a weapon
   def havWeapon(): Boolean = {
     weapon
   }
 
-  def sayMana()={
+  // Method to return the mana points of the magic character
+  def sayMana(): Int = {
     mana
   }
+
+  // Override equals method to compare two magic characters based on their name and kind
   override def equals(other: Any): Boolean = {
     if (other.isInstanceOf[Playable]) {
       val otherCast = other.asInstanceOf[MagicCharacter]
-      sayName() == otherCast.sayName() &&
-        sayKind() == otherCast.sayKind()
+      sayName() == otherCast.sayName() && sayKind() == otherCast.sayKind()
     } else false
   }
-
-
 }

From ff3052c84197e58a61fd7dfd1e29429cf59d19d5 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:44:39 -0400
Subject: [PATCH 117/128] DOC: Document all my code of class 'Character' in
 English.

---
 src/main/scala/model/playable/Character.scala | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 14bba87..c9dca39 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -1,41 +1,47 @@
 package model.playable
 import model.playable.Playable
+// Character class extends the Playable trait
+class Character(name: String, life: Int,
+                defence: Int, weight: Int,
+                kind: String, weapon: Boolean) extends Playable {
 
-class Character(name:String, life:Int,
-                defence:Int,weight:Int,
-                kind:String,weapon:Boolean) extends Playable {
+  // Method to return the name of the character
   def sayName(): String = {
     name
   }
 
+  // Method to return the life points of the character
   def sayLife(): Int = {
     life
   }
 
+  // Method to return the defense points of the character
   def sayDefence(): Int = {
     defence
   }
 
+  // Method to return the weight of the character
   def sayWeight(): Int = {
     weight
   }
 
+  // Method to return the kind/type of the character
   def sayKind(): String = {
     kind
   }
 
+  // Method to check if the character has a weapon
   def havWeapon(): Boolean = {
-    weapon}
+    weapon
+  }
 
+  // Override equals method to compare two characters based on their attributes
   override def equals(other: Any): Boolean = {
     if (other.isInstanceOf[Playable]) {
       val otherCast = other.asInstanceOf[Character]
-      sayName() == otherCast.sayName() &&
-        sayKind() == otherCast.sayKind() &&
-        sayWeight() == otherCast.sayWeight() &&
-        sayLife() == otherCast.sayLife() &&
+      sayName() == otherCast.sayName() && sayKind() == otherCast.sayKind() &&
+        sayWeight() == otherCast.sayWeight() && sayLife() == otherCast.sayLife() &&
         sayDefence() == otherCast.sayDefence()
-
     } else false
   }
 }

From 59577b6e239b788b4390741fef5e98308bd6f266 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:45:30 -0400
Subject: [PATCH 118/128] DOC: Document all my code of class 'Party' in
 English.

---
 src/main/scala/model/party/Party.scala | 28 ++++++++++++++++----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
index 7018fb4..f8a3504 100644
--- a/src/main/scala/model/party/Party.scala
+++ b/src/main/scala/model/party/Party.scala
@@ -1,21 +1,27 @@
 package model.party
+
 import model.playable.{Character, MagicCharacter, Playable}
 
 import scala.collection.mutable.Map
+
+// Party class to manage a group of playable characters
 class Party {
+  // Map to store the allies in the party, keyed by their kind/type
   val allies: Map[String, Playable] = Map()
 
-  // Método para añadir un personaje a la party
+  // Method to add a playable character to the party
   def addPlayable(pj: Playable): Unit = {
-    allies.put(pj.sayKind(), pj)
-  }
-  // Método para verificar si la party está derrotada
-  def isDefeated: Boolean = if (allies.isEmpty) {
-    println("Party Empty")
-    true // La party está vacía, por lo tanto se considera derrotada
-  } else {
-    allies.values.forall(_.sayLife() == 0)
+    allies.put(pj.sayKind(), pj) // Adds the playable character to the allies map with their kind as the key
   }
 
-
-}
\ No newline at end of file
+  // Method to check if the party is defeated
+  def isDefeated: Boolean = {
+    if (allies.isEmpty) {
+      println("Party Empty") // Print a message if the party is empty
+      true // The party is considered defeated if it's empty
+    } else {
+      // The party is considered defeated if all allies have 0 life points
+      allies.values.forall(_.sayLife() == 0)
+    }
+  }
+}

From acecb521eb14d561e81f77c892101cb8338fafbf Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:46:20 -0400
Subject: [PATCH 119/128] DOC: Document all my code of trait 'NonPlayable' in
 English.

---
 src/main/scala/model/nonplayable/NonPlayable.scala | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/model/nonplayable/NonPlayable.scala b/src/main/scala/model/nonplayable/NonPlayable.scala
index 906ea6e..02174c2 100644
--- a/src/main/scala/model/nonplayable/NonPlayable.scala
+++ b/src/main/scala/model/nonplayable/NonPlayable.scala
@@ -1,9 +1,14 @@
 package model.nonplayable
 
+// Trait to represent non-playable entities
 trait NonPlayable {
+  // Abstract method to get the name of the non-playable entity
   def sayName(): String
-  def sayWeight(): Int
-  def sayAttack(): Int
 
+  // Abstract method to get the weight of the non-playable entity
+  def sayWeight(): Int
 
+  // Abstract method to get the attack power of the non-playable entity
+  def sayAttack(): Int
 }
+

From 7470a9420c32e06aba27f1731d72f6a5dbbd3222 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:47:15 -0400
Subject: [PATCH 120/128] DOC: Document all my code of class 'Weapon' in
 English.

---
 src/main/scala/model/nonplayable/Weapon.scala | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index 99e95e4..219bbed 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -1,25 +1,28 @@
 package model.nonplayable
 import model.nonplayable.NonPlayable
 import model.playable.Character
-class Weapon(name:String,weight:Int,
-             attack:Int,owner:Character) extends NonPlayable {
-  def sayOwner() : Character = {
+
+// Weapon class represents a non-playable entity that is a weapon
+class Weapon(name: String, weight: Int,
+             attack: Int, owner: Character) extends NonPlayable {
+
+  // Method to return the owner character of the weapon
+  def sayOwner(): Character = {
     owner
   }
 
+  // Method to return the name of the weapon
   def sayName(): String = {
-     name
+    name
   }
 
+  // Method to return the weight of the weapon
   def sayWeight(): Int = {
     weight
   }
 
+  // Method to return the attack power of the weapon
   def sayAttack(): Int = {
     attack
   }
-
-
-
-
 }

From 9fd2a7ae967cf2f35155ce2cd5ba144b24ecc50e Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:48:05 -0400
Subject: [PATCH 121/128] DOC: Document all my code of class 'MagicWeapon' in
 English.

---
 .../scala/model/nonplayable/MagicWeapon.scala     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
index 0a7152d..2701365 100644
--- a/src/main/scala/model/nonplayable/MagicWeapon.scala
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -2,25 +2,34 @@ package model.nonplayable
 import model.nonplayable.NonPlayable
 import model.playable.MagicCharacter
 
-class MagicWeapon(name:String,weight:Int,
-                  attack:Int,mana:Int,
+// MagicWeapon class represents a non-playable entity that is a magic weapon
+class MagicWeapon(name: String, weight: Int,
+                  attack: Int, mana: Int,
                   owner: MagicCharacter) extends NonPlayable {
+
+  // Method to return the mana points required to use the magic weapon
   def sayMana(): Int ={
     mana
   }
 
+  // Method to return the name of the magic weapon
   def sayName(): String = {
     name
   }
 
+  // Method to return the weight of the magic weapon
   def sayWeight(): Int = {
     weight
   }
 
-  def sayAttack() : Int = {
+  // Method to return the attack power of the magic weapon
+  def sayAttack(): Int = {
     attack
   }
+
+  // Method to return the owner character of the magic weapon
   def sayOwner(): MagicCharacter = {
     owner
   }
 }
+

From 5be24927fbf815759ed05c73bc54ae78e27cc85d Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Fri, 12 Apr 2024 22:48:48 -0400
Subject: [PATCH 122/128] DOC: Document all my code of class 'Enemy' in
 English.

---
 src/main/scala/model/nonplayable/Enemy.scala | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/main/scala/model/nonplayable/Enemy.scala b/src/main/scala/model/nonplayable/Enemy.scala
index e60c442..6848301 100644
--- a/src/main/scala/model/nonplayable/Enemy.scala
+++ b/src/main/scala/model/nonplayable/Enemy.scala
@@ -1,26 +1,33 @@
 package model.nonplayable
 import model.nonplayable.NonPlayable
-class Enemy(name:String,weight:Int,
-            attack:Int,life:Int,
-            defence:Int) extends NonPlayable{
 
-  def sayName():String= {
+// Enemy class represents a non-playable entity that is an enemy
+class Enemy(name: String, weight: Int,
+            attack: Int, life: Int,
+            defence: Int) extends NonPlayable {
+
+  // Method to return the name of the enemy
+  def sayName(): String = {
     name
   }
 
-  def sayWeight(): Int ={
+  // Method to return the weight of the enemy
+  def sayWeight(): Int = {
     weight
   }
 
+  // Method to return the attack power of the enemy
   def sayAttack(): Int = {
     attack
   }
 
-  def sayLife() : Int = {
+  // Method to return the life points of the enemy
+  def sayLife(): Int = {
     life
   }
 
-  def sayDefence() : Int = {
+  // Method to return the defence points of the enemy
+  def sayDefence(): Int = {
     defence
   }
 }

From 4230bec199dba3feae24e52c6aea99f633571a76 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Mon, 22 Apr 2024 17:16:27 -0400
Subject: [PATCH 123/128] REFACTOR: moved 'WeaponTest', 'EnemyTest',
 'MagicWeaponTest' to new package 'nonplayable' in scala in test

---
 src/main/scala/model/party/Party.scala                 | 2 +-
 src/test/scala/{ => nonplayable}/EnemyTest.scala       | 5 +++--
 src/test/scala/{ => nonplayable}/MagicWeaponTest.scala | 6 ++++--
 src/test/scala/{ => nonplayable}/WeaponTest.scala      | 6 ++++--
 src/test/scala/{ => playable}/CharacterTest.scala      | 4 +++-
 src/test/scala/{ => playable}/MagicCharacterTest.scala | 4 +++-
 6 files changed, 18 insertions(+), 9 deletions(-)
 rename src/test/scala/{ => nonplayable}/EnemyTest.scala (97%)
 rename src/test/scala/{ => nonplayable}/MagicWeaponTest.scala (97%)
 rename src/test/scala/{ => nonplayable}/WeaponTest.scala (96%)
 rename src/test/scala/{ => playable}/CharacterTest.scala (99%)
 rename src/test/scala/{ => playable}/MagicCharacterTest.scala (99%)

diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
index f8a3504..071ec24 100644
--- a/src/main/scala/model/party/Party.scala
+++ b/src/main/scala/model/party/Party.scala
@@ -17,7 +17,7 @@ class Party {
   // Method to check if the party is defeated
   def isDefeated: Boolean = {
     if (allies.isEmpty) {
-      println("Party Empty") // Print a message if the party is empty
+      // Print a message if the party is empty
       true // The party is considered defeated if it's empty
     } else {
       // The party is considered defeated if all allies have 0 life points
diff --git a/src/test/scala/EnemyTest.scala b/src/test/scala/nonplayable/EnemyTest.scala
similarity index 97%
rename from src/test/scala/EnemyTest.scala
rename to src/test/scala/nonplayable/EnemyTest.scala
index d6ce2c9..7a6c5e7 100644
--- a/src/test/scala/EnemyTest.scala
+++ b/src/test/scala/nonplayable/EnemyTest.scala
@@ -1,6 +1,7 @@
+package nonplayable
+
+import model.nonplayable.Enemy
 import munit.FunSuite
-import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
-import model.playable.{Character, MagicCharacter, Playable}
 class EnemyTest extends FunSuite {
   var Neymar: Enemy = _ // We declare a variable Neymar of type Enemy
   var Bale: Enemy = _ // We declare a variable Bale of type Enemy
diff --git a/src/test/scala/MagicWeaponTest.scala b/src/test/scala/nonplayable/MagicWeaponTest.scala
similarity index 97%
rename from src/test/scala/MagicWeaponTest.scala
rename to src/test/scala/nonplayable/MagicWeaponTest.scala
index 50c1898..fc9fc0f 100644
--- a/src/test/scala/MagicWeaponTest.scala
+++ b/src/test/scala/nonplayable/MagicWeaponTest.scala
@@ -1,6 +1,8 @@
+package nonplayable
+
+import model.nonplayable.MagicWeapon
+import model.playable.{Character, MagicCharacter}
 import munit.FunSuite
-import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
-import model.playable.{Character, MagicCharacter, Playable}
 class MagicWeaponTest extends FunSuite {
   var Wand: MagicWeapon = _ // We declare a variable Wand of type MagicWeapon
   var Staff: MagicWeapon = _ // We declare a variable Staff of type MagicWeapon
diff --git a/src/test/scala/WeaponTest.scala b/src/test/scala/nonplayable/WeaponTest.scala
similarity index 96%
rename from src/test/scala/WeaponTest.scala
rename to src/test/scala/nonplayable/WeaponTest.scala
index 64208dc..e4d74cb 100644
--- a/src/test/scala/WeaponTest.scala
+++ b/src/test/scala/nonplayable/WeaponTest.scala
@@ -1,6 +1,8 @@
+package nonplayable
+
+import model.nonplayable.Weapon
+import model.playable.Character
 import munit.FunSuite
-import model.nonplayable.{MagicWeapon, NonPlayable, Weapon,Enemy}
-import model.playable.{Character, MagicCharacter, Playable}
 class WeaponTest extends FunSuite {
   var Sword: Weapon = _ // We declare a variable Sword of type Weapon
   var Bow: Weapon = _ // We declare a variable Bow of type Weapon
diff --git a/src/test/scala/CharacterTest.scala b/src/test/scala/playable/CharacterTest.scala
similarity index 99%
rename from src/test/scala/CharacterTest.scala
rename to src/test/scala/playable/CharacterTest.scala
index d03c167..acb87dc 100644
--- a/src/test/scala/CharacterTest.scala
+++ b/src/test/scala/playable/CharacterTest.scala
@@ -1,5 +1,7 @@
+package playable
+
+import model.playable.Character
 import munit.FunSuite
-import model.playable.{Character, MagicCharacter, Playable}
 class CharacterTest extends FunSuite {
   var Cristiano: Character = _ // We declare a variable Cristiano of type Character
   var Messi: Character = _ // We declare a variable Messi of type Character
diff --git a/src/test/scala/MagicCharacterTest.scala b/src/test/scala/playable/MagicCharacterTest.scala
similarity index 99%
rename from src/test/scala/MagicCharacterTest.scala
rename to src/test/scala/playable/MagicCharacterTest.scala
index 739b397..ebfe64f 100644
--- a/src/test/scala/MagicCharacterTest.scala
+++ b/src/test/scala/playable/MagicCharacterTest.scala
@@ -1,4 +1,6 @@
-import model.playable.{Character, MagicCharacter,Playable}
+package playable
+
+import model.playable.MagicCharacter
 import munit.FunSuite
 class MagicCharacterTest extends FunSuite {
   var Alexis: MagicCharacter = _ // We declare a variable Alexis of type MagicCharacter

From 9161538d4440740ac1641a693e16a7a71eb448e8 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Mon, 22 Apr 2024 20:49:25 -0400
Subject: [PATCH 124/128] DOC: I wrote my read.me

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index e7d6320..5608905 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,8 @@
 Final Reality is a simplified clone of the renowned game, Final Fantasy. Its main purpose is to
 serve as an educational tool, teaching foundational programming concepts.
 
+this game will be selling more than final fantasy...
+
 This README is yours to complete it. Take this opportunity to describe your contributions, the
 design decisions you've made, and any other information you deem necessary.
 

From 313d2edcd83a2e8a1a7e5627746178483e58903f Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Mon, 22 Apr 2024 21:13:32 -0400
Subject: [PATCH 125/128] DOC: I created class Controller

---
 src/main/scala/model/controller/Controller.scala | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/main/scala/model/controller/Controller.scala

diff --git a/src/main/scala/model/controller/Controller.scala b/src/main/scala/model/controller/Controller.scala
new file mode 100644
index 0000000..b9c086e
--- /dev/null
+++ b/src/main/scala/model/controller/Controller.scala
@@ -0,0 +1,12 @@
+package model.controller
+import model.playable.{Character, MagicCharacter, Playable}
+import model.nonplayable.{MagicWeapon, Weapon}
+import scala.collection.mutable.Map
+import model.party.Party
+
+class Controller {
+
+
+
+}
+

From ac8fa13097c2be5e63f15044ade8903fedb0ad8d Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Mon, 22 Apr 2024 21:59:42 -0400
Subject: [PATCH 126/128] FEAT: created abstrac class 'APlayable' and changed
 the class 'Character'

---
 .../scala/model/controller/Controller.scala   |  5 +-
 src/main/scala/model/nonplayable/Weapon.scala |  2 +-
 src/main/scala/model/party/Party.scala        |  2 +-
 src/main/scala/model/playable/Character.scala | 54 +++++--------------
 .../scala/model/playable/MagicCharacter.scala |  2 +-
 src/main/scala/model/playable/aPlayable.scala | 38 +++++++++++++
 src/test/scala/PartyTest.scala                |  2 +-
 7 files changed, 55 insertions(+), 50 deletions(-)
 create mode 100644 src/main/scala/model/playable/aPlayable.scala

diff --git a/src/main/scala/model/controller/Controller.scala b/src/main/scala/model/controller/Controller.scala
index b9c086e..477dcc7 100644
--- a/src/main/scala/model/controller/Controller.scala
+++ b/src/main/scala/model/controller/Controller.scala
@@ -1,8 +1,5 @@
 package model.controller
-import model.playable.{Character, MagicCharacter, Playable}
-import model.nonplayable.{MagicWeapon, Weapon}
-import scala.collection.mutable.Map
-import model.party.Party
+
 
 class Controller {
 
diff --git a/src/main/scala/model/nonplayable/Weapon.scala b/src/main/scala/model/nonplayable/Weapon.scala
index 219bbed..b00f0ec 100644
--- a/src/main/scala/model/nonplayable/Weapon.scala
+++ b/src/main/scala/model/nonplayable/Weapon.scala
@@ -1,6 +1,6 @@
 package model.nonplayable
 import model.nonplayable.NonPlayable
-import model.playable.Character
+import model.playable.APlayable
 
 // Weapon class represents a non-playable entity that is a weapon
 class Weapon(name: String, weight: Int,
diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
index 071ec24..b1595af 100644
--- a/src/main/scala/model/party/Party.scala
+++ b/src/main/scala/model/party/Party.scala
@@ -1,6 +1,6 @@
 package model.party
 
-import model.playable.{Character, MagicCharacter, Playable}
+import model.playable.{APlayable, MagicCharacter, Playable}
 
 import scala.collection.mutable.Map
 
diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index c9dca39..6188ee9 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -1,50 +1,20 @@
 package model.playable
 import model.playable.Playable
+import model.playable.APlayable
 // Character class extends the Playable trait
-class Character(name: String, life: Int,
-                defence: Int, weight: Int,
-                kind: String, weapon: Boolean) extends Playable {
-
-  // Method to return the name of the character
-  def sayName(): String = {
-    name
-  }
-
-  // Method to return the life points of the character
-  def sayLife(): Int = {
-    life
-  }
-
-  // Method to return the defense points of the character
-  def sayDefence(): Int = {
-    defence
-  }
-
-  // Method to return the weight of the character
-  def sayWeight(): Int = {
-    weight
-  }
-
-  // Method to return the kind/type of the character
-  def sayKind(): String = {
-    kind
-  }
-
-  // Method to check if the character has a weapon
-  def havWeapon(): Boolean = {
-    weapon
-  }
+class Paladin(name:String) extends APlayable(name,100,50,50,"Paladin",false) {
+
+}
+class Guerrero(name:String) extends APlayable(name,120,80,50,"Guerrero",false) {
+
+}
+class Ninja(name:String) extends APlayable(name,50,80,20,"Ninja",false) {
 
-  // Override equals method to compare two characters based on their attributes
-  override def equals(other: Any): Boolean = {
-    if (other.isInstanceOf[Playable]) {
-      val otherCast = other.asInstanceOf[Character]
-      sayName() == otherCast.sayName() && sayKind() == otherCast.sayKind() &&
-        sayWeight() == otherCast.sayWeight() && sayLife() == otherCast.sayLife() &&
-        sayDefence() == otherCast.sayDefence()
-    } else false
-  }
 }
 
+  // Override equals method to compare two characters based on their attributes
+
+
+
 
 
diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index 14837c4..ae2f7d0 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -1,5 +1,5 @@
 package model.playable
-import model.playable.Character
+import model.playable.APlayable
 
 // MagicCharacter class extends the Playable trait
 class MagicCharacter(name: String, life: Int,
diff --git a/src/main/scala/model/playable/aPlayable.scala b/src/main/scala/model/playable/aPlayable.scala
new file mode 100644
index 0000000..30e5d1a
--- /dev/null
+++ b/src/main/scala/model/playable/aPlayable.scala
@@ -0,0 +1,38 @@
+package model.playable
+import model.playable.Playable
+class APlayable(name: String, life: Int,
+                defence: Int, weight: Int,
+                kind: String, weapon: Boolean) extends Playable {
+
+  // Method to return the name of the character
+  def sayName(): String = {
+    name
+  }
+
+  // Method to return the life points of the character
+  def sayLife(): Int = {
+    life
+  }
+
+  // Method to return the defense points of the character
+  def sayDefence(): Int = {
+    defence
+  }
+
+  // Method to return the weight of the character
+  def sayWeight(): Int = {
+    weight
+  }
+
+  // Method to return the kind/type of the character
+  def sayKind(): String = {
+    kind
+  }
+
+  // Method to check if the character has a weapon
+  def havWeapon(): Boolean = {
+    weapon
+  }
+
+
+}
diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index bd965a2..36dd8cf 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -1,6 +1,6 @@
 import munit.FunSuite
 import model.party.Party
-import model.playable.{Character,MagicCharacter,Playable}
+import model.playable.{APlayable,MagicCharacter,Playable}
 import model.nonplayable.{Enemy,Weapon,MagicWeapon}
 class PartyTest extends FunSuite {
   var Team1: Party = _ // We declare a variable Team1 of type Party

From b2ab71caa8255b30f9f8eacda2ee06c643ca6b25 Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Mon, 22 Apr 2024 22:37:26 -0400
Subject: [PATCH 127/128] FEAT: created classes 'MagoNegro' and ' MagoBlanco',
 i changed all instance of 'Character' and ' MagicCharacter' for APlayable

---
 .../scala/model/nonplayable/MagicWeapon.scala |  6 +-
 src/main/scala/model/party/Party.scala        |  6 +-
 .../{aPlayable.scala => APlayable.scala}      | 10 ++-
 src/main/scala/model/playable/Character.scala | 13 ++--
 .../scala/model/playable/MagicCharacter.scala | 48 --------------
 src/test/scala/PartyTest.scala                | 28 +++-----
 .../scala/nonplayable/MagicWeaponTest.scala   | 12 ++--
 src/test/scala/nonplayable/WeaponTest.scala   |  2 +-
 src/test/scala/playable/CharacterTest.scala   | 29 ++++-----
 .../scala/playable/MagicCharacterTest.scala   | 64 ++++++-------------
 10 files changed, 74 insertions(+), 144 deletions(-)
 rename src/main/scala/model/playable/{aPlayable.scala => APlayable.scala} (71%)

diff --git a/src/main/scala/model/nonplayable/MagicWeapon.scala b/src/main/scala/model/nonplayable/MagicWeapon.scala
index 2701365..31ef769 100644
--- a/src/main/scala/model/nonplayable/MagicWeapon.scala
+++ b/src/main/scala/model/nonplayable/MagicWeapon.scala
@@ -1,11 +1,11 @@
 package model.nonplayable
 import model.nonplayable.NonPlayable
-import model.playable.MagicCharacter
+import model.playable.APlayable
 
 // MagicWeapon class represents a non-playable entity that is a magic weapon
 class MagicWeapon(name: String, weight: Int,
                   attack: Int, mana: Int,
-                  owner: MagicCharacter) extends NonPlayable {
+                  owner: APlayable) extends NonPlayable {
 
   // Method to return the mana points required to use the magic weapon
   def sayMana(): Int ={
@@ -28,7 +28,7 @@ class MagicWeapon(name: String, weight: Int,
   }
 
   // Method to return the owner character of the magic weapon
-  def sayOwner(): MagicCharacter = {
+  def sayOwner(): APlayable = {
     owner
   }
 }
diff --git a/src/main/scala/model/party/Party.scala b/src/main/scala/model/party/Party.scala
index b1595af..4c878b9 100644
--- a/src/main/scala/model/party/Party.scala
+++ b/src/main/scala/model/party/Party.scala
@@ -1,16 +1,16 @@
 package model.party
 
-import model.playable.{APlayable, MagicCharacter, Playable}
+import model.playable.{APlayable}
 
 import scala.collection.mutable.Map
 
 // Party class to manage a group of playable characters
 class Party {
   // Map to store the allies in the party, keyed by their kind/type
-  val allies: Map[String, Playable] = Map()
+  val allies: Map[String, APlayable] = Map()
 
   // Method to add a playable character to the party
-  def addPlayable(pj: Playable): Unit = {
+  def addPlayable(pj: APlayable): Unit = {
     allies.put(pj.sayKind(), pj) // Adds the playable character to the allies map with their kind as the key
   }
 
diff --git a/src/main/scala/model/playable/aPlayable.scala b/src/main/scala/model/playable/APlayable.scala
similarity index 71%
rename from src/main/scala/model/playable/aPlayable.scala
rename to src/main/scala/model/playable/APlayable.scala
index 30e5d1a..0ee52ec 100644
--- a/src/main/scala/model/playable/aPlayable.scala
+++ b/src/main/scala/model/playable/APlayable.scala
@@ -1,8 +1,8 @@
 package model.playable
 import model.playable.Playable
-class APlayable(name: String, life: Int,
-                defence: Int, weight: Int,
-                kind: String, weapon: Boolean) extends Playable {
+abstract class APlayable(val name: String, var life: Int,
+                         val defence: Int, val weight: Int,
+                         var kind: String, var weapon: Boolean, val mana: Int) extends Playable {
 
   // Method to return the name of the character
   def sayName(): String = {
@@ -33,6 +33,10 @@ class APlayable(name: String, life: Int,
   def havWeapon(): Boolean = {
     weapon
   }
+  def sayMana(): Int = {
+    mana
+  }
 
 
 }
+
diff --git a/src/main/scala/model/playable/Character.scala b/src/main/scala/model/playable/Character.scala
index 6188ee9..423eaab 100644
--- a/src/main/scala/model/playable/Character.scala
+++ b/src/main/scala/model/playable/Character.scala
@@ -2,17 +2,22 @@ package model.playable
 import model.playable.Playable
 import model.playable.APlayable
 // Character class extends the Playable trait
-class Paladin(name:String) extends APlayable(name,100,50,50,"Paladin",false) {
+class Paladin(name:String) extends APlayable(name,100,50,50,"Paladin",false,0) {
 
 }
-class Guerrero(name:String) extends APlayable(name,120,80,50,"Guerrero",false) {
+class Guerrero(name:String) extends APlayable(name,120,80,40,"Guerrero",false,0) {
 
 }
-class Ninja(name:String) extends APlayable(name,50,80,20,"Ninja",false) {
+class Ninja(name:String) extends APlayable(name,50,80,20,"Ninja",false,0) {
 
 }
+class MagoNegro(name:String) extends APlayable(name,100,100,120,"MagoNegro",false,50) {
 
-  // Override equals method to compare two characters based on their attributes
+}
+
+class MagoBlanco(name:String) extends APlayable(name,50,150,100,"MagoBlanco",false,80) {
+
+} // Override equals method to compare two characters based on their attributes
 
 
 
diff --git a/src/main/scala/model/playable/MagicCharacter.scala b/src/main/scala/model/playable/MagicCharacter.scala
index ae2f7d0..4000fc9 100644
--- a/src/main/scala/model/playable/MagicCharacter.scala
+++ b/src/main/scala/model/playable/MagicCharacter.scala
@@ -2,51 +2,3 @@ package model.playable
 import model.playable.APlayable
 
 // MagicCharacter class extends the Playable trait
-class MagicCharacter(name: String, life: Int,
-                     defence: Int, weight: Int,
-                     kind: String, weapon: Boolean,
-                     mana: Int) extends Playable {
-
-  // Method to return the name of the magic character
-  def sayName(): String = {
-    name
-  }
-
-  // Method to return the life points of the magic character
-  def sayLife(): Int = {
-    life
-  }
-
-  // Method to return the defense points of the magic character
-  def sayDefence(): Int = {
-    defence
-  }
-
-  // Method to return the weight of the magic character
-  def sayWeight(): Int = {
-    weight
-  }
-
-  // Method to return the kind/type of the magic character
-  def sayKind(): String = {
-    kind
-  }
-
-  // Method to check if the magic character has a weapon
-  def havWeapon(): Boolean = {
-    weapon
-  }
-
-  // Method to return the mana points of the magic character
-  def sayMana(): Int = {
-    mana
-  }
-
-  // Override equals method to compare two magic characters based on their name and kind
-  override def equals(other: Any): Boolean = {
-    if (other.isInstanceOf[Playable]) {
-      val otherCast = other.asInstanceOf[MagicCharacter]
-      sayName() == otherCast.sayName() && sayKind() == otherCast.sayKind()
-    } else false
-  }
-}
diff --git a/src/test/scala/PartyTest.scala b/src/test/scala/PartyTest.scala
index 36dd8cf..e231376 100644
--- a/src/test/scala/PartyTest.scala
+++ b/src/test/scala/PartyTest.scala
@@ -1,35 +1,25 @@
 import munit.FunSuite
 import model.party.Party
-import model.playable.{APlayable,MagicCharacter,Playable}
-import model.nonplayable.{Enemy,Weapon,MagicWeapon}
+import model.playable.{APlayable,Paladin,Guerrero,Ninja,MagoBlanco,MagoNegro}
+import model.nonplayable.{Enemy, MagicWeapon, Weapon}
 class PartyTest extends FunSuite {
   var Team1: Party = _ // We declare a variable Team1 of type Party
-  var Cristiano: Playable = _ // We declare a variable Cristiano of type Playable
-  var Alexis: Playable = _ // We declare a variable Alexis of type Playable
+  var Cristiano: APlayable = _ // We declare a variable Cristiano of type Playable
+  var Alexis: APlayable = _ // We declare a variable Alexis of type Playable
 
 
   override def beforeEach(context: BeforeEach): Unit = {
     Team1 = new Party() // Creates a new instance of the Party class and assigns it to the variable Team1.
     // Creates a new instance of the Character class with the specified parameters:
-    Cristiano = new Character("Cristiano",0, // - Name: Cristiano // - Life: 0
-                                       50,70, // - Defence : 50 // - Weight: 70
-                                       "Paladin",false)  // - Kind: Paladin // - Weapon: false
+    Cristiano = new Paladin("Cristiano")
 
     // Creates a new instance of the MagicCharacter class with the specified parameters:
-    Alexis = new MagicCharacter("Alexis", 0, // - Name: Alexis // - Life: 0
-                                    55, 65, // - Defence : 55 // - Weight: 65
-                                    "Mago Blanco", false, 90) // - Kind: Mago Blanco // - Weapon: false
+    Alexis = new MagoBlanco("Alexis")// - Kind: Mago Blanco // - Weapon: false
 
   }
   test("addCharacter") { // Test the method to add a character
     Team1.addPlayable(Cristiano) // Add the character Cristiano
-    val expected: Map[String, Playable] = Map("Paladin" -> Cristiano) // The expected variable will be a map with the type and name of the character
-    assertEquals(Team1.allies.toMap, expected) // Compare the result with the Map
-  }
-
-  test("addMagicCharacter") { // Test if the method also works for adding a magic character
-    Team1.addPlayable(Alexis) // Add a magic character, Alexis
-    val expected: Map[String, Playable] = Map("Mago Blanco" -> Alexis) // The expected variable will be a map with the type and name of the character
+    val expected: Map[String, APlayable] = Map("Paladin" -> Cristiano) // The expected variable will be a map with the type and name of the character
     assertEquals(Team1.allies.toMap, expected) // Compare the result with the Map
   }
 
@@ -38,13 +28,15 @@ class PartyTest extends FunSuite {
     assertEquals(state, true) // Compare the results
   }
   test("isDefeat") { // Test if a party is defeated or not
+    Cristiano.life = 0
     Team1.addPlayable(Cristiano) // Add a character with zero health
+    Alexis.life = 0
     Team1.addPlayable(Alexis) // Add a magic character with zero health
     assertEquals(Team1.isDefeated, true) // Check if they are defeated or not (a team with no health is defeated) -> true
   }
   test("isNotDefeat") { // Test if a party is not defeated
     Team1.addPlayable(Cristiano) // Add a character with zero health
-    Alexis = new MagicCharacter("Alexis", 100, 90, 10, "Mago Blanco", false, 50) // Create a magic character with health not equal to zero
+    Alexis = new MagoBlanco("Alexis")
     Team1.addPlayable(Alexis) // Add that living character
     assertEquals(Team1.isDefeated, false) // Check that the team is alive (false)
   }
diff --git a/src/test/scala/nonplayable/MagicWeaponTest.scala b/src/test/scala/nonplayable/MagicWeaponTest.scala
index fc9fc0f..152b999 100644
--- a/src/test/scala/nonplayable/MagicWeaponTest.scala
+++ b/src/test/scala/nonplayable/MagicWeaponTest.scala
@@ -1,14 +1,14 @@
 package nonplayable
 
 import model.nonplayable.MagicWeapon
-import model.playable.{Character, MagicCharacter}
+import model.playable.{APlayable}
 import munit.FunSuite
 class MagicWeaponTest extends FunSuite {
   var Wand: MagicWeapon = _ // We declare a variable Wand of type MagicWeapon
   var Staff: MagicWeapon = _ // We declare a variable Staff of type MagicWeapon
-  var Alexis: MagicCharacter = _ // We declare a variable Alexis of type MagicCharacter
-  var Vidal: MagicCharacter = _ // We declare a variable Vidal of type MagicCharacter
-  var Cristiano: Character = _ // We declare a variable Cristiano of type Character
+  var Alexis: APlayable = _ // We declare a variable Alexis of type MagicCharacter
+  var Vidal: APlayable = _ // We declare a variable Vidal of type MagicCharacter
+  var Cristiano: APlayable = _ // We declare a variable Cristiano of type Character
 
   override def beforeEach(context: BeforeEach): Unit = {
     // Creates a new instance of the MagicWeapon class with the specified parameters:
@@ -67,8 +67,8 @@ class MagicWeaponTest extends FunSuite {
   }
 
   test("equalsMagicOwner") { // Test if the returned owner character for a wand matches the expected character
-    var owner: MagicCharacter = Wand.sayOwner() // Retrieve the owner character of the wand and store it in the 'owner' variable
-    var expected: MagicCharacter = Alexis // Define the expected owner character
+    var owner: APlayable = Wand.sayOwner() // Retrieve the owner character of the wand and store it in the 'owner' variable
+    var expected: APlayable = Alexis // Define the expected owner character
     assertEquals(owner, expected) // Compare the actual owner character with the expected character
   }
 
diff --git a/src/test/scala/nonplayable/WeaponTest.scala b/src/test/scala/nonplayable/WeaponTest.scala
index e4d74cb..c3f5e58 100644
--- a/src/test/scala/nonplayable/WeaponTest.scala
+++ b/src/test/scala/nonplayable/WeaponTest.scala
@@ -1,7 +1,7 @@
 package nonplayable
 
 import model.nonplayable.Weapon
-import model.playable.Character
+import model.playable.APlayable
 import munit.FunSuite
 class WeaponTest extends FunSuite {
   var Sword: Weapon = _ // We declare a variable Sword of type Weapon
diff --git a/src/test/scala/playable/CharacterTest.scala b/src/test/scala/playable/CharacterTest.scala
index acb87dc..e875cdb 100644
--- a/src/test/scala/playable/CharacterTest.scala
+++ b/src/test/scala/playable/CharacterTest.scala
@@ -1,29 +1,27 @@
 package playable
 
-import model.playable.Character
+import model.playable.{APlayable, Guerrero, Paladin}
 import munit.FunSuite
 class CharacterTest extends FunSuite {
-  var Cristiano: Character = _ // We declare a variable Cristiano of type Character
-  var Messi: Character = _ // We declare a variable Messi of type Character
+  var Cristiano: APlayable = _ // We declare a variable Cristiano of type Character
+  var Messi: APlayable = _ // We declare a variable Messi of type Character
 
   override def beforeEach(context: BeforeEach): Unit = {
     // Creates a new instance of the Character class with the specified parameters:
-    Cristiano = new Character("Cristiano",100,50 // - Name: Cristiano // - Life: 100 // - Defence : 50
-                             ,70,"Paladin",false) // - Weight: 70 // - Kind: Paladin // - Weapon: false
+    Cristiano = new Paladin("Cristiano")
     // Creates a new instance of the Character class with the specified parameters:
-    Messi = new Character("Messi",90,40, // - Name: Messi // - Life: 90 // - Defence : 40
-                         60,"Guerrero",true) // - Weight: 60 // - Kind: Guerrero // - Weapon: true
+    Messi = new Guerrero("Messi")// - Weight: 60 // - Kind: Guerrero // - Weapon: true
 
   }
   test("equals") { // Test if two references to the same character are equal
-    val character: Character = Cristiano // Create a reference to the character Cristiano and assign it to the variable 'character'
+    val character: APlayable = Cristiano // Create a reference to the character Cristiano and assign it to the variable 'character'
     var expected = Cristiano // Define the expected value as the character Cristiano
     assertEquals(character, expected) // Compare the actual reference with the expected value
   }
 
   test("NotEquals") { // Test if two references to different characters are not equal
-    val character1: Character = Cristiano // Create a reference to the character Cristiano and assign it to the variable 'character1'
-    val character2: Character = Messi // Create a reference to the character Messi and assign it to the variable 'character2'
+    val character1: APlayable = Cristiano // Create a reference to the character Cristiano and assign it to the variable 'character1'
+    val character2: APlayable = Messi // Create a reference to the character Messi and assign it to the variable 'character2'
     assertNotEquals(character1, character2) // Assert that the references to Cristiano and Messi are not equal
   }
 
@@ -64,13 +62,13 @@ class CharacterTest extends FunSuite {
 
   test("equalsWeight") { // Test if the returned weight value for a character matches the expected value
     var weight = Cristiano.sayWeight() // Retrieve the weight value of the character Cristiano and store it in the 'weight' variable
-    var expected: Int = 70 // Define the expected weight value
+    var expected: Int = 50 // Define the expected weight value
     assertEquals(weight, expected) // Compare the actual weight value with the expected value
   }
 
   test("NotEqualsWeight") { // Test if the weight values of two different characters are not equal
-    var weight1 = Cristiano.sayWeight() // Retrieve the weight value of the character Cristiano and store it in the 'weight1' variable
-    var weight2 = Messi.sayWeight() // Retrieve the weight value of the character Messi and store it in the 'weight2' variable
+    var weight1 = Cristiano.weight // Retrieve the weight value of the character Cristiano and store it in the 'weight1' variable
+    var weight2 = Messi.weight // Retrieve the weight value of the character Messi and store it in the 'weight2' variable
     assertNotEquals(weight1, weight2) // Assert that the weight values of Cristiano and Messi are not equal
   }
 
@@ -87,13 +85,14 @@ class CharacterTest extends FunSuite {
   }
 
   test("haveWeapon") { // Test if the character Messi has a weapon
-    val hasWeapon = Messi.havWeapon() // Check if the character Messi has a weapon and store the result in the 'hasWeapon' variable
+    Messi.weapon = true
+    val hasWeapon = Messi.weapon // Check if the character Messi has a weapon and store the result in the 'hasWeapon' variable
     var expected = true // Define the expected value indicating that Messi has a weapon
     assertEquals(hasWeapon, expected) // Compare the actual result with the expected value
   }
 
   test("haveNotWeapon") { // Test if the character Cristiano doesn't have a weapon
-    val hasWeapon = Cristiano.havWeapon() // Check if the character Cristiano has a weapon and store the result in the 'hasWeapon' variable
+    val hasWeapon = Cristiano.weapon // Check if the character Cristiano has a weapon and store the result in the 'hasWeapon' variable
     var expected = false // Define the expected value indicating that Cristiano doesn't have a weapon
     assertEquals(hasWeapon, expected) // Compare the actual result with the expected value
   }
diff --git a/src/test/scala/playable/MagicCharacterTest.scala b/src/test/scala/playable/MagicCharacterTest.scala
index ebfe64f..5435954 100644
--- a/src/test/scala/playable/MagicCharacterTest.scala
+++ b/src/test/scala/playable/MagicCharacterTest.scala
@@ -1,20 +1,16 @@
 package playable
 
-import model.playable.MagicCharacter
+import model.playable.{APlayable, MagoBlanco, MagoNegro}
 import munit.FunSuite
 class MagicCharacterTest extends FunSuite {
-  var Alexis: MagicCharacter = _ // We declare a variable Alexis of type MagicCharacter
-  var Vidal: MagicCharacter = _ // We declare a variable Vidal of type MagicCharacter
+  var Alexis: APlayable = _ // We declare a variable Alexis of type MagicCharacter
+  var Vidal: APlayable = _ // We declare a variable Vidal of type MagicCharacter
 
   override def beforeEach(context: BeforeEach): Unit = {
     // Creates a new instance of the Magic Character class with the specified parameters:
-    Alexis = new MagicCharacter("Alexis", 80, // - Name: Alexis // - Life: 80
-                                      55, 65, // - Defence : 55 // - Weight: 65
-                                      "Mago Blanco", false, 90) // - Kind: Mago Blanco // - Weapon: false
+    Alexis = new MagoBlanco("Alexis")  // - Kind: Mago Blanco // - Weapon: false
     // Creates a new instance of the Magic Character class with the specified parameters:
-    Vidal = new MagicCharacter("Vidal", 90, // - Name: Vidal // - Life: 90
-                                   100, 70, // - Defence : 100 // - Weight: 70
-                                   "Mago Negro", true, 50) // - Kind: Mago Negro // - Weapon: true
+    Vidal = new MagoNegro("Vidal") // - Kind: Mago Negro // - Weapon: true
 
   }
   test("equalsName") { // Test if the sayName method behaves correctly
@@ -30,8 +26,8 @@ class MagicCharacterTest extends FunSuite {
     assertNotEquals(name1, name2) // Assert that the two names are not equal
   }
   test("equalsLife") { // Test if the returned life value for a character matches the expected value
-    var life = Alexis.sayLife() // Retrieve the life value of the character Alexis and store it in the 'life' variable
-    var expected: Int = 80 // Define the expected life value
+    var life = Alexis.life // Retrieve the life value of the character Alexis and store it in the 'life' variable
+    var expected: Int = 50 // Define the expected life value
     assertEquals(life, expected) // Compare the actual life value with the expected value
   }
   test("NotEqualsLife") { // Test if the life values of two different characters are not equal
@@ -39,56 +35,38 @@ class MagicCharacterTest extends FunSuite {
     var life2 = Vidal.sayLife() // Retrieve the life value of the character Vidal and store it in the 'life2' variable
     assertNotEquals(life1, life2) // Assert that the life values of Alexis and Vidal are not equal
   }
-  test("equalsDefence") { // Test if the returned defense value for a character matches the expected value
-    var defense = Alexis.sayDefence() // Retrieve the defense value of the character Alexis and store it in the 'defense' variable
-    var expected: Int = 55 // Define the expected defense value
-    assertEquals(defense, expected) // Compare the actual defense value with the expected value
-  }
+
   test("NotEqualsDefence") { // Test if the defense values of two different characters are not equal
-    var defense1 = Alexis.sayDefence() // Retrieve the defense value of the character Alexis and store it in the 'defense1' variable
-    var defense2 = Vidal.sayDefence() // Retrieve the defense value of the character Vidal and store it in the 'defense2' variable
+    var defense1 = Alexis.defence // Retrieve the defense value of the character Alexis and store it in the 'defense1' variable
+    var defense2 = Vidal.defence // Retrieve the defense value of the character Vidal and store it in the 'defense2' variable
     assertNotEquals(defense1, defense2) // Assert that the defense values of Alexis and Vidal are not equal
   }
 
-  test("equalsWeight") { // Test if the returned weight value for a character matches the expected value
-    var weight = Alexis.sayWeight() // Retrieve the weight value of the character Alexis and store it in the 'weight' variable
-    var expected: Int = 65 // Define the expected weight value
-    assertEquals(weight, expected) // Compare the actual weight value with the expected value
-  }
+
 
   test("NotEqualsWeight") { // Test if the weight values of two different characters are not equal
-    var weight1 = Alexis.sayWeight() // Retrieve the weight value of the character Alexis and store it in the 'weight1' variable
-    var weight2 = Vidal.sayWeight() // Retrieve the weight value of the character Vidal and store it in the 'weight2' variable
+    var weight1 = Alexis.weight // Retrieve the weight value of the character Alexis and store it in the 'weight1' variable
+    var weight2 = Vidal.weight // Retrieve the weight value of the character Vidal and store it in the 'weight2' variable
     assertNotEquals(weight1, weight2) // Assert that the weight values of Alexis and Vidal are not equal
   }
 
-  test("haveWeapon") { // Test if the character Vidal has a weapon
-    val hasWeapon = Vidal.havWeapon() // Check if the character Vidal has a weapon and store the result in the 'hasWeapon' variable
-    var expected = true // Define the expected value indicating that Vidal has a weapon
-    assertEquals(hasWeapon, expected) // Compare the actual result with the expected value
-  }
 
   test("haveNotWeapon") { // Test if the character Alexis doesn't have a weapon
-    val hasWeapon = Alexis.havWeapon() // Check if the character Alexis has a weapon and store the result in the 'hasWeapon' variable
+    val hasWeapon = Alexis.weapon // Check if the character Alexis has a weapon and store the result in the 'hasWeapon' variable
     var expected = false // Define the expected value indicating that Alexis doesn't have a weapon
     assertEquals(hasWeapon, expected) // Compare the actual result with the expected value
   }
 
-  test("equalsMana") { // Test if the returned mana value for a character matches the expected value
-    var mana = Alexis.sayMana() // Retrieve the mana value of the character Alexis and store it in the 'mana' variable
-    var expected: Int = 90 // Define the expected mana value
-    assertEquals(mana, expected) // Compare the actual mana value with the expected value
-  }
 
   test("NotEqualsMana") { // Test if the mana values of two different characters are not equal
-    var mana1 = Alexis.sayMana() // Retrieve the mana value of the character Alexis and store it in the 'mana1' variable
-    var mana2 = Vidal.sayMana() // Retrieve the mana value of the character Vidal and store it in the 'mana2' variable
+    var mana1 = Alexis.mana // Retrieve the mana value of the character Alexis and store it in the 'mana1' variable
+    var mana2 = Vidal.mana // Retrieve the mana value of the character Vidal and store it in the 'mana2' variable
     assertNotEquals(mana1, mana2) // Assert that the mana values of Alexis and Vidal are not equal
   }
 
   test("equalsMagicKind") { // Test if the returned magic kind for a character matches the expected value
-    var magicKind = Alexis.sayKind() // Retrieve the magic kind of the character Alexis and store it in the 'magicKind' variable
-    var expected: String = "Mago Blanco" // Define the expected magic kind
+    var magicKind = Alexis.kind // Retrieve the magic kind of the character Alexis and store it in the 'magicKind' variable
+    var expected: String = "MagoBlanco" // Define the expected magic kind
     assertEquals(magicKind, expected) // Compare the actual magic kind with the expected value
   }
 
@@ -99,14 +77,14 @@ class MagicCharacterTest extends FunSuite {
   }
 
   test("equalsMagicCharacter") { // Test if two references to the same magic character are equal
-    val pmc: MagicCharacter = Alexis // Create a reference to the character Alexis and assign it to the variable 'pmc'
+    val pmc: APlayable = Alexis // Create a reference to the character Alexis and assign it to the variable 'pmc'
     var expected = Alexis // Define the expected value as the character Alexis
     assertEquals(pmc, expected) // Compare the actual reference with the expected value
   }
 
   test("NotEqualsMagicCharacter") { // Test if two references to different magic characters are not equal
-    val pmc1: MagicCharacter = Alexis // Create a reference to the character Alexis and assign it to the variable 'pmc1'
-    val pmc2: MagicCharacter = Vidal // Create a reference to the character Vidal and assign it to the variable 'pmc2'
+    val pmc1: APlayable = Alexis // Create a reference to the character Alexis and assign it to the variable 'pmc1'
+    val pmc2: APlayable = Vidal // Create a reference to the character Vidal and assign it to the variable 'pmc2'
     assertNotEquals(pmc1, pmc2) // Assert that the references to Alexis and Vidal are not equal
   }
 

From 0e49facecec7ddefe38b1afa5687dba0066b417a Mon Sep 17 00:00:00 2001
From: Baasty-Och <bastian.olguin@ug.uchile.cl>
Date: Mon, 22 Apr 2024 22:40:27 -0400
Subject: [PATCH 128/128] FEAT: added some comments in 'Controller' class

---
 src/main/scala/model/controller/Controller.scala | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/scala/model/controller/Controller.scala b/src/main/scala/model/controller/Controller.scala
index 477dcc7..095d2c2 100644
--- a/src/main/scala/model/controller/Controller.scala
+++ b/src/main/scala/model/controller/Controller.scala
@@ -2,6 +2,11 @@ package model.controller
 
 
 class Controller {
+  // tuve problemas con mi licencia de intellij, lo solucione hoy y no me dio tiempo a terminar esta parte
+  // si arreglé varias cosas que no estaban del  buenas en la entrega parcial 1
+  // el cuerpo docente ya esta al tanto de la situacion
+
+