some of #916

Please review every file and comments and tell me what is wrong so I can fix =)
should I change
doAddCondition(pid, condition)
into
combat:execute(creature, var)
?