@@ -276,8 +276,7 @@ pub enum Block {
276276 ChangePenSaturation ,
277277 ChangePenBrightness ,
278278 ChangePenTransparency ,
279- PlayDrum1 ,
280- PlayDrum2 ,
279+ PlayDrum ,
281280 PlayNote ,
282281 SetInstrument ,
283282 Rest ,
@@ -438,13 +437,7 @@ impl Block {
438437 field : "colorParam" ,
439438 default : "transparency" ,
440439 } ) ,
441- Self :: PlayDrum1 => Some ( Menu {
442- opcode : "music_menu_DRUM" ,
443- input : "DRUM" ,
444- field : "DRUM" ,
445- default : "1" ,
446- } ) ,
447- Self :: PlayDrum2 => Some ( Menu {
440+ Self :: PlayDrum => Some ( Menu {
448441 opcode : "music_menu_DRUM" ,
449442 input : "DRUM" ,
450443 field : "DRUM" ,
@@ -467,7 +460,6 @@ impl Block {
467460 "say" => & [ Self :: Say2 , Self :: Say1 ] ,
468461 "think" => & [ Self :: Think2 , Self :: Think1 ] ,
469462 "clone" => & [ Self :: Clone0 , Self :: Clone1 ] ,
470- "play_drum" => & [ Self :: PlayDrum1 , Self :: PlayDrum2 ] ,
471463 _ => & [ ] ,
472464 }
473465 }
@@ -573,9 +565,7 @@ impl Block {
573565 ( "change_pen_saturation" , _) => Some ( Self :: ChangePenSaturation ) ,
574566 ( "change_pen_brightness" , _) => Some ( Self :: ChangePenBrightness ) ,
575567 ( "change_pen_transparency" , _) => Some ( Self :: ChangePenTransparency ) ,
576- ( "play_drum" , 1 ) => Some ( Self :: PlayDrum1 ) ,
577- ( "play_drum" , 2 ) => Some ( Self :: PlayDrum2 ) ,
578- ( "play_drum" , _) => Some ( Self :: PlayDrum1 ) ,
568+ ( "play_drum" , _) => Some ( Self :: PlayDrum ) ,
579569 ( "play_note" , _) => Some ( Self :: PlayNote ) ,
580570 ( "set_instrument" , _) => Some ( Self :: SetInstrument ) ,
581571 ( "rest" , _) => Some ( Self :: Rest ) ,
@@ -681,8 +671,7 @@ impl Block {
681671 Self :: ChangePenSaturation => "change_pen_saturation" ,
682672 Self :: ChangePenBrightness => "change_pen_brightness" ,
683673 Self :: ChangePenTransparency => "change_pen_transparency" ,
684- Self :: PlayDrum1 => "play_drum" ,
685- Self :: PlayDrum2 => "play_drum" ,
674+ Self :: PlayDrum => "play_drum" ,
686675 Self :: PlayNote => "play_note" ,
687676 Self :: SetInstrument => "set_instrument" ,
688677 Self :: Rest => "rest" ,
@@ -887,8 +876,7 @@ impl Block {
887876 Self :: ChangePenSaturation => "pen_changePenColorParamBy" ,
888877 Self :: ChangePenBrightness => "pen_changePenColorParamBy" ,
889878 Self :: ChangePenTransparency => "pen_changePenColorParamBy" ,
890- Self :: PlayDrum1 => "music_playDrumForBeats" ,
891- Self :: PlayDrum2 => "music_playDrumForBeats" ,
879+ Self :: PlayDrum => "music_playDrumForBeats" ,
892880 Self :: PlayNote => "music_playNoteForBeats" ,
893881 Self :: SetInstrument => "music_setInstrument" ,
894882 Self :: Rest => "music_restForBeats" ,
@@ -993,8 +981,7 @@ impl Block {
993981 Self :: ChangePenSaturation => & [ "VALUE" ] ,
994982 Self :: ChangePenBrightness => & [ "VALUE" ] ,
995983 Self :: ChangePenTransparency => & [ "VALUE" ] ,
996- Self :: PlayDrum1 => & [ "BEATS" ] ,
997- Self :: PlayDrum2 => & [ "DRUM" , "BEATS" ] ,
984+ Self :: PlayDrum => & [ "DRUM" , "BEATS" ] ,
998985 Self :: PlayNote => & [ "NOTE" , "BEATS" ] ,
999986 Self :: SetInstrument => & [ "INSTRUMENT" ] ,
1000987 Self :: Rest => & [ "BEATS" ] ,
@@ -1101,8 +1088,7 @@ impl Block {
11011088 Self :: ChangePenSaturation => None ,
11021089 Self :: ChangePenBrightness => None ,
11031090 Self :: ChangePenTransparency => None ,
1104- Self :: PlayDrum1 => None ,
1105- Self :: PlayDrum2 => None ,
1091+ Self :: PlayDrum => None ,
11061092 Self :: PlayNote => None ,
11071093 Self :: SetInstrument => None ,
11081094 Self :: Rest => None ,
@@ -1142,6 +1128,7 @@ pub enum Repr {
11421128 CurrentSecond ,
11431129 DaysSince2000 ,
11441130 Username ,
1131+ Online ,
11451132 TouchingColor ,
11461133 ColorIsTouchingColor ,
11471134 Answer ,
@@ -1192,7 +1179,7 @@ impl Repr {
11921179 }
11931180 }
11941181
1195- pub fn overloads ( _name : & str ) -> & ' static [ Self ] {
1182+ pub fn overloads ( name : & str ) -> & ' static [ Self ] {
11961183 & [ ]
11971184 }
11981185
@@ -1227,6 +1214,7 @@ impl Repr {
12271214 ( "current_second" , _) => Some ( Self :: CurrentSecond ) ,
12281215 ( "days_since_2000" , _) => Some ( Self :: DaysSince2000 ) ,
12291216 ( "username" , _) => Some ( Self :: Username ) ,
1217+ ( "online" , _) => Some ( Self :: Online ) ,
12301218 ( "touching_color" , _) => Some ( Self :: TouchingColor ) ,
12311219 ( "color_is_touching_color" , _) => Some ( Self :: ColorIsTouchingColor ) ,
12321220 ( "answer" , _) => Some ( Self :: Answer ) ,
@@ -1267,6 +1255,7 @@ impl Repr {
12671255 Self :: CurrentSecond => "current_second" ,
12681256 Self :: DaysSince2000 => "days_since_2000" ,
12691257 Self :: Username => "username" ,
1258+ Self :: Online => "online" ,
12701259 Self :: TouchingColor => "touching_color" ,
12711260 Self :: ColorIsTouchingColor => "color_is_touching_color" ,
12721261 Self :: Answer => "answer" ,
@@ -1306,6 +1295,7 @@ impl Repr {
13061295 "current_second" ,
13071296 "days_since_2000" ,
13081297 "username" ,
1298+ "online" ,
13091299 "touching_color" ,
13101300 "color_is_touching_color" ,
13111301 "answer" ,
@@ -1345,6 +1335,7 @@ impl Repr {
13451335 Self :: CurrentSecond => "sensing_current" ,
13461336 Self :: DaysSince2000 => "sensing_dayssince2000" ,
13471337 Self :: Username => "sensing_username" ,
1338+ Self :: Online => "sensing_online" ,
13481339 Self :: TouchingColor => "sensing_touchingcolor" ,
13491340 Self :: ColorIsTouchingColor => "sensing_coloristouchingcolor" ,
13501341 Self :: Answer => "sensing_answer" ,
@@ -1384,6 +1375,7 @@ impl Repr {
13841375 Self :: CurrentSecond => & [ ] ,
13851376 Self :: DaysSince2000 => & [ ] ,
13861377 Self :: Username => & [ ] ,
1378+ Self :: Online => & [ ] ,
13871379 Self :: TouchingColor => & [ "COLOR" ] ,
13881380 Self :: ColorIsTouchingColor => & [ "COLOR" , "COLOR2" ] ,
13891381 Self :: Answer => & [ ] ,
@@ -1423,6 +1415,7 @@ impl Repr {
14231415 Self :: CurrentSecond => Some ( "{\" CURRENTMENU\" : [\" SECOND\" , null]}" ) ,
14241416 Self :: DaysSince2000 => None ,
14251417 Self :: Username => None ,
1418+ Self :: Online => None ,
14261419 Self :: TouchingColor => None ,
14271420 Self :: ColorIsTouchingColor => None ,
14281421 Self :: Answer => None ,
0 commit comments