Use animation for new_style_water

[oweals/minetest_game.git] / mods / default / init.lua

diff --git a/mods/default/init.lua b/mods/default/init.lua
index 459c06d932f8158945a232d15992b7e6a6a4f6d1..b0329413104dea5e391258ef5c1da463c06c072a 100644 (file)
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -133,7 +133,7 @@ minetest.register_tool("default:axe_wood", {
                full_punch_interval = 1.0,
                max_drop_level=0,
                groupcaps={
-                       choppy = {times={[2]=1.40, [3]=0.80}, uses=10, maxlevel=1},
+                       choppy = {times={[2]=1.60, [3]=1.20}, uses=10, maxlevel=1},
                        fleshy = {times={[2]=0.70, [3]=0.50}, uses=5, maxlevel=1}
                }
        },
@@ -145,7 +145,7 @@ minetest.register_tool("default:axe_stone", {
                full_punch_interval = 1.2,
                max_drop_level=0,
                groupcaps={
-                       choppy={times={[1]=3.00, [2]=1.00, [3]=0.60}, uses=20, maxlevel=1},
+                       choppy={times={[1]=3.00, [2]=1.40, [3]=1.00}, uses=20, maxlevel=1},
                        fleshy={times={[2]=0.60, [3]=0.40}, uses=15, maxlevel=1}
                }
        },
@@ -157,7 +157,7 @@ minetest.register_tool("default:axe_steel", {
                full_punch_interval = 0.9,
                max_drop_level=1,
                groupcaps={
-                       choppy={times={[1]=3.00, [2]=1.60, [3]=1.00}, uses=30, maxlevel=2},
+                       choppy={times={[1]=2.60, [2]=1.00, [3]=0.60}, uses=30, maxlevel=2},
                        fleshy={times={[2]=0.40, [3]=0.25}, uses=25, maxlevel=1}
                }
        },
@@ -213,6 +213,13 @@ minetest.register_craft({
        }
 })
 
+minetest.register_craft({
+       output = 'default:junglewood 4',
+       recipe = {
+               {'default:jungletree'},
+       }
+})
+
 minetest.register_craft({
        output = 'default:stick 4',
        recipe = {
@@ -563,7 +570,7 @@ minetest.register_craft({
 
 minetest.register_craft({
        type = "fuel",
-       recipe = "default:leaves",
+       recipe = "group:leaves",
        burntime = 1,
 })
 
@@ -663,6 +670,12 @@ minetest.register_craft({
        burntime = 40,
 })
 
+minetest.register_craft({
+       type = "fuel",
+       recipe = "default:junglesapling",
+       burntime = 10,
+})
+
 --
 -- Node definitions
 --
@@ -829,7 +842,7 @@ minetest.register_node("default:desert_sand", {
        description = "Desert Sand",
        tiles = {"default_desert_sand.png"},
        is_ground_content = true,
-       groups = {sand=1, crumbly=3, falling_node=1, sand=1},
+       groups = {crumbly=3, falling_node=1, sand=1},
        sounds = default.node_sound_sand_defaults(),
 })
 
@@ -886,6 +899,58 @@ minetest.register_node("default:jungletree", {
        sounds = default.node_sound_wood_defaults(),
 })
 
+minetest.register_node("default:junglewood", {
+       description = "Junglewood Planks",
+       tiles = {"default_junglewood.png"},
+       is_ground_content = true,
+       groups = {snappy=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
+       sounds = default.node_sound_wood_defaults(),
+})
+
+minetest.register_node("default:jungleleaves", {
+       description = "Jungle Leaves",
+       drawtype = "allfaces_optional",
+       visual_scale = 1.3,
+       tiles = {"default_jungleleaves.png"},
+       paramtype = "light",
+       groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
+       drop = {
+               max_items = 1,
+               items = {
+                       {
+                               -- player will get sapling with 1/20 chance
+                               items = {'default:junglesapling'},
+                               rarity = 20,
+                       },
+                       {
+                               -- player will get leaves only if he get no saplings,
+                               -- this is because max_items is 1
+                               items = {'default:jungleleaves'},
+                       }
+               }
+       },
+       sounds = default.node_sound_leaves_defaults(),
+})
+
+minetest.register_node("default:junglesapling", {
+       description = "Jungle Sapling",
+       drawtype = "plantlike",
+       visual_scale = 1.0,
+       tiles = {"default_junglesapling.png"},
+       inventory_image = "default_junglesapling.png",
+       wield_image = "default_junglesapling.png",
+       paramtype = "light",
+       walkable = false,
+       selection_box = {
+               type = "fixed",
+               fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
+       },
+       groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1},
+       sounds = default.node_sound_defaults(),
+})
+-- alias for tree growing abm in content_abm.cpp
+minetest.register_alias("junglesapling", "default:junglesapling")
+
 minetest.register_node("default:junglegrass", {
        description = "Jungle Grass",
        drawtype = "plantlike",
@@ -905,7 +970,7 @@ minetest.register_node("default:leaves", {
        visual_scale = 1.3,
        tiles = {"default_leaves.png"},
        paramtype = "light",
-       groups = {snappy=3, leafdecay=3, flammable=2},
+       groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
        drop = {
                max_items = 1,
                items = {
@@ -1081,7 +1146,11 @@ minetest.register_node("default:water_source", {
        },
        special_tiles = {
                -- New-style water source material (mostly unused)
-               {name="default_water.png", backface_culling=false},
+               {
+                       name="default_water_source_animated.png",
+                       animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0},
+                       backface_culling = false,
+               }
        },
        alpha = WATER_ALPHA,
        paramtype = "light",
@@ -1140,7 +1209,11 @@ minetest.register_node("default:lava_source", {
        },
        special_tiles = {
                -- New-style lava source material (mostly unused)
-               {name="default_lava.png", backface_culling=false},
+               {
+                       name="default_lava_source_animated.png",
+                       animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=3.0},
+                       backface_culling = false,
+               }
        },
        paramtype = "light",
        light_source = LIGHT_MAX - 1,
@@ -1688,7 +1761,6 @@ minetest.register_craftitem("default:mese_crystal_fragment", {
 
 minetest.register_craftitem("default:clay_brick", {
        description = "Clay Brick",
-       inventory_image = "default_steel_ingot.png",
        inventory_image = "default_clay_brick.png",
 })
 
@@ -1737,4 +1809,32 @@ function on_punchnode(p, node)
 end
 minetest.register_on_punchnode(on_punchnode)
 
+--
+-- Lavacooling
+--
+
+default.cool_lava_source = function(pos)
+       minetest.env:set_node(pos, {name="default:stone"})
+end
+
+default.cool_lava_flowing = function(pos)
+       minetest.env:set_node(pos, {name="default:cobble"})
+end
+
+minetest.register_abm({
+       nodenames = {"default:lava_flowing"},
+       neighbors = {"group:water"},
+       interval = 1,
+       chance = 1,
+       action = default.cool_lava_flowing,
+})
+
+minetest.register_abm({
+       nodenames = {"default:lava_source"},
+       neighbors = {"group:water"},
+       interval = 1,
+       chance = 1,
+       action = default.cool_lava_source,
+})
+
 -- END