Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

近接武器で市民が攻撃するように修正 #63

Merged
merged 3 commits into from
Mar 30, 2019
Merged

近接武器で市民が攻撃するように修正 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2c4b96
市民が近接武器でも攻撃してくるように
meronmks Mar 27, 2019
2b060b7
設定可能な武器の種類に近接武器を追加
meronmks Mar 27, 2019
1716bc8
コメントを入れたはずなのに消えてたので対応
meronmks Mar 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Inferno/ChaosMode/ChaosMode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"));
}

Expand Down
2 changes: 1 addition & 1 deletion Inferno/ChaosMode/WeaponProvider/CustomWeaponProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down