Merge remote-tracking branch 'origin/lunalua-0.7.2.1' into lunalua-0.…

…7.2.1
WohlSoft · Oct 30, 2015 · 9da59c1 · 9da59c1
2 parents 4f07ce9 + d93597b
commit 9da59c1
Show file tree

Hide file tree

Showing 41 changed files with 6,913 additions and 160 deletions.
diff --git a/LuaScriptsLib/core/defines.lua b/LuaScriptsLib/core/defines.lua
@@ -82,7 +82,7 @@ local defines = {
     player_link_shieldEnabled       = {defValue = true, minVal = nil, maxVal = nil, address = nil, size = FIELD_BOOLEAN,
                                         n = 1, group = "Player Settings: Link", desc = "If the shield of link is enabled.", 
                                         customFuncGet = function()
-                                            return mem(0x00A53042, FIELD_BYTE) == 0x90
+                                            return mem(0x00A53042, FIELD_BYTE) ~= 0x90
                                         end,
                                         customFuncSet = function(value)
                                             if(value)then
@@ -102,6 +102,18 @@ local defines = {
                                                 mem(0x00A53047, FIELD_BYTE, 0x90)
                                                 mem(0x00A53048, FIELD_BYTE, 0x90)
                                             end
+                                        end},
+    player_link_fairyVineEnabled    = {defValue = true, minVal = nil, maxVal = nil, address = nil, size = FIELD_BOOLEAN,
+                                        n = 2, group = "Player Settings: Link", desc = "If the vine fairy is enabled",
+                                        customFuncGet = function()
+                                            return mem(0x009AAF93, FIELD_BYTE) == 0x5
+                                        end,
+                                        customFuncSet = function(value)
+                                            if(value)then
+                                                mem(0x009AAF93, FIELD_BYTE, 0x5)
+                                            else
+                                                mem(0x009AAF93, FIELD_BYTE, 0xFF)
+                                            end
                                         end}
 }
 
@@ -123,7 +135,7 @@ end
 
 local function getDefine(defTable)
     if(defTable.customFuncGet)then
-        defTable.customFuncGet()
+        return defTable.customFuncGet()
     else
         return mem(defTable.address, defTable.size)    
     end