Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feedback #1

Open
wants to merge 2 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions comidas.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ object manzana {

method energiaQueOtorga() = 40

method teEncontro(ave) {}
}

object alpiste {
Expand All @@ -18,5 +19,6 @@ object alpiste {

method energiaQueOtorga() = 70

method teEncontro(ave) {}
}

8 changes: 7 additions & 1 deletion extras.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ object nido {
method image() = "nido.png"

method teEncontro(ave) {
game.removeTickEvent("GRAVEDAD")
game.say(ave, "GANASTE! WIII")
game.schedule(2000, { game.stop() })
}
Expand All @@ -18,6 +19,11 @@ object silvestre {

method image() = "silvestre.png"

method position() = game.origin()
method position() = game.at(pepita.position().x().max(3), 0)

method teEncontro(ave) {
game.removeTickEvent("GRAVEDAD")
game.say(ave, "PERDISTE! NOOO")
game.schedule(2000, { game.stop() })
}
}
1,453 changes: 1,453 additions & 0 deletions log/wollok.log

Large diffs are not rendered by default.

18 changes: 12 additions & 6 deletions niveles.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ object tutorial1 {
game.addVisual(silvestre)
game.addVisualCharacter(pepita)
}

}

object tutorial2 {
Expand All @@ -21,10 +20,9 @@ object tutorial2 {
game.addVisual(nido)
game.addVisual(silvestre)
game.addVisual(pepita)
config.configurarTeclas()
//config.configurarGravedad()
game.addVisual(energiaPepita)
config.gravedad()
}

}

object tutorial3 {
Expand All @@ -35,9 +33,10 @@ object tutorial3 {
game.addVisual(nido)
game.addVisual(silvestre)
game.addVisual(pepita)
game.addVisual(energiaPepita)
config.configurarTeclas()
config.configurarColisiones()
// config.configurarGravedad()
config.gravedad()
}

}
Expand All @@ -47,9 +46,16 @@ object config {
method configurarTeclas() {
keyboard.left().onPressDo({ pepita.irA(pepita.position().left(1)) })
keyboard.right().onPressDo({ pepita.irA(pepita.position().right(1))})
keyboard.up().onPressDo({pepita.irA(pepita.position().up(1))})
keyboard.down().onPressDo({pepita.irA(pepita.position().down(1))})
keyboard.c().onPressDo{pepita.come(game.uniqueCollider(pepita))}
}

method configurarColisiones() {
game.onCollideDo(pepita, { algo => algo.teEncontro(pepita) })
}

method gravedad(){
game.onTick(800, "GRAVEDAD", {pepita.caer(1)})
}
}
30 changes: 25 additions & 5 deletions pepita.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,32 @@ object pepita {
var property position = game.origin()

method image() {
return if (self.estaEnElNido()) "pepita-grande.png" else "pepita.png"
return if (self.estaEnElNido())
"pepita-grande.png"
else if (self.estaConSilvestre() or self.estaCansada())
"pepita-gris.png"
else "pepita.png"
}

method come(comida) {
energia = energia + comida.energiaQueOtorga()
game.removeVisual(comida)
}

method vola(kms) {
energia = energia - kms * 9
}

method irA(nuevaPosicion) {
self.vola(position.distance(nuevaPosicion))
position = nuevaPosicion
if(not self.estaCansada() && nuevaPosicion.x().between(0, 9) && nuevaPosicion.y().between(0, 9)){
self.vola(position.distance(nuevaPosicion))
position = nuevaPosicion
}
if (self.estaCansada()){
game.removeTickEvent("GRAVEDAD")
game.say(self, "PERDISTE! NOOO")
game.schedule(2000, {game.stop()})
}
}

method estaCansada() {
Expand All @@ -32,9 +44,17 @@ object pepita {
}


method estaEnElSuelo() {
return position.y() == 0
method estaConSilvestre() {
return position == silvestre.position()
}

method caer(altura){
position = game.at(position.x(), 0.max(position.y() - altura))
}
}

object energiaPepita{
method position()=game.at(8,9)
method text()= "Energia: "+pepita.energia()
method textColor() = "FFFFFF"
}
6 changes: 4 additions & 2 deletions pepitaGame.wpgm
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ program PepitaGame {
game.width(10)
game.boardGround("fondo2.jpg")

tutorial1.iniciar()

//tutorial1.iniciar()
//tutorial2.iniciar()
tutorial3.iniciar()

game.showAttributes(pepita) //Debug

game.start()
Expand Down