From ff0df538291a50d681b58592cfc3d37ee0fda8a3 Mon Sep 17 00:00:00 2001 From: Vanessa Ezekowitz Date: Sun, 24 Aug 2014 03:14:08 -0400 Subject: [PATCH] add acacia trees grows in the desert near the edges of the biome --- biome_defs.lua | 13 ++++++++ default_settings.txt | 5 +-- init.lua | 6 ++++ node_defs.lua | 19 +++++------ textures/moretrees_acacia_leaves.png | Bin 0 -> 340 bytes textures/moretrees_acacia_sapling.png | Bin 0 -> 359 bytes textures/moretrees_acacia_trunk.png | Bin 0 -> 682 bytes textures/moretrees_acacia_trunk_top.png | Bin 0 -> 731 bytes textures/moretrees_acacia_wood.png | Bin 0 -> 364 bytes tree_models.lua | 41 +++++++++++++++++++++--- 10 files changed, 68 insertions(+), 16 deletions(-) create mode 100644 textures/moretrees_acacia_leaves.png create mode 100644 textures/moretrees_acacia_sapling.png create mode 100644 textures/moretrees_acacia_trunk.png create mode 100644 textures/moretrees_acacia_trunk_top.png create mode 100644 textures/moretrees_acacia_wood.png diff --git a/biome_defs.lua b/biome_defs.lua index 323433c..8c50de7 100644 --- a/biome_defs.lua +++ b/biome_defs.lua @@ -90,6 +90,18 @@ moretrees.willow_biome = { max_count = 5, } +moretrees.acacia_biome = { + surface = { "default:dirt_with_grass", "default:desert_sand" }, + avoid_nodes = moretrees.avoidnodes, + avoid_radius = 15, + seed_diff = 1, + rarity = 50, + max_count = 15, + plantlife_limit = -1, + humidity_min = 0.3, + humidity_max = 0, +} + moretrees.rubber_tree_biome = { surface = "default:dirt_with_grass", avoid_nodes = moretrees.avoidnodes, @@ -168,3 +180,4 @@ moretrees.fir_biome_snow = { delete_above = true, spawn_replace_node = true } + diff --git a/default_settings.txt b/default_settings.txt index 2c08374..a7887c5 100644 --- a/default_settings.txt +++ b/default_settings.txt @@ -7,11 +7,12 @@ moretrees.enable_oak = true moretrees.enable_sequoia = true moretrees.enable_palm = true moretrees.enable_pine = true -moretrees.enable_rubber_tree = true +moretrees.enable_rubber_tree = true moretrees.enable_willow = true +moretrees.enable_acacia = true moretrees.enable_birch = true moretrees.enable_spruce = true -moretrees.enable_jungle_tree = true +moretrees.enable_jungle_tree = true moretrees.enable_fir = true moretrees.enable_beech = false diff --git a/init.lua b/init.lua index b9aa270..786b9e9 100644 --- a/init.lua +++ b/init.lua @@ -92,6 +92,7 @@ if moretrees.spawn_saplings then moretrees.spawn_pine_object = "moretrees:pine_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" moretrees.spawn_birch_object = "moretrees:birch_sapling_ongen" moretrees.spawn_spruce_object = "moretrees:spruce_sapling_ongen" moretrees.spawn_jungletree_object = "moretrees:jungletree_sapling_ongen" @@ -106,6 +107,7 @@ else moretrees.spawn_pine_object = moretrees.pine_model moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model moretrees.spawn_willow_object = moretrees.willow_model + moretrees.spawn_acacia_object = moretrees.acacia_model moretrees.spawn_birch_object = "moretrees:grow_birch" moretrees.spawn_spruce_object = "moretrees:grow_spruce" moretrees.spawn_jungletree_object = "moretrees:grow_jungletree" @@ -146,6 +148,10 @@ if moretrees.enable_willow then plantslib:register_generate_plant(moretrees.willow_biome, moretrees.spawn_willow_object) end +if moretrees.enable_acacia then + plantslib:register_generate_plant(moretrees.acacia_biome, moretrees.spawn_acacia_object) +end + if moretrees.enable_birch then plantslib:register_generate_plant(moretrees.birch_biome, moretrees.spawn_birch_object) end diff --git a/node_defs.lua b/node_defs.lua index 890e929..c487189 100644 --- a/node_defs.lua +++ b/node_defs.lua @@ -10,18 +10,19 @@ end moretrees.avoidnodes = {} moretrees.treelist = { - {"beech", "Beech Tree"}, + {"beech", "Beech Tree"}, {"apple_tree", "Apple Tree"}, - {"oak", "Oak Tree", "acorn", "Acorn", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, - {"sequoia", "Giant Sequoia"}, - {"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 }, - {"pine", "Pine Tree", "pine_cone", "Pine Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, - {"willow", "Willow Tree"}, + {"oak", "Oak Tree", "acorn", "Acorn", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, + {"sequoia", "Giant Sequoia"}, + {"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 }, + {"pine", "Pine Tree", "pine_cone", "Pine Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, + {"willow", "Willow Tree"}, + {"acacia", "Acacia Tree"}, {"rubber_tree", "Rubber Tree"}, {"jungletree", "Jungle Tree"}, - {"fir", "Douglas Fir", "fir_cone", "Fir Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, + {"fir", "Douglas Fir", "fir_cone", "Fir Cone", {-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 }, } local dirs1 = { 21, 20, 23, 22, 21 } diff --git a/textures/moretrees_acacia_leaves.png b/textures/moretrees_acacia_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..08cf3998c0c8d47ae63ddcf51878b725faec497e GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPggK7CvSv7MGoE(}6-)JY5_^EKaYT zq$|{HAkZp5w`r}@W3A+()`T67MU&?&INtG?!?b|aN0qPlkkCfaxvjEY%GsaHZ~p!E z_O#UcjJZW$-cFEQzH*K7Gd=e}*AKQX63bWSx1V8iWhgj&bO&R@nG@-ecP)I6_ZLr3 zmJAkH6TB}~XH`e)9ZiOYlNGjEMROm_2y}Zas;e9j^6`Cdsh2V9%#VM6<+!Zj&n|JB z*ml6e*Gxm}b;YgaA^SgeEzw^mY*JUQ@ICYJ`Yzrsl~&#^x%0J7o*eJ?B(l$A{eC`g e>b@O5A6QpKmzL{@-S7eWkHOQ`&t;ucLK6V4LxIx( literal 0 HcmV?d00001 diff --git a/textures/moretrees_acacia_sapling.png b/textures/moretrees_acacia_sapling.png new file mode 100644 index 0000000000000000000000000000000000000000..07170a03d4c81eeb0916263ec90d2d4b72326908 GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPq8#l9sI!}?%bfC}|PZ!4!i_^&o3#CHpIZX;h`|j0S*NUspZZe7`b&YyDy=YI~pCvE66Yh%O2Hyj^}xBl)wo9a@{D8{VP z%6Nu*;^(jbo~Nozn8tTO^k7Vbzp?TiU4Eb;)_C#QaYseSe5kLJ6g7?zz$d&nHSBmn4t22WQ%mvv4FO#s8{k+1*& literal 0 HcmV?d00001 diff --git a/textures/moretrees_acacia_trunk.png b/textures/moretrees_acacia_trunk.png new file mode 100644 index 0000000000000000000000000000000000000000..169823d41612d29e16c7faa44baae5d51b842de3 GIT binary patch literal 682 zcmV;b0#*HqP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^n? z2^1XGbQyO500JsWL_t(I%Po^jj@(ELL?4+SWvZ%e_(Zdt?cDzk#sEfFNy;DTg=$9- zAQ=&ikpKSu$2CN1t!RjplF2EvY?1QD|G$6p^Vd&auY*zwL50`rK*V{!->3mGXL_HQ zP0Wlj2aXeia=c&Ul!-ACLI6?bnurQ4LscL~MWcc!tu@A6m>K4VnbCV^uZ6W1$9Vv- z<^lmll$au_O3;A2v({qGg*l{{Xst2lWQ~ED0elXC3eFspQVPo!b4+54_t5Cn=NHHO zAcVlxE*vL?z!(bvb$7;GhzM&f93iJjyG}+Q)V+czSL@8y*-PQ-9b5BWfG9}=DF&|N zz};_ds+{LZ*)oDtw#?$DH+n-wQ9#8VjY_*3W)ruChR9YQxH~R#i)K#B+oxVETNvDL zOet|37h9?H-ocF&!>4~RTPNqtUJI=c9?vh_*9QTPi*vkQl)9q|=FrZ@^ZDdF-;6l` zh$%Dsq}EEz$vWl2W)uRNy>L%D(gc z{mt|1$#GnS7{FoMD*)GZ0pRXj=RvI%$I)fZ`F^uMc6#fyF;L+)&RlG@^7!$^abBd9 zsC#A1MQPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i^n? z2_zerR=Otu00LV{L_t(I%YBo}iW5N;hQF$=PSWl4WG)@eOmsjL2Nm3lYu`iNxYC_2 zUAS_od%*{BA-EPC5EK;^FE~otOkyW}tLiEjne>b!cs6zTDGulS7jgUMHOHY!h6w<1 zFK+rpEwH#3H<$vrfBk9$m@Gww5hhFLACB~g>)w;6^8o;_Zarjh`2>2VsejK99Ur;e z!B&=*uL!KeEO$_+HhKH(4Hxg;AQ>hH1GcX8nGQ2X-^U#51_)hIeH^2F&|#aI-@;2u zg1W=G3u~AxCGN$jWSC&Gl-lzdeHs&QA4jb%gO#vlP^&A5c7P`Z*1`1UYrK9)H;m>R z#JzZaTTxLffi;Hln=h=KJ&FD~L1!h(DokAwZfzojXt)9nHgMW8nK{~{jJy&=!Y8=2 zjSzz3*9iT2f|*SbN`SPeFe2{7$OQ*_lG0ljbT_+%fXORZ+vH4p-NWvDAVPAq0g1V+^_0*xXW%9OFW==X}ohBu;Cx zso|KJo2v1F3L~sB7;CAslC41pTT7OfBtc!X=^RRVqCQFf%f{nNk4?>^g3!i{96STMm$O!Ra#M1mO%vl4g{Vf#L``DbLvc& zR(~1i94~f8P4F5kKX`oSpCC1f+s78~U_Vq1iT9p7{cn^H$M|TR{{S1^LDaALQ)vJI N002ovPDHLkV1hvjGz9