diff --git a/src/Data/Bases/bow.lua b/src/Data/Bases/bow.lua index 51a3aab086..25ec705940 100644 --- a/src/Data/Bases/bow.lua +++ b/src/Data/Bases/bow.lua @@ -64,7 +64,7 @@ itemBases["Cultist Bow"] = { socketLimit = 4, tags = { two_hand_weapon = true, vaal_basetype = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, implicitModTypes = { }, - weapon = { PhysicalMin = 10, PhysicalMax = 17, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, }, + weapon = { PhysicalMin = 10, PhysicalMax = 17, ChaosMin = 19, ChaosMax = 37, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, }, req = { level = 33, dex = 60, }, } itemBases["Zealot Bow"] = { @@ -166,7 +166,7 @@ itemBases["Adherent Bow"] = { socketLimit = 4, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, implicitModTypes = { }, - weapon = { PhysicalMin = 21, PhysicalMax = 34, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, }, + weapon = { PhysicalMin = 21, PhysicalMax = 34, ChaosMin = 31, ChaosMax = 59, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, }, req = { level = 59, dex = 104, }, } itemBases["Militant Bow"] = { @@ -222,7 +222,7 @@ itemBases["Fanatic Bow"] = { socketLimit = 4, tags = { two_hand_weapon = true, ranged = true, weapon = true, default = true, twohand = true, bow = true, }, implicitModTypes = { }, - weapon = { PhysicalMin = 42, PhysicalMax = 70, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, }, + weapon = { PhysicalMin = 42, PhysicalMax = 70, ChaosMin = 43, ChaosMax = 71, CritChanceBase = 5, AttackRateBase = 1.2, Range = 120, }, req = { level = 79, dex = 163, }, } itemBases["Warmonger Bow"] = { diff --git a/src/Data/Bases/shield.lua b/src/Data/Bases/shield.lua index c9e6293804..bd04d6e29c 100644 --- a/src/Data/Bases/shield.lua +++ b/src/Data/Bases/shield.lua @@ -256,116 +256,6 @@ itemBases["Tawhoan Tower Shield"] = { armour = { BlockChance = 26, Armour = 197, MovementPenalty = 0.03, }, req = { level = 80, str = 115, }, } -itemBases["Aged Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 110, MovementPenalty = 0.03, }, - req = { level = 45, str = 64, }, -} -itemBases["Metalworked Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 116, MovementPenalty = 0.03, }, - req = { level = 48, str = 69, }, -} -itemBases["Cultist Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 123, MovementPenalty = 0.03, }, - req = { level = 51, str = 73, }, -} -itemBases["Bulwark Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 129, MovementPenalty = 0.03, }, - req = { level = 54, str = 77, }, -} -itemBases["Noble Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 139, MovementPenalty = 0.03, }, - req = { level = 59, str = 83, }, -} -itemBases["Goldworked Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 144, MovementPenalty = 0.03, }, - req = { level = 61, str = 86, }, -} -itemBases["Royal Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 152, MovementPenalty = 0.03, }, - req = { level = 65, str = 91, }, -} -itemBases["Fortress Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 167, MovementPenalty = 0.03, }, - req = { level = 70, str = 99, }, -} -itemBases["Vaal Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 182, MovementPenalty = 0.03, }, - req = { level = 75, str = 107, }, -} -itemBases["Tawhoan Tower Shield"] = { - type = "Shield", - subType = "Armour", - quality = 20, - socketLimit = 3, - tags = { karui_basetype = true, str_armour = true, str_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 26, Armour = 197, MovementPenalty = 0.03, }, - req = { level = 80, str = 115, }, -} itemBases["Leather Buckler"] = { type = "Shield", @@ -620,116 +510,6 @@ itemBases["Desert Buckler"] = { armour = { BlockChance = 20, Evasion = 144, }, req = { level = 80, dex = 115, }, } -itemBases["Oak Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 79, }, - req = { level = 45, dex = 64, }, -} -itemBases["Painted Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 84, }, - req = { level = 48, dex = 69, }, -} -itemBases["Coiled Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 89, }, - req = { level = 51, dex = 73, }, -} -itemBases["Spikeward Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 93, }, - req = { level = 54, dex = 77, }, -} -itemBases["Jingling Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 101, }, - req = { level = 59, dex = 83, }, -} -itemBases["Bladeguard Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 105, }, - req = { level = 61, dex = 86, }, -} -itemBases["Ornate Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 111, }, - req = { level = 65, dex = 91, }, -} -itemBases["Gutspike Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 122, }, - req = { level = 70, dex = 99, }, -} -itemBases["Ancient Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 133, }, - req = { level = 75, dex = 107, }, -} -itemBases["Desert Buckler"] = { - type = "Shield", - subType = "Evasion", - quality = 20, - socketLimit = 3, - tags = { karui_basetype = true, buckler = true, dex_shield = true, dex_armour = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Parry", - implicitModTypes = { }, - armour = { BlockChance = 20, Evasion = 144, }, - req = { level = 80, dex = 115, }, -} itemBases["Hardwood Targe"] = { type = "Shield", @@ -962,116 +742,6 @@ itemBases["Golden Targe"] = { armour = { BlockChance = 25, Armour = 109, Evasion = 99, MovementPenalty = 0.015, }, req = { level = 80, str = 63, dex = 63, }, } -itemBases["Ironwood Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 61, Evasion = 54, MovementPenalty = 0.015, }, - req = { level = 45, str = 36, dex = 36, }, -} -itemBases["Fur-lined Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 64, Evasion = 58, MovementPenalty = 0.015, }, - req = { level = 48, str = 38, dex = 38, }, -} -itemBases["Mercenary Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 67, Evasion = 61, MovementPenalty = 0.015, }, - req = { level = 51, str = 40, dex = 40, }, -} -itemBases["Polished Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 71, Evasion = 64, MovementPenalty = 0.015, }, - req = { level = 54, str = 42, dex = 42, }, -} -itemBases["Stone Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 77, Evasion = 70, MovementPenalty = 0.015, }, - req = { level = 59, str = 46, dex = 46, }, -} -itemBases["Avian Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 80, Evasion = 73, MovementPenalty = 0.015, }, - req = { level = 62, str = 48, dex = 48, }, -} -itemBases["Mammoth Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 84, Evasion = 76, MovementPenalty = 0.015, }, - req = { level = 65, str = 50, dex = 50, }, -} -itemBases["Baroque Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 92, Evasion = 84, MovementPenalty = 0.015, }, - req = { level = 70, str = 54, dex = 54, }, -} -itemBases["Soaring Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 100, Evasion = 91, MovementPenalty = 0.015, }, - req = { level = 75, str = 59, dex = 59, }, -} -itemBases["Golden Targe"] = { - type = "Shield", - subType = "Armour/Evasion", - quality = 20, - socketLimit = 3, - tags = { karui_basetype = true, str_dex_armour = true, str_dex_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 109, Evasion = 99, MovementPenalty = 0.015, }, - req = { level = 80, str = 63, dex = 63, }, -} itemBases["Blazon Crest Shield"] = { type = "Shield", @@ -1304,116 +974,6 @@ itemBases["Blacksteel Crest Shield"] = { armour = { BlockChance = 25, Armour = 109, EnergyShield = 37, MovementPenalty = 0.015, }, req = { level = 80, str = 63, int = 63, }, } -itemBases["Painted Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 61, EnergyShield = 22, MovementPenalty = 0.015, }, - req = { level = 45, str = 36, int = 36, }, -} -itemBases["Engraved Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 64, EnergyShield = 23, MovementPenalty = 0.015, }, - req = { level = 48, str = 38, int = 38, }, -} -itemBases["Descry Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 67, EnergyShield = 24, MovementPenalty = 0.015, }, - req = { level = 51, str = 40, int = 40, }, -} -itemBases["Dekharan Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 71, EnergyShield = 25, MovementPenalty = 0.015, }, - req = { level = 54, str = 42, int = 42, }, -} -itemBases["Quartered Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 77, EnergyShield = 27, MovementPenalty = 0.015, }, - req = { level = 59, str = 46, int = 46, }, -} -itemBases["Glowering Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 80, EnergyShield = 28, MovementPenalty = 0.015, }, - req = { level = 62, str = 48, int = 48, }, -} -itemBases["Intricate Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 84, EnergyShield = 29, MovementPenalty = 0.015, }, - req = { level = 65, str = 50, int = 50, }, -} -itemBases["Sekheman Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 92, EnergyShield = 32, MovementPenalty = 0.015, }, - req = { level = 70, str = 54, int = 54, }, -} -itemBases["Vaal Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 100, EnergyShield = 35, MovementPenalty = 0.015, }, - req = { level = 75, str = 59, int = 59, }, -} -itemBases["Blacksteel Crest Shield"] = { - type = "Shield", - subType = "Armour/Energy Shield", - quality = 20, - socketLimit = 3, - tags = { karui_basetype = true, str_int_armour = true, str_int_shield = true, armour = true, default = true, shield = true, }, - implicit = "Grants Skill: Level (1-20) Raise Shield", - implicitModTypes = { }, - armour = { BlockChance = 25, Armour = 109, EnergyShield = 37, MovementPenalty = 0.015, }, - req = { level = 80, str = 63, int = 63, }, -} itemBases["Golden Flame"] = { type = "Shield", diff --git a/src/Data/Bases/spear.lua b/src/Data/Bases/spear.lua index 0ee72c6d7e..b5c1b94391 100644 --- a/src/Data/Bases/spear.lua +++ b/src/Data/Bases/spear.lua @@ -7,6 +7,7 @@ itemBases["Hardwood Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 5, PhysicalMax = 9, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { }, @@ -16,6 +17,7 @@ itemBases["Ironhead Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 7, PhysicalMax = 13, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 5, dex = 10, }, @@ -25,7 +27,7 @@ itemBases["Hunting Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, ezomyte_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, - implicit = "(15-25)% chance to Maim on Hit", + implicit = "Grants Skill: Spear Throw\n(15-25)% chance to Maim on Hit", implicitModTypes = { { "attack" }, }, weapon = { PhysicalMin = 10, PhysicalMax = 18, CritChanceBase = 5, AttackRateBase = 1.55, Range = 15, }, req = { level = 10, str = 9, dex = 17, }, @@ -35,6 +37,7 @@ itemBases["Winged Spear"] = { quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 12, PhysicalMax = 22, CritChanceBase = 5, AttackRateBase = 1.65, Range = 15, }, req = { level = 16, str = 12, dex = 25, }, @@ -44,7 +47,7 @@ itemBases["War Spear"] = { quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, - implicit = "(25-35)% increased Projectile Speed with this Weapon", + implicit = "Grants Skill: Spear Throw\n(25-35)% increased Projectile Speed with this Weapon", implicitModTypes = { { }, }, weapon = { PhysicalMin = 14, PhysicalMax = 26, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 21, str = 14, dex = 31, }, @@ -54,6 +57,7 @@ itemBases["Forked Spear"] = { quality = 20, socketLimit = 3, tags = { maraketh_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 17, PhysicalMax = 32, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 26, str = 17, dex = 38, }, @@ -63,6 +67,7 @@ itemBases["Barbed Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 20, PhysicalMax = 38, CritChanceBase = 6.5, AttackRateBase = 1.6, Range = 15, }, req = { level = 33, str = 20, dex = 47, }, @@ -72,6 +77,7 @@ itemBases["Broad Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, vaal_basetype = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 26, PhysicalMax = 48, CritChanceBase = 5, AttackRateBase = 1.5, Range = 15, }, req = { level = 40, str = 23, dex = 56, }, @@ -81,6 +87,7 @@ itemBases["Crossblade Spear"] = { quality = 20, socketLimit = 3, tags = { karui_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 28, PhysicalMax = 51, CritChanceBase = 5, AttackRateBase = 1.55, Range = 15, }, req = { level = 45, str = 26, dex = 63, }, @@ -90,6 +97,7 @@ itemBases["Seaglass Spear"] = { quality = 20, socketLimit = 3, tags = { karui_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 31, PhysicalMax = 57, CritChanceBase = 7, AttackRateBase = 1.5, Range = 15, }, req = { level = 51, str = 29, dex = 71, int = 50, }, @@ -99,6 +107,7 @@ itemBases["Sword Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 30, PhysicalMax = 56, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 52, str = 29, dex = 72, }, @@ -108,6 +117,7 @@ itemBases["Striking Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 11, PhysicalMax = 45, LightningMin = 11, LightningMax = 45, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 55, str = 31, dex = 76, }, @@ -117,6 +127,7 @@ itemBases["Helix Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 37, PhysicalMax = 68, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 65, str = 36, dex = 89, }, @@ -126,6 +137,7 @@ itemBases["Steelhead Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 27, PhysicalMax = 50, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 45, str = 26, dex = 63, }, @@ -135,7 +147,7 @@ itemBases["Coursing Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, - implicit = "(15-25)% chance to Maim on Hit", + implicit = "Grants Skill: Spear Throw\n(15-25)% chance to Maim on Hit", implicitModTypes = { { "attack" }, }, weapon = { PhysicalMin = 29, PhysicalMax = 54, CritChanceBase = 5, AttackRateBase = 1.55, Range = 15, }, req = { level = 48, str = 27, dex = 67, }, @@ -145,7 +157,7 @@ itemBases["Swift Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, - implicit = "(25-35)% increased Projectile Speed with this Weapon", + implicit = "Grants Skill: Spear Throw\n(25-35)% increased Projectile Speed with this Weapon", implicitModTypes = { { }, }, weapon = { PhysicalMin = 28, PhysicalMax = 53, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 51, str = 29, dex = 71, }, @@ -155,6 +167,7 @@ itemBases["Branched Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 31, PhysicalMax = 58, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 54, str = 30, dex = 75, }, @@ -164,6 +177,7 @@ itemBases["Jagged Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 33, PhysicalMax = 61, CritChanceBase = 6.5, AttackRateBase = 1.6, Range = 15, }, req = { level = 59, str = 33, dex = 81, }, @@ -173,6 +187,7 @@ itemBases["Massive Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 38, PhysicalMax = 70, CritChanceBase = 5, AttackRateBase = 1.5, Range = 15, }, req = { level = 62, str = 34, dex = 85, }, @@ -182,6 +197,7 @@ itemBases["Orichalcum Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 38, PhysicalMax = 70, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 67, str = 41, dex = 104, }, @@ -191,6 +207,7 @@ itemBases["Pronged Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 40, PhysicalMax = 75, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 72, str = 46, dex = 115, }, @@ -200,7 +217,7 @@ itemBases["Stalking Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, - implicit = "(15-25)% chance to Maim on Hit", + implicit = "Grants Skill: Spear Throw\n(15-25)% chance to Maim on Hit", implicitModTypes = { { "attack" }, }, weapon = { PhysicalMin = 44, PhysicalMax = 82, CritChanceBase = 5, AttackRateBase = 1.55, Range = 15, }, req = { level = 77, str = 50, dex = 127, }, @@ -210,7 +227,7 @@ itemBases["Flying Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, - implicit = "(25-35)% increased Projectile Speed with this Weapon", + implicit = "Grants Skill: Spear Throw\n(25-35)% increased Projectile Speed with this Weapon", implicitModTypes = { { }, }, weapon = { PhysicalMin = 41, PhysicalMax = 76, CritChanceBase = 5, AttackRateBase = 1.6, Range = 15, }, req = { level = 78, str = 50, dex = 127, }, @@ -220,6 +237,7 @@ itemBases["Grand Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 46, PhysicalMax = 85, CritChanceBase = 5, AttackRateBase = 1.5, Range = 15, }, req = { level = 79, str = 50, dex = 127, }, @@ -229,6 +247,7 @@ itemBases["Spiked Spear"] = { quality = 20, socketLimit = 3, tags = { onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 41, PhysicalMax = 76, CritChanceBase = 6.5, AttackRateBase = 1.6, Range = 15, }, req = { level = 77, str = 50, dex = 127, }, @@ -238,6 +257,7 @@ itemBases["Akoyan Spear"] = { quality = 20, socketLimit = 3, tags = { karui_basetype = true, onehand = true, spear = true, weapon = true, one_hand_weapon = true, default = true, }, + implicit = "Grants Skill: Spear Throw", implicitModTypes = { }, weapon = { PhysicalMin = 43, PhysicalMax = 80, CritChanceBase = 7, AttackRateBase = 1.5, Range = 15, }, req = { level = 78, str = 50, dex = 127, int = 90, }, diff --git a/src/Data/Bases/staff.lua b/src/Data/Bases/staff.lua index 1a8f3a3f99..a3e9079d74 100644 --- a/src/Data/Bases/staff.lua +++ b/src/Data/Bases/staff.lua @@ -176,7 +176,7 @@ itemBases["Crackling Quarterstaff"] = { socketLimit = 4, tags = { two_hand_weapon = true, warstaff = true, maraketh_basetype = true, weapon = true, twohand = true, default = true, }, implicitModTypes = { }, - weapon = { PhysicalMin = 5, PhysicalMax = 22, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, + weapon = { PhysicalMin = 5, PhysicalMax = 22, LightningMin = 1, LightningMax = 35, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, req = { level = 16, dex = 25, int = 12, }, } itemBases["Crescent Quarterstaff"] = { @@ -298,7 +298,7 @@ itemBases["Arcing Quarterstaff"] = { socketLimit = 4, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, implicitModTypes = { }, - weapon = { PhysicalMin = 14, PhysicalMax = 55, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, + weapon = { PhysicalMin = 14, PhysicalMax = 55, LightningMin = 1, LightningMax = 75, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, req = { level = 51, dex = 71, int = 29, }, } itemBases["Waxing Quarterstaff"] = { @@ -370,141 +370,7 @@ itemBases["Bolting Quarterstaff"] = { socketLimit = 4, tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, implicitModTypes = { }, - weapon = { PhysicalMin = 24, PhysicalMax = 97, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, - req = { level = 78, dex = 127, int = 50, }, -} -itemBases["Aegis Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicit = "+(10-15)% to Block chance", - implicitModTypes = { { "block" }, }, - weapon = { PhysicalMin = 58, PhysicalMax = 97, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, - req = { level = 79, dex = 127, int = 50, }, -} -itemBases["Razor Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 65, PhysicalMax = 108, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, - req = { level = 77, dex = 127, int = 50, }, -} -itemBases["Dreaming Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, karui_basetype = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 99, PhysicalMax = 133, CritChanceBase = 0, AttackRateBase = 1.5, Range = 13, }, - req = { level = 78, dex = 127, int = 50, }, -} -itemBases["Reaching Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicit = "16% increased Melee Strike Range with this weapon", - implicitModTypes = { { "attack" }, }, - weapon = { PhysicalMin = 35, PhysicalMax = 72, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, - req = { level = 45, dex = 63, int = 26, }, -} -itemBases["Barbarous Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 43, PhysicalMax = 72, CritChanceBase = 11.5, AttackRateBase = 1.4, Range = 13, }, - req = { level = 48, dex = 67, int = 27, }, -} -itemBases["Arcing Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 14, PhysicalMax = 55, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, - req = { level = 51, dex = 71, int = 29, }, -} -itemBases["Waxing Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 39, PhysicalMax = 82, CritChanceBase = 10, AttackRateBase = 1.5, Range = 13, }, - req = { level = 54, dex = 75, int = 30, }, -} -itemBases["Bladed Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 45, PhysicalMax = 94, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, - req = { level = 59, dex = 81, int = 33, }, -} -itemBases["Guardian Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicit = "+(10-15)% to Block chance", - implicitModTypes = { { "block" }, }, - weapon = { PhysicalMin = 49, PhysicalMax = 82, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, - req = { level = 62, dex = 85, int = 34, }, -} -itemBases["Sinister Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 55, PhysicalMax = 92, CritChanceBase = 11.5, AttackRateBase = 1.4, Range = 13, }, - req = { level = 67, dex = 104, int = 41, }, -} -itemBases["Lunar Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 50, PhysicalMax = 103, CritChanceBase = 10, AttackRateBase = 1.5, Range = 13, }, - req = { level = 72, dex = 115, int = 46, }, -} -itemBases["Striking Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicit = "16% increased Melee Strike Range with this weapon", - implicitModTypes = { { "attack" }, }, - weapon = { PhysicalMin = 53, PhysicalMax = 111, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, - req = { level = 77, dex = 127, int = 50, }, -} -itemBases["Bolting Quarterstaff"] = { - type = "Staff", - subType = "Warstaff", - quality = 20, - socketLimit = 4, - tags = { two_hand_weapon = true, warstaff = true, weapon = true, twohand = true, default = true, }, - implicitModTypes = { }, - weapon = { PhysicalMin = 24, PhysicalMax = 97, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, + weapon = { PhysicalMin = 24, PhysicalMax = 97, LightningMin = 1, LightningMax = 100, CritChanceBase = 10, AttackRateBase = 1.4, Range = 13, }, req = { level = 78, dex = 127, int = 50, }, } itemBases["Aegis Quarterstaff"] = { diff --git a/src/Export/Bases/shield.txt b/src/Export/Bases/shield.txt index b44bbea407..3c53692ff6 100644 --- a/src/Export/Bases/shield.txt +++ b/src/Export/Bases/shield.txt @@ -6,23 +6,15 @@ local itemBases = ... #subType Armour #baseMatch Metadata/Items/Armours/Shields/FourShieldStr%d+ -#baseMatch Metadata/Items/Armours/Shields/FourShieldStr%d+Cruel -#baseMatch Metadata/Items/Armours/Shields/FourShieldStr%d+Endgame #subType Evasion #baseMatch Metadata/Items/Armours/Shields/FourShieldDex%d+ -#baseMatch Metadata/Items/Armours/Shields/FourShieldDex%d+Cruel -#baseMatch Metadata/Items/Armours/Shields/FourShieldDex%d+Endgame #subType Armour/Evasion #baseMatch Metadata/Items/Armours/Shields/FourShieldStrDex%d+ -#baseMatch Metadata/Items/Armours/Shields/FourShieldStrDex%d+Cruel -#baseMatch Metadata/Items/Armours/Shields/FourShieldStrDex%d+Endgame #subType Armour/Energy Shield #baseMatch Metadata/Items/Armours/Shields/FourShieldStrInt%d+ -#baseMatch Metadata/Items/Armours/Shields/FourShieldStrInt%d+Cruel -#baseMatch Metadata/Items/Armours/Shields/FourShieldStrInt%d+Endgame #subType #base Metadata/Items/Armours/Shields/ShieldDemigods diff --git a/src/Export/Bases/staff.txt b/src/Export/Bases/staff.txt index 5c655b68ab..a589e781c5 100644 --- a/src/Export/Bases/staff.txt +++ b/src/Export/Bases/staff.txt @@ -8,6 +8,4 @@ local itemBases = ... #type Staff #subType Warstaff #socketLimit 4 -#baseMatch Metadata/Items/Weapons/TwoHandWeapons/Staves/FourQuarterstaff%d+ -#baseMatch Metadata/Items/Weapons/TwoHandWeapons/Staves/FourQuarterstaff%d+Cruel -#baseMatch Metadata/Items/Weapons/TwoHandWeapons/Staves/FourQuarterstaff%d+Endgame \ No newline at end of file +#baseMatch Metadata/Items/Weapons/TwoHandWeapons/Staves/FourQuarterstaff%d+ \ No newline at end of file diff --git a/src/Export/Scripts/bases.lua b/src/Export/Scripts/bases.lua index 61fc5115bb..e0774fb644 100644 --- a/src/Export/Scripts/bases.lua +++ b/src/Export/Scripts/bases.lua @@ -132,6 +132,9 @@ directiveTable.base = function(state, args, out) table.insert(implicitLines, line) table.insert(implicitModTypes, modDesc.modTags) end + if mod.Id == "SpearImplicitDisplaySpearThrow1" then + table.insert(implicitLines, "Grants Skill: Spear Throw") + end end if state.type == "Belt" then table.insert(implicitLines, "Has (1-3) Charm Slots") @@ -163,6 +166,18 @@ directiveTable.base = function(state, args, out) ["local_weapon_implicit_hidden_%_base_damage_is_lightning"] = "Lightning", ["local_weapon_implicit_hidden_%_base_damage_is_chaos"] = "Chaos", } + local modAddedMinMap = { + ["local_weapon_implicit_hidden_added_minimum_fire_damage"] = "Fire", + ["local_weapon_implicit_hidden_added_minimum_cold_damage"] = "Cold", + ["local_weapon_implicit_hidden_added_minimum_lightning_damage"] = "Lightning", + ["local_weapon_implicit_hidden_added_minimum_chaos_damage"] = "Chaos", + } + local modAddedMaxMap = { + ["local_weapon_implicit_hidden_added_maximum_fire_damage"] = "Fire", + ["local_weapon_implicit_hidden_added_maximum_cold_damage"] = "Cold", + ["local_weapon_implicit_hidden_added_maximum_lightning_damage"] = "Lightning", + ["local_weapon_implicit_hidden_added_maximum_chaos_damage"] = "Chaos", + } local conversion = { ["Physical"] = 100, ["Fire"] = 0, @@ -170,6 +185,20 @@ directiveTable.base = function(state, args, out) ["Lightning"] = 0, ["Chaos"] = 0, } + local addedMin = { + ["Physical"] = 0, + ["Fire"] = 0, + ["Cold"] = 0, + ["Lightning"] = 0, + ["Chaos"] = 0, + } + local addedMax = { + ["Physical"] = 0, + ["Fire"] = 0, + ["Cold"] = 0, + ["Lightning"] = 0, + ["Chaos"] = 0, + } local total = 0 for _, mod in ipairs(baseItemType.ImplicitMods) do for i = 1, 6 do @@ -180,6 +209,16 @@ directiveTable.base = function(state, args, out) conversion[dmgType] = conversion[dmgType] + value total = total + value end + local addedMinDamage = modAddedMinMap[mod["Stat"..i].Id] + if addedMinDamage then + local value = mod["Stat"..i.."Value"][1] + addedMin[addedMinDamage] = addedMin[addedMinDamage] + value + end + local addedMaxDamage = modAddedMaxMap[mod["Stat"..i].Id] + if addedMaxDamage then + local value = mod["Stat"..i.."Value"][1] + addedMax[addedMaxDamage] = addedMax[addedMaxDamage] + value + end end end end @@ -193,6 +232,12 @@ directiveTable.base = function(state, args, out) if conversion[type] ~= 0 then out:write(type, 'Min = ', math.floor(weaponType.DamageMin * conversion[type]), ', ', type, 'Max = ', math.floor(weaponType.DamageMax * conversion[type]), ', ') end + if addedMin[type] ~= 0 then + out:write(type, 'Min = ', addedMin[type], ', ') + end + if addedMax[type] ~= 0 then + out:write(type,'Max = ', addedMax[type], ', ') + end end out:write('CritChanceBase = ', weaponType.CritChance / 100, ', ') out:write('AttackRateBase = ', round(1000 / weaponType.Speed, 2), ', ')