changed db npc tables
changed around fighting logic