More work done on AI/combat mechanics

Combat mechanics yet to work... Getting there though.