diff --git a/.sbproj b/.sbproj index 97db4cd..a80bcf2 100644 --- a/.sbproj +++ b/.sbproj @@ -1,292 +1,292 @@ -{ - "Title": "S\u0026mbit", - "Type": "game", - "Org": "destiny", - "Ident": "sandmbit", - "Tags": null, - "Schema": 1, - "HasAssets": true, - "AssetsPath": "", - "Resources": "fonts/Destiny_Keys.otf", - "MenuResources": null, - "HasCode": true, - "CodePath": "/code/", - "PackageReferences": [], - "EditorReferences": null, - "Metadata": { - "MaxPlayers": 8, - "MinPlayers": 2, - "GameNetworkType": "Multiplayer", - "MapSelect": "Unrestricted", - "MapList": [ - "facepunch.square" - ], - "RankType": "None", - "PerMapRanking": false, - "LeaderboardType": "None", - "GameCategory": "TechDemos", - "ProjectTemplate": null, - "CsProjName": "", - "HttpAllowList": null, - "SavedGames": true, - "MapDependentSaves": false, - "SaveFormatVersion": 1001, - "TickRate": 60, - "LaunchConfigs": [ - { - "Name": "Sambit Test", - "GameIdent": "destiny.sandmbit#local", - "MapName": "test.vmap", - "MaxPlayers": 4, - "GameSettings": {}, - "Addons": "", - "PreLaunchCommand": "", - "PostLaunchCommand": "" - } - ], - "Compiler": { - "RootNamespace": "Sandbox", - "DefineConstants": "SANDBOX;ADDON;DEBUG", - "NoWarn": "1701;1702;1591;", - "WarningsAsErrors": "", - "References": [], - "DistinctReferences": [] - }, - "Collision": { - "Defaults": { - "solid": "Collide", - "trigger": "Trigger", - "ladder": "Ignore", - "water": "Trigger", - "ethereal": "Collide", - "player": "Unset" - }, - "Pairs": [ - { - "a": "solid", - "b": "solid", - "r": "Collide" - }, - { - "a": "trigger", - "b": "playerclip", - "r": "Ignore" - }, - { - "a": "trigger", - "b": "solid", - "r": "Trigger" - }, - { - "a": "solid", - "b": "trigger", - "r": "Collide" - }, - { - "a": "playerclip", - "b": "solid", - "r": "Collide" - }, - { - "a": "water", - "b": "water" - }, - { - "a": "ethereal", - "b": "player", - "r": "Trigger" - }, - { - "a": "ethereal", - "b": "ethereal" - }, - { - "a": "solid", - "b": "ethereal", - "r": "Collide" - } - ] - }, - "ControlModes": {}, - "InputSettings": { - "Actions": [ - { - "Name": "Forward", - "KeyboardCode": "W", - "GroupName": "Movement" - }, - { - "Name": "Backward", - "KeyboardCode": "S", - "GroupName": "Movement" - }, - { - "Name": "Left", - "KeyboardCode": "A", - "GroupName": "Movement" - }, - { - "Name": "Right", - "KeyboardCode": "D", - "GroupName": "Movement" - }, - { - "Name": "Jump", - "KeyboardCode": "space", - "GamepadCode": "A", - "GroupName": "Movement" - }, - { - "Name": "Run", - "KeyboardCode": "shift", - "GamepadCode": "LeftJoystickButton", - "GroupName": "Movement" - }, - { - "Name": "Walk", - "KeyboardCode": "alt", - "GroupName": "Movement" - }, - { - "Name": "Duck", - "KeyboardCode": "ctrl", - "GamepadCode": "B", - "GroupName": "Movement" - }, - { - "Name": "attack1", - "KeyboardCode": "mouse1", - "GamepadCode": "RightTrigger", - "GroupName": "Actions" - }, - { - "Name": "attack2", - "KeyboardCode": "mouse2", - "GamepadCode": "LeftTrigger", - "GroupName": "Actions" - }, - { - "Name": "reload", - "KeyboardCode": "r", - "GamepadCode": "X", - "GroupName": "Actions" - }, - { - "Name": "use", - "KeyboardCode": "e", - "GamepadCode": "Y", - "GroupName": "Actions" - }, - { - "Name": "Slot1", - "KeyboardCode": "1", - "GamepadCode": "DpadWest", - "GroupName": "Inventory" - }, - { - "Name": "Slot2", - "KeyboardCode": "2", - "GamepadCode": "DpadEast", - "GroupName": "Inventory" - }, - { - "Name": "Slot3", - "KeyboardCode": "3", - "GamepadCode": "DpadSouth", - "GroupName": "Inventory" - }, - { - "Name": "Slot4", - "KeyboardCode": "4", - "GroupName": "Inventory" - }, - { - "Name": "Slot5", - "KeyboardCode": "5", - "GroupName": "Inventory" - }, - { - "Name": "Slot6", - "KeyboardCode": "6", - "GroupName": "Inventory" - }, - { - "Name": "Slot7", - "KeyboardCode": "7", - "GroupName": "Inventory" - }, - { - "Name": "Slot8", - "KeyboardCode": "8", - "GroupName": "Inventory" - }, - { - "Name": "Slot9", - "KeyboardCode": "9", - "GroupName": "Inventory" - }, - { - "Name": "Slot0", - "KeyboardCode": "0", - "GroupName": "Inventory" - }, - { - "Name": "SlotPrev", - "KeyboardCode": "mouse4", - "GamepadCode": "SwitchLeftBumper", - "GroupName": "Inventory" - }, - { - "Name": "SlotNext", - "KeyboardCode": "mouse5", - "GamepadCode": "SwitchRightBumper", - "GroupName": "Inventory" - }, - { - "Name": "View", - "KeyboardCode": "C", - "GamepadCode": "RightJoystickButton", - "GroupName": "Other" - }, - { - "Name": "Voice", - "KeyboardCode": "v", - "GroupName": "Other" - }, - { - "Name": "Drop", - "KeyboardCode": "g", - "GroupName": "Other" - }, - { - "Name": "Flashlight", - "KeyboardCode": "f", - "GamepadCode": "DpadNorth", - "GroupName": "Other" - }, - { - "Name": "Score", - "KeyboardCode": "tab", - "GamepadCode": "SwitchLeftMenu", - "GroupName": "Other" - }, - { - "Name": "Menu", - "KeyboardCode": "Q", - "GamepadCode": "SwitchRightMenu", - "GroupName": "Other" - }, - { - "Name": "Chat", - "KeyboardCode": "enter", - "GroupName": "Other" - }, - { - "Name": "attack3", - "KeyboardCode": "MOUSE3", - "GroupName": "Actions" - } - ] - } - } +{ + "Title": "S\u0026mbit", + "Type": "game", + "Org": "destiny", + "Ident": "sandmbit", + "Tags": null, + "Schema": 1, + "HasAssets": true, + "AssetsPath": "", + "Resources": "fonts/Destiny_Keys.otf", + "MenuResources": null, + "HasCode": true, + "CodePath": "/code/", + "PackageReferences": [], + "EditorReferences": null, + "Metadata": { + "MaxPlayers": 8, + "MinPlayers": 2, + "GameNetworkType": "Multiplayer", + "MapSelect": "Unrestricted", + "MapList": [ + "facepunch.square" + ], + "RankType": "None", + "PerMapRanking": false, + "LeaderboardType": "None", + "GameCategory": "TechDemos", + "ProjectTemplate": null, + "CsProjName": "", + "HttpAllowList": null, + "SavedGames": true, + "MapDependentSaves": false, + "SaveFormatVersion": 1001, + "TickRate": 60, + "LaunchConfigs": [ + { + "Name": "Sambit Test", + "GameIdent": "destiny.sandmbit#local", + "MapName": "test.vmap", + "MaxPlayers": 4, + "GameSettings": {}, + "Addons": "", + "PreLaunchCommand": "", + "PostLaunchCommand": "" + } + ], + "Compiler": { + "RootNamespace": "Sandbox", + "DefineConstants": "SANDBOX;ADDON;DEBUG", + "NoWarn": "1701;1702;1591;", + "WarningsAsErrors": "", + "References": [], + "DistinctReferences": [] + }, + "Collision": { + "Defaults": { + "solid": "Collide", + "trigger": "Trigger", + "ladder": "Ignore", + "water": "Trigger", + "ethereal": "Collide", + "player": "Unset" + }, + "Pairs": [ + { + "a": "solid", + "b": "solid", + "r": "Collide" + }, + { + "a": "trigger", + "b": "playerclip", + "r": "Ignore" + }, + { + "a": "trigger", + "b": "solid", + "r": "Trigger" + }, + { + "a": "solid", + "b": "trigger", + "r": "Collide" + }, + { + "a": "playerclip", + "b": "solid", + "r": "Collide" + }, + { + "a": "water", + "b": "water" + }, + { + "a": "ethereal", + "b": "player", + "r": "Trigger" + }, + { + "a": "ethereal", + "b": "ethereal" + }, + { + "a": "solid", + "b": "ethereal", + "r": "Collide" + } + ] + }, + "ControlModes": {}, + "InputSettings": { + "Actions": [ + { + "Name": "Forward", + "KeyboardCode": "W", + "GroupName": "Movement" + }, + { + "Name": "Backward", + "KeyboardCode": "S", + "GroupName": "Movement" + }, + { + "Name": "Left", + "KeyboardCode": "A", + "GroupName": "Movement" + }, + { + "Name": "Right", + "KeyboardCode": "D", + "GroupName": "Movement" + }, + { + "Name": "Jump", + "KeyboardCode": "space", + "GamepadCode": "A", + "GroupName": "Movement" + }, + { + "Name": "Run", + "KeyboardCode": "shift", + "GamepadCode": "LeftJoystickButton", + "GroupName": "Movement" + }, + { + "Name": "Walk", + "KeyboardCode": "alt", + "GroupName": "Movement" + }, + { + "Name": "Duck", + "KeyboardCode": "ctrl", + "GamepadCode": "B", + "GroupName": "Movement" + }, + { + "Name": "attack1", + "KeyboardCode": "mouse1", + "GamepadCode": "RightTrigger", + "GroupName": "Actions" + }, + { + "Name": "attack2", + "KeyboardCode": "mouse2", + "GamepadCode": "LeftTrigger", + "GroupName": "Actions" + }, + { + "Name": "reload", + "KeyboardCode": "r", + "GamepadCode": "X", + "GroupName": "Actions" + }, + { + "Name": "use", + "KeyboardCode": "e", + "GamepadCode": "Y", + "GroupName": "Actions" + }, + { + "Name": "Slot1", + "KeyboardCode": "1", + "GamepadCode": "DpadWest", + "GroupName": "Inventory" + }, + { + "Name": "Slot2", + "KeyboardCode": "2", + "GamepadCode": "DpadEast", + "GroupName": "Inventory" + }, + { + "Name": "Slot3", + "KeyboardCode": "3", + "GamepadCode": "DpadSouth", + "GroupName": "Inventory" + }, + { + "Name": "Slot4", + "KeyboardCode": "4", + "GroupName": "Inventory" + }, + { + "Name": "Slot5", + "KeyboardCode": "5", + "GroupName": "Inventory" + }, + { + "Name": "Slot6", + "KeyboardCode": "6", + "GroupName": "Inventory" + }, + { + "Name": "Slot7", + "KeyboardCode": "7", + "GroupName": "Inventory" + }, + { + "Name": "Slot8", + "KeyboardCode": "8", + "GroupName": "Inventory" + }, + { + "Name": "Slot9", + "KeyboardCode": "9", + "GroupName": "Inventory" + }, + { + "Name": "Slot0", + "KeyboardCode": "0", + "GroupName": "Inventory" + }, + { + "Name": "SlotPrev", + "KeyboardCode": "mouse4", + "GamepadCode": "SwitchLeftBumper", + "GroupName": "Inventory" + }, + { + "Name": "SlotNext", + "KeyboardCode": "mouse5", + "GamepadCode": "SwitchRightBumper", + "GroupName": "Inventory" + }, + { + "Name": "View", + "KeyboardCode": "C", + "GamepadCode": "RightJoystickButton", + "GroupName": "Other" + }, + { + "Name": "Voice", + "KeyboardCode": "v", + "GroupName": "Other" + }, + { + "Name": "Drop", + "KeyboardCode": "g", + "GroupName": "Other" + }, + { + "Name": "Flashlight", + "KeyboardCode": "f", + "GamepadCode": "DpadNorth", + "GroupName": "Other" + }, + { + "Name": "Score", + "KeyboardCode": "tab", + "GamepadCode": "SwitchLeftMenu", + "GroupName": "Other" + }, + { + "Name": "Menu", + "KeyboardCode": "Q", + "GamepadCode": "SwitchRightMenu", + "GroupName": "Other" + }, + { + "Name": "Chat", + "KeyboardCode": "enter", + "GroupName": "Other" + }, + { + "Name": "attack3", + "KeyboardCode": "MOUSE3", + "GroupName": "Actions" + } + ] + } + } } \ No newline at end of file diff --git a/code/Systems/Weapon/Components/PrimaryFireComponent.cs b/code/Systems/Weapon/Components/PrimaryFireComponent.cs index 6a56d67..8d0043c 100644 --- a/code/Systems/Weapon/Components/PrimaryFireComponent.cs +++ b/code/Systems/Weapon/Components/PrimaryFireComponent.cs @@ -17,8 +17,9 @@ public partial class PrimaryFire : WeaponComponent, ISingletonComponent [Net, Prefab, Category( "Bullet" )] public int BulletCount { get; set; } [Net, Prefab, Category( "Bullet" )] public float BulletForce { get; set; } [Net, Prefab, Category( "Bullet" )] public float BulletSize { get; set; } - [Net, Prefab, Category( "Bullet" )] public float BulletSpread { get; set; } + [Net, Prefab, Category( "Bullet" )] public float BulletSpread { get; set; } + [Net, Prefab, Category( "Bullet" )] public float AimSpread { get; set; } [Net, Prefab, Category( "General" )] public float RPM { get; set; } protected AimDownSights AimData => Weapon.GetComponent(); @@ -40,8 +41,8 @@ public enum Firing_Type protected override bool CanStart( Pawn player ) { - if ( player.Controller.IsMechanicActive() ) return false; - + if ( player.Controller.IsMechanicActive() ) return false; + if ( Weapon.Ammo == 0 ) return false; if ( CanBurst() ) { BurstCount = 0; @@ -105,7 +106,7 @@ protected override void OnStart( Pawn player ) DoShootEffects( To.Single( player ) ); } - ShootBullet( BulletSpread, BulletForce, BulletSize, BulletCount, BulletRange ); + ShootBullet( BulletSpread, AimSpread, BulletForce, BulletSize, BulletCount, BulletRange ); } [ClientRpc] @@ -141,7 +142,7 @@ public virtual IEnumerable TraceBullet( Vector3 start, Vector3 end, yield return tr; } - public virtual void ShootBullet( float spread, float force, float bulletSize, int bulletCount = 1, float bulletRange = 5000f ) + public virtual void ShootBullet( float spread, float aimSpread, float force, float bulletSize, int bulletCount = 1, float bulletRange = 5000f ) { // // Seed rand using the tick, so bullet cones match on client and server @@ -152,8 +153,9 @@ public virtual void ShootBullet( float spread, float force, float bulletSize, in { var rot = Rotation.LookAt( Player.AimRay.Forward ); - var forward = rot.Forward; - forward += (Vector3.Random + Vector3.Random + Vector3.Random + Vector3.Random) * spread * 0.25f; + var forward = rot.Forward; + float multiplier = Input.Down( "attack2" ) ? aimSpread : spread; + forward += (Vector3.Random + Vector3.Random + Vector3.Random + Vector3.Random) * multiplier * 0.25f; forward = forward.Normal; var damage = BaseDamage; diff --git a/code/Systems/Weapon/Components/ReloadComponent.cs b/code/Systems/Weapon/Components/ReloadComponent.cs index 790ff73..922a6dc 100644 --- a/code/Systems/Weapon/Components/ReloadComponent.cs +++ b/code/Systems/Weapon/Components/ReloadComponent.cs @@ -23,7 +23,8 @@ protected override bool CanStart( Pawn player ) if ( IsReloading || controller.IsMechanicActive() ) return false; if ( Weapon.Ammo == Weapon.MaxAmmo || Weapon.ReserveAmmo == 0 ) return false; - if ( Input.Down( "reload" ) ) return true; + if ( Input.Down( "reload" ) ) return true; + if ( Weapon.Ammo == 0 && Input.Released( "attack1" ) ) return true; return false; } diff --git a/code/player/Pawn.cs b/code/player/Pawn.cs index 2988d85..8d1a154 100644 --- a/code/player/Pawn.cs +++ b/code/player/Pawn.cs @@ -99,8 +99,8 @@ public void Respawn() Components.Create(); var inventory = Components.Create(); - inventory.AddWeapon( PrefabLibrary.Spawn( "prefabs/pistol.prefab" ) ); - + inventory.AddWeapon( PrefabLibrary.Spawn( "prefabs/placeholder/pistol.prefab" ) ); + inventory.AddWeapon( PrefabLibrary.Spawn( "prefabs/placeholder/mp5.prefab" ) ); GameManager.Current?.MoveToSpawnpoint( this ); Position = Position + Vector3.Up * 2; ResetInterpolation(); diff --git a/maps/test.vmap b/maps/test.vmap index e0fe829..f18bad2 100644 Binary files a/maps/test.vmap and b/maps/test.vmap differ diff --git a/maps/test.vmap.meta b/maps/test.vmap.meta index 9783da3..507c84b 100644 --- a/maps/test.vmap.meta +++ b/maps/test.vmap.meta @@ -1,27 +1,27 @@ -{ - "publish": { - "Allowed": true, - "Enabled": false, - "ProjectConfig": { - "Title": "test", - "Type": "map", - "Org": "local", - "Ident": "test", - "Tags": null, - "Schema": 0, - "HasAssets": false, - "AssetsPath": null, - "Resources": null, - "MenuResources": null, - "HasCode": false, - "CodePath": null, - "PackageReferences": [], - "EditorReferences": [ - "destiny.sandmbit#local" - ], - "Metadata": { - "SingleAssetSource": "maps/test.vmap" - } - } - } +{ + "publish": { + "Allowed": true, + "Enabled": false, + "ProjectConfig": { + "Title": "test", + "Type": "map", + "Org": "local", + "Ident": "test", + "Tags": null, + "Schema": 0, + "HasAssets": false, + "AssetsPath": null, + "Resources": null, + "MenuResources": null, + "HasCode": false, + "CodePath": null, + "PackageReferences": [], + "EditorReferences": [ + "destiny.sandmbit#local" + ], + "Metadata": { + "SingleAssetSource": "maps/test.vmap" + } + } + } } \ No newline at end of file diff --git a/prefabs/placeholder/mp5.prefab b/prefabs/placeholder/mp5.prefab new file mode 100644 index 0000000..4e5b4c9 --- /dev/null +++ b/prefabs/placeholder/mp5.prefab @@ -0,0 +1,330 @@ +{ + "SchemaVersion": 1, + "Name": null, + "Description": null, + "Root": { + "Guid": "60f4b990-4b49-4a59-aec6-45558e69826c", + "Class": "Weapon", + "Entities": [], + "Components": [ + { + "Guid": "89f43426-e4ff-4080-8d5d-1747fe2f56b9", + "Class": "ViewModelComponent", + "Keys": { + "OverallWeight": { + "Type": "Single", + "Value": "1" + }, + "WeightReturnForce": { + "Type": "Single", + "Value": "100" + }, + "WeightDamping": { + "Type": "Single", + "Value": "10" + }, + "AccelerationDamping": { + "Type": "Single", + "Value": "1" + }, + "VelocityScale": { + "Type": "Single", + "Value": "0.5" + }, + "RotationalPivotForce": { + "Type": "Single", + "Value": "1" + }, + "RotationalScale": { + "Type": "Single", + "Value": "15" + }, + "WalkCycleOffset": { + "Type": "Vector3", + "Value": "\u00220,0,0\u0022" + }, + "BobAmount": { + "Type": "Vector2", + "Value": "\u00220,0\u0022" + }, + "GlobalLerpPower": { + "Type": "Single", + "Value": "0" + }, + "GlobalPositionOffset": { + "Type": "Vector3", + "Value": "\u00223,-2.7,0.75\u0022", + "JsonValue": "3,-2.7,0.75" + }, + "GlobalAngleOffset": { + "Type": "Angles", + "Value": "\u00220,0,0\u0022" + }, + "CrouchPositionOffset": { + "Type": "Vector3", + "Value": "\u00220,0,0\u0022" + }, + "CrouchAngleOffset": { + "Type": "Angles", + "Value": "\u00220,0,0\u0022" + }, + "AvoidancePositionOffset": { + "Type": "Vector3", + "Value": "\u00220,0,0\u0022" + }, + "AvoidanceAngleOffset": { + "Type": "Angles", + "Value": "\u00220,0,0\u0022" + }, + "SprintPositionOffset": { + "Type": "Vector3", + "Value": "\u00220,0,0\u0022" + }, + "AimAngleOffset": { + "Type": "Angles", + "Value": "\u00220,0,0\u0022" + }, + "AimFovOffset": { + "Type": "Single", + "Value": "0" + }, + "AimPositionOffset": { + "Type": "Vector3", + "Value": "\u00220,0,0\u0022" + }, + "SprintAngleOffset": { + "Type": "Angles", + "Value": "\u00220,0,0\u0022" + }, + "ViewModelPath": { + "Type": "String", + "Value": "\u0022models/weapons/v_mp5.vmdl\u0022", + "JsonValue": "models/weapons/v_mp5.vmdl" + }, + "_name": { + "JsonValue": "Pistol View Model" + }, + "_tags": { + "JsonValue": [] + }, + "ViewModelFOV": { + "Type": "Single", + "Value": "82" + } + } + }, + { + "Guid": "40f88a75-5ed2-4d6f-aca2-add47a468c4b", + "Class": "Reload", + "Keys": { + "_name": { + "JsonValue": "Reload" + }, + "_tags": { + "JsonValue": [] + } + } + }, + { + "Guid": "b8f96c18-c331-4e8a-a360-497fcea60f18", + "Class": "AimDownSights", + "Keys": { + "AimingPositionOffset": { + "Type": "Vector3", + "Value": "\u00222.25,5.85,1.8\u0022", + "JsonValue": "2.25,5.85,1.8" + }, + "AimingAngleOffset": { + "Type": "Angles", + "Value": "\u00220,0,0\u0022", + "JsonValue": "0,0,0" + }, + "AimFOV": { + "Type": "Single", + "Value": "72.6" + }, + "AimSpeed": { + "Type": "Single", + "Value": "1" + }, + "_name": { + "JsonValue": "AimDownSights" + }, + "_tags": { + "JsonValue": [] + }, + "DebugAim": { + "Type": "Boolean", + "Value": "false", + "JsonValue": false + }, + "AnimateInADS": { + "Type": "Boolean", + "Value": "true", + "JsonValue": true + } + } + }, + { + "Guid": "656c8dad-5d6a-40ff-9544-da83a0ccc1e8", + "Class": "PrimaryFire", + "Keys": { + "BaseDamage": { + "Type": "Single", + "Value": "25" + }, + "HeadshotMultiplier": { + "Type": "Single", + "Value": "1" + }, + "BulletRange": { + "Type": "Single", + "Value": "1000" + }, + "BulletCount": { + "Type": "Int32", + "Value": "1" + }, + "BulletForce": { + "Type": "Single", + "Value": "1" + }, + "BulletSize": { + "Type": "Single", + "Value": "1" + }, + "BulletSpread": { + "Type": "Single", + "Value": "0.15" + }, + "RPM": { + "Type": "Single", + "Value": "900", + "JsonValue": 900 + }, + "FiringType": { + "Type": "Firing_Type", + "Value": "\u0022Auto\u0022", + "JsonValue": "Auto" + }, + "FireSound": { + "Type": "String", + "Value": "\u0022sounds/guns/mp5.shoot.sound\u0022", + "JsonValue": "sounds/guns/mp5.shoot.sound" + }, + "_name": { + "JsonValue": "PrimaryFire" + }, + "_tags": { + "JsonValue": [] + }, + "MaxBurstCount": { + "Type": "Int32", + "Value": "3" + } + } + }, + { + "Guid": "14dadd47-4bf1-4073-bc18-51e4b818bffa", + "Class": "MoteGun", + "Keys": { + "BaseDamage": { + "Type": "Single", + "Value": "0" + }, + "HeadshotMultiplier": { + "Type": "Single", + "Value": "0" + }, + "BulletRange": { + "Type": "Single", + "Value": "0" + }, + "BulletCount": { + "Type": "Int32", + "Value": "0" + }, + "BulletForce": { + "Type": "Single", + "Value": "0" + }, + "BulletSize": { + "Type": "Single", + "Value": "0" + }, + "BulletSpread": { + "Type": "Single", + "Value": "0" + }, + "RPM": { + "Type": "Single", + "Value": "0" + }, + "FiringType": { + "Type": "Firing_Type", + "Value": "\u0022Auto\u0022" + }, + "_name": { + "JsonValue": "MoteGun" + }, + "_tags": { + "JsonValue": [] + } + } + } + ], + "Keys": { + "HoldTypePose": { + "Type": "Single", + "Value": "0" + }, + "Handedness": { + "Type": "WeaponHandedness", + "Value": "\u0022Both\u0022" + }, + "ViewModelPath": { + "Type": "String", + "Value": "\u0022weapons/rust_pistol/v_rust_pistol.vmdl\u0022" + }, + "HoldType": { + "Type": "WeaponHoldType", + "Value": "\u0022Rifle\u0022" + }, + "_name": { + "JsonValue": "MP5" + }, + "_localposition": { + "JsonValue": "0,0,0" + }, + "_localrotation": { + "JsonValue": "0,0,0" + }, + "_scale": { + "JsonValue": 1 + }, + "_tags": { + "JsonValue": "" + }, + "Model": { + "Type": "Model", + "Value": "\u0022models/weapons/w_mp5.vmdl\u0022" + }, + "ReserveAmmo": { + "Type": "Int32", + "Value": "10000" + }, + "Ammo": { + "Type": "Int32", + "Value": "32" + }, + "AmmoType": { + "Type": "Ammo_Type", + "Value": "\u0022Primary\u0022" + }, + "WeaponType": { + "Type": "WeaponType", + "Value": "\u0022SubmachineGun\u0022" + } + } + } +} \ No newline at end of file diff --git a/prefabs/pistol.prefab b/prefabs/placeholder/pistol.prefab similarity index 100% rename from prefabs/pistol.prefab rename to prefabs/placeholder/pistol.prefab