From 1479757f3dd45ec81f5ce978ad1054f00b28886c Mon Sep 17 00:00:00 2001
From: sayterdarkwynd <sayterdarkwynd@gmail.com>
Date: Mon, 1 Jul 2019 18:03:36 -0400
Subject: [PATCH] diet fixes

---
 .metadata                                           |  2 +-
 interface/scripted/statWindow/statWindow.config     |  2 +-
 scripts/fr_diets.config                             | 13 +++++--------
 .../food/food_complex/plant_dessert.statuseffect    | 12 ++++++++++++
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 stats/effects/food/food_complex/plant_dessert.statuseffect

diff --git a/.metadata b/.metadata
index a17ba9af..f23d4c6d 100644
--- a/.metadata
+++ b/.metadata
@@ -9,5 +9,5 @@
   "requires" : [],
   "steamContentId" : "763259329",
   "tags" : "Species|Mechanics",
-  "version" : "5.2.48"
+  "version" : "5.2.49"
 }
\ No newline at end of file
diff --git a/interface/scripted/statWindow/statWindow.config b/interface/scripted/statWindow/statWindow.config
index 67ed2863..4765ce2a 100644
--- a/interface/scripted/statWindow/statWindow.config
+++ b/interface/scripted/statWindow/statWindow.config
@@ -198,7 +198,7 @@
 	},
 
 
-	"races":	[ "apex", "avian", "floran", "glitch", "human", "hylotl", "mauskin", "novakid", "shadow", "elduukhar", "argonian", "avali", "slimeperson", "deerfolk", "lastree", "avikan", "bunnykin", "callistan", "calskies","droden", "elunite", "familiar", "felin", "fenerox", "gardevan", "aegi", "greckan", "gyrusen", "calskie", "kazdra", "kemono", "kineptic", "lamia", "mantizi","fumantizi", "mlp", "munari", "neko", "nightar", "ningen", "orcana", "fupeglaci","peglaci", "phox", "ponex", "sergal", "skelekin", "trink", "vespoid", "viera", "moogle", "vulpes", "wasphive", "arachne", "Indix", "skath", "pygs", "kitsune", "indix", "thelusian", "fukirhos", "kirhos", "radien", "woggle", "dragon", "tauren", "lucario", "inkling", "eevee", "elysian", "fennix", "lombax_striped", "lombax_pointed", "saturn", "saturn2", "blattra", "sarasinor", "webber", "candavaswebber", "Zoroark","everis","changenykt", "demon", "shade", "veluu", "cat", "deerkin", "terrakin","merrkin", "spiritguardian", "fragmentedruin" ],
+	"races":	[ "apex", "avian", "floran", "glitch", "human", "hylotl", "mauskin", "novakid", "shadow", "elduukhar", "argonian", "avali", "fuslimeperson", "slimeperson", "deerfolk", "lastree", "avikan", "bunnykin", "callistan", "calskies","droden", "elunite", "familiar", "felin", "fenerox", "gardevan", "aegi", "greckan", "gyrusen", "calskie", "kazdra", "kemono", "kineptic", "lamia", "mantizi","fumantizi", "mlp", "munari", "neko", "nightar", "ningen", "orcana", "fupeglaci","peglaci", "phox", "ponex", "sergal", "skelekin", "trink", "vespoid", "viera", "moogle", "vulpes", "wasphive", "arachne", "Indix", "skath", "pygs", "kitsune", "indix", "thelusian", "fukirhos", "kirhos", "radien", "woggle", "dragon", "tauren", "lucario", "inkling", "eevee", "elysian", "fennix", "lombax_striped", "lombax_pointed", "saturn", "saturn2", "blattra", "sarasinor", "webber", "candavaswebber", "Zoroark","everis","changenykt", "demon", "shade", "veluu", "cat", "deerkin", "terrakin","merrkin", "spiritguardian", "fragmentedruin", "juux", "fupeglaci" ],
 
 	"elements":	[ "physical", "fire", "poison", "ice", "electric", "radioactive", "cosmic", "shadow" ],
 	"statuses" : {
diff --git a/scripts/fr_diets.config b/scripts/fr_diets.config
index b4ec6d8a..71b6ab7e 100644
--- a/scripts/fr_diets.config
+++ b/scripts/fr_diets.config
@@ -81,16 +81,13 @@
 	// The diets given below are samples; you can use them in your race files by name, but you may wish to build your own instead.
 	"diets" : {
 		// Carnivores are fine with eating cooked meat - but you won't get a diet bonus that way!
-		"carnivore"       : [ { "ORGANIC" : false, "MEAT_RAW" : true }, 
-							  { "PLANT" : true } ],
-		"omnivore"        : [ { "ORGANIC" : false },
-							  { "MEAT_RAW" : true } ],
+		"carnivore"       : [ { "ORGANIC" : false, "MEAT_RAW" : true,"FISH" : true }, { "PLANT" : true } ],
+		"omnivore"        : [ { "ORGANIC" : false },{ "MEAT_RAW" : true } ],
 		"raw_omnivore"    : [ { "ORGANIC" : false, "MEAT_RAW" : true } ],
+		
 		// By having ORGANIC and FISH but excluding PLANT and MEAT, Piscivores can enjoy miscellaneous ORGANIC products (milk, etc.) as well as fish
-		"piscivore"       : [ { "ORGANIC" : false, "FISH" : true },
-							  { "PLANT" : true, "MEAT" : true } ],
-		"herbivore"       : [ { "ORGANIC" : false, "PLANT" : true }, 
-							  { "MEAT" : true, "EGG" : true } ],
+		"piscivore"       : [ { "ORGANIC" : false, "FISH" : true },{ "PLANT" : true, "MEAT" : true } ],
+		"herbivore"       : [ { "ORGANIC" : false, "PLANT" : true }, { "MEAT" : true, "EGG" : true } ],
 		"robot"           : [ { "ROBOT_PLANT" : true } ],
 		"lithivore"       : [ { "ROCK": true } ],
 		
diff --git a/stats/effects/food/food_complex/plant_dessert.statuseffect b/stats/effects/food/food_complex/plant_dessert.statuseffect
new file mode 100644
index 00000000..a841727f
--- /dev/null
+++ b/stats/effects/food/food_complex/plant_dessert.statuseffect
@@ -0,0 +1,12 @@
+{
+	"name" : "plant_dessert",
+
+	"effectConfig" : {
+		"foodTypes" : [ "PLANT", "HIGH_GLUCOSE" ]
+	},
+	"defaultDuration" : 0,
+
+	"scripts" : [
+		"/stats/effects/food/foodBase.lua"
+	]
+}