Revert "ダメージ計算式の変更2"

This reverts commit 330fbe433781146aca97a7c48bd23652f96dff61.
Revert "Revert "ダメージ計算式の変更2""

This reverts commit 3d3b669e1f8e05490680cebb83f33a64c6002e7d.
Revert "Revert "Revert "ダメージ計算式の変更2"""

This reverts commit c8ff47c81e18286993301e469c4b914ff8185c21.