Commit 7d159646 authored 6 months ago by diegval

Merge branch 'combate' into 'develop'

Combate

See merge request !28

parents 8f93441d 341c8db4

Branches

No related tags found

2 merge requests!65Feature:,!28Combate

Show whitespace changes

Inline Side-by-side

Showing

app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ExploradoresDePintia.kt 3 additions, 0 deletions

...gadodepintia/exploradoresDePintia/ExploradoresDePintia.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalDetallesEnemigo.kt 63 additions, 0 deletions

...gadodepintia/exploradoresDePintia/ModalDetallesEnemigo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalDetallesFragment.kt 2 additions, 4 deletions

...adodepintia/exploradoresDePintia/ModalDetallesFragment.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/ModalHabilidadesProtagonista.kt 117 additions, 0 deletions

...ntia/exploradoresDePintia/ModalHabilidadesProtagonista.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/GameState.kt 2 additions, 0 deletions

.../ellegadodepintia/exploradoresDePintia/model/GameState.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GeneradorDeEventos.kt 5 additions, 1 deletion

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

...egadodepintia/exploradoresDePintia/model/GestorCombate.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/GestorDeEventos.kt 7 additions, 10 deletions

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

...le/ellegadodepintia/exploradoresDePintia/model/Jugador.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/LayoutUtils.kt 14 additions, 7 deletions

...llegadodepintia/exploradoresDePintia/model/LayoutUtils.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Opcion.kt 5 additions, 5 deletions

...ple/ellegadodepintia/exploradoresDePintia/model/Opcion.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/OpcionCombate.kt 16 additions, 0 deletions

...egadodepintia/exploradoresDePintia/model/OpcionCombate.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoAtaqueEnemigo.kt 2 additions, 2 deletions

.../exploradoresDePintia/model/efecto/EfectoAtaqueEnemigo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoAtaqueProtagonista.kt 3 additions, 17 deletions

...oradoresDePintia/model/efecto/EfectoAtaqueProtagonista.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoDestruir.kt 3 additions, 4 deletions

...intia/exploradoresDePintia/model/efecto/EfectoDestruir.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoHabilidadesProtagonista.kt 39 additions, 0 deletions

...resDePintia/model/efecto/EfectoHabilidadesProtagonista.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoHuirProtagonista.kt 1 addition, 3 deletions

...ploradoresDePintia/model/efecto/EfectoHuirProtagonista.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoIgnorar.kt 1 addition, 2 deletions

...pintia/exploradoresDePintia/model/efecto/EfectoIgnorar.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoInvestigar.kt 4 additions, 4 deletions

...tia/exploradoresDePintia/model/efecto/EfectoInvestigar.kt

with 403 additions and 75 deletions

Please register or to comment