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 32 commits into
base: feedback
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
5b19e05
Setting up GitHub Classroom Feedback
github-classroom[bot] Oct 1, 2024
b739f54
nuevo comentario
christianale12 Oct 1, 2024
8414181
a
Barde35 Oct 1, 2024
a27c637
prueba1
castiel21 Oct 1, 2024
3243096
pruebaAgus
Barde35 Oct 1, 2024
1780d94
Merge branch 'main' of https://github.com/algo1unsam/dino2-drimteam
christianale12 Oct 1, 2024
2eadfac
prueba
castiel21 Oct 1, 2024
b08cb30
termina al chocar
castiel21 Oct 1, 2024
3db3000
ahora termina bn
castiel21 Oct 1, 2024
3c2b1c7
tiempo
christianale12 Oct 1, 2024
a7278f4
tiempo
christianale12 Oct 1, 2024
4c34376
saltitos
Barde35 Oct 1, 2024
ac4f163
salto
Barde35 Oct 1, 2024
d9c223b
salto
Barde35 Oct 1, 2024
b7bc8e8
camb
castiel21 Oct 1, 2024
e8d4265
Merge branch 'main' of https://github.com/algo1unsam/dino2-drimteam
christianale12 Oct 1, 2024
3868ed6
asd
castiel21 Oct 1, 2024
6e3f7fa
Merge branch 'main' of https://github.com/algo1unsam/dino2-drimteam
christianale12 Oct 1, 2024
7e02873
merge
christianale12 Oct 1, 2024
d1d3201
salto2
Barde35 Oct 1, 2024
e991dff
salto2
Barde35 Oct 1, 2024
0b0ced0
a
castiel21 Oct 1, 2024
3d68c9f
a
castiel21 Oct 1, 2024
269d218
salo2
castiel21 Oct 1, 2024
d18967c
reinicia bien
castiel21 Oct 1, 2024
59a34a7
cactus reinicia
castiel21 Oct 1, 2024
47e2c7f
algo
christianale12 Oct 2, 2024
0f769b3
algo1
christianale12 Oct 2, 2024
81b99d4
Merge branch 'main' of https://github.com/algo1unsam/dino2-drimteam
christianale12 Oct 2, 2024
0b3594e
cambios del reloj y color
christianale12 Oct 2, 2024
c3e758b
cambio en el tiempo
christianale12 Oct 4, 2024
1e88ae9
cambios
christianale12 Oct 4, 2024
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: 1 addition & 1 deletion dino.wtest
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ test "pasa el tiempo" {

reloj.pasarTiempo()
reloj.pasarTiempo()
//assert.equals("2",reloj.text())
assert.equals("2",reloj.text())
}
35 changes: 24 additions & 11 deletions dinoGame.wlk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ object juego{

keyboard.space().onPressDo{ self.jugar()}
game.onCollideDo(dino,{ obstaculo => obstaculo.chocar()})

}

method iniciar(){
Expand Down Expand Up @@ -52,24 +51,26 @@ object gameOver {
object reloj {
var property tiempo = 0
method text() = tiempo.toString()
//method textColor() = "00FF00FF"
method textColor() = "00FF00FF"
method position() = game.at(1, game.height()-1)

method pasarTiempo() {
//COMPLETAR
method pasarTiempo() {tiempo=tiempo + 1


}
method iniciar(){
tiempo = 0
game.onTick(100,"tiempo",{self.pasarTiempo()})
}
method detener(){
//COMPLETAR

game.removeTickEvent("tiempo")
self.textColor()
}
}

object cactus {
var property position = self.posicionInicial()

method image() = "cactus.png"
method posicionInicial() = game.at(game.width()-1,suelo.position().y())

Expand All @@ -79,19 +80,23 @@ object cactus {
}

method mover(){
//COMPLETAR
//position = position.left(1)
// if para saber posicion y si pasa al dino game.set a la derecha de nuevo
if(self.position()== game.at(0,1)){
position = game.at(game.width()-1,suelo.position().y())
}else position = position.left(1)
}

method chocar(){
//COMPLETAR
juego.terminar()
}

method detener(){
//COMPLETAR
game.removeTickEvent("moverCactus")
}
}

object suelo{

method position() = game.origin().up(1)
method image() = "suelo.png"
}
Expand All @@ -104,11 +109,17 @@ object dino {
method image() = "dino.png"

method saltar(){
//COMPLETAR
if(self.position() == game.at(1,1)){
self.subir()
}

}


method subir(){

position = position.up(1)
game.schedule(600, {self.bajar()})
}

method bajar(){
Expand All @@ -124,4 +135,6 @@ object dino {
method estaVivo() {
return vivo
}


}
Loading