HRiggs/The-Only-Cure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed support to Fancy Handwork

Browse Source
This commit is contained in:
Pao
2023-02-03 00:12:35 +01:00
parent 9a1992870d
commit cbb934a26f
2 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/lua/client/TOC_HelperFunctions.lua
View File

@@ -282,6 +282,4 @@ function TocPopulateCanBeHeldTable(can_be_held, limbs_data)
end end
end end
return
end end

41
media/lua/client/TOC_ModCompatibility.lua
View File

@@ -4,7 +4,7 @@
local function OverrideFancyHandwork() local function OverrideFancyHandwork()
if getActivatedMods():contains('FancyHandwork') == false then return end if getActivatedMods():contains('FancyHandwork') == false then return end
require "TimedActions/FHSwapHandsAction"
local og_ISHotbar_equipItem = ISHotbar.equipItem local og_ISHotbar_equipItem = ISHotbar.equipItem
@@ -18,12 +18,14 @@ local function OverrideFancyHandwork()
local limbs_data = getPlayer():getModData().TOC.Limbs local limbs_data = getPlayer():getModData().TOC.Limbs
local can_be_held = {} local can_be_held = {}
-- TODO not totally realiable
TocPopulateCanBeHeldTable(can_be_held, limbs_data) TocPopulateCanBeHeldTable(can_be_held, limbs_data)
for _, test in pairs(can_be_held) do -- for _, test in pairs(can_be_held) do
print(test) -- print(test)
end -- end
--ISInventoryPaneContextMenu.transferIfNeeded(self.chr, item) --ISInventoryPaneContextMenu.transferIfNeeded(self.chr, item)
-- If we already have the item equipped -- If we already have the item equipped
@@ -41,6 +43,7 @@ local function OverrideFancyHandwork()
equip = false equip = false
end end
if mod then if mod then
print("TOC: Fancy Handwork modifier")
-- If we still have something equipped in secondary, unequip -- If we still have something equipped in secondary, unequip
if secondary and equip and can_be_held["Left"] then if secondary and equip and can_be_held["Left"] then
ISTimedActionQueue.add(ISUnequipAction:new(self.chr, secondary, 20)) ISTimedActionQueue.add(ISUnequipAction:new(self.chr, secondary, 20))
@@ -48,7 +51,7 @@ local function OverrideFancyHandwork()
if can_be_held["Left"] then if can_be_held["Left"] then
ISTimedActionQueue.add(ISEquipWeaponAction:new(self.chr, item, 20, false, item:isTwoHandWeapon())) ISTimedActionQueue.add(ISEquipWeaponAction:new(self.chr, item, 20, false, item:isTwoHandWeapon()))
else elseif can_be_held["Right"] then
ISTimedActionQueue.add(ISEquipWeaponAction:new(self.chr, item, 20, true, item:isTwoHandWeapon())) ISTimedActionQueue.add(ISEquipWeaponAction:new(self.chr, item, 20, true, item:isTwoHandWeapon()))
end end
@@ -60,7 +63,7 @@ local function OverrideFancyHandwork()
-- Equip Primary -- Equip Primary
if can_be_held["Right"] then if can_be_held["Right"] then
ISTimedActionQueue.add(ISEquipWeaponAction:new(self.chr, item, 20, true, item:isTwoHandWeapon())) ISTimedActionQueue.add(ISEquipWeaponAction:new(self.chr, item, 20, true, item:isTwoHandWeapon()))
else elseif can_be_held["Left"] then
ISTimedActionQueue.add(ISEquipWeaponAction:new(self.chr, item, 20, false, item:isTwoHandWeapon())) ISTimedActionQueue.add(ISEquipWeaponAction:new(self.chr, item, 20, false, item:isTwoHandWeapon()))
end end
@@ -73,32 +76,12 @@ local function OverrideFancyHandwork()
local og_FHSwapHandsAction = FHSwapHandsAction.start local og_FHSwapHandsAction = FHSwapHandsAction.start
function FHSwapHandsAction:start()
function FHSwapHandsAction:isValid()
local limbs_data = getPlayer():getModData().TOC.Limbs local limbs_data = getPlayer():getModData().TOC.Limbs
local can_be_held = {} local can_be_held = {}
TocPopulateCanBeHeldTable(can_be_held, limbs_data) TocPopulateCanBeHeldTable(can_be_held, limbs_data)
return (can_be_held["Right"] and can_be_held["Left"]) and(((self.character:getPrimaryHandItem() or self.character:getSecondaryHandItem()) ~= nil))
if self.itemL and can_be_held["Right"] then
self.itemL:setJobType(getText("ContextMenu_Equip_Primary") .. " " .. self.itemL:getName())
self.itemL:setJobDelta(0.0)
else
self:stop()
return
end
if self.itemR and can_be_held["Left"] then
self.itemR:setJobType(getText("ContextMenu_Equip_Secondary") .. " " .. self.itemR:getName())
self.itemR:setJobDelta(0.0)
else
self:stop()
return
end
self:setActionAnim("EquipItem")
self:setOverrideHandModels(self.itemR, self.itemL)
end end
end end