diff --git a/Carbonite/Carbonite.lua b/Carbonite/Carbonite.lua
index 8322a0f..f1c5931 100644
--- a/Carbonite/Carbonite.lua
+++ b/Carbonite/Carbonite.lua
@@ -26,7 +26,7 @@ function NXInit()
NXTITLEFULL = NXTITLE
- Nx.VERMAJOR = 5.055
+ Nx.VERMAJOR = 5.056
Nx.VERMINOR = .000 -- Not 0 is a test version
Nx.BUILD = 292
diff --git a/Carbonite/Carbonite.toc b/Carbonite/Carbonite.toc
index 949c029..818c0f5 100644
--- a/Carbonite/Carbonite.toc
+++ b/Carbonite/Carbonite.toc
@@ -1,6 +1,6 @@
## Interface: 50001
-## Title: Carbonite 5.05.05
-## Version: 5.05.05
+## Title: Carbonite 5.05.06
+## Version: 5.05.06
## Author: Rythal
## Notes: Released Under GPL
## DefaultState: Enabled
diff --git a/Carbonite/CarboniteLicenseAgreement.txt b/Carbonite/CarboniteLicenseAgreement.txt
new file mode 100644
index 0000000..6b524a6
--- /dev/null
+++ b/Carbonite/CarboniteLicenseAgreement.txt
@@ -0,0 +1,41 @@
+
+ CARBONITE
+ Copyright 2007-2012 Carbon Based Creations, LLC
+ CARBONITE(tm) is a registered trademark of Carbon Based Creations, LLC.
+
+----------------------------------------------------------
+ Enable word wrap to more easily view this file.
+----------------------------------------------------------
+
+LICENSE AGREEMENT
+
+PLEASE READ THIS END USER LICENSE AGREEMENT ("AGREEMENT") CAREFULLY AND MAKE SURE YOU UNDERSTAND IT.
+The accompanying executable code version of CARBONITE and related documentation ("Software") is made available under the terms and conditions of this Agreement. IF YOU INSTALL OR USE THE PRODUCT, YOU CONSENT TO BE BOUND BY THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS HEREIN, DO NOT INSTALL OR USE THIS PRODUCT.
+
+LICENSE. The Software is protected by copyright laws, trade secret, and international copyright treaties, and is being licensed to You according to the terms of this Agreement. Carbon Based Creations, LLC ("Company") grants to You a non-exclusive and non-transferable right to install and use a copy of the Software for Your personal, non-commercial home entertainment use on one personal computer. The Software made available under this Agreement is licensed, not sold, to You by Company. Company reserves all rights not expressly granted under this Agreement.
+
+Except to the extent that Company otherwise authorizes You in writing, the following restrictions shall apply:
+
+(1) You may not use the Software for any commercial purposes, including resale, rental, lease, display, or offering on a pay-per-play or other for-charge basis. You may not sub-license the rights provided to You.
+
+(2) The Software (in both object and source code forms) constitutes valuable trade secret information of Company, and You may not reverse-engineer, decompile or disassemble the Software or otherwise attempt to gain access to the source code for the Software.
+
+(3) You may make a single archival copy of the Software to the extent permitted by law. You may not otherwise reproduce the Software, or modify or distribute all or any portion of the Software. You shall not provide copies of the Software to any other party. You may not create derivative works from the Software.
+
+(4) No right, title or interest in or to any trademark, service mark, logo or trade name of Company or of any third parties is granted under this Agreement. You may not remove or alter any trademark, logo, copyright, or other proprietary notice(s) on the Software.
+
+TERMINATION: This Agreement is effective until terminated. If You breach this Agreement, the license and Your right to use the Software will terminate immediately and without notice, but all other terms of this Agreement will survive termination and continue in effect. Upon termination, You will immediately cease using the Software and You must destroy all copies of the Software in Your possession or control.
+
+EXPORT. You agree that You will not export the Software or any part thereof, except in accordance with all applicable U.S. export restrictions.
+
+U.S. GOVERNMENT RESTRICTED RIGHTS. The Software is commercial computer software and documentation developed by Company and belonging solely to Company. If the Software is acquired by or on behalf of the U.S. Government or by a U.S. government prime contractor or a subcontractor, then the Government's rights in the Software will be only as set forth in this Agreement; this is in accordance with 48 C.F.R. 227.7202-4 or successor regulation (for Department of Defense (DOD) acquisitions) and with 48 C.F.R. 2.101 and 12.212 or successor regulation (for non-DOD acquisitions).
+
+GOVERNING LAW AND VENUE. This Agreement is governed by the laws of the State of Illinois, excluding its choice of law rules. The United Nations Convention on Contracts for the International Sale of Goods shall not apply. In any action or suit to enforce any right or remedy under this Agreement or to interpret any of its provisions, the state or federal courts located in the State of Illinois shall have exclusive jurisdiction over any such suit or action, and You hereby agree to submit to the jurisdiction of such courts.
+
+NO WARRANTY. YOU ACKNOWLEDGE AND AGREE THAT THE SOFTWARE IS PROVIDED "AS IS", "AT YOUR OWN RISK", AND WITHOUT WARRANTY OF ANY KIND. TO THE FULLEST EXTENT PERMITTED BY LAW, COMPANY HEREBY DISCLAIMS ALL EXPRESS AND IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING BUT NOT LIMITED TO ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT OF ANY THIRD PARTY RIGHTS WITH RESPECT TO THE SOFTWARE. COMPANY DOES NOT WARRANT THAT THE SOFTWARE IS ERROR-FREE OR THAT ACCESS TO THE SOFTWARE WILL BE UNINTERRUPTED AND WITHOUT COMPROMISE TO SECURITY SYSTEMS.
+
+LIMITATION OF LIABILITY. YOU ACKNOWLEDGE AND AGREE THAT TO THE FULLEST EXTENT PERMITTED BY LAW, COMPANY WILL NOT BE LIABLE FOR ANY LOST REVENUE, LOST PROFIT, BUSINESS INTERRUPTION, LOSS OF BUSINESS OR CONFIDENTIAL INFORMATION OR LOSS OF DATA, COMPUTER MALFUNCTION, OR FOR ANY DIRECT, SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE OR IN CONNECTION WITH THE SOFTWARE, EVEN IF COMPANY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND WHETHER OR NOT SUCH DAMAGES ARE FORESEEABLE. IN NO EVENT WILL COMPANY'S LIABILITY TO YOU, WHETHER IN CONTRACT, TORT (INCLUDING NEGLIGENCE), OR OTHERWISE, EXCEED THE AMOUNT, IF ANY, PAID BY YOU FOR THE SOFTWARE UNDER THIS AGREEMENT. THE FOREGOING LIMITATIONS WILL APPLY EVEN IF THE ABOVE STATED WARRANTY FAILS OF ITS ESSENTIAL PURPOSE. BECAUSE SOME STATES AND/OR JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY TO YOU, AND YOU MAY ALSO HAVE OTHER LEGAL RIGHTS THAT VARY FROM STATE TO STATE.
+
+SEVERABILITY/NO WAIVER. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. Failure to enforce any provision of this Agreement is not a waiver of future enforcement of that or any other provision.
+
+----------------------------------------------------------
diff --git a/Carbonite/NxMap.lua b/Carbonite/NxMap.lua
index 0918761..34e3b88 100644
--- a/Carbonite/NxMap.lua
+++ b/Carbonite/NxMap.lua
@@ -218,6 +218,7 @@ function Nx.Map:Init()
tom["AddZWaypoint"] = Nx.TTAddZWaypoint
tom["SetCustomWaypoint"] = Nx.TTSetCustomWaypoint
tom["SetCustomMFWaypoint"] = Nx.TTSetCustomMFWaypoint
+ tom["AddMFWaypoint"] = Nx.TTSetCustomMFWaypoint
tom["RemoveWaypoint"] = Nx.TTRemoveWaypoint
tom["SetCrazyArrow"] = Nx.TTSetCrazyArrow
SLASH_WAY1 = '/way'
@@ -2485,7 +2486,7 @@ function Nx.Map:MinimapNodeGlowInit (reset)
t:SetTexture ("Interface\\AddOns\\Carbonite\\Gfx\\Map\\MMOIconsG")
t:Hide()
end
-
+
Nx.Timer:Start ("MapNodeGlow", .1, self, self.OnMinimapNodeGlowTimer)
end
end
@@ -2510,18 +2511,12 @@ end
function Nx.Map:MinimapNodeGlowSet (letter)
- local count = GetNumTrackingTypes()
+ local count = GetNumTrackingTypes()
for n = 1, count do
local name, texture, active, category = GetTrackingInfo (n)
if active and category == "spell" then
--- Nx.prt ("#%d %s %s %s %s", n, name, texture, active or "0", category or "nil")
-
--- if IsAltKeyDown() then
--- self.MMFrm:SetBlipTexture ("Interface\\Minimap\\objecticons")
self.MMFrm:SetBlipTexture ("Interface\\AddOns\\Carbonite\\Gfx\\Map\\MMOIcons" .. letter)
--- end
-
break
end
end
diff --git a/Carbonite/NxMapData.lua b/Carbonite/NxMapData.lua
index 191653d..177cde4 100644
--- a/Carbonite/NxMapData.lua
+++ b/Carbonite/NxMapData.lua
@@ -2248,7 +2248,7 @@ Map.InstanceInfo = { -- Blizzard instance maps (SetInstanceMap uses size of 3
0, -100, "ShadowpanHideout\\ShadowpanHideout1_",
0, -200, "ShadowpanHideout\\ShadowpanHideout2_",
0, -300, "ShadowpanHideout\\ShadowpanHideout3_", },
- [16229] = { 0, 0, "Siegeofniuzaotemple\\Siegeofniuzaotemple_",
+ [16229] = { 0, 0, "Siegeofniuzaotemple\\SiegeofNiuzaoTemple",
0, -100, "SiegeofNiuzaoTemple\\SiegeofNiuzaoTemple1_",
0, -200, "SiegeofNiuzaoTemple\\SiegeofNiuzaoTemple2_", },
[16230] = { 0, 0, "StormstoutBrewery\\StormstoutBrewery1_",
diff --git a/Carbonite/NxQuest.lua b/Carbonite/NxQuest.lua
index 144d421..5d83e67 100644
--- a/Carbonite/NxQuest.lua
+++ b/Carbonite/NxQuest.lua
@@ -7934,17 +7934,19 @@ function Nx.Quest:TrackOnMap (qId, qObj, useEnd, target, skipSame)
local QMap = NxMap1.NxMap
if not InCombatLockdown() then
local cur = self.QIds[qId]
- if not cur.Complete then
- QMap.QuestWin:DrawNone();
- if Nx.CharOpts["MapShowQuestBlobs"] then
- QMap.QuestWin:DrawBlob(qId,true)
- QMap:ClipZoneFrm( QMap.Cont, QMap.Zone, QMap.QuestWin, 1 )
- QMap.QuestWin:SetFrameLevel(QMap.Level)
- QMap.QuestWin:SetFillAlpha(255 * QMap.QuestAlpha)
- QMap.QuestWin:SetBorderAlpha( 255 * QMap.QuestAlpha )
- QMap.QuestWin:Show()
- else
- QMap.QuestWin:Hide()
+ if cur then
+ if not cur.Complete then
+ QMap.QuestWin:DrawNone();
+ if Nx.CharOpts["MapShowQuestBlobs"] then
+ QMap.QuestWin:DrawBlob(qId,true)
+ QMap:ClipZoneFrm( QMap.Cont, QMap.Zone, QMap.QuestWin, 1 )
+ QMap.QuestWin:SetFrameLevel(QMap.Level)
+ QMap.QuestWin:SetFillAlpha(255 * QMap.QuestAlpha)
+ QMap.QuestWin:SetBorderAlpha( 255 * QMap.QuestAlpha )
+ QMap.QuestWin:Show()
+ else
+ QMap.QuestWin:Hide()
+ end
end
end
end
diff --git a/Carbonite/NxWarehouse.lua b/Carbonite/NxWarehouse.lua
index 84de6db..13514a3 100644
--- a/Carbonite/NxWarehouse.lua
+++ b/Carbonite/NxWarehouse.lua
@@ -43,6 +43,7 @@ function Nx.Warehouse:Init()
["Warlock"] = "Spell_Nature_FaerieFire",
["Warrior"] = "INV_Sword_27",
["Death Knight"] = "Spell_Deathknight_ClassIcon",
+ ["Monk"] = "class_monk",
}
self.InvNames = {
@@ -1128,7 +1129,7 @@ function Nx.Warehouse:FindCharsWithItem (link)
-- local tm = GetTime()
local s1, s2, link = strfind (link, "item:(%d+)")
- assert (s1)
+-- assert (s1)
-- Nx.prt ("Find Link %s", link)