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

これまでに追加された武器を実装 #57

Merged
merged 2 commits into from
Oct 26, 2017
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
20 changes: 19 additions & 1 deletion Inferno/ChaosMode/WeaponProvider/ChaosModeWeapons.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ static ChaosModeWeapons()
Weapon.MINISMG,
Weapon.AUTOSHOTGUN,
Weapon.COMPACTLAUNCHER,
Weapon.PistolMk2,
Weapon.SMGMk2,
Weapon.CombatMGMk2,
Weapon.AssaultRifleMk2,
Weapon.CarbineRifleMk2,
Weapon.HeavySniperMk2,
};

//近距離系
Expand All @@ -81,6 +87,16 @@ static ChaosModeWeapons()
Weapon.GOLFCLUB,
Weapon.KNIFE,
Weapon.NIGHTSTICK,
Weapon.Bottle,
Weapon.Dagger,
Weapon.Hatchet,
Weapon.KnuckleDuster,
Weapon.Machete,
Weapon.Flashlight,
Weapon.SwitchBlade,
Weapon.Poolcue,
Weapon.Wrench,
Weapon.Battleaxe,
};

//投げる系
Expand All @@ -94,7 +110,7 @@ static ChaosModeWeapons()
Weapon.FLARE,
Weapon.SMOKEGRENADE,
Weapon.PROXIMITYMINE,
Weapon.PIPEBOMB
Weapon.PIPEBOMB,
};

//ドライブバイ
Expand All @@ -116,6 +132,8 @@ static ChaosModeWeapons()
Weapon.MINISMG,
Weapon.AUTOSHOTGUN,
Weapon.COMPACTLAUNCHER,
Weapon.PistolMk2,
Weapon.SMGMk2,
};

AllWeapons = ShootWeapons.Concat(ClosedWeapons).Concat(ProjectileWeapons).ToArray();
Expand Down
19 changes: 18 additions & 1 deletion Inferno/InfernoScripts/InfernoCore/Enums/Enums.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,24 @@ public enum Weapon
MINISMG = -1121678507,
AUTOSHOTGUN = 317205821,
COMPACTLAUNCHER = 125959754,
PIPEBOMB = -1169823560
PIPEBOMB = -1169823560,
Bottle = -102323637,
Dagger = -1834847097,
Hatchet = -102973651,
KnuckleDuster = -656458692,
Machete = -581044007,
Flashlight = -1951375401,
SwitchBlade = -538741184,
Poolcue = -1810795771,
Wrench = 419712736,
Battleaxe = -853065399,
PistolMk2 = 3219281620,
SMGMk2 = 2024373456,
CombatMGMk2 = 3686625920,
AssaultRifleMk2 = 961495388,
CarbineRifleMk2 = 4208062921,
HeavySniperMk2 = 177293209,
HomingLauncher = 1672152130
}

public enum VehicleWeapon
Expand Down