From b2c4b96aeb5ae2b0d52b6f4998c848c436783965 Mon Sep 17 00:00:00 2001 From: meronmks Date: Wed, 27 Mar 2019 23:57:31 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B8=82=E6=B0=91=E3=81=8C=E8=BF=91?= =?UTF-8?q?=E6=8E=A5=E6=AD=A6=E5=99=A8=E3=81=A7=E3=82=82=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=8F=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 非武装（近接）で武装組に攻撃可能かのフラグを立てた --- Inferno/ChaosMode/ChaosMode.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Inferno/ChaosMode/ChaosMode.cs b/Inferno/ChaosMode/ChaosMode.cs index c18b1ad3..04838d0b 100644 --- a/Inferno/ChaosMode/ChaosMode.cs +++ b/Inferno/ChaosMode/ChaosMode.cs @@ -388,6 +388,7 @@ 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")); } From 2b060b781dc3c0ffe6073fdefb62811e76aece25 Mon Sep 17 00:00:00 2001 From: meronmks Date: Wed, 27 Mar 2019 23:58:32 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E3=81=AA=E6=AD=A6=E5=99=A8=E3=81=AE=E7=A8=AE=E9=A1=9E=E3=81=AB?= =?UTF-8?q?=E8=BF=91=E6=8E=A5=E6=AD=A6=E5=99=A8=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inferno/ChaosMode/WeaponProvider/CustomWeaponProvider.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Inferno/ChaosMode/WeaponProvider/CustomWeaponProvider.cs b/Inferno/ChaosMode/WeaponProvider/CustomWeaponProvider.cs index c1a393bb..16f8df1d 100644 --- a/Inferno/ChaosMode/WeaponProvider/CustomWeaponProvider.cs +++ b/Inferno/ChaosMode/WeaponProvider/CustomWeaponProvider.cs @@ -27,7 +27,7 @@ public CustomWeaponProvider(IEnumerable weaponList, IEnumerable 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(); } /// From 1716bc820eb638b75f8cef56708b3ba893d88e10 Mon Sep 17 00:00:00 2001 From: meronmks Date: Thu, 28 Mar 2019 21:03:46 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E5=85=A5=E3=82=8C=E3=81=9F=E3=81=AF=E3=81=9A=E3=81=AA?= =?UTF-8?q?=E3=81=AE=E3=81=AB=E6=B6=88=E3=81=88=E3=81=A6=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Inferno/ChaosMode/ChaosMode.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Inferno/ChaosMode/ChaosMode.cs b/Inferno/ChaosMode/ChaosMode.cs index 04838d0b..d1674f85 100644 --- a/Inferno/ChaosMode/ChaosMode.cs +++ b/Inferno/ChaosMode/ChaosMode.cs @@ -388,6 +388,7 @@ 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")); }