Issue #34: Restructuring bonuses in player class