How to make a Shillelagh & Magic Stone weapons

[Dresdon]

Hi,

I'm looking for some help in creating Shillelagh and Magic Stone weapons resulting from the druidic cantrips.

Given you can pick this up via Magic Initiate Feat, you need to know the primary casting stat, rather than just the Wisdom bonus.

So for Shillelagh we need:

• Melee weapon, damage type magic bludgeoning.
• Normal Strength or Dexterity adjustments should be ignored.
• Attack bonus is Prof + Primary casting stat
• Damage bonus is 1d8 + Primary casting stat

• Magic stone, swap to thrown and 1d6 damage die.

I had a go at creating this using 'Spell Attack' weapon as a starting point, but couldn't work out how to add the primary casting stat to damage whilst avoiding Strength or Dexterity being added also.

Additionally I noticed that the tooltip that appears when you mouse over 'Spell Attack' shows the wrong calculations, so that needs correcting too.

Can anyone help?