From cd877ff6519e8bb08191a9859e5b4d69fbc39792 Mon Sep 17 00:00:00 2001 From: KaiserMaus Date: Wed, 15 Jan 2025 15:36:12 +0000 Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B5=D0=B7=D0=BE=D0=BF=D0=B0=D1=81?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C:=20=D0=9C=D0=B0=D0=BB=D1=8B?= =?UTF-8?q?=D0=B5=20=D0=B1=D0=B0=D0=BB=D0=B0=D0=BD=D1=81=D0=BD=D1=8B=D0=B5?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B7=D0=B0=D1=89?= =?UTF-8?q?=D0=B8=D1=82=D1=8B=20=D0=B8=20=D0=B2=D0=BE=D0=BE=D1=80=D1=83?= =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20(#1116)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Balance changes * Clean --- .../VendingMachines/Inventories/detdrobe.yml | 4 ++-- .../Entities/Clothing/OuterClothing/coats.yml | 13 +++++++------ .../Entities/Clothing/OuterClothing/hardsuits.yml | 4 ++-- .../Entities/Objects/Power/powercells.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 4 +--- Resources/Prototypes/Research/arsenal.yml | 2 +- .../_Sunrise/Entities/Clothing/Head/helmets.yml | 8 ++++---- .../Entities/Clothing/OuterClothing/armor.yml | 8 ++++---- .../Entities/Clothing/OuterClothing/coats.yml | 7 ------- .../Objects/Weapons/Guns/Battery/battery_guns.yml | 12 +++++++++--- .../Prototypes/_Sunrise/Recipes/Lathes/security.yml | 5 ++--- Resources/Prototypes/_Sunrise/Research/arsenal.yml | 2 ++ 12 files changed, 35 insertions(+), 36 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index 2b44b93bb5..3e2ac795ca 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -6,11 +6,11 @@ ClothingShoesColorBrown: 2 ClothingOuterCoatDetectiveLoadout: 1 ClothingOuterCoatDetectiveLoadoutGrey: 1 - ClothingOuterCoatDetectiveDark: 2 + ClothingOuterCoatDetectiveDark: 1 ClothingHeadHatFedoraBrown: 2 ClothingUniformJumpsuitDetectiveGrey: 2 ClothingUniformJumpskirtDetectiveGrey: 2 - ClothingOuterVestDetective: 2 + ClothingOuterVestDetective: 1 ClothingNeckTieDet: 2 ClothingHeadHatFedoraGrey: 2 ClothingHandsGlovesColorBlack: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 9f25d19014..b8ee4752e5 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -66,9 +66,9 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 + Blunt: 0.65 #sunrise-start + Slash: 0.65 + Piercing: 0.6 #sunrise-end Heat: 0.7 Caustic: 0.75 # not the full 90% from ss13 because of the head - type: ExplosionResistance @@ -82,10 +82,11 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.7 + Blunt: 0.65 #sunrise-edit + Slash: 0.65 #sunrise-edit + Piercing: 0.65 #sunrise-edit Heat: 0.7 + Caustic: 0.75 #sunrise-edit - type: ExplosionResistance damageCoefficient: 0.9 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 792c76c5f6..dbfa677ff0 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -290,8 +290,8 @@ - type: Armor modifiers: coefficients: - Blunt: 0.5 - Slash: 0.5 #sunrise-edit + Blunt: 0.45 #sunrise-edit + Slash: 0.45 #sunrise-edit Piercing: 0.6 Heat: 0.65 #sunrise-edit Caustic: 0.7 diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index c01612a0d6..ce073c794c 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -34,7 +34,7 @@ - type: PowerCellVisuals - type: Riggable - type: HitscanBatteryAmmoProvider - proto: BulletRedLightLaser # Sunrise-Edit + proto: BulletRedLaser # Sunrise-Edit fireCost: 50 - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index ef148b4474..2ddec91b93 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -368,7 +368,7 @@ - EnergyDomeDirectionalTurtle # Sunrise-start - PowerCellHyper - - ClothingHeadHelmetPubgMore + - ClothingHeadHelmetPubg - MechPhasicScanningModule - HandCraftedNVD - BasicNVD @@ -933,8 +933,6 @@ - MagazineBoxMagnumRubber - MagazineBoxRifleRubber - MagazineBoxLightRifleRubber - - MagazineLightRifleBoxIncendiary - - MagazineLightRifleBoxUranium - PowerCageCombat - WeaponMechCombatImmolationGun # Sunrise - Mechs - WeaponMechCombatSolarisLaser # Sunrise - Mechs diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index fc7d0b6e99..a70d92092a 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -117,7 +117,7 @@ - TelescopicShield - HoloprojectorSecurity - WeaponDisablerSMG - - ClothingHeadHelmetPubgMore # Sunrise-edit + - ClothingHeadHelmetPubg # Sunrise-edit - type: technology id: ExplosiveTechnology diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml index e833f7a69d..0aaf7ccb51 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/Head/helmets.yml @@ -51,11 +51,11 @@ - type: Armor modifiers: coefficients: - Blunt: 0.90 - Slash: 0.90 - Heat: 0.90 + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.85 - type: ExplosionResistance - damageCoefficient: 0.90 + damageCoefficient: 0.95 #ERT Amber EVA Helmet - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml index df43b76463..fb833ca27e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/armor.yml @@ -56,14 +56,14 @@ - type: Armor modifiers: coefficients: - Blunt: 0.45 - Slash: 0.45 + Blunt: 0.5 + Slash: 0.5 Piercing: 0.5 Heat: 0.60 - Radiation: 0.75 + Radiation: 0.65 Caustic: 0.75 - type: ExplosionResistance - damageCoefficient: 0.80 + damageCoefficient: 0.75 - type: PressureProtection highPressureMultiplier: 0.6 lowPressureMultiplier: 1000 diff --git a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml index 91cc2063f0..f985a1c224 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Clothing/OuterClothing/coats.yml @@ -26,13 +26,6 @@ sprite: _Sunrise/Clothing/OuterClothing/Coats/noirdet.rsi - type: Clothing sprite: _Sunrise/Clothing/OuterClothing/Coats/noirdet.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.6 - Heat: 0.9 - type: entity parent: ClothingOuterCoatWarden diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 0f5cadc3bc..1bdb1b0f02 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -50,6 +50,8 @@ sprite: _Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi - type: Item size: Large + shape: + - 0,0,2,1 sprite: _Sunrise/Objects/Weapons/Guns/Battery/smg_laser.rsi - type: MagazineVisuals magState: mag @@ -72,7 +74,7 @@ shader: unshaded - type: Gun selectedMode: SemiAuto - fireRate: 3 + fireRate: 2.75 availableModes: - SemiAuto - type: Clothing @@ -104,6 +106,8 @@ shader: unshaded - type: Clothing sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun.rsi + - type: Item + size: Large - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser.ogg @@ -422,13 +426,15 @@ shader: unshaded - type: Clothing sprite: _Sunrise/Objects/Weapons/Guns/Battery/energygun_tactical.rsi + - type: Item + size: Large - type: Gun soundGunshot: path: /Audio/Weapons/Guns/Gunshots/laser.ogg soundEmpty: path: /Audio/Weapons/Guns/Empty/empty.ogg selectedMode: SemiAuto - fireRate: 2.1 + fireRate: 2 availableModes: - SemiAuto - FullAuto @@ -437,7 +443,7 @@ startingCharge: 1500 - type: BatterySelfRecharger autoRecharge: true - autoRechargeRate: 15 # ~3 minute + autoRechargeRate: 20 # ~2 minute autoRechargePause: true autoRechargePauseTime: 60 - type: EnergyGunFireModes diff --git a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml index 0b6753cef6..18b684deb3 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Lathes/security.yml @@ -400,11 +400,10 @@ id: ClothingShoesBootsMagCombat result: ClothingShoesBootsMagCombat category: Weapons - completetime: 12 + completetime: 25 materials: - Steel: 1500 + Steel: 1200 Plastic: 500 - Plasma: 300 Silver: 200 - type: latheRecipe diff --git a/Resources/Prototypes/_Sunrise/Research/arsenal.yml b/Resources/Prototypes/_Sunrise/Research/arsenal.yml index 3cd5ea04fb..15a27a99d3 100644 --- a/Resources/Prototypes/_Sunrise/Research/arsenal.yml +++ b/Resources/Prototypes/_Sunrise/Research/arsenal.yml @@ -37,6 +37,8 @@ cost: 7500 recipeUnlocks: - ClothingShoesBootsMagCombat + technologyPrerequisites: + - AdvancedRiotControl - type: technology id: Advanced Laser Manipulation