pulliendo algunas cosas

pdepjm · Nov 14, 2024 · 66c0b5b · 66c0b5b
1 parent b51367d
commit 66c0b5b
Show file tree

Hide file tree

Showing 29 changed files with 11 additions and 30,546 deletions.
diff --git a/bicho.wlk b/bicho.wlk
@@ -97,6 +97,6 @@ const bicho4 = new Enemigo(subiendo = false, limiteDerecho = 28, limiteIzquierdo
 const bicho5 = new Enemigo(horizontal = false, limiteSuperior = 18, limiteInferior = 12, position = game.at(12,16))
 const mago1 = new Mago(subiendo = false, limiteDerecho = 24 , limiteIzquierdo = 10, position = game.at(10,10))
 const mago2 = new Mago(subiendo = false, limiteDerecho = 22 , limiteIzquierdo = 12, position = game.at(12,6))
-const mago3 = new Mago(subiendo = false, limiteDerecho = 22, limiteIzquierdo = 14, position = game.at(10,10))
+const mago3 = new Mago(subiendo = false, limiteDerecho = 22, limiteIzquierdo = 14, position = game.at(14,10))
 const fantasma1 = new Fantasma(horizontal = false, limiteSuperior = 15 , limiteInferior = 1, position = game.at(24,3))
 const fantasma2 = new Fantasma(horizontal = false, limiteSuperior = 9 , limiteInferior = 1, position = game.at(12,3))
diff --git a/isaac.wlk b/isaac.wlk
@@ -27,7 +27,7 @@ object isaac{
   }
 
   method avanzarNivel(escenario){
-      if (tieneLlave)
+      if (tieneLlave && nivel.escenarioActual() != escenario)
         nivel.cambiarEscenario(escenario)
       else game.say(self, "Necesito la llave")
     }

diff --git a/log/wollok.log b/log/wollok.log
diff --git a/log/wollok1.log b/log/wollok1.log
diff --git a/log/wollok10.log b/log/wollok10.log
diff --git a/log/wollok11.log b/log/wollok11.log
diff --git a/log/wollok12.log b/log/wollok12.log
diff --git a/log/wollok13.log b/log/wollok13.log
diff --git a/log/wollok14.log b/log/wollok14.log
diff --git a/log/wollok15.log b/log/wollok15.log
diff --git a/log/wollok16.log b/log/wollok16.log
diff --git a/log/wollok17.log b/log/wollok17.log
diff --git a/log/wollok18.log b/log/wollok18.log
diff --git a/log/wollok19.log b/log/wollok19.log
diff --git a/log/wollok2.log b/log/wollok2.log
diff --git a/log/wollok20.log b/log/wollok20.log
diff --git a/log/wollok21.log b/log/wollok21.log
diff --git a/log/wollok22.log b/log/wollok22.log
diff --git a/log/wollok23.log b/log/wollok23.log
diff --git a/log/wollok3.log b/log/wollok3.log
diff --git a/log/wollok4.log b/log/wollok4.log
diff --git a/log/wollok5.log b/log/wollok5.log
diff --git a/log/wollok6.log b/log/wollok6.log
diff --git a/log/wollok7.log b/log/wollok7.log
diff --git a/log/wollok8.log b/log/wollok8.log
diff --git a/log/wollok9.log b/log/wollok9.log
diff --git a/nivel.wlk b/nivel.wlk
@@ -57,11 +57,16 @@ object nivel{
     method muerte(){
         self.clearGame()
         game.addVisual(gameOver)
+        isaac.vida(100)
+        isaac.image("peque.png")
     }
 
     method finalizar(){
         self.clearGame()	
         game.addVisual(finDelJuego)
+        isaac.vida(100)
+        isaac.image("peque.png")
+        cofre.abierto(false)
     }
 }
 

diff --git a/obstaculos.wlk b/obstaculos.wlk
@@ -68,12 +68,12 @@ object cura{
 
 object cofre{
   var property position = game.at(3,16)
-  var abierto = false
+  var property abierto = false
   var property image = "cofre.png"
 
   method interactuar(){
     self.image("cofreAbierto.png")
-    if(abierto == false){
+    if(!abierto){
       isaac.vida(isaac.vida() + 20)
       game.say(isaac, "Ahora tengo " + isaac.vida() + " de vida")
       isaac.image("isaacConArmadura.png")

diff --git a/pruebas.wtest b/pruebas.wtest
@@ -22,7 +22,7 @@ describe "tests para isaac" {
 
   test "el fantasma toca a isaac y lo despoja de sus armaduras"{
     fantasma1.interactuar()
-    assert.equals(90, isaac.vida())
+    assert.equals(85, isaac.vida())
     assert.equals("sinArmadura.png", isaac.image())
   }