Updates testFloors, implements player combat, fixes small compile erors