From f69c09c845f179efb65dfd6ed4d65d606e1bc6c4 Mon Sep 17 00:00:00 2001
From: BillLive <bill@live.com.au>
Date: Sun, 31 Jan 2016 13:00:46 +1030
Subject: [PATCH] Put back configuration option for Flameshock behaviour
 Signed-off-by: BillLive <bill@live.com.au>

---
 Elementarist.lua      |    5 +++++
 Elementarist.toc      |    5 ++++-
 Localization_enUS.lua |    4 +++-
 Localization_frFR.lua |    4 +++-
 modules/elemental.lua |   22 ++++++++++++++++------
 5 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/Elementarist.lua b/Elementarist.lua
index 104c908..876963c 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -289,6 +289,10 @@ function Elementarist.events.ADDON_LOADED(addon)
 
 	Elementarist.playerLevel = UnitLevel("player")
 
+	-- Setup behaviors so they can be loaded for defaults if required
+	Elementarist.Behaviors["1"] = L.BEHAVIOR_KEEP_FS_UP
+	Elementarist.Behaviors["2"] = L.BEHAVIOR_FS_BEFORE_LVB
+
 	-- Coop with other addons
 	Elementarist.OmniCC = _G['OmniCC']
 	Elementarist.SpellFlash = _G['SpellFlashAddon']
@@ -349,6 +353,7 @@ function Elementarist:InitSettings()
 	if not ElementaristDB.scale then ElementaristDB.scale = 1 end
 	if not ElementaristDB.debuffscale then ElementaristDB.debuffscale = 1 end
 	if not ElementaristDB.shieldscale then ElementaristDB.shieldscale = 1 end
+	if ElementaristDB.Behavior == nil then ElementaristDB.Behavior = Elementarist.Behaviors["1"] end
 	if ElementaristDB.locked == nil then ElementaristDB.locked = false end
 	if ElementaristDB.enabled == nil then ElementaristDB.enabled = true end
 	if ElementaristDB.disableIfNotEle == nil then ElementaristDB.disableIfNotEle = true end
diff --git a/Elementarist.toc b/Elementarist.toc
index a9e3de4..82f3b4a 100755
--- a/Elementarist.toc
+++ b/Elementarist.toc
@@ -1,4 +1,4 @@
-## Interface: 60200
+## Interface: 60200
 ## Title: Elementarist
 ## Notes: Elemental shaman spell rotation helper
 ## Author: Taracque, Felmosórongy of Arathor
@@ -6,6 +6,9 @@
 ## SavedVariables: ElementaristDB
 ## OptionalDeps: OmniCC, SpellFlash
 ## Dependencies: 
+## X-Curse-Project-Name: Elementarist
+## X-Curse-Project-ID: elementarist
+## X-Curse-Repository-ID: wow/elementarist/mainline
 
 Elementarist.lua
 Ele_GUI.lua
diff --git a/Localization_enUS.lua b/Localization_enUS.lua
index 73993b5..22046d7 100755
--- a/Localization_enUS.lua
+++ b/Localization_enUS.lua
@@ -4,7 +4,9 @@
 
 if GetLocale() then
 	local L = Elementarist.Locals
-
+	L.CONFIG_BEHAVIOR = "Flame Shock behavior:"
+	L.BEHAVIOR_KEEP_FS_UP = "Keep Flame Shock up"
+	L.BEHAVIOR_FS_BEFORE_LVB = "Flame Shock before Lava"
 	L.THREAT_WARNING_SUFFIX = "% threat!"
 	L.THREAT_WARNING_PREFIX = ""
 	L.CONFIG_ENABLED = "Enabled"
diff --git a/Localization_frFR.lua b/Localization_frFR.lua
index ad14e40..dd4764c 100755
--- a/Localization_frFR.lua
+++ b/Localization_frFR.lua
@@ -5,7 +5,9 @@ end
 
 if GetLocale() then
 	local L = Elementarist.Locals
-
+	L["BEHAVIOR_FS_BEFORE_LVB"] = "Horion de flammes avant lave"
+	L["BEHAVIOR_KEEP_FS_UP"] = "Gardez Horion de flammes Up !"
+	L["CONFIG_BEHAVIOR"] = "Flame Shock behavior:" -- Requires localization
 	L["CONFIG_ANNOUNCE_STORMLASH"] = "Announce Stormlash Totem in Raid/Party chat" -- Requires localization
 	L["CONFIG_BEHAVIOR"] = "Flame Shock behavior:" -- Requires localization
 	L["CONFIG_CLSTBEHAVIOR"] = "Chain Lightning single target behavior" -- Requires localization
diff --git a/modules/elemental.lua b/modules/elemental.lua
index a83de2b..97a4960 100755
--- a/modules/elemental.lua
+++ b/modules/elemental.lua
@@ -4,39 +4,49 @@ Elementarist:RegisterModule("elemental");
 
 Elementarist.elemental = {
 	["Configuration"] = {
+			["Behavior"] = {
+			["type"]	= "DropDown",
+			["vposition"] =  -70,
+			["hposition"] =  38,
+			["label"]	=	L.CONFIG_BEHAVIOR,
+			["options"]	= {
+				{text	=	L.BEHAVIOR_KEEP_FS_UP},
+				{text	=	L.BEHAVIOR_FS_BEFORE_LVB}
+			}
+		},
 		["trackAuraBuffs"] = {
 			["type"]	=	"CheckBox",
-			["vposition"] =  -100,
+			["vposition"] =  -155,
 			["hposition"] =  10,
 			["label"]	=	L.CONFIG_DEBUFF_TRACKER_SHOW_BUFFS
 		},
 		["enableEQ"] = {
 			["type"]	=	"CheckBox",
-			["vposition"] =  -170,
+			["vposition"] =  -215,
 			["hposition"] =  10,
 			["label"]	=	L.CONFIG_ENABLE_EQ_SPELL
 		},
 		["showHealingStream"] = {
 			["type"]	=	"CheckBox",
-			["vposition"] =  -200,
+			["vposition"] =  -245,
 			["hposition"] =  10,
 			["label"]	=	L.CONFIG_ENABLE_HS_TOTEM
 		},
 		["disableLM"] = {
 			["type"]	=	"CheckBox",
-			["vposition"] =  -140,
+			["vposition"] =  -185,
 			["hposition"] =  10,
 			["label"]	=	L.CONFIG_DISABLE_LM_SPELL
 		},
 		["maximizeFS"] = {
 			["type"]	=	"CheckBox",
-			["vposition"] =  -60,
+			["vposition"] =  -110,
 			["hposition"] =  10,
 			["label"]	=	L.CONFIG_DOFS
 		},
 		["doFSThreshold"] = {
 			["type"]	=	"Slider",
-			["vposition"] =  -85,
+			["vposition"] =  -135,
 			["hposition"] =  350,
 			["label"]	=	L.CONFIG_DOFS_THRESHOLD,
 			["low"]		=	1,
-- 
1.7.9.5