Made a big change to the combat system to allow for smoother movement of the attack bar and make the combat generally less boring. Also made the combat scene way less basic. On to map gen and obstacle placement.

Just realized theres a random dude in there...

Here's a pic of my map generator draft, it's not fully random, but i aim to remedy that by making encounters/room layouts have randomized elements.