smalruby-editor 0.1.1 → 0.1.2

data/app/assets/javascripts/models/character.js.coffee

@@ -14,6 +14,27 @@ Smalruby.Character = Backbone.Model.extend({
     if @get('costumes').length == 0
       @set({ costumes: [Smalruby.Character.PRESET_COSTUMES[0]] })
 
+  validate: (attrs, options) ->
+    errors = []
+
+    name = attrs.name
+    if _.isUndefined(name) || _.isNull(name) ||
+       (_.isString(name) && name.length == 0)
+      errors.push
+        attr: 'name'
+        message: 'Name is required'
+
+    if _.isString(name) &&
+       name.match(/^[0-9A-Z]|[!\"\#$%&\'()\-=^~\\|@`\[{;+:*\]},<.>/?]/)
+      errors.push
+        attr: 'name'
+        message: 'Name is invalid'
+
+    if errors.length > 0
+      return errors
+
+    return
+
   link: (object) ->
     @objects.push(object)
     @objects = _.uniq(@objects)

data/app/assets/javascripts/views/character_modal_view.js.coffee

@@ -37,9 +37,11 @@ Smalruby.CharacterModalView = Backbone.View.extend
         true
 
     self = @
-    @$el.find('input[name="character[name]"]').change (e) ->
+    changeNameFunc = (e) ->
       self.model.set({ name: $(@).val() })
       self.nameChanged = true
+    @$el.find('input[name="character[name]"]').change(changeNameFunc)
+    @$el.find('input[name="character[name]"]').keyup(changeNameFunc)
 
     @$el.find('input[name="character[x]"]').change (e) ->
       self.model.set({ x: $(@).val() })
@@ -55,11 +57,14 @@ Smalruby.CharacterModalView = Backbone.View.extend
     @listenTo(@model, 'change:y', @onChangeY)
     @listenTo(@model, 'change:angle', @onChangeAngle)
     @listenTo(@model, 'change:costumes', @onChangeCostumes)
+    @listenTo(@model, 'change', @onChange)
 
-    @onChange(@model)
+    @callAllOnChangeAttributes_()
 
   render: ->
+    @onChange(@model)
     @$el.modal('show')
+
     # HACK: ダイアログを表示して500ms程度待たないと画像のサイズが取得できなかった
     f = ->
       if @readImageSizeflag
@@ -74,7 +79,7 @@ Smalruby.CharacterModalView = Backbone.View.extend
     if @readImageSizeflag
       setTimeout(_.bind(f, @), 1)
 
-  onChange: (model, options)->
+  callAllOnChangeAttributes_: ->
     @onChangeName(@model, @model.get('name'))
     @onChangeX(@model, @model.get('x'))
     @onChangeY(@model, @model.get('y'))
@@ -118,6 +123,22 @@ Smalruby.CharacterModalView = Backbone.View.extend
     else
       @readImageSizeflag = true
 
+  onChange: (model, options) ->
+    return unless @target
+
+    @$el.find('.control-group[for="character[name]"]').removeClass('error')
+    @$el.find('#character-modal-ok-button').removeClass('disabled').removeAttr('disabled')
+
+    unless @model.isValid()
+      @$el.find('.control-group[for="character[name]"]').addClass('error')
+      @$el.find('#character-modal-ok-button').addClass('disabled').attr({ disabled: 'disabled' })
+
+    name = @model.get('name')
+    if @target.get('name') != name &&
+       Smalruby.Collections.CharacterSet.findWhere({ name: name })
+      @$el.find('.control-group[for="character[name]"]').addClass('error')
+      @$el.find('#character-modal-ok-button').addClass('disabled').attr({ disabled: 'disabled' })
+
   onSelectCostume: (e) ->
     e.preventDefault()
 

data/app/views/editor/_character_modal.html.haml

@@ -17,7 +17,7 @@
 
       #character-modal-attributes
         %form#character-modal-form{:class => 'form-horizontal'}
-          .control-group
+          .control-group{:for => "character[name]"}
             %label.control-label{:for => 'character_name'}<
               名前
             .controls

data/app/views/editor/_toolbox.html.haml

@@ -22,7 +22,6 @@
 
     -# [▼]へ向ける
     %block{:type => "#{category}_point_towards_character"}
-      = toolbox_character_field
 
     -# x座標を(　)、y座標を(　)にする
     %block{:type => "#{category}_set_x_y"}
@@ -247,12 +246,12 @@
       = toolbox_number_value('A', 1)
       = toolbox_number_value('B', 10)
 
-    -# 変数:(　)の[　]番目
+    -# 変数:(　)の(　)番目
     %block{:type => "#{category}_index_of"}
       = toolbox_text_value('A', 'あいうえお')
       = toolbox_number_value('INDEX', 1)
 
-    -# 変数:[　]の長さ
+    -# 変数:(　)の長さ
     %block{:type => "#{category}_length"}
       = toolbox_text_value('A', 'あいうえお')
 
@@ -363,6 +362,11 @@
     -#  -# LCDをクリアする
     -#  %block{:type => "#{category}_lcd_clear"}
 
+    %category{:name => 'サーボ'}
+      -# サーボ[▼ピン]を(　)度(5～180)にする
+      %block{:type => "#{category}_servo_set_position"}
+        = toolbox_number_value('POS', 90)
+
     -#%category{:name => 'ボタン'}
     -#  -# 条件:ボタン[▼]を押している
     -#  %block{:type => "#{category}_button_down"}

data/lib/smalruby_editor/version.rb

@@ -1,3 +1,3 @@
 module SmalrubyEditor
-  VERSION =  '0.1.1'
+  VERSION =  '0.1.2'
 end

data/public/assets/{application-0c2ae32cd8822cec7ba6e445e2501010.js → application-735e172a0df828da16d22f5d3c26671f.js}

@@ -12642,6 +12642,26 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
         });
       }
     },
+    validate: function(attrs, options) {
+      var errors, name;
+      errors = [];
+      name = attrs.name;
+      if (_.isUndefined(name) || _.isNull(name) || (_.isString(name) && name.length === 0)) {
+        errors.push({
+          attr: 'name',
+          message: 'Name is required'
+        });
+      }
+      if (_.isString(name) && name.match(/^[0-9A-Z]|[!\"\#$%&\'()\-=^~\\|@`\[{;+:*\]},<.>/?]/)) {
+        errors.push({
+          attr: 'name',
+          message: 'Name is invalid'
+        });
+      }
+      if (errors.length > 0) {
+        return errors;
+      }
+    },
     link: function(object) {
       this.objects.push(object);
       this.objects = _.uniq(this.objects);
@@ -12820,7 +12840,7 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
     },
     previewZoomLevel: 0.5,
     initialize: function() {
-      var self, setPosition,
+      var changeNameFunc, self, setPosition,
         _this = this;
       this.target = null;
       $('#character-modal-costume-selector img').on('dragstart', function(e) {
@@ -12855,12 +12875,14 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
         }
       });
       self = this;
-      this.$el.find('input[name="character[name]"]').change(function(e) {
+      changeNameFunc = function(e) {
         self.model.set({
           name: $(this).val()
         });
         return self.nameChanged = true;
-      });
+      };
+      this.$el.find('input[name="character[name]"]').change(changeNameFunc);
+      this.$el.find('input[name="character[name]"]').keyup(changeNameFunc);
       this.$el.find('input[name="character[x]"]').change(function(e) {
         return self.model.set({
           x: $(this).val()
@@ -12881,10 +12903,12 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
       this.listenTo(this.model, 'change:y', this.onChangeY);
       this.listenTo(this.model, 'change:angle', this.onChangeAngle);
       this.listenTo(this.model, 'change:costumes', this.onChangeCostumes);
-      return this.onChange(this.model);
+      this.listenTo(this.model, 'change', this.onChange);
+      return this.callAllOnChangeAttributes_();
     },
     render: function() {
       var f;
+      this.onChange(this.model);
       this.$el.modal('show');
       f = function() {
         var img;
@@ -12905,7 +12929,7 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
         return setTimeout(_.bind(f, this), 1);
       }
     },
-    onChange: function(model, options) {
+    callAllOnChangeAttributes_: function() {
       this.onChangeName(this.model, this.model.get('name'));
       this.onChangeX(this.model, this.model.get('x'));
       this.onChangeY(this.model, this.model.get('y'));
@@ -12955,6 +12979,29 @@ Blockly.Msg.CONTROLS_IF_ELSE_TITLE_ELSE = Blockly.Msg.CONTROLS_IF_MSG_ELSE;
         return this.readImageSizeflag = true;
       }
     },
+    onChange: function(model, options) {
+      var name;
+      if (!this.target) {
+        return;
+      }
+      this.$el.find('.control-group[for="character[name]"]').removeClass('error');
+      this.$el.find('#character-modal-ok-button').removeClass('disabled').removeAttr('disabled');
+      if (!this.model.isValid()) {
+        this.$el.find('.control-group[for="character[name]"]').addClass('error');
+        this.$el.find('#character-modal-ok-button').addClass('disabled').attr({
+          disabled: 'disabled'
+        });
+      }
+      name = this.model.get('name');
+      if (this.target.get('name') !== name && Smalruby.Collections.CharacterSet.findWhere({
+        name: name
+      })) {
+        this.$el.find('.control-group[for="character[name]"]').addClass('error');
+        return this.$el.find('#character-modal-ok-button').addClass('disabled').attr({
+          disabled: 'disabled'
+        });
+      }
+    },
     onSelectCostume: function(e) {
       var attrs, costume, prefix;
       e.preventDefault();
@@ -13405,37 +13452,45 @@ case     end      next     return   until\
 
   Blockly.Ruby.ORDER_MEMBER = 2;
 
-  Blockly.Ruby.ORDER_FUNCTION_CALL = 2;
+  Blockly.Ruby.ORDER_INDEX = 3;
+
+  Blockly.Ruby.ORDER_FUNCTION_CALL = 4;
+
+  Blockly.Ruby.ORDER_UNARY_SIGN = 5;
 
-  Blockly.Ruby.ORDER_EXPONENTIATION = 3;
+  Blockly.Ruby.ORDER_EXPONENTIATION = 6;
 
-  Blockly.Ruby.ORDER_UNARY_SIGN = 4;
+  Blockly.Ruby.ORDER_UNARY_MINUS_SIGN = 7;
 
-  Blockly.Ruby.ORDER_BITWISE_NOT = 4;
+  Blockly.Ruby.ORDER_MULTIPLICATIVE = 8;
 
-  Blockly.Ruby.ORDER_MULTIPLICATIVE = 5;
+  Blockly.Ruby.ORDER_ADDITIVE = 9;
 
-  Blockly.Ruby.ORDER_ADDITIVE = 6;
+  Blockly.Ruby.ORDER_BITWISE_SHIFT = 10;
 
-  Blockly.Ruby.ORDER_BITWISE_SHIFT = 7;
+  Blockly.Ruby.ORDER_BITWISE_AND = 11;
 
-  Blockly.Ruby.ORDER_BITWISE_AND = 8;
+  Blockly.Ruby.ORDER_BITWISE_XOR = 12;
 
-  Blockly.Ruby.ORDER_BITWISE_XOR = 9;
+  Blockly.Ruby.ORDER_BITWISE_OR = 12;
 
-  Blockly.Ruby.ORDER_BITWISE_OR = 10;
+  Blockly.Ruby.ORDER_RELATIONAL = 13;
 
-  Blockly.Ruby.ORDER_RELATIONAL = 11;
+  Blockly.Ruby.ORDER_EQUALS = 14;
 
-  Blockly.Ruby.ORDER_LOGICAL_NOT = 12;
+  Blockly.Ruby.ORDER_LOGICAL_AND = 15;
 
-  Blockly.Ruby.ORDER_LOGICAL_AND = 13;
+  Blockly.Ruby.ORDER_LOGICAL_OR = 16;
 
-  Blockly.Ruby.ORDER_LOGICAL_OR = 14;
+  Blockly.Ruby.ORDER_RANGE = 17;
 
-  Blockly.Ruby.ORDER_CONDITIONAL = 15;
+  Blockly.Ruby.ORDER_CONDITIONAL = 18;
 
-  Blockly.Ruby.ORDER_LAMBDA = 16;
+  Blockly.Ruby.ORDER_ASSIGNMENT = 19;
+
+  Blockly.Ruby.ORDER_NOT = 20;
+
+  Blockly.Ruby.ORDER_AND_OR = 21;
 
   Blockly.Ruby.ORDER_NONE = 99;
 
@@ -13642,12 +13697,160 @@ case     end      next     return   until\
     return commentCode + code + nextCode;
   };
 
+}).call(this);
+(function() {
+  'use strict';
+  goog.provide('Smalruby.FieldCharacter');
+
+  goog.require('Blockly.FieldDropdown');
+
+  Smalruby.FieldCharacter = function(character, opt_changeHandler) {
+    var changeHandler, charSet,
+      _this = this;
+    if (opt_changeHandler) {
+      changeHandler = function(value) {
+        var newVal, retVal;
+        retVal = Smalruby.FieldCharacter.dropdownChange.call(_this, value);
+        if (retVal) {
+          newVal = retVal;
+        } else {
+          retVal = _this.getValue();
+        }
+        opt_changeHandler.call(_this, newVal);
+        return retVal;
+      };
+    } else {
+      changeHandler = Smalruby.FieldCharacter.dropdownChange;
+    }
+    Smalruby.FieldCharacter.superClass_.constructor.call(this, Smalruby.FieldCharacter.dropdownCreate, changeHandler);
+    charSet = Smalruby.Collections.CharacterSet;
+    charSet.on('add', this.onCharacterSetAdd_, this);
+    charSet.on('remove', this.onCharacterSetRemove_, this);
+    charSet.on('reset', this.onCharacterSetReset_, this);
+    this.character = Smalruby.FieldCharacter.NullCharacter;
+    if (!character) {
+      character = Smalruby.Collections.CharacterSet.first();
+    }
+    return this.setCharacter(character);
+  };
+
+  goog.inherits(Smalruby.FieldCharacter, Blockly.FieldDropdown);
+
+  Smalruby.FieldCharacter.prototype.setCharacter = function(character) {
+    if (character === this.character) {
+      return;
+    }
+    this.character.unlink(this);
+    this.character.off('change:name', this.onCharacterChangeName_, this);
+    this.character = character ? character : Smalruby.FieldCharacter.NullCharacter;
+    this.character.link(this);
+    this.character.on('change:name', this.onCharacterChangeName_, this);
+    return this.setValue(this.character.get('name'));
+  };
+
+  Smalruby.FieldCharacter.prototype.onCharacterSetAdd_ = function(model, collection, options) {
+    if (this.character === Smalruby.FieldCharacter.NullCharacter) {
+      return this.setCharacter(model);
+    }
+  };
+
+  Smalruby.FieldCharacter.prototype.onCharacterSetRemove_ = function(model, collection, options) {
+    if (model === this.character) {
+      return this.setCharacter();
+    }
+  };
+
+  Smalruby.FieldCharacter.prototype.onCharacterSetReset_ = function(collection, options) {
+    if (this.character === Smalruby.FieldCharacter.NullCharacter) {
+      return this.setCharacter(collection.first());
+    } else {
+      return this.setCharacter(collection.findWhere({
+        name: this.getValue()
+      }));
+    }
+  };
+
+  Smalruby.FieldCharacter.prototype.onCharacterChangeName_ = function(model, value, options) {
+    return this.setValue(value);
+  };
+
+  Smalruby.FieldCharacter.prototype.clone = function() {
+    return new Smalruby.FieldCharacter(this.character, this.changeHandler_);
+  };
+
+  Smalruby.FieldCharacter.prototype.dispose = function() {
+    var charSet;
+    charSet = Smalruby.Collections.CharacterSet;
+    charSet.off('add', this.onCharacterSetAdd_, this);
+    charSet.off('remove', this.onCharacterSetRemove_, this);
+    charSet.off('reset', this.onCharacterSetReset_, this);
+    this.setCharacter();
+    return Blockly.FieldDropdown.prototype.dispose.call(this);
+  };
+
+  Smalruby.FieldCharacter.prototype.setText = function(value) {
+    var charSet;
+    if (!this.character) {
+      this.character = Smalruby.FieldCharacter.NullCharacter;
+      charSet = Smalruby.Collections.CharacterSet;
+      this.setCharacter(charSet.findWhere({
+        name: value
+      }));
+    }
+    return Blockly.FieldDropdown.prototype.setText.call(this, value);
+  };
+
+  Smalruby.FieldCharacter.dropdownCreate = function() {
+    var charSet;
+    charSet = Smalruby.Collections.CharacterSet;
+    if (charSet.length > 0) {
+      return Smalruby.Collections.CharacterSet.map(function(c) {
+        var n;
+        n = c.get('name');
+        return [n, n];
+      });
+    } else {
+      return [[Smalruby.FieldCharacter.NullCharacter.get('name'), '']];
+    }
+  };
+
+  Smalruby.FieldCharacter.dropdownChange = function(value) {
+    var c;
+    c = Smalruby.Collections.CharacterSet.findWhere({
+      name: value
+    });
+    if (c) {
+      this.setCharacter(c);
+      return value;
+    } else {
+      return null;
+    }
+  };
+
+  Smalruby.FieldCharacter.NullCharacter = {
+    get: function(name) {
+      return 'キャラクターなし';
+    },
+    on: function() {
+      return $.noop;
+    },
+    off: function() {
+      return $.noop;
+    },
+    link: function() {
+      return $.noop;
+    },
+    unlink: function() {
+      return $.noop;
+    }
+  };
+
 }).call(this);
 (function() {
   Blockly.Ruby['math_number'] = function(block) {
     var code, order;
     code = parseFloat(this.getFieldValue('NUM'));
-    order = code < 0 ? Blockly.Ruby.ORDER_UNARY_SIGN : Blockly.Ruby.ORDER_ATOMIC;
+    order = code < 0 ? Blockly.Ruby.ORDER_UNARY_MINUS_SIGN : Blockly.Ruby.ORDER_ATOMIC;
     return [code, order];
   };
 
@@ -14015,7 +14218,7 @@ case     end      next     return   until\
     init: function() {
       this.setHelpUrl('');
       this.setColour(33);
-      this.appendDummyInput().appendField(new Blockly.FieldVariable('car1'), 'CHAR').appendField('にぶつかったとき');
+      this.appendDummyInput().appendField(new Smalruby.FieldCharacter(), 'CHAR').appendField('にぶつかったとき');
       this.appendStatementInput('DO');
       this.setPreviousStatement(true);
       this.setNextStatement(true);
@@ -14025,17 +14228,18 @@ case     end      next     return   until\
 
   Blockly.Ruby['events_on_hit'] = function(block) {
     var char;
-    char = Blockly.Ruby.variableDB_.getName(block.getFieldValue('CHAR'), Blockly.Variables.NAME_TYPE);
+    char = this.getFieldValue('CHAR');
     return Blockly.Ruby.characterEvent_(block, 'DO', 'hit', char);
   };
 
 }).call(this);
 (function() {
-  var acDropdown, aiPinDropdown, dioPinDropdown, n, pwmPinDropdown;
+  var acDropdown, aiPinDropdown, dioPinDropdown, n, pwmPinDropdown, rgbLedPinDropdown;
 
   window.SmalrubyEditor.Hardware = {
     Type: 'Arduino',
     DioPins: [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13],
+    PwmPins: [3, 5, 6, 9, 10, 11],
     AiPins: [0, 1, 2, 3, 4, 5]
   };
 
@@ -14051,6 +14255,17 @@ case     end      next     return   until\
   })();
 
   pwmPinDropdown = (function() {
+    var _i, _len, _ref, _results;
+    _ref = window.SmalrubyEditor.Hardware.PwmPins;
+    _results = [];
+    for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+      n = _ref[_i];
+      _results.push(["D" + n, "D" + n]);
+    }
+    return _results;
+  })();
+
+  rgbLedPinDropdown = (function() {
     var _i, _len, _ref, _results;
     _ref = [3, 9];
     _results = [];
@@ -14128,7 +14343,7 @@ case     end      next     return   until\
     init: function() {
       this.setHelpUrl('');
       this.setColour(208);
-      this.appendDummyInput().appendField('RGB LED').appendField(new Blockly.FieldDropdown(acDropdown), 'AC').appendField('コモン').appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN').appendField('を').appendField(new Blockly.FieldColour('#ff0000'), 'COLOUR').appendField('にする');
+      this.appendDummyInput().appendField('RGB LED').appendField(new Blockly.FieldDropdown(acDropdown), 'AC').appendField('コモン').appendField(new Blockly.FieldDropdown(rgbLedPinDropdown), 'PIN').appendField('を').appendField(new Blockly.FieldColour('#ff0000'), 'COLOUR').appendField('にする');
       this.setPreviousStatement(true);
       this.setNextStatement(true);
       return this.setTooltip('');
@@ -14150,7 +14365,7 @@ case     end      next     return   until\
     init: function() {
       this.setHelpUrl('');
       this.setColour(208);
-      this.appendDummyInput().appendField('RGB LED').appendField(new Blockly.FieldDropdown(acDropdown), 'AC').appendField('コモン').appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN').appendField('をオフにする');
+      this.appendDummyInput().appendField('RGB LED').appendField(new Blockly.FieldDropdown(acDropdown), 'AC').appendField('コモン').appendField(new Blockly.FieldDropdown(rgbLedPinDropdown), 'PIN').appendField('をオフにする');
       this.setPreviousStatement(true);
       this.setNextStatement(true);
       return this.setTooltip('');
@@ -14254,6 +14469,27 @@ case     end      next     return   until\
     return "seven_segment_display.off\n";
   };
 
+  Blockly.Blocks['hardware_servo_set_position'] = {
+    init: function() {
+      this.setHelpUrl('');
+      this.setColour(208);
+      this.appendDummyInput().appendField('サーボ').appendField(new Blockly.FieldDropdown(pwmPinDropdown), 'PIN').appendField('を');
+      this.appendValueInput('POS').setCheck('Number');
+      this.appendDummyInput().appendField('度(5～180)にする');
+      this.setInputsInline(true);
+      this.setPreviousStatement(true);
+      this.setNextStatement(true);
+      return this.setTooltip('');
+    }
+  };
+
+  Blockly.Ruby['hardware_servo_set_position'] = function(block) {
+    var pin, pos;
+    pin = this.getFieldValue('PIN');
+    pos = Blockly.Ruby.valueToCode(this, 'POS', Blockly.Ruby.ORDER_FUNCTION_CALL) || '5';
+    return Blockly.Ruby.characterMethodCall_("servo(" + (Blockly.Ruby.quote_(pin)) + ").position = " + pos);
+  };
+
   Blockly.Blocks['hardware_button_down'] = {
     init: function() {
       this.setHelpUrl('');
@@ -14650,7 +14886,7 @@ case     end      next     return   until\
     init: function() {
       this.setHelpUrl('');
       this.setColour(225);
-      this.appendDummyInput().appendField(new Blockly.FieldVariable('char1'), 'VAR').appendField('へ向ける');
+      this.appendDummyInput().appendField(new Smalruby.FieldCharacter(), 'CHAR').appendField('へ向ける');
       this.setPreviousStatement(true);
       this.setNextStatement(true);
       return this.setTooltip('');
@@ -14659,7 +14895,7 @@ case     end      next     return   until\
 
   Blockly.Ruby['motion_point_towards_character'] = function(block) {
     var char;
-    char = Blockly.Ruby.variableDB_.getName(block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+    char = this.getFieldValue('CHAR');
     return Blockly.Ruby.characterMethodCall_('point_towards', char);
   };
 
@@ -14705,7 +14941,7 @@ case     end      next     return   until\
     init: function() {
       this.setHelpUrl('');
       this.setColour(225);
-      this.appendDummyInput().appendField(new Blockly.FieldVariable('char1'), 'VAR').appendField('へ行く');
+      this.appendDummyInput().appendField(new Smalruby.FieldCharacter(), 'CHAR').appendField('へ行く');
       this.setPreviousStatement(true);
       this.setNextStatement(true);
       return this.setTooltip('');
@@ -14713,8 +14949,8 @@ case     end      next     return   until\
   };
 
   Blockly.Ruby['motion_go_to_character'] = function(block) {
-    var var0;
-    var0 = Blockly.Ruby.variableDB_.getName(block.getFieldValue('VAR'), Blockly.Variables.NAME_TYPE);
+    var char;
+    char = this.getFieldValue('CHAR');
     return "" + (Blockly.Ruby.rn()) + "go_to(" + var0 + ")\n";
   };
 
@@ -14991,11 +15227,11 @@ case     end      next     return   until\
     var a, b, order;
     order = Blockly.Ruby.ORDER_MULTIPLICATIVE;
     a = Blockly.Ruby.valueToCode(block, 'A', order) || '0';
-    b = Blockly.Ruby.valueToCode(block, 'B', order) || '0';
+    b = Blockly.Ruby.valueToCode(block, 'B', order) || '1';
     return [a + ' / ' + b, order];
   };
 
-  Blockly.Blocks['operators_compare_gt'] = {
+  Blockly.Blocks['operators_compare_lt'] = {
     init: function() {
       this.setHelpUrl('');
       this.setColour(93);
@@ -15006,7 +15242,7 @@ case     end      next     return   until\
     }
   };
 
-  Blockly.Ruby['operators_compare_gt'] = function(block) {
+  Blockly.Ruby['operators_compare_lt'] = function(block) {
     var a, b, order;
     order = Blockly.Ruby.ORDER_RELATIONAL;
     a = Blockly.Ruby.valueToCode(block, 'A', order) || '0';
@@ -15014,7 +15250,7 @@ case     end      next     return   until\
     return [a + ' < ' + b, order];
   };
 
-  Blockly.Blocks['operators_compare_gte'] = {
+  Blockly.Blocks['operators_compare_lte'] = {
     init: function() {
       this.setHelpUrl('');
       this.setColour(93);
@@ -15025,7 +15261,7 @@ case     end      next     return   until\
     }
   };
 
-  Blockly.Ruby['operators_compare_gte'] = function(block) {
+  Blockly.Ruby['operators_compare_lte'] = function(block) {
     var a, b, order;
     order = Blockly.Ruby.ORDER_RELATIONAL;
     a = Blockly.Ruby.valueToCode(block, 'A', order) || '0';
@@ -15046,13 +15282,13 @@ case     end      next     return   until\
 
   Blockly.Ruby['operators_compare_eq'] = function(block) {
     var a, b, order;
-    order = Blockly.Ruby.ORDER_RELATIONAL;
+    order = Blockly.Ruby.ORDER_EQUALS;
     a = Blockly.Ruby.valueToCode(block, 'A', order) || '0';
     b = Blockly.Ruby.valueToCode(block, 'B', order) || '0';
     return [a + ' == ' + b, order];
   };
 
-  Blockly.Blocks['operators_compare_lte'] = {
+  Blockly.Blocks['operators_compare_gte'] = {
     init: function() {
       this.setHelpUrl('');
       this.setColour(93);
@@ -15063,7 +15299,7 @@ case     end      next     return   until\
     }
   };
 
-  Blockly.Ruby['operators_compare_lte'] = function(block) {
+  Blockly.Ruby['operators_compare_gte'] = function(block) {
     var a, b, order;
     order = Blockly.Ruby.ORDER_RELATIONAL;
     a = Blockly.Ruby.valueToCode(block, 'A', order) || '0';
@@ -15071,7 +15307,7 @@ case     end      next     return   until\
     return [a + ' >= ' + b, order];
   };
 
-  Blockly.Blocks['operators_compare_lt'] = {
+  Blockly.Blocks['operators_compare_gt'] = {
     init: function() {
       this.setHelpUrl('');
       this.setColour(93);
@@ -15082,7 +15318,7 @@ case     end      next     return   until\
     }
   };
 
-  Blockly.Ruby['operators_compare_lt'] = function(block) {
+  Blockly.Ruby['operators_compare_gt'] = function(block) {
     var a, b, order;
     order = Blockly.Ruby.ORDER_RELATIONAL;
     a = Blockly.Ruby.valueToCode(block, 'A', order) || '0';
@@ -15102,11 +15338,10 @@ case     end      next     return   until\
   };
 
   Blockly.Ruby['operators_rand'] = function(block) {
-    var a, b, order;
-    order = Blockly.Ruby.ORDER_FUNCTION_CALL;
-    a = Blockly.Ruby.valueToCode(block, 'A', order) || '0';
-    b = Blockly.Ruby.valueToCode(block, 'B', order) || '0';
-    return ["rand(" + a + ".." + b + ")", order];
+    var a, b;
+    a = Blockly.Ruby.valueToCode(block, 'A', Blockly.Ruby.ORDER_RANGE) || '0';
+    b = Blockly.Ruby.valueToCode(block, 'B', Blockly.Ruby.ORDER_RANGE) || '0';
+    return ["rand(" + a + ".." + b + ")", Blockly.Ruby.ORDER_FUNCTION_CALL];
   };
 
   Blockly.Blocks['operators_and'] = {
@@ -15160,7 +15395,7 @@ case     end      next     return   until\
 
   Blockly.Ruby['operators_negate'] = function(block) {
     var a, order;
-    order = Blockly.Ruby.ORDER_LOGICAL_NOT;
+    order = Blockly.Ruby.ORDER_UNARY_SIGN;
     a = Blockly.Ruby.valueToCode(block, 'A', order) || 'true';
     return ["!" + a, order];
   };
@@ -15177,11 +15412,10 @@ case     end      next     return   until\
   };
 
   Blockly.Ruby['operators_index_of'] = function(block) {
-    var a, index, order;
-    order = Blockly.Ruby.ORDER_FUNCTION_CALL;
-    a = Blockly.Ruby.valueToCode(block, 'A', order) || '""';
-    index = Blockly.Ruby.valueToCode(block, 'INDEX', order) || '0';
-    return ["" + a + "[" + index + "]", order];
+    var a, index;
+    a = Blockly.Ruby.valueToCode(block, 'A', Blockly.Ruby.ORDER_FUNCTION_CALL) || '""';
+    index = Blockly.Ruby.valueToCode(block, 'INDEX', Blockly.Ruby.ORDER_INDEX) || '0';
+    return ["" + a + "[" + index + "]", Blockly.Ruby.ORDER_FUNCTION_CALL];
   };
 
   Blockly.Blocks['operators_length'] = {
@@ -15216,8 +15450,8 @@ case     end      next     return   until\
   Blockly.Ruby['operators_modulo'] = function(block) {
     var a, b, order;
     order = Blockly.Ruby.ORDER_MULTIPLICATIVE;
-    a = Blockly.Ruby.valueToCode(block, 'A', order) || '5';
-    b = Blockly.Ruby.valueToCode(block, 'B', order) || '2';
+    a = Blockly.Ruby.valueToCode(block, 'A', order) || '1';
+    b = Blockly.Ruby.valueToCode(block, 'B', order) || '1';
     return ["" + a + " % " + b, order];
   };
 
@@ -15445,7 +15679,7 @@ case     end      next     return   until\
     init: function() {
       this.setHelpUrl('');
       this.setColour(200);
-      this.appendDummyInput().appendField(new Blockly.FieldVariable('car1'), 'CHAR').appendField('に触れた');
+      this.appendDummyInput().appendField(new Smalruby.FieldCharacter(), 'CHAR').appendField('に触れた');
       this.setOutput(true, 'Boolean');
       return this.setTooltip('');
     }
@@ -15453,7 +15687,7 @@ case     end      next     return   until\
 
   Blockly.Ruby['sensing_hit'] = function(block) {
     var char;
-    char = Blockly.Ruby.variableDB_.getName(block.getFieldValue('CHAR'), Blockly.Variables.NAME_TYPE);
+    char = this.getFieldValue('CHAR');
     return Blockly.Ruby.characterMethodCallInput_('hit?', char);
   };
 
@@ -15524,7 +15758,7 @@ case     end      next     return   until\
       dropdown = [['x座標', 'x'], ['y座標', 'y'], ['向き', 'angle'], ['コスチューム番号', 'costume_index'], ['コスチューム名', 'costume'], ['大きさ', 'scale'], ['ボリューム', 'volume']];
       this.setHelpUrl('');
       this.setColour(200);
-      this.appendDummyInput().appendField(new Blockly.FieldVariable('car1'), 'CHAR').appendField('の').appendField(new Blockly.FieldDropdown(dropdown), 'PROPERTY');
+      this.appendDummyInput().appendField(new Smalruby.FieldCharacter(), 'CHAR').appendField('の').appendField(new Blockly.FieldDropdown(dropdown), 'PROPERTY');
       this.setOutput(true, ['Number', 'String']);
       return this.setTooltip('');
     }
@@ -15532,7 +15766,7 @@ case     end      next     return   until\
 
   Blockly.Ruby['sensing_character_property'] = function(block) {
     var c, char, property;
-    char = Blockly.Ruby.variableDB_.getName(block.getFieldValue('CHAR'), Blockly.Variables.NAME_TYPE);
+    char = this.getFieldValue('CHAR');
     property = this.getFieldValue('PROPERTY');
     c = Smalruby.Collections.CharacterSet.findWhere({
       name: char
@@ -15696,6 +15930,7 @@ case     end      next     return   until\
 
 
 
+
 
 
 ;