Skip to content

Commit 9d64e9d

Browse files
z16z16
authored
Merge pull request #2221 from xurion/dev
Update EmpyPopTracker to 2.7.0
2 parents e4433b2 + cecc1c5 commit 9d64e9d

File tree

8 files changed

+274
-2
lines changed

8 files changed

+274
-2
lines changed

‎addons/EmpyPopTracker/EmpyPopTracker.lua‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
_addon.name = 'Empy Pop Tracker'
3030
_addon.author = 'Dean James (Xurion of Bismarck)'
3131
_addon.commands = { 'ept', 'empypoptracker' }
32-
_addon.version = '2.5.0'
32+
_addon.version = '2.7.0'
3333

3434
config = require('config')
3535
res = require('resources')
@@ -224,7 +224,12 @@ end
224224
EmpyPopTracker.generate_info = function(nm, key_items, items)
225225
return {
226226
has_all_pops = not nm.pops or T(nm.pops):all(function(item)
227-
return item.type == 'item' and owns_item(item.id, items) or owns_key_item(item.id, key_items)
227+
-- Avoids confusing item and key item IDs
228+
if item.type == 'item' then
229+
return owns_item(item.id, items)
230+
end
231+
232+
return owns_key_item(item.id, key_items)
228233
end),
229234
text = generate_text(nm, key_items, items, 1)
230235
}

‎addons/EmpyPopTracker/nms/amphitrite.lua‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
--[[
2+
Copyright © 2020, Dean James (Xurion of Bismarck)
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
* Neither the name of Empy Pop Tracker nor the
14+
names of its contributors may be used to endorse or promote products
15+
derived from this software without specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY
21+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
]]
28+
29+
return {
30+
name = 'Amphitrite',
31+
pops = { {
32+
id = 1532, --Variegated Uragnite Shell
33+
type = 'key item',
34+
dropped_from = {
35+
name = 'Melo Melo, Timed (F-11/G-11)',
36+
}
37+
} }
38+
}

‎addons/EmpyPopTracker/nms/bennu.lua‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
--[[
2+
Copyright © 2020, Dean James (Xurion of Bismarck)
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
* Neither the name of Empy Pop Tracker nor the
14+
names of its contributors may be used to endorse or promote products
15+
derived from this software without specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY
21+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
]]
28+
29+
return {
30+
name = 'Bennu',
31+
pops = { {
32+
id = 1522, --Resplendent roc quill
33+
type = 'key item',
34+
dropped_from = {
35+
name = 'Ouzelum, Timed (I-8/J-9)',
36+
}
37+
} }
38+
}

‎addons/EmpyPopTracker/nms/index.lua‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828

2929
local nms = {
3030
'alfard',
31+
'amphitrite',
3132
'apademak',
3233
'arch dynamis lord',
3334
'azdaja',
35+
'bennu',
3436
'briareus',
3537
'brulo',
3638
'bukhis',
@@ -39,12 +41,16 @@ local nms = {
3941
'cirein-croin',
4042
'dragua',
4143
'glavoid',
44+
'ironclad smiter',
45+
'ironclad sunderer',
46+
'ironclad triturator',
4247
'isgebind',
4348
'itzpapalotl',
4449
'kukulkan',
4550
'maere',
4651
'ogopogo',
4752
'orthrus',
53+
'resheph',
4854
'sedna',
4955
'sobek',
5056
'ulhuadshi',

‎addons/EmpyPopTracker/nms/ironclad smiter.lua‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
--[[
2+
Copyright © 2020, Dean James (Xurion of Bismarck)
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
* Neither the name of Empy Pop Tracker nor the
14+
names of its contributors may be used to endorse or promote products
15+
derived from this software without specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY
21+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
]]
28+
29+
return {
30+
name = 'Ironclad Smiter',
31+
collectable = 3293, --Iron Plate
32+
collectable_target_count = 50,
33+
pops = { {
34+
id = 3230, --Tablilla Mercury
35+
type = 'item',
36+
dropped_from = {
37+
name = 'Tablilla, Forced (C-11)',
38+
pops = { {
39+
id = 3235, --Sandy Shard
40+
type = 'item',
41+
dropped_from = { name = 'Sand Sweeper, (D-10)' }
42+
} }
43+
}
44+
}, {
45+
id = 3236, --Smoldering Arm
46+
type = 'item',
47+
dropped_from = { name = 'Bonfire, (D-11/E-11)' }
48+
} }
49+
}

‎addons/EmpyPopTracker/nms/ironclad sunderer.lua‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
--[[
2+
Copyright © 2020, Dean James (Xurion of Bismarck)
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
* Neither the name of Empy Pop Tracker nor the
14+
names of its contributors may be used to endorse or promote products
15+
derived from this software without specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY
21+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
]]
28+
29+
return {
30+
name = 'Ironclad Sunderer',
31+
collectable = 3293, --Iron Plate
32+
collectable_target_count = 50,
33+
pops = { {
34+
id = 3260, --Teekesselchen Fragment
35+
type = 'item',
36+
dropped_from = {
37+
name = 'Teekesselchen, Forced (I-5)',
38+
pops = { {
39+
id = 3265, --Bubbling Oil
40+
type = 'item',
41+
dropped_from = { name = 'Sinister Seidel, (J-5)' }
42+
} }
43+
}
44+
}, {
45+
id = 3266, --Darkflame Arm
46+
type = 'item',
47+
dropped_from = { name = 'Stygian Djinn, (K-7)' }
48+
} }
49+
}

‎addons/EmpyPopTracker/nms/ironclad triturator.lua‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
--[[
2+
Copyright © 2020, Dean James (Xurion of Bismarck)
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
* Neither the name of Empy Pop Tracker nor the
14+
names of its contributors may be used to endorse or promote products
15+
derived from this software without specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY
21+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
]]
28+
29+
return {
30+
name = 'Ironclad Triturator',
31+
collectable = 3293, --Iron Plate
32+
collectable_target_count = 50,
33+
pops = { {
34+
id = 3245, --Bevel Gear
35+
type = 'item',
36+
dropped_from = {
37+
name = 'Koghatu, Forced (G-8)',
38+
pops = { {
39+
id = 3250, --Helical Gear
40+
type = 'item',
41+
dropped_from = { name = 'Mechanical Menace, (G-8/H-8)' }
42+
} }
43+
}
44+
}, {
45+
id = 3251, --Gear Fluid
46+
type = 'item',
47+
dropped_from = { name = 'Sub-zero Gear, (F-8/F-9)' }
48+
} }
49+
}

‎addons/EmpyPopTracker/nms/resheph.lua‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
--[[
2+
Copyright © 2020, Dean James (Xurion of Bismarck)
3+
All rights reserved.
4+
5+
Redistribution and use in source and binary forms, with or without
6+
modification, are permitted provided that the following conditions are met:
7+
8+
* Redistributions of source code must retain the above copyright
9+
notice, this list of conditions and the following disclaimer.
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
* Neither the name of Empy Pop Tracker nor the
14+
names of its contributors may be used to endorse or promote products
15+
derived from this software without specific prior written permission.
16+
17+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
18+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20+
DISCLAIMED. IN NO EVENT SHALL Dean James (Xurion of Bismarck) BE LIABLE FOR ANY
21+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27+
]]
28+
29+
return {
30+
name = 'Resheph',
31+
pops = { {
32+
id = 1527, --Decaying Diremite Fang
33+
type = 'key item',
34+
dropped_from = {
35+
name = 'Awahondo, Timed (K-6/K-7)',
36+
}
37+
} }
38+
}

0 commit comments

Comments
 (0)