Merge pull request #63 from meronmks/FixClosedWeapon

近接武器で市民が攻撃するように修正
TORISOUP · Mar 30, 2019 · 4e54c3f · 4e54c3f
2 parents f0b2cb2 + 1716bc8
commit 4e54c3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Inferno/ChaosMode/ChaosMode.cs b/Inferno/ChaosMode/ChaosMode.cs
@@ -388,6 +388,8 @@ private void PreventToFlee(Ped ped)
         {
             ped.SetFleeAttributes(0, 0);
             ped.SetCombatAttributes(46, true);
+            //非武装（近接武器）で武装した市民を攻撃できるか
+            ped.SetCombatAttributes(5, true);
             Function.Call(Hash.SET_PED_RELATIONSHIP_GROUP_HASH, ped, this.GetGTAObjectHashKey("cougar"));
         }
 

diff --git a/Inferno/ChaosMode/WeaponProvider/CustomWeaponProvider.cs b/Inferno/ChaosMode/WeaponProvider/CustomWeaponProvider.cs
@@ -27,7 +27,7 @@ public CustomWeaponProvider(IEnumerable<Weapon> weaponList, IEnumerable<Weapon>
             CustomClosedWeapons = weaponArray.Intersect(ChaosModeWeapons.ClosedWeapons).ToArray();
             CustomProjectileWeapons = weaponArray.Intersect(ChaosModeWeapons.ProjectileWeapons).ToArray();
             CustomDriveByWeapons = weaponListForDriveBy.Intersect(ChaosModeWeapons.DriveByWeapons).ToArray();
-            CustomExcludeClosedWeapons = CustomShootWeapons.Concat(CustomProjectileWeapons).ToArray();
+            CustomExcludeClosedWeapons = CustomShootWeapons.Concat(CustomProjectileWeapons).Concat(CustomClosedWeapons).ToArray();
         }
 
         /// <summary>