Merge pull request #75 from TORISOUP/fix_chaosmode_mission

ミッションキャラクターのカオス判定修正

Author: TORISOUP

Inferno/ChaosMode/ChaosMode.cs

@@ -69,10 +69,8 @@ protected override void Setup()
         {
             _chaosSettingLoader = new ChaosModeSettingReadWriter();
             _chaosModeSetting = _chaosSettingLoader.LoadSettingFile(@"ChaosMode.conf");
-
-
-            _chaosChecker = new CharacterChaosChecker(_chaosModeSetting.MissionCharacterBehaviour,
-                _chaosModeSetting.OverrideMissionCharacterWeapon);
+            
+            _chaosChecker = new CharacterChaosChecker(_chaosModeSetting);
 
             var customWeaponProvider =
                 new CustomWeaponProvider(_chaosModeSetting.WeaponList, _chaosModeSetting.WeaponListForDriveBy);
@@ -84,8 +82,7 @@ protected override void Setup()
             {
                 customWeaponProvider.SetUp(_chaosModeSetting.WeaponList, _chaosModeSetting.WeaponListForDriveBy);
             };
-
-
+            
             //キーワードが入力されたらON／OFFを切り替える
             CreateInputKeywordAsObservable("ChaosMode_Activate", Keyword)
                 .Subscribe(_ =>
@@ -129,7 +126,7 @@ protected override void Setup()
                 .Subscribe(_ =>
                 {
                     _currentTreatType = _nextTreatType;
-                    _chaosChecker.MissionCharacterTreatment = _nextTreatType;
+                    _chaosModeSetting.MissionCharacterBehaviour= _nextTreatType;
                     DrawText("CharacterChaos:" + _currentTreatType + "[OK]");
                     chaosedPedList.Clear();
                     _localCts?.Cancel();

Inferno/ChaosMode/PedChaosChecker/CharacterChaosChecker.cs

@@ -5,22 +5,22 @@ namespace Inferno.ChaosMode
 {
     public class CharacterChaosChecker
     {
-        public CharacterChaosChecker(MissionCharacterBehaviour missionCharacterTreatment,
-            bool isChangeMissonCharacterWeapon)
+        private readonly ChaosModeSetting _chaosModeSetting;
+
+        public CharacterChaosChecker(ChaosModeSetting chaosModeSetting)
         {
-            MissionCharacterTreatment = missionCharacterTreatment;
-            IsChangeMissonCharacterWeapon = isChangeMissonCharacterWeapon;
+            _chaosModeSetting = chaosModeSetting;
         }
 
         /// <summary>
         /// ミッションキャラの武器を変更するか
         /// </summary>
-        public bool IsChangeMissonCharacterWeapon { get; set; }
+        private bool IsChangeMissionCharacterWeapon => _chaosModeSetting.OverrideMissionCharacterWeapon;
 
         /// <summary>
         /// ミッションキャラのカオス化
         /// </summary>
-        public MissionCharacterBehaviour MissionCharacterTreatment { get; set; }
+        private MissionCharacterBehaviour MissionCharacterTreatment => _chaosModeSetting.MissionCharacterBehaviour;
 
         /// <summary>
         /// 攻撃を避けるべき対象群
@@ -65,7 +65,7 @@ public bool IsPedNearAvoidAttackEntities(Ped ped)
         public bool IsPedChangebalWeapon(Ped ped)
         {
             return ped.IsSafeExist() && ped.IsAlive && !ped.IsPlayer
-                   && (!ped.IsRequiredForMission() || IsChangeMissonCharacterWeapon);
+                   && (!ped.IsRequiredForMission() || IsChangeMissionCharacterWeapon);
         }
 
         /// <summary>