diff --git a/menu/background.png b/menu/background.png index 267f5df..2f8eedd 100644 Binary files a/menu/background.png and b/menu/background.png differ diff --git a/menu/header.png b/menu/header.png index 7fb3e8b..90a2129 100644 Binary files a/menu/header.png and b/menu/header.png differ diff --git a/menu/icon.png b/menu/icon.png index 5edfd40..21a9131 100644 Binary files a/menu/icon.png and b/menu/icon.png differ diff --git a/mods/bones/init.lua b/mods/bones/init.lua index 499e358..3a85dca 100644 --- a/mods/bones/init.lua +++ b/mods/bones/init.lua @@ -9,15 +9,42 @@ local function is_owner(pos, name) return false end +local death_strings = {} + +death_strings[1] = " didn't check their health bar." +death_strings[2] = " didn't bring a sword." +death_strings[3] = " should have ate more often." +death_strings[4] = " somehow died, but time will tell." +death_strings[5] = " died as they lived - running away!" +death_strings[6] = " could have done a better job when living." +death_strings[7] = " was just a pawn in the game of life." +death_strings[8] = " didn't think mobs would spawn here." +death_strings[9] = " died by stupidity." +death_strings[10] = " looked left and right, but not behind oneself." +death_strings[11] = " could have easily avoided death, but still managed to die." +death_strings[12] = " drank from the wrong pool of liquid." + + + minetest.register_node("bones:bones", { - description = "Bones", + description = "Headstone", tiles = { - "bones_top.png", - "bones_bottom.png", - "bones_side.png", - "bones_side.png", - "bones_rear.png", - "bones_front.png" + "deco_cobble.png", + "deco_cobble.png", + "deco_cobble.png", + "deco_cobble.png", + "deco_cobble.png", + "deco_cobble.png^bones_overlay.png", + }, + drawtype = "nodebox", + paramtype = "light", + node_box = { + type = "fixed", + fixed = { + {0.375, -0.5, 0.5, -0.375, -0.375, 0}, --base + {0.3125, -0.375, 0.375, -0.3125, 0.375, 0.125}, --mid segment + {0.25, 0.375, 0.375, -0.25, 0.5, 0.125}, --top segment + }, }, paramtype2 = "facedir", groups = {dig_immediate=2}, @@ -52,7 +79,7 @@ minetest.register_node("bones:bones", { on_metadata_inventory_take = function(pos, listname, index, stack, player) local meta = minetest.get_meta(pos) if meta:get_string("owner") ~= "" and meta:get_inventory():is_empty("main") then - meta:set_string("infotext", meta:get_string("owner").."'s old bones") + --meta:set_string("infotext", meta:get_string("owner").."'s old bones") meta:set_string("formspec", "") meta:set_string("owner", "") end @@ -61,7 +88,7 @@ minetest.register_node("bones:bones", { on_timer = function(pos, elapsed) local meta = minetest.get_meta(pos) local time = meta:get_int("time")+elapsed - local publish = 1200 + local publish = 240 if tonumber(minetest.setting_get("share_bones_time")) then publish = tonumber(minetest.setting_get("share_bones_time")) end @@ -69,7 +96,7 @@ minetest.register_node("bones:bones", { return end if time >= publish then - meta:set_string("infotext", meta:get_string("owner").."'s old bones") + --meta:set_string("infotext", meta:get_string("owner").."'s old headstone") meta:set_string("owner", "") else return true @@ -119,12 +146,16 @@ minetest.register_on_dieplayer(function(player) player_inv:set_stack("craft", i, nil) end + local d_msg = math.random(1, #death_strings) + local p_name = player:get_player_name() + meta:set_string("formspec", "size[8,9;]".. "list[current_name;main;0,0;8,4;]".. "list[current_player;main;0,5;8,4;]".. "listcolors[#49413f;#7c7371;#7b7675;#8d7e77;#ffffff]".. "background[-0.5,-0.65;9,10.35;".."bones.png".."]") - meta:set_string("infotext", player:get_player_name().."'s fresh bones") + + meta:set_string("infotext", player:get_player_name()..death_strings[d_msg]) meta:set_string("owner", player:get_player_name()) meta:set_int("time", 0) diff --git a/mods/bones/textures/bones_bottom.png b/mods/bones/textures/bones_bottom.png deleted file mode 100644 index 899ae3b..0000000 Binary files a/mods/bones/textures/bones_bottom.png and /dev/null differ diff --git a/mods/bones/textures/bones_front.png b/mods/bones/textures/bones_front.png deleted file mode 100644 index 3261290..0000000 Binary files a/mods/bones/textures/bones_front.png and /dev/null differ diff --git a/mods/bones/textures/bones_overlay.png b/mods/bones/textures/bones_overlay.png new file mode 100644 index 0000000..8e881d4 Binary files /dev/null and b/mods/bones/textures/bones_overlay.png differ diff --git a/mods/bones/textures/bones_rear.png b/mods/bones/textures/bones_rear.png deleted file mode 100644 index bf66d5f..0000000 Binary files a/mods/bones/textures/bones_rear.png and /dev/null differ diff --git a/mods/bones/textures/bones_side.png b/mods/bones/textures/bones_side.png deleted file mode 100644 index 88fdfdd..0000000 Binary files a/mods/bones/textures/bones_side.png and /dev/null differ diff --git a/mods/bones/textures/bones_top.png b/mods/bones/textures/bones_top.png deleted file mode 100644 index 08b156d..0000000 Binary files a/mods/bones/textures/bones_top.png and /dev/null differ diff --git a/mods/bucket/textures/bucket.png b/mods/bucket/textures/bucket.png index 7c7441c..dff7a0c 100644 Binary files a/mods/bucket/textures/bucket.png and b/mods/bucket/textures/bucket.png differ diff --git a/mods/bucket/textures/bucket_edens_water.png b/mods/bucket/textures/bucket_edens_water.png index 7f5074d..a7cc1cc 100644 Binary files a/mods/bucket/textures/bucket_edens_water.png and b/mods/bucket/textures/bucket_edens_water.png differ diff --git a/mods/bucket/textures/bucket_lava.png b/mods/bucket/textures/bucket_lava.png index 7dbf61a..7495191 100644 Binary files a/mods/bucket/textures/bucket_lava.png and b/mods/bucket/textures/bucket_lava.png differ diff --git a/mods/bucket/textures/bucket_oil.png b/mods/bucket/textures/bucket_oil.png index 27ddff2..0aae64a 100644 Binary files a/mods/bucket/textures/bucket_oil.png and b/mods/bucket/textures/bucket_oil.png differ diff --git a/mods/bucket/textures/bucket_water.png b/mods/bucket/textures/bucket_water.png index 0039df4..6fcab49 100644 Binary files a/mods/bucket/textures/bucket_water.png and b/mods/bucket/textures/bucket_water.png differ diff --git a/mods/deco/license.txt b/mods/deco/license.txt index 34a48b1..b394e50 100644 --- a/mods/deco/license.txt +++ b/mods/deco/license.txt @@ -1 +1 @@ -deco_cobble.png is licensed by BlockMen as CC BY-SA 3.0 +deco_cobble.png and deco_mossy_cobble.png is licensed by BlockMen as CC BY-SA 3.0 diff --git a/mods/deco/models/CraftGuideTower.blend b/mods/deco/models/CraftGuideTower.blend new file mode 100644 index 0000000..74dc460 Binary files /dev/null and b/mods/deco/models/CraftGuideTower.blend differ diff --git a/mods/deco/models/craft_guide_terminal.png b/mods/deco/models/craft_guide_terminal.png new file mode 100644 index 0000000..67d65a5 Binary files /dev/null and b/mods/deco/models/craft_guide_terminal.png differ diff --git a/mods/deco/textures/deco_brick.png b/mods/deco/textures/deco_brick.png index bb0c3e4..456d73b 100644 Binary files a/mods/deco/textures/deco_brick.png and b/mods/deco/textures/deco_brick.png differ diff --git a/mods/deco/textures/deco_glass.png b/mods/deco/textures/deco_glass.png index ade0196..f2c29a3 100644 Binary files a/mods/deco/textures/deco_glass.png and b/mods/deco/textures/deco_glass.png differ diff --git a/mods/deco/textures/deco_stone_brick.png b/mods/deco/textures/deco_stone_brick.png index a28d3fc..0b427f9 100644 Binary files a/mods/deco/textures/deco_stone_brick.png and b/mods/deco/textures/deco_stone_brick.png differ diff --git a/mods/deco/textures/deco_stone_tile.png b/mods/deco/textures/deco_stone_tile.png index d00b2e5..094c133 100644 Binary files a/mods/deco/textures/deco_stone_tile.png and b/mods/deco/textures/deco_stone_tile.png differ diff --git a/mods/deco/textures/deco_wood_birch_planks.png b/mods/deco/textures/deco_wood_birch_planks.png index 0128e5c..c67ae01 100644 Binary files a/mods/deco/textures/deco_wood_birch_planks.png and b/mods/deco/textures/deco_wood_birch_planks.png differ diff --git a/mods/deco/textures/deco_wood_cherry_planks.png b/mods/deco/textures/deco_wood_cherry_planks.png index 81ab62e..acd837b 100644 Binary files a/mods/deco/textures/deco_wood_cherry_planks.png and b/mods/deco/textures/deco_wood_cherry_planks.png differ diff --git a/mods/deco/textures/deco_wood_deathly_planks.png b/mods/deco/textures/deco_wood_deathly_planks.png index 4118e3f..05edc62 100644 Binary files a/mods/deco/textures/deco_wood_deathly_planks.png and b/mods/deco/textures/deco_wood_deathly_planks.png differ diff --git a/mods/deco/textures/deco_wood_evergreen_planks.png b/mods/deco/textures/deco_wood_evergreen_planks.png index 88dca95..5a383f9 100644 Binary files a/mods/deco/textures/deco_wood_evergreen_planks.png and b/mods/deco/textures/deco_wood_evergreen_planks.png differ diff --git a/mods/deco/textures/deco_wood_jungle_planks.png b/mods/deco/textures/deco_wood_jungle_planks.png new file mode 100644 index 0000000..d4d5a3c Binary files /dev/null and b/mods/deco/textures/deco_wood_jungle_planks.png differ diff --git a/mods/deco/textures/deco_wood_oak_planks.png b/mods/deco/textures/deco_wood_oak_planks.png index f81ff3d..1bd68f5 100644 Binary files a/mods/deco/textures/deco_wood_oak_planks.png and b/mods/deco/textures/deco_wood_oak_planks.png differ diff --git a/mods/default/functions.lua b/mods/default/functions.lua index d5a9329..ce95da8 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -7,20 +7,40 @@ function default.node_sound_defaults(table) table = table or {} table.footstep = table.footstep or - {name="", gain=1.0} + {name = "default_hard_footstep", gain = 0.6} + table.dig = table.dig or + {name = "default_hard_footstep", gain = 0.7} table.dug = table.dug or - {name="default_dug_node", gain=0.25} + {name = "default_hard_footstep", gain = 0.8} table.place = table.place or - {name="default_place_node_hard", gain=1.0} + {name = "default_hard_footstep", gain = 0.8} return table end function default.node_sound_stone_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_hard_footstep", gain=0.5} + {name = "default_hard_footstep", gain = 0.6} + table.dig = table.dig or + {name = "default_hard_footstep", gain = 0.7} table.dug = table.dug or - {name="default_hard_footstep", gain=1.0} + {name = "default_hard_footstep", gain = 0.8} + table.place = table.place or + {name = "default_hard_footstep", gain = 0.8} + default.node_sound_defaults(table) + return table +end + +function default.node_sound_metal_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_metal_footstep", gain = 0.575} + table.dig = table.dig or + {name = "default_metal_footstep", gain = 0.65} + table.dug = table.dug or + {name = "default_metal_footstep", gain = 0.8} + table.place = table.place or + {name = "default_metal_footstep", gain = 0.8} default.node_sound_defaults(table) return table end @@ -28,11 +48,41 @@ end function default.node_sound_dirt_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_dirt_footstep", gain=1.0} + {name = "default_dirt_footstep", gain = 0.8} + table.dig = table.dig or + {name = "default_dirt_footstep", gain = 0.9} table.dug = table.dug or - {name="default_dirt_footstep", gain=1.5} + {name = "default_dirt_footstep", gain = 1.0} table.place = table.place or - {name="default_place_node", gain=1.0} + {name = "default_dirt_footstep", gain = 1.0} + default.node_sound_defaults(table) + return table +end + +function default.node_sound_snow_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_dirt_footstep", gain = 0.15/2} + table.dig = table.dig or + {name = "default_dirt_footstep", gain = 0.1} + table.dug = table.dug or + {name = "default_dirt_footstep", gain = 0.2525/2} + table.place = table.place or + {name = "default_dirt_footstep", gain = 0.15} + default.node_sound_defaults(table) + return table +end + +function default.node_sound_gravel_defaults(table) + table = table or {} + table.footstep = table.footstep or + {name = "default_dirt_footstep", gain = 0.8} + table.dig = table.dig or + {name = "default_dirt_footstep", gain = 0.9} + table.dug = table.dug or + {name = "default_dirt_footstep", gain = 1.0} + table.place = table.place or + {name = "default_dirt_footstep", gain = 1.0} default.node_sound_defaults(table) return table end @@ -40,11 +90,13 @@ end function default.node_sound_sand_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_sand_footstep", gain=0.5} + {name = "default_sand_footstep", gain = 0.6} + table.dig = table.dig or + {name = "default_sand_footstep", gain = 0.7} table.dug = table.dug or - {name="default_sand_footstep", gain=1.0} + {name = "default_sand_footstep", gain = 0.8} table.place = table.place or - {name="default_place_node", gain=1.0} + {name = "default_sand_footstep", gain = 0.8} default.node_sound_defaults(table) return table end @@ -52,9 +104,13 @@ end function default.node_sound_wood_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_wood_footstep", gain=0.5} + {name = "default_wood_footstep", gain = 0.625} + table.dig = table.dig or + {name = "default_wood_footstep", gain = 0.7} table.dug = table.dug or - {name="default_wood_footstep", gain=1.0} + {name = "default_wood_footstep", gain = 0.8} + table.place = table.place or + {name = "default_wood_footstep", gain = 0.8} default.node_sound_defaults(table) return table end @@ -62,13 +118,13 @@ end function default.node_sound_leaves_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_grass_footstep", gain=0.35} - table.dug = table.dug or - {name="default_grass_footstep", gain=0.85} + {name = "default_grass_footstep", gain = 0.6} table.dig = table.dig or - {name="default_dig_crumbly", gain=0.4} + {name = "default_grass_footstep", gain = 0.7} + table.dug = table.dug or + {name = "default_snow_footstep", gain = 0.8} table.place = table.place or - {name="default_place_node", gain=1.0} + {name = "default_snow_footstep", gain = 0.8} default.node_sound_defaults(table) return table end @@ -76,9 +132,13 @@ end function default.node_sound_glass_defaults(table) table = table or {} table.footstep = table.footstep or - {name="default_glass_footstep", gain=0.5} + {name = "default_hard_footstep", gain = 0.55} + table.dig = table.dig or + {name = "default_hard_footstep", gain = 0.65} table.dug = table.dug or - {name="default_break_glass", gain=1.0} + {name = "default_break_glass", gain = 0.8} + table.place = table.place or + {name = "default_hard_footstep", gain = 0.75} default.node_sound_defaults(table) return table end diff --git a/mods/default/models/character_jordach.b3d b/mods/default/models/character_jordach.b3d index f31bf2a..e3ea7fa 100644 Binary files a/mods/default/models/character_jordach.b3d and b/mods/default/models/character_jordach.b3d differ diff --git a/mods/default/models/character_jordach.blend b/mods/default/models/character_jordach.blend index 2d4ccb0..f97ca14 100644 Binary files a/mods/default/models/character_jordach.blend and b/mods/default/models/character_jordach.blend differ diff --git a/mods/default/sounds/default_dirt_footstep.1.ogg b/mods/default/sounds/default_dirt_footstep.1.ogg index 84a197d..bf4915b 100644 Binary files a/mods/default/sounds/default_dirt_footstep.1.ogg and b/mods/default/sounds/default_dirt_footstep.1.ogg differ diff --git a/mods/default/sounds/default_dirt_footstep.2.ogg b/mods/default/sounds/default_dirt_footstep.2.ogg index 2e23b8a..3ecef3e 100644 Binary files a/mods/default/sounds/default_dirt_footstep.2.ogg and b/mods/default/sounds/default_dirt_footstep.2.ogg differ diff --git a/mods/default/sounds/default_dirt_footstep.3.ogg b/mods/default/sounds/default_dirt_footstep.3.ogg new file mode 100644 index 0000000..57689e7 Binary files /dev/null and b/mods/default/sounds/default_dirt_footstep.3.ogg differ diff --git a/mods/default/sounds/default_dirt_footstep.4.ogg b/mods/default/sounds/default_dirt_footstep.4.ogg new file mode 100644 index 0000000..352109b Binary files /dev/null and b/mods/default/sounds/default_dirt_footstep.4.ogg differ diff --git a/mods/default/sounds/default_grass_footstep.1.ogg b/mods/default/sounds/default_grass_footstep.1.ogg index 22d1ad6..742a53a 100644 Binary files a/mods/default/sounds/default_grass_footstep.1.ogg and b/mods/default/sounds/default_grass_footstep.1.ogg differ diff --git a/mods/default/sounds/default_grass_footstep.2.ogg b/mods/default/sounds/default_grass_footstep.2.ogg index 4ccd8a0..7676d60 100644 Binary files a/mods/default/sounds/default_grass_footstep.2.ogg and b/mods/default/sounds/default_grass_footstep.2.ogg differ diff --git a/mods/default/sounds/default_grass_footstep.3.ogg b/mods/default/sounds/default_grass_footstep.3.ogg index 20db84e..2008b77 100644 Binary files a/mods/default/sounds/default_grass_footstep.3.ogg and b/mods/default/sounds/default_grass_footstep.3.ogg differ diff --git a/mods/default/sounds/default_grass_footstep.4.ogg b/mods/default/sounds/default_grass_footstep.4.ogg new file mode 100644 index 0000000..b7a6114 Binary files /dev/null and b/mods/default/sounds/default_grass_footstep.4.ogg differ diff --git a/mods/default/sounds/default_gravel_footstep.1.ogg b/mods/default/sounds/default_gravel_footstep.1.ogg index 8d260ce..68758b2 100644 Binary files a/mods/default/sounds/default_gravel_footstep.1.ogg and b/mods/default/sounds/default_gravel_footstep.1.ogg differ diff --git a/mods/default/sounds/default_gravel_footstep.2.ogg b/mods/default/sounds/default_gravel_footstep.2.ogg index 2aba2c6..128ae57 100644 Binary files a/mods/default/sounds/default_gravel_footstep.2.ogg and b/mods/default/sounds/default_gravel_footstep.2.ogg differ diff --git a/mods/default/sounds/default_gravel_footstep.3.ogg b/mods/default/sounds/default_gravel_footstep.3.ogg index 1bcd8a1..7a5863f 100644 Binary files a/mods/default/sounds/default_gravel_footstep.3.ogg and b/mods/default/sounds/default_gravel_footstep.3.ogg differ diff --git a/mods/default/sounds/default_gravel_footstep.4.ogg b/mods/default/sounds/default_gravel_footstep.4.ogg index 696c9ff..8cdadb1 100644 Binary files a/mods/default/sounds/default_gravel_footstep.4.ogg and b/mods/default/sounds/default_gravel_footstep.4.ogg differ diff --git a/mods/default/sounds/default_hard_footstep.1.ogg b/mods/default/sounds/default_hard_footstep.1.ogg index 1748bc5..27a5515 100644 Binary files a/mods/default/sounds/default_hard_footstep.1.ogg and b/mods/default/sounds/default_hard_footstep.1.ogg differ diff --git a/mods/default/sounds/default_hard_footstep.2.ogg b/mods/default/sounds/default_hard_footstep.2.ogg index fe39fd7..f108ddb 100644 Binary files a/mods/default/sounds/default_hard_footstep.2.ogg and b/mods/default/sounds/default_hard_footstep.2.ogg differ diff --git a/mods/default/sounds/default_hard_footstep.3.ogg b/mods/default/sounds/default_hard_footstep.3.ogg index 5030e06..dc2af54 100644 Binary files a/mods/default/sounds/default_hard_footstep.3.ogg and b/mods/default/sounds/default_hard_footstep.3.ogg differ diff --git a/mods/default/sounds/default_hard_footstep.4.ogg b/mods/default/sounds/default_hard_footstep.4.ogg new file mode 100644 index 0000000..f2a6405 Binary files /dev/null and b/mods/default/sounds/default_hard_footstep.4.ogg differ diff --git a/mods/default/sounds/default_metal_footstep.1.ogg b/mods/default/sounds/default_metal_footstep.1.ogg new file mode 100644 index 0000000..afec046 Binary files /dev/null and b/mods/default/sounds/default_metal_footstep.1.ogg differ diff --git a/mods/default/sounds/default_metal_footstep.2.ogg b/mods/default/sounds/default_metal_footstep.2.ogg new file mode 100644 index 0000000..d80f3c0 Binary files /dev/null and b/mods/default/sounds/default_metal_footstep.2.ogg differ diff --git a/mods/default/sounds/default_metal_footstep.3.ogg b/mods/default/sounds/default_metal_footstep.3.ogg new file mode 100644 index 0000000..a3c92c1 Binary files /dev/null and b/mods/default/sounds/default_metal_footstep.3.ogg differ diff --git a/mods/default/sounds/default_metal_footstep.4.ogg b/mods/default/sounds/default_metal_footstep.4.ogg new file mode 100644 index 0000000..dd8dd94 Binary files /dev/null and b/mods/default/sounds/default_metal_footstep.4.ogg differ diff --git a/mods/default/sounds/default_sand_footstep.1.ogg b/mods/default/sounds/default_sand_footstep.1.ogg index 65b68c7..aa8853f 100644 Binary files a/mods/default/sounds/default_sand_footstep.1.ogg and b/mods/default/sounds/default_sand_footstep.1.ogg differ diff --git a/mods/default/sounds/default_sand_footstep.2.ogg b/mods/default/sounds/default_sand_footstep.2.ogg index 57f35f3..320eb20 100644 Binary files a/mods/default/sounds/default_sand_footstep.2.ogg and b/mods/default/sounds/default_sand_footstep.2.ogg differ diff --git a/mods/default/sounds/default_sand_footstep.3.ogg b/mods/default/sounds/default_sand_footstep.3.ogg new file mode 100644 index 0000000..ffce3c4 Binary files /dev/null and b/mods/default/sounds/default_sand_footstep.3.ogg differ diff --git a/mods/default/sounds/default_sand_footstep.4.ogg b/mods/default/sounds/default_sand_footstep.4.ogg new file mode 100644 index 0000000..bc22443 Binary files /dev/null and b/mods/default/sounds/default_sand_footstep.4.ogg differ diff --git a/mods/default/sounds/default_snow_footstep.1.ogg b/mods/default/sounds/default_snow_footstep.1.ogg index 3260b91..e3a55f4 100644 Binary files a/mods/default/sounds/default_snow_footstep.1.ogg and b/mods/default/sounds/default_snow_footstep.1.ogg differ diff --git a/mods/default/sounds/default_snow_footstep.2.ogg b/mods/default/sounds/default_snow_footstep.2.ogg index 4aac1e7..3926a8b 100644 Binary files a/mods/default/sounds/default_snow_footstep.2.ogg and b/mods/default/sounds/default_snow_footstep.2.ogg differ diff --git a/mods/default/sounds/default_snow_footstep.3.ogg b/mods/default/sounds/default_snow_footstep.3.ogg index cf4235b..2815b52 100644 Binary files a/mods/default/sounds/default_snow_footstep.3.ogg and b/mods/default/sounds/default_snow_footstep.3.ogg differ diff --git a/mods/default/sounds/default_snow_footstep.4.ogg b/mods/default/sounds/default_snow_footstep.4.ogg new file mode 100644 index 0000000..ca06ac6 Binary files /dev/null and b/mods/default/sounds/default_snow_footstep.4.ogg differ diff --git a/mods/default/sounds/default_wood_footstep.1.ogg b/mods/default/sounds/default_wood_footstep.1.ogg index 34f63a1..6423a3b 100644 Binary files a/mods/default/sounds/default_wood_footstep.1.ogg and b/mods/default/sounds/default_wood_footstep.1.ogg differ diff --git a/mods/default/sounds/default_wood_footstep.2.ogg b/mods/default/sounds/default_wood_footstep.2.ogg index 124fc29..8018791 100644 Binary files a/mods/default/sounds/default_wood_footstep.2.ogg and b/mods/default/sounds/default_wood_footstep.2.ogg differ diff --git a/mods/default/sounds/default_wood_footstep.3.ogg b/mods/default/sounds/default_wood_footstep.3.ogg new file mode 100644 index 0000000..304fc66 Binary files /dev/null and b/mods/default/sounds/default_wood_footstep.3.ogg differ diff --git a/mods/default/sounds/default_wood_footstep.4.ogg b/mods/default/sounds/default_wood_footstep.4.ogg new file mode 100644 index 0000000..5cfc534 Binary files /dev/null and b/mods/default/sounds/default_wood_footstep.4.ogg differ diff --git a/mods/default/sounds/health_gain.ogg b/mods/default/sounds/health_gain.ogg new file mode 100644 index 0000000..9057511 Binary files /dev/null and b/mods/default/sounds/health_gain.ogg differ diff --git a/mods/default/sounds/hit.ogg b/mods/default/sounds/hit.ogg new file mode 100644 index 0000000..d9a6a17 Binary files /dev/null and b/mods/default/sounds/hit.ogg differ diff --git a/mods/default/sounds/hit_death.ogg b/mods/default/sounds/hit_death.ogg new file mode 100644 index 0000000..a73e00e Binary files /dev/null and b/mods/default/sounds/hit_death.ogg differ diff --git a/mods/default/sounds/lava.ogg b/mods/default/sounds/lava.ogg new file mode 100644 index 0000000..c91b561 Binary files /dev/null and b/mods/default/sounds/lava.ogg differ diff --git a/mods/default/sounds/player_damage.1.ogg b/mods/default/sounds/player_damage.1.ogg new file mode 100644 index 0000000..974f575 Binary files /dev/null and b/mods/default/sounds/player_damage.1.ogg differ diff --git a/mods/default/sounds/player_damage.2.ogg b/mods/default/sounds/player_damage.2.ogg new file mode 100644 index 0000000..a713c12 Binary files /dev/null and b/mods/default/sounds/player_damage.2.ogg differ diff --git a/mods/default/sounds/player_death.ogg b/mods/default/sounds/player_death.ogg new file mode 100644 index 0000000..260964b Binary files /dev/null and b/mods/default/sounds/player_death.ogg differ diff --git a/mods/default/sounds/player_falling_damage.ogg b/mods/default/sounds/player_falling_damage.ogg new file mode 100644 index 0000000..c051401 Binary files /dev/null and b/mods/default/sounds/player_falling_damage.ogg differ diff --git a/mods/default/sounds/player_join.ogg b/mods/default/sounds/player_join.ogg new file mode 100644 index 0000000..ce405b6 Binary files /dev/null and b/mods/default/sounds/player_join.ogg differ diff --git a/mods/default/sounds/player_leave.ogg b/mods/default/sounds/player_leave.ogg new file mode 100644 index 0000000..8e5268d Binary files /dev/null and b/mods/default/sounds/player_leave.ogg differ diff --git a/mods/default/sounds/waterfall.ogg b/mods/default/sounds/waterfall.ogg new file mode 100644 index 0000000..3b29d86 Binary files /dev/null and b/mods/default/sounds/waterfall.ogg differ diff --git a/mods/mapgen/init.lua b/mods/mapgen/init.lua index 5111fb9..2e11eb4 100644 --- a/mods/mapgen/init.lua +++ b/mods/mapgen/init.lua @@ -30,7 +30,20 @@ minetest.register_alias("mapgen_stone", "mapgen:stone") minetest.register_alias("mapgen_dirt", "mapgen:dirt") minetest.register_alias("mapgen_dirt_with_grass", "mapgen:grass") +local function player_join_sounds() + minetest.register_on_joinplayer(function() + minetest.sound_play("player_join", {gain = 0.75}) + end) +end +local function player_leave_sounds() + minetest.register_on_leaveplayer(function() + minetest.sound_play("player_leave", {gain = 1}) + end) +end + +minetest.after(5, player_join_sounds) +minetest.after(5, player_leave_sounds) minetest.register_item(":", { type = "none", @@ -116,7 +129,7 @@ minetest.register_node("mapgen:snowy_grass", { is_ground_content = true, drop = 'mapgen:dirt', groups = {crumbly=3, soil=1}, - sounds = default.node_sound_dirt_defaults(), + sounds = default.node_sound_snow_defaults(), }) @@ -579,20 +592,6 @@ end crustymese("mapgen:stone", "mapgen:mese_stone") --- liquid sounds - -minetest.register_abm({ - nodenames = {"mapgen:lava_source", "mapgen:lava_flowing"}, - interval = 2, - chance = 2, - action = function(pos, node, active_object_count, active_object_count_wider) - minetest.sound_play("mapgen_lava", {pos = pos, gain = 0.05, max_hear_distance = 1.5}) - if math.random(1,13) == 8 then - local rnd = math.random(0,1)*-1 - --minetest.add_particle(pos, {x=0.1*rnd, y=0.8, z=-0.1*rnd}, {x=-0.5*rnd, y=0.2, z=0.5*rnd}, 1.7,1.2, true, "mapgen_lava_particle.png") - end -end}) - -- -- Flowing water sound -- diff --git a/mods/mapgen/mapgen.lua b/mods/mapgen/mapgen.lua index cff2102..7be0f0f 100644 --- a/mods/mapgen/mapgen.lua +++ b/mods/mapgen/mapgen.lua @@ -18,6 +18,8 @@ -- You should have received a copy of the GNU General Public License -- along with BFD. If not, see . +--minetest.clear_registered_biomes() + minetest.register_biome({ name = "plains", diff --git a/mods/mapgen/nodes.lua b/mods/mapgen/nodes.lua index 6ad150e..23f0d51 100644 --- a/mods/mapgen/nodes.lua +++ b/mods/mapgen/nodes.lua @@ -617,7 +617,7 @@ minetest.register_node("mapgen:evergreen_leaves_snowy", { } } }, - sounds = default.node_sound_leaves_defaults(), + sounds = default.node_sound_snow_defaults(), }) minetest.register_node("mapgen:evergreen_sapling", { @@ -659,10 +659,7 @@ minetest.register_node("mapgen:snow", { }, }, groups = {crumbly=3,falling_node=1}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_snow_footstep", gain=0.25}, - dug = {name="default_snow_footstep", gain=0.75}, - }), + sounds = default.node_sound_snow_defaults(), on_construct = function(pos) pos.y = pos.y - 1 if minetest.get_node(pos).name == "mapgen:grass" then @@ -676,10 +673,7 @@ minetest.register_node("mapgen:snowblock", { tiles = {"mapgen_snow.png"}, is_ground_content = true, groups = {crumbly=3}, - sounds = default.node_sound_dirt_defaults({ - footstep = {name="default_snow_footstep", gain=0.25}, - dug = {name="default_snow_footstep", gain=0.75}, - }), + sounds = default.node_sound_snow_defaults(), }) minetest.register_craft({ diff --git a/mods/mapgen/textures/mapgen_birch_tree.png b/mods/mapgen/textures/mapgen_birch_tree.png index f09d229..110e6b6 100644 Binary files a/mods/mapgen/textures/mapgen_birch_tree.png and b/mods/mapgen/textures/mapgen_birch_tree.png differ diff --git a/mods/mapgen/textures/mapgen_cherry_tree.png b/mods/mapgen/textures/mapgen_cherry_tree.png index 1d2552f..13c0e86 100644 Binary files a/mods/mapgen/textures/mapgen_cherry_tree.png and b/mods/mapgen/textures/mapgen_cherry_tree.png differ diff --git a/mods/mapgen/textures/mapgen_dead_oak_tree.png b/mods/mapgen/textures/mapgen_dead_oak_tree.png index e00e7c7..16010ad 100644 Binary files a/mods/mapgen/textures/mapgen_dead_oak_tree.png and b/mods/mapgen/textures/mapgen_dead_oak_tree.png differ diff --git a/mods/mapgen/textures/mapgen_deathly_log.png b/mods/mapgen/textures/mapgen_deathly_log.png index 3f30e4b..853d9b3 100644 Binary files a/mods/mapgen/textures/mapgen_deathly_log.png and b/mods/mapgen/textures/mapgen_deathly_log.png differ diff --git a/mods/mapgen/textures/mapgen_evergreen_leaves_snowy.png b/mods/mapgen/textures/mapgen_evergreen_leaves_snowy.png index 59df4f5..3ebe847 100644 Binary files a/mods/mapgen/textures/mapgen_evergreen_leaves_snowy.png and b/mods/mapgen/textures/mapgen_evergreen_leaves_snowy.png differ diff --git a/mods/mapgen/textures/mapgen_ice.png b/mods/mapgen/textures/mapgen_ice.png index 4aa583a..c6f2ac8 100644 Binary files a/mods/mapgen/textures/mapgen_ice.png and b/mods/mapgen/textures/mapgen_ice.png differ diff --git a/mods/mapgen/textures/mapgen_snow.png b/mods/mapgen/textures/mapgen_snow.png index b4d0cc8..bdd3d69 100644 Binary files a/mods/mapgen/textures/mapgen_snow.png and b/mods/mapgen/textures/mapgen_snow.png differ diff --git a/mods/mapgen/textures/mapgen_snow_side.png b/mods/mapgen/textures/mapgen_snow_side.png index 8336126..6afc19a 100644 Binary files a/mods/mapgen/textures/mapgen_snow_side.png and b/mods/mapgen/textures/mapgen_snow_side.png differ diff --git a/mods/mapgen/textures/mapgen_snowball.png b/mods/mapgen/textures/mapgen_snowball.png index 8a4a14a..16b7613 100644 Binary files a/mods/mapgen/textures/mapgen_snowball.png and b/mods/mapgen/textures/mapgen_snowball.png differ diff --git a/mods/mobs/init.lua b/mods/mobs/init.lua index 61822ca..0c3c319 100644 --- a/mods/mobs/init.lua +++ b/mods/mobs/init.lua @@ -501,6 +501,105 @@ mobs:register_mob("mobs:evergreen_tree", { } }) +mobs:register_mob("mobs:kitten_striped", { + type = "animal", + hp_max = 5, + collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.1, 0.3}, + visual = "mesh", + visual_size = {x=0.5, y=0.5}, + mesh = "mobs_kitten.b3d", + textures = {"mobs_kitten_striped.png"}, + makes_footstep_sound = false, + view_range = 15, + walk_velocity = 0.6, + drops = { + {name = "tools:sword_air", + chance = 400000, + min = 1, + max = 1,} + }, + water_damage = 1, + lava_damage = 10, + on_rightclick = nil, + armor = 100, + sounds = { + random = "mobs_kitten", + }, + animation = { + stand_start = 97, + stand_end = 192, + walk_start = 0, + walk_end = 96, + speed_normal = 42, + } +}) + +mobs:register_mob("mobs:kitten_splotchy", { + type = "animal", + hp_max = 5, + collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.1, 0.3}, + visual = "mesh", + visual_size = {x=0.5, y=0.5}, + mesh = "mobs_kitten.b3d", + textures = {"mobs_kitten_splotchy.png"}, + makes_footstep_sound = false, + view_range = 15, + walk_velocity = 0.6, + drops = { + {name = "tools:sword_air", + chance = 400000, + min = 1, + max = 1,} + }, + water_damage = 1, + lava_damage = 10, + on_rightclick = nil, + armor = 100, + sounds = { + random = "mobs_kitten", + }, + animation = { + stand_start = 97, + stand_end = 192, + walk_start = 0, + walk_end = 96, + speed_normal = 42, + } +}) + +mobs:register_mob("mobs:kitten_ginger", { + type = "animal", + hp_max = 5, + collisionbox = {-0.3, -0.3, -0.3, 0.3, 0.1, 0.3}, + visual = "mesh", + visual_size = {x=0.5, y=0.5}, + mesh = "mobs_kitten.b3d", + textures = {"mobs_kitten_ginger.png"}, + makes_footstep_sound = false, + view_range = 15, + walk_velocity = 0.6, + drops = { + {name = "tools:sword_air", + chance = 400000, + min = 1, + max = 1,} + }, + water_damage = 1, + lava_damage = 10, + on_rightclick = nil, + armor = 100, + sounds = { + random = "mobs_kitten", + }, + animation = { + stand_start = 97, + stand_end = 192, + walk_start = 0, + walk_end = 96, + speed_normal = 42, + } +}) + if minetest.setting_get("log_mods") then minetest.log("action", "mobs loaded") end diff --git a/mods/mobs/models/kitten.blend b/mods/mobs/models/kitten.blend new file mode 100644 index 0000000..897e30a Binary files /dev/null and b/mods/mobs/models/kitten.blend differ diff --git a/mods/mobs/models/kitten.blend1 b/mods/mobs/models/kitten.blend1 new file mode 100644 index 0000000..660786f Binary files /dev/null and b/mods/mobs/models/kitten.blend1 differ diff --git a/mods/mobs/models/mobs_kitten.b3d b/mods/mobs/models/mobs_kitten.b3d new file mode 100644 index 0000000..3ebec29 Binary files /dev/null and b/mods/mobs/models/mobs_kitten.b3d differ diff --git a/mods/mobs/models/mobs_kitten_ginger.png b/mods/mobs/models/mobs_kitten_ginger.png new file mode 100644 index 0000000..ae718e5 Binary files /dev/null and b/mods/mobs/models/mobs_kitten_ginger.png differ diff --git a/mods/mobs/models/mobs_kitten_protolayer.png b/mods/mobs/models/mobs_kitten_protolayer.png new file mode 100644 index 0000000..c74c084 Binary files /dev/null and b/mods/mobs/models/mobs_kitten_protolayer.png differ diff --git a/mods/mobs/models/mobs_kitten_splotchy.png b/mods/mobs/models/mobs_kitten_splotchy.png new file mode 100644 index 0000000..bd497fc Binary files /dev/null and b/mods/mobs/models/mobs_kitten_splotchy.png differ diff --git a/mods/mobs/models/mobs_kitten_striped.png b/mods/mobs/models/mobs_kitten_striped.png new file mode 100644 index 0000000..3ded472 Binary files /dev/null and b/mods/mobs/models/mobs_kitten_striped.png differ diff --git a/mods/mobs/sounds/mobs_kitten.0.ogg b/mods/mobs/sounds/mobs_kitten.0.ogg new file mode 100644 index 0000000..2d8a706 Binary files /dev/null and b/mods/mobs/sounds/mobs_kitten.0.ogg differ diff --git a/mods/mobs/sounds/mobs_kitten.1.ogg b/mods/mobs/sounds/mobs_kitten.1.ogg new file mode 100644 index 0000000..9d2fa05 Binary files /dev/null and b/mods/mobs/sounds/mobs_kitten.1.ogg differ diff --git a/mods/mobs/sounds/mobs_kitten.2.ogg b/mods/mobs/sounds/mobs_kitten.2.ogg new file mode 100644 index 0000000..4749a6d Binary files /dev/null and b/mods/mobs/sounds/mobs_kitten.2.ogg differ diff --git a/mods/mobs/sounds/mobs_kitten.3.ogg b/mods/mobs/sounds/mobs_kitten.3.ogg new file mode 100644 index 0000000..021d3dc Binary files /dev/null and b/mods/mobs/sounds/mobs_kitten.3.ogg differ diff --git a/mods/mobs/sounds/mobs_kitten.4.ogg b/mods/mobs/sounds/mobs_kitten.4.ogg new file mode 100644 index 0000000..cda83b3 Binary files /dev/null and b/mods/mobs/sounds/mobs_kitten.4.ogg differ diff --git a/mods/mobs/sounds/mobs_kitten.5.ogg b/mods/mobs/sounds/mobs_kitten.5.ogg new file mode 100644 index 0000000..21f771f Binary files /dev/null and b/mods/mobs/sounds/mobs_kitten.5.ogg differ diff --git a/mods/mobs/sounds/mobs_kitten.6.ogg b/mods/mobs/sounds/mobs_kitten.6.ogg new file mode 100644 index 0000000..e7dd96d Binary files /dev/null and b/mods/mobs/sounds/mobs_kitten.6.ogg differ diff --git a/mods/mobs/sounds/stuff/mobs_kitten.0.aiff b/mods/mobs/sounds/stuff/mobs_kitten.0.aiff new file mode 100644 index 0000000..6371ae6 Binary files /dev/null and b/mods/mobs/sounds/stuff/mobs_kitten.0.aiff differ diff --git a/mods/mobs/sounds/stuff/mobs_kitten.1.wav b/mods/mobs/sounds/stuff/mobs_kitten.1.wav new file mode 100644 index 0000000..54439d6 Binary files /dev/null and b/mods/mobs/sounds/stuff/mobs_kitten.1.wav differ diff --git a/mods/mobs/sounds/stuff/mobs_kitten.5.aiff b/mods/mobs/sounds/stuff/mobs_kitten.5.aiff new file mode 100644 index 0000000..c72c1f0 Binary files /dev/null and b/mods/mobs/sounds/stuff/mobs_kitten.5.aiff differ diff --git a/mods/mobs/thanks.txt b/mods/mobs/thanks.txt new file mode 100644 index 0000000..e10f72e --- /dev/null +++ b/mods/mobs/thanks.txt @@ -0,0 +1,12 @@ +I give thanks to these FreeSound author's kittens who donated their meows and purrs for BFD: + +Some of them have been modified according to the license. + +http://freesound.org/people/lolamadeus/sounds/196251/ +By lolamadeus, CC0 + +http://freesound.org/people/soundatADM/sounds/223743/ +By soundatADM, CC0 + +http://freesound.org/people/kyles/sounds/51810/ +By kyles, CC0 \ No newline at end of file diff --git a/mods/ores/textures/ores_mese_crystal.png b/mods/ores/textures/ores_mese_crystal.png index afc68b7..5a9fa77 100644 Binary files a/mods/ores/textures/ores_mese_crystal.png and b/mods/ores/textures/ores_mese_crystal.png differ diff --git a/mods/ores/textures/ores_mese_crystal_fragment.png b/mods/ores/textures/ores_mese_crystal_fragment.png index eaf77c4..1aae537 100644 Binary files a/mods/ores/textures/ores_mese_crystal_fragment.png and b/mods/ores/textures/ores_mese_crystal_fragment.png differ diff --git a/mods/ores/textures/ores_obsidian_block.png b/mods/ores/textures/ores_obsidian_block.png index 66b4bb7..9fbb3e5 100644 Binary files a/mods/ores/textures/ores_obsidian_block.png and b/mods/ores/textures/ores_obsidian_block.png differ diff --git a/mods/player_textures/textures/player_Jordach.png b/mods/player_textures/textures/player_Jordach.png index 913c629..31354ab 100644 Binary files a/mods/player_textures/textures/player_Jordach.png and b/mods/player_textures/textures/player_Jordach.png differ diff --git a/mods/tools/textures/tool_rod.png b/mods/tools/textures/tool_rod.png index eac71ad..dbed357 100644 Binary files a/mods/tools/textures/tool_rod.png and b/mods/tools/textures/tool_rod.png differ diff --git a/mods/tools/textures/tool_steelaxe.png b/mods/tools/textures/tool_steelaxe.png index 1ddf000..2abe210 100644 Binary files a/mods/tools/textures/tool_steelaxe.png and b/mods/tools/textures/tool_steelaxe.png differ diff --git a/mods/tools/textures/tool_steelpick.png b/mods/tools/textures/tool_steelpick.png index ed62f2e..dbba4fc 100644 Binary files a/mods/tools/textures/tool_steelpick.png and b/mods/tools/textures/tool_steelpick.png differ diff --git a/mods/tools/textures/tool_steelshovel.png b/mods/tools/textures/tool_steelshovel.png index 32e3fac..28aa179 100644 Binary files a/mods/tools/textures/tool_steelshovel.png and b/mods/tools/textures/tool_steelshovel.png differ diff --git a/mods/tools/textures/tool_steelsword.png b/mods/tools/textures/tool_steelsword.png index ca995ea..b2b7cd1 100644 Binary files a/mods/tools/textures/tool_steelsword.png and b/mods/tools/textures/tool_steelsword.png differ diff --git a/mods/tools/textures/tool_stick.png b/mods/tools/textures/tool_stick.png index eac71ad..e0b660f 100644 Binary files a/mods/tools/textures/tool_stick.png and b/mods/tools/textures/tool_stick.png differ diff --git a/mods/tools/textures/tool_woodaxe.png b/mods/tools/textures/tool_woodaxe.png index 4ea505f..77681d8 100644 Binary files a/mods/tools/textures/tool_woodaxe.png and b/mods/tools/textures/tool_woodaxe.png differ diff --git a/mods/tools/textures/tool_woodpick.png b/mods/tools/textures/tool_woodpick.png index 2ab00a8..033f33a 100644 Binary files a/mods/tools/textures/tool_woodpick.png and b/mods/tools/textures/tool_woodpick.png differ diff --git a/mods/tools/textures/tool_woodshovel.png b/mods/tools/textures/tool_woodshovel.png index 18c19a9..a6a4421 100644 Binary files a/mods/tools/textures/tool_woodshovel.png and b/mods/tools/textures/tool_woodshovel.png differ diff --git a/mods/tools/textures/tool_woodsword.png b/mods/tools/textures/tool_woodsword.png index 0ca2cf6..eeea7c3 100644 Binary files a/mods/tools/textures/tool_woodsword.png and b/mods/tools/textures/tool_woodsword.png differ