Changed combat's master to Actor and lower cased combat_
created Die() on combat