Merge branch 'master' into fnode-redo

diff --git a/engine/falling_node.js b/engine/falling_node.js
new file mode 100644 (file)
index 0000000..99cdfe2
--- /dev/null
+++ b/engine/falling_node.js
@@ -0,0 +1,49 @@
+/*
+ * 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,
+       width: 1,
+       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){
+                       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)
+})
+
+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();
+}

diff --git a/engine/init.js b/engine/init.js
index 26977659ef6b56af8c3c72707dfc976ed0be8cc4..79703e68461aced9c53e0faf42ffe5b9a605460a 100755 (executable)
--- a/engine/init.js
+++ b/engine/init.js
@@ -161,7 +161,7 @@ dragonblocks.loadMod = function(modname){
        dragonblocks.loadedMods.push(modname);
        dragonblocks.loadingMods[modname] = false;
 }
-dragonblocks.modules = ["ressources", "key_handler", "gui", "mapgen", "world", "item", "node", "tool", "group", "builtin", "map_node", "map", "itemstack", "inventory", "inventory_group", "hudbar", "inventory_container", "creative_inventory", "recipe", "craftfield", "menu", "skin", "entity", "map_interaction", "spawned_entity", "item_entity", "timer", "player", "pixel_manipulator", "chat", "chatcommands", "mainmenu"];
+dragonblocks.modules = ["ressources", "key_handler", "gui", "mapgen", "world", "item", "node", "tool", "group", "builtin", "map_node", "map", "itemstack", "inventory", "inventory_group", "hudbar", "inventory_container", "creative_inventory", "recipe", "craftfield", "menu", "skin", "entity", "map_interaction", "spawned_entity", "item_entity", "falling_node", "timer", "player", "pixel_manipulator", "chat", "chatcommands", "mainmenu"];
 dragonblocks.moduleCount = dragonblocks.modules.length;
 dragonblocks.loadModule = function(){
        if(dragonblocks.modules[0]){

diff --git a/engine/node.js b/engine/node.js
index 9c14d111f82cc04f1b01b3f0452cc233772f158f..95eb19fbe3d4402f974673eaa67d528d34bc14c1 100755 (executable)
--- a/engine/node.js
+++ b/engine/node.js
@@ -31,21 +31,6 @@ dragonblocks.Node = class extends dragonblocks.Item{
                if(this.mobstable == undefined)
                        this.mobstable = this.stable;
                let self = this;
-               if(this.physics){
-                       dragonblocks.registerEntity({
-                               name: this.name,
-                               gravity: true,
-                               width: 1,
-                               height: 1,
-                               texture: this.texture,
-                               oncollide: entity => {
-                                       if(! dragonblocks.getNode(Math.floor(entity.x), Math.floor(entity.y) + 1) || dragonblocks.getNode(Math.floor(entity.x), Math.floor(entity.y) + 1).mobstable){
-                                               dragonblocks.setNode(Math.floor(entity.x), Math.floor(entity.y), entity.name);
-                                               entity.despawn();
-                                       }
-                               }
-                       });
-               }
                if(this.liquid){
                        this.hardness = 1;
                        let oldOndig = this.ondig;
@@ -119,11 +104,4 @@ dragonblocks.onPunchNodeFunctions = [];
 dragonblocks.registerOnPunchNode = function(func){
        dragonblocks.onPunchNodeFunctions.push(func);
 }
-dragonblocks.registerOnActivateNode((x, y) => {
-       if(! dragonblocks.getNode(x, y).toNode().physics || ! dragonblocks.getNode(x, y + 1) || dragonblocks.getNode(x, y + 1).mobstable)
-               return;
-       let name =      dragonblocks.getNode(x, y).name;
-       setTimeout(_ => {dragonblocks.map.activate(x, y);}, 50);
-       dragonblocks.setNode(x, y, "air");
-       dragonblocks.spawnEntity(name, x, y);
-})
+