Gun refactor (#8301)

Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: T-Stalker <le0nel_1van@hotmail.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ElectroJr <leonsfriedrich@gmail.com> Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00
parent 1ced3c5002
commit fb943a61dc
1051 changed files with 8230 additions and 99090 deletions
--- a/Resources/Maps/marathon.yml
+++ b/Resources/Maps/marathon.yml
@@ -35543,27 +35543,17 @@ entities:
    parent: 30
    type: Transform
 - uid: 1946
-  type: ShotgunGladstone
+  type: WeaponShotgunGladstone
  components:
  - pos: -37.522247,53.66581
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.PumpBarrelComponent-ammo-container: !type:Container
-        ents: []
-      Content.Server.Weapon.Ranged.Barrels.Components.PumpBarrelComponent-chamber-container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 1947
-  type: ShotgunGladstone
+  type: WeaponShotgunGladstone
  components:
  - pos: -37.506622,53.60331
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.PumpBarrelComponent-ammo-container: !type:Container
-        ents: []
-      Content.Server.Weapon.Ranged.Barrels.Components.PumpBarrelComponent-chamber-container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 1948
  type: ShellShotgunBeanbag
  components:
@@ -35745,57 +35735,35 @@ entities:
    parent: 30
    type: Transform
 - uid: 1978
-  type: ShotgunPump
+  type: WeaponShotgunKammerer
  components:
  - pos: -37.498955,53.30476
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.PumpBarrelComponent-ammo-container: !type:Container
-        ents: []
-      Content.Server.Weapon.Ranged.Barrels.Components.PumpBarrelComponent-chamber-container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 1979
-  type: ShotgunPump
+  type: WeaponShotgunKammerer
  components:
  - pos: -37.498955,53.42976
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.PumpBarrelComponent-ammo-container: !type:Container
-        ents: []
-      Content.Server.Weapon.Ranged.Barrels.Components.PumpBarrelComponent-chamber-container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 1980
-  type: LaserRifleCog
+  type: WeaponLaserRifleCog
  components:
  - pos: -37.501694,54.356064
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 1981
-  type: LaserRifleCog
+  type: WeaponLaserRifleCog
  components:
  - pos: -37.501694,54.481064
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 1982
-  type: LaserRifleCog
+  type: WeaponLaserRifleCog
  components:
  - pos: -37.501694,54.606064
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 1983
  type: ClosetBombFilled
  components:
@@ -35839,141 +35807,101 @@ entities:
    parent: 30
    type: Transform
 - uid: 1989
-  type: SmgDrozdRiot
+  type: WeaponSubMachineGunDrozdRubber
  components:
  - pos: -37.418808,55.43419
    parent: 30
    type: Transform
  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.MagazineBarrelComponent-chamber: !type:ContainerSlot {}
-      Content.Server.Weapon.Ranged.Barrels.Components.MagazineBarrelComponent-magazine: !type:ContainerSlot
+      gun-chamber: !type:ContainerSlot {}
+      gun-magazine: !type:ContainerSlot
        ent: 1990
    type: ContainerContainer
 - uid: 1990
-  type: MagazineMagnumSmgRubber
+  type: MagazineMagnumSubMachineGunRubber
  components:
  - parent: 1989
    type: Transform
  - canCollide: False
    type: Physics
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 1991
-  type: SmgDrozdRiot
+  type: WeaponSubMachineGunDrozdRubber
  components:
  - pos: -37.418808,55.55919
    parent: 30
    type: Transform
  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.MagazineBarrelComponent-chamber: !type:ContainerSlot {}
-      Content.Server.Weapon.Ranged.Barrels.Components.MagazineBarrelComponent-magazine: !type:ContainerSlot
+      gun-chamber: !type:ContainerSlot {}
+      gun-magazine: !type:ContainerSlot
        ent: 1992
    type: ContainerContainer
 - uid: 1992
-  type: MagazineMagnumSmgRubber
+  type: MagazineMagnumSubMachineGunRubber
  components:
  - parent: 1991
    type: Transform
  - canCollide: False
    type: Physics
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 1993
-  type: MagazineMagnumSmg
+  type: MagazineMagnumSubMachineGun
  components:
  - pos: -41.760475,53.519436
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 1994
-  type: MagazineMagnumSmg
+  type: MagazineMagnumSubMachineGun
  components:
  - pos: -41.635475,53.519436
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 1995
-  type: MagazineMagnumSmg
+  type: MagazineMagnumSubMachineGun
  components:
  - pos: -41.5261,53.519436
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 1996
-  type: MagazineMagnumSmgRubber
+  type: MagazineMagnumSubMachineGunRubber
  components:
  - pos: -41.36985,53.519436
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 1997
-  type: MagazineMagnumSmgRubber
+  type: MagazineMagnumSubMachineGunRubber
  components:
  - pos: -41.2761,53.519436
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 1998
-  type: SmgWt550
+  type: WeaponSubMachineGunWt550
  components:
  - pos: -41.462822,56.535095
    parent: 30
    type: Transform
  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.MagazineBarrelComponent-chamber: !type:ContainerSlot {}
-      Content.Server.Weapon.Ranged.Barrels.Components.MagazineBarrelComponent-magazine: !type:ContainerSlot
+      gun-chamber: !type:ContainerSlot {}
+      gun-magazine: !type:ContainerSlot
        ent: 1999
    type: ContainerContainer
 - uid: 1999
-  type: MagazinePistolSmgTopMounted
+  type: MagazinePistolSubMachineGunTopMounted
  components:
  - parent: 1998
    type: Transform
  - canCollide: False
    type: Physics
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 2000
-  type: MagazinePistolSmgTopMounted
+  type: MagazinePistolSubMachineGunTopMounted
  components:
  - pos: -41.402954,56.816345
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 2001
-  type: MagazinePistolSmgTopMounted
+  type: MagazinePistolSubMachineGunTopMounted
  components:
  - pos: -41.402954,56.816345
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Ammunition.Components.RangedMagazineComponent-magazine: !type:Container
-        ents: []
-    type: ContainerContainer
 - uid: 2002
  type: BoxFlashbang
  components:
@@ -35985,25 +35913,17 @@ entities:
        ents: []
    type: ContainerContainer
 - uid: 2003
-  type: TaserGun
+  type: WeaponTaser
  components:
  - pos: -41.433113,55.382885
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 2004
-  type: TaserGun
+  type: WeaponTaser
  components:
  - pos: -41.41749,55.49226
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 2005
  type: FirelockGlass
  components:
@@ -36196,15 +36116,11 @@ entities:
        ents: []
    type: ContainerContainer
 - uid: 2029
-  type: TaserGun
+  type: WeaponTaser
  components:
  - pos: -43.536865,49.58343
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 2030
  type: Stunbaton
  components:
@@ -36705,35 +36621,23 @@ entities:
      cellslot_cell_container: !type:ContainerSlot {}
    type: ContainerContainer
 - uid: 2100
-  type: TaserGun
+  type: WeaponTaser
  components:
  - pos: -32.722816,56.444035
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 2101
-  type: TaserGun
+  type: WeaponTaser
  components:
  - pos: -32.722816,56.600285
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 2102
-  type: TaserGun
+  type: WeaponTaser
  components:
  - pos: -32.722816,56.725285
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BatteryBarrelComponent-ammo-container: !type:ContainerSlot {}
-      cellslot_cell_container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 2103
  type: Table
  components:
@@ -37136,16 +37040,11 @@ entities:
      charger-slot: !type:ContainerSlot {}
    type: ContainerContainer
 - uid: 2160
-  type: SniperBoltGunWood
+  type: WeaponSniperMosin
  components:
  - pos: -22.676535,53.623
    parent: 30
    type: Transform
-  - containers:
-      Content.Server.Weapon.Ranged.Barrels.Components.BoltActionBarrelComponent-ammo-container: !type:Container
-        ents: []
-      Content.Server.Weapon.Ranged.Barrels.Components.BoltActionBarrelComponent-chamber-container: !type:ContainerSlot {}
-    type: ContainerContainer
 - uid: 2161
  type: ClothingEyesHudSecurity
  components: