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

fix: fixed ignored actions that should ignore toc calculations

Browse Source
This commit is contained in:
ZioPao
2025-04-17 12:42:35 +02:00
parent d7bdee1d26
commit 80e9391db5
2 changed files with 45 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
common/media/lua/client/TOC/TimedActions/IgnoredActions.lua
View File

@@ -1,6 +1,6 @@
-- TODO This section must be overhauled
-- local DataController = require("TOC/Controllers/DataController")
local DataController = require("TOC/Controllers/DataController")
local StaticData = require("TOC/StaticData")
---@diagnostic disable: duplicate-set-field
@@ -13,70 +13,63 @@ local StaticData = require("TOC/StaticData")
---ISEquipWeaponAction
---ISUnequipAction
-- --- We're forced to re-run this crap to fix it
-- ---@param action ISBaseTimedAction
-- local function HandleSpeedSpecificAction(action, time)
-- action.skipTOC = true
-- action.maxTime = time
-- action.animSpeed = 1.0
-- end
--- We're forced to re-run this crap to fix it
---@param action ISBaseTimedAction
local function OverrideAction(action, time)
-- TODO Add forced debuff instead of just relying on the vanilla values?
action.skipTOC = true
action.maxTime = time
action.animSpeed = 1.0
end
-- local og_ISAttachItemHotbar_new = ISAttachItemHotbar.new
-- function ISAttachItemHotbar:new(character, item, slot, slotIndex, slotDef)
-- local action = og_ISAttachItemHotbar_new(self, character, item, slot, slotIndex, slotDef)
-- HandleSpeedSpecificAction(action, -1)
-- return action
-- end
local og_ISAttachItemHotbar_new = ISAttachItemHotbar.new
function ISAttachItemHotbar:new(character, item, slot, slotIndex, slotDef)
local action = og_ISAttachItemHotbar_new(self, character, item, slot, slotIndex, slotDef)
OverrideAction(action, -1)
return action
end
-- local og_ISDetachItemHotbar_new = ISDetachItemHotbar.new
-- function ISDetachItemHotbar:new(character, item)
-- local action = og_ISDetachItemHotbar_new(self, character, item)
-- HandleSpeedSpecificAction(action, -1)
-- return action
-- end
local og_ISDetachItemHotbar_new = ISDetachItemHotbar.new
function ISDetachItemHotbar:new(character, item)
local action = og_ISDetachItemHotbar_new(self, character, item)
action = OverrideAction(action, -1)
return action
end
-- local og_ISEquipWeaponAction_new = ISEquipWeaponAction.new
-- function ISEquipWeaponAction:new(character, item, time, primary, twoHands)
local og_ISEquipWeaponAction_new = ISEquipWeaponAction.new
function ISEquipWeaponAction:new(character, item, time, primary, twoHands)
-- local action = og_ISEquipWeaponAction_new(self, character, item, time, primary, twoHands)
-- TOC_DEBUG.print("Override ISEquipWeaponAction New")
local action = og_ISEquipWeaponAction_new(self, character, item, time, primary, twoHands)
TOC_DEBUG.print("Override ISEquipWeaponAction New")
-- -- check if right arm is cut off or not. if it is, penality shall apply
-- -- if we got here, the action is valid, so we know that we have a prosthesis.
-- check if right arm is cut off or not. if it is, penality shall apply
-- if we got here, the action is valid, so we know that we have a prosthesis.
local dcInst = DataController.GetInstance()
-- local dcInst = DataController.GetInstance()
-- Brutal Handwork should be considered. Use the twohands thing
if not (dcInst:getIsAnyLimbCut() and twoHands) then
OverrideAction(action, time)
end
-- if not dcInst:getIsCut(StaticData.LIMBS_IND_STR.Hand_R) then
-- action.skipTOC = true
-- action.maxTime = time
-- action.animSpeed = 1.0
-- TOC_DEBUG.print("Skipping TOC for ISEquipWeaponAction new")
-- end
return action
end
-- -- if not twoHands then
-- -- TOC_DEBUG.print("Not a two handed action, re-adding skip TOC")
-- -- HandleSpeedSpecificAction(action)
-- -- end
-- return action
-- end
local og_ISUnequipAction_new = ISUnequipAction.new
function ISUnequipAction:new(character, item, time)
local action = og_ISUnequipAction_new(self, character, item, time)
---@cast item InventoryItem
-- local og_ISUnequipAction_new = ISUnequipAction.new
-- function ISUnequipAction:new(character, item, time)
-- local action = og_ISUnequipAction_new(self, character, item, time)
-- ---@cast item InventoryItem
-- For some reason (I have no clue why), if we re-run the method it breaks basically every unequip clothing action. Not for weapons though.
if instanceof(item, 'HandWeapon') then
OverrideAction(action, time)
end
-- -- For some reason (I have no clue why), if we re-run the method it breaks basically every unequip clothing action. Not for weapons though.
-- if instanceof(item, 'HandWeapon') then
-- --print("Running handlespeedspecificaction")
-- HandleSpeedSpecificAction(action)
-- end
-- return action
-- end
return action
end
------------------------------------------------------
--- Normal cases