Commit c0cb584a authored 4 months ago by viccall

Merge branch 'develop' into 'intefaces'

# Conflicts:
#   app/src/main/res/layout/activity_exploradores_de_pintia.xml

parents 49977506 0669ca71

No related branches found

No related tags found

2 merge requests!65Feature:,!57Feature:

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalDetallesEnemigo.kt 1 addition, 1 deletion

...gadodepintia/exploradoresDePintia/ModalDetallesEnemigo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Atributo.kt 2 additions, 1 deletion

...e/ellegadodepintia/exploradoresDePintia/model/Atributo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GeneradorDeEventos.kt 8 additions, 2 deletions

...depintia/exploradoresDePintia/model/GeneradorDeEventos.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorCombate.kt 31 additions, 12 deletions

...egadodepintia/exploradoresDePintia/model/GestorCombate.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorDeEventos.kt 0 additions, 1 deletion

...adodepintia/exploradoresDePintia/model/GestorDeEventos.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt 3 additions, 9 deletions

...le/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoAtaqueEnemigo.kt 1 addition, 1 deletion

.../exploradoresDePintia/model/efecto/EfectoAtaqueEnemigo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoAtaqueProtagonista.kt 1 addition, 1 deletion

...oradoresDePintia/model/efecto/EfectoAtaqueProtagonista.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoDestruir.kt 8 additions, 1 deletion

...intia/exploradoresDePintia/model/efecto/EfectoDestruir.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoReparar.kt 1 addition, 1 deletion

...pintia/exploradoresDePintia/model/efecto/EfectoReparar.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoRevivirEnemigo.kt 27 additions, 0 deletions

...exploradoresDePintia/model/efecto/EfectoRevivirEnemigo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/CombateFactory.kt 44 additions, 30 deletions

...xploradoresDePintia/model/eventoFactory/CombateFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/Evento.kt 5 additions, 0 deletions

...pintia/exploradoresDePintia/model/eventoFactory/Evento.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoCombate.kt 1 addition, 0 deletions

...exploradoresDePintia/model/eventoFactory/EventoCombate.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/ReliquiaFactory.kt 43 additions, 11 deletions

...ploradoresDePintia/model/eventoFactory/ReliquiaFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/habilidad/efectoHabilidad/EfectoGolpeMultiple.kt 1 addition, 1 deletion

...ia/model/habilidad/efectoHabilidad/EfectoGolpeMultiple.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/objeto/efectoObjeto/EfectoEquipableHabilidad.kt 14 additions, 0 deletions

...tia/model/objeto/efectoObjeto/EfectoEquipableHabilidad.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/objeto/efectoObjeto/EfectoObjetoAtacar.kt 9 additions, 0 deletions

...sDePintia/model/objeto/efectoObjeto/EfectoObjetoAtacar.kt
app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt 81 additions, 40 deletions

...ample/ellegadodepintia/repositorios/RepositorioObjetos.kt
app/src/main/res/drawable-nodpi/asi_objeto_veneno2.png 0 additions, 0 deletions

app/src/main/res/drawable-nodpi/asi_objeto_veneno2.png

with 281 additions and 112 deletions

Please register or to comment