Merge pull request #2170 from posimagi/pointwatch-master-level

[pointwatch] support Master Levels (specifically)
Windower · Mar 24, 2022 · ee68ba9 · ee68ba9
2 parents 2bb6e75 + 360d6c3
commit ee68ba9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/addons/pointwatch/ReadMe.txt b/addons/pointwatch/ReadMe.txt
@@ -30,6 +30,8 @@ Here are the available values:
 * xp.tnl                  = Number of Experience Points in your current level (number from 500 to 56,000)
 * xp.rate                 = Current XP gain rate per hour. This is calculated over a 10 minute window and requires at least two gains within the window.
 * xp.total                = Total Experience Points gained since the last time the addon was loaded (number)
+* xp.job_level            = Level of your current job.
+* xp.sub_job_level        = Level of your current support job.
 
 * lp.current              = Current Experience Points (number from 0 to 55,999 XP)
 * lp.tnm                  = Similar to a "To Next Level", but this value is always 10,000 because that's always the number of Limit Points per merit point.
@@ -45,12 +47,13 @@ Here are the available values:
 * ep.current              = Current Exemplar Points
 * ep.rate                 = Current Exemplar Points gain rate per hour. This is calculated over a 10 minute window and requires at least two gains within the window.
 * ep.tnml                 = Required Exemplar Points for your next Master Level
+* ep.master_level         = Master Level of your current job. -- Will be incorrect during Level Sync.
 
-* sparks.current          = Current number of RoE Sparks (number between 0 and 50,000)
-* sparks.maximum          = Maximum number of RoE Sparks (always 50,000)
+* sparks.current          = Current number of RoE Sparks (number between 0 and 99,999)
+* sparks.maximum          = Maximum number of RoE Sparks (always 99,999)
 
-* accolades.current       = Current number of Unity Accolades (number between 0 and 50,000)
-* accolades.maximum       = Maximum number of Unity Accolades (always 50,000)
+* accolades.current       = Current number of Unity Accolades (number between 0 and 99,999)
+* accolades.maximum       = Maximum number of Unity Accolades (always 99,999)
 
 * dynamis.KIs             = Series of Xs and Os indicating whether or not you have the 5 KIs.
 * dynamis.entry_time      = Your Dynamis entry time, in seconds. -- If the addon is loaded in dynamis, this will be the time of addon load.

diff --git a/addons/pointwatch/pointwatch.lua b/addons/pointwatch/pointwatch.lua
@@ -36,7 +36,7 @@ require('chat')
 
 _addon.name = 'PointWatch'
 _addon.author = 'Byrth'
-_addon.version = 0.211112
+_addon.version = 0.220312
 _addon.command = 'pw'
 
 settings = config.load('data\\settings.xml',default_settings)
@@ -114,9 +114,12 @@ packet_handlers = {
         local p = packets.parse('incoming',org)
         xp.current = p['Current EXP']
         xp.tnl = p['Required EXP']
+        xp.job_level = p['Main Job Level']
+        xp.sub_job_level = p['Sub Job Level']
         accolades.current = p['Unity Points']
         ep.current = p['Current Exemplar Points']
         ep.tnml = p['Required Exemplar Points']
+        ep.master_level = p['Master Level']
     end,
     [0x063] = function(org)
         local p = packets.parse('incoming',org)

diff --git a/addons/pointwatch/statics.lua b/addons/pointwatch/statics.lua
@@ -101,6 +101,8 @@ function initialize()
         rate = 0,
         current = 0,
         tnl = 0,
+        job_level = 0,
+        sub_job_level = 0,
     }
 
     lp = {
@@ -116,6 +118,7 @@ function initialize()
         current = 0,
         rate = 0,
         tnml = 0,
+        master_level = 0,
     }
 
     sparks = {