Commit 41105366 authored 5 months ago by izajime

Merge branch 'tienda' into 'ciudad'

Tienda to guapa

See merge request !51

parents 55491b1d 65544312

Hide whitespace changes

Inline Side-by-side

Showing

.idea/deploymentTargetSelector.xml 10 additions, 0 deletions

.idea/deploymentTargetSelector.xml
app/src/main/AndroidManifest.xml 1 addition, 0 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/com/example/ellegadodepintia/MapActivity.kt 6 additions, 0 deletions

...src/main/java/com/example/ellegadodepintia/MapActivity.kt
app/src/main/java/com/example/ellegadodepintia/TiendaActivity.kt 139 additions, 0 deletions

.../main/java/com/example/ellegadodepintia/TiendaActivity.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/Resumen.kt 53 additions, 8 deletions

.../example/ellegadodepintia/exploradoresDePintia/Resumen.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/Jugador.kt 16 additions, 23 deletions

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

...llegadodepintia/exploradoresDePintia/model/LayoutUtils.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoEscalar.kt 0 additions, 22 deletions

...pintia/exploradoresDePintia/model/efecto/EfectoEscalar.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoFuerzaBruta.kt 0 additions, 16 deletions

...ia/exploradoresDePintia/model/efecto/EfectoFuerzaBruta.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoResolverTrampaConAtributo.kt 29 additions, 0 deletions

...sDePintia/model/efecto/EfectoResolverTrampaConAtributo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoRiesgo.kt 4 additions, 2 deletions

...epintia/exploradoresDePintia/model/efecto/EfectoRiesgo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoUtilizarObjetoUtil.kt 16 additions, 0 deletions

...oradoresDePintia/model/efecto/EfectoUtilizarObjetoUtil.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoFactorySelector.kt 2 additions, 2 deletions

...oresDePintia/model/eventoFactory/EventoFactorySelector.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/EventoRiesgo.kt 15 additions, 1 deletion

.../exploradoresDePintia/model/eventoFactory/EventoRiesgo.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/ReliquiaFactory.kt 5 additions, 26 deletions

...ploradoresDePintia/model/eventoFactory/ReliquiaFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt 54 additions, 24 deletions

...exploradoresDePintia/model/eventoFactory/RiesgoFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/TiendaFactory.kt 6 additions, 30 deletions

...exploradoresDePintia/model/eventoFactory/TiendaFactory.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/TrampaFactory.kt 26 additions, 8 deletions

...exploradoresDePintia/model/eventoFactory/TrampaFactory.kt
app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt 7 additions, 4 deletions

...legadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioJugador.kt 15 additions, 1 deletion

...ample/ellegadodepintia/repositorios/RepositorioJugador.kt

with 411 additions and 167 deletions

Please register or to comment