diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoCriticoAutomaticoEnemigo.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoCriticoAutomaticoEnemigo.kt new file mode 100644 index 0000000000000000000000000000000000000000..d3c96c1bbaecf26b00b3a62418f1fc2049eb3319 --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/efecto/EfectoCriticoAutomaticoEnemigo.kt @@ -0,0 +1,20 @@ +package com.example.ellegadodepintia.exploradoresDePintia.model.efecto + +import com.example.ellegadodepintia.exploradoresDePintia.model.GameState +import com.example.ellegadodepintia.exploradoresDePintia.model.GestorCombate +import com.example.ellegadodepintia.exploradoresDePintia.model.Atributo +import com.example.ellegadodepintia.exploradoresDePintia.model.eventoFactory.EventoCombate + +class EfectoCriticoAutomaticoEnemigo(private val stringExito: String) : + Efecto(100) { + override fun ejecutar(): String { + + val evento = GameState.eventoActual as? EventoCombate ?: return "No es un evento de combate" + GestorCombate.cargarAnimacionesAtaqueEnemigo() + val ataqueReal = GestorCombate.calcularAtaque(evento.ataque, 35) + + GameState.jugador.actualizarAtributo(Atributo.Vida, -ataqueReal) + + return stringExito + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/CombateFactory.kt b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/CombateFactory.kt index dd20f2a9b2169350be56abed89db41f5af5fc737..3b60701a0ebae5c8fcbc761cfa97f8f71509832c 100644 --- a/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/CombateFactory.kt +++ b/app/src/main/java/com/example/ellegadodepintia/exploradoresDePintia/model/eventoFactory/CombateFactory.kt @@ -8,6 +8,7 @@ import com.example.ellegadodepintia.exploradoresDePintia.model.OpcionCombate import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.Efecto import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.EfectoAtaqueEnemigo import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.EfectoAtaqueProtagonista +import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.EfectoCriticoAutomaticoEnemigo import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.EfectoHabilidadesProtagonista import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.EfectoHuirProtagonista import com.example.ellegadodepintia.exploradoresDePintia.model.efecto.EfectoInvestigarEnemigo @@ -49,6 +50,14 @@ class CombateFactory : EventoFactory { vidaMax = (5..8).random(), ataque = (1..3).random(), RepositorioObjetos.obtenerObjetoPorNombre("Poción de Veneno II")!! + ), + "Te encuentras con el Lobo Vacceo, sus ojos amarillos te observan fijamente, llenos de una sabidurÃa ancestral y una amenaza latente" to CombateInfo( + imagenIdle = R.drawable.monster_wolf_idle_animation, + imagenAtaque = R.drawable.monster_wolf_attack_animation, + habilidades = listOf(EfectoAtaqueEnemigo(80), EfectoCriticoAutomaticoEnemigo("El lobo te golpea gravemente con sus enormes zarpas")), + vidaMax = (7..11).random(), + ataque = (2..3).random(), + RepositorioObjetos.obtenerObjetoPorNombre("Piel del Gran Lobo")!! ) ) diff --git a/app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt b/app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt index 5ca7f86e3edc003f8dbcc0b4f81ff987d8d7c53a..7f086a2bde645737fe2fdb02350b6698a0c665c0 100644 --- a/app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt +++ b/app/src/main/java/com/example/ellegadodepintia/repositorios/RepositorioObjetos.kt @@ -113,6 +113,12 @@ object RepositorioObjetos { imagen = R.drawable.asi_minijuego_3_sonajero_redondo, coste = 15 ), + ObjetoDeValor( + nombre= "Piel del Gran Lobo", + descripcion = "Piel obtenida del lobo que representa parte de la mitologÃa vaccea. Está valorado en 100 monedas", + imagen = R.drawable.asi_minijuego_3_sonajero_redondo, + coste = 100 + ), //********************************************** // D E U T I L I D A D //********************************************** diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_attack_00.png b/app/src/main/res/drawable-nodpi/monster_wolf_attack_00.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f13b669439d70fa2a7e8fd0711f148c5f7ce5b Binary files /dev/null and b/app/src/main/res/drawable-nodpi/monster_wolf_attack_00.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_attack_01.png b/app/src/main/res/drawable-nodpi/monster_wolf_attack_01.png new file mode 100644 index 0000000000000000000000000000000000000000..18be854c4c5797382f446ce3d56b05457aa1c554 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/monster_wolf_attack_01.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_attack_02.png b/app/src/main/res/drawable-nodpi/monster_wolf_attack_02.png new file mode 100644 index 0000000000000000000000000000000000000000..cd46c8e825abb1be6278d1e1457657a115a16083 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/monster_wolf_attack_02.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_attack_03.png b/app/src/main/res/drawable-nodpi/monster_wolf_attack_03.png new file mode 100644 index 0000000000000000000000000000000000000000..815564e33e21c631fa1f2f20c2ff456c72c5bc68 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/monster_wolf_attack_03.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_attack_04.png b/app/src/main/res/drawable-nodpi/monster_wolf_attack_04.png new file mode 100644 index 0000000000000000000000000000000000000000..a5be162d9fe3bf5c94c5283babbba39846c165a7 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/monster_wolf_attack_04.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_idle_00.png b/app/src/main/res/drawable-nodpi/monster_wolf_idle_00.png index cebe6fdc3a8655c4022d254e0f6c21ef956dbf05..1c071dc213e3f23b9229376eb9a0927ef23e2800 100644 Binary files a/app/src/main/res/drawable-nodpi/monster_wolf_idle_00.png and b/app/src/main/res/drawable-nodpi/monster_wolf_idle_00.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_idle_01.png b/app/src/main/res/drawable-nodpi/monster_wolf_idle_01.png index f58354335e888170b79ad8915939a9713f928db2..9e3207e5d1caf3aafbdbeb76839896a4f4038886 100644 Binary files a/app/src/main/res/drawable-nodpi/monster_wolf_idle_01.png and b/app/src/main/res/drawable-nodpi/monster_wolf_idle_01.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_idle_02.png b/app/src/main/res/drawable-nodpi/monster_wolf_idle_02.png index dba03b3972f4357369a985a404afeac60b35fb50..96a3e0a00f147677e720a5e99c4bb0d4e8225bd7 100644 Binary files a/app/src/main/res/drawable-nodpi/monster_wolf_idle_02.png and b/app/src/main/res/drawable-nodpi/monster_wolf_idle_02.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_idle_03.png b/app/src/main/res/drawable-nodpi/monster_wolf_idle_03.png index d6cfc8f9037caa1c12614cd1c677272c8703fd57..9175ae27f1267388e9cbe52b50df82e94f7242d7 100644 Binary files a/app/src/main/res/drawable-nodpi/monster_wolf_idle_03.png and b/app/src/main/res/drawable-nodpi/monster_wolf_idle_03.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_idle_04.png b/app/src/main/res/drawable-nodpi/monster_wolf_idle_04.png index fc97bbd84699a9f052009272cc72fb2e4349f644..6387139186f300309b314512d2793a3fd8a8aed4 100644 Binary files a/app/src/main/res/drawable-nodpi/monster_wolf_idle_04.png and b/app/src/main/res/drawable-nodpi/monster_wolf_idle_04.png differ diff --git a/app/src/main/res/drawable-nodpi/monster_wolf_idle_05.png b/app/src/main/res/drawable-nodpi/monster_wolf_idle_05.png index 415d12b71dd2fdb8b11b8c63ae0d4be099f205df..6a0feb3a51c4f75124b94878ced3f5ef87217fd2 100644 Binary files a/app/src/main/res/drawable-nodpi/monster_wolf_idle_05.png and b/app/src/main/res/drawable-nodpi/monster_wolf_idle_05.png differ diff --git a/app/src/main/res/drawable/asi_objeto_piel.png b/app/src/main/res/drawable/asi_objeto_piel.png new file mode 100644 index 0000000000000000000000000000000000000000..7ebf3fef65975b89e398a15b0e20e50f19419fad Binary files /dev/null and b/app/src/main/res/drawable/asi_objeto_piel.png differ diff --git a/app/src/main/res/drawable/monster_wolf_attack_animation.xml b/app/src/main/res/drawable/monster_wolf_attack_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..3aea95b88841aff28030a1c52a93f1577245b347 --- /dev/null +++ b/app/src/main/res/drawable/monster_wolf_attack_animation.xml @@ -0,0 +1,11 @@ +<!-- res/drawable/idle_animation.xml --> +<animation-list xmlns:android="http://schemas.android.com/apk/res/android" + android:oneshot="false"> + + <item android:drawable="@drawable/monster_wolf_attack_00" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_attack_01" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_attack_02" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_attack_03" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_attack_04" android:duration="150" /> + +</animation-list> \ No newline at end of file diff --git a/app/src/main/res/drawable/monster_wolf_idle_animation.xml b/app/src/main/res/drawable/monster_wolf_idle_animation.xml new file mode 100644 index 0000000000000000000000000000000000000000..388f3ec2ec0b2448d01d6b818caa4f7c26d94e30 --- /dev/null +++ b/app/src/main/res/drawable/monster_wolf_idle_animation.xml @@ -0,0 +1,11 @@ +<!-- res/drawable/idle_animation.xml --> +<animation-list xmlns:android="http://schemas.android.com/apk/res/android" + android:oneshot="false"> + + <item android:drawable="@drawable/monster_wolf_idle_00" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_idle_01" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_idle_02" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_idle_03" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_idle_04" android:duration="150" /> + <item android:drawable="@drawable/monster_wolf_idle_05" android:duration="150" /> +</animation-list> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_exploradores_de_pintia.xml b/app/src/main/res/layout/activity_exploradores_de_pintia.xml index e35a936534af0456b72bbf445568b87bedb1d193..4ef76e2b7e8895be96af7265418f9284388758fe 100644 --- a/app/src/main/res/layout/activity_exploradores_de_pintia.xml +++ b/app/src/main/res/layout/activity_exploradores_de_pintia.xml @@ -107,7 +107,7 @@ android:layout_height="match_parent" android:contentDescription="Imagen del yacimiento arqueológico" android:scaleX="-1" - android:src="@drawable/skeleton_idle_03" /> + android:src="@drawable/monster_wolf_idle_00" /> <ImageView android:id="@+id/imagenEfectoEvento"