From ce81c1a7a2f2d8370e2e2764970a0607fb562d47 Mon Sep 17 00:00:00 2001 From: Focstor <111702496+Focstor@users.noreply.github.com> Date: Mon, 30 Sep 2024 16:15:10 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B2=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BA=D1=83=D0=BF=D0=BE=D0=BA=20=D0=BA=D0=B0=D1=80=D0=B3?= =?UTF-8?q?=D0=BE=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B9=20=D1=85=D1=83=D0=B9?= =?UTF-8?q?=D0=BD=D0=B8=20=D0=B8=20=D0=B5=D1=89=D1=91=20=D1=85=D1=83=D0=B9?= =?UTF-8?q?=D0=BD=D1=8F=20=D0=BA=D0=B0=D0=BA=D0=B0=D1=8F=20=D1=82=D0=BE=20?= =?UTF-8?q?(#405)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * dobavlenievsego * ispravil * travmattepernegovno --- .../_sunrise/catalog/fills/crates/armory.ftl | 10 ++++ .../catalog/fills/crates/security.ftl | 5 ++ .../Entities/Clothing/Belt/belts.yml | 2 +- .../Guns/Ammunition/Cartridges/shotgun.yml | 2 +- .../Guns/Ammunition/Projectiles/shotgun.yml | 42 +++++++++---- .../_Sunrise/Catalog/Cargo/cargo_armory.yml | 49 +++++++++++++++ .../_Sunrise/Catalog/Cargo/cargo_security.yml | 19 ++++++ .../_Sunrise/Catalog/Fills/Crates/armory.yml | 60 +++++++++++++++++++ .../Catalog/Fills/Crates/security.yml | 21 +++++++ 9 files changed, 197 insertions(+), 13 deletions(-) create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl create mode 100644 Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/armory.yml create mode 100644 Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl new file mode 100644 index 0000000000..96c8b1c2fa --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/armory.ftl @@ -0,0 +1,10 @@ +ent-CrateArmoryM16A4 = ящик M16A4 + .desc = Содержит две штурмовые винтовки M16A4 и четыре магазина. Чтобы открыть необходим доступ уровня Оружейной. +ent-CrateArmoryAKMS = ящик AKMS + .desc = Содержит две штурмовые винтовки AKMS и четыре магазина. Чтобы открыть необходим доступ уровня Оружейной. +ent-CrateArmoryMP5 = ящик MP5 + .desc = Содержит два пистолета-пулемёта MP5 и четыре магазина. Чтобы открыть необходим доступ уровня Оружейной. +ent-CrateArmoryMagazineBoxLightRifleBig = ящик патронов .30 винтовочные + .desc = Содержит три ящика патрон калибра .30, в сумме 600 патрон. Чтобы открыть необходим доступ уровня Оружейной. +ent-CrateArmoryMagazineBoxRifleBig = ящик патронов .20 винтовочные + .desc = Содержит три ящика патрон калибра .20, в сумме 600 патрон. Чтобы открыть необходим доступ уровня Оружейной. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl new file mode 100644 index 0000000000..536002ff58 --- /dev/null +++ b/Resources/Locale/ru-RU/_prototypes/_sunrise/catalog/fills/crates/security.ftl @@ -0,0 +1,5 @@ +ent-CrateSecurityWebbing = ящик с РПС охраны + .desc = Ящик, содержащий две РПС охраны. Чтобы открыть необходим уровень доступа Служба безопасности. +ent-CrateSecurityGlovesCombat = ящик с боевыми перчатками + .desc = Ящик, содержащий трое боевых перчаток. Чтобы открыть необходим уровень доступа Служба безопасности. + diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 845944302f..f8cf8d89a5 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -610,7 +610,7 @@ - CartridgeAmmo - type: entity - parent: ClothingBeltSecurity + parent: [ ClothingBeltStorageBase, BaseSecurityContraband ] id: ClothingBeltSecurityWebbing name: security carrier description: Unique and versatile chest rig, can hold security gear. diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml index 47577b0857..d18eb13d55 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml @@ -29,7 +29,7 @@ - state: beanbag map: [ "enum.AmmoVisualLayers.Base" ] - type: CartridgeAmmo - proto: PelletShotgunBeanbag + proto: PelletShotgunBeanbagSpread # Sunrise-Edit - type: SpentAmmoVisuals state: "beanbag" diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml index d8c465cf9e..82df503647 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -6,7 +6,8 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: slug + layers: + - state: slug - type: Projectile damage: types: @@ -20,13 +21,25 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot + layers: + - state: buckshot - type: Projectile damage: types: - Blunt: 10 + Blunt: 2.5 # Sunrise-Edit - type: StaminaDamageOnCollide - damage: 40 # 3 hits to stun + damage: 15 # 3 hits to stun # Sunrise-Edit + +- type: entity # Sunrise-Edit + id: PelletShotgunBeanbagSpread + categories: [ HideSpawnMenu ] + parent: PelletShotgunBeanbag + components: + - type: ProjectileSpread + proto: PelletShotgunBeanbag + count: 3 + spread: 4.5 + - type: entity id: PelletShotgun @@ -36,7 +49,8 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot + layers: + - state: buckshot - type: Projectile damage: types: @@ -60,7 +74,8 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot-flare + layers: + - state: buckshot-flare - type: Projectile damage: types: @@ -87,7 +102,8 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot + layers: + - state: buckshot - type: Projectile damage: types: @@ -111,7 +127,8 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: shard + layers: + - state: shard - type: Projectile damage: types: @@ -136,7 +153,8 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot + layers: + - state: buckshot - type: Projectile damage: types: @@ -175,7 +193,8 @@ - BulletImpassable - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: buckshot-flare + layers: + - state: buckshot-flare - type: IgnitionSource ignited: true temperature: 1000 @@ -210,7 +229,8 @@ components: - type: Sprite sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi - state: depleted-uranium + layers: + - state: depleted-uranium - type: Projectile damage: types: diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml new file mode 100644 index 0000000000..28a26597f9 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_armory.yml @@ -0,0 +1,49 @@ +- type: cargoProduct + id: ArmoryM16A4 + icon: + sprite: _Sunrise/Objects/Weapons/Guns/Rifles/m16a4/big.rsi + state: icon + product: CrateArmoryM16A4 + cost: 10000 + category: cargoproduct-category-name-armory + group: market + +- type: cargoProduct + id: ArmoryAKMS + icon: + sprite: _Sunrise/Objects/Weapons/Guns/Rifles/akms/big.rsi + state: icon + product: CrateArmoryAKMS + cost: 11000 + category: cargoproduct-category-name-armory + group: market + +- type: cargoProduct + id: ArmoryMP5 + icon: + sprite: _Sunrise/Objects/Weapons/Guns/SMGs/mp5/big.rsi + state: icon + product: CrateArmoryMP5 + cost: 9500 + category: cargoproduct-category-name-armory + group: market + +- type: cargoProduct + id: ArmoryMagazineBoxLightRifleBig + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.rsi + state: base-b + product: CrateArmoryMagazineBoxLightRifleBig + cost: 2000 + category: cargoproduct-category-name-armory + group: market + +- type: cargoProduct + id: ArmoryMagazineBoxRifleBig + icon: + sprite: Objects/Weapons/Guns/Ammunition/Boxes/rifle.rsi + state: base-b + product: CrateArmoryMagazineBoxRifleBig + cost: 2000 + category: cargoproduct-category-name-armory + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml new file mode 100644 index 0000000000..45ad31cd84 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Cargo/cargo_security.yml @@ -0,0 +1,19 @@ +- type: cargoProduct + id: SecurityWebbing + icon: + sprite: Clothing/Belt/securitywebbing.rsi + state: icon + product: CrateSecurityWebbing + cost: 2500 + category: cargoproduct-category-name-security + group: market + +- type: cargoProduct + id: SecurityGlovesCombat + icon: + sprite: Clothing/Hands/Gloves/combat.rsi + state: icon + product: CrateSecurityGlovesCombat + cost: 3500 + category: cargoproduct-category-name-security + group: market diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/armory.yml new file mode 100644 index 0000000000..85e22e8585 --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/armory.yml @@ -0,0 +1,60 @@ +- type: entity + id: CrateArmoryM16A4 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + name: M16A4 crate + description: Contains two M16A4 assault rifle with four mags. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponRifleM16A4 + amount: 2 + - id: MagazineM16A4 + amount: 4 + +- type: entity + id: CrateArmoryAKMS + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + name: AKMS crate + description: Contains two AKMS assault rifle with four mags. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponAKMSRifle + amount: 2 + - id: MagazineLightRifle + amount: 4 + +- type: entity + id: CrateArmoryMP5 + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + name: MP5 crate + description: Contains two MP5 submachine gun with four mags. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: WeaponSubMachineGunMP5 + amount: 2 + - id: MagazineMP5 + amount: 4 + +- type: entity + id: CrateArmoryMagazineBoxLightRifleBig + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + name: MagazineBoxLightRifleBig crate + description: Contains two MagazineBoxLightRifleBig. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: MagazineBoxLightRifleBig + amount: 3 + +- type: entity + id: CrateArmoryMagazineBoxRifleBig + parent: [ CrateWeaponSecure, BaseRestrictedContraband ] + name: MagazineBoxRifleBig crate + description: Contains two MagazineBoxRifleBig. Requires Armory access to open. + components: + - type: StorageFill + contents: + - id: MagazineBoxRifleBig + amount: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml new file mode 100644 index 0000000000..e101c9ea2e --- /dev/null +++ b/Resources/Prototypes/_Sunrise/Catalog/Fills/Crates/security.yml @@ -0,0 +1,21 @@ +- type: entity + id: CrateSecurityWebbing + parent: CrateSecgear + name: Security Webbing crate + description: Contains two Security Webbing. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: ClothingBeltSecurityWebbing + amount: 2 + +- type: entity + id: CrateSecurityGlovesCombat + parent: CrateSecgear + name: Gloves Combat crate + description: Contains three Gloves Combat. Requires Security access to open. + components: + - type: StorageFill + contents: + - id: ClothingHandsGlovesCombat + amount: 3 \ No newline at end of file