Merge pull request #57 from Hackbesh/master

これまでに追加された武器を実装
TORISOUP · Oct 26, 2017 · 17e405f · 17e405f
2 parents 15c93ea + 20bf433
commit 17e405f
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 2 deletions.
diff --git a/Inferno/ChaosMode/WeaponProvider/ChaosModeWeapons.cs b/Inferno/ChaosMode/WeaponProvider/ChaosModeWeapons.cs
@@ -68,6 +68,12 @@ static ChaosModeWeapons()
                 Weapon.MINISMG,
                 Weapon.AUTOSHOTGUN,
                 Weapon.COMPACTLAUNCHER,
+                Weapon.PistolMk2,
+                Weapon.SMGMk2,
+                Weapon.CombatMGMk2,
+                Weapon.AssaultRifleMk2,
+                Weapon.CarbineRifleMk2,
+                Weapon.HeavySniperMk2,
             };
 
             //近距離系
@@ -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,
             };
 
             //投げる系
@@ -94,7 +110,7 @@ static ChaosModeWeapons()
                 Weapon.FLARE,
                 Weapon.SMOKEGRENADE,
                 Weapon.PROXIMITYMINE,
-                Weapon.PIPEBOMB
+                Weapon.PIPEBOMB,
             };
 
             //ドライブバイ
@@ -116,6 +132,8 @@ static ChaosModeWeapons()
                 Weapon.MINISMG,
                 Weapon.AUTOSHOTGUN,
                 Weapon.COMPACTLAUNCHER,
+                Weapon.PistolMk2,
+                Weapon.SMGMk2,
             };
 
             AllWeapons = ShootWeapons.Concat(ClosedWeapons).Concat(ProjectileWeapons).ToArray();

diff --git a/Inferno/InfernoScripts/InfernoCore/Enums/Enums.cs b/Inferno/InfernoScripts/InfernoCore/Enums/Enums.cs
@@ -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