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.

Sign up for GitHub

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

Chuy haciendo jueguito #1477

Merged
merged 10 commits into from
Oct 20, 2023
Merged

Chuy haciendo jueguito #1477

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aca87e9
NoMeCansoDeRebotar
danielferro69 Oct 5, 2023
94532ab
tests
danielferro69 Oct 5, 2023
959eb0b
Merge'origin/develop' into keepie-uppie
danielferro69 Oct 5, 2023
cf5287b
exercises
danielferro69 Oct 5, 2023
a72ae74
fix merge tom
danielferro69 Oct 5, 2023
556c49a
fix test
danielferro69 Oct 5, 2023
2e42a6b
add error test
danielferro69 Oct 19, 2023
882b96c
Volver x Retroceder y Teststs
danielferro69 Oct 20, 2023
b7dc80a
Merge branch 'develop' into keepie-uppie
danielferro69 Oct 20, 2023
4ce809d
update pb-exercises 1.4.13
danielferro69 Oct 20, 2023
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
30 changes: 30 additions & 0 deletions app/services/blocks-gallery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,30 @@ export default Service.extend({
argumentos: '{etiqueta: "Pulpito", nombreAnimacion:"rebotarPulpito", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una pelota"}',
})

this.crearBloqueAccion('RevolearPulpito', 'volleyRubberBall', {
icono: 'icono.pelota-pulpo.png',
comportamiento: 'Interactuar',
argumentos: '{etiqueta: "Pulpito", nombreAnimacion:"revolearPulpito", "mensajeError": "Acá no hay una pelota", idTransicion: "revolearPulpito"}',
})

this.crearBloqueAccion('RebotarPiePulpito', 'bounceFootRubberBall', {
icono: 'icono.pelota-pulpo.png',
comportamiento: 'Interactuar',
argumentos: '{etiqueta: "Pulpito", nombreAnimacion:"rebotarPulpito", "mensajeError": "Acá no hay una pelota", idTransicion: "rebotarPiePulpito"}',
})

this.crearBloqueAccion('RecogerPulpito', 'pickRubberBall', {
icono: 'icono.pelota-pulpo.png',
comportamiento: 'Interactuar',
argumentos: '{etiqueta: "Pulpito", nombreAnimacion: "recoger", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una pelota", idTransicion: "recoger"}',
})

this.crearBloqueAccion('RebotarUnaVezPingPong', 'bouncePingPong', {
icono: 'icono.paleta.png',
comportamiento: 'PingPongAnimado',
argumentos: '{mensaje: "Rebotando...", etiqueta: "PingPong", nombreAnimacion:"usarPaletaUnaVez", animacionInteractuadoMientras: "desaparecer" }',
});
Comment on lines +367 to +371
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No se llega a ver la cantidad de veces que rebotó, queda siempre el mensaje Rebotando..., ¿se puede usar el mismo comportamiento que tiene el ejercicio original? SaltarHablando

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revisar https://github.com/Program-AR/pilas-bloques-exercises/blob/master/src/comportamientos/SaltarHablando.ts y modificar el personaje si es necesario

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dlopezalvas @asanzo Respecto al tema de los rebotes, hice un cambio en exercises porque este comportamiento de SaltarHablando es para el actor, en ese caso, el Gato (GatoAnimado). Y lo que hace es mover hacia arriba al Gato con una velocidad inicial, una altura, velocidad y cantidad de pasos. En este caso con Chuy es distinto, porque la animacion es la de rebotar la pelota de ping pong con la paleta que es una animacion propia de Chuy y no es Chuy saltando o rebotando. Entonces, lo que hice fue modificar el mensaje antes de crear el globo en la preAnimacion del comportamiento PingPongAnimado y de esa forma, en lugar de ver la palabra Rebotando... se ve la cantidad que lleva de rebotes. Me pareció que esta era una buena solucion.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Genial, yo aprovecharía la resolución de conflictos para hacer bump de la versión de exercises.


this.crearBloqueAccion('DespertarLuciernaga', 'wakeUpFirefly', {
icono: 'icono.luciernaga-prendida.png',
comportamiento: 'SacarFoto',
Expand Down Expand Up @@ -554,6 +578,12 @@ export default Service.extend({
argumentos: '{direccion: [1,0], distancia: 50, idTransicion: "avanzar"}',
});

this.crearBloqueAccion('Retroceder', 'back', {
icono: 'icono.izquierda.png',
comportamiento: 'MovimientoAnimado',
argumentos: '{direccion: [-1,0], distancia: 50, idTransicion: "retroceder"}',
});

this.crearBloqueAccion('Soniar', 'dream', {
icono: 'icono.soniar.png',
comportamiento: 'Pensar',
Expand Down
18 changes: 18 additions & 0 deletions app/utils/staticData/desafios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2747,6 +2747,24 @@ export const desafios = [
</xml>`
},
{
id: 'nuevo2',
nombre: 'ChuyHaciendoJueguito',
escena: 'ChuyHaciendoJueguito',
bloques: ['Avanzar', 'Volver', 'Retroceder', 'RecogerPulpito', 'RebotarPiePulpito', 'RevolearPulpito', 'Repetir', 'Procedimiento'],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

¿Puede ser que no sea necesario el Volver/Retroceder? Si hacen cosas diferentes, creo que sería mejor que tengan diferentes iconos porque me dio la sensación de que hacen lo mismo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

En realidad los bloques volver y retroceder ya existian y los estoy usando. Como que el ejercicio termina con el bloque volver. El avanzar y retroceder los uso para que entre en calor...
Asi lo pedia el issue, pero lo podemos analizar.

expectations: {
simpleRepetition: false
}
},
{
id: 'nuevo3',
nombre: 'NoMeCansoDeRebotar',
escena: 'NoMeCansoDeRebotar',
bloques: ['RebotarUnaVezPingPong', 'Procedimiento', 'Repetir'],
expectations: {
decomposition: false
}
},
{
id: 'nuevo4',
nombre: 'ManicEnElCielo',
escena: `new EscenaManic("\
Expand Down
2 changes: 2 additions & 0 deletions app/utils/staticData/grupos.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ export const grupos = [
{
id: 'grupoTemporal',
desafioIds: [
'nuevo2',
'nuevo3',
'nuevo4',
'nuevo5',
'nuevo6',
Expand Down
6 changes: 3 additions & 3 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"creador-de-desafios-pilasbloques": "^1.0.1",
"mulang": "^6.0.5",
"pilas-bloques-ember-intl": "^1.1.2",
"pilas-bloques-exercises": "1.4.7",
"pilas-bloques-exercises": "1.4.8",
"pilasweb": "^0.5.0",
"proceds-blockly": "^1.1.0",
"ramda": "^0.28.0",
Expand Down
2 changes: 1 addition & 1 deletion public/pilas.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<head>
<script src="libs/pilasweb.js?v=0.5.0"></script>
<script src="libs/pilas-bloques-exercises.js?v=1.4.7"></script>
<script src="libs/pilas-bloques-exercises.js?v=1.4.8"></script>
</head>

</html>
16 changes: 16 additions & 0 deletions tests/integration/desafios/ChuyHaciendoJueguito-test.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 23 additions & 0 deletions tests/integration/desafios/NoMeCansoDeRebotar-test.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions translations/blocks/en-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ lie: Lie down
standUp: Stand up
return: Return
advance: Move forward
back: Move backward
dream: Dream
jump: Jump
goToLeftBorder: Go to left border
Expand Down Expand Up @@ -51,6 +52,9 @@ blowUpBallon: Pinch the balloon
kickBall: Kick the ball
kickFootballBall: Kick the football ball
bounceRubberBall: Bounce the rubber ball
volleyRubberBall: Volley the rubber ball
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Me suena rara la traducción 'volley', ¿podría ser throw the rubber ball up?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

el ingles, se los dejo... la realidad es que revolear pelota en ingles es precisamente volley ball jajajaj ! pero podemos poner que sea tirar la pelota para arriba... no hay problema.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jajajajajj mirá vos, claro, volley.

pickRubberBall: Pick the rubber ball
bounceFootRubberBall: Bounce with foot the rubber ball
move1Km: Move 1 Km forward
changeLightColor: Change spotlight color
moveNextLight: Move to next spotlight
Expand Down
4 changes: 4 additions & 0 deletions translations/blocks/es-ar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ lie: Acostarse
standUp: Pararse
return: Volver
advance: Avanzar
back: Retroceder
dream: Soñar
jump: Saltar
goToLeftBorder: Ir al borde izquierdo
Expand Down Expand Up @@ -51,6 +52,9 @@ blowUpBallon: Explotar globo
kickBall: Patear pelota
kickFootballBall: Patear pelota de fútbol
bounceRubberBall: Rebotar pelota pulpito
volleyRubberBall: Revolear pelota pulpito
pickRubberBall: Agarrar pelota pulpito
bounceFootRubberBall: Rebotar con el pie la pelota pulpito
move1Km: Avanzar 1 Km
changeLightColor: Cambiar color del foco
moveNextLight: Pasar al siguiente foco
Expand Down
4 changes: 4 additions & 0 deletions translations/blocks/pt-br.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ lie: 'Deitar-se '
standUp: Levantar-se
return: Retornar
advance: Avançar
back: Votar
dream: Sonhar
jump: Saltar
goToLeftBorder: Ir para a borda esquerda
Expand Down Expand Up @@ -51,6 +52,9 @@ blowUpBallon: Explodir balão
kickBall: Chutar bola
kickFootballBall: Chutar bola de futebol
bounceRubberBall: Chutar bola pulpito
volleyRubberBall: Voleio uma bola pulpito
pickRubberBall: Pegar uma bola pulpito
bounceFootRubberBall: Chutar com ó pe uma bola pulpito
move1Km: Avançar 1 Km
changeLightColor: Mudar a cor da lâmpada
moveNextLight: Ir para a próxima lâmpada
Expand Down
9 changes: 9 additions & 0 deletions translations/en-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,15 @@ model:
Tenemos un programa ya hecho para que toto lea la provincia que está al sur de rio negro.
Fijate si funciona o qué hay que arreglar.
clue: Con el botón 'PASO' Toto puede ir realizando las instrucciones una por una
'nuevo2':
title: Chuy keepie-uppie
description: 'Make Chuy take a step forward, warm up moving back and forth, pick up the rubber ball, do keepie-uppie flipping the ball and bouncing it with the foot and finally come back to the original place.'
clue: You can create new actions in _My procedures_ by defining new blocks including other actions.
'nuevo3':
title: I love bouncing the ping pong ball
description: |
Help Chuy bounce the ping pong ball 30 times non-stop. Clue: you can solve this challenge with less than 30 blocks.
clue: The Repeat block allows you to select the number of times you want to repeat a sequence of actions. This is called "Simple repetition".
'nuevo4':
title: Mañic in sky
description: |
Expand Down
9 changes: 9 additions & 0 deletions translations/es-ar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,15 @@ model:
description: |
El carpincho Capy y su inseparable amigo, el picabuey Guyrá, tienen una forma muy particular de recorrer los esteros. Ayudá a Capy a pasar a buscar a su amigo para subirlo a su cabeza y así emprender juntos una nueva aventura.
clue: 'Fijate bien el orden de las _primitivas_: qué cosa tenés que hacer primero y qué cosa va después.'
'nuevo2':
title: Chuy haciendo jueguito
description: 'Hacé que Chuy avance un paso, entre en calor avanzando y retrocediendo, recoja la pelota pulpito, haga jueguito revoleando la pelota y rebotandola con el pie y por ultimo vuelva a su lugar.'
clue: Se pueden crear nuevas acciones en Procedimientos definiendo nuevos bloques que incluyan otras acciones.
'nuevo3':
title: No me canso de rebotar
description: |
Ayudá a Chuy a hacer rebotar la pelota de ping pong 30 veces seguidas. Pista: se puede resolver con menos de 30 bloques.
clue: El bloque Repetir permite elegir la cantidad de veces que se desea repetir una secuencia de acciones. Esto se llama "Repetición simple".
'nuevo4':
title: Mañic en el cielo
description: |
Expand Down
9 changes: 9 additions & 0 deletions translations/pt-br.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,15 @@ model:
Já temos um programa feito para o Toto ler a província que fica ao sul do Rio Negro.
Veja se funciona ou o que precisa ser corrigido.
clue: A província é Chubut. Com o botão 'PASSO' o Toto pode executar as instruções uma a uma
'nuevo2':
title: Chuy joga uma embaixadinha
description: Faça que Chuy dê um passo à frente, aqueça-se movendo-se para frente e para trás, pegue a bola pulpito, jogue uma embaixadinha virando a bola e quicando-a com o pé e, finalmente, retorne ao seu lugar.
clue: Novas ações podem ser criadas em Procedimentos definindo novos blocos que incluem outras ações.
'nuevo3':
title: Eu adoro quicar a bola de pingue-pongue
description: |
Ajude Chuy a quicar a bola de pingue-pongue 30 vezes seguidas. Dica: pode ser resolvido com menos de 30 blocos.
clue: O bloco Repetir permite que você escolha o número de vezes que deseja repetir uma sequência de ações. Isso é chamado de "Repetição Simples".
'nuevo4':
title: Mañic en el cielo
description: |
Expand Down