Anderys

If I place points into Weapon Focus: Melee Weapons - does it give me a bonus to say, a vibroblade AND a lightsaber? Or just the vibroblade. Also, if I take Weapon Focus: Melee Weapons, and then later Weapon Focus: Lightsaber, will the effects stack?