Scratch 2.0-sized blocks

SheepTester · Jul 13, 2018 · da4f64b · da4f64b
1 parent 50e6351
commit da4f64b
Show file tree

Hide file tree

Showing 11 changed files with 1,954 additions and 104 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,23 +13,16 @@ common.pyc
 *.komodoproject
 /nbproject/private/
 
-/accessible/*
-/dist
-/msg/js/*
-!/msg/js/en.js
-/msg/json/*
-!/msg/json/en.json
-/blockly_compressed_horizontal.js
-/blockly_compressed_vertical.js
-/blockly_uncompressed_horizontal.js
-/blockly_uncompressed_vertical.js
-/blocks_compressed_horizontal.js
-/blocks_compressed_vertical.js
-/blocks_compressed.js
-/gh-pages/main.js
-/gh-pages/playgrounds
-/gh-pages/Gemfile.lock
-/gh-pages/closure-library
-/gh-pages/_site
-/*compiler*.jar
-/local_blockly_compressed_vertical.js
+# /accessible/*
+# /dist
+# /msg/js/*
+# !/msg/js/en.js
+# /msg/json/*
+# !/msg/json/en.json
+# /gh-pages/main.js
+# /gh-pages/playgrounds
+# /gh-pages/Gemfile.lock
+# /gh-pages/closure-library
+# /gh-pages/_site
+# /*compiler*.jar
+# /local_blockly_compressed_vertical.js
diff --git a/blockly_uncompressed_vertical.js b/blockly_uncompressed_vertical.js
diff --git a/blocks_common/colour.js b/blocks_common/colour.js
@@ -54,7 +54,7 @@ Blockly.Blocks['colour_picker'] = {
           "colour": randomColour()
         }
       ],
-      "outputShape": Blockly.OUTPUT_SHAPE_ROUND,
+      "outputShape": Blockly.OUTPUT_SHAPE_SQUARE,
       "output": "Colour"
     });
   }

diff --git a/blocks_common/text.js b/blocks_common/text.js
@@ -47,7 +47,7 @@ Blockly.Blocks['text'] = {
         }
       ],
       "output": "String",
-      "outputShape": Blockly.OUTPUT_SHAPE_ROUND,
+      "outputShape": Blockly.OUTPUT_SHAPE_SQUARE,
       "colour": Blockly.Colours.textField,
       "colourSecondary": Blockly.Colours.textField,
       "colourTertiary": Blockly.Colours.textField

diff --git a/blocks_vertical/default_toolbox.js b/blocks_vertical/default_toolbox.js
@@ -248,7 +248,7 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
     '</block>' +
     '<block type="sound_volume" id="sound_volume"></block>' +
   '</category>' +
-  '<category name="%{BKY_CATEGORY_EVENTS}" id="events" colour="#FFD500" secondaryColour="#CC9900">' +
+  '<category name="%{BKY_CATEGORY_EVENTS}" id="events" colour="#FFAB19" secondaryColour="#CF8B17">' +
     '<block type="event_whenflagclicked" id="event_whenflagclicked"></block>' +
     '<block type="event_whenkeypressed" id="event_whenkeypressed">' +
     '</block>' +
@@ -275,7 +275,7 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
       '</value>' +
     '</block>' +
   '</category>' +
-  '<category name="%{BKY_CATEGORY_CONTROL}" id="control" colour="#FFAB19" secondaryColour="#CF8B17">' +
+  '<category name="%{BKY_CATEGORY_CONTROL}" id="control" colour="#FFD500" secondaryColour="#CC9900">' +
     '<block type="control_wait" id="control_wait">' +
       '<value name="DURATION">' +
         '<shadow type="math_positive_number">' +

diff --git a/blocks_vertical/extensions.js b/blocks_vertical/extensions.js
@@ -38,8 +38,8 @@ Blockly.Blocks['extension_pen_down'] = {
         {
           "type": "field_image",
           "src": Blockly.mainWorkspace.options.pathToMedia + "extensions/pen-block-icon.svg",
-          "width": 40,
-          "height": 40
+          "width": 24,
+          "height": 24
         },
         {
           "type": "field_vertical_separator"
@@ -62,8 +62,8 @@ Blockly.Blocks['extension_music_drum'] = {
         {
           "type": "field_image",
           "src": Blockly.mainWorkspace.options.pathToMedia + "extensions/music-block-icon.svg",
-          "width": 40,
-          "height": 40
+          "width": 24,
+          "height": 24
         },
         {
           "type": "field_vertical_separator"
@@ -90,8 +90,8 @@ Blockly.Blocks['extension_wedo_motor'] = {
         {
           "type": "field_image",
           "src": Blockly.mainWorkspace.options.pathToMedia + "extensions/wedo2-block-icon.svg",
-          "width": 40,
-          "height": 40
+          "width": 24,
+          "height": 24
         },
         {
           "type": "field_vertical_separator"
@@ -120,8 +120,8 @@ Blockly.Blocks['extension_wedo_hat'] = {
         {
           "type": "field_image",
           "src": Blockly.mainWorkspace.options.pathToMedia + "extensions/wedo2-block-icon.svg",
-          "width": 40,
-          "height": 40
+          "width": 24,
+          "height": 24
         },
         {
           "type": "field_vertical_separator"
@@ -144,8 +144,8 @@ Blockly.Blocks['extension_wedo_boolean'] = {
         {
           "type": "field_image",
           "src": Blockly.mainWorkspace.options.pathToMedia + "extensions/wedo2-block-icon.svg",
-          "width": 40,
-          "height": 40
+          "width": 24,
+          "height": 24
         },
         {
           "type": "field_vertical_separator"
@@ -168,8 +168,8 @@ Blockly.Blocks['extension_wedo_tilt_reporter'] = {
         {
           "type": "field_image",
           "src": Blockly.mainWorkspace.options.pathToMedia + "extensions/wedo2-block-icon.svg",
-          "width": 40,
-          "height": 40
+          "width": 24,
+          "height": 24
         },
         {
           "type": "field_vertical_separator"
@@ -220,8 +220,8 @@ Blockly.Blocks['extension_music_reporter'] = {
         {
           "type": "field_image",
           "src": Blockly.mainWorkspace.options.pathToMedia + "extensions/music-block-icon.svg",
-          "width": 40,
-          "height": 40
+          "width": 24,
+          "height": 24
         },
         {
           "type": "field_vertical_separator"
@@ -244,8 +244,8 @@ Blockly.Blocks['extension_microbit_display'] = {
         {
           "type": "field_image",
           "src": Blockly.mainWorkspace.options.pathToMedia + "extensions/microbit-block-icon.svg",
-          "width": 40,
-          "height": 40
+          "width": 24,
+          "height": 24
         },
         {
           "type": "field_vertical_separator"