diff --git a/README.md b/README.md index 79e1b64..d53f6e6 100644 --- a/README.md +++ b/README.md @@ -74,4 +74,4 @@ Wollok Game automáticamente va a hacer que Héctor le diga eso al usuario. ## Demo -![demo](./videos/demo.gif) +![demo](./videos/demoFarmville.gif) diff --git a/arbustos.wlk b/arbustos.wlk index 788a341..747fc99 100644 --- a/arbustos.wlk +++ b/arbustos.wlk @@ -5,37 +5,7 @@ class Arbusto { method dibujar() { game.addVisual(self) - game.whenCollideDo(self, { granjero => self.empuja(granjero) }) } method image() = "fence02.png" - method empuja(granjero) -} - -class ArbustoArriba inherits Arbusto { - - override method empuja(granjero) { - granjero.position(granjero.position().down(1)) - } -} - -class ArbustoAbajo inherits Arbusto { - - override method empuja(granjero) { - granjero.position(granjero.position().up(1)) - } -} - -class ArbustoIzquierda inherits Arbusto { - - override method empuja(granjero) { - granjero.position(granjero.position().right(1)) - } -} - -class ArbustoDerecha inherits Arbusto { - - override method empuja(granjero) { - granjero.position(granjero.position().left(1)) - } } diff --git a/log/wollok.log b/log/wollok.log index 3336625..96207f6 100644 --- a/log/wollok.log +++ b/log/wollok.log @@ -76,3 +76,13 @@ {"level":"info","message":"onRequest - STRONG_FILES_CHANGED:/home/dodain/workspace/wollok-dev/wollok-workspace/migracion-proyectos/farmvilleGame/video","timestamp":"2024-05-25T21:53:19.059Z"} {"level":"info","message":"onRequest - WORKSPACE_URI:file:///home/dodain/workspace/wollok-dev/wollok-workspace/migracion-proyectos/farmvilleGame","timestamp":"2024-05-25T21:53:19.340Z"} {"level":"info","message":"Removing diagnostics from /home/dodain/workspace/wollok-dev/wollok-workspace/migracion-proyectos/farmvilleGame/video","timestamp":"2024-05-25T21:53:19.482Z"} +{"level":"info","message":"⌛ Building environment","timeElapsed":295,"timestamp":"2024-05-25T21:55:49.709Z"} +{"level":"info","message":"onRequest - WORKSPACE_URI:file:///home/dodain/workspace/wollok-dev/wollok-workspace/migracion-proyectos/farmvilleGame","timestamp":"2024-05-25T21:55:49.719Z"} +{"level":"info","message":"⌛ Building environment","timeElapsed":133,"timestamp":"2024-05-25T21:55:49.854Z"} +{"level":"info","message":"⌛ Building environment","timeElapsed":101,"timestamp":"2024-05-25T21:55:49.957Z"} +{"level":"info","message":"⌛ Building environment","timeElapsed":116,"timestamp":"2024-05-25T21:55:50.074Z"} +{"exitCode":"SIGHUP","level":"info","message":"👾 Game executed pgmGame.farmville on /home/dodain/workspace/wollok-dev/wollok-workspace/migracion-proyectos/farmvilleGame","timeElapsed":648220,"timestamp":"2024-05-25T22:02:15.391Z"} +{"level":"info","message":"onRequest - completionItem/resolve","timestamp":"2024-05-25T22:04:40.019Z"} +{"exitCode":"SIGHUP","level":"info","message":"👾 Game executed pgmGame.farmville on /home/dodain/workspace/wollok-dev/wollok-workspace/migracion-proyectos/farmvilleGame","timeElapsed":118864,"timestamp":"2024-05-25T22:09:02.088Z"} +{"exitCode":"SIGHUP","level":"info","message":"👾 Game executed pgmGame.farmville on /home/dodain/workspace/wollok-dev/wollok-workspace/migracion-proyectos/farmvilleGame","timeElapsed":249959,"timestamp":"2024-05-25T22:13:12.255Z"} +{"exitCode":"SIGHUP","level":"info","message":"👾 Game executed pgmGame.farmville on /home/dodain/workspace/wollok-dev/wollok-workspace/migracion-proyectos/farmvilleGame","timeElapsed":155046,"timestamp":"2024-05-25T22:15:47.504Z"} diff --git a/nivel.wlk b/nivel.wlk index ca197ff..7a6da7a 100644 --- a/nivel.wlk +++ b/nivel.wlk @@ -19,10 +19,10 @@ method configurate(){ const ancho = game.width() - 1 const largo = game.height() - 1 - (1 .. ancho-1).forEach { n => new ArbustoAbajo(position = new Position(x = n, y = 0)).dibujar() } // bordeAbajo - (1 .. ancho-1).forEach { n => new ArbustoArriba(position = new Position(x =n, y = largo)).dibujar() } // bordeArriba - (0 .. largo).forEach { n => new ArbustoIzquierda(position = new Position(x =0, y = n)).dibujar() } // bordeIzq - (0 .. largo).forEach { n => new ArbustoDerecha(position = new Position(x =ancho, y = n)).dibujar() } // bordeDer + (1 .. ancho-1).forEach { n => new Arbusto(position = new Position(x = n, y = 0)).dibujar() } // bordeAbajo + (1 .. ancho-1).forEach { n => new Arbusto(position = new Position(x =n, y = largo)).dibujar() } // bordeArriba + (0 .. largo).forEach { n => new Arbusto(position = new Position(x =0, y = n)).dibujar() } // bordeIzq + (0 .. largo).forEach { n => new Arbusto(position = new Position(x =ancho, y = n)).dibujar() } // bordeDer // TECLADO keyboard.m().onPressDo { granjero.plantaMaiz() } diff --git a/videos/demo.gif b/videos/demo.gif deleted file mode 100644 index 6a9585e..0000000 Binary files a/videos/demo.gif and /dev/null differ diff --git a/videos/demoFarmville.gif b/videos/demoFarmville.gif new file mode 100644 index 0000000..f8be6cc Binary files /dev/null and b/videos/demoFarmville.gif differ