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

Jump to bottom

Limpieza bloques #1421

Merged
merged 4 commits into from
Sep 1, 2023
Merged

Limpieza bloques #1421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e2d52d
limpieza bloques
tfloxolodeiro Aug 23, 2023
a17dc9c
Update translations/blocks/es-ar.yaml
asanzo Aug 31, 2023
6c71dc0
RecogerPaleta
tfloxolodeiro Sep 1, 2023
5df2a74
mensajeError paleta
tfloxolodeiro Sep 1, 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
35 changes: 31 additions & 4 deletions app/services/blocks-gallery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,10 +328,16 @@ export default Service.extend({
argumentos: '{etiqueta: "Trofeo", "mensajeError": "Acá no hay un trofeo"}',
});

this.crearBloqueAccion('UsarPaleta', 'usePaddle', {
this.crearBloqueAccion('RecogerPaleta', 'pickPaddle', {
icono: 'icono.paleta.png',
comportamiento: 'Recolectar',
argumentos: '{etiqueta: "PingPong", nombreAnimacion:"usarPaleta", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una paleta"}',
argumentos: '{etiqueta: "Paleta", "mensajeError": "Acá no hay una paleta"}',
});

this.crearBloqueAccion('RebotarPingPong', 'bouncePingPong', {
icono: 'icono.paleta.png',
comportamiento: 'Recolectar',
argumentos: '{etiqueta: "PingPong", nombreAnimacion:"usarPaleta", animacionInteractuadoMientras: "desaparecer", "mensajeError": "Acá no hay una pelota de ping pong"}',
});

this.crearBloqueAccion('PatearPulpito', 'bounceRubberBall', {
Expand All @@ -346,7 +352,7 @@ export default Service.extend({
argumentos: "{'etiqueta':'Luciernaga'}"
});

this.crearBloqueAccion('ObservarMariposa', 'watchButterfly', {
this.crearBloqueAccion('FotografiarMariposa', 'photographButterfly', {
icono: 'icono.mariposa.png',
comportamiento: 'Recolectar',
argumentos: '{etiqueta: "Mariposa", nombreAnimacion: "sacarFoto", "mensajeError": "Acá no hay una mariposa"}',
Expand Down Expand Up @@ -393,6 +399,12 @@ export default Service.extend({
argumentos: `{ etiqueta: "Telescopio" }`,
});

this.crearBloqueAccion('AlinearTelescopio', 'repairTelescope', {
icono: 'icono.telescopio.png',
comportamiento: 'RepararTelescopio',
argumentos: `{ etiqueta: "Telescopio" }`,
asanzo marked this conversation as resolved.
Show resolved Hide resolved
});

this.crearBloqueAccion('RecogerLata', 'pickCan', {
icono: 'icono.lata.png',
comportamiento: 'RecojoLata',
Expand Down Expand Up @@ -983,7 +995,7 @@ export default Service.extend({
this.crearBloqueAccion('PrepararEnsalada', 'prepareSalad', {
icono: 'icono.ensaladera.png',
comportamiento: 'PrepararEnsalada',
argumentos: `{}`,
argumentos: `{etiqueta:"Ensaladera"}`,
});

// Para los desafíos de escribir y leer letras
Expand Down Expand Up @@ -1359,6 +1371,21 @@ export default Service.extend({
funcionSensor: 'tocando("Tomate")',
});

this.crearBloqueSensor('HayCargador', 'chargerHere', {
icono: 'icono.cargador.png',
funcionSensor: 'tocando("Cargador")',
});

this.crearBloqueSensor('HayEnsaladera', 'saladBowlHere', {
icono: 'icono.ensaladera.png',
funcionSensor: 'tocando("Ensaladera")',
});

this.crearBloqueSensor('HayTrofeo', 'trophyHere', {
icono: 'icono.trofeo.png',
funcionSensor: 'tocando("Trofeo")',
});

},

_definirBloquesQueRepresentanValores() {
Expand Down
6 changes: 3 additions & 3 deletions app/utils/staticData/desafios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2810,7 +2810,7 @@ export const desafios = [
id: 'nuevo14',
nombre: 'PelotaPaleta',
escena: `new EscenaChuy(["[A,P]", "[A,G]"],{},[1,0])`,
bloques: ['PatearPelotaChuy', 'UsarPaleta', 'MoverACasillaDerecha', 'Procedimiento', 'Repetir', 'Si', 'SiNo', 'TocandoPelotaChuy', 'TocandoPingPong'],
bloques: ['PatearPelotaChuy', 'RebotarPingPong', 'MoverACasillaDerecha', 'Procedimiento', 'Repetir', 'Si', 'SiNo', 'TocandoPelotaChuy', 'TocandoPingPong'],
expectations: {
conditionalAlternative: true,
decomposition: false
Expand Down Expand Up @@ -3061,7 +3061,7 @@ export const desafios = [
e: ["M", "M"],
f: ["M", "M"]
}})`,
bloques: ['MoverACasillaDerecha', 'MoverACasillaArriba', 'VolverABordeIzquierdo', 'ObservarMariposa', 'TocandoMariposa', 'Procedimiento', 'Repetir', 'Si', 'SiNo']
bloques: ['MoverACasillaDerecha', 'MoverACasillaArriba', 'VolverABordeIzquierdo', 'FotografiarMariposa', 'TocandoMariposa', 'Procedimiento', 'Repetir', 'Si', 'SiNo']
},
{
id: 'nuevo46',
Expand Down Expand Up @@ -3112,7 +3112,7 @@ export const desafios = [
{ macros: { "M": "*>M?" }, coleccion: ["M"] })`,
bloques: ['ParaLaDerecha', 'ParaLaIzquierda', 'ParaArriba', 'ParaAbajo',
'MoverA', 'Procedimiento', 'RepetirVacio', 'Repetir', 'Si', 'SiNo', 'Hasta',
'TocandoMariposa', 'ObservarMariposa', 'Numero', 'OpAritmetica'],
'TocandoMariposa', 'FotografiarMariposa', 'Numero', 'OpAritmetica'],
},
{
id: 'nuevo134',
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/desafios/segundoCiclo/Chuy/PelotaPaleta-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ moduloActividad(nombre, () => {
<block type="PatearPelotaChuy" id="26" />
</statement>
<statement name="block2">
<block type="UsarPaleta" id="34" />
<block type="RebotarPingPong" id="34" />
</statement>
</block>
</next>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/desafios/segundoCiclo/Yvoty/MariposasEncuadradas-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ moduloActividad(nombre, () => {
</value>
<statement name="block">
<shadow type="required_statement" id="^Dx\`KpAK\`MbXQ(@eatkT"></shadow>
<block type="ObservarMariposa" id="31"></block>
<block type="FotografiarMariposa" id="31"></block>
</statement>
</block>
</statement>
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/desafios/segundoCiclo/Yvoty/ObservadoraDeMariposas-test.js
View file
Open in desktop

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

6 changes: 4 additions & 2 deletions translations/blocks/en-us.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ conditionalRepetition: Repeat until
simpleAlternative: If
completeAlternative: else
wakeUpFirefly: Wake up firefly
watchButterfly: Watch butterfly
photographButterfly: Photograph butterfly
unlockCellphone: Unlock cell phone
pickCharger: Pick charger
chargeCellphone: Charge cell phone
Expand All @@ -132,10 +132,12 @@ pingPongBallHere: Is there a ping pong ball here?
footBallHere: Is there a soccer ball here?
paddleHere: Is there a paddle here?
pickTrophy: Pick trophy
usePaddle: Use paddle
pickPaddle: Pick paddle
bouncePingPong: Bounce ping pong ball
watchStar: Watch star
watchPlanet: Watch planet
repairTelescope: Repair telescope
alignTelescope: Align telescope
pickCan: Pick can
pickPaper: Pick paper
holdPaper: Hold paper
Expand Down
8 changes: 5 additions & 3 deletions translations/blocks/es-ar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ conditionalRepetition: Repetir hasta que
simpleAlternative: Si
completeAlternative: sino
wakeUpFirefly: Despertar luciérnaga
watchButterfly: Observar mariposa
photographButterfly: Fotografiar mariposa
unlockCellphone: Desbloquear celular
pickCharger: Agarrar cargador
chargeCellphone: Cargar celular
Expand All @@ -131,11 +131,13 @@ pulpitoBallHere: ¿Hay una pelota pulpito acá?
pingPongBallHere: ¿Hay una pelota de ping pong acá?
footBallHere: ¿Hay una pelota de fútbol acá?
paddleHere: ¿Hay una paleta acá?
pickTrophy: Agarrar trofeo
usePaddle: Usar paleta
pickTrophy: Recoger trofeo
pickPaddle: Recoger paleta
bouncePingPong: Rebotar pelota de ping pong
watchStar: Observar estrella
watchPlanet: Observar planeta
repairTelescope: Reparar telescopio
alignTelescope: Alinear telescopio
pickCan: Recoger lata
pickPaper: Recoger papel
holdPaper: Sostener papel
Expand Down