added basic npcs + combat