fix makefile; prettify javascript

scripts/actor.js

@@ -5,8 +5,7 @@ var script_times = {};
 
 var actor_spawns = {};
 
-globalThis.class_use = function(script, config, base, callback)
-{
+globalThis.class_use = function (script, config, base, callback) {
   var file = Resources.find_script(script);
 
   if (!file) {
@@ -31,24 +30,21 @@ globalThis.class_use = function(script, config, base, callback)
 
   var script = Resources.replstrs(file);
   script = `(function() { var self = this; var $ = this.__proto__; ${script}; })`;
-  
-  var fn = os.eval(file,script);
+
+  var fn = os.eval(file, script);
   fn.call(padawan);
 
-  if (typeof config === 'object')
-    Object.merge(padawan,config);
+  if (typeof config === "object") Object.merge(padawan, config);
 
   return padawan;
-}
+};
 
-globalThis.rmactor = function(e)
-{
+globalThis.rmactor = function (e) {
   if (!actor_spawns[e._file]) return;
   actor_spawns[e._file].remove(e);
-}
+};
 
-actor.__stats = function()
-{
+actor.__stats = function () {
   var total = 0;
   var stats = {};
   for (var i in actor_spawns) {
@@ -57,10 +53,9 @@ actor.__stats = function()
   }
   stats.total = total;
   return stats;
-}
+};
 
-actor.hotreload = function()
-{
+actor.hotreload = function () {
   profile.cache("hotreload", "check");
   for (var i in script_times) {
     if (io.mod(i) > script_times[i]) {
@@ -72,54 +67,54 @@ actor.hotreload = function()
 	var $ = this.__proto__;
         ${script};
       })`;
-      var fn = os.eval(i,script);
-      
+      var fn = os.eval(i, script);
+
       for (var obj of actor_spawns[i]) {
         var a = obj;
-	for (var t of a.timers)
-	  t();
-	a.timers = [];
-	var save = json.decode(json.encode(a));
+        for (var t of a.timers) t();
+        a.timers = [];
+        var save = json.decode(json.encode(a));
         fn.call(a);
-	Object.merge(a,save);
-	check_registers(a);
+        Object.merge(a, save);
+        check_registers(a);
       }
     }
   }
   profile.endcache();
-}
+};
 
-actor.spawn = function(script, config){
-  if (typeof script !== 'string') return undefined;
+actor.spawn = function (script, config) {
+  if (typeof script !== "string") return undefined;
 
   var padawan = class_use(script, config, actor);
-  
+
   padawan.padawans = [];
   padawan.timers = [];
   padawan.master = this;
-  Object.hide(padawan, "master","padawans");
-  padawan.toString = function() { return script; }  
+  Object.hide(padawan, "master", "padawans");
+  padawan.toString = function () {
+    return script;
+  };
   check_registers(padawan);
   this.padawans.push(padawan);
   if (padawan.awake) padawan.awake();
   return padawan;
 };
 
-actor.tween = function(from,to,time,fn) {
-  var stop = tween(from,to,time,fn);
+actor.tween = function (from, to, time, fn) {
+  var stop = tween(from, to, time, fn);
   this.timers.push(stop);
   return stop;
-}
+};
 
 actor.spawn.doc = `Create a new actor, using this actor as the master, initializing it with 'script' and with data (as a JSON or Nota file) from 'config'.`;
 
-actor.rm_pawn = function(pawn)
-{
+actor.rm_pawn = function (pawn) {
   this.padawans.remove(pawn);
-}
+};
 
 actor.timers = [];
-actor.kill = function(){
+actor.kill = function () {
   if (this.__dead__) return;
   this.timers.forEach(t => t());
   input.do_uncontrol(this);
@@ -129,62 +124,65 @@ actor.kill = function(){
   this.padawans = [];
   this.__dead__ = true;
   actor_spawns[this._file].remove(this);
-  if (typeof this.die === 'function') this.die();
-  if (typeof this.stop === 'function') this.stop();
-  if (typeof this.garbage === 'function') this.garbage();
-  if (typeof this.then === 'function') this.then();
+  if (typeof this.die === "function") this.die();
+  if (typeof this.stop === "function") this.stop();
+  if (typeof this.garbage === "function") this.garbage();
+  if (typeof this.then === "function") this.then();
 };
 
 actor.kill.doc = `Remove this actor and all its padawans from existence.`;
 
-actor.delay = function(fn, seconds) {
+actor.delay = function (fn, seconds) {
   var timers = this.timers;
-  var stop = function() {
+  var stop = function () {
     timers.remove(stop);
     stop = undefined;
     rm();
-  }
+  };
 
   function execute() {
     if (fn) fn();
     if (stop && stop.then) stop.then();
     stop();
   }
-  
+
   stop.remain = seconds;
   stop.seconds = seconds;
-  stop.pct = function() { return 1-(stop.remain / stop.seconds); };
-  
+  stop.pct = function () {
+    return 1 - stop.remain / stop.seconds;
+  };
+
   function update(dt) {
     profile.frame("timer");
     stop.remain -= dt;
     if (stop.remain <= 0) execute();
     profile.endframe();
   }
-  
+
   var rm = Register.appupdate.register(update);
-  
+
   timers.push(stop);
   return stop;
 };
 actor.delay.doc = `Call 'fn' after 'seconds' with 'this' set to the actor.`;
 
-actor.interval = function(fn, seconds)
-{
+actor.interval = function (fn, seconds) {
   var self = this;
   var stop;
-  var usefn = function() {
+  var usefn = function () {
     fn();
     stop = self.delay(usefn, seconds);
-  }
+  };
   stop = self.delay(usefn, seconds);
 
   return stop;
-}
+};
 
 actor.padawans = [];
 
 global.app = Object.create(actor);
-app.die = function() { os.quit(); }
+app.die = function () {
+  os.quit();
+};
 
-return {actor, app};
+return { actor, app };