Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

El Legado De Pintia
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

9beb33d9

Commit 9beb33d9 authored 5 months ago by diegval

Downloads
- Plain Diff

Merge branch 'merge-de-efectos-trampa' into 'develop'

Fix: Hechos los efectos trampa más modulares

See merge request !44

parents 437bb79f b0afab56

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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/EfectoUtilizarObjetoUtil.kt 16 additions, 0 deletions

...oradoresDePintia/model/efecto/EfectoUtilizarObjetoUtil.kt
app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/TrampaFactory.kt 27 additions, 9 deletions

...exploradoresDePintia/model/eventoFactory/TrampaFactory.kt

with 72 additions and 47 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment