Partly reindent replacements.lua

master
Solebull 2018-12-24 01:02:15 +01:00
parent ba50783ae0
commit aa66df968a
2 changed files with 110 additions and 108 deletions

30
ROADMAP
View File

@ -3,7 +3,7 @@
* v1.0.0
** v0.1.0
*** v0.0.1
**** This king of dashboard is smart
**** This kind of dashboard is smart
https://grafana.qbuissondebon.info/dashboard/db/minetestforfun-external-monitoring
- Could we have one ?
**** See if we can implement unit tests for mods
@ -42,7 +42,7 @@ wool_brown.png wool_grey.png wool_violet.png
wool_cyan.png wool_magenta.png wool_white.png
wool_dark_green.png
**** Improve minetestwrapper
**** Improve minetestmapper
*Should show factions*
- [ ] Clone this project and create a gitlab project as minetestmapper-factions
- [ ] Add a legend with all known factions
@ -85,7 +85,8 @@ Building the C++ version manually in ~/Jeux/minetestmapper. It works
It's really fast. May be used on a website, to show the actual map.
- [ ] Maybe we could have ranking etc...
**** Some warnings
WARNING[Server]: WARNING: minetest.setting_* functions are deprecated. Use methods on the minetest.settings object. (at .../.minetest/games/minetest-solebull/mods/hbarmor/init.lua:97)
- [ ] WARNING[Server]: WARNING: minetest.setting_* functions are deprecated. Use methods on the minetest.settings object. (at .../.minetest/games/minetest-solebull/mods/hbarmor/init.lua:97)
Still present with new client ?
**** Multiplayer test
CLOCK: [2018-09-16 dim. 18:28]--[2018-09-16 dim. 18:59] => 0:31
CLOCK: [2018-09-09 dim. 17:42]--[2018-09-09 dim. 21:11] => 3:29
@ -103,28 +104,28 @@ WARNING[Server]: WARNING: minetest.setting_* functions are deprecated. Use meth
- [X] Can another player can modify land in another one's parcel : NO
- [X] Does my mapper understand and show the factions ? NO
- [X] Explain in README : Shift+ click to send directly to the inventory
- [X] We can't find a NPC in villages :(
it's done by villagers mod but buggy https://github.com/ErrorNull0/villagers
- [X] Is thje lag due to : autosave deactivated
[playereffects] Autosaving mod data to playereffects.mt ...
[playereffects] Wrote playereffects data into /home/rainbru/.minetest/worlds/Survie pour PNJ/playereffects.mt.
- [ ] Next stream test
- [ ] pvp_areas to protext spawn point against pvp
- [ ] pvp_areas to protect spawn point against pvp
- [ ] See that error
[advanced_npc] ERROR: Unable to find building entrance!
- [ ] See if we can change actual minecart
With Froward/Backward touchs
- [ ] We can't find a NPC in villages :(
it's done by villagers mod but buggy https://github.com/ErrorNull0/villagers
- [ ] May find an 'update aquatic' mod :)
- [ ] Is thje lag due to
[playereffects] Autosaving mod data to playereffects.mt ...
[playereffects] Wrote playereffects data into /home/rainbru/.minetest/worlds/Survie pour PNJ/playereffects.mt.
- [ ] May find an 'update aquatic' mod :)
- [ ] Understand what are the bags tab in the inventory
- [ ] Could we handle auto-run
- [ ] Could code that : "When exitting craft table, inside stuff go directly to
the player's inventory"
- [ ] Find some female skins
- See this error WARNING[Server]: Assignment to undeclared global "p2" inside a function at ...rainbru/.minetest/games/minetest-pvp/mods/ruins/init.lua:99.
- [ ] See this error WARNING[Server]: Assignment to undeclared global "p2" inside a function at ...rainbru/.minetest/games/minetest-pvp/mods/ruins/init.lua:99.
**** TODO [feature_AwardsFactionsLink] Could link awards with factions power
*We could link each achievement to the player's faction's power*
*Power can be seen as reputation*
@ -142,6 +143,7 @@ WARNING[Server]: WARNING: minetest.setting_* functions are deprecated. Use meth
**** pvp shoudld be a privillege
- So we can revoke it to some players
**** TODO Continue to test factions and NPC mod
CLOCK: [2018-12-24 lun. 00:51]--[2018-12-24 lun. 00:52] => 0:01
CLOCK: [2018-12-23 dim. 18:16]--[2018-12-23 dim. 18:40] => 0:24
CLOCK: [2018-12-23 dim. 13:29]--[2018-12-23 dim. 14:37] => 1:08
CLOCK: [2018-12-21 ven. 00:50]--[2018-12-21 ven. 01:15] => 0:25
@ -176,15 +178,15 @@ WARNING[Server]: WARNING: minetest.setting_* functions are deprecated. Use meth
Deactivated autosave every 10 seconds in playereffects/settings.lua
- [ ] Even with protection, we can take what's in villagers' chests
Try to add them as protected chest
Try to edit mts files in mods/mg_villages/schems/
These are schematics files sued with worldedit
- [ ] Too much stuff in NPC villages
How to change that
Try to edit mts files in mods/mg_villages/schems/
These are schematics files sued with worldedit : not really usable
- [ ] Faction chest must be for faction only (no parcel needed)
- [ ] Try to find a protector mod, test it
- [ ] Make the protector/faction_protector available to all members of
the faction
- [ ] The faction spawn seems to be broken
- [ ] We should be able to create a hoe fom the right
Actually only stone:stone

View File

@ -181,103 +181,103 @@ end
-- replace the tree trunk as well so that it fits to the wood type
mg_villages.replace_tree_trunk = function( replacements, wood_type )
if( wood_type == 'default:junglewood' ) then
table.insert( replacements, {'default:tree', 'default:jungletree'});
elseif( wood_type == 'default:pine_wood' ) then
table.insert( replacements, {'default:tree', 'default:pine_tree'});
elseif( wood_type == 'default:acacia_wood' ) then
table.insert( replacements, {'default:tree', 'default:acacia_tree'});
elseif( wood_type == 'default:aspen_wood' ) then
table.insert( replacements, {'default:tree', 'default:aspen_tree'});
elseif( wood_type == 'mg:savannawood' ) then
table.insert( replacements, {'default:tree', 'mg:savannatree'});
elseif( wood_type == 'mg:pinewood' ) then
table.insert( replacements, {'default:tree', 'mg:pinetree'});
elseif( mg_villages.moretrees_treelist ) then
for _,v in ipairs( mg_villages.moretrees_treelist ) do
if( wood_type == "moretrees:"..v[1].."_planks" ) then
table.insert( replacements, {'default:tree', "moretrees:"..v[1].."_trunk"});
table.insert( replacements, {'default:leaves', "moretrees:"..v[1].."_leaves"});
end
end
elseif( wood_type == 'deco:birch_plank' ) then
table.insert( replacements, {'default:tree', "mapgen:birch_log"});
elseif( wood_type == 'deco:cherry_plank' ) then
table.insert( replacements, {'default:tree', "mapgen:cherry_log"});
elseif( wood_type == 'deco:evergreen_plank' ) then
table.insert( replacements, {'default:tree', "mapgen:evergreen_log"});
elseif( wood_type == 'deco:oak_plank' ) then
table.insert( replacements, {'default:tree', "mapgen:oak_log"});
elseif( wood_type == 'ethereal:frost_wood' ) then
table.insert( replacements, {'default:tree', "ethereal:frost_tree"});
elseif( wood_type == "ethereal:mushroom_pore" ) then
table.insert( replacements, {'default:tree', "ethereal:mushroom_trunk"});
elseif( mg_villages.ethereal_trees ) then
for _,v in ipairs( mg_villages.ethereal_trees ) do
if( wood_type == "ethereal:"..v.."_wood" ) then
table.insert( replacements, {'default:tree', "ethereal:"..v.."_trunk"});
end
end
elseif( mg_villages.forest_trees ) then
for _,v in ipairs( mg_villages.forest_trees ) do
if( wood_type == "forest:"..v.."_wood" ) then
table.insert( replacements, {'default:tree', "forest:"..v.."_tree"});
end
end
elseif( mg_villages.tinytrees_trees ) then
for _,v in ipairs( mg_villages.tinytrees_trees ) do
if( wood_type == "trees:wood_"..v ) then
table.insert( replacements, {'default:tree', "trees:tree_"..v});
end
end
elseif( mg_villages.realtest_trees ) then
for _,v in ipairs( mg_villages.realtest_trees ) do
if( wood_type == 'trees:'..v..'_planks' ) then
table.insert( replacements, {'default:tree', "trees:"..v..'_log'});
-- realtest does not have most of the nodes from default, so we need to replace them as well
table.insert( replacements, {'default:wood', 'trees:'..v..'_planks'});
table.insert( replacements, {'default:leaves', 'trees:'..v..'_leaves'});
table.insert( replacements, {'default:ladder', 'trees:'..v..'_ladder'});
table.insert( replacements, {'default:chest', 'trees:'..v..'_chest'});
table.insert( replacements, {'default:chest_locked', 'trees:'..v..'_chest_locked'});
table.insert( replacements, {'default:fence_wood', 'fences:'..v..'_fence'});
table.insert( replacements, {'default:bookshelf', 'decorations:bookshelf_'..v});
table.insert( replacements, {'doors:door_wood_t_1', 'doors:door_'..v..'_t_1'});
table.insert( replacements, {'doors:door_wood_b_1', 'doors:door_'..v..'_b_1'});
table.insert( replacements, {'doors:door_wood_t_2', 'doors:door_'..v..'_t_2'});
table.insert( replacements, {'doors:door_wood_b_2', 'doors:door_'..v..'_b_2'});
-- not really wood-realted, but needs to be replaced as well
table.insert( replacements, {'default:furnace', 'oven:oven'});
-- farming is also handled diffrently
table.insert( replacements, {'farming:soil_wet', 'farming:soil'});
table.insert( replacements, {'farming:cotton_1', 'farming:flax_1'});
table.insert( replacements, {'farming:cotton_2', 'farming:flax_1'});
table.insert( replacements, {'farming:cotton_3', 'farming:flax_2'});
table.insert( replacements, {'farming:cotton_4', 'farming:flax_2'});
table.insert( replacements, {'farming:cotton_5', 'farming:flax_3'});
table.insert( replacements, {'farming:cotton_6', 'farming:flax_3'});
table.insert( replacements, {'farming:cotton_7', 'farming:flax_4'});
table.insert( replacements, {'farming:cotton_8', 'farming:flax_4'});
-- stairs and slabs made out of default wood
table.insert( replacements, {'stairs:stair_wood', 'trees:'..v..'_planks_stair'});
table.insert( replacements, {'stairs:slab_wood', 'trees:'..v..'_planks_slab'});
table.insert( replacements, {'stairs:stair_woodupside_down','trees:'..v..'_planks_stair_upside_down' } );
table.insert( replacements, {'stairs:slab_woodupside_down', 'trees:'..v..'_planks_slab_upside_down' } );
end
end
if(wood_type == 'default:junglewood' ) then
table.insert( replacements, {'default:tree', 'default:jungletree'});
elseif( wood_type == 'default:pine_wood' ) then
table.insert( replacements, {'default:tree', 'default:pine_tree'});
elseif( wood_type == 'default:acacia_wood' ) then
table.insert( replacements, {'default:tree', 'default:acacia_tree'});
elseif( wood_type == 'default:aspen_wood' ) then
table.insert( replacements, {'default:tree', 'default:aspen_tree'});
elseif( wood_type == 'mg:savannawood' ) then
table.insert( replacements, {'default:tree', 'mg:savannatree'});
elseif( wood_type == 'mg:pinewood' ) then
table.insert( replacements, {'default:tree', 'mg:pinetree'});
elseif( mg_villages.moretrees_treelist ) then
for _,v in ipairs( mg_villages.moretrees_treelist ) do
if( wood_type == "moretrees:"..v[1].."_planks" ) then
table.insert( replacements, {'default:tree', "moretrees:"..v[1].."_trunk"});
table.insert( replacements, {'default:leaves', "moretrees:"..v[1].."_leaves"});
end
end
elseif( wood_type == 'deco:birch_plank' ) then
table.insert( replacements, {'default:tree', "mapgen:birch_log"});
elseif( wood_type == 'deco:cherry_plank' ) then
table.insert( replacements, {'default:tree', "mapgen:cherry_log"});
elseif( wood_type == 'deco:evergreen_plank' ) then
table.insert( replacements, {'default:tree', "mapgen:evergreen_log"});
elseif( wood_type == 'deco:oak_plank' ) then
table.insert( replacements, {'default:tree', "mapgen:oak_log"});
elseif( wood_type == 'ethereal:frost_wood' ) then
table.insert( replacements, {'default:tree', "ethereal:frost_tree"});
elseif( wood_type == "ethereal:mushroom_pore" ) then
table.insert( replacements, {'default:tree', "ethereal:mushroom_trunk"});
elseif( mg_villages.ethereal_trees ) then
for _,v in ipairs( mg_villages.ethereal_trees ) do
if( wood_type == "ethereal:"..v.."_wood" ) then
table.insert( replacements, {'default:tree', "ethereal:"..v.."_trunk"});
end
end
elseif( mg_villages.forest_trees ) then
for _,v in ipairs( mg_villages.forest_trees ) do
if( wood_type == "forest:"..v.."_wood" ) then
table.insert( replacements, {'default:tree', "forest:"..v.."_tree"});
end
end
elseif( mg_villages.tinytrees_trees ) then
for _,v in ipairs( mg_villages.tinytrees_trees ) do
if( wood_type == "trees:wood_"..v ) then
table.insert( replacements, {'default:tree', "trees:tree_"..v});
end
end
elseif( mg_villages.realtest_trees ) then
for _,v in ipairs( mg_villages.realtest_trees ) do
if( wood_type == 'trees:'..v..'_planks' ) then
table.insert( replacements, {'default:tree', "trees:"..v..'_log'});
-- realtest does not have most of the nodes from default, so we need to replace them as well
table.insert( replacements, {'default:wood', 'trees:'..v..'_planks'});
table.insert( replacements, {'default:leaves', 'trees:'..v..'_leaves'});
table.insert( replacements, {'default:ladder', 'trees:'..v..'_ladder'});
table.insert( replacements, {'default:chest', 'trees:'..v..'_chest'});
table.insert( replacements, {'default:chest_locked', 'trees:'..v..'_chest_locked'});
table.insert( replacements, {'default:fence_wood', 'fences:'..v..'_fence'});
table.insert( replacements, {'default:bookshelf', 'decorations:bookshelf_'..v});
table.insert( replacements, {'doors:door_wood_t_1', 'doors:door_'..v..'_t_1'});
table.insert( replacements, {'doors:door_wood_b_1', 'doors:door_'..v..'_b_1'});
table.insert( replacements, {'doors:door_wood_t_2', 'doors:door_'..v..'_t_2'});
table.insert( replacements, {'doors:door_wood_b_2', 'doors:door_'..v..'_b_2'});
-- not really wood-realted, but needs to be replaced as well
table.insert( replacements, {'default:furnace', 'oven:oven'});
-- farming is also handled diffrently
table.insert( replacements, {'farming:soil_wet', 'farming:soil'});
table.insert( replacements, {'farming:cotton_1', 'farming:flax_1'});
table.insert( replacements, {'farming:cotton_2', 'farming:flax_1'});
table.insert( replacements, {'farming:cotton_3', 'farming:flax_2'});
table.insert( replacements, {'farming:cotton_4', 'farming:flax_2'});
table.insert( replacements, {'farming:cotton_5', 'farming:flax_3'});
table.insert( replacements, {'farming:cotton_6', 'farming:flax_3'});
table.insert( replacements, {'farming:cotton_7', 'farming:flax_4'});
table.insert( replacements, {'farming:cotton_8', 'farming:flax_4'});
-- stairs and slabs made out of default wood
table.insert( replacements, {'stairs:stair_wood', 'trees:'..v..'_planks_stair'});
table.insert( replacements, {'stairs:slab_wood', 'trees:'..v..'_planks_slab'});
table.insert( replacements, {'stairs:stair_woodupside_down','trees:'..v..'_planks_stair_upside_down' } );
table.insert( replacements, {'stairs:slab_woodupside_down', 'trees:'..v..'_planks_slab_upside_down' } );
end
end
else
return nil;
return nil;
end
return wood_type;
-- TODO if minetest.get_modpath("moreblocks") and moretrees.enable_stairsplus the
-- TODO if minetest.get_modpath("moreblocks") and moretrees.enable_stairsplus the
end