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.

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

バイカーアップデートの武器を追加 #51

Merged
merged 1 commit into from
Oct 9, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions Inferno/ChaosMode/WeaponProvider/ChaosModeWeapons.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ public ChaosModeWeapons()
Weapon.GUSENBERG,
Weapon.REVOLVER,
Weapon.COMPACTRIFLE,
Weapon.DOUBLEBARRELSHOTGUN
Weapon.DOUBLEBARRELSHOTGUN,
Weapon.MINISMG,
Weapon.AUTOSHOTGUN,
Weapon.COMPACTLAUNCHER,
};

//近距離系
Expand All @@ -87,7 +90,8 @@ public ChaosModeWeapons()
Weapon.STICKYBOMB,
Weapon.FLARE,
Weapon.SMOKEGRENADE,
Weapon.PROXIMITYMINE
Weapon.PROXIMITYMINE,
Weapon.PIPEBOMB
};

//ドライブバイ
Expand All @@ -106,6 +110,9 @@ public ChaosModeWeapons()
Weapon.SAWNOFFSHOTGUN,
Weapon.DOUBLEBARRELSHOTGUN,
Weapon.STUNGUN,
Weapon.MINISMG,
Weapon.AUTOSHOTGUN,
Weapon.COMPACTLAUNCHER,
};

AllWeapons = ShootWeapons.Concat(ClosedWeapons).Concat(ProjectileWeapons).ToArray();
Expand Down
6 changes: 5 additions & 1 deletion Inferno/InfernoScripts/InfernoCore/Enums/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ public enum Weapon
TANK = 1945616459,
REVOLVER = -1045183535,
COMPACTRIFLE = 1649403952,
DOUBLEBARRELSHOTGUN = -275439685
DOUBLEBARRELSHOTGUN = -275439685,
MINISMG = -1121678507,
AUTOSHOTGUN = 317205821,
COMPACTLAUNCHER = 125959754,
PIPEBOMB = -1169823560
}

public enum VehicleWeapon
Expand Down