From 7059756929c07f08ceef17dbc5851fe480142eae Mon Sep 17 00:00:00 2001
From: Vanessa Ezekowitz <vanessaezekowitz@gmail.com>
Date: Sun, 1 Mar 2015 12:25:54 -0500
Subject: [PATCH] update vines from upstream

---
 vines/functions.lua |  4 ++--
 vines/vines.lua     | 35 ++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/vines/functions.lua b/vines/functions.lua
index 5ffb3c9..f7db03d 100644
--- a/vines/functions.lua
+++ b/vines/functions.lua
@@ -1,6 +1,5 @@
 vines.register_vine = function( name, defs, biome )
-  --different properties for bottom and side vines.
-  local selection_box
+  local biome = biome
   local groups = { vines=1, snappy=3, flammable=2 }
 
   local vine_name_end = 'vines:'..name..'_end'
@@ -19,6 +18,7 @@ vines.register_vine = function( name, defs, biome )
   local selection_box = { type = "wallmounted", }
   local drawtype = 'signlike'
   if ( not biome.spawn_on_side ) then
+    --different properties for bottom and side vines.
     selection_box = { type = "fixed", fixed = { -0.4, -1/2, -0.4, 0.4, 1/2, 0.4 }, }
     drawtype = 'plantlike'
   end
diff --git a/vines/vines.lua b/vines/vines.lua
index cb16b6d..2ac5904 100644
--- a/vines/vines.lua
+++ b/vines/vines.lua
@@ -27,10 +27,10 @@ vines.register_vine( 'vine', {
   spawn_chance = 100,
   spawn_surfaces = {
     "default:leaves",
-    "default:jungleleave",
-    "moretrees:jungetree_leaves_red",
-    "moretrees:jungetree_leaves_yellow",
-    "moretrees:jungetree_leaves_green"
+    "default:jungleleaves",
+    "moretrees:jungletree_leaves_red",
+    "moretrees:jungletree_leaves_yellow",
+    "moretrees:jungletree_leaves_green"
   },
   spawn_on_bottom = true,
   plantlife_limit = -0.9,
@@ -39,10 +39,10 @@ vines.register_vine( 'vine', {
 
 vines.register_vine( 'side', {
   description = "Vines",
-  average_length = 3,
+  average_length = 6,
 },{
   choose_random_wall = true,
-  avoid_nodes = {"group:vines"},
+  avoid_nodes = {"group:vines", "default:apple"},
   choose_random_wall = true,
   avoid_radius = 3,
   spawn_delay = 500,
@@ -50,21 +50,30 @@ vines.register_vine( 'side', {
   spawn_surfaces = {
     "default:leaves",
     "default:jungleleaves",
-    "moretrees:jungletree_leaves_red",
-    "moretrees:jungletree_leaves_yellow",
-    "moretrees:jungletree_leaves_green"
+    "moretrees:jungetree_leaves_red",
+    "moretrees:jungetree_leaves_yellow",
+    "moretrees:jungetree_leaves_green"
   },
   spawn_on_side = true,
   plantlife_limit = -0.9,
   humidity_min = 0.4,
 })
 
-vines.register_vine( 'jungle', {
+vines.register_vine( "jungle", {
   description = "Jungle Vines",
   average_length = 7,
 },{
   choose_random_wall = true,
-  avoid_nodes = {"group:vines"},
+  neighbors = {
+    "default:jungleleaves",
+    "moretrees:jungetree_leaves_red",
+    "moretrees:jungetree_leaves_yellow",
+    "moretrees:jungetree_leaves_green"
+  },
+  avoid_nodes = {
+    "vines:jungle_middle",
+    "vines:jungle_end",
+  },
   avoid_radius = 5,
   spawn_delay = 500,
   spawn_chance = 100,
@@ -73,7 +82,7 @@ vines.register_vine( 'jungle', {
     "moretrees:jungletree_trunk"
   },
   spawn_on_side = true,
-  plantlife_limit = -0.4,
+  plantlife_limit = -0.9,
   humidity_min = 0.2,
 })
 
@@ -86,8 +95,8 @@ vines.register_vine( 'willow', {
   avoid_radius = 5,
   near_nodes = { 'default:water_source' },
   near_nodes_size = 1,
-  near_nodes_vertical = 7,
   near_nodes_count = 1,
+  near_nodes_vertical = 7,
   plantlife_limit = -0.8,
   spawn_chance = 10,
   spawn_delay = 500,