corrected some bugs concerning combat activity
begining of control for activities according to state
merge
merge once again
new armor and weapon class, all the battle action are implemented