Skip to content

Commit a935775

Browse files
make it default in advanced mode
1 parent 84fe70a commit a935775

File tree

1 file changed

+37
-2
lines changed

1 file changed

+37
-2
lines changed

js/blocks/WidgetBlocks.js

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@ function setupWidgetBlocks(activity) {
13711371

13721372
//.TRANS: assigns pitch to a sequence of beats to generate a melody
13731373
this.formBlock({ name: _("phrase maker"), canCollapse: true });
1374-
this.makeMacro((x, y) => [
1374+
activity.beginnerMode ? this.makeMacro((x, y) => [
13751375
[0, "matrix", x, y, [null, 1, 33]],
13761376
[1, "pitch", 0, 0, [0, 2, 3, 4]],
13771377
[2, ["solfege", { value: "ti" }], 0, 0, [1]],
@@ -1394,8 +1394,43 @@ function setupWidgetBlocks(activity) {
13941394
[19, ["number", { value: 100 }], 0, 0, [18]],
13951395
[20, "right", 0, 0, [18, 21, 22]],
13961396
[21, ["number", { value: 90 }], 0, 0, [20]],
1397+
[22, "rhythm2", 0, 0, [20, 23, 24, 27]],
1398+
[23, ["number", { value: 6 }], 0, 0, [22]],
1399+
[24, "divide", 0, 0, [22, 25, 26]],
1400+
[25, ["number", { value: 1 }], 0, 0, [24]],
1401+
[26, ["number", { value: 4 }], 0, 0, [24]],
1402+
[27, "vspace", 0, 0, [22, 28]],
1403+
[28, "rhythm2", 0, 0, [27, 29, 30, null]],
1404+
[29, ["number", { value: 1 }], 0, 0, [28]],
1405+
[30, "divide", 0, 0, [28, 31, 32]],
1406+
[31, ["number", { value: 1 }], 0, 0, [30]],
1407+
[32, ["number", { value: 2 }], 0, 0, [30]],
1408+
[33, "hiddennoflow", 0, 0, [0, null]]
1409+
]) : this.makeMacro((x, y) => [
1410+
[0, "matrix", x, y, [null, 1, 35]],
1411+
[1, "pitch", 0, 0, [0, 2, 3, 4]],
1412+
[2, ["solfege", { value: "ti" }], 0, 0, [1]],
1413+
[3, ["number", { value: 4 }], 0, 0, [1]],
1414+
[4, "pitch", 0, 0, [1, 5, 6, 7]],
1415+
[5, ["solfege", { value: "la" }], 0, 0, [4]],
1416+
[6, ["number", { value: 4 }], 0, 0, [4]],
1417+
[7, "pitch", 0, 0, [4, 8, 9, 10]],
1418+
[8, ["solfege", { value: "sol" }], 0, 0, [7]],
1419+
[9, ["number", { value: 4 }], 0, 0, [7]],
1420+
[10, "pitch", 0, 0, [7, 11, 12, 13]],
1421+
[11, ["solfege", { value: "mi" }], 0, 0, [10]],
1422+
[12, ["number", { value: 4 }], 0, 0, [10]],
1423+
[13, "pitch", 0, 0, [10, 14, 15, 16]],
1424+
[14, ["solfege", { value: "re" }], 0, 0, [13]],
1425+
[15, ["number", { value: 4 }], 0, 0, [13]],
1426+
[16, "playdrum", 0, 0, [13, 17, 18]],
1427+
[17, ["drumname", { value: "snare drum" }], 0, 0, [16]],
1428+
[18, "forward", 0, 0, [16, 19, 20]],
1429+
[19, ["number", { value: 100 }], 0, 0, [18]],
1430+
[20, "right", 0, 0, [18, 21, 22]],
1431+
[21, ["number", { value: 90 }], 0, 0, [20]],
13971432
[22, "print", 0, 0, [20, 23, 24]],
1398-
[23, ["text", {"value":"Lyric?"}], 0, 0, [22]],
1433+
[23, ["text", { "value": "Lyrics" }], 0, 0, [22]],
13991434
[24, "rhythm2", 0, 0, [22, 25, 26, 29]],
14001435
[25, ["number", { value: 6 }], 0, 0, [24]],
14011436
[26, "divide", 0, 0, [24, 27, 28]],

0 commit comments

Comments
 (0)