Merge pull request #22 from Lionas/develop

v0.7.1リリース
Lionas · Aug 30, 2016 · 30548c1 · 30548c1
2 parents c0d452e + 347942a
commit 30548c1
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 65 deletions.
diff --git 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.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.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
@@ -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="true" tier="2" layer="2" level="2">
             <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
@@ -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")