13 Achegas 2cdcd29333 ... bc25e3d53b

Autor SHA1 Mensaxe Data
  NathanSalapat bc25e3d53b Added labels to all abms %!s(int64=4) %!d(string=hai) anos
  NathanSalapat 97b8cc9ea4 added pedestals %!s(int64=4) %!d(string=hai) anos
  NathanSalapat 768ae3d423 fixed a bug with the titanium armor recipe. %!s(int64=4) %!d(string=hai) anos
  NathanSalapat c058e76a34 Added more blocks to morelights. %!s(int64=4) %!d(string=hai) anos
  NathanSalapat fcd0eb13fa Added a few nodes to the tablesaw. %!s(int64=4) %!d(string=hai) anos
  NathanSalapat ffea0aa475 Added some documentation %!s(int64=4) %!d(string=hai) anos
  NathanSalapat cd21ddbe5c Added burlap for making metal armors. %!s(int64=4) %!d(string=hai) anos
  NathanSalapat a459ca154a updated Mobs_redo %!s(int64=4) %!d(string=hai) anos
  NathanSalapat b6952141e6 Updated playeranim %!s(int64=4) %!d(string=hai) anos
  NathanS21 efe8b9cc76 Merge branch 'play_jazz_only_when_all_players_in_bed' of Xachman/Epic into master %!s(int64=4) %!d(string=hai) anos
  NathanSalapat c96e966f00 testing %!s(int64=4) %!d(string=hai) anos
  NathanSalapat b26f9ba216 just a test %!s(int64=4) %!d(string=hai) anos
  xachman 578b692a25 play music only when all players are in bed %!s(int64=4) %!d(string=hai) anos

+ 1 - 1
mods/afk/init.lua

@@ -5,7 +5,7 @@ local INTERVAL = 5
 local MINDIST = 0.4
 
 -- If player does not move within this time, 'sit' player (in seconds) and label them as afk.
-local TIMEOUT = 300 -- 300 = 5 minutes
+local TIMEOUT = 600
 
 local time_afk = {} -- a table indexed by plname that indicates the approximate time since last moved
 local last_pos = {} -- a table of position vectors that are indexed by plname

+ 5 - 1
mods/beds/functions.lua

@@ -153,7 +153,6 @@ end
 
 function beds.skip_night()
 	minetest.set_timeofday(0.23)
-   minetest.sound_play('beds_jazz', {gain = 1})
 end
 
 function beds.on_rightclick(pos, player)
@@ -181,6 +180,7 @@ function beds.on_rightclick(pos, player)
 		update_formspecs(false)
 	end
 
+	local player_in_bed = get_player_in_bed_count()
 	-- skip the night and let all players stand up
 	if check_in_beds() then
 		minetest.after(2, function()
@@ -188,6 +188,10 @@ function beds.on_rightclick(pos, player)
 				update_formspecs(is_night_skip_enabled())
 			end
 			if is_night_skip_enabled() then
+				local ges = #minetest.get_connected_players()
+				if ges == player_in_bed then
+					minetest.sound_play('beds_jazz', {gain = 1})
+				end
 				beds.skip_night()
 				beds.kick_players()
 			end

+ 3 - 1
mods/caverealms_lite/abms.lua

@@ -37,9 +37,11 @@ minetest.register_abm({
       else
          local above_pos = {x=pos.x, y=pos.y+1, z=pos.z}
          local above_node = minetest.get_node(above_pos).name
-         while above_node == 'caverealms:fire_vine' do
+         local node_count = 0
+         while above_node == 'caverealms:fire_vine' and node_count < 25 do
             above_pos.y = above_pos.y + 1
             above_node = minetest.get_node(above_pos).name
+            local node_count = node_count + 1
          end
          if minetest.get_item_group(above_node, 'flammable') > 0 or above_node == 'air' then
             minetest.set_node(above_pos, {name = 'caverealms:fire_vine'})

+ 1 - 0
mods/crafting_bench/init.lua

@@ -144,6 +144,7 @@ end
 
 minetest.register_abm( {
    nodenames = {'crafting_bench:workbench'},
+   label = 'autocrafting table',
    interval = crafting_rate,
    chance = 1,
    action = function ( pos, node )

+ 1 - 0
mods/darkage/nodes.lua

@@ -340,6 +340,7 @@ minetest.register_node("darkage:tuff_bricks", {
 
 -- abm to turn Tuff bricks to old Tuff bricks if water is nearby
 minetest.register_abm({
+   label = 'Tuff bricks to old Tuff if near water.',
 	nodenames = {"darkage:tuff_bricks"},
 	neighbors = {"group:water"},
 	interval = 16,

+ 1 - 0
mods/desert_life/barrel_cacti.lua

@@ -76,6 +76,7 @@ minetest.register_decoration({
 })
 
 minetest.register_abm{
+   label = 'Barrel Cacti growth/spread',
    nodenames = {"group:dl_bc"},
    interval = 40,
    chance = 30,

+ 1 - 0
mods/desert_life/prickly_pear.lua

@@ -124,6 +124,7 @@ minetest.register_decoration({
 
 minetest.register_abm{
    nodenames = {"group:dl_pp"},
+   label = 'Prickly pear growth/spread',
    interval = 40,
    chance = 30,
    action = function(pos)

+ 10 - 0
mods/epic/craftitems.lua

@@ -143,3 +143,13 @@ minetest.register_craftitem('epic:glowingdiamond', {
    description = 'Glowing Diamond',
    inventory_image = 'epic_glowingdiamond.png',
 })
+
+minetest.register_craftitem('epic:burlap_tattered', {
+   description = 'Tattered Burlap',
+   inventory_image = 'epic_burlap_tattered.png',
+})
+
+minetest.register_craftitem('epic:burlap', {
+   description = 'Burlap',
+   inventory_image = 'epic_burlap.png'
+})

+ 8 - 0
mods/epic/crafts.lua

@@ -16,6 +16,14 @@ for i in ipairs (crystals) do
 end
 
 minetest.register_craft({
+   output = 'epic:burlap',
+   recipe = {
+      {'epic:burlap_tattered', 'epic:burlap_tattered'},
+      {'epic:burlap_tattered', 'epic:burlap_tattered'}
+   }
+})
+
+minetest.register_craft({
    output = 'default:dirt',
    recipe = {
       {'epic:scorched_dirt', 'bonemeal:mulch'}

+ 0 - 0
mods/epic/doc.lua


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio