diff --git a/addons/EmpyPopTracker/EmpyPopTracker.lua b/addons/EmpyPopTracker/EmpyPopTracker.lua index f2803e6d6..cf178946e 100644 --- a/addons/EmpyPopTracker/EmpyPopTracker.lua +++ b/addons/EmpyPopTracker/EmpyPopTracker.lua @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. _addon.name = 'Empy Pop Tracker' _addon.author = 'Dean James (Xurion of Bismarck)' _addon.commands = { 'ept', 'empypoptracker' } -_addon.version = '2.2.2' +_addon.version = '2.3.0' config = require('config') res = require('resources') diff --git a/addons/EmpyPopTracker/README.md b/addons/EmpyPopTracker/README.md index 5ff3d1214..24684f744 100644 --- a/addons/EmpyPopTracker/README.md +++ b/addons/EmpyPopTracker/README.md @@ -8,10 +8,16 @@ Originally developed to track Abyssea Empyrean weapon NMs, hence the name. Key i All text colours are configurable via the auto-generated settings.xml file. +## Installation + +Empy Pop Tracker is now available via the Windower 4 addons list. + ## Load `//lua load empypoptracker` +Note: You won't have to do this if you obtained this addon via Windower. + ## Track an NM `//ept track glavoid` tracks Glavoid pop items/key items. diff --git a/addons/EmpyPopTracker/nms/brulo.lua b/addons/EmpyPopTracker/nms/brulo.lua new file mode 100644 index 000000000..1c100b413 --- /dev/null +++ b/addons/EmpyPopTracker/nms/brulo.lua @@ -0,0 +1,50 @@ +--[[ +Copyright © 2020, Dean James (Xurion of Bismarck) +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Empy Pop Tracker nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +]] + +return { + name = 'Brulo', + pops = { { + id = 1652, --Emerald demilune abyssite + type = 'key item', + dropped_from = { + name = 'Koios (Conflux #5)', + pops = { { + id = 1565, --Colorful demilune abyssite + type = 'key item', + dropped_from = { + name = 'Fire/Earth Elemental', + pops = { { + id = 1564, --Clear demilune abyssite + type = 'key item', + dropped_from = { name = 'Any Cruor Prospector' } + } } + } + } } + } + } } +} diff --git a/addons/EmpyPopTracker/nms/index.lua b/addons/EmpyPopTracker/nms/index.lua index 425a2b4c5..a2ab5b604 100644 --- a/addons/EmpyPopTracker/nms/index.lua +++ b/addons/EmpyPopTracker/nms/index.lua @@ -32,6 +32,7 @@ local nms = { 'arch dynamis lord', 'azdaja', 'briareus', + 'brulo', 'bukhis', 'carabosse', 'chloris', @@ -41,6 +42,8 @@ local nms = { 'isgebind', 'itzpapalotl', 'kukulkan', + 'maere', + 'ogopogo', 'orthrus', 'sedna', 'sobek', diff --git a/addons/EmpyPopTracker/nms/maere.lua b/addons/EmpyPopTracker/nms/maere.lua new file mode 100644 index 000000000..cfcc57214 --- /dev/null +++ b/addons/EmpyPopTracker/nms/maere.lua @@ -0,0 +1,50 @@ +--[[ +Copyright © 2020, Dean James (Xurion of Bismarck) +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Empy Pop Tracker nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +]] + +return { + name = 'Maere', + pops = { { + id = 1654, --Indigo demilune abyssite + type = 'key item', + dropped_from = { + name = 'Gamayun (Conflux #8)', + pops = { { + id = 1565, --Colorful demilune abyssite + type = 'key item', + dropped_from = { + name = 'Air/Dark Elemental', + pops = { { + id = 1564, --Clear demilune abyssite + type = 'key item', + dropped_from = { name = 'Any Cruor Prospector' } + } } + } + } } + } + } } +} diff --git a/addons/EmpyPopTracker/nms/ogopogo.lua b/addons/EmpyPopTracker/nms/ogopogo.lua new file mode 100644 index 000000000..52a64ca25 --- /dev/null +++ b/addons/EmpyPopTracker/nms/ogopogo.lua @@ -0,0 +1,50 @@ +--[[ +Copyright © 2020, Dean James (Xurion of Bismarck) +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Empy Pop Tracker nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +]] + +return { + name = 'Ogopogo', + pops = { { + id = 1653, --Vermillion demilune abyssite + type = 'key item', + dropped_from = { + name = 'Chione (Conflux #7)', + pops = { { + id = 1565, --Colorful demilune abyssite + type = 'key item', + dropped_from = { + name = 'Ice/Water Elemental', + pops = { { + id = 1564, --Clear demilune abyssite + type = 'key item', + dropped_from = { name = 'Any Cruor Prospector' } + } } + } + } } + } + } } +}