In case someone's looking for a merge with the mod that turns weapon upgrades into charges instead of timeouts, it can be done by deleting the lines
AddEffectDefault(EET_EnhancedWeapon, this, "repair_object", false); or AddEffectDefault(EET_EnhancedArmor, this, "repair_object", false);
from both the triggering functions where the actual conflict is AND the timer functions
timer function PNRepairBuffWeapon( dt : float, id : int ) timer function PNRepairBuffArmor( dt : float, id : int )
the other mod takes care of that effect in its own function.
This needs to be done during the merge with script merger. If a regular merge is done without this change the effect will get applied twice after the animation, which results in the buff HUD getting messed up, showing the buff twice, one of them with 0 charges.
Grindstone and Workbench Charges: http://www.nexusmods.com/witcher3/mods/2174
edit: I managed to merge everything but I still don't know how to delete single lines.
edit 2: Ok, I think I got it. I deleted the two conflict lines and searched for the 2 timer lines. Had to delete it with the "{" included, like this: https://i.imgur.com/m8AbcPS.png
So far it works, thank you.
PS It's not pretty clear if we have to delete both lines because you use the word "or".
Give Feedback
Merging with Grindstone and Workbench Charges (2 comments)
AddEffectDefault(EET_EnhancedWeapon, this, "repair_object", false);
or
AddEffectDefault(EET_EnhancedArmor, this, "repair_object", false);
from both the triggering functions where the actual conflict is AND the timer functions
timer function PNRepairBuffWeapon( dt : float, id : int )
timer function PNRepairBuffArmor( dt : float, id : int )
the other mod takes care of that effect in its own function.
This needs to be done during the merge with script merger. If a regular merge is done without this change the effect will get applied twice after the animation, which results in the buff HUD getting messed up, showing the buff twice, one of them with 0 charges.
Grindstone and Workbench Charges:
http://www.nexusmods.com/witcher3/mods/2174
It seems I can't merge this, right?
https://i.imgur.com/2lJAwlr.png
edit:
I managed to merge everything but I still don't know how to delete single lines.
edit 2:
Ok, I think I got it. I deleted the two conflict lines and searched for the 2 timer lines. Had to delete it with the "{" included, like this: https://i.imgur.com/m8AbcPS.png
So far it works, thank you.
PS
It's not pretty clear if we have to delete both lines because you use the word "or".