Skip to content

Commit 2991588

Browse files
LocalIdentityLocalIdentity
andauthored
Add support for Ancestral Commander Ancestral Spirit Minions (#8938)
Adds support for all the minions granted by the ascendancy and also the 5 legacy skills granted by Tattoo's that I believe still exist in standard and may come back in the future at some point Adds support for tracking the number of each Tattoo type to properly scale the buff effects too Co-authored-by: LocalIdentity <localidentity2@gmail.com>
1 parent 67d9fbe commit 2991588

12 files changed

Lines changed: 1853 additions & 740 deletions

File tree

src/Classes/ModStore.lua

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ function ModStoreClass:EvalMod(mod, cfg, globalLimits)
299299
tag.div = self:GetMultiplier(tag.divVar, cfg)
300300
end
301301
local mult = m_floor(base / (tag.div or 1) + 0.0001)
302+
if tag.noFloor then
303+
mult = base / (tag.div or 1)
304+
end
302305
local limitTotal
303306
local limitNegTotal
304307
if tag.limit or tag.limitVar or tag.limitStat then

src/Classes/PassiveSpec.lua

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,6 +1166,7 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
11661166
self.allocatedNotableCount = 0
11671167
self.allocatedMasteryTypes = { }
11681168
self.allocatedMasteryTypeCount = 0
1169+
self.allocatedTattooTypes = { }
11691170
for id, node in pairs(self.nodes) do
11701171
if self.ignoredNodes[id] and self.allocNodes[id] then
11711172
self.nodes[id].alloc = false
@@ -1206,6 +1207,13 @@ function PassiveSpecClass:BuildAllDependsAndPaths()
12061207
elseif node.type == "Notable" and node.alloc then
12071208
self.allocatedNotableCount = self.allocatedNotableCount + 1
12081209
end
1210+
if node.isTattoo and node.alloc and node.overrideType then
1211+
if not self.allocatedTattooTypes[node.overrideType] then
1212+
self.allocatedTattooTypes[node.overrideType] = 1
1213+
else
1214+
self.allocatedTattooTypes[node.overrideType] = self.allocatedTattooTypes[node.overrideType] + 1
1215+
end
1216+
end
12091217
end
12101218
end
12111219

@@ -1398,6 +1406,7 @@ function PassiveSpecClass:ReplaceNode(old, newNode)
13981406
old.sprites = newNode.sprites
13991407
old.effectSprites = newNode.effectSprites
14001408
old.isTattoo = newNode.isTattoo
1409+
old.overrideType = newNode.overrideType
14011410
old.keystoneMod = newNode.keystoneMod
14021411
old.icon = newNode.icon
14031412
old.spriteId = newNode.spriteId

src/Data/Minions.lua

Lines changed: 261 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1223,3 +1223,264 @@ minions["VoidSpawn"] = {
12231223
-- CannotBeAugmented [cannot_have_affliction_mods = 1]
12241224
},
12251225
}
1226+
1227+
minions["AncestralAhuanaMinion"] = {
1228+
name = "Spirit of Ahuana",
1229+
monsterTags = { "human", "humanoid", "medium_movement", "not_int", "not_str", "red_blood", },
1230+
baseDamageIgnoresAttackSpeed = true,
1231+
life = 0.9,
1232+
evasion = 1,
1233+
fireResist = 0,
1234+
coldResist = 0,
1235+
lightningResist = 0,
1236+
chaosResist = 0,
1237+
damage = 1.3,
1238+
damageSpread = 0.2,
1239+
attackTime = 1,
1240+
attackRange = 70,
1241+
accuracy = 1,
1242+
weaponType1 = "Bow",
1243+
skillList = {
1244+
"MPWAhuanaIceShot",
1245+
"MonsterSnipeAhuana",
1246+
"MPWAhuanaFakeArrow",
1247+
},
1248+
modList = {
1249+
},
1250+
}
1251+
1252+
minions["AncestralAkoyaMinion"] = {
1253+
name = "Spirit of Akoya",
1254+
monsterTags = { "human", "humanoid", "medium_movement", "not_int", "red_blood", },
1255+
baseDamageIgnoresAttackSpeed = true,
1256+
life = 1.1,
1257+
armour = 0.75,
1258+
evasion = 0.25,
1259+
fireResist = 0,
1260+
coldResist = 0,
1261+
lightningResist = 0,
1262+
chaosResist = 0,
1263+
damage = 1.2,
1264+
damageSpread = 0.2,
1265+
attackTime = 1,
1266+
attackRange = 20,
1267+
accuracy = 1,
1268+
weaponType1 = "Two Handed Axe",
1269+
skillList = {
1270+
"MeleeAtAnimationSpeedUnique",
1271+
"MPSAkoyaJadeSpray",
1272+
"GSAkoyaRockExplosion",
1273+
},
1274+
modList = {
1275+
},
1276+
}
1277+
1278+
minions["AncestralIkiahoMinion"] = {
1279+
name = "Spirit of Ikiaho",
1280+
monsterTags = { "human", "humanoid", "medium_movement", "not_dex", "not_str", "red_blood", },
1281+
baseDamageIgnoresAttackSpeed = true,
1282+
life = 1,
1283+
energyShield = 4,
1284+
fireResist = 0,
1285+
coldResist = 0,
1286+
lightningResist = 0,
1287+
chaosResist = 0,
1288+
damage = 1.2,
1289+
damageSpread = 0.2,
1290+
attackTime = 1,
1291+
attackRange = 10,
1292+
accuracy = 1,
1293+
skillList = {
1294+
"AncestralIkiahoArcticBreath",
1295+
"AncestralIkiahoIceStorm",
1296+
"EASIkiahoIceStorm",
1297+
},
1298+
modList = {
1299+
},
1300+
}
1301+
1302+
minions["AncestralKahuturoaMinion"] = {
1303+
name = "Spirit of Kahuturoa",
1304+
monsterTags = { "fast_movement", "human", "humanoid", "not_dex", "not_int", "red_blood", },
1305+
baseDamageIgnoresAttackSpeed = true,
1306+
life = 1.2,
1307+
armour = 1,
1308+
fireResist = 0,
1309+
coldResist = 0,
1310+
lightningResist = 0,
1311+
chaosResist = 0,
1312+
damage = 1.6,
1313+
damageSpread = 0.2,
1314+
attackTime = 1,
1315+
attackRange = 24,
1316+
accuracy = 1,
1317+
skillList = {
1318+
"KahuturoaMelee",
1319+
"DTTKahuturoaLeapSlam",
1320+
"GAKahuturoaLeapSlamImpact",
1321+
"GAKahuturoaForwardMelee",
1322+
"GAKahuturoaLeapSlamWeaponSwing",
1323+
},
1324+
modList = {
1325+
},
1326+
}
1327+
1328+
minions["AncestralKaomMinion"] = {
1329+
name = "Spirit of Kaom",
1330+
monsterTags = { "human", "humanoid", "not_int", "red_blood", "slow_movement", },
1331+
baseDamageIgnoresAttackSpeed = true,
1332+
life = 2,
1333+
armour = 0.75,
1334+
evasion = 0.25,
1335+
fireResist = 0,
1336+
coldResist = 0,
1337+
lightningResist = 0,
1338+
chaosResist = 0,
1339+
damage = 1.3,
1340+
damageSpread = 0.2,
1341+
attackTime = 1,
1342+
attackRange = 20,
1343+
accuracy = 1,
1344+
weaponType1 = "Two Handed Axe",
1345+
skillList = {
1346+
"MeleeAtAnimationSpeedUnique",
1347+
"MPSKaomFireFist",
1348+
"GAKaomFistBlast",
1349+
"GAKaomFistBlastFinal",
1350+
"AncestralKaomUnarmedCombo",
1351+
},
1352+
modList = {
1353+
},
1354+
}
1355+
1356+
minions["AncestralKiloavaMinion"] = {
1357+
name = "Spirit of Kiloava",
1358+
monsterTags = { "fast_movement", "human", "humanoid", "not_int", "red_blood", },
1359+
baseDamageIgnoresAttackSpeed = true,
1360+
life = 1.2,
1361+
armour = 0.75,
1362+
evasion = 0.25,
1363+
fireResist = 0,
1364+
coldResist = 0,
1365+
lightningResist = 0,
1366+
chaosResist = 0,
1367+
damage = 1,
1368+
damageSpread = 0.2,
1369+
attackTime = 1,
1370+
attackRange = 19,
1371+
accuracy = 1,
1372+
skillList = {
1373+
"MeleeAtAnimationSpeedUnique",
1374+
"MPWKiloavaSpearThrow",
1375+
"GSKiloavaLightningBolt",
1376+
},
1377+
modList = {
1378+
},
1379+
}
1380+
1381+
minions["AncestralMaataMinion"] = {
1382+
name = "Spirit of Maata",
1383+
monsterTags = { "human", "humanoid", "medium_movement", "not_str", "red_blood", },
1384+
baseDamageIgnoresAttackSpeed = true,
1385+
life = 0.9,
1386+
energyShield = 1.6,
1387+
evasion = 0.4,
1388+
fireResist = 0,
1389+
coldResist = 0,
1390+
lightningResist = 0,
1391+
chaosResist = 0,
1392+
damage = 1,
1393+
damageSpread = 0.2,
1394+
attackTime = 1,
1395+
attackRange = 20,
1396+
accuracy = 1,
1397+
weaponType1 = "One Handed Mace",
1398+
skillList = {
1399+
"MeleeAtAnimationSpeedUnique",
1400+
"DonutCircleMaata",
1401+
"SSMMaataVine",
1402+
"GSMaataVineCascade",
1403+
"GTMaataVineCascade",
1404+
},
1405+
modList = {
1406+
},
1407+
}
1408+
1409+
minions["AncestralRakiataMinion"] = {
1410+
name = "Spirit of Rakiata",
1411+
monsterTags = { "fast_movement", "human", "humanoid", "not_int", "red_blood", },
1412+
baseDamageIgnoresAttackSpeed = true,
1413+
life = 1,
1414+
armour = 0.75,
1415+
evasion = 0.3,
1416+
fireResist = 0,
1417+
coldResist = 0,
1418+
lightningResist = 0,
1419+
chaosResist = 0,
1420+
damage = 1.3,
1421+
damageSpread = 0.2,
1422+
attackTime = 1,
1423+
attackRange = 20,
1424+
accuracy = 1,
1425+
weaponType1 = "Two Handed Sword",
1426+
skillList = {
1427+
"GARakiataSlam",
1428+
"RakiataSweep",
1429+
"RakiataSlam",
1430+
"RakiataLacerate",
1431+
"GTRakiataSlam",
1432+
},
1433+
modList = {
1434+
},
1435+
}
1436+
1437+
minions["AncestralTawhanukuMinion"] = {
1438+
name = "Spirit of Tawhanuku",
1439+
monsterTags = { "human", "humanoid", "medium_movement", "not_dex", "not_str", "red_blood", },
1440+
baseDamageIgnoresAttackSpeed = true,
1441+
life = 2,
1442+
energyShield = 0.4,
1443+
fireResist = 0,
1444+
coldResist = 0,
1445+
lightningResist = 0,
1446+
chaosResist = 0,
1447+
damage = 1.2,
1448+
damageSpread = 0.2,
1449+
attackTime = 1,
1450+
attackRange = 10,
1451+
accuracy = 1,
1452+
skillList = {
1453+
"GSAncestralTawhanukuWave",
1454+
"AncestralTawhanukuSoulRend",
1455+
"GTTawhanukuMultiSoulrend",
1456+
},
1457+
modList = {
1458+
},
1459+
}
1460+
1461+
minions["AncestralUtulaMinion"] = {
1462+
name = "Spirit of Utula",
1463+
monsterTags = { "fast_movement", "human", "humanoid", "not_int", "red_blood", },
1464+
baseDamageIgnoresAttackSpeed = true,
1465+
life = 1.2,
1466+
armour = 0.75,
1467+
evasion = 0.1,
1468+
fireResist = 0,
1469+
coldResist = 0,
1470+
lightningResist = 0,
1471+
chaosResist = 0,
1472+
damage = 1.2,
1473+
damageSpread = 0.2,
1474+
attackTime = 1,
1475+
attackRange = 19,
1476+
accuracy = 1,
1477+
weaponType1 = "One Handed Axe",
1478+
weaponType2 = "One Handed Axe",
1479+
skillList = {
1480+
"MeleeAtAnimationSpeedUnique",
1481+
"UtulaFireSwing",
1482+
"MPSUtulaFireball",
1483+
},
1484+
modList = {
1485+
},
1486+
}

0 commit comments

Comments
 (0)