From db9233278399236df1b82afc82cbbfc34375d4cd Mon Sep 17 00:00:00 2001 From: henriquenakashima Date: Tue, 13 Oct 2020 23:03:21 -0400 Subject: [PATCH] Refactor MathUtil out of BattleController --- Assets/Battle/BattleController.cs | 6 +----- Assets/Common/MathUtil.cs | 5 +++++ Assets/Common/MathUtil.cs.meta | 11 +++++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 Assets/Common/MathUtil.cs create mode 100644 Assets/Common/MathUtil.cs.meta diff --git a/Assets/Battle/BattleController.cs b/Assets/Battle/BattleController.cs index c4e512c..b0f2c69 100644 --- a/Assets/Battle/BattleController.cs +++ b/Assets/Battle/BattleController.cs @@ -500,7 +500,7 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe if (i < start || i > end) { newPositions[i] = i; } else { - int newI = start + TrueMod( + int newI = start + MathUtil.TrueMod( i - start - effect.Positions, end - start + 1); newPositions[newI] = i; @@ -510,10 +510,6 @@ public class BattleController : MonoBehaviour, IBattleEffectApplier, IBattleEffe this.state.MoveTeamToNewPositions(effect.Team, newPositions); } - private static int TrueMod(int a, int b) { - return (a % b + b) % b; - } - public void SetupDefault(DefaultEffect effect) { DefaultHeroCard previousDefault = this.state.PlayArea.SetupDefault(effect); if (previousDefault != null) { diff --git a/Assets/Common/MathUtil.cs b/Assets/Common/MathUtil.cs new file mode 100644 index 0000000..b5de9a8 --- /dev/null +++ b/Assets/Common/MathUtil.cs @@ -0,0 +1,5 @@ +public static class MathUtil { + public static int TrueMod(int a, int b) { + return (a % b + b) % b; + } +} diff --git a/Assets/Common/MathUtil.cs.meta b/Assets/Common/MathUtil.cs.meta new file mode 100644 index 0000000..c97e80e --- /dev/null +++ b/Assets/Common/MathUtil.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b72ff201fdba3944baf8ff98adc0197e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: