Code

Tarea 1 - Entrega Parcial 2#2

Code

Open

Baasty-OCh wants to merge 128 commits intomaindcc-cc3002/final-reality-Baasty-OCh:mainfrom entrega-parcial-2dcc-cc3002/final-reality-Baasty-OCh:entrega-parcial-2Copy head branch name to clipboard

+703

Commits

Commits on Apr 5, 2024

• FEAT add Personaje class

  Baasty-OCh

  committed
  2059de3

Commits on Apr 6, 2024

• REFACTOR: changed class 'PersonajeTest2' for 'PlayableTest'

  Baasty-OCh

  committed
  ccf69e9

• REFACTOR: changed the package 'pj' for 'playable'

  Baasty-OCh

  committed
  876d063

• FEAT: added nonplayable trait

  Baasty-OCh

  committed
  6e8121d

• FEAT: added playable trait

  Baasty-OCh

  committed
  37732b4

• DOC: added methods 'sayName','sayLife','sayDefence','sayWeight','sayKind','checkWeapon' in trait Playable

  Baasty-OCh

  committed
  6ff4bb4

• DOC: added methods 'sayName','sayLife','sayDefence','sayWeight','sayKind','checkWeapon' in trait Playable

  Baasty-OCh

  committed
  d8e3fc4

• TEST: added test 'equalsName' in class 'PlayableTest'

  Baasty-OCh

  committed
  8ef9df8

Commits on Apr 7, 2024

• DOC: added method 'sayName' in class 'Character'

  Baasty-OCh

  committed
  4da32eb

• DOC: added method 'sayLife' in class 'Character'

  Baasty-OCh

  committed
  7bca4c0

• DOC: added method 'sayDefence' in class 'Character'

  Baasty-OCh

  committed
  c752b77

• DOC: added method 'sayWeight' in class 'Character'

  Baasty-OCh

  committed
  435dc0f

• REFACTOR: changed all instances of method 'checkWeapon' for put 'putWeapon' in trait 'Playable'

  Baasty-OCh

  committed
  ca2ac3e

• TEST: added test 'NotequalsName' in class 'PlayableTest'

  Baasty-OCh

  committed
  c898f9b

• TEST: added test 'equalsLife' in class 'PlayableTest'

  Baasty-OCh

  committed
  0ee178e

• TEST: added test 'NotEqualsLife' in class 'PlayableTest'

  Baasty-OCh

  committed
  945630b

• TEST: added test 'equalsDefence' in class 'PlayableTest'

  Baasty-OCh

  committed
  b3c6089

• TEST: added test NotEqualsDefence' in class 'PlayableTest'

  Baasty-OCh

  committed
  7167c40

• TEST: added test 'equalsWeight' in class 'PlayableTest'

  Baasty-OCh

  committed
  51c9bd3

• TEST: added test NotEqualsWeight' in class 'PlayableTest'

  Baasty-OCh

  committed
  bb62954

• TEST: added test 'equalsKind' in class 'PlayableTest'

  Baasty-OCh

  committed
  00cadf0

• TEST: added test NotEqualsKind' in class 'PlayableTest'

  Baasty-OCh

  committed
  6badacf

• TEST: added test 'equalsWeapon' in class 'PlayableTest'

  Baasty-OCh

  committed
  02dc737

• TEST: added test NotEqualsWeapon' in class 'PlayableTest'

  Baasty-OCh

  committed
  e2299ce

• FEAT: added class 'MagicCharacter' in package 'playable'

  Baasty-OCh

  committed
  fc5d741

• DOC: added methods 'sayName','sayLife','sayDefence','sayWeight','sayKind','putWeapon' in class 'MagicCharacter'

  Baasty-OCh

  committed
  3dbd21f

• DOC: added method 'sayMana' in class 'MagicCharacter'

  Baasty-OCh

  committed
  6aca872

• TEST: added test 'equalsMana' in class 'PlayableTest'

  Baasty-OCh

  committed
  ba1312f

• TEST: added test NotEqualsMana' in class 'PlayableTest'

  Baasty-OCh

  committed
  4b737d5

• TEST: added test 'equalsMagicKind' in class 'PlayableTest'

  Baasty-OCh

  committed
  d9f36d3

• TEST: added test NotEqualsMagicKind' in class 'PlayableTest'

  Baasty-OCh

  committed
  82d97d1

• FEAT: deleted methods 'sayName','sayLife','sayDefence','sayWeight','sayKind','putWeapon' in class 'MagicCharacter' in package 'playable'

  Baasty-OCh

  committed
  b389ec7

• FEAT: added method 'sayName' in trait 'NonPlayable' in package 'nonplayable'

  Baasty-OCh

  committed
  5dd75c7

• FEAT: added method 'sayWeight' in trait 'NonPlayable' in package 'nonplayable'

  Baasty-OCh

  committed
  d51f916

• FEAT: added method 'sayAttack' in trait 'NonPlayable' in package 'nonplayable'

  Baasty-OCh

  committed
  f3beff6

• FEAT: added class 'weapon' in package 'nonplayable'

  Baasty-OCh

  committed
  89732fc

• REFACTOR: changed all instances of class 'weapon' for put 'Weapon' in package 'nonplayable'

  Baasty-OCh

  committed
  4e17441

• FEAT: added method 'sayName' in class 'Weapon' in package 'nonplayable'

  Baasty-OCh

  committed
  6695efb

• FEAT: added method 'sayWeight' in class 'Weapon' in package 'nonplayable'

  Baasty-OCh

  committed
  7dbfe93

• FEAT: added method 'sayAttack' in class 'Weapon' in package 'nonplayable'

  Baasty-OCh

  committed
  a5e362b

• REFACTOR: changed all instances of trait 'Nonplayable' for put 'NonPlayable' in package 'nonplayable'

  Baasty-OCh

  committed
  5c80b54

• FEAT: added class 'NonPlayableTest' in package 'test'

  Baasty-OCh

  committed
  07aafc6

• TEST: added test 'equalsName' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  932c0b0

• TEST: added test 'NotEqualsName' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  a8d84f3

• TEST: added test 'equalsWeight' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  d75be85

• TEST: added test 'NotEqualsWeight' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  cb4ca05

• TEST: added test 'equalsAttack' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  3ef4281

• TEST: added test 'NotEqualsAttack' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  39524ee

• FEAT: added class 'MagicWeapon' in package 'nonplayable'

  Baasty-OCh

  committed
  8975158

• FEAT: added method 'sayMana' in class 'MagicWeapon' in package 'nonplayable'

  Baasty-OCh

  committed
  08f907a

• TEST: added test 'equalsMana' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  a78e4b8

• TEST: added test 'NotEqualsMana' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  9b7f7f9

• REFACTOR: changed all instances of var 'ataque' for put 'mana' in test 'equalsMana' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  71da2ac

• FEAT: added method 'sayOwner' in class 'Weapon' in package 'nonplayable'

  Baasty-OCh

  committed
  70294c6

• TEST: added test 'equalsOwner' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  11061c4

• FEAT: override method 'sayOwner' in class 'MagicWeapon' in package 'nonplayable'

  Baasty-OCh

  committed
  89be0f2

• FEAT: deleted method 'sayOwner' in class 'MagicWeapon' in package 'nonplayable'

  Baasty-OCh

  committed
  6668b27

• FEAT: added methods 'sayMagicOwner','sayMana','sayName','sayWeight','sayAttack' in class 'MagicWeapon' in package 'nonplayable'

  Baasty-OCh

  committed
  589f280

• TEST: added test 'equalsMagicOwner' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  6527442

• TEST: added test 'NotEqualsMagicOwner' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  faa0bc7

• FEAT: added class 'Enemy' in package 'nonplayable'

  Baasty-OCh

  committed
  e6f2879

• FEAT: added methods 'sayLife','sayDefence','sayName','sayWeight','sayAttack' in class 'Enemy' in package 'nonplayable'

  Baasty-OCh

  committed
  9eecf39

• TEST: added test 'EqualsEnemyName' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  353a2e8

• REFACTOR: changed test 'EqualsEnemyName for 'equalsEnemyName' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  e0afa60

• TEST: added test 'NotEqualsEnemyName' in class 'NonPlayableTest'

  Baasty-OCh

  committed
  048249e

• FEAT: added class 'WeaponTest' in package 'test'

  Baasty-OCh

  committed
  0036a5f

• FEAT: added class 'MagicWeaponTest' in package 'test'

  Baasty-OCh

  committed
  1570b11

• REFACTOR: changed class 'NonPlayableTest' for 'EnemyTest' in package 'Test'

  Baasty-OCh

  committed
  ecdda6b

• FEAT: added test 'equalsName','NotEqualsName', 'equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack', 'equalOwner', 'NotEqualsOwner' in class 'WeaponTest'

  Baasty-OCh

  committed
  4a7cb95

• FEAT: added test 'equalsMana','NotEqualsMana', 'equalMagicOwner', 'NotEqualsMagicOwner' in class 'MagicWeaponTest'

  Baasty-OCh

  committed
  d96e786

• FEAT: deleted test 'equalsMana','NotEqualsMana', 'equalMagicOwner', 'NotEqualsMagicOwner' in class 'EnemyTest'

  Baasty-OCh

  committed
  5e8172e

• FEAT: added test 'equalsName','NotEqualsName', 'equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack' in class 'MagicWeaponTest'

  Baasty-OCh

  committed
  aa96c51

• FEAT: added test 'equalsName','NotEqualsName', 'equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack','equalsAttack', 'NotEqualsAttack','equalsDefence','NotEqualsdefence' in class 'Enemy…

  Show description for f6b0762
  Baasty-OCh

  committed
  f6b0762

Commits on Apr 12, 2024

• REFACTOR: edited methods 'sayName', 'sayLife','sayDefence', 'sayWeight', 'sayKind' and renamed 'putWeapon' for 'havWeapon'in trait 'Playable' in package 'playable'

  Baasty-OCh

  committed
  1fb9131

• REFACTOR: edited methods 'sayName', 'sayLife','sayDefence', 'sayWeight', 'sayKind' and renamed 'putWeapon' for 'havWeapon'in class 'Character' in package 'playable'

  Baasty-OCh

  committed
  d2834ad

• REFACTOR: added methods 'sayName', 'sayLife','sayDefence', 'sayWeight', 'sayKind', 'putWeapon' and edited 'sayMana' in class 'MagicCharacter' in package 'playable'

  Baasty-OCh

  committed
  0e2f644

• REFACTOR: edited test 'equalsName','NotequalsName','equalsLife','NotequalsLife','equalsDefence','NotEqualsDefence','equalsWeight','NotEqualsWeight','equalsKind','NotEqualsKind','equalsWeapon','NotE…

  Show description for 2860925
  Baasty-OCh

  committed
  2860925

• REFACTOR: edited test 'equalsMagicKind','NotequalsMagicKind'and deleted 'equalsWeapon' and 'NotEqualsWeapon' in Test 'PlayableTest'

  Baasty-OCh

  committed
  c0839f0

• REFACTOR: edited methods 'sayName' 'sayWeight' and 'sayAttack' in trait 'NonPlayable' in package 'nonplayable'

  Baasty-OCh

  committed
  324f3f3

• REFACTOR: edited methods 'sayName', 'sayLife','sayDefence', 'sayWeight', 'sayAttack' in class 'Enemy' in package 'nonplayable'

  Baasty-OCh

  committed
  87be12b

• REFACTOR: edited methods 'sayName', 'sayAttack','sayDefence', 'sayWeight', 'sayOwner' and 'sayMana' in class 'MagicWeapon' in package 'nonplayable'

  Baasty-OCh

  committed
  369e30f

• REFACTOR: edited methods 'sayName', 'sayAttack','sayDefence', 'sayWeight', 'sayOwner' in class 'Weapon' in package 'nonplayable'

  Baasty-OCh

  committed
  91c9bb8

• REFACTOR: edited test 'equalsName','NotequalsName','equalsLife','NotequalsLife','equalsDefence','NotEqualsDefence','equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack' in Test 'EnemyTest'

  Baasty-OCh

  committed
  ed6da5e

• REFACTOR: edited test 'equalsName','NotequalsName','equalsMana','NotequalsMana','equalsMagicOwner','NotEqualsMagicOwner','equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack' in Test 'E…

  Show description for ae3d927
  Baasty-OCh

  committed
  ae3d927

• REFACTOR: edited test 'equalsName','NotequalsName',,'equalsOwner','NotEqualsOwner','equalsWeight','NotEqualsWeight','equalsAttack','NotEqualsAttack' in Test 'WeaponTest'

  Baasty-OCh

  committed
  d0f854a

• REFACTOR: override method equals in class 'Character' in 'playable' package

  Baasty-OCh

  committed
  36107c0

• REFACTOR: override method equals in class 'MagicCharacter' in 'playable' package

  Baasty-OCh

  committed
  0e57eb8

• REFACTOR: added test 'equals' and 'NotEquals' in Test 'PlayableTest'

  Baasty-OCh

  committed
  9de2508

• REFACTOR: added test 'equalsMagicCharacter' and 'NotEqualsMagicCharacter' in Test 'PlayableTest'

  Baasty-OCh

  committed
  06db54e

• REFACTOR: added 4 cast in method equals in class 'Character' in 'playable' package

  Baasty-OCh

  committed
  09dd495

Commits on Apr 13, 2024

• DOC: splited 'PlayableTest' in 'CharacterTest' and 'MagicCharacterTest'

  Baasty-OCh

  committed
  61dab3e

• TEST: added test 'equalsMana','NotEqualsMana', 'equalsMagicKind', 'NotEqualsMagicKind','equalsMagicCharacter','NotEqualsMagicCharacter' in class 'MagicCharacterTest'

  Baasty-OCh

  committed
  9736143

• REFACTOR: changed name of 'PlayableTest' for 'CharacterTest' in package test.scala

  Baasty-OCh

  committed
  569f5e0

• TEST: added test 'equalsName','NotEqualsName' in class 'MagicCharacterTest'

  Baasty-OCh

  committed
  27888b0

• TEST: added test 'equalsLife','NotEqualsLife' in class 'MagicCharacterTest'

  Baasty-OCh

  committed
  f937dde

• TEST: added test 'equalsDefence','NotEqualsDefence', 'equalsWeight','NotEqualsWeight' in class 'MagicCharacterTest'

  Baasty-OCh

  committed
  3987ad6

• TEST: added test 'haveWeapon', 'haveNotWeapon' in class 'MagicCharacterTest'

  Baasty-OCh

  committed
  38554b6

• TEST: added test 'haveWeapon', 'haveNotWeapon' in class 'CharacterTest'

  Baasty-OCh

  committed
  5510302

• TEST: added test 'equalsMagicOwner' in class 'MagicWeaponTest'

  Baasty-OCh

  committed
  46f75bb

• REFACTOR: added method 'addCharacter' in class 'Party' in package model

  Baasty-OCh

  committed
  b032b36

• REFACTOR: changed method 'addCharacter' for 'addPlayable' in class 'Party' in package model

  Baasty-OCh

  committed
  8a4edf5

• REFACTOR: changed all instance of var 'character' for 'pj' in method 'addCharacter' in class 'Party' in package model

  Baasty-OCh

  committed
  d1311c1

• DOC: added 'PartyTest' in scala.test

  Baasty-OCh

  committed
  b1abc31

• FEAT: added var Team1 in PartyTest class

  Baasty-OCh

  committed
  1759fe3

• FEAT: added var 'Cristiano' and ' Alexis' in PartyTest class

  Baasty-OCh

  committed
  e071223

• TEST: added test 'addPersonaje' in class 'PartyTest'

  Baasty-OCh

  committed
  8d56dc9

• TEST: added test 'addMagicCharacter' in class 'PartyTest'

  Show description for 91759f1
  Baasty-OCh

  committed
  91759f1

• TEST: added test 'isEmpty' in class 'PartyTest'

  Show description for 652e3d1
  Baasty-OCh

  committed
  652e3d1

• TEST: added test 'isDefeat' in class 'PartyTest'

  Baasty-OCh

  committed
  1802621

• TEST: added test 'isNotDefeat' in class 'PartyTest'

  Baasty-OCh

  committed
  9a5b5ad

• DOC: Document all my code of 'PartyTest in English.

  Baasty-OCh

  committed
  8432f0e

• DOC: Document all my code of 'MagicCharacterTest' and 'CharacterTest' in English.

  Baasty-OCh

  committed
  a44f810

• DOC: Document all my code of 'WeaponTest' in English.

  Baasty-OCh

  committed
  1f336d7

• DOC: Document all my code of 'EnemyTest' in English.

  Baasty-OCh

  committed
  abff0e6

• DOC: Document all my code of 'MagicWeaponTest' in English.

  Show description for 792372f
  Baasty-OCh

  committed
  792372f

• DOC: Document all my code of class 'MagicCharacter' in English.

  Baasty-OCh

  committed
  a2ebacc

• DOC: Document all my code of class 'Character' in English.

  Baasty-OCh

  committed
  ff3052c

• DOC: Document all my code of class 'Party' in English.

  Baasty-OCh

  committed
  59577b6

• DOC: Document all my code of trait 'NonPlayable' in English.

  Baasty-OCh

  committed
  acecb52

• DOC: Document all my code of class 'Weapon' in English.

  Baasty-OCh

  committed
  7470a94

• DOC: Document all my code of class 'MagicWeapon' in English.

  Baasty-OCh

  committed
  9fd2a7a

• DOC: Document all my code of class 'Enemy' in English.

  Baasty-OCh

  committed
  5be2492

Commits on Apr 22, 2024

• REFACTOR: moved 'WeaponTest', 'EnemyTest', 'MagicWeaponTest' to new package 'nonplayable' in scala in test

  Baasty-OCh

  committed
  4230bec

Commits on Apr 23, 2024

• DOC: I wrote my read.me

  Baasty-OCh

  committed
  9161538

• DOC: I created class Controller

  Baasty-OCh

  committed
  313d2ed

• FEAT: created abstrac class 'APlayable' and changed the class 'Character'

  Baasty-OCh

  committed
  ac8fa13

• FEAT: created classes 'MagoNegro' and ' MagoBlanco', i changed all instance of 'Character' and ' MagicCharacter' for APlayable

  Baasty-OCh

  committed
  b2ab71c

• FEAT: added some comments in 'Controller' class

  Baasty-OCh

  committed
  0e49fac