Skip to content

Commit 6e9d240

Browse files
author
LocalIdentity
committed
Fix MonsterVarieties spec
1 parent 8c1b143 commit 6e9d240

File tree

3 files changed

+53
-78
lines changed

3 files changed

+53
-78
lines changed

‎src/Export/Scripts/miscdata.lua

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ out:write('local data = ...\n')
44
local evasion = ""
55
local accuracy = ""
66
local life = ""
7-
local altLife1 = ""
8-
local altLife2 = ""
97
local allyLife = ""
108
local allyDamage = ""
119
local damage = ""
@@ -16,8 +14,6 @@ for stats in dat("DefaultMonsterStats"):Rows() do
1614
evasion = evasion .. stats.Evasion .. ", "
1715
accuracy = accuracy .. stats.Accuracy .. ", "
1816
life = life .. stats.MonsterLife .. ", "
19-
altLife1 = altLife1 .. stats.AltLife1 .. ", "
20-
altLife2 = altLife2 .. stats.AltLife2 .. ", "
2117
allyLife = allyLife .. stats.MinionLife .. ", "
2218
damage = damage .. stats.Damage .. ", "
2319
allyDamage = allyDamage .. stats.MinionDamage .. ", "

‎src/Export/spec.lua

Lines changed: 52 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -8288,7 +8288,7 @@ return {
82888288
moddomains={
82898289
[1]={
82908290
list=false,
8291-
name="",
8291+
name="Id",
82928292
refTo="",
82938293
type="String",
82948294
width=220
@@ -9880,21 +9880,21 @@ return {
98809880
name="",
98819881
refTo="AchievementItems",
98829882
type="Int",
9883-
width=150
9883+
width=50
98849884
},
98859885
[50]={
98869886
list=false,
98879887
name="",
98889888
refTo="AchievementItems",
98899889
type="Int",
9890-
width=150
9890+
width=50
98919891
},
98929892
[51]={
98939893
list=false,
98949894
name="",
98959895
refTo="AchievementItems",
98969896
type="Int",
9897-
width=150
9897+
width=50
98989898
},
98999899
[52]={
99009900
list=false,
@@ -9985,7 +9985,7 @@ return {
99859985
name="",
99869986
refTo="",
99879987
type="Key",
9988-
width=150
9988+
width=50
99899989
},
99909990
[65]={
99919991
list=false,
@@ -10006,7 +10006,7 @@ return {
1000610006
name="",
1000710007
refTo="AchievementItems",
1000810008
type="Key",
10009-
width=150
10009+
width=50
1001010010
},
1001110011
[68]={
1001210012
list=true,
@@ -10027,7 +10027,7 @@ return {
1002710027
name="SinkAnimation",
1002810028
refTo="",
1002910029
type="String",
10030-
width=150
10030+
width=100
1003110031
},
1003210032
[71]={
1003310033
list=false,
@@ -10041,7 +10041,7 @@ return {
1004110041
name="",
1004210042
refTo="MultiPartAchievements",
1004310043
type="Key",
10044-
width=150
10044+
width=50
1004510045
},
1004610046
[73]={
1004710047
list=false,
@@ -10090,7 +10090,7 @@ return {
1009010090
name="SinkEffect",
1009110091
refTo="",
1009210092
type="String",
10093-
width=150
10093+
width=100
1009410094
},
1009510095
[80]={
1009610096
list=false,
@@ -10177,18 +10177,18 @@ return {
1017710177
width=50
1017810178
},
1017910179
[92]={
10180-
list=false,
10180+
list=true,
1018110181
name="",
1018210182
refTo="",
10183-
type="Int",
10184-
width=50
10183+
type="String",
10184+
width=150
1018510185
},
1018610186
[93]={
1018710187
list=false,
1018810188
name="",
1018910189
refTo="",
1019010190
type="Int",
10191-
width=130
10191+
width=50
1019210192
},
1019310193
[94]={
1019410194
list=false,
@@ -10199,16 +10199,16 @@ return {
1019910199
},
1020010200
[95]={
1020110201
list=false,
10202-
name="",
10202+
name="BossHealthBar",
1020310203
refTo="",
10204-
type="Int",
10205-
width=50
10204+
type="Bool",
10205+
width=100
1020610206
},
1020710207
[96]={
1020810208
list=false,
1020910209
name="",
1021010210
refTo="",
10211-
type="Int",
10211+
type="Key",
1021210212
width=50
1021310213
},
1021410214
[97]={
@@ -10220,16 +10220,16 @@ return {
1022010220
},
1022110221
[98]={
1022210222
list=false,
10223-
name="BossHealthBar",
10223+
name="",
1022410224
refTo="",
1022510225
type="Bool",
10226-
width=100
10226+
width=50
1022710227
},
1022810228
[99]={
1022910229
list=false,
1023010230
name="",
1023110231
refTo="",
10232-
type="Key",
10232+
type="Int",
1023310233
width=50
1023410234
},
1023510235
[100]={
@@ -10243,141 +10243,120 @@ return {
1024310243
list=false,
1024410244
name="",
1024510245
refTo="",
10246-
type="Bool",
10247-
width=150
10246+
type="Int",
10247+
width=50
1024810248
},
1024910249
[102]={
1025010250
list=false,
1025110251
name="",
1025210252
refTo="",
1025310253
type="Int",
10254-
width=150
10254+
width=50
1025510255
},
1025610256
[103]={
1025710257
list=false,
1025810258
name="",
1025910259
refTo="",
10260-
type="Int",
10261-
width=150
10260+
type="Bool",
10261+
width=50
1026210262
},
1026310263
[104]={
1026410264
list=false,
10265-
name="",
10266-
refTo="",
10267-
type="Int",
10265+
name="QuestFlag",
10266+
refTo="QuestFlags",
10267+
type="Key",
1026810268
width=150
1026910269
},
1027010270
[105]={
1027110271
list=false,
1027210272
name="",
1027310273
refTo="",
10274-
type="Int",
10275-
width=150
10274+
type="Float",
10275+
width=80
1027610276
},
1027710277
[106]={
1027810278
list=false,
1027910279
name="",
1028010280
refTo="",
10281-
type="Bool",
10282-
width=150
10281+
type="Float",
10282+
width=80
1028310283
},
1028410284
[107]={
1028510285
list=false,
1028610286
name="",
1028710287
refTo="",
10288-
type="Int",
10289-
width=150
10288+
type="Bool",
10289+
width=50
1029010290
},
1029110291
[108]={
10292-
list=false,
10292+
list=true,
1029310293
name="",
1029410294
refTo="",
1029510295
type="Key",
10296-
width=150
10296+
width=50
1029710297
},
1029810298
[109]={
1029910299
list=false,
1030010300
name="",
1030110301
refTo="",
10302-
type="Int",
10303-
width=150
10302+
type="Key",
10303+
width=50
1030410304
},
1030510305
[110]={
1030610306
list=false,
1030710307
name="",
1030810308
refTo="",
1030910309
type="Int",
10310-
width=150
10310+
width=50
1031110311
},
1031210312
[111]={
1031310313
list=false,
10314-
name="",
10314+
name="PoiseThreshold",
1031510315
refTo="",
1031610316
type="Int",
10317-
width=150
10317+
width=100
1031810318
},
1031910319
[112]={
1032010320
list=false,
1032110321
name="",
1032210322
refTo="",
10323-
type="Bool",
10323+
type="Float",
1032410324
width=150
1032510325
},
1032610326
[113]={
1032710327
list=false,
1032810328
name="",
1032910329
refTo="",
10330-
type="Int",
10331-
width=150
10330+
type="Key",
10331+
width=50
1033210332
},
1033310333
[114]={
1033410334
list=false,
1033510335
name="",
1033610336
refTo="",
10337-
type="String",
10338-
width=380
10337+
type="Bool",
10338+
width=50
1033910339
},
1034010340
[115]={
1034110341
list=false,
1034210342
name="",
1034310343
refTo="",
10344-
type="Key",
10345-
width=150
10346-
},
10347-
[116]={
10348-
list=false,
10349-
name="PoiseThreshold",
10350-
refTo="",
1035110344
type="Int",
10352-
width=150
10353-
},
10354-
[117]={
10355-
list=false,
10356-
name="",
10357-
refTo="",
10358-
type="Int",
10359-
width=150
10360-
},
10361-
[118]={
10362-
list=false,
10363-
name="",
10364-
refTo="",
10365-
type="Float",
10366-
width=150
10345+
width=50
1036710346
},
10368-
[119]={
10347+
[116]={
1036910348
list=false,
1037010349
name="",
1037110350
refTo="",
10372-
type="Key",
10373-
width=150
10351+
type="Bool",
10352+
width=50
1037410353
},
10375-
[120]={
10354+
[117]={
1037610355
list=false,
1037710356
name="",
1037810357
refTo="",
1037910358
type="Int",
10380-
width=60
10359+
width=50
1038110360
}
1038210361
},
1038310362
monstervarietiesartvariations={

‎src/Modules/CalcActiveSkill.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ function calcs.buildActiveSkillModList(env, activeSkill)
725725
minion.level = m_min(m_max(minion.level,1),100)
726726
minion.itemList = { }
727727
minion.uses = activeGrantedEffect.minionUses
728-
minion.lifeTable = (minion.minionData.lifeScaling == "AltLife1" and env.data.monsterLifeTable2) or (minion.minionData.lifeScaling == "AltLife2" and env.data.monsterLifeTable3) or (isSpectre and env.data.monsterLifeTable) or env.data.monsterAllyLifeTable
728+
minion.lifeTable = (isSpectre and env.data.monsterLifeTable) or env.data.monsterAllyLifeTable
729729
local attackTime = minion.minionData.attackTime
730730
local damage = (isSpectre and env.data.monsterDamageTable[minion.level] or env.data.monsterAllyDamageTable[minion.level]) * minion.minionData.damage
731731
if not minion.minionData.baseDamageIgnoresAttackSpeed then -- minions with this flag do not factor attack time into their base damage

0 commit comments

Comments
 (0)