Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tarea 1 - Entrega Final #3

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8e33838
EST Added initial packages and first tests
JTJetc Apr 7, 2024
a82eb05
FIX Corrected magictrainer mana test
JTJetc Apr 7, 2024
3afe36b
FEAT Added Unit trait and AbstractCharacter abstract class
JTJetc Apr 7, 2024
2ff14a7
FEAT Added Character Class and fixed typos
JTJetc Apr 7, 2024
cf11a5e
FEAT Added auxiliary constructors for Character class and refactored …
JTJetc Apr 7, 2024
1c796b5
FIX Added Weapon trait and current tests run successfully
JTJetc Apr 7, 2024
b9b01f7
FIX Improved coverage
JTJetc Apr 7, 2024
f44cab7
REFACTOR Added ICharacter trait between Units and AbstractCharacter f…
JTJetc Apr 7, 2024
157d60e
FEAT Added Party class
JTJetc Apr 7, 2024
c6c21bd
REFACTOR Added DummyCharacter for isAlive method
JTJetc Apr 7, 2024
7316535
REFACTOR Split Character into two classes, adding MagicCharacter
JTJetc Apr 9, 2024
4e2e4d3
FEAT! Added Character 'Classes' aka Professions
JTJetc Apr 9, 2024
5cf2f38
FEAT Added Enemy Trait
JTJetc Apr 10, 2024
054eefe
FEAT Added Common and Magic Weapons
JTJetc Apr 10, 2024
1a084eb
DOC Added project explaining to the readme
JTJetc Apr 10, 2024
d6df54f
FEAT Added EnemyClass
JTJetc Apr 12, 2024
8b23970
DOC Added documentation and renamed WhiteMage and BlackMage to White …
JTJetc Apr 13, 2024
3dfb2bc
DOC Added more documentation and fixed miscellaneous typos
JTJetc Apr 13, 2024
4f28259
Branch Creation
JTJetc Apr 16, 2024
22ded8d
FEAT Added Programmer Class and tests
JTJetc Apr 16, 2024
ead7b7a
FEAT Added add methods to programmer
JTJetc Apr 21, 2024
ee4be6c
FEAT Added actionbar for characters
JTJetc Apr 21, 2024
bfca82b
FEAT Added actionbar for enemies
JTJetc Apr 21, 2024
f54fac7
FEAT Added step method
JTJetc Apr 21, 2024
4e0fe65
FEAT Added anyturn checking method
JTJetc Apr 21, 2024
0da4276
FEAT Added getTurn method
JTJetc Apr 21, 2024
9f42b4e
FEAT Added setting actionbar back to zero
JTJetc Apr 21, 2024
9cac4ca
FEAT Added last touchs for finding and getting turns
JTJetc Apr 23, 2024
b2af248
FEAT Added remove method for party and programmer
JTJetc Apr 23, 2024
4e46173
DOC Added more documentation
JTJetc Apr 23, 2024
e5034d6
Branch creation
JTJetc Apr 25, 2024
327833c
Added Privatization
JTJetc May 11, 2024
c012df9
Added placeholderEquipWeapon method
JTJetc May 11, 2024
5f3f2a3
Added Max values, and the use of require to avoid illegal values
JTJetc May 11, 2024
46ce456
Added attacking and taking damage methods
JTJetc May 12, 2024
33ec4a7
Added more tests
JTJetc May 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
FEAT Added auxiliary constructors for Character class and refactored …
…Unit to Units to avoid confusion
JTJetc committed Apr 7, 2024

Verified

This commit was signed with the committer’s verified signature.
niladrih Niladri Halder
commit cf11a5efa830697466178b095007bc0649de7716
2 changes: 1 addition & 1 deletion src/main/scala/unit/AbstractCharacter.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package unit

abstract class AbstractCharacter extends Unit {
abstract class AbstractCharacter extends Units {
var heldweapon: Weapon = _
}
22 changes: 20 additions & 2 deletions src/main/scala/unit/Character.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
package unit

class Character(val name: String = "Unknown",var life: Int = 0,var defense: Int = 0,val weight: Double = 0.1,val profession: String) extends AbstractCharacter {

class Character(val name: String = "Unknown",var life: Int = 0,var defense: Int = 0,val weight: Double = 0.1,val profession: String, var mana:Int=0) extends AbstractCharacter {
def this(x: String, l: Int, w: Double, p: String) = {
this(x, l, defense, w, p)
}

def this(x: String, l: Int, w: Int, p: String) = {
this(x, l, w.toDouble, p)
}

def this(x: String, l: Int, d: Int, w: Int, p: String) = {
this(x, l, d, w.toDouble, p)
}

def this(x: String, l: Int, w: Double, p: String, m: Int) = {
this(x, l, defense, w, p, m)
}

def this(x: String, l: Int, w: Int, p: String, m: Int) = {
this(x, l, w.toDouble, p, m)
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package unit

trait Unit {
trait Units {
val name: String
var life: Int
var defense: Int
17 changes: 15 additions & 2 deletions src/test/scala/unit/CharacterTest.scala
Original file line number Diff line number Diff line change
@@ -3,22 +3,35 @@ package unit
class CharacterTest extends munit.FunSuite {
var trainer: Character = _
var magictrainer: Character = _
var weakcharacter: Character = _
var weakcharacter2: Character = _
var weakcharacter3: Character = _

override def beforeEach(context: BeforeEach): Unit = {
trainer = new Character("TrainerOne",100,50,32.5,"Paladin")
magictrainer = new Character("TrainerTwo",20,5,25.0,"BlackMage",1000)
trainer = new Character("TrainerOne", 100, 50, 32.5, "Paladin")
magictrainer = new Character("TrainerTwo", 20, 5, 25, "BlackMage", 1000)
weakcharacter = new Character("TrainerOne", 100, 30, "Ninja")
weakcharacter2 = new Character("TrainerOne", 100, 32.5, "WhiteMage",1)
weakcharacter3 = new Character("TrainerOne", 100, 10, "WhiteMage",1)
}
test("Character constructor checks"){
assertEquals(trainer.name,"TrainerOne")
assertEquals(trainer.life,100)
assertEquals(trainer.defense,50)
assertEquals(trainer.weight,32.5)
assertEquals(trainer.profession,"Paladin")
assertEquals(trainer.mana,0)
assertEquals(magictrainer.name,"TrainerTwo")
assertEquals(magictrainer.life,20)
assertEquals(magictrainer.defense,5)
assertEquals(magictrainer.weight,25.0)
assertEquals(magictrainer.profession,"BlackMage")
assertEquals(magictrainer.mana,1000)
assertEquals(weakcharacter.weight,30.0)
assertEquals(weakcharacter.defense,0)
assertEquals(weakcharacter2.weight,32.5)
assertEquals(weakcharacter2.defense,0)
assertEquals(weakcharacter3.weight,10.0)
assertEquals(weakcharacter3.defense,0)
}
}