Code style overhaul

[dragonblocks.git] / engine / falling_node.js

diff --git a/engine/falling_node.js b/engine/falling_node.js
index 99cdfe2237ed6f58d40af58675528f346c3de63e..13f2a6ea19e1b8b8ce24c41fe82b65ead9933f54 100644 (file)
--- a/engine/falling_node.js
+++ b/engine/falling_node.js
@@ -1,25 +1,26 @@
 /*
  * falling_node.js
- * 
+ *
  * Copyright 2020 Elias Fleckenstein <eliasfleckenstein@web.de>
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA 02110-1301, USA.
- * 
- * 
+ *
+ *
  */
+
 dragonblocks.registerEntity({
        name: "dragonblocks:falling_node",
        gravity: true,
@@ -27,23 +28,34 @@ dragonblocks.registerEntity({
        height: 1,
        texture: this.texture,
        oncollide: self => {
-               if(! dragonblocks.getNode(Math.floor(self.x), Math.floor(self.y) + 1) || dragonblocks.getNode(Math.floor(self.x), Math.floor(self.y) + 1).mobstable){
+               let under = dragonblocks.getNode(Math.floor(self.x), Math.floor(self.y) + 1);
+
+               if (! under || under.mobstable) {
                        dragonblocks.setNode(Math.floor(self.x), Math.floor(self.y), self.meta.nodeName);
                        self.despawn();
                }
        }
-}); 
+});
 
 dragonblocks.registerOnActivateNode((x, y) => {
-       if(dragonblocks.getNode(x, y).toNode().physics && dragonblocks.getNode(x, y + 1) && ! dragonblocks.getNode(x, y + 1).mobstable)
-               dragonblocks.spawnFallingNode(dragonblocks.getNode(x, y).name, x, y)
-})
+       let node = dragonblocks.getNode(x, y);
+       if (! node.toNode().physics)
+               return;
+
+       let under = dragonblocks.getNode(x, y + 1);
+       if (under && ! under.mobstable)
+               dragonblocks.spawnFallingNode(node.name, x, y)
+});
+
+dragonblocks.spawnFallingNode = (nodename, x, y) => {
+       setTimeout(_ => {
+               dragonblocks.map.activate(x, y);
+       }, 50);
 
-dragonblocks.spawnFallingNode = function(nodename, x, y) {
-       setTimeout(_ => {dragonblocks.map.activate(x, y);}, 50);
        dragonblocks.setNode(x, y, "air");
+
        let entity = dragonblocks.spawnEntity("dragonblocks:falling_node", x, y);
        entity.meta.nodeName = nodename;
        entity.texture = dragonblocks.nodes[nodename].texture;
        entity.updateTexture();
-}
+};