Item Upgrade and Friendly Random Drops compatibility issue

[ZFR]

There is a tiny issue with Item Upgrade and Friendly Random Drops (merchant or token) components from Tweaks. I'm using the following:

 

~IU_IWD/SETUP-IU_IWD.TP2~ #0 #0 // Item Upgrade for Icewind Dale: v6
~CDTWEAKS/SETUP-CDTWEAKS.TP2~ #0 #3242 // Friendly Random Drops -> Exchange with merchants: v16

 

Basically if you get Stoutward from the Merchant (or from token outside the area where you got it), then CDStoutInGame will not be set to 1, and as such when you visit Dorn's Deep, AR6003, Clan Battlehammer Icon will not appear, and so even though you have Stoutward, you cannot upgrade it.

 

Now this might seem as something that has an easy workaround: simply visit AR2004 after you have Stoutward, so the script will kick in. However, there is a bigger issue: The place where Clan Battlehammer Icon appears (Container1 in AR6003) is not permanent. It's a place in the ground that disappears if you remove existing items from it.

Therefore the workaround only works if you obtain Stoutward and visit AR2004 before you visit AR6003 and remove items from Container1.

 

Ideally CDStoutInGame should be set when you obtain it from random merchant or token, but perhaps another thing that could be done is to move Clan Battlehammer icon to a permanent container too. Maybe one of the tombs in Hall of Heroes?