Refactor ch1 and ch2
Fix attack skills