Buff underconstruction - BM Remove conflict

(Not yet debugged...since everyone is changing the code and I was forced
to sync the code first)
BombPlusPlus was chosen to be implemented at this testing stage.
Map1 was changed for forcing an buff to occur