Just actually today, I was thinking about something similar to your weapon combo system. There may be hope for that mechanic in the future!
