Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Increase gun item sizes (gun nerf) (#8683)

Browse Source
This commit is contained in:
metalgearsloth
2022-06-12 15:30:03 +10:00
committed by GitHub
parent 9ca56df024
commit 47aa0815de
25 changed files with 94 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Storage/EntitySystems/StorageSystem.Fill.cs
View File

@@ -31,7 +31,7 @@ public sealed partial class StorageSystem
if (serverStorageComp != null && Insert(uid, ent, serverStorageComp))
continue;
Logger.ErrorS("storage", $"Tried to StorageFill {item} inside {uid} but can't.");
Logger.ErrorS("storage", $"Tried to StorageFill {item} inside {ToPrettyString(uid)} but can't.");
EntityManager.DeleteEntity(ent);
}
}

12
Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml
View File

@@ -143,7 +143,7 @@
- type: StorageFill
contents:
- id: MagazineMagnumSubMachineGun
amount: 6
amount: 3
- type: entity
name: box of .40 Drozd (high-velocity) magazines
@@ -154,7 +154,7 @@
- type: StorageFill
contents:
- id: MagazineMagnumSubMachineGunHighVelocity
amount: 6
amount: 3
- type: entity
name: box of .40 Drozd (practice) magazines
@@ -165,7 +165,7 @@
- type: StorageFill
contents:
- id: MagazineMagnumSubMachineGunPractice
amount: 6
amount: 3
- type: entity
name: box of .40 Drozd (rubber) magazines
@@ -176,7 +176,7 @@
- type: StorageFill
contents:
- id: MagazineMagnumSubMachineGunRubber
amount: 6
amount: 3
# Pistol
- type: entity
@@ -188,7 +188,7 @@
- type: StorageFill
contents:
- id: MagazinePistolSubMachineGunTopMounted
amount: 6
amount: 3
- type: entity
name: box of Calico .35 auto magazines
@@ -199,7 +199,7 @@
- type: StorageFill
contents:
- id: MagazinePistolCalicoTopMounted
amount: 6
amount: 3
- type: entity
name: box of pistol .35 auto magazines

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/caseless_rifle.yml
View File

@@ -10,6 +10,8 @@
- CartridgeCaselessRifle
proto: CartridgeCaselessRifle
capacity: 60
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml
View File

@@ -10,6 +10,8 @@
- CartridgeLightRifle
proto: CartridgeLightRifle
capacity: 50
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml
View File

@@ -9,6 +9,8 @@
- CartridgeMagnum
proto: CartridgeMagnum
capacity: 60
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml
View File

@@ -10,6 +10,8 @@
- CartridgePistol
proto: CartridgePistol
capacity: 60
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
View File

@@ -9,6 +9,8 @@
- CartridgeRifle
proto: CartridgeRifle
capacity: 60
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/caseless_rifle.yml
View File

@@ -13,6 +13,8 @@
- CartridgeCaselessRifle
proto: CartridgeCaselessRifle
capacity: 30
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
@@ -39,6 +41,8 @@
- type: BallisticAmmoProvider
proto: CartridgeCaselessRifle
capacity: 10
- type: Item
size: 3
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_rifle_mag_short.rsi
layers:
@@ -62,6 +66,8 @@
- CartridgeCaselessRifle
proto: CartridgeCaselessRifle
capacity: 10
- type: Item
size: 5
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/CaselessRifle/caseless_pistol_mag.rsi
layers:

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
View File

@@ -7,6 +7,8 @@
- type: Tag
tags:
- MagazineHeavyRifle
- type: Item
size: 10
- type: BallisticAmmoProvider
capacity: 100
- type: ContainerContainer

3
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml
View File

@@ -14,6 +14,8 @@
- CartridgeLightRifle
proto: CartridgeLightRifle
capacity: 30
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
@@ -44,7 +46,6 @@
proto: CartridgeLightRifle
capacity: 100
- type: Item
size: 10
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Magazine/LightRifle/light_rifle_box.rsi
- type: MagazineVisuals

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/magnum.yml
View File

@@ -12,6 +12,8 @@
tags:
- CartridgeMagnum
capacity: 10
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
@@ -43,6 +45,8 @@
tags:
- CartridgeMagnum
capacity: 25
- type: Item
size: 10
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml
View File

@@ -12,6 +12,8 @@
tags:
- CartridgePistol
capacity: 10
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
@@ -43,6 +45,8 @@
tags:
- CartridgePistol
capacity: 16
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container
@@ -74,6 +78,8 @@
tags:
- CartridgePistol
capacity: 35
- type: Item
size: 10
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml
View File

@@ -8,6 +8,8 @@
- type: Tag
tags:
- MagazineRifle
- type: Item
size: 5
- type: BallisticAmmoProvider
whitelist:
tags:

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml
View File

@@ -14,6 +14,8 @@
capacity: 8
soundRack:
path: /Audio/Weapons/Guns/Cock/smg_cock.ogg
- type: Item
size: 5
- type: ContainerContainer
containers:
ballistic-ammo: !type:Container

72
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml
View File

@@ -1,3 +1,5 @@
# Rockets
- type: entity
id: CartridgeRocket
name: PG-7VL grenade
@@ -7,6 +9,8 @@
- type: Tag
tags:
- CartridgeRocket
- type: Item
size: 5
- type: CartridgeAmmo
proto: BulletRocket
deleteOnSpawn: true
@@ -16,17 +20,46 @@
state: rpg
- type: entity
id: GrenadeBaton
name: baton grenade
id: CartridgeRocketSlow
name: PG-7VL grenade "Snail-Rocket"
parent: BaseItem
description: A 1.5 warhead designed for the RPG-7 launcher. It's unusually slow.
components:
- type: Tag
tags:
- CartridgeRocket
- type: Item
size: 5
- type: CartridgeAmmo
proto: BulletWeakRocket
deleteOnSpawn: true
- type: Sprite
sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
state: frag
# Grenades
- type: entity
id: BaseGrenade
name: base grenade
parent: BaseItem
components:
- type: Tag
tags:
- Grenade
- Grenade
- type: Item
size: 5
- type: Sprite
netsync: false
- type: entity
id: GrenadeBaton
name: baton grenade
parent: BaseGrenade
components:
- type: CartridgeAmmo
proto: BulletGrenadeBaton
- type: Sprite
netsync: false
sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
layers:
- state: baton
@@ -39,15 +72,11 @@
- type: entity
id: GrenadeBlast
name: blast grenade
parent: BaseItem
parent: BaseGrenade
components:
- type: Tag
tags:
- Grenade
- type: CartridgeAmmo
proto: BulletGrenadeBlast
- type: Sprite
netsync: false
sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
layers:
- state: blast
@@ -62,13 +91,9 @@
name: flash grenade
parent: BaseItem
components:
- type: Tag
tags:
- Grenade
- type: CartridgeAmmo
proto: BulletGrenadeFlash
- type: Sprite
netsync: false
sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
layers:
- state: flash
@@ -83,13 +108,9 @@
name: frag grenade
parent: BaseItem
components:
- type: Tag
tags:
- Grenade
- type: CartridgeAmmo
proto: BulletGrenadeFrag
- type: Sprite
netsync: false
sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
layers:
- state: frag
@@ -98,20 +119,3 @@
- type: SpentAmmoVisuals
state: frag
suffix: false
- type: entity
id: CartridgeRocketSlow
name: PG-7VL grenade "Snail-Rocket"
parent: BaseItem
description: A 1.5 warhead designed for the RPG-7 launcher. It's unusually slow.
components:
- type: Tag
tags:
- CartridgeRocket
- type: CartridgeAmmo
proto: BulletWeakRocket
deleteOnSpawn: true
- type: Sprite
netsync: false
sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi
state: frag

16
Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
View File

@@ -5,6 +5,8 @@
components:
- type: Sprite
netsync: false
- type: Item
size: 50
- type: AmmoCounter
- type: Gun
fireRate: 2
@@ -37,7 +39,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 12
sprite: Objects/Weapons/Guns/Battery/laser_retro.rsi
- type: HitscanBatteryAmmoProvider
proto: RedLaser
@@ -63,7 +64,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 48
sprite: Objects/Weapons/Guns/Battery/makeshift.rsi
- type: HitscanBatteryAmmoProvider
proto: RedLaser
@@ -90,7 +90,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Battery/laser_gun.rsi
- type: Gun
selectedMode: SemiAuto
@@ -115,7 +114,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 12
sprite: Objects/Weapons/Guns/Battery/pulse_pistol.rsi
- type: Gun
selectedMode: SemiAuto
@@ -145,7 +143,7 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 24
size: 10
sprite: Objects/Weapons/Guns/Battery/pulse_carbine.rsi
- type: Gun
selectedMode: SemiAuto
@@ -177,7 +175,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Battery/pulse_rifle.rsi
- type: Gun
fireRate: 1.5
@@ -205,7 +202,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Battery/laser_cannon.rsi
- type: Gun
fireRate: 1.5
@@ -230,7 +226,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Battery/xray.rsi
- type: Gun
soundGunshot:
@@ -263,7 +258,7 @@
shader: unshaded
- type: Clothing
sprite: Objects/Weapons/Guns/Battery/taser.rsi
size: 24
size: 10
quickEquip: false
Slots:
- Belt
@@ -273,7 +268,7 @@
path: /Audio/Weapons/Guns/Gunshots/taser.ogg
- type: ProjectileBatteryAmmoProvider
proto: BulletTaser
fireCost: 100
fireCost: 50
- type: Battery
maxCharge: 100
startingCharge: 100
@@ -298,7 +293,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 12
sprite: Objects/Weapons/Guns/Battery/antiquelasergun.rsi
- type: Gun
soundGunshot:

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
View File

@@ -8,7 +8,6 @@
- type: Sprite
netsync: false
- type: Item
size: 24
- type: Gun
fireRate: 20
selectedMode: FullAuto
@@ -32,7 +31,6 @@
- state: icon
map: ["enum.GunVisualLayers.Base"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/HMGs/minigun.rsi
- type: Gun
fireRate: 15

5
Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
View File

@@ -8,7 +8,7 @@
- type: Sprite
netsync: false
- type: Item
size: 24
size: 60
- type: entity
name: china lake
@@ -22,7 +22,6 @@
- state: icon
map: ["enum.GunVisualLayers.Base"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
- type: Gun
fireRate: 1
@@ -55,7 +54,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
- type: Gun
fireRate: 0.5
@@ -89,7 +87,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Launchers/rocket.rsi
- type: Gun
fireRate: 6

4
Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml
View File

@@ -57,7 +57,6 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Pistols/viper.rsi
- type: Item
size: 10
sprite: Objects/Weapons/Guns/Pistols/viper.rsi
- type: ItemSlots
slots:
@@ -93,7 +92,6 @@
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Item
size: 10
sprite: Objects/Weapons/Guns/Pistols/hm_pistol.rsi
- type: Gun
selectedMode: SemiAuto
@@ -114,7 +112,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 10
sprite: Objects/Weapons/Guns/Pistols/cobra.rsi
- type: Gun
soundGunshot:
@@ -154,7 +151,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 10
sprite: Objects/Weapons/Guns/Pistols/mk58.rsi
- type: Gun
fireRate: 5

7
Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
View File

@@ -8,6 +8,8 @@
- type: Sprite
netsync: false
state: icon
- type: Item
size: 10
- type: Gun
selectedMode: SemiAuto
fireRate: 1.5
@@ -41,7 +43,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 12
sprite: Objects/Weapons/Guns/Revolvers/deckard.rsi
- type: RevolverAmmoProvider
capacity: 5
@@ -60,7 +61,6 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
- type: Item
size: 12
sprite: Objects/Weapons/Guns/Revolvers/inspector.rsi
- type: RevolverAmmoProvider
capacity: 6
@@ -74,7 +74,6 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
- type: Item
size: 12
sprite: Objects/Weapons/Guns/Revolvers/mateba.rsi
- type: RevolverAmmoProvider
capacity: 7
@@ -88,7 +87,6 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/python.rsi
- type: Item
size: 12
sprite: Objects/Weapons/Guns/Revolvers/python.rsi
- type: entity
@@ -100,7 +98,6 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
- type: Item
size: 12
sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi
- type: Gun
fireRate: 1

5
Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml
View File

@@ -8,7 +8,7 @@
- type: Sprite
netsync: false
- type: Item
size: 24
size: 50
- type: AmmoCounter
- type: Gun
fireRate: 5
@@ -53,7 +53,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Rifles/ak.rsi
- type: Gun
fireRate: 5
@@ -100,7 +99,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Rifles/carbine.rsi
- type: ItemSlots
slots:
@@ -142,7 +140,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Rifles/lecter.rsi
- type: Gun
soundGunshot:

6
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
View File

@@ -8,7 +8,7 @@
- type: Sprite
netsync: false
- type: Item
size: 24
size: 30
- type: AmmoCounter
- type: Gun
minAngle: 2
@@ -56,7 +56,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/SMGs/atreides.rsi
- type: Gun
fireRate: 10
@@ -80,7 +79,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/SMGs/c20r.rsi
- type: Gun
- type: ChamberMagazineAmmoProvider
@@ -105,7 +103,6 @@
- state: mag-0
map: ["enum.GunVisualLayers.Mag"]
- type: Item
size: 24
sprite: Objects/Weapons/Guns/SMGs/vector.rsi
- type: Gun
fireRate: 6
@@ -158,7 +155,6 @@
map: ["enum.GunVisualLayers.MagUnshaded"]
shader: unshaded
- type: Item
size: 24
sprite: Objects/Weapons/Guns/SMGs/wt550.rsi
- type: Gun
fireRate: 5

8
Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
View File

@@ -11,7 +11,7 @@
- state: icon
map: [ "enum.GunVisualLayers.Base" ]
- type: Item
size: 24
size: 30
- type: AmmoCounter
- type: Gun
fireRate: 2
@@ -49,7 +49,6 @@
map: ["enum.GunVisualLayers.Mag"]
- type: Item
sprite: Objects/Weapons/Guns/Shotguns/bulldog.rsi
size: 24
- type: Gun
fireRate: 2
selectedMode: FullAuto
@@ -89,7 +88,6 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
- type: Item
size: 24
sprite: Objects/Weapons/Guns/Shotguns/db_shotgun.rsi
- type: Gun
fireRate: 8
@@ -130,9 +128,9 @@
- type: Sprite
sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
- type: Item
size: 15
size: 10
sprite: Objects/Weapons/Guns/Shotguns/sawn.rsi
- type: Gun
fireRate: 8
fireRate: 4
- type: BallisticAmmoProvider
capacity: 2

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml
View File

@@ -11,7 +11,7 @@
- state: base
map: ["enum.GunVisualLayers.Base"]
- type: Item
size: 24
size: 30
- type: AmmoCounter
- type: Gun
fireRate: 1

2
Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml
View File

@@ -10,7 +10,7 @@
- state: icon
map: ["enum.GunVisualLayers.Base"]
- type: Item
size: 12
size: 10
sprite: Objects/Weapons/Guns/Shotguns/flaregun.rsi
- type: Gun
fireRate: 8