Skip to content

Commit d8a950d

Browse files
Xaver-DaRedXaver-DaRed
authored
Merge pull request LandSandBoat#10369 from Skold177/Implement-Heady-Artifice
[lua] [sql] Implement JA Heady Artifice
2 parents 55230ff + e331b2c commit d8a950d

31 files changed

Lines changed: 301 additions & 123 deletions

‎modules/era/lua/actions/abilities/pets/attachments/flame_holder.lua‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@ local m = Module:new(moduleName)
1717

1818
local validSkills = set
1919
{
20-
xi.automaton.abilities.ARCUBALLISTA,
21-
xi.automaton.abilities.ARMOR_PIERCER,
22-
xi.automaton.abilities.ARMOR_SHATTERER,
23-
xi.automaton.abilities.BONE_CRUSHER,
24-
xi.automaton.abilities.CANNIBAL_BLADE,
25-
xi.automaton.abilities.CHIMERA_RIPPER,
26-
xi.automaton.abilities.DAZE,
27-
xi.automaton.abilities.KNOCKOUT,
28-
xi.automaton.abilities.MAGIC_MORTAR,
29-
xi.automaton.abilities.SLAPSTICK,
30-
xi.automaton.abilities.STRING_CLIPPER,
31-
xi.automaton.abilities.STRING_SHREDDER,
20+
xi.mobSkill.ARCUBALLISTA_AUTOMATON,
21+
xi.mobSkill.ARMOR_PIERCER_AUTOMATON,
22+
xi.mobSkill.ARMOR_SHATTERER_AUTOMATON,
23+
xi.mobSkill.BONE_CRUSHER_AUTOMATON,
24+
xi.mobSkill.CANNIBAL_BLADE_AUTOMATON,
25+
xi.mobSkill.CHIMERA_RIPPER_AUTOMATON,
26+
xi.mobSkill.DAZE_AUTOMATON,
27+
xi.mobSkill.KNOCKOUT_AUTOMATON,
28+
xi.mobSkill.MAGIC_MORTAR_AUTOMATON,
29+
xi.mobSkill.SLAPSTICK_AUTOMATON,
30+
xi.mobSkill.STRING_CLIPPER_AUTOMATON,
31+
xi.mobSkill.STRING_SHREDDER_AUTOMATON,
3232
}
3333

3434
m:addOverride('xi.actions.abilities.pets.attachments.flame_holder.onEquip', function(pet, attachment)

‎scripts/actions/abilities/heady_artifice.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ abilityObject.onAbilityCheck = function(player, target, ability)
1111
return xi.job_utils.puppetmaster.onAbilityCheckHeadyArtiface(player, target, ability)
1212
end
1313

14-
abilityObject.onUseAbility = function(player, target, ability)
15-
return xi.job_utils.puppetmaster.onAbilityUseHeadyArtiface(player, target, ability)
14+
abilityObject.onUseAbility = function(player, target, ability, action)
15+
return xi.job_utils.puppetmaster.onAbilityUseHeadyArtiface(player, target, ability, action)
1616
end
1717

1818
return abilityObject

‎scripts/actions/abilities/pets/attachments/barrage_turbine.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ local attachmentObject = {}
77
attachmentObject.onEquip = function(pet)
88
pet:addListener('AUTOMATON_ATTACHMENT_CHECK', 'ATTACHMENT_BARRAGE_TURBINE', function(automaton, target)
99
-- If Barrage Turbine is still on cooldown, do nothing.
10-
if automaton:hasRecast(xi.recast.ABILITY, xi.automaton.abilities.BARRAGE_TURBINE) then
10+
if automaton:hasRecast(xi.recast.ABILITY, xi.mobSkill.BARRAGE_TURBINE_AUTOMATON) then
1111
return
1212
end
1313

@@ -22,7 +22,7 @@ attachmentObject.onEquip = function(pet)
2222
return
2323
end
2424

25-
automaton:useMobAbility(xi.automaton.abilities.BARRAGE_TURBINE, target)
25+
automaton:useMobAbility(xi.mobSkill.BARRAGE_TURBINE_AUTOMATON, target)
2626
end)
2727
end
2828

‎scripts/actions/abilities/pets/attachments/disruptor.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local attachmentObject = {}
99
attachmentObject.onEquip = function(pet)
1010
pet:addListener('AUTOMATON_ATTACHMENT_CHECK', 'ATTACHMENT_DISRUPTOR', function(automaton, target)
1111
-- If Disruptor is still on cooldown, do nothing.
12-
if automaton:hasRecast(xi.recast.ABILITY, xi.automaton.abilities.DISRUPTOR) then
12+
if automaton:hasRecast(xi.recast.ABILITY, xi.mobSkill.DISRUPTOR_AUTOMATON) then
1313
return
1414
end
1515

@@ -29,7 +29,7 @@ attachmentObject.onEquip = function(pet)
2929
return
3030
end
3131

32-
automaton:useMobAbility(xi.automaton.abilities.DISRUPTOR, target)
32+
automaton:useMobAbility(xi.mobSkill.DISRUPTOR_AUTOMATON, target)
3333
end)
3434
end
3535

‎scripts/actions/abilities/pets/attachments/economizer.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ local activationThresholds =
1818
attachmentObject.onEquip = function(pet)
1919
pet:addListener('AUTOMATON_ATTACHMENT_CHECK', 'ATTACHMENT_ECONOMIZER', function(automaton, target)
2020
-- If Economizer is still on cooldown, do nothing.
21-
if automaton:hasRecast(xi.recast.ABILITY, xi.automaton.abilities.ECONOMIZER) then
21+
if automaton:hasRecast(xi.recast.ABILITY, xi.mobSkill.ECONOMIZER_AUTOMATON) then
2222
return
2323
end
2424

@@ -44,7 +44,7 @@ attachmentObject.onEquip = function(pet)
4444
return
4545
end
4646

47-
automaton:useMobAbility(xi.automaton.abilities.ECONOMIZER, automaton)
47+
automaton:useMobAbility(xi.mobSkill.ECONOMIZER_AUTOMATON, automaton)
4848
end)
4949
end
5050

‎scripts/actions/abilities/pets/attachments/eraser.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ end
7979

8080
attachmentObject.onEquip = function(pet)
8181
pet:addListener('AUTOMATON_ATTACHMENT_CHECK', 'ATTACHMENT_ERASER', function(automaton, target)
82-
if automaton:hasRecast(xi.recast.ABILITY, xi.automaton.abilities.ERASER) then
82+
if automaton:hasRecast(xi.recast.ABILITY, xi.mobSkill.ERASER_AUTOMATON) then
8383
return
8484
end
8585

@@ -109,7 +109,7 @@ attachmentObject.onEquip = function(pet)
109109
return
110110
end
111111

112-
automaton:useMobAbility(xi.automaton.abilities.ERASER, eraserTarget)
112+
automaton:useMobAbility(xi.mobSkill.ERASER_AUTOMATON, eraserTarget)
113113
end)
114114
end
115115

‎scripts/actions/abilities/pets/attachments/flashbulb.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local attachmentObject = {}
99
attachmentObject.onEquip = function(pet)
1010
pet:addListener('AUTOMATON_ATTACHMENT_CHECK', 'ATTACHMENT_FLASHBULB', function(automaton, target)
1111
-- If Flashbulb is still on cooldown, do nothing.
12-
if automaton:hasRecast(xi.recast.ABILITY, xi.automaton.abilities.FLASHBULB) then
12+
if automaton:hasRecast(xi.recast.ABILITY, xi.mobSkill.FLASHBULB_AUTOMATON) then
1313
return
1414
end
1515

@@ -26,7 +26,7 @@ attachmentObject.onEquip = function(pet)
2626
return
2727
end
2828

29-
automaton:useMobAbility(xi.automaton.abilities.FLASHBULB)
29+
automaton:useMobAbility(xi.mobSkill.FLASHBULB_AUTOMATON)
3030
end)
3131
end
3232

‎scripts/actions/abilities/pets/attachments/heat_capacitor.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local attachmentObject = {}
99
attachmentObject.onEquip = function(pet)
1010
pet:addListener('AUTOMATON_ATTACHMENT_CHECK', 'ATTACHMENT_HEAT_CAPACITOR', function(automaton, target)
1111
-- If Heat Capacitor is still on cooldown, do nothing.
12-
if automaton:hasRecast(xi.recast.ABILITY, xi.automaton.abilities.HEAT_CAPACITOR) then
12+
if automaton:hasRecast(xi.recast.ABILITY, xi.mobSkill.HEAT_CAPACITOR_AUTOMATON) then
1313
return
1414
end
1515

@@ -24,7 +24,7 @@ attachmentObject.onEquip = function(pet)
2424
return
2525
end
2626

27-
automaton:useMobAbility(xi.automaton.abilities.HEAT_CAPACITOR, automaton)
27+
automaton:useMobAbility(xi.mobSkill.HEAT_CAPACITOR_AUTOMATON, automaton)
2828
end)
2929
end
3030

‎scripts/actions/abilities/pets/attachments/heat_capacitor_ii.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local attachmentObject = {}
99
attachmentObject.onEquip = function(pet)
1010
pet:addListener('AUTOMATON_ATTACHMENT_CHECK', 'ATTACHMENT_HEAT_CAPACITOR', function(automaton, target)
1111
-- If Heat Capacitor is still on cooldown, do nothing.
12-
if automaton:hasRecast(xi.recast.ABILITY, xi.automaton.abilities.HEAT_CAPACITOR) then
12+
if automaton:hasRecast(xi.recast.ABILITY, xi.mobSkill.HEAT_CAPACITOR_AUTOMATON) then
1313
return
1414
end
1515

@@ -24,7 +24,7 @@ attachmentObject.onEquip = function(pet)
2424
return
2525
end
2626

27-
automaton:useMobAbility(xi.automaton.abilities.HEAT_CAPACITOR, automaton)
27+
automaton:useMobAbility(xi.mobSkill.HEAT_CAPACITOR_AUTOMATON, automaton)
2828
end)
2929
end
3030

‎scripts/actions/abilities/pets/attachments/mana_converter.lua‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ local attachmentObject = {}
1717
attachmentObject.onEquip = function(pet)
1818
pet:addListener('AUTOMATON_ATTACHMENT_CHECK', 'ATTACHMENT_MANA_CONVERTER', function(automaton, target)
1919
-- If Mana Converter is on cooldown, do nothing.
20-
if automaton:hasRecast(xi.recast.ABILITY, xi.automaton.abilities.MANA_CONVERTER) then
20+
if automaton:hasRecast(xi.recast.ABILITY, xi.mobSkill.MANA_CONVERTER_AUTOMATON) then
2121
return
2222
end
2323

@@ -47,7 +47,7 @@ attachmentObject.onEquip = function(pet)
4747
return
4848
end
4949

50-
automaton:useMobAbility(xi.automaton.abilities.MANA_CONVERTER, automaton)
50+
automaton:useMobAbility(xi.mobSkill.MANA_CONVERTER_AUTOMATON, automaton)
5151
end)
5252
end
5353

0 commit comments

Comments
 (0)