Minor bug fixes

Revised player to inherit from items so that EquipItem would recognize
temporary stat changes. Attempted to implement the base_game_entity
(which is inherited by player) into combat. No luck so far