Merge branch 'master' into fnode-redo

diff --git a/TODO.md b/TODO.md
new file mode 100644 (file)
index 0000000..f363f5e
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,34 @@
+# 3.1
+- Item Entities
+- Rewrite Falling Nodes
+- Item Uses (Wear)
+- Support for multible games
+- HP, Entity Groups
+- Mapgen Enhancements
+- Entity API Changes
+- White Chat Preview in the upper left corner
+- Optional Mod Dependencies
+- Particles
+- Rename Pixel Manipulators to Schemplates
+- Improved Main Menu, Main Menu API
+- Builtin Clickable Chat Messages and Hyperlinks
+- Debug info
+
+# 3.x
+- Improved Physics (Bugfixes, Swimming/Diving, Flying, Climbing, Sneaking)
+- Nametags
+- Improved Error Handling
+- Light & Time
+- Custumizable Settings and Key Bindings
+- Liquids
+- Breath
+
+# 4.0
+- Animations (gif ?)
+- Dynamic Map Loading (sqlite3 ?)
+- Minimap
+
+# x.0
+- Multiplayer
+- WebGL Rendering
+- Node.js Backend

diff --git a/engine/init.js b/engine/init.js
index f09e44a670784a747246d13344581badc37cbfd0..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", "falling_node", "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/item_entity.js b/engine/item_entity.js
new file mode 100644 (file)
index 0000000..2e790c3
--- /dev/null
+++ b/engine/item_entity.js
@@ -0,0 +1,46 @@
+/*
+ * item_entity.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:item_entity",
+       width: 0.4,
+       height: 0.4,
+       gravity: true,
+       verticalSpeed: 2,
+       onpunch: self => {
+               dragonblocks.dropItem(dragonblocks.player.give(self.meta.itemstring), self.x, self.y);
+               self.despawn();
+       },
+       oncollide: self => {
+               self.jump();
+       },
+});
+
+dragonblocks.dropItem = function(itemstack, x, y) {
+       if (! itemstack || ! itemstack.item || ! itemstack.count)
+               return;
+       let entity = dragonblocks.spawnEntity("dragonblocks:item_entity", x, y);
+       entity.meta.itemstring = itemstack.stringify();
+       entity.texture = itemstack.toItem().texture;
+       entity.updateTexture();
+}

diff --git a/engine/map_interaction.js b/engine/map_interaction.js
index a2e200f643c008a3a9bacf1809a4367ee5a8569a..3f2023a50e0fdee3b650525f9e4edf427a4c4cb4 100644 (file)
--- a/engine/map_interaction.js
+++ b/engine/map_interaction.js
@@ -102,12 +102,8 @@ dragonblocks.MapIntercation = {
                if(! mapNode)
                        return;
                let node = mapNode.toNode();
-               if(this.dig(x, y)){
-                       if(node.drops instanceof Function)
-                               this.tmp.mainInventory.add(node.drops());
-                       else
-                               this.tmp.mainInventory.add(node.drops);
-               }
+               if (this.dig(x, y))
+                       dragonblocks.handleNodeDrop(this.tmp.mainInventory, node, x, y);
                document.getElementById("dragonblocks.crack[" + this.id + "]").style.visibility = "hidden";
        },
        digStop(){
@@ -158,3 +154,7 @@ dragonblocks.MapIntercation = {
                return (Math.sqrt(Math.pow(x - this.x, 2) + Math.pow(y - this.y, 2)) <= this.tool.range) || this.meta.creative;
        },
 } 
+
+dragonblocks.handleNodeDrop = function(inventory, node, x, y) {
+       dragonblocks.dropItem(inventory.add((node.drops instanceof Function) ? node.drops() : node.drops), x + 0.2, y + 0.2);
+}

diff --git a/settings.json b/settings.json
index a132807c5fb1acefbc6e704f32edf4674c67170c..81d4634c942365a4371f3a2f67e58c22915b6727 100755 (executable)
--- a/settings.json
+++ b/settings.json
@@ -1,8 +1,9 @@
 {
        "version": {
                "major": 3,
-               "minor": 0,
+               "minor": 1,
                "patch": 0,
+               "snapshot": 1,
                "copyright": "© 2019 - 2020 Elidragon. Please Distribute!"
        },
        "inventory": {