From 67a77c7c05f433e0563e5adf507301d7ab4bbc31 Mon Sep 17 00:00:00 2001
From: Dan Berglund <dbergl@outlook.com>
Date: Fri, 10 Jun 2016 14:03:30 -0700
Subject: [PATCH] Revert temp & humidity changes and add missing biomes

---
 overviewer_core/src/primitives/biomes.h | 37 +++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/overviewer_core/src/primitives/biomes.h b/overviewer_core/src/primitives/biomes.h
index 1fcc28a..e01aaf9 100644
--- a/overviewer_core/src/primitives/biomes.h
+++ b/overviewer_core/src/primitives/biomes.h
@@ -50,7 +50,7 @@ static Biome biome_table[] = {
     {"Swampland", 0.8, 0.9, 205, 128, 255},
     {"River", 0.5, 0.5, 255, 255, 255},
     {"Hell", 2.0, 0.0, 255, 255, 255},
-    {"Sky", 0.5, 0.5, 255, 255, 255},
+    {"The End", 0.5, 0.5, 255, 255, 255},
     /* 10 */
     {"FrozenOcean", 0.0, 0.5, 255, 255, 255},
     {"FrozenRiver", 0.0, 0.5, 255, 255, 255},
@@ -65,28 +65,29 @@ static Biome biome_table[] = {
     {"TaigaHills", 0.05, 0.8, 255, 255, 255},
     /* 20 */
     {"Extreme Hills Edge", 0.2, 0.3, 255, 255, 255},
-    {"Jungle", .95, 0.90, 255, 255, 255}, /* <-- GUESS, but a good one */
-    {"Jungle Hills", 0.95, 0.90, 255, 255, 255}, /* <-- also a guess */
-    {"JungleEdge", 0.95, 0.80, 255, 255, 255},
-    {"Deep Ocean", 0.5, 0.5, 255, 255, 255},
+     /* Values below are guesses */
+    {"Jungle", 2.0, 0.45, 255, 255, 255},
+    {"JungleHills", 2.0, 0.45, 255, 255, 255},
+    {"JungleEdge", 2.0, 0.45, 255, 255, 255},
+    {"Deep Ocean", 0.0, 1, 255, 255, 255},
     /* 25 */
-    {"Stone Beach", 0.2, 0.31, 255, 255, 255},
-    {"Cold Beach", 0.05, 0.31, 255, 255, 255},
-    {"Birch Forest", 0.6, 0.6, 255, 255, 255},
-    {"Birch Forest Hills", 0.6, 0.6, 255, 255, 255},
-    {"Roofed Forest", 0.7, 0.8, 255, 255, 255},
+    {"Stone Beach", 0.2, 1, 255, 255, 255},
+    {"Cold Beach", 0.2, 1, 255, 255, 255},
+    {"Birch Forest", 0.7, 0.8, 255, 255, 255},
+    {"Birch Forest Hills", 0.7, 0.8, 255, 255, 255},
+    {"Roofed Forest", 2.0, 0.45, 255, 255, 255},
     /* 30 */
     {"Cold Taiga", 0.05, 0.8, 255, 255, 255},
     {"Cold Taiga Hills", 0.05, 0.8, 255, 255, 255},
-    {"Mega Taiga", 0.3, 0.8, 255, 255, 255},
-    {"Mega Taiga Hills", 0.3, 0.8, 255, 255, 255},
+    {"Mega Taiga", 0.05, 0.8, 255, 255, 255},
+    {"Mega Taiga Hills", 0.05, 0.8, 255, 255, 255},
     {"Extreme Hills+", 0.2, 0.3, 255, 255, 255},
     /* 35 */
-    {"Savanna", 2.0, 0.0, 255, 255, 255},
-    {"Savanna Plateau", 2.0, 0.0, 255, 255, 255},
-    {"Mesa", 0.0, 0.0, 255, 255, 255},
-    {"Mesa Plateau F", 0.0, 0.0, 255, 255, 255},
-    {"Mesa Plateau", 0.0, 0.0, 255, 255, 255},
+    {"Savanna", 1.0, 0.1, 255, 255, 255},
+    {"Savanna Plateau", 1.0, 0.1, 255, 255, 255},
+    {"Mesa", 1.8, 0.0, 255, 255, 255},
+    {"Mesa Plateau F", 1.8, 0.0, 255, 255, 255},
+    {"Mesa Plateau", 1.8, 0.0, 255, 255, 255}
     /* 40 */
     {"", 0.0, 0.0, 255, 255, 255},
     {"", 0.0, 0.0, 255, 255, 255},
@@ -193,7 +194,7 @@ static Biome biome_table[] = {
     {"", 0.0, 0.0, 255, 255, 255},
     {"", 0.0, 0.0, 255, 255, 255},
     {"", 0.0, 0.0, 255, 255, 255},
-    {"", 0.0, 0.0, 255, 255, 255},
+    {"Plains M", 0.8, 0.4, 255, 255, 255},
     {"Sunflower Plains", 0.8, 0.4, 255, 255, 255},
     /* 130 */
     {"Desert M", 2.0, 0.0, 255, 255, 255},