From b9fad20210fd668c9e460eabb36e692bb92e8b07 Mon Sep 17 00:00:00 2001 From: Succuberry Date: Wed, 26 Jun 2024 05:00:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D0=BB=D1=8C=D0=BA=D0=B8-=D0=BF?= =?UTF-8?q?=D1=83=D0=BB=D1=8C=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml | 8 +++++++- .../Guns/Ammunition/Projectiles/antimateriel.yml | 1 + .../Guns/Ammunition/Projectiles/caseless_rifle.yml | 2 ++ .../Guns/Ammunition/Projectiles/heavy_rifle.yml | 2 ++ .../Guns/Ammunition/Projectiles/light_rifle.yml | 12 +++++++----- .../Weapons/Guns/Ammunition/Projectiles/magnum.yml | 5 ++++- .../Weapons/Guns/Ammunition/Projectiles/pistol.yml | 4 ++++ .../Weapons/Guns/Ammunition/Projectiles/rifle.yml | 4 +++- .../Weapons/Guns/Ammunition/Projectiles/shotgun.yml | 3 +-- 9 files changed, 31 insertions(+), 10 deletions(-) diff --git a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml index f1f29cea202..3827f165ea7 100644 --- a/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml +++ b/Resources/Prototypes/Corvax/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/SMGsAmmo.yml @@ -9,6 +9,8 @@ types: Piercing: 5 Blunt: 4 + penetrationProb: 0.06 #CorvaxFrontier + penetrationScore: 1 - type: entity #FrontierCorvax id: BulletVector22Incendiary @@ -57,6 +59,7 @@ types: Piercing: 17 Blunt: 6 + penetrationProb: 0.51 #CorvaxFrontier penetrationScore: 1 - type: entity #FrontierCorvax @@ -94,6 +97,8 @@ Piercing: 6 Blunt: 3 Radiation: 14 + penetrationProb: 0.23 #CorvaxFrontier + penetrationScore: 1 - type: entity id: BulletVector45AP @@ -106,5 +111,6 @@ types: Piercing: 12 Blunt: 3 # 20% decrease - penetrationScore: 2 + penetrationProb: 0.69 #CorvaxFrontier + penetrationScore: 1 ignoreResistances: true diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml index be73011e777..21aeef5926f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml @@ -9,6 +9,7 @@ types: Piercing: 40 Structural: 30 + penetrationProb: 1 #CorvaxFrontier penetrationScore: 3 - type: StaminaDamageOnCollide damage: 35 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml index 5ce0bf82fe9..35de0b52451 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/caseless_rifle.yml @@ -5,6 +5,8 @@ noSpawn: true components: - type: Projectile + penetrationProb: 0.19 #CorvaxFrontier + penetrationScore: 1 damage: types: Piercing: 19 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml index 921cbc8d4ad..4b0343a33f8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml @@ -8,6 +8,7 @@ damage: types: Piercing: 19 + penetrationProb: 0.53 #CorvaxFrontier penetrationScore: 1 - type: entity @@ -20,4 +21,5 @@ damage: types: Piercing: 5 + penetrationProb: 0.04 #CorvaxFrontier penetrationScore: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml index b69efdb1aa6..575457e2c84 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/light_rifle.yml @@ -1,6 +1,6 @@ - type: entity id: BulletLightRifle - name: bullet (.20 rifle) + name: bullet (.30 rifle) parent: BaseBullet noSpawn: true components: @@ -8,11 +8,12 @@ damage: types: Piercing: 19 + penetrationProb: 0.53 #CorvaxFrontier penetrationScore: 1 - type: entity id: BulletLightRiflePractice - name: bullet (.20 rifle practice) + name: bullet (.30 rifle practice) parent: BaseBulletPractice noSpawn: true components: @@ -23,7 +24,7 @@ - type: entity id: BulletLightRifleRubber - name: bullet (.20 rifle rubber) + name: bullet (.30 rifle rubber) parent: BaseBulletRubber noSpawn: true components: @@ -35,7 +36,7 @@ - type: entity id: BulletLightRifleIncendiary parent: BaseBulletIncendiary - name: bullet (.20 rifle incendiary) + name: bullet (.30 rifle incendiary) noSpawn: true components: - type: Projectile @@ -47,7 +48,7 @@ - type: entity id: BulletLightRifleUranium parent: BaseBulletUranium - name: bullet (.20 rifle uranium) + name: bullet (.30 rifle uranium) noSpawn: true components: - type: Projectile @@ -55,4 +56,5 @@ types: Radiation: 9 Piercing: 10 + penetrationProb: 0.24 #CorvaxFrontier penetrationScore: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml index 84a079ff765..d64091c9a4e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/magnum.yml @@ -8,6 +8,7 @@ damage: types: Piercing: 35 + penetrationProb: 0.56 #CorvaxFrontier penetrationScore: 1 - type: entity @@ -56,7 +57,8 @@ damage: types: Piercing: 26 # 20% decrease - penetrationScore: 2 + penetrationProb: 0.9 #CorvaxFrontier + penetrationScore: 1 ignoreResistances: true - type: entity @@ -70,4 +72,5 @@ types: Radiation: 15 Piercing: 20 + penetrationProb: 0.32 #CorvaxFrontier penetrationScore: 1 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml index 086a8dc914f..49f82bc3ddb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/pistol.yml @@ -8,6 +8,8 @@ damage: types: Piercing: 16 + penetrationProb: 0.13 #CorvaxFrontier + penetrationScore: 1 - type: entity id: BulletPistolPractice @@ -54,3 +56,5 @@ types: Radiation: 6 Piercing: 10 + penetrationProb: 0.07 #CorvaxFrontier + penetrationScore: 1 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml index 99278c99b5a..d7d7d18e9f9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml @@ -8,6 +8,7 @@ damage: types: Piercing: 17 + penetrationProb: 0.38 #CorvaxFrontier penetrationScore: 1 - type: entity @@ -55,4 +56,5 @@ types: Radiation: 7 Piercing: 8 - penetrationScore: 1 + penetrationProb: 0.2 #CorvaxFrontier + penetrationScore: 1 \ No newline at end of file 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 fff384c2144..aabc29c05d4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml @@ -11,6 +11,7 @@ damage: types: Piercing: 28 + penetrationProb: 0.62 #CorvaxFrontier penetrationScore: 2 - type: entity @@ -42,7 +43,6 @@ damage: types: Piercing: 10 - penetrationScore: 1 - type: entity id: PelletShotgunIncendiary @@ -179,7 +179,6 @@ types: Radiation: 5 Piercing: 5 - penetrationScore: 1 - type: entity id: PelletGrapeshot #tally fucking ho