c_meyer/pxt-calliope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove punctuation for isTouching, isTouchingEdge (#1695)

Browse Source 
* Remove punctuation for isTouching, isTouchingEdge

* Update isTouching,isTouchingEdge in core-strings.json
This commit is contained in:
Xuefeng education 2018-12-02 21:41:52 -08:00 committed by Peli de Halleux
parent 55e5125449
commit 30b6ae3acd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/core/_locales/core-strings.json
View File

@ -260,8 +260,8 @@
"game.LedSprite.delete|block": "delete %this(sprite)", "game.LedSprite.delete|block": "delete %this(sprite)",
"game.LedSprite.get|block": "%sprite|%property", "game.LedSprite.get|block": "%sprite|%property",
"game.LedSprite.ifOnEdgeBounce|block": "%sprite|if on edge, bounce", "game.LedSprite.ifOnEdgeBounce|block": "%sprite|if on edge, bounce",
"game.LedSprite.isTouchingEdge|block": "%sprite|touching edge?", "game.LedSprite.isTouchingEdge|block": "is %sprite|touching edge",
"game.LedSprite.isTouching|block": "%sprite|touching %other|?", "game.LedSprite.isTouching|block": "is %sprite|touching %other",
"game.LedSprite.move|block": "%sprite|move by %leds", "game.LedSprite.move|block": "%sprite|move by %leds",
"game.LedSprite.set|block": "%sprite|set %property|to %value", "game.LedSprite.set|block": "%sprite|set %property|to %value",
"game.LedSprite.turn|block": "%sprite|turn %direction|by (°) %degrees", "game.LedSprite.turn|block": "%sprite|turn %direction|by (°) %degrees",
@ -394,4 +394,4 @@
"{id:category}Serial": "Serial", "{id:category}Serial": "Serial",
"{id:category}String": "String", "{id:category}String": "String",
"{id:category}Text": "Text" "{id:category}Text": "Text"
} }

4
libs/core/game.ts
View File

@ -618,7 +618,7 @@ namespace game {
* @param other TODO * @param other TODO
*/ */
//% weight=20 help=game/is-touching //% weight=20 help=game/is-touching
//% blockId=game_sprite_touching_sprite block="%sprite|touching %other|?" blockGap=8 //% blockId=game_sprite_touching_sprite block="is %sprite|touching %other" blockGap=8
public isTouching(other: LedSprite): boolean { public isTouching(other: LedSprite): boolean {
return this._enabled && other._enabled && this._x == other._x && this._y == other._y; return this._enabled && other._enabled && this._x == other._x && this._y == other._y;
} }
@ -628,7 +628,7 @@ namespace game {
* @param this TODO * @param this TODO
*/ */
//% weight=19 help=game/is-touching-edge //% weight=19 help=game/is-touching-edge
//% blockId=game_sprite_touching_edge block="%sprite|touching edge?" blockGap=8 //% blockId=game_sprite_touching_edge block="is %sprite|touching edge" blockGap=8
public isTouchingEdge(): boolean { public isTouchingEdge(): boolean {
return this._x == 0 || this._x == 4 || this._y == 0 || this._y == 4; return this._x == 0 || this._x == 4 || this._y == 0 || this._y == 4;
} }