Skip to content

Commit 17d302d

Browse files
Blitz54Blitz54
authored
Merge branch 'PathOfBuildingCommunity:dev' into spectres
2 parents f709c73 + 42b786d commit 17d302d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+909
-478
lines changed

‎src/Classes/ImportTab.lua

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,6 +941,19 @@ function ImportTabClass:ImportItem(itemData, slotName)
941941
end
942942
end
943943

944+
if itemData.grantedSkills then
945+
for _, grantedSkillInfo in ipairs(itemData.grantedSkills) do
946+
local level = grantedSkillInfo.values and #grantedSkillInfo.values > 0 and #grantedSkillInfo.values[1] > 0 and grantedSkillInfo.values[1][1] or "unknown"
947+
local grantedSkills = string.format(
948+
"%s: %s",
949+
grantedSkillInfo.name,
950+
level
951+
)
952+
local modList, extra = modLib.parseMod(grantedSkills)
953+
t_insert(item.implicitModLines, { line = grantedSkills, extra = extra, mods = modList or { } })
954+
end
955+
end
956+
944957
-- Sometimes flavour text has actual mods that PoB cares about
945958
-- Right now, the only known one is "This item can be anointed by Cassia"
946959
if itemData.flavourText then
@@ -986,7 +999,11 @@ function ImportTabClass:ImportItem(itemData, slotName)
986999
else
9871000
self.build.itemsTab:AddItem(item, true)
9881001
end
989-
self.build.itemsTab.slots[slotName]:SetSelItemId(item.id)
1002+
if self.build.itemsTab.slots[slotName] then
1003+
self.build.itemsTab.slots[slotName]:SetSelItemId(item.id)
1004+
else
1005+
ConPrintf("Unrecognised slot name in imported item: %s", slotName)
1006+
end
9901007
end
9911008
end
9921009

‎src/Classes/ModDB.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ function ModDBClass:SumInternal(context, modType, cfg, flags, keywordFlags, sour
9696
if modList then
9797
for i = 1, #modList do
9898
local mod = modList[i]
99-
if mod.type == modType and band(flags, mod.flags) == mod.flags and MatchKeywordFlags(keywordFlags, mod.keywordFlags) and (not source or ( mod.source and mod.source:match("[^:]+") == source )) then
99+
if mod.type == modType and band(flags, mod.flags) == mod.flags and MatchKeywordFlags(keywordFlags, mod.keywordFlags) and (not source or ( mod.source and (mod.source:match("[^:]+") == source or mod.source == source))) then
100100
if mod[1] then
101101
local value = context:EvalMod(mod, cfg) or 0
102102
if mod[1].globalLimit and mod[1].globalLimitKey then

‎src/Classes/PassiveTreeView.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ function PassiveTreeViewClass:AddNodeTooltip(tooltip, node, build, incSmallPassi
11221122
self:AddNodeName(tooltip, node, build)
11231123
end
11241124
tooltip:AddSeparator(14)
1125-
if socket:IsEnabled() then
1125+
if socket ~= nil and socket:IsEnabled() then
11261126
tooltip:AddLine(14, colorCodes.TIP.."Tip: Right click this socket to go to the items page and choose the jewel for this socket.")
11271127
end
11281128
tooltip:AddLine(14, colorCodes.TIP.."Tip: Hold Shift or Ctrl to hide this tooltip.")

‎src/Data/Bases/sceptre.lua

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ itemBases["Rattling Sceptre"] = {
77
quality = 20,
88
spirit = 100,
99
tags = { default = true, onehand = true, sceptre = true, },
10-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
10+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
1111
implicitModTypes = { },
1212
req = { },
1313
}
@@ -25,7 +25,7 @@ itemBases["Lupine Sceptre"] = {
2525
quality = 20,
2626
spirit = 100,
2727
tags = { default = true, onehand = true, sceptre = true, },
28-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
28+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
2929
implicitModTypes = { },
3030
req = { },
3131
}
@@ -43,7 +43,7 @@ itemBases["Ochre Sceptre"] = {
4343
quality = 20,
4444
spirit = 100,
4545
tags = { default = true, onehand = true, sceptre = true, },
46-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
46+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
4747
implicitModTypes = { },
4848
req = { },
4949
}
@@ -79,7 +79,7 @@ itemBases["Devouring Sceptre"] = {
7979
quality = 20,
8080
spirit = 100,
8181
tags = { default = true, onehand = true, sceptre = true, },
82-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
82+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
8383
implicitModTypes = { },
8484
req = { },
8585
}
@@ -88,7 +88,7 @@ itemBases["Clasped Sceptre"] = {
8888
quality = 20,
8989
spirit = 100,
9090
tags = { default = true, onehand = true, sceptre = true, },
91-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
91+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
9292
implicitModTypes = { },
9393
req = { },
9494
}
@@ -97,7 +97,7 @@ itemBases["Devotional Sceptre"] = {
9797
quality = 20,
9898
spirit = 100,
9999
tags = { default = true, onehand = true, sceptre = true, },
100-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
100+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
101101
implicitModTypes = { },
102102
req = { },
103103
}
@@ -106,7 +106,7 @@ itemBases["Wrath Sceptre"] = {
106106
quality = 20,
107107
spirit = 100,
108108
tags = { default = true, onehand = true, sceptre = true, },
109-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
109+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
110110
implicitModTypes = { },
111111
req = { },
112112
}
@@ -115,7 +115,7 @@ itemBases["Aromatic Sceptre"] = {
115115
quality = 20,
116116
spirit = 100,
117117
tags = { default = true, onehand = true, sceptre = true, },
118-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
118+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
119119
implicitModTypes = { },
120120
req = { },
121121
}
@@ -124,7 +124,7 @@ itemBases["Pious Sceptre"] = {
124124
quality = 20,
125125
spirit = 100,
126126
tags = { default = true, onehand = true, sceptre = true, },
127-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
127+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
128128
implicitModTypes = { },
129129
req = { },
130130
}
@@ -133,7 +133,7 @@ itemBases["Hallowed Sceptre"] = {
133133
quality = 20,
134134
spirit = 100,
135135
tags = { default = true, onehand = true, sceptre = true, },
136-
implicit = "Grants Skill: Level (1-20) Skeletal Warrior",
136+
implicit = "Grants Skill: Level (1-20) Skeletal Warrior Minion",
137137
implicitModTypes = { },
138138
req = { },
139139
}

‎src/Data/Gems.lua

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2107,29 +2107,6 @@ return {
21072107
Tier = 1,
21082108
naturalMaxLevel = 1,
21092109
},
2110-
["Metadata/Items/Gems/SkillGemSoulrend"] = {
2111-
name = "Soulrend",
2112-
baseTypeName = "Soulrend",
2113-
gameId = "Metadata/Items/Gems/SkillGemSoulrend",
2114-
variantId = "Soulrend",
2115-
grantedEffectId = "SoulrendPlayer",
2116-
additionalStatSet1 = "SoulrendDotPlayer",
2117-
tags = {
2118-
intelligence = true,
2119-
grants_active_skill = true,
2120-
spell = true,
2121-
projectile = true,
2122-
chaos = true,
2123-
duration = true,
2124-
},
2125-
gemType = "Spell",
2126-
tagString = "Projectile, Chaos, Duration",
2127-
reqStr = 0,
2128-
reqDex = 0,
2129-
reqInt = 100,
2130-
Tier = 0,
2131-
naturalMaxLevel = 20,
2132-
},
21332110
["Metadata/Items/Gems/SkillGemUnleashSupport"] = {
21342111
name = "Unleash",
21352112
gameId = "Metadata/Items/Gems/SupportGemUnleash",
@@ -2791,7 +2768,7 @@ return {
27912768
reqStr = 0,
27922769
reqDex = 100,
27932770
reqInt = 0,
2794-
Tier = 3,
2771+
Tier = 5,
27952772
naturalMaxLevel = 20,
27962773
},
27972774
["Metadata/Items/Gems/SkillGemLightningSpear"] = {
@@ -4643,11 +4620,12 @@ return {
46434620
grants_active_skill = true,
46444621
attack = true,
46454622
area = true,
4623+
melee = true,
46464624
physical = true,
46474625
channelling = true,
46484626
},
46494627
gemType = "Attack",
4650-
tagString = "AoE, Physical, Channelling",
4628+
tagString = "AoE, Melee, Physical, Channelling",
46514629
reqStr = 0,
46524630
reqDex = 0,
46534631
reqInt = 0,
@@ -5431,6 +5409,27 @@ return {
54315409
Tier = 3,
54325410
naturalMaxLevel = 1,
54335411
},
5412+
["Metadata/Items/Gems/SkillGemSkeletalWarrior"] = {
5413+
name = "Skeletal Warrior",
5414+
baseTypeName = "Skeletal Warrior Minion",
5415+
gameId = "Metadata/Items/Gems/SkillGemSkeletalWarriorWeaponSkill",
5416+
variantId = "SkeletalWarrior",
5417+
grantedEffectId = "SummonSkeletalWarriorsPlayer",
5418+
tags = {
5419+
intelligence = true,
5420+
grants_active_skill = true,
5421+
minion = true,
5422+
persistent = true,
5423+
physical = true,
5424+
},
5425+
gemType = "Minion",
5426+
tagString = "Persistent, Physical",
5427+
reqStr = 0,
5428+
reqDex = 0,
5429+
reqInt = 100,
5430+
Tier = 0,
5431+
naturalMaxLevel = 20,
5432+
},
54345433
["Metadata/Items/Gems/SkillGemMinionInstabilitySupport"] = {
54355434
name = "Minion Instability",
54365435
gameId = "Metadata/Items/Gem/SupportGemMinionInstability",
@@ -9864,28 +9863,6 @@ return {
98649863
Tier = 2,
98659864
naturalMaxLevel = 1,
98669865
},
9867-
["Metadata/Items/Gems/SkillGemHoarfrostSupport"] = {
9868-
name = "Hoarfrost",
9869-
gameId = "Metadata/Items/Gem/SupportGemHoarfrost",
9870-
variantId = "HoarfrostSupport",
9871-
grantedEffectId = "SupportHoarfrostPlayer",
9872-
additionalGrantedEffectId1 = "TriggeredHoarfrostPlayer",
9873-
tags = {
9874-
support = true,
9875-
grants_active_skill = true,
9876-
spell = true,
9877-
area = true,
9878-
cold = true,
9879-
duration = true,
9880-
},
9881-
gemType = "Support",
9882-
tagString = "Spell, AoE, Cold, Duration",
9883-
reqStr = 0,
9884-
reqDex = 0,
9885-
reqInt = 100,
9886-
Tier = 0,
9887-
naturalMaxLevel = 1,
9888-
},
98899866
["Metadata/Items/Gems/SkillGemDeathmarchSupport"] = {
98909867
name = "Deathmarch",
98919868
gameId = "Metadata/Items/Gem/SupportGemDeathmarch",
@@ -11416,6 +11393,28 @@ return {
1141611393
Tier = 7,
1141711394
naturalMaxLevel = 20,
1141811395
},
11396+
["Metadata/Items/Gems/SkillGemCullTheWeak"] = {
11397+
name = "Cull The Weak",
11398+
baseTypeName = "Cull the Weak",
11399+
gameId = "Metadata/Items/Gem/SkillGemCullTheWeak",
11400+
variantId = "CullTheWeak",
11401+
grantedEffectId = "CullTheWeakPlayer",
11402+
tags = {
11403+
dexterity = true,
11404+
grants_active_skill = true,
11405+
attack = true,
11406+
area = true,
11407+
melee = true,
11408+
strike = true,
11409+
},
11410+
gemType = "Attack",
11411+
tagString = "AoE, Melee, Strike",
11412+
reqStr = 0,
11413+
reqDex = 100,
11414+
reqInt = 0,
11415+
Tier = 3,
11416+
naturalMaxLevel = 20,
11417+
},
1141911418
["Metadata/Items/Gems/SkillGemFangsOfFrost"] = {
1142011419
name = "Fangs of Frost",
1142111420
baseTypeName = "Fangs of Frost",

‎src/Data/Minions.lua

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,34 @@ minions["RaisedSkeletonReaver"] = {
236236
},
237237
}
238238

239+
minions["RaisedSkeletonWarriors"] = {
240+
name = "Skeletal Warrior",
241+
monsterTags = { "1HSword_onhit_audio", "bone_armour", "bones", "fast_movement", "has_one_hand_sword", "has_one_handed_melee", "medium_height", "melee", "not_dex", "not_int", "physical_affinity", "skeleton", "slashing_weapon", "undead", },
242+
life = 0.88,
243+
baseDamageIgnoresAttackSpeed = true,
244+
armour = 0.5,
245+
fireResist = 0,
246+
coldResist = 0,
247+
lightningResist = 0,
248+
chaosResist = 0,
249+
damage = 0.7,
250+
damageSpread = 0.3,
251+
attackTime = 1,
252+
attackRange = 12,
253+
accuracy = 1,
254+
weaponType1 = "One Handed Sword",
255+
weaponType2 = "Shield",
256+
limit = "ActiveSkeletonLimit",
257+
skillList = {
258+
"MinionMeleeStep",
259+
},
260+
modList = {
261+
-- MonsterNoDropsOrExperience [monster_no_drops_or_experience = 1]
262+
mod("BlockChance", "BASE", 30, 0, 0), -- SkeletonWarriorPlayerMinionBlockChance [monster_base_block_% = 30]
263+
-- SkeletonWarriorPlayerMinionBlockChance [additional_maximum_block_% = 0]
264+
},
265+
}
266+
239267
minions["SummonedHellhound"] = {
240268
name = "Infernal Hound",
241269
monsterTags = { "beast", "demon", "medium_movement", "not_int", "red_blood", "Unarmed_onhit_audio", },

‎src/Data/Misc.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ local data = ...
55
data.monsterEvasionTable = { 11, 14, 17, 20, 24, 27, 31, 35, 38, 42, 46, 50, 54, 59, 63, 67, 72, 76, 81, 86, 91, 96, 101, 106, 111, 117, 122, 128, 134, 140, 146, 152, 158, 165, 171, 178, 185, 191, 199, 206, 213, 221, 228, 236, 244, 252, 261, 269, 278, 286, 295, 304, 314, 323, 333, 343, 353, 363, 373, 384, 395, 406, 417, 429, 440, 452, 464, 477, 489, 502, 515, 528, 542, 556, 570, 584, 598, 613, 628, 644, 659, 675, 691, 708, 724, 742, 759, 777, 795, 813, 832, 850, 870, 889, 909, 930, 951, 972, 993, 1015, }
66
data.monsterAccuracyTable = { 51, 56, 60, 65, 70, 75, 80, 86, 91, 97, 103, 110, 116, 123, 130, 137, 145, 152, 160, 169, 177, 186, 195, 204, 214, 224, 234, 245, 256, 267, 279, 291, 304, 317, 330, 344, 358, 372, 387, 403, 419, 435, 452, 470, 488, 506, 526, 545, 566, 587, 608, 630, 653, 677, 701, 726, 752, 778, 806, 834, 863, 892, 923, 955, 987, 1020, 1055, 1090, 1126, 1164, 1202, 1242, 1283, 1324, 1368, 1412, 1457, 1504, 1552, 1602, 1653, 1705, 1759, 1814, 1871, 1930, 1990, 2052, 2115, 2180, 2247, 2316, 2387, 2460, 2535, 2612, 2690, 2772, 2855, 2941, }
77
data.monsterLifeTable = { 15, 20, 24, 28, 33, 38, 45, 50, 58, 67, 78, 89, 103, 118, 134, 158, 178, 200, 224, 249, 276, 305, 335, 366, 400, 434, 472, 510, 551, 593, 637, 683, 731, 790, 853, 921, 995, 1074, 1160, 1253, 1353, 1462, 1578, 1705, 1841, 1967, 2101, 2244, 2395, 2556, 2726, 2909, 3102, 3307, 3525, 3756, 4002, 4264, 4540, 4834, 5147, 5478, 5829, 6203, 6513, 6904, 7318, 7757, 8222, 8716, 9239, 9793, 10381, 11003, 11664, 12363, 13105, 13892, 14725, 15609, 16545, 17538, 18590, 19705, 20888, 22141, 23469, 24878, 26370, 27953, 29630, 31407, 33292, 35289, 37407, 39651, 42030, 44552, 47225, 50059, }
8-
data.monsterAllyLifeTable = { 51, 78, 106, 135, 166, 197, 230, 264, 299, 335, 373, 412, 453, 495, 538, 583, 630, 678, 728, 780, 834, 889, 946, 1005, 1066, 1130, 1195, 1262, 1332, 1404, 1478, 1555, 1634, 1716, 1800, 1887, 1977, 2069, 2165, 2263, 2365, 2470, 2578, 2689, 2804, 2922, 3044, 3169, 3299, 3432, 3569, 3710, 3856, 4006, 4160, 4319, 4483, 4652, 4825, 5004, 5187, 5376, 5571, 5771, 5977, 6189, 6407, 6631, 6862, 7099, 7343, 7594, 7852, 8117, 8390, 8670, 8959, 9255, 9560, 9873, 10195, 10525, 10865, 11214, 11573, 11942, 12321, 12710, 13110, 13521, 13943, 14376, 14821, 15278, 15748, 16230, 16726, 17234, 17756, 18293, }
8+
data.monsterAllyLifeTable = { 51, 83, 116, 150, 186, 223, 261, 300, 341, 382, 426, 471, 517, 565, 614, 665, 718, 772, 828, 886, 945, 1007, 1070, 1135, 1203, 1272, 1344, 1417, 1493, 1571, 1652, 1734, 1820, 1907, 1998, 2091, 2186, 2285, 2386, 2490, 2598, 2708, 2821, 2938, 3058, 3181, 3307, 3438, 3571, 3709, 3850, 3995, 4144, 4298, 4455, 4617, 4783, 4953, 5128, 5308, 5493, 5682, 5877, 6077, 6282, 6492, 6708, 6930, 7157, 7391, 7630, 7876, 8128, 8387, 8652, 8924, 9203, 9489, 9783, 10084, 10393, 10710, 11034, 11367, 11708, 12058, 12417, 12785, 13161, 13548, 13944, 14350, 14766, 15192, 15629, 16076, 16535, 17005, 17486, 17980, }
99
data.monsterDamageTable = { 9.1599998474121, 10.260000228882, 11.390000343323, 12.569999694824, 13.779999732971, 15.029999732971, 16.319999694824, 17.64999961853, 19.020000457764, 20.440000534058, 21.89999961853, 23.409999847412, 24.969999313354, 26.569999694824, 28.229999542236, 29.930000305176, 31.690000534058, 33.5, 35.369998931885, 37.290000915527, 39.270000457764, 41.310001373291, 43.409999847412, 45.569999694824, 47.799999237061, 50.090000152588, 52.450000762939, 54.880001068115, 57.369998931885, 59.939998626709, 62.590000152588, 65.309997558594, 68.099998474121, 70.980003356934, 73.940002441406, 76.980003356934, 80.110000610352, 83.319999694824, 86.629997253418, 90.019996643066, 93.51000213623, 97.099998474121, 100.79000091553, 104.56999969482, 108.45999908447, 112.45999908447, 116.56999969482, 120.7799987793, 125.12000274658, 129.55999755859, 134.13000488281, 138.82000732422, 143.63999938965, 148.58000183105, 153.66000366211, 158.86999511719, 164.21000671387, 169.69999694824, 175.33999633789, 181.11999511719, 187.05000305176, 193.13999938965, 199.38000488281, 205.78999328613, 212.36000061035, 219.11000061035, 226.0299987793, 233.11999511719, 240.39999389648, 247.86000061035, 255.52000427246, 263.36999511719, 271.42001342773, 279.67999267578, 288.14001464844, 296.82000732422, 305.7200012207, 314.83999633789, 324.19000244141, 333.7799987793, 343.60000610352, 353.67001342773, 364, 374.57998657227, 385.42001342773, 396.5299987793, 407.92001342773, 419.57998657227, 431.54000854492, 443.79000854492, 456.33999633789, 469.20001220703, 482.38000488281, 495.86999511719, 509.70001220703, 523.85998535156, 538.36999511719, 553.22998046875, 568.46002197266, 584.04998779297, }
10-
data.monsterAllyDamageTable = { 3.6199998855591, 4.5900001525879, 5.6199998855591, 6.7199997901917, 7.8800001144409, 9.1099996566772, 10.420000076294, 11.800000190735, 13.260000228882, 14.800000190735, 16.440000534058, 18.159999847412, 19.979999542236, 21.89999961853, 23.920000076294, 26.059999465942, 28.309999465942, 30.680000305176, 33.169998168945, 35.799999237061, 38.560001373291, 41.470001220703, 44.520000457764, 47.740001678467, 51.110000610352, 54.659999847412, 58.389999389648, 62.299999237061, 66.410003662109, 70.720001220703, 75.23999786377, 79.980003356934, 84.959999084473, 90.169998168945, 95.639999389648, 101.37000274658, 107.37999725342, 113.66999816895, 120.26000213623, 127.16000366211, 134.38000488281, 141.94999694824, 149.86000061035, 158.13999938965, 166.80999755859, 175.88000488281, 185.36000061035, 195.2799987793, 205.64999389648, 216.49000549316, 227.83000183105, 239.66999816895, 252.05000305176, 264.98999023438, 278.51000976562, 292.63000488281, 307.36999511719, 322.7799987793, 338.85998535156, 355.64999389648, 373.19000244141, 391.48999023438, 410.60000610352, 430.54000854492, 451.33999633789, 473.05999755859, 495.70999145508, 519.34997558594, 544, 569.71997070312, 596.53997802734, 624.51000976562, 653.67999267578, 684.09002685547, 715.79998779297, 748.85998535156, 783.30999755859, 819.22998046875, 856.65997314453, 895.67999267578, 936.33001708984, 978.69000244141, 1022.8300170898, 1068.8199462891, 1116.7299804688, 1166.6300048828, 1218.6099853516, 1272.7600097656, 1329.1500244141, 1387.8699951172, 1449.0300292969, 1512.6999511719, 1579.0100097656, 1648.0400390625, 1719.9100341797, 1794.7299804688, 1872.6099853516, 1953.6800537109, 2038.0500488281, 2125.8701171875, }
10+
data.monsterAllyDamageTable = { 3.1099998950958, 4.4200000762939, 5.8200001716614, 7.3099999427795, 8.9200000762939, 10.630000114441, 12.460000038147, 14.420000076294, 16.510000228882, 18.729999542236, 21.10000038147, 23.620000839233, 26.309999465942, 29.159999847412, 32.189998626709, 35.419998168945, 38.830001831055, 42.459999084473, 46.310001373291, 50.389999389648, 54.709999084473, 59.290000915527, 64.139999389648, 69.269996643066, 74.690002441406, 80.430000305176, 86.5, 92.910003662109, 99.690002441406, 106.83999633789, 114.40000152588, 122.37000274658, 130.78999328613, 139.66999816895, 149.03999328613, 158.91000366211, 169.32000732422, 180.28999328613, 191.86000061035, 204.03999328613, 216.86000061035, 230.36999511719, 244.60000610352, 259.57000732422, 275.32000732422, 291.89999389648, 309.33999633789, 327.69000244141, 346.98001098633, 367.26998901367, 388.58999633789, 411.01000976562, 434.57000732422, 459.32000732422, 485.32998657227, 512.65997314453, 541.34997558594, 571.48999023438, 603.14001464844, 636.36999511719, 671.26000976562, 707.86999511719, 746.29998779297, 786.63000488281, 828.94000244141, 873.34002685547, 919.90997314453, 968.76000976562, 1019.9899902344, 1073.7199707031, 1130.0600585938, 1189.1300048828, 1251.0600585938, 1315.9799804688, 1384.0300292969, 1455.3399658203, 1530.0799560547, 1608.4000244141, 1690.4599609375, 1776.4300537109, 1866.5, 1960.8399658203, 2059.6599121094, 2163.1599121094, 2271.5600585938, 2385.0600585938, 2503.9099121094, 2628.3601074219, 2758.6398925781, 2895.0300292969, 3037.8000488281, 3187.2399902344, 3343.6599121094, 3507.3500976562, 3678.6599121094, 3857.9299316406, 4045.5100097656, 4241.7700195312, 4447.1098632812, 4661.9301757812, }
1111
data.monsterArmourTable = { 3, 6, 8, 10, 13, 16, 19, 22, 26, 30, 34, 39, 43, 49, 54, 60, 67, 73, 81, 89, 97, 106, 116, 126, 137, 149, 161, 174, 189, 204, 220, 237, 255, 274, 295, 317, 340, 364, 391, 418, 448, 479, 512, 547, 585, 624, 666, 711, 758, 808, 861, 917, 976, 1039, 1105, 1176, 1250, 1329, 1412, 1500, 1594, 1692, 1796, 1906, 2023, 2146, 2276, 2413, 2558, 2712, 2874, 3044, 3225, 3416, 3617, 3829, 4053, 4290, 4540, 4803, 5081, 5375, 5684, 6011, 6355, 6718, 7101, 7505, 7930, 8379, 8852, 9351, 9877, 10431, 11015, 11630, 12279, 12962, 13682, 14441, }
1212
data.monsterAilmentThresholdTable = { 15, 20, 24, 28, 34, 39, 46, 52, 60, 70, 81, 95, 110, 126, 144, 171, 193, 218, 245, 275, 306, 340, 376, 413, 455, 497, 543, 590, 641, 695, 752, 812, 874, 950, 1033, 1123, 1220, 1326, 1442, 1568, 1705, 1854, 2015, 2192, 2384, 2564, 2757, 2966, 3188, 3426, 3681, 3955, 4247, 4560, 4895, 5254, 5638, 6049, 6489, 6959, 7462, 8001, 8576, 9193, 9723, 10382, 11085, 11837, 12639, 13497, 14413, 15390, 16435, 17549, 18742, 20013, 21372, 22824, 24373, 26029, 27796, 29684, 31700, 33852, 36153, 38608, 41230, 44033, 47023, 50219, 53630, 57272, 61164, 65318, 69757, 74494, 79554, 84958, 90729, 96892, }
1313

0 commit comments

Comments
 (0)