From e832f54de6b2f866b64214e681fca5042e7d3237 Mon Sep 17 00:00:00 2001
From: Lionas <lionas.watanabe@gmail.com>
Date: Tue, 30 Aug 2016 19:41:57 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=88=E3=81=A7=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E3=82=92?=
 =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LioFADR_FoodsAndDrinksUtil.lua            | 48 -------------------
 .../LionasFoodAndDrinkReminder.txt            |  4 +-
 .../LionasFoodAndDrinkReminder.xml            |  2 +-
 .../LionasFoodAndDrinkReminderMenu.lua        |  4 +-
 4 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/LionasFoodAndDrinkReminder/LioFADR_FoodsAndDrinksUtil.lua b/LionasFoodAndDrinkReminder/LioFADR_FoodsAndDrinksUtil.lua
index 5809251..16ce657 100644
--- a/LionasFoodAndDrinkReminder/LioFADR_FoodsAndDrinksUtil.lua
+++ b/LionasFoodAndDrinkReminder/LioFADR_FoodsAndDrinksUtil.lua
@@ -297,51 +297,3 @@ function LioFADRFoods.isContain(abilityId)
 
 end
 
-
---local function getFoodTypeBonus()
-    
---    local FODD_BUFF_NONE = 0
---    local FODD_BUFF_MAX_HEALTH = 1
---    local FODD_BUFF_MAX_MAGICKA = 2
---    local FODD_BUFF_MAX_STAMINA = 4
---    local FODD_BUFF_REGEN_HEALTH = 8
---    local FODD_BUFF_REGEN_MAGICKA = 16
---    local FODD_BUFF_REGEN_STAMINA = 32
---    local FODD_BUFF_MAX_HEALTH_MAGICKA = FODD_BUFF_MAX_HEALTH + FODD_BUFF_MAX_MAGICKA
---    local FODD_BUFF_MAX_HEALTH_STAMINA = FODD_BUFF_MAX_HEALTH + FODD_BUFF_MAX_STAMINA
---    local FODD_BUFF_MAX_MAGICKA_STAMINA = FODD_BUFF_MAX_MAGICKA + FODD_BUFF_MAX_STAMINA
---    local FODD_BUFF_REGEN_HEALTH_MAGICKA = FODD_BUFF_REGEN_HEALTH + FODD_BUFF_REGEN_MAGICKA
---    local FODD_BUFF_REGEN_HEALTH_STAMINA = FODD_BUFF_REGEN_HEALTH + FODD_BUFF_REGEN_STAMINA
---    local FODD_BUFF_REGEN_MAGICKA_STAMINA = FODD_BUFF_REGEN_MAGICKA + FODD_BUFF_REGEN_STAMINA
---    local FODD_BUFF_MAX_ALL = FODD_BUFF_MAX_HEALTH + FODD_BUFF_MAX_MAGICKA + FODD_BUFF_MAX_STAMINA
---    local FODD_BUFF_REGEN_ALL = FODD_BUFF_REGEN_HEALTH + FODD_BUFF_REGEN_MAGICKA + FODD_BUFF_REGEN_STAMINA
---    local FODD_BUFF_MAX_HEALTH_REGEN_HEALTH = FODD_BUFF_MAX_HEALTH + FODD_BUFF_REGEN_HEALTH
---    local FODD_BUFF_MAX_HEALTH_REGEN_MAGICKA = FODD_BUFF_MAX_HEALTH + FODD_BUFF_REGEN_MAGICKA
---    local FODD_BUFF_MAX_HEALTH_REGEN_STAMINA = FODD_BUFF_MAX_HEALTH + FODD_BUFF_REGEN_STAMINA
---    local FODD_BUFF_MAX_HEALTH_REGEN_ALL = FODD_BUFF_MAX_HEALTH + FODD_BUFF_REGEN_HEALTH + FODD_BUFF_REGEN_MAGICKA + FODD_BUFF_REGEN_STAMINA
-    
---    local isFoodBuff = {
---        [61259] = FODD_BUFF_MAX_HEALTH,
---        [61260] = FODD_BUFF_MAX_MAGICKA,
---        [61261] = FODD_BUFF_MAX_STAMINA,
---        [61322] = FODD_BUFF_REGEN_HEALTH,
---        [61325] = FODD_BUFF_REGEN_MAGICKA,
---        [61328] = FODD_BUFF_REGEN_STAMINA,
---        [61257] = FODD_BUFF_MAX_HEALTH_MAGICKA,
---        [61255] = FODD_BUFF_MAX_HEALTH_STAMINA,
---        [61294] = FODD_BUFF_MAX_MAGICKA_STAMINA,
---        [72816] = FODD_BUFF_REGEN_HEALTH_MAGICKA,
---        [61340] = FODD_BUFF_REGEN_HEALTH_STAMINA,
---        [61345] = FODD_BUFF_REGEN_MAGICKA_STAMINA,
---        [61218] = FODD_BUFF_MAX_ALL,
---        [61350] = FODD_BUFF_REGEN_ALL,
---        [72822] = FODD_BUFF_MAX_HEALTH_REGEN_HEALTH,
---        [72816] = FODD_BUFF_MAX_HEALTH_REGEN_MAGICKA,
---        [72819] = FODD_BUFF_MAX_HEALTH_REGEN_STAMINA,
---        [72824] = FODD_BUFF_MAX_HEALTH_REGEN_ALL,
---    }
-    
---    return isFoodBuff
-        
---end
-
diff --git a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.txt b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.txt
index 18e8cf6..648ff4b 100755
--- a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.txt
+++ b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.txt
@@ -1,7 +1,7 @@
 
-## Title: Lionas's Food and Drink Reminder v0.6.1
+## Title: Lionas's Food and Drink Reminder v0.7.1
 ## APIVersion: 100016
-## Version: 0.7.0
+## Version: 0.7.1
 ## Author: Lionas
 ## Description: Notify for food and drink when you entered in dungeon and expired.
 ## OptionalDependsOn: LibStub LibAddonMenu-2.0
diff --git a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml
index 0e31f24..fcbf6ba 100644
--- a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml
+++ b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml
@@ -1,6 +1,6 @@
 <GuiXml>
     <Controls>
-        <TopLevelControl name="LioFADRContainer" mouseEnabled="true" movable="false" clampedToScreen="true" hidden="false" tier="2" layer="2" level="2" >
+        <TopLevelControl name="LioFADRContainer" mouseEnabled="true" movable="false" clampedToScreen="true" hidden="false" tier="2" layer="2" level="2" hidden="true" >
             <Dimensions x="1" y="1" />
             <Anchor point="TOPLEFT" relativeTo="GuiRoot" relativePoint="CENTER" offsetX="0" offsetY="0"/>
         </TopLevelControl>
diff --git a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminderMenu.lua b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminderMenu.lua
index 03020cc..6f156c1 100755
--- a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminderMenu.lua
+++ b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminderMenu.lua
@@ -1,7 +1,7 @@
--- Lionas's Food & Drink Reminder
+-- Lionas's Food & Drink Reminder
 -- Author: Lionas
 local PanelTitle = "Lionas's Food & Drink Reminder"
-local Version = "0.7.0"
+local Version = "0.7.1"
 local Author = "Lionas"
 
 local LAM2 = LibStub:GetLibrary("LibAddonMenu-2.0")

From 347942a0e548e72bcd5c0749324e29a35efe91d5 Mon Sep 17 00:00:00 2001
From: Lionas <lionas.watanabe@gmail.com>
Date: Tue, 30 Aug 2016 23:41:29 +0900
Subject: [PATCH 2/2] =?UTF-8?q?StateChange=E3=81=97=E3=81=9F=E6=99=82?=
 =?UTF-8?q?=E3=81=AB=E3=82=A2=E3=82=A4=E3=82=B3=E3=83=B3=E3=81=AE=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E7=8A=B6=E6=85=8B=E3=82=92=E5=8D=B3=E6=99=82=E5=8F=8D?=
 =?UTF-8?q?=E6=98=A0=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LionasFoodAndDrinkReminder.lua            | 38 +++++++++++++------
 .../LionasFoodAndDrinkReminder.xml            |  2 +-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.lua b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.lua
index e196563..863091b 100755
--- a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.lua
+++ b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.lua
@@ -137,7 +137,7 @@ function OnIconMouseUp(self, mouseButton, upInside)
 
   if mouseButton == 2 and upInside then -- right click
     
-    LioFADR.isNeverNotify = true
+    LioFADR.isNeverNotify = true   
     hideIcon()
     
   end
@@ -364,6 +364,24 @@ local function notifyExpiredBuffs(currentBuffs)
 end
 
 
+-- show / hide icon
+local function setIconVisibility()
+  
+  if(((LioFADRCommon.getTableLength(LioFADR.notifyRemain) > 0) or 
+     (LioFADRCommon.getTableLength(LioFADR.notifyClosed) > 0) or
+     (LioFADRCommon.getTableLength(LioFADR.notifyExpired)> 0)) and
+     not LioFADR.isNeverNotify) then
+    
+    showIcon()
+    
+  else
+    
+    hideIcon()
+  end
+  
+end
+
+
 -- Scan buffs
 local function scanBuffs()
 
@@ -443,17 +461,7 @@ local function scanBuffs()
   end
 
   -- アイコンの表示判断
-  if(((LioFADRCommon.getTableLength(LioFADR.notifyRemain) > 0) or 
-     (LioFADRCommon.getTableLength(LioFADR.notifyClosed) > 0) or
-     (LioFADRCommon.getTableLength(LioFADR.notifyExpired)> 0)) and
-     not LioFADR.isNeverNotify) then
-    
-    showIcon()
-    
-  else
-    hideIcon()
-  end
-
+  setIconVisibility()
 
 end
 
@@ -586,6 +594,9 @@ local function initializeIcon()
         LioFADR.isHideScene = true
       end
       
+      -- アイコンの表示判断
+      setIconVisibility()
+
     end
   )
   HUD_UI_SCENE:RegisterCallback("StateChange", 
@@ -599,6 +610,9 @@ local function initializeIcon()
         LioFADR.isHideReticle = false
       end
       
+      -- アイコンの表示判断
+      setIconVisibility()
+      
     end
   )
   
diff --git a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml
index fcbf6ba..1b2f9c2 100644
--- a/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml
+++ b/LionasFoodAndDrinkReminder/LionasFoodAndDrinkReminder.xml
@@ -1,6 +1,6 @@
 <GuiXml>
     <Controls>
-        <TopLevelControl name="LioFADRContainer" mouseEnabled="true" movable="false" clampedToScreen="true" hidden="false" tier="2" layer="2" level="2" hidden="true" >
+        <TopLevelControl name="LioFADRContainer" mouseEnabled="true" movable="false" clampedToScreen="true" hidden="true" tier="2" layer="2" level="2">
             <Dimensions x="1" y="1" />
             <Anchor point="TOPLEFT" relativeTo="GuiRoot" relativePoint="CENTER" offsetX="0" offsetY="0"/>
         </TopLevelControl>