From b0e98bc0e50d26c0502168901097590e060aea42 Mon Sep 17 00:00:00 2001 From: Allonte Date: Wed, 24 Jul 2019 05:39:38 -0700 Subject: [PATCH 01/17] Update checkparam.lua - Add Bladeborn/Flashsteel Earring set - Add Heartseeker/Dudgeon Earring set - Add in more relevant paramaters to THF's default --- addons/checkparam/checkparam.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 587c28d30..adfe103a0 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -42,7 +42,7 @@ defaults = { WHM = 'cure potency|cure potency ii|fast cast|cure spellcasting time|enmity|healing magic casting time|divine benison|damage taken|physical damage taken|magic damage taken', BLM = 'magic attack bonus|magic burst damage|magic burst damage ii|int|magic accuracy|magic damage|fast cast|elemental magic casting time', RDM = 'magic attack bonus|magic burst damage|magic burst damage ii|magic accuracy|fast cast|enfeebling magic skill|enhancing magic skill|store tp|dual wield', - THF = 'store tp|double attack|triple attack|quadruple attack|dual wield', + THF = 'store tp|double attack|triple attack|quadruple attack|dual wield|critical hit rate|critical hit damage|haste|weapon skill damage', PLD = 'enmity|damage taken|physical damage taken|magic damage taken|spell interruption rate|phalanx|cure potency|fastcast', DRK = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage', BST = 'pet: double attack|pet: magic attack bonus|pet: damage taken', @@ -316,4 +316,6 @@ combination={ ['jhakri']={item=S{25578,25794,25832,25883,25950},stats={['fast cast']=3},type=-1}, ['meghanada']={item=S{25575,25791,25829,25880,25947},stats={['regen']=3},type=-1}, ['Sulevia\'s']={item=S{25574,25790,25828,25879,25946},stats={['subtle blow']=5},type=-1}, + ['BladeFlashEarrings']={item=S{28520,28521},stats={['double attack']=7},type=-1} + ['HeartDudgeonEarrings']={item=S{28522,28523},stats={['dual wield']=7},type=-1} } From 68594225320945595c6661f34d6ca1a006e0eada Mon Sep 17 00:00:00 2001 From: Allonte Date: Wed, 24 Jul 2019 10:02:42 -0700 Subject: [PATCH 02/17] tabs to space-tabs --- addons/checkparam/checkparam.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index adfe103a0..01fe4d2b0 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -316,6 +316,6 @@ combination={ ['jhakri']={item=S{25578,25794,25832,25883,25950},stats={['fast cast']=3},type=-1}, ['meghanada']={item=S{25575,25791,25829,25880,25947},stats={['regen']=3},type=-1}, ['Sulevia\'s']={item=S{25574,25790,25828,25879,25946},stats={['subtle blow']=5},type=-1}, - ['BladeFlashEarrings']={item=S{28520,28521},stats={['double attack']=7},type=-1} - ['HeartDudgeonEarrings']={item=S{28522,28523},stats={['dual wield']=7},type=-1} + ['BladeFlashEarrings']={item=S{28520,28521},stats={['double attack']=7},type=-1} + ['HeartDudgeonEarrings']={item=S{28522,28523},stats={['dual wield']=7},type=-1} } From 8b618ea4088df3dbc1a28327bc3d76ec6c3b4ca5 Mon Sep 17 00:00:00 2001 From: Allonte Date: Wed, 24 Jul 2019 14:44:00 -0700 Subject: [PATCH 03/17] Missed a comma --- addons/checkparam/checkparam.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 01fe4d2b0..ab6c81f8b 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -316,6 +316,6 @@ combination={ ['jhakri']={item=S{25578,25794,25832,25883,25950},stats={['fast cast']=3},type=-1}, ['meghanada']={item=S{25575,25791,25829,25880,25947},stats={['regen']=3},type=-1}, ['Sulevia\'s']={item=S{25574,25790,25828,25879,25946},stats={['subtle blow']=5},type=-1}, - ['BladeFlashEarrings']={item=S{28520,28521},stats={['double attack']=7},type=-1} + ['BladeFlashEarrings']={item=S{28520,28521},stats={['double attack']=7},type=-1}, ['HeartDudgeonEarrings']={item=S{28522,28523},stats={['dual wield']=7},type=-1} } From 757d59050c4dd12f30a8b4eec20b1b4b7c4b5781 Mon Sep 17 00:00:00 2001 From: Allonte Date: Wed, 24 Jul 2019 17:59:51 -0700 Subject: [PATCH 04/17] Add in support to display stat caps - Add in support (display and color code) the params relative to the know (hard) cap - Do not display stat params that are converted to other stats --- addons/checkparam/checkparam.lua | 50 ++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index ab6c81f8b..e650d07f1 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -26,8 +26,8 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.]] _addon.name = 'Checkparam' -_addon.author = 'from20020516' -_addon.version = '1.2' +_addon.author = 'from20020516 & Kigen' +_addon.version = '1.3' _addon.commands = {'cp','checkparam'} require('logger') @@ -35,6 +35,7 @@ res = require('resources') extdata = require('extdata') config = require('config') packets = require('packets') +require('math') defaults = { WAR = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage', @@ -150,7 +151,12 @@ function split_text(id,text,arg) if key == "blood pact damage" then key = "pet: blood pact damage" end - tbl[key] = tonumber(value)+(tbl[key] or 0) + if key == "damage taken" then + tbl['physical damage taken'] = tonumber(value)+(tbl['physical damage taken'] or 0) + tbl['magic damage taken'] = tonumber(value)+(tbl['magic damage taken'] or 0) + else + tbl[key] = tonumber(value)+(tbl[key] or 0) + end if settings.debugmode then log(id,res.items[id].english,key,value,tbl[key]) end @@ -175,9 +181,25 @@ function show_results(name,mjob,sjob) local head = '<'..mjob..'/'..(sjob or '')..'>' windower.add_to_chat(160,string.color(name,1,160)..': '..string.color(head,160,160)) for index,key in ipairs(windower.regex.split(stats,'[|]')) do - local value = tbl[string.lower(key)] - local color = {value and 1 or 160,value and 166 or 160} - windower.add_to_chat(160,' ['..string.color(key,color[1],160)..'] '..string.color(tostring(value),color[2],160)) + -- WA for blood pact damage showing when it is converted to pet: blood pact damage + -- WA for damage taken showing when it is converted to physical/magic damage taken + key = string.lower(key) + if key ~= 'blood pact damage' and key ~= 'damage taken' then + local value = tbl[key] + local color = {value and 1 or 160,value and 166 or 160, 106, 205, 61} + local stat_cap = caps[key] + local output_string = ' ['..string.color(key,color[1],160)..']' + if stat_cap == nil or value == nil then + output_string = output_string..' '..string.color(tostring(value),color[2],160) + elseif value == stat_cap then + output_string = output_string..' '..string.color(tostring(value),color[3],160)..'/'..string.color(tostring(stat_cap),155,160) + elseif math.abs(value) > math.abs(stat_cap) then + output_string = output_string..' '..string.color(tostring(value),color[4],160)..'/'..string.color(tostring(stat_cap),155,160) + else + output_string = output_string..' '..string.color(tostring(value),color[5],160)..'/'..string.color(tostring(stat_cap),155,160) + end + windower.add_to_chat(160,output_string) + end end tbl = {} end @@ -319,3 +341,19 @@ combination={ ['BladeFlashEarrings']={item=S{28520,28521},stats={['double attack']=7},type=-1}, ['HeartDudgeonEarrings']={item=S{28522,28523},stats={['dual wield']=7},type=-1} } + +caps={ + ['haste']=25, + ['subtle blow']=50, + ['cure potency']=50, + ['potency of cure effects received']=30, + ['physical damage taken']=25, + ['magic damage taken']=25, + ['pet: haste']=80, + ['magic burst damage']=40, + ['blood pact delay']=-15, + ['blood pact delay ii']=-15, + ['save tp']=500, + ['fast cast']=80, + ['reward']=50 +} \ No newline at end of file From 0229bf1034fee5acdad11755db504442f2ae66e4 Mon Sep 17 00:00:00 2001 From: Allonte Date: Wed, 24 Jul 2019 18:06:16 -0700 Subject: [PATCH 05/17] PDT/MDT should be negative --- addons/checkparam/checkparam.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index e650d07f1..1255f6909 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -347,8 +347,8 @@ caps={ ['subtle blow']=50, ['cure potency']=50, ['potency of cure effects received']=30, - ['physical damage taken']=25, - ['magic damage taken']=25, + ['physical damage taken']=-25, + ['magic damage taken']=-25, ['pet: haste']=80, ['magic burst damage']=40, ['blood pact delay']=-15, From f7814518ae371eb31660d2b52a5e0efb024de71d Mon Sep 17 00:00:00 2001 From: Allonte Date: Sat, 3 Aug 2019 11:57:02 -0700 Subject: [PATCH 06/17] Add support for the alias "Quick Cast" Quick Cast is the alias for 'occassionally quickens spellcasting' that caps out at 10% --- addons/checkparam/checkparam.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 1255f6909..281426902 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -40,9 +40,9 @@ require('math') defaults = { WAR = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage', MNK = 'store tp|double attack|triple attack|quadruple attack|martial arts|subtle blow', - WHM = 'cure potency|cure potency ii|fast cast|cure spellcasting time|enmity|healing magic casting time|divine benison|damage taken|physical damage taken|magic damage taken', + WHM = 'cure potency|cure potency ii|fast cast|quick cast|cure spellcasting time|enmity|healing magic casting time|divine benison|damage taken|physical damage taken|magic damage taken', BLM = 'magic attack bonus|magic burst damage|magic burst damage ii|int|magic accuracy|magic damage|fast cast|elemental magic casting time', - RDM = 'magic attack bonus|magic burst damage|magic burst damage ii|magic accuracy|fast cast|enfeebling magic skill|enhancing magic skill|store tp|dual wield', + RDM = 'magic attack bonus|magic burst damage|magic burst damage ii|magic accuracy|fast cast|quick cast|enfeebling magic skill|enhancing magic skill|store tp|dual wield', THF = 'store tp|double attack|triple attack|quadruple attack|dual wield|critical hit rate|critical hit damage|haste|weapon skill damage', PLD = 'enmity|damage taken|physical damage taken|magic damage taken|spell interruption rate|phalanx|cure potency|fastcast', DRK = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage', @@ -230,6 +230,8 @@ integrate = { ['mag dmg'] = 'magic damage', ['crithit rate'] = 'critical hit rate', ['phys dmg taken'] = 'physical damage taken', + ['occ. quickens spellcasting']="quick cast", + ['occassionally quickens spellcasting']="quick cast" } enhanced = { [10392] = 'cursna+10', --Malison Medallion @@ -347,6 +349,7 @@ caps={ ['subtle blow']=50, ['cure potency']=50, ['potency of cure effects received']=30, + ['quick cast']=10, ['physical damage taken']=-25, ['magic damage taken']=-25, ['pet: haste']=80, From 9f53ad65e40c424eb1cf231013960718f12e374d Mon Sep 17 00:00:00 2001 From: funkworkz Date: Fri, 9 Aug 2019 09:57:51 -0500 Subject: [PATCH 07/17] Update setbgm.lua Song names released with the soundtrack FINAL FANTASY XI Gifts from Vana'diel: Songs of Rebirth OST. --- addons/setbgm/setbgm.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/setbgm/setbgm.lua b/addons/setbgm/setbgm.lua index 383a9f73d..045b65d79 100644 --- a/addons/setbgm/setbgm.lua +++ b/addons/setbgm/setbgm.lua @@ -54,7 +54,7 @@ songs = { [50]='Feast of the Ladies', [51]='Abyssea - Scarlet Skies, Shadowed Plains', [52]='Melodies Errant', [53]='Shinryu', [54]='Everlasting Bonds', [55]='Provenance Watcher', [56]='Where it All Begins', [57]='Steel Sings, Blades Dance', [58]='A New Direction', [59]='The Pioneers', [60]='Into Lands Primeval - Ulbuka', [61]="Water's Umbral Knell", [62]='Keepers of the Wild', [63]='The Sacred City of Adoulin', [64]='Breaking Ground', [65]='Hades', [66]='Arciela', [67]='Mog Resort', [68]='Worlds Away', [69]="Distant Worlds (Nanaa Mihgo's version)", [70]='Monstrosity', [71]="The Pioneers (Nanaa Mihgo's version)", [72]='The Serpentine Labyrinth', [73]='The Divine', [74]='Clouds Over Ulbuka', [75]='The Price', [76]='Forever Today', [77]='Distant Worlds (Instrumental)', [78]='Forever Today (Instrumental)', [79]='Iroha', - [80]='The Boundless Black', [81]='Isle of the Gods', [82]='Wail of the Void', [83]="Rhapsodies of Vana'diel", [84]="Mount", [85]="Ambuscade", [86]="FFRK Shadow Lord", [87]="Omen", [88]="Dynamis - Divergence", [89]="Dynamis - Divergence (Wave 3)", [90]="Iroha's Theme (BCNM)", + [80]='The Boundless Black', [81]='Isle of the Gods', [82]='Wail of the Void', [83]="Rhapsodies of Vana'diel", [84]="Full Speed Ahead!", [85]="Times Grow Tense", [86]="Shadow Lord (Record Keeper Remix)", [87]="For a Friend", [88]="Between Dreams and Reality", [89]="Disjoined One", [90]="Winds of Change", [101]='Battle Theme', [102]='Battle in the Dungeon #2', [103]='Battle Theme #2', [104]='A Road Once Traveled', [105]='Mhaura', [106]='Voyager', [107]="The Kingdom of San d'Oria", [108]="Vana'diel March", [109]='Ronfaure', [110]='The Grand Duchy of Jeuno', [111]='Blackout', [112]='Selbina', [113]='Sarutabaruta', [114]='Batallia Downs', [115]='Battle in the Dungeon', [116]='Gustaberg', [117]="Ru'Lude Gardens", [118]='Rolanberry Fields', [119]='Awakening', [120]="Vana'diel March #2", [121]='Shadow Lord', [122]='One Last Time', [123]='Hopelessness', [124]='Recollection', [125]='Tough Battle', [126]='Mog House', [127]='Anxiety', [128]='Airship', [129]='Hook, Line and Sinker', From f28e6c6b229a72fbe28e92fd5a29334901dd8608 Mon Sep 17 00:00:00 2001 From: Allonte Date: Wed, 21 Aug 2019 08:16:43 -0700 Subject: [PATCH 08/17] Update checkparam.lua - Add "Sneak Attack" to default THF - Add "Trick Attack" to default THF - Allow "Song Duration" to be bundled with "Song Effect Duration". --- addons/checkparam/checkparam.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 281426902..02809a714 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -43,7 +43,7 @@ defaults = { WHM = 'cure potency|cure potency ii|fast cast|quick cast|cure spellcasting time|enmity|healing magic casting time|divine benison|damage taken|physical damage taken|magic damage taken', BLM = 'magic attack bonus|magic burst damage|magic burst damage ii|int|magic accuracy|magic damage|fast cast|elemental magic casting time', RDM = 'magic attack bonus|magic burst damage|magic burst damage ii|magic accuracy|fast cast|quick cast|enfeebling magic skill|enhancing magic skill|store tp|dual wield', - THF = 'store tp|double attack|triple attack|quadruple attack|dual wield|critical hit rate|critical hit damage|haste|weapon skill damage', + THF = 'store tp|double attack|triple attack|quadruple attack|dual wield|critical hit rate|critical hit damage|haste|weapon skill damage|steal|sneak attack|trick attack', PLD = 'enmity|damage taken|physical damage taken|magic damage taken|spell interruption rate|phalanx|cure potency|fastcast', DRK = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage', BST = 'pet: double attack|pet: magic attack bonus|pet: damage taken', @@ -231,7 +231,8 @@ integrate = { ['crithit rate'] = 'critical hit rate', ['phys dmg taken'] = 'physical damage taken', ['occ. quickens spellcasting']="quick cast", - ['occassionally quickens spellcasting']="quick cast" + ['occassionally quickens spellcasting']="quick cast", + ['song duration']="song effect duration", } enhanced = { [10392] = 'cursna+10', --Malison Medallion From fd9fedfa3af1ffbd362190f232d41de1bd8e2aa8 Mon Sep 17 00:00:00 2001 From: Allonte Date: Wed, 21 Aug 2019 19:59:03 -0700 Subject: [PATCH 09/17] Update checkparam.lua - Add Singing, Wind, and String skill by default to BRD - Add in Aoido's Matinee and Legato Dagget values to Song Effect Duration --- addons/checkparam/checkparam.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 02809a714..dd7f80a4a 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -47,7 +47,7 @@ defaults = { PLD = 'enmity|damage taken|physical damage taken|magic damage taken|spell interruption rate|phalanx|cure potency|fastcast', DRK = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage', BST = 'pet: double attack|pet: magic attack bonus|pet: damage taken', - BRD = 'all songs|song effect duration|fast cast|song spellcasting time', + BRD = 'all songs|song effect duration|fast cast|song spellcasting time|singing skill|wind skill|string skill', RNG = 'store tp|snapshot|rapid shot|weapon skill damage', SAM = 'store tp|double attack|triple attack|quadruple attack|weapon skill damage', NIN = 'store tp|double attack|triple attack|quadruple attack|subtle blow', @@ -304,6 +304,8 @@ enhanced = { [28619] = 'cursna+15', --Mending Cape [28631] = 'elemental siphon+30', --Conveyance Cape [28637] = 'fast cast+7', --Lifestream Cape + [11618] = 'song effect duration+10', -- Aoidos' Matinee + [20629] = 'song effect duration+5', -- Legato Dagger } combination={ ['af']={item=S{ From c98ae188b05c00f8e63c5077386b77c78ab5c9a4 Mon Sep 17 00:00:00 2001 From: Allonte Date: Mon, 26 Aug 2019 18:01:38 -0700 Subject: [PATCH 10/17] Bugfix in Integrate Key - Resolve issue where 'blood pact ab. del. ii' could never be found (on such items as Conveyance Cape) due to the period being stripped from the string. --- addons/checkparam/checkparam.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index dd7f80a4a..725580ca0 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -150,8 +150,7 @@ function split_text(id,text,arg) local key = arg and arg..key or key if key == "blood pact damage" then key = "pet: blood pact damage" - end - if key == "damage taken" then + elseif key == "damage taken" then tbl['physical damage taken'] = tonumber(value)+(tbl['physical damage taken'] or 0) tbl['magic damage taken'] = tonumber(value)+(tbl['magic damage taken'] or 0) else @@ -213,7 +212,7 @@ integrate = { ['dblatk'] = 'double attack', ['blood pact ability delay'] = 'blood pact delay', ['blood pact ability delay ii'] = 'blood pact delay ii', - ['blood pact ab. del. ii'] = 'blood pact delay ii', + ['blood pact ab del ii'] = 'blood pact delay ii', ['blood pact recast time ii'] = 'blood pact delay ii', ['blood pact dmg'] = 'blood pact damage', ['enhancing magic duration'] = 'enhancing magic effect duration', From 936695af59c85761d0c84edda8e4acfa2dd82b7d Mon Sep 17 00:00:00 2001 From: Allonte Date: Mon, 26 Aug 2019 18:02:28 -0700 Subject: [PATCH 11/17] Tab to Space --- addons/checkparam/checkparam.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 725580ca0..4f16d2230 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -212,7 +212,7 @@ integrate = { ['dblatk'] = 'double attack', ['blood pact ability delay'] = 'blood pact delay', ['blood pact ability delay ii'] = 'blood pact delay ii', - ['blood pact ab del ii'] = 'blood pact delay ii', + ['blood pact ab del ii'] = 'blood pact delay ii', ['blood pact recast time ii'] = 'blood pact delay ii', ['blood pact dmg'] = 'blood pact damage', ['enhancing magic duration'] = 'enhancing magic effect duration', From 0a6d47fb78fb4579d109335f96d7cdf528fa6ab9 Mon Sep 17 00:00:00 2001 From: Allonte Date: Mon, 26 Aug 2019 18:38:57 -0700 Subject: [PATCH 12/17] Bugfix Pet: Haste I could not confirm that gear "Pet: Haste" could go beyond 25%. Setting cap to 25%. --- addons/checkparam/checkparam.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/checkparam/checkparam.lua b/addons/checkparam/checkparam.lua index 4f16d2230..8731d32bb 100644 --- a/addons/checkparam/checkparam.lua +++ b/addons/checkparam/checkparam.lua @@ -354,7 +354,7 @@ caps={ ['quick cast']=10, ['physical damage taken']=-25, ['magic damage taken']=-25, - ['pet: haste']=80, + ['pet: haste']=25, ['magic burst damage']=40, ['blood pact delay']=-15, ['blood pact delay ii']=-15, From 8c22dc8b19e6ed1dc7755aa56bf51885f9b92379 Mon Sep 17 00:00:00 2001 From: Chiaia Date: Wed, 11 Sep 2019 00:40:49 -0400 Subject: [PATCH 13/17] Slip 22 Wind Knife NQ/HQ --- addons/libs/slips.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/libs/slips.lua b/addons/libs/slips.lua index 845fdfff2..adb7feb80 100644 --- a/addons/libs/slips.lua +++ b/addons/libs/slips.lua @@ -34,7 +34,7 @@ slips.items = { [slips.storages[19]] = L{27715, 27866, 27716, 27867, 278, 281, 284, 3680, 3681, 27859, 28149, 27860, 28150, 21107, 21108, 27625, 27626, 26693, 26694, 26707, 26708, 27631, 27632, 26705, 26706, 27854, 27855, 26703, 26704, 3682, 3683, 3684, 3685, 3686, 3687, 3688, 3689, 3690, 3691, 3692, 3693, 3694, 3695, 21097, 21098, 26717, 26718, 26728,26719,26720,26889,26890, 21095, 21096, 26738, 26739, 26729, 26730, 26788, 26946, 27281, 27455, 26789, 3698, 20713, 20714, 26798, 26954, 26799, 26955, 3706, 26956, 26957, 3705, 26964, 26965, 27291, 26967, 27293, 26966, 27292, 26968, 27294, 21153, 21154, 21086, 21087, 25606, 26974, 27111, 27296, 27467, 25607, 26975, 27112, 27297, 27468, 14195, 14830, 14831, 13945, 13946, 14832, 13947, 17058, 13948, 14400, 14392, 14393, 14394, 14395, 14396, 14397, 14398, 14399, 11337, 11329, 11330, 11331, 11332, 11333, 11334, 11335, 11336, 15819, 15820, 15821, 15822, 15823, 15824, 15825, 15826, 3670, 3672, 3661, 3595, 3665, 3668, 3663, 3674, 3667, 191, 28, 153, 151, 198, 202, 142, 134, 137, 340, 341, 334, 335, 337, 339, 336, 342, 338, 3631, 3632, 3625, 3626, 3628, 3630, 3627, 3633, 3629, 25632, 25633, 25604, 25713, 27325, 25714, 27326, 3651, 25711, 25712, 10925, 10948, 10949, 10950, 10951, 10952, 10953, 10954, 10955, 25657, 25756, 25658, 25757}, -- 191 [slips.storages[20]] = L{26740, 26898, 27052, 27237, 27411, 26742, 26900, 27054, 27239, 27413, 26744, 26902, 27056, 27241, 27415, 26746, 26904, 27058, 27243, 27417, 26748, 26906, 27060, 27245, 27419, 26750, 26908, 27062, 27247, 27421, 26752, 26910, 27064, 27249, 27423, 26754, 26912, 27066, 27251, 27425, 26756, 26914, 27068, 27253, 27427, 26758, 26916, 27070, 27255, 27429, 26760, 26918, 27072, 27257, 27431, 26762, 26920, 27074, 27259, 27433, 26764, 26922, 27076, 27261, 27435, 26766, 26924, 27078, 27263, 27437, 26768, 26926, 27080, 27265, 27439, 26770, 26928, 27082, 27267, 27441, 26772, 26930, 27084, 27269, 27443, 26774, 26932, 27086, 27271, 27445, 26776, 26934, 27088, 27273, 27447, 26778, 26936, 27090, 27275, 27449, 26780, 26938, 27092, 27277, 27451, 26782, 26940, 27094, 27279, 27453,}, -- 110 [slips.storages[21]] = L{26741, 26899, 27053, 27238, 27412, 26743, 26901, 27055, 27240, 27414, 26745, 26903, 27057, 27242, 27416, 26747, 26905, 27059, 27244, 27418, 26749, 26907, 27061, 27246, 27420, 26751, 26909, 27063, 27248, 27422, 26753, 26911, 27065, 27250, 27424, 26755, 26913, 27067, 27252, 27426, 26757, 26915, 27069, 27254, 27428, 26759, 26917, 27071, 27256, 27430, 26761, 26919, 27073, 27258, 27432, 26763, 26921, 27075, 27260, 27434, 26765, 26923, 27077, 27262, 27436, 26767, 26925, 27079, 27264, 27438, 26769, 26927, 27081, 27266, 27440, 26771, 26929, 27083, 27268, 27442, 26773, 26931, 27085, 27270, 27444, 26775, 26933, 27087, 27272, 27446, 26777, 26935, 27089, 27274, 27448, 26779, 26937, 27091, 27276, 27450, 26781, 26939, 27093, 27278, 27452, 26783, 26941, 27095, 27280, 27454,}, -- 110 - [slips.storages[22]] = L{25639, 25715, 25638, 3707, 3708, 21074, 26406, 25645, 25726, 25648, 25649, 25650, 25758, 25759, 25672, 25673, 282, 279, 280, 268, 25670, 25671, 26520, 25652, 25669, 22017, 22018, 25586, 25587, 10384, 10385, 22019, 22020, 25722, 25585, 25776, 25677, 25678, 25675, 25679, 20668, 20669, 22069, 25755, 3722, 21608, 3713, 3714, 3715, 3717, 3727, 3728, 20577, 3726, 20666, 20667, 21741, 21609, 3723, 26410, 26411, 25850, 21509, 3725, 3720, 21658, 26524, 20665, 26412, 21965, 21966, 21967, 25774, 25838, 25775, 25839, 26518, 27623, 3719, 20573, 20674, 21742, 21860, 22065, 23731, 26517, 3724, 3721, 21682, 22072, 21820, 21821, 22124, 22132, 3738, 22039, 23730,}, -- 97 + [slips.storages[22]] = L{25639, 25715, 25638, 3707, 3708, 21074, 26406, 25645, 25726, 25648, 25649, 25650, 25758, 25759, 25672, 25673, 282, 279, 280, 268, 25670, 25671, 26520, 25652, 25669, 22017, 22018, 25586, 25587, 10384, 10385, 22019, 22020, 25722, 25585, 25776, 25677, 25678, 25675, 25679, 20668, 20669, 22069, 25755, 3722, 21608, 3713, 3714, 3715, 3717, 3727, 3728, 20577, 3726, 20666, 20667, 21741, 21609, 3723, 26410, 26411, 25850, 21509, 3725, 3720, 21658, 26524, 20665, 26412, 21965, 21966, 21967, 25774, 25838, 25775, 25839, 26518, 27623, 3719, 20573, 20674, 21742, 21860, 22065, 23731, 26517, 3724, 3721, 21682, 22072, 21820, 21821, 22124, 22132, 3738, 22039, 23730, 20578, 20568}, -- 99 [slips.storages[23]] = L{25659, 25745, 25800, 25858, 25925, 25660, 25746, 25801, 25859, 25926, 25663, 25749, 25804, 25862, 25929, 25664, 25750, 25805, 25863, 25930, 25665, 25751, 25806, 25865, 25931, 25666, 25752, 25807, 25866, 25932, 25661, 25747, 25802, 25860, 25927, 25662, 25748, 25803, 25861, 25928, 25667, 25753, 25808, 25867, 25933, 25668, 25754, 25809, 25868, 25934, 25579, 25779, 25818, 25873, 25940, 25580, 25780, 25819, 25874, 25941, 25590, 25764, 25812, 25871, 25937, 25591, 25765, 25813, 25872, 25938, 25581, 25781, 25820, 25875, 25942, 25582, 25782, 25821, 25876, 25943, 25588, 25589, 25762, 25763, 25810, 25811, 25869, 25870, 25935, 25936, 25583, 25783, 25822, 25877, 25944, 25584, 25784, 25823, 25878, 25945, 25574, 25790, 25828, 25879, 25946, 25575, 25791, 25829, 25880, 25947, 25576, 25792, 25830, 25881, 25948, 25577, 25793, 25831, 25882, 25949, 25578, 25794, 25832, 25883, 25950, 26204, 26205, 26206, 26207, 26208, 25569, 25797, 25835, 25886, 25953, 25573, 25796, 25834, 25885, 25952, 25570, 25798, 25836, 25887, 25954, 25572, 25795, 25833, 25884, 25951, 25571, 25799, 25837, 25888, 25955, 26211, 26210, 26212, 26209, 26213, 21863, 22004, 21744, 21272, 20576, 21761, 26409,}, --167 [slips.storages[24]] = L{23040, 23107, 23174, 23241, 23308, 23041, 23108, 23175, 23242, 23309, 23042, 23109, 23176, 23243, 23310, 23043, 23110, 23177, 23244, 23311, 23044, 23111, 23178, 23245, 23312, 23045, 23112, 23179, 23246, 23313, 23046, 23113, 23180, 23247, 23314, 23047, 23114, 23181, 23248, 23315, 23048, 23115, 23182, 23249, 23316, 23049, 23116, 23183, 23250, 23317, 23050, 23117, 23184, 23251, 23318, 23051, 23118, 23185, 23252, 23319, 23052, 23119, 23186, 23253, 23320, 23053, 23120, 23187, 23254, 23321, 23054, 23121, 23188, 23255, 23322, 23055, 23122, 23189, 23256, 23323, 23056, 23123, 23190, 23257, 23324, 23057, 23124, 23191, 23258, 23325, 23058, 23125, 23192, 23259, 23326, 23059, 23126, 23193, 23260, 23327, 23060, 23127, 23194, 23261, 23328, 23061, 23128, 23195, 23262, 23329, 23062, 23129, 23196, 23263, 23330,}, --115 [slips.storages[25]] = L{23375, 23442, 23509, 23576, 23643, 23376, 23443, 23510, 23577, 23644, 23377, 23444, 23511, 23578, 23645, 23378, 23445, 23512, 23579, 23646, 23379, 23446, 23513, 23580, 23647, 23380, 23447, 23514, 23581, 23648, 23381, 23448, 23515, 23582, 23649, 23382, 23449, 23516, 23583, 23650, 23383, 23450, 23517, 23584, 23651, 23384, 23451, 23518, 23585, 23652, 23385, 23452, 23519, 23586, 23653, 23386, 23453, 23520, 23587, 23654, 23387, 23454, 23521, 23588, 23655, 23388, 23455, 23522, 23589, 23656, 23389, 23456, 23523, 23590, 23657, 23390, 23457, 23524, 23591, 23658, 23391, 23458, 23525, 23592, 23659, 23392, 23459, 23526, 23593, 23660, 23393, 23460, 23527, 23594, 23661, 23394, 23461, 23528, 23595, 23662, 23395, 23462, 23529, 23596, 23663, 23396, 23463, 23530, 23597, 23664, 23397, 23464, 23531, 23598, 23665,}, --115 From b2345145e3b0696e815c1c6be5034bde7c715b4f Mon Sep 17 00:00:00 2001 From: Benjamin Johnson Date: Wed, 18 Sep 2019 19:46:19 +0100 Subject: [PATCH 14/17] Update Gearswap to allow for Dispelga Include Dispelga in the check_spell, similar to Impact, as it's a gear-attained spell. --- addons/GearSwap/helper_functions.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/GearSwap/helper_functions.lua b/addons/GearSwap/helper_functions.lua index 2058b23b1..88de35e8c 100644 --- a/addons/GearSwap/helper_functions.lua +++ b/addons/GearSwap/helper_functions.lua @@ -701,9 +701,9 @@ end ---- false if the spell is not currently accessible ----------------------------------------------------------------------------------- function check_spell(available_spells,spell) - -- Filter for spells that you do not know. Exclude Impact. + -- Filter for spells that you do not know. Exclude Impact / Dispelga. local spell_jobs = copy_entry(res.spells[spell.id].levels) - if not available_spells[spell.id] and not (spell.id == 503 or spell.id == 417) then + if not available_spells[spell.id] and not (spell.id == 503 or spell.id == 417 or spell.id == 360) then return false,"Unable to execute command. You do not know that spell ("..(res.spells[spell.id][language] or spell.id)..")" -- Filter for spells that you know, but do not currently have access to elseif (not spell_jobs[player.main_job_id] or not (spell_jobs[player.main_job_id] <= player.main_job_level or From 0d5e2a7126e278f6de4e23cd2c9d8deccde308cd Mon Sep 17 00:00:00 2001 From: posimagi Date: Fri, 20 Sep 2019 12:35:52 -0700 Subject: [PATCH 15/17] Fix parry pronoun --- addons/battlemod/parse_action_packet.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/battlemod/parse_action_packet.lua b/addons/battlemod/parse_action_packet.lua index 396ef4d50..a94786ee3 100644 --- a/addons/battlemod/parse_action_packet.lua +++ b/addons/battlemod/parse_action_packet.lua @@ -227,9 +227,9 @@ function parse_action_packet(act) if m.fields.status then numb = m.status else numb = pref_suf((m.cparam or m.param),m.message) end if msg and m.message == 70 and not simplify then -- fix pronoun on parry - if act.actor.race == 0 then + if v.target[1].race == 0 then msg = msg:gsub(' his ',' its ') - elseif female_races:contains(act.actor.race) then + elseif female_races:contains(v.target[1].race) then msg = msg:gsub(' his ',' her ') end end From b9acf69f15e14bb8d8423fd3cea444dff4e20da6 Mon Sep 17 00:00:00 2001 From: posimagi Date: Fri, 20 Sep 2019 15:25:07 -0700 Subject: [PATCH 16/17] battlemod: handle debuff application messages --- addons/battlemod/parse_action_packet.lua | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/addons/battlemod/parse_action_packet.lua b/addons/battlemod/parse_action_packet.lua index 396ef4d50..9d4f6d0d2 100644 --- a/addons/battlemod/parse_action_packet.lua +++ b/addons/battlemod/parse_action_packet.lua @@ -193,6 +193,26 @@ function parse_action_packet(act) else m.simp_name = act.action.name or '' end + -- Debuff Application Messages + if message_map[82]:contains(m.message) then + if m.status == 'Evasion Down' then + m.message = 237 + end + if m.status == 'addle' then m.status = 'addled' + elseif m.status == 'bind' then m.status = 'bound' + elseif m.status == 'blindness' then m.status = 'blinded' + elseif m.status == 'Inundation' then m.status = 'inundated' + elseif m.status == 'paralysis' then m.status = 'paralyzed' + elseif m.status == 'petrification' then m.status = 'petrified' + elseif m.status == 'poison' then m.status = 'poisoned' + elseif m.status == 'silence' then m.status = 'silenced' + elseif m.status == 'sleep' then m.status = 'asleep' + elseif m.status == 'slow' then m.status = 'slowed' + elseif m.status == 'stun' then m.status = 'stunned' + elseif m.status == 'weight' then m.status = 'weighed down' + end + end + -- if m.message == 93 or m.message == 273 then m.status=color_it('Vanish',color_arr['statuscol']) end -- Special Message Handling From 161b0385fbc796de6a4b8a807650d6cb60405d41 Mon Sep 17 00:00:00 2001 From: Ivaar <7287342+Ivaar@users.noreply.github.com> Date: Wed, 2 Oct 2019 00:27:40 -0700 Subject: [PATCH 17/17] Slips.lua: correct item order for ayanmo/add wardrobes --- addons/libs/slips.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/libs/slips.lua b/addons/libs/slips.lua index adb7feb80..f73746fd5 100644 --- a/addons/libs/slips.lua +++ b/addons/libs/slips.lua @@ -10,7 +10,7 @@ local slips = {} _libs.slips = slips -slips.default_storages = {'inventory', 'safe', 'storage', 'locker', 'satchel', 'sack', 'case', 'wardrobe', 'safe2'} +slips.default_storages = {'inventory', 'safe', 'storage', 'locker', 'satchel', 'sack', 'case', 'wardrobe', 'safe2', 'wardrobe2', 'wardrobe3', 'wardrobe4'} slips.storages = L{29312, 29313, 29314, 29315, 29316, 29317, 29318, 29319, 29320, 29321, 29322, 29323, 29324, 29325, 29326, 29327, 29328, 29329, 29330, 29331, 29332, 29333, 29334, 29335, 29336, 29337, 29338, 29339} slips.items = { [slips.storages[1]] = L{16084, 14546, 14961, 15625, 15711, 16085, 14547, 14962, 15626, 15712, 16086, 14548, 14963, 15627, 15713, 16087, 14549, 14964, 15628, 15714, 16088, 14550, 14965, 15629, 15715, 16089, 14551, 14966, 15630, 15716, 16090, 14552, 14967, 15631, 15717, 16091, 14553, 14968, 15632, 15718, 16092, 14554, 14969, 15633, 15719, 16093, 14555, 14970, 15634, 15720, 16094, 14556, 14971, 15635, 15721, 16095, 14557, 14972, 15636, 15722, 16096, 14558, 14973, 15637, 15723, 16097, 14559, 14974, 15638, 15724, 16098, 14560, 14975, 15639, 15725, 16099, 14561, 14976, 15640, 15726, 16100, 14562, 14977, 15641, 15727, 16101, 14563, 14978, 15642, 15728, 16102, 14564, 14979, 15643, 15729, 16103, 14565, 14980, 15644, 15730, 16106, 14568, 14983, 15647, 15733, 16107, 14569, 14984, 15648, 15734, 16108, 14570, 14985, 15649, 15735, 16602, 17741, 18425, 18491, 18588, 18717, 18718, 18850, 18943, 16069, 14530, 14940, 15609, 15695, 16062, 14525, 14933, 15604, 15688, 16064, 14527, 14935, 15606, 15690, 18685, 18065, 17851, 18686, 18025, 18435, 18113, 17951, 17715, 18485, 18408, 18365, 18583, 18417, 18388, 16267, 16268, 16269, 16228, 16229, 15911, 15799, 15800, 15990, 17745, 18121, 16117, 14577, 17857}, -- 168 @@ -35,7 +35,7 @@ slips.items = { [slips.storages[20]] = L{26740, 26898, 27052, 27237, 27411, 26742, 26900, 27054, 27239, 27413, 26744, 26902, 27056, 27241, 27415, 26746, 26904, 27058, 27243, 27417, 26748, 26906, 27060, 27245, 27419, 26750, 26908, 27062, 27247, 27421, 26752, 26910, 27064, 27249, 27423, 26754, 26912, 27066, 27251, 27425, 26756, 26914, 27068, 27253, 27427, 26758, 26916, 27070, 27255, 27429, 26760, 26918, 27072, 27257, 27431, 26762, 26920, 27074, 27259, 27433, 26764, 26922, 27076, 27261, 27435, 26766, 26924, 27078, 27263, 27437, 26768, 26926, 27080, 27265, 27439, 26770, 26928, 27082, 27267, 27441, 26772, 26930, 27084, 27269, 27443, 26774, 26932, 27086, 27271, 27445, 26776, 26934, 27088, 27273, 27447, 26778, 26936, 27090, 27275, 27449, 26780, 26938, 27092, 27277, 27451, 26782, 26940, 27094, 27279, 27453,}, -- 110 [slips.storages[21]] = L{26741, 26899, 27053, 27238, 27412, 26743, 26901, 27055, 27240, 27414, 26745, 26903, 27057, 27242, 27416, 26747, 26905, 27059, 27244, 27418, 26749, 26907, 27061, 27246, 27420, 26751, 26909, 27063, 27248, 27422, 26753, 26911, 27065, 27250, 27424, 26755, 26913, 27067, 27252, 27426, 26757, 26915, 27069, 27254, 27428, 26759, 26917, 27071, 27256, 27430, 26761, 26919, 27073, 27258, 27432, 26763, 26921, 27075, 27260, 27434, 26765, 26923, 27077, 27262, 27436, 26767, 26925, 27079, 27264, 27438, 26769, 26927, 27081, 27266, 27440, 26771, 26929, 27083, 27268, 27442, 26773, 26931, 27085, 27270, 27444, 26775, 26933, 27087, 27272, 27446, 26777, 26935, 27089, 27274, 27448, 26779, 26937, 27091, 27276, 27450, 26781, 26939, 27093, 27278, 27452, 26783, 26941, 27095, 27280, 27454,}, -- 110 [slips.storages[22]] = L{25639, 25715, 25638, 3707, 3708, 21074, 26406, 25645, 25726, 25648, 25649, 25650, 25758, 25759, 25672, 25673, 282, 279, 280, 268, 25670, 25671, 26520, 25652, 25669, 22017, 22018, 25586, 25587, 10384, 10385, 22019, 22020, 25722, 25585, 25776, 25677, 25678, 25675, 25679, 20668, 20669, 22069, 25755, 3722, 21608, 3713, 3714, 3715, 3717, 3727, 3728, 20577, 3726, 20666, 20667, 21741, 21609, 3723, 26410, 26411, 25850, 21509, 3725, 3720, 21658, 26524, 20665, 26412, 21965, 21966, 21967, 25774, 25838, 25775, 25839, 26518, 27623, 3719, 20573, 20674, 21742, 21860, 22065, 23731, 26517, 3724, 3721, 21682, 22072, 21820, 21821, 22124, 22132, 3738, 22039, 23730, 20578, 20568}, -- 99 - [slips.storages[23]] = L{25659, 25745, 25800, 25858, 25925, 25660, 25746, 25801, 25859, 25926, 25663, 25749, 25804, 25862, 25929, 25664, 25750, 25805, 25863, 25930, 25665, 25751, 25806, 25865, 25931, 25666, 25752, 25807, 25866, 25932, 25661, 25747, 25802, 25860, 25927, 25662, 25748, 25803, 25861, 25928, 25667, 25753, 25808, 25867, 25933, 25668, 25754, 25809, 25868, 25934, 25579, 25779, 25818, 25873, 25940, 25580, 25780, 25819, 25874, 25941, 25590, 25764, 25812, 25871, 25937, 25591, 25765, 25813, 25872, 25938, 25581, 25781, 25820, 25875, 25942, 25582, 25782, 25821, 25876, 25943, 25588, 25589, 25762, 25763, 25810, 25811, 25869, 25870, 25935, 25936, 25583, 25783, 25822, 25877, 25944, 25584, 25784, 25823, 25878, 25945, 25574, 25790, 25828, 25879, 25946, 25575, 25791, 25829, 25880, 25947, 25576, 25792, 25830, 25881, 25948, 25577, 25793, 25831, 25882, 25949, 25578, 25794, 25832, 25883, 25950, 26204, 26205, 26206, 26207, 26208, 25569, 25797, 25835, 25886, 25953, 25573, 25796, 25834, 25885, 25952, 25570, 25798, 25836, 25887, 25954, 25572, 25795, 25833, 25884, 25951, 25571, 25799, 25837, 25888, 25955, 26211, 26210, 26212, 26209, 26213, 21863, 22004, 21744, 21272, 20576, 21761, 26409,}, --167 + [slips.storages[23]] = L{25659, 25745, 25800, 25858, 25925, 25660, 25746, 25801, 25859, 25926, 25663, 25749, 25804, 25862, 25929, 25664, 25750, 25805, 25863, 25930, 25665, 25751, 25806, 25865, 25931, 25666, 25752, 25807, 25866, 25932, 25661, 25747, 25802, 25860, 25927, 25662, 25748, 25803, 25861, 25928, 25667, 25753, 25808, 25867, 25933, 25668, 25754, 25809, 25868, 25934, 25579, 25779, 25818, 25873, 25940, 25580, 25780, 25819, 25874, 25941, 25590, 25764, 25812, 25871, 25937, 25591, 25765, 25813, 25872, 25938, 25581, 25781, 25820, 25875, 25942, 25582, 25782, 25821, 25876, 25943, 25588, 25762, 25810, 25869, 25935, 25589, 25763, 25811, 25870, 25936, 25583, 25783, 25822, 25877, 25944, 25584, 25784, 25823, 25878, 25945, 25574, 25790, 25828, 25879, 25946, 25575, 25791, 25829, 25880, 25947, 25576, 25792, 25830, 25881, 25948, 25577, 25793, 25831, 25882, 25949, 25578, 25794, 25832, 25883, 25950, 26204, 26205, 26206, 26207, 26208, 25569, 25797, 25835, 25886, 25953, 25573, 25796, 25834, 25885, 25952, 25570, 25798, 25836, 25887, 25954, 25572, 25795, 25833, 25884, 25951, 25571, 25799, 25837, 25888, 25955, 26211, 26210, 26212, 26209, 26213, 21863, 22004, 21744, 21272, 20576, 21761, 26409,}, --167 [slips.storages[24]] = L{23040, 23107, 23174, 23241, 23308, 23041, 23108, 23175, 23242, 23309, 23042, 23109, 23176, 23243, 23310, 23043, 23110, 23177, 23244, 23311, 23044, 23111, 23178, 23245, 23312, 23045, 23112, 23179, 23246, 23313, 23046, 23113, 23180, 23247, 23314, 23047, 23114, 23181, 23248, 23315, 23048, 23115, 23182, 23249, 23316, 23049, 23116, 23183, 23250, 23317, 23050, 23117, 23184, 23251, 23318, 23051, 23118, 23185, 23252, 23319, 23052, 23119, 23186, 23253, 23320, 23053, 23120, 23187, 23254, 23321, 23054, 23121, 23188, 23255, 23322, 23055, 23122, 23189, 23256, 23323, 23056, 23123, 23190, 23257, 23324, 23057, 23124, 23191, 23258, 23325, 23058, 23125, 23192, 23259, 23326, 23059, 23126, 23193, 23260, 23327, 23060, 23127, 23194, 23261, 23328, 23061, 23128, 23195, 23262, 23329, 23062, 23129, 23196, 23263, 23330,}, --115 [slips.storages[25]] = L{23375, 23442, 23509, 23576, 23643, 23376, 23443, 23510, 23577, 23644, 23377, 23444, 23511, 23578, 23645, 23378, 23445, 23512, 23579, 23646, 23379, 23446, 23513, 23580, 23647, 23380, 23447, 23514, 23581, 23648, 23381, 23448, 23515, 23582, 23649, 23382, 23449, 23516, 23583, 23650, 23383, 23450, 23517, 23584, 23651, 23384, 23451, 23518, 23585, 23652, 23385, 23452, 23519, 23586, 23653, 23386, 23453, 23520, 23587, 23654, 23387, 23454, 23521, 23588, 23655, 23388, 23455, 23522, 23589, 23656, 23389, 23456, 23523, 23590, 23657, 23390, 23457, 23524, 23591, 23658, 23391, 23458, 23525, 23592, 23659, 23392, 23459, 23526, 23593, 23660, 23393, 23460, 23527, 23594, 23661, 23394, 23461, 23528, 23595, 23662, 23395, 23462, 23529, 23596, 23663, 23396, 23463, 23530, 23597, 23664, 23397, 23464, 23531, 23598, 23665,}, --115 [slips.storages[26]] = L{23063, 23130, 23197, 23264, 23331, 23064, 23131, 23198, 23265, 23332, 23065, 23132, 23199, 23266, 23333, 23066, 23133, 23200, 23267, 23334, 23067, 23134, 23201, 23268, 23335, 23068, 23135, 23202, 23269, 23336, 23069, 23136, 23203, 23270, 23337, 23070, 23137, 23204, 23271, 23338, 23071, 23138, 23205, 23272, 23339, 23072, 23139, 23206, 23273, 23340, 23073, 23140, 23207, 23274, 23341, 23074, 23141, 23208, 23274, 23342, 23075, 23142, 23209, 23276, 23343, 23076, 23143, 23210, 23277, 23344, 23077, 23144, 23211, 23278, 23345, 23078, 23145, 23212, 23279, 23346, 23079, 23146, 23213, 23280, 23347, 23080, 23147, 23214, 23281, 23348, 23081, 23148, 23215, 23282, 23349, 23082, 23149, 23216, 23283, 23350, 23083, 23150, 23217, 23284, 23351, 23084, 23151, 23218, 23285, 23352,}, --110