Simplify variables API

example-project/Cat/Cat.mjs

@@ -50,8 +50,10 @@ export default class Cat extends Sprite {
 
   * turn() {
     for(let i = 0; i < 36; i++) {
+      console.log(this.stage.vars.myGlobalVar)
       yield* this.broadcastAndWait('turn dog')
-      this.direction += 10
+      this.direction += this.vars.speed
+      this.vars.speed += 1
     }
   }
 }

example-project/Dog/Dog.mjs

@@ -21,6 +21,7 @@ export default class Dog extends Sprite {
   * turn() {
     for(let i = 0; i < 36; i++) {
       this.direction += 10
+      this.stage.vars.myGlobalVar = this.random(0, 100)
       yield
     }
   }

example-project/index.mjs

@@ -4,20 +4,24 @@ import Stage from './Stage/Stage.mjs'
 import Dog from './Dog/Dog.mjs'
 import Cat from './Cat/Cat.mjs'
 
-const stage = new Stage({
-  costumeNumber: 1
-})
+const stage = new Stage(
+  { costumeNumber: 1 },
+  { myGlobalVar: "hello" }
+)
 
 const sprites = [
-  new Cat({
-    x: -100,
-    y: 0,
-    direction: 90,
-    costumeNumber: 1,
-    size: 100,
-    visible: true,
-    penDown: true
-  }),
+  new Cat(
+    {
+      x: -100,
+      y: 0,
+      direction: 90,
+      costumeNumber: 1,
+      size: 100,
+      visible: true,
+      penDown: true
+    },
+    { speed: 1 }
+  ),
   new Dog({
     x: 100,
     y: 0,

scratch-js/Project.mjs

@@ -1,10 +1,9 @@
 import Trigger from './Trigger.mjs'
 import Renderer from './Renderer.mjs'
 import Input from './Input.mjs'
-import Vars from './Vars.mjs'
 
 export default class Project {
-  constructor(stage, sprites = [], globalVars = new Vars()) {
+  constructor(stage, sprites = []) {
     this.stage = stage
     this.sprites = sprites
 
@@ -13,8 +12,6 @@ export default class Project {
     }
     this.stage._project = this
 
-    this._vars = globalVars
-
     this.renderer = new Renderer('#project')
     this.input = new Input(this.renderer.stage, key => {
       this.fireTrigger(Trigger.KEY_PRESSED, { key })

scratch-js/Sprite.mjs

@@ -1,13 +1,20 @@
 import Trigger from './Trigger.mjs'
 
 class SpriteBase {
-  constructor(initialConditions) {
+  constructor(initialConditions, vars = {}) {
+    this._project = null
+
     const { costumeNumber } = initialConditions
-
     this.costumeNumber = costumeNumber
 
     this.triggers = []
     this.costumes = []
+
+    this._vars = vars
+  }
+
+  get vars() {
+    return this._vars
   }
 
   set costume(costume) {
@@ -104,8 +111,8 @@ class SpriteBase {
 }
 
 export class Sprite extends SpriteBase {
-  constructor(initialConditions, vars = {}) {
-    super(initialConditions)
+  constructor(initialConditions, ...args) {
+    super(initialConditions, ...args)
 
     const { x, y, direction, costumeNumber, size, visible, penDown, penSize, penColor } = initialConditions
 
@@ -119,8 +126,10 @@ export class Sprite extends SpriteBase {
     this._penDown = penDown || false
     this.penSize = penSize || 1
     this.penColor = penColor || 'blue'
+  }
 
-    this._vars = vars
+  get stage() {
+    return this._project.stage
   }
 
   get direction() {
@@ -235,7 +244,7 @@ export class Sprite extends SpriteBase {
 }
 
 export class Stage extends SpriteBase {
-  constructor(initialConditions) {
-    super(initialConditions)
+  constructor(...args) {
+    super(...args)
   }
 }

scratch-js/Trigger.mjs

@@ -27,11 +27,11 @@ export default class Trigger {
     return true
   }
 
-  start(...args) {
+  start() {
     this.stop()
 
     this.done = false
-    this._scriptRunning = this._script(...args)
+    this._scriptRunning = this._script()
 
     return new Promise(resolve => {
       this.stop = () => {

scratch-js/index.mjs

@@ -2,6 +2,5 @@ import Project from './Project.mjs'
 import { Sprite, Stage } from './Sprite.mjs'
 import Trigger from './Trigger.mjs'
 import Costume from './Costume.mjs'
-import Vars from './Vars.mjs'
 
-export { Project, Sprite, Stage, Trigger, Costume, Vars }
+export { Project, Sprite, Stage, Trigger, Costume }