Edited weapon.d to build with the changes to inheritance