From 1553776ae156b94ff7b9568296a8a781d1e7f105 Mon Sep 17 00:00:00 2001
From: poikilos <7557867+poikilos@users.noreply.github.com>
Date: Tue, 9 Apr 2019 17:07:15 -0400
Subject: [PATCH] enable future deer, add settings for new mobs

---
 .gitignore                                                  | 2 +-
 overrides/worlds/CenterOfTheSun/world.conf                  | 6 ++++++
 .../Bucket_Game/mods/codermobs/codermobs/elk.lua            | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d6d084..f29b2d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 *.pyc
 *.kate-swp
 *.blend1
-/nohup.out
+nohup.out
 /webapp/linux-minetest-kit.zip
 /webapp/linux-minetest-kit
 /webapp/linux-minetest-kit-poikilos-patch
diff --git a/overrides/worlds/CenterOfTheSun/world.conf b/overrides/worlds/CenterOfTheSun/world.conf
index f1ac85e..79eb4c1 100644
--- a/overrides/worlds/CenterOfTheSun/world.conf
+++ b/overrides/worlds/CenterOfTheSun/world.conf
@@ -135,6 +135,7 @@ codermobs_enable_cow            = true
 codermobs_enable_dog            = true
 
 codermobs_enable_elephant       = true
+codermobs_enable_elk            = true
 codermobs_enable_farhorse       = true
 codermobs_enable_goat           = true
 codermobs_enable_hedgehog       = true
@@ -144,6 +145,7 @@ codermobs_enable_kitten         = true
 codermobs_enable_mammoth        = true
 codermobs_enable_owl            = true
 
+codermobs_enable_ostrich        = true
 codermobs_enable_panda          = true
 codermobs_enable_penguin        = true
 codermobs_enable_rat            = true
@@ -155,6 +157,7 @@ codermobs_enable_snake_ice      = false
 codermobs_enable_whinny         = false
 
 codermobs_enable_wolf           = true
+codermobs_enable_warthog        = true
 codermobs_enable_zebra          = true
 
 # Note:  The "farhorse" and the "whinny" are  two different categories
@@ -172,13 +175,16 @@ codermobs_enable_ghost          = true
 codermobs_enable_lava_flan      = true
 
 codermobs_enable_lott_spider    = true
+codermobs_enable_mdskeleton     = false
 codermobs_enable_oerkki         = true
+codermobs_enable_sacreeper      = false
 codermobs_enable_santa          = false
 codermobs_enable_snowman        = false
 
 codermobs_enable_tree_monster   = true
 codermobs_enable_polar_bear     = true
 codermobs_enable_silverfish     = true
+codermobs_enable_vombie         = true
 
 #---------------------------------------------------------------------
 
diff --git a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua
index 6fec0d7..b9ce8c4 100644
--- a/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua
+++ b/patches/deprecated/merged-upstream/Bucket_Game/mods/codermobs/codermobs/elk.lua
@@ -30,7 +30,7 @@ mobs_param = {
     max_light    =   20         ,
     min_height   =    0         ,
     max_height   =  200         ,
-    spawn_chance = 8000         ,
+    spawn_chance = 50000         ,
     spawn_type   = "animal"     ,
 
     spawn_nodes  = {
@@ -43,7 +43,6 @@ mobs_param = {
 
     spawn_by = {
         "default:pine_tree"             ,
-        "flowers:mushroom_brown"        ,
     } ,
 
     add_egg   = true                    ,