From b1adb55c115fc235f4d94892c20e918518100b43 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Wed, 8 Jun 2016 18:15:03 +0200 Subject: [PATCH] [moretrees] Update --- mods/moretrees/biome_defs.lua | 2 +- mods/moretrees/crafts.lua | 10 +++++----- mods/moretrees/default_settings.txt | 2 +- mods/moretrees/init.lua | 8 ++++---- mods/moretrees/node_defs.lua | 12 +++++++----- mods/moretrees/textures/moretrees_cedar_cone.png | Bin 0 -> 315 bytes .../textures/moretrees_cedar_leaves.png | Bin 0 -> 205 bytes ...es_pine_nuts.png => moretrees_cedar_nuts.png} | Bin .../textures/moretrees_cedar_sapling.png | Bin 0 -> 202 bytes .../moretrees/textures/moretrees_cedar_trunk.png | Bin 0 -> 1074 bytes .../textures/moretrees_cedar_trunk_top.png | Bin 0 -> 451 bytes mods/moretrees/textures/moretrees_cedar_wood.png | Bin 0 -> 648 bytes mods/moretrees/textures/moretrees_pine_cone.png | Bin 312 -> 0 bytes mods/moretrees/tree_biomes.txt | 5 ++++- mods/moretrees/tree_models.lua | 8 ++++---- 15 files changed, 26 insertions(+), 21 deletions(-) create mode 100644 mods/moretrees/textures/moretrees_cedar_cone.png create mode 100644 mods/moretrees/textures/moretrees_cedar_leaves.png rename mods/moretrees/textures/{moretrees_pine_nuts.png => moretrees_cedar_nuts.png} (100%) mode change 100755 => 100644 create mode 100644 mods/moretrees/textures/moretrees_cedar_sapling.png create mode 100644 mods/moretrees/textures/moretrees_cedar_trunk.png create mode 100644 mods/moretrees/textures/moretrees_cedar_trunk_top.png create mode 100644 mods/moretrees/textures/moretrees_cedar_wood.png delete mode 100755 mods/moretrees/textures/moretrees_pine_cone.png diff --git a/mods/moretrees/biome_defs.lua b/mods/moretrees/biome_defs.lua index 34d8e4e8..48efee0d 100755 --- a/mods/moretrees/biome_defs.lua +++ b/mods/moretrees/biome_defs.lua @@ -150,7 +150,7 @@ moretrees.spruce_biome = { max_count = 5, } -moretrees.pine_biome = { +moretrees.cedar_biome = { surface = "default:dirt_with_grass", avoid_nodes = moretrees.avoidnodes, avoid_radius = 10, diff --git a/mods/moretrees/crafts.lua b/mods/moretrees/crafts.lua index 6b0c232f..ad064da9 100755 --- a/mods/moretrees/crafts.lua +++ b/mods/moretrees/crafts.lua @@ -83,9 +83,9 @@ minetest.register_craftitem("moretrees:spruce_nuts", { on_use = minetest.item_eat(1), }) -minetest.register_craftitem("moretrees:pine_nuts", { - description = S("Roasted Pine Cone Nuts"), - inventory_image = "moretrees_pine_nuts.png", +minetest.register_craftitem("moretrees:cedar_nuts", { + description = S("Roasted Cedar Cone Nuts"), + inventory_image = "moretrees_cedar_nuts.png", on_use = minetest.item_eat(1), }) @@ -141,8 +141,8 @@ minetest.register_craft({ minetest.register_craft({ type = "cooking", - output = "moretrees:pine_nuts 4", - recipe = "moretrees:pine_cone", + output = "moretrees:cedar_nuts 4", + recipe = "moretrees:cedar_cone", }) minetest.register_craft({ diff --git a/mods/moretrees/default_settings.txt b/mods/moretrees/default_settings.txt index a34ea230..1bb85f52 100755 --- a/mods/moretrees/default_settings.txt +++ b/mods/moretrees/default_settings.txt @@ -6,7 +6,7 @@ moretrees.enable_apple_tree = true moretrees.enable_oak = true moretrees.enable_sequoia = true moretrees.enable_palm = true -moretrees.enable_pine = true +moretrees.enable_cedar = true moretrees.enable_rubber_tree = true moretrees.enable_willow = true moretrees.enable_acacia = true diff --git a/mods/moretrees/init.lua b/mods/moretrees/init.lua index e5245b45..1459917c 100755 --- a/mods/moretrees/init.lua +++ b/mods/moretrees/init.lua @@ -86,7 +86,7 @@ if moretrees.spawn_saplings then moretrees.spawn_oak_object = "moretrees:oak_sapling_ongen" moretrees.spawn_sequoia_object = "moretrees:sequoia_sapling_ongen" moretrees.spawn_palm_object = "moretrees:palm_sapling_ongen" - moretrees.spawn_pine_object = "moretrees:pine_sapling_ongen" + moretrees.spawn_cedar_object = "moretrees:cedar_sapling_ongen" moretrees.spawn_rubber_tree_object = "moretrees:rubber_tree_sapling_ongen" moretrees.spawn_willow_object = "moretrees:willow_sapling_ongen" moretrees.spawn_acacia_object = "moretrees:acacia_sapling_ongen" @@ -101,7 +101,7 @@ else moretrees.spawn_oak_object = moretrees.oak_model moretrees.spawn_sequoia_object = moretrees.sequoia_model moretrees.spawn_palm_object = moretrees.palm_model - moretrees.spawn_pine_object = moretrees.pine_model + moretrees.spawn_cedar_object = moretrees.cedar_model moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model moretrees.spawn_willow_object = moretrees.willow_model moretrees.spawn_acacia_object = moretrees.acacia_model @@ -132,8 +132,8 @@ if moretrees.enable_palm then biome_lib:register_generate_plant(moretrees.palm_biome, moretrees.spawn_palm_object) end -if moretrees.enable_pine then - biome_lib:register_generate_plant(moretrees.pine_biome, moretrees.spawn_pine_object) +if moretrees.enable_cedar then + biome_lib:register_generate_plant(moretrees.cedar_biome, moretrees.spawn_cedar_object) end if moretrees.enable_rubber_tree then diff --git a/mods/moretrees/node_defs.lua b/mods/moretrees/node_defs.lua index 64856116..3b5eafb8 100755 --- a/mods/moretrees/node_defs.lua +++ b/mods/moretrees/node_defs.lua @@ -10,12 +10,12 @@ moretrees.treelist = { {"birch", "Birch Tree"}, {"palm", "Palm Tree", "coconut", "Coconut", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 }, {"spruce", "Spruce Tree", "spruce_cone", "Spruce Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, + {"cedar", "Cedar Tree", "cedar_cone", "Cedar Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, {"willow", "Willow Tree"}, {"rubber_tree", "Rubber Tree"}, {"fir", "Douglas Fir", "fir_cone", "Fir Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, {"jungletree", "Jungle Tree", nil, nil, nil, nil, "default_junglesapling.png" }, - {"pine", "Pine Tree", "pine_cone", "Pine Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8, "default_pine_sapling.png" }, {"acacia", "Acacia Tree", nil, nil, nil, nil, "default_acacia_sapling.png" }, } @@ -424,10 +424,12 @@ minetest.register_alias("moretrees:acacia_planks", "default:acacia_wood") minetest.register_alias("moretrees:acacia_sapling", "default:acacia_sapling") minetest.register_alias("moretrees:acacia_leaves", "default:acacia_leaves") -minetest.register_alias("moretrees:pine_trunk", "default:pine_tree") -minetest.register_alias("moretrees:pine_planks", "default:pine_wood") -minetest.register_alias("moretrees:pine_sapling", "default:pine_sapling") -minetest.register_alias("moretrees:pine_leaves", "default:pine_needles") +minetest.register_alias("moretrees:pine_trunk", "moretrees:cedar_trunk") +minetest.register_alias("moretrees:pine_planks", "moretrees:cedar_planks") +minetest.register_alias("moretrees:pine_sapling", "moretrees:cedar_sapling") +minetest.register_alias("moretrees:pine_leaves", "moretrees:cedar_leaves") +minetest.register_alias("moretrees:pine_cone", "moretrees:cedar_cone") +minetest.register_alias("moretrees:pine_nuts", "moretrees:cedar_nuts") -- Overriding moretrees' palm leaves: minetest.override_item("moretrees:palm_leaves",{walkable = false}) diff --git a/mods/moretrees/textures/moretrees_cedar_cone.png b/mods/moretrees/textures/moretrees_cedar_cone.png new file mode 100644 index 0000000000000000000000000000000000000000..5e1fae9fd03500670bb2886d81e3239b60b3698c GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbK}NPtg>YiF5tXPKX$wR&fg-`phi z8ym}RY)pC$LSm!|hbIbfTc3R({)Z6!v;JqftJyY zGhHI?{GX@ib4ea3= zPlnWjCv)}-JX&!eHvGNiSskvm=32(tygsT6d@C|IzK6^g)(Km3=MDS%IsK1onKtkJ dnttF8`>8MDXUanb*@3QL@O1TaS?83{1ON~hhr9p) literal 0 HcmV?d00001 diff --git a/mods/moretrees/textures/moretrees_cedar_leaves.png b/mods/moretrees/textures/moretrees_cedar_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..e6de4829367c815615988c4d36808a134cc20e1a GIT binary patch literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?bRmu<)G~<-;=Hb<31ByL% zxgiRqSWANZg8u^n!|!c;!9alwPZ!4!j_a%k8wFb&IG7Lo@nB72mf~_~W7<>j_xhLJ z8J@;cFABCVXuQ7Ii&ty5-1@{5vCCV2&v{jlB%i3a`@rwjeNq}P+uaxKjJ9fh5tEyf xl4&yggKPH>PQj?HDHWSfK4_NRy!hTvX0d9~KfK|(5$I6C_~@0WY? zfBz#Mo&$pCJ7f*NtabQO8OI#HGMame>G@rcGotOqcD!1@zi|D``>gZJVjh@Xwd<9* r{xj!oVn%Lv=Am6v7`)UnX3o^FpAaSxRhIEp2V||MtDnm{r-UW|k=sKV literal 0 HcmV?d00001 diff --git a/mods/moretrees/textures/moretrees_cedar_trunk.png b/mods/moretrees/textures/moretrees_cedar_trunk.png new file mode 100644 index 0000000000000000000000000000000000000000..ea685e3a91100ba3cdb73d4b4983e701fb216d93 GIT binary patch literal 1074 zcmV-21kL-2P)BZ^jdNbOoQR@^Z=;26Ur9D_ zRX&%1Y;#*iY*apBNi)o?m3dxEe_%z4YgF34sE>PUmVj@Na#?X!Ky_F?Yg9swZ&hVW zH;#5;dtgVNf^VjXa+7#sc3nwvSVLt^IelPEVM#fEU`BUgOjSNBaa2BSSVvYtF=IzG zYEnC1LNIbzLwQ?6k8f3LPdai|LTyq$oPB7vmVb0tL#~Q&;J>KHs+GW>hk0I1nS5n% zRzq%4J8@M)d0a(vSVMebO?6sErh#Z>Nj7y+JEDYba#%raP&|ZYPlabub5=l-b6kLE zREK9xjBZw)d}N}0UU*+ib67-tUP_U1ScYg%Yfm|fZCGteGmvjsQ8y@TR6&MmRANdv zc344lTuM$pFjYb_fM`|Fsf~qYOKed;n|WY!Qa*@iQk#2Yd{a4CLo%d-XKqY3k#%B^ zaa?InJ%nUQgJDR5V@!u_T90;Mg=kTGVohvJH*Zxxa#KLGl6!?{RA)^(k8oOKO*KO@ zBym+grG#u)LNk|iT6|kWqJU>~RzXEFBSteNk8xV2eqp4Da&S*MlyFvAK`c@`Dsxjk zUPCdCa$R{|NqSsFRzNI)Uq_jFVofbv zSZ7W;T0=0Mby$X6KzLh3hiOw_L@B=&g#7RTb*B~?0reE2gsgtN+zd0RMCXA-8&W_+-`Vs zsMYl|q13=IHU_lp$zn{}p^S&s$EV0395o3k#IT;1(@FyZoFOI7Z+^=6h5uy;{sPG} sn`ypqA(*)bO$5R<%W4A@nU)8L|B>{4p{EVKi~s-t07*qoM6N<$f?E)^UjP6A literal 0 HcmV?d00001 diff --git a/mods/moretrees/textures/moretrees_cedar_trunk_top.png b/mods/moretrees/textures/moretrees_cedar_trunk_top.png new file mode 100644 index 0000000000000000000000000000000000000000..01aed1d7dd0b0d627abcbdaf441f1b434b83ed7f GIT binary patch literal 451 zcmV;!0X+VRP)+E%UER@SGpohz;?fD)hKr?354m zv{l=Q4n;F5@R$|yt3mRrJ@c|qLoz7}1qF%#0075HL_t&-8AZWGb^}2S1we(F8O$Dr zW|IE>&y|;zt7wOWgS4mlZnLcG%d7Rx?rR1Ty)1K(QbdV3#{i`+C~tL)*|Kvz2rJj9 z5F|{~#Nio)KE&e1a^b0j2M~H`y%Fam3rh#WN_iF8u#IBn351SsZT6=1CTMvC;l21` zvL1DmENc)xr72Z5?Q51s?m_rak$D`oWiC>K5(?{!%EVY@ao>q%T-%(p_hTs%e?bGb t=cgxhbi6oQylu9Leugy6_?G~r{U7tZFU5qk?Y{s3002ovPDHLkV1nQ6y%7Ka literal 0 HcmV?d00001 diff --git a/mods/moretrees/textures/moretrees_cedar_wood.png b/mods/moretrees/textures/moretrees_cedar_wood.png new file mode 100644 index 0000000000000000000000000000000000000000..8680bd5ba2ccd575391ac8812c20f6cfc066d3bf GIT binary patch literal 648 zcmV;30(bq1P)9Zv}Kl0+U(<^v{;i zf(O=x2zp5ZSu_Ffz;w=l2j`n6;*AM{PXpeH2%lmEky!*gAp!2aY@=iZ?X+4~GXdI% z2*-N|onZv41g>7q2{mmluDYV591 z-H8a`j0sFE0ZJ#a*t zF9GC|6zQQeZwBIl^N}}UQ{swRx$zYwOsPWf97_g9pfT>aWaN<&>#IjGpYwbG008(&L_t&-(+$FdcEnH=0Ki+@w%x96W)XF>vGMf( zU(lWzcr5*f|Gt`)VzIeiSp)JAsn)aY_GgE?8-$hNNtTC1NjezC)jbvrAz^x4VBbHS z;@{0PbOLWTX3jIaf;X=lrm;VUqnb{SDHR7)(gwG528_6)z_F}p6#E$Q4ARp;b<=L` z{S&n%_7XrQ3`;BZ&66-}-M7w9uV8_T7KbT6O0J!L4@Fr3$4>dSeIQ@Daexp5JF7`L z38tg!M4NQT7Uc4tF!sjti+tA*Ji~+nw;b_pOwJNE!Xibmw5qDf?4#VU9DdtTV!#@G i^?R5!^aQh5-1!5su1FJ=;Ez`T0000YiF5tXPKX$wR&fg-`phi z8ym}RY)pC$LSm!|hbIbfTc3R(bP0l+XkKf3b@j diff --git a/mods/moretrees/tree_biomes.txt b/mods/moretrees/tree_biomes.txt index 3e4533c6..fdba90db 100755 --- a/mods/moretrees/tree_biomes.txt +++ b/mods/moretrees/tree_biomes.txt @@ -11,7 +11,7 @@ oak 0 to +10 + 4 to +16 n/a n/a dirt_with grass 332 15 sequoia 0 to +10 -30 to +50 n/a n/a dirt_with grass 333 10 birch +10 to +15 -20 to +10 n/a n/a dirt_with grass 334 5 spruce above +20 -20 to +10 n/a n/a dirt_with grass 335 10 -pine n/a n/a water, 15 5 dirt_with grass 336 10 +cedar n/a n/a water, 15 5 dirt_with grass 336 10 willow - 5 to + 5 n/a water, 15 5 dirt_with grass 337 20 acacia n/a n/a n/a n/a dirt_with_grass, desert_sand n/a 15 @@ -32,3 +32,6 @@ where the humidity is low (but not bone dry). Fir trees appear in a snow biome only with older versions of SPlizard's Snow Biomes mod. In more recent versions, these trees will not grow, due to an engine bug. + +Cedar trees replace, and are identical to, the original pine trees, as the minetest default game now has (a completely +different type of) pine trees. diff --git a/mods/moretrees/tree_models.lua b/mods/moretrees/tree_models.lua index 34430573..c5340891 100755 --- a/mods/moretrees/tree_models.lua +++ b/mods/moretrees/tree_models.lua @@ -138,20 +138,20 @@ moretrees.spruce_model2={ fruit_chance=8 } -moretrees.pine_model={ +moretrees.cedar_model={ axiom="FFFFFcccdddB///cFdFB////cFdFB///cFdFB///cFdFA///cFdFA///cFdFB[FF]f", rules_a="[&&&TTTT[++^TFdd][--&TFd]//Tdd[+^Fd][--&Fdd]]", rules_b="[&&&TTT[++^Fdd][--&Fdd]//dd[+^d][--&Fd]]", rules_c="/", rules_d="F", - trunk="default:pine_tree", - leaves="default:pine_needles", + trunk="moretrees:cedar_trunk", + leaves="moretrees:cedar_leaves", angle=30, iterations=2, random_level=0, trunk_type="single", thin_branches=true, - fruit="moretrees:pine_cone", + fruit="moretrees:cedar_cone", fruit_chance=8 }