develop
[Game] Changed gimmick implementation so that Sunken Treasure works (#1129)
Performance + Refactoring + Code Style (#709)