unfinished combat
Fixed map
+ begin combat system