Changes in default module. Work on support for weather_with_wind module.

master
SFENCE 2020-04-03 20:20:49 +02:00
parent 14768f61b5
commit c8566bc8fe
14 changed files with 105 additions and 45 deletions

12
.gitmodules vendored
View File

@ -1,3 +1,15 @@
[submodule "mods/dynamic_liquid"]
path = mods/dynamic_liquid
url = https://github.com/sfence/dynamic_liquid.git
[submodule "mods/tempsurvive"]
path = mods/tempsurvive
url = https://github.com/sfence/tempsurvive.git
[submodule "mods/lightning"]
path = mods/lightning
url = https://github.com/sfence/lightning.git
[submodule "mods/mymonths"]
path = mods/mymonths
url = https://github.com/sfence/mymonths.git
[submodule "mods/weather_with_wind"]
path = mods/weather_with_wind
url = https://github.com/sfence/weather_with_wind

View File

@ -14,3 +14,7 @@ dynamic_liquid_flow_through = true
dynamic_liquid_displace_liquid = true
dynamic_liquid_mapgen_prefill = true
# tnt
enable_tnt = true
tnt_radius = 3

View File

@ -67,6 +67,7 @@ if creative_mode_cache then
damage_groups = {fleshy = 10},
},
groups = {hand_work = 2, hand_work_uses = 0, hand_work_maxlevel = 2},
liquids_pointable = true,
})
end

View File

@ -65,7 +65,7 @@ function default.register_changeable_node_change(node_name, change_name, change_
end
-- do node change with change_name
function default.apply_node_change(pos, node, change_name)
function default.apply_node_change(pos, node, change_name, change_power)
if (node==nil) then
node = minetest.get_node(pos);
end
@ -79,7 +79,7 @@ function default.apply_node_change(pos, node, change_name)
local change_def = changeable_node.changes[change_name];
--minetest.log("warning","change_def: "..dump(change_def))
if (change_def~=nil) then
if ((change_def.allow_change==nil) or (change_def.allow_change(pos, node)==true)) then
if ((change_def.allow_change==nil) or (change_def.allow_change(pos, node, change_power)==true)) then
--minetest.log("warning", "Change "..node.name.." to "..change_def.new_node_name..".")
minetest.swap_node(pos, {name=change_def.new_node_name});
if (change_def.check_stability==true) then

View File

@ -1,45 +1,47 @@
-- mods/default/item_entity.lua
local function item_move_pos(pos)
local check_pos = table.copy(pos);
local function get_item_move_posibilities(pos)
local table_pos = {};
check_pos.x = pos.x - 1;
if (default.shared_is_buildable_to(check_pos)==true) then
table.insert(table_pos, table.copy(check_pos));
end
check_pos.x = pos.x + 1;
if (default.shared_is_buildable_to(check_pos)==true) then
table.insert(table_pos, table.copy(check_pos));
end
check_pos.x = pos.x;
check_pos.z = pos.z - 1;
if (default.shared_is_buildable_to(check_pos)==true) then
table.insert(table_pos, table.copy(check_pos));
end
check_pos.z = pos.z + 1;
if (default.shared_is_buildable_to(check_pos)==true) then
table.insert(table_pos, table.copy(check_pos));
end
check_pos.z = pos.z;
check_pos.y = pos.y + 1;
if (default.shared_is_buildable_to(check_pos)==true) then
table.insert(table_pos, table.copy(check_pos));
local new_pos = table.copy(pos);
new_pos.x = pos.x - 1;
table.insert(table_pos, table.copy(new_pos));
new_pos.x = pos.x + 1;
table.insert(table_pos, table.copy(new_pos));
new_pos.x = pos.x;
new_pos.z = pos.z + 1;
table.insert(table_pos, table.copy(new_pos));
new_pos.z = pos.z - 1;
table.insert(table_pos, table.copy(new_pos));
new_pos.z = pos.z;
new_pos.y = pos.y + 1;
table.insert(table_pos, table.copy(new_pos));
return table_pos;
end
local function item_move_pos(pos)
local move_pos = nil;
local table_pos = {};
local for_check_pos = get_item_move_posibilities(pos);
for index,check_pos in pairs(for_check_pos)
do
if (default.shared_is_buildable_to(check_pos)==true) then
table.insert(table_pos, check_pos);
end
end
if (#table_pos>0) then
local new_index = default.random_generator:next(1, #table_pos);
check_pos = table_pos[new_index];
move_pos = table_pos[new_index];
--minetest.log("warning", ""..dump(table_pos).." index: "..dump(new_index))
else
check_pos.y = pos.y + 1;
while (default.shared_is_buildable_to(check_pos)==true)
do
check_pos.y = check_pos.y + 1;
end
local new_index = default.random_generator:next(1, #for_check_pos);
move_pos = for_check_pos[new_index];
end
check_pos.x = check_pos.x - 0.5;
check_pos.y = check_pos.y - 0.5;
check_pos.z = check_pos.z - 0.5;
return check_pos;
return move_pos;
end
local builtin_item = minetest.registered_entities["__builtin:item"]
@ -89,9 +91,6 @@ local item = {
build_itself = function(self)
local pos = self.object:get_pos()
pos.x = pos.x + 0.5;
pos.y = pos.y + 0.5;
pos.z = pos.z + 0.5;
local node = minetest.get_node(pos);
if (node.name=="air") or (node.name=="ignore") or (minetest.registered_nodes[node.name].buildable_to==true) then

View File

@ -21,6 +21,7 @@ minetest.register_item(":", {
},
groups = {hand_work = 2, hand_work_uses = 0,
hand_work_maxlevel = 2},
liquids_pointable = true,
})
--

1
mods/lightning Submodule

@ -0,0 +1 @@
Subproject commit 01f2b9c89da1a6e97e5763518ad0f34f4a84236a

1
mods/mymonths Submodule

@ -0,0 +1 @@
Subproject commit c759ca0e90cdde97aa10e9db626de83d21250a93

38
mods/stone_age/PLAN Normal file
View File

@ -0,0 +1,38 @@
PLAN for stone age
Tools
Chip tools
stone_age:chip_stone_hard - stone for chipping another stone
stone_age:chip_stone_soft - stone for chipping another stone
Scrapers
stone_age:scraper_flint - hand axe from flint
stone_age:scraper_soft_stone - hand axe from soft stone
Axes
stone_age:hand_axe_flint - hand axe from flint
stone_age:hand_axe_soft_stone - hand axe from soft stone
Shovels
stone_age:shovel_wood - wooden shovel
Spikes
stone_age:spike_soft_stone_medium
stone_age:spike_flint_medium
stone_age:spike_flint_precise
Saws
stone_age:saw_small_flint - saw from flints
Sickles
stone_age:sickle_flint
Bowls
stone_age:bowl_wood
Make fire tools
Hand Weapons
stone_age:lance_wood - wooden lance
Shot Weapons

1
mods/tempsurvive Submodule

@ -0,0 +1 @@
Subproject commit bd9a428c9b5d1454405d4c31ba16a80a451aa8b6

View File

@ -5,13 +5,10 @@ local S = test.S;
--
--
minetest.register_item("test:test_lua_call", {
minetest.register_craftitem("test:test_lua_call", {
description = S("Test lua call"),
tiles = {"default_stick.png"},
inventory_image = "test_lua_call.png",
groups = {oddly_breakable_by_hand = 1},
drop = "test:test_lua_call",
legacy_mineral = true,
sounds = default.node_sound_stone_defaults(),
on_use = function(itemstack, user, pointed_thing)
local node_pos = pointed_thing.under;
@ -20,7 +17,10 @@ minetest.register_item("test:test_lua_call", {
minetest.log("warning", "Test lua call for node: "..dump(node));
-- test call
vegetation.tree_stump_grow(node_pos, node);
--vegetation.tree_stump_grow(node_pos, node);
minetest.log("warning", "Light under: "..minetest.get_node_light(pointed_thing.under));
minetest.log("warning", "Light above: "..minetest.get_node_light(pointed_thing.above));
end,
})

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B

View File

@ -26,7 +26,8 @@ end
--
-- vegetation probability function
--
-- max_probability*abs(1/(1+lower_steepness^(-x+lower_border)) + 1/(1+upper_steepness^(x-upper_border)) - 1)
-- max_probability*abs(1/(1+lower_steepness^(-x+lower_border))
-- + 1/(1+upper_steepness^(x-upper_border)) - 1)
--
-- probabality in lower_border and upper_border is 0.5,
-- between lower_border and upper_border probability increase to 1,

@ -0,0 +1 @@
Subproject commit d4c87db71aa48d7caa862a770821b8c653050b37