* Refactored initUpgrades, especially handling of pills
* Moved prepareBaseEffects up and renamed it
Refactored initUpgrades:
* Simplified replacement of unique jump upgrades with common ones
* Removed unused assignment of this to upgrade.skill
trailing spaces
* Fixed that selecting an upgrade didn't activate a skill
link upgrades only when not on the jump skill
Merge branch 'r0estir0bbe-refactor-initialization-skill'