* update timers, update combat AI, codestyle changes, reorder AI hooks (cherry picked from commit 2bdc0d6e9d0f663892608cbcf10be122b5db80a9)
* update timers, update combat AI, codestyle changes, reorder AI hooks (cherry picked from commit 2bdc0d6e9d0f663892608cbcf10be122b5db80a9)