From 9718e806e6826a6a714bf000e1106bebf567ca7d Mon Sep 17 00:00:00 2001 From: RevengenRat <138193222+Ratyyy@users.noreply.github.com> Date: Fri, 17 Jan 2025 13:58:48 +0200 Subject: [PATCH] =?UTF-8?q?=D0=BD=D1=91=D1=80=D1=84=20=D0=BF=D0=B8=D1=80?= =?UTF-8?q?=D0=B0=D1=82=D0=BE=D0=B2,=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BC=D0=B8=D0=BA=D1=80=D0=BE=D1=80=D0=B5?= =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=BE=D0=BA=20(#992)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Описание PR список цен пиратов заменён на предложенный @armorkilled микрореакторки удалены из рнд ## Почему / Баланс **Ссылка на публикацию в Discord** пираты были слишком имбовыми, как и микрореакторки. TODO: добавить блюспейс кристалы, блюспейс батарейки ## Медиа ## Требования - [X] Я прочитал(а) и следую [Руководство по созданию пулл реквестов](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html). Я понимаю, что в противном случае мой ПР может быть закрыт по усмотрению мейнтейнера. - [X] Я добавил скриншоты/видео к этому пулл реквесту, демонстрирующие его изменения в игре, **или** этот пулл реквест не требует демонстрации в игре ## Критические изменения **Чейнджлог** 🆑 Ratyyy - remove: НТ приняло решение убрать микрореакторные батареи из снаряжения, доступного РнД! - tweak: в связи с инфляцией пиастр, их стоимость значительно упала, в следствии чего на них нельзя больше закупить настолько много снаряжения! --- .../Prototypes/ADT/Catalog/pirate_catalog.yml | 57 ++++++++----------- .../Entities/Structures/Machines/lathe.yml | 2 +- Resources/Prototypes/Research/industrial.yml | 27 ++++----- 3 files changed, 38 insertions(+), 48 deletions(-) diff --git a/Resources/Prototypes/ADT/Catalog/pirate_catalog.yml b/Resources/Prototypes/ADT/Catalog/pirate_catalog.yml index 85ed9c0490b..093162f43ce 100644 --- a/Resources/Prototypes/ADT/Catalog/pirate_catalog.yml +++ b/Resources/Prototypes/ADT/Catalog/pirate_catalog.yml @@ -7,7 +7,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Projectiles/projectiles2.rsi, state: ball } productEntity: CannonBall cost: - Piastre: 100 + Piastre: 2200 categories: - ADTPirate @@ -19,7 +19,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: grapeshot } productEntity: CannonBallGrapeshot cost: - Piastre: 120 + Piastre: 1060 categories: - ADTPirate @@ -30,7 +30,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Shotguns/sawn.rsi, state: icon } productEntity: WeaponShotgunSawn cost: - Piastre: 1200 + Piastre: 5000 categories: - ADTPirate @@ -41,7 +41,7 @@ icon: { sprite: /Textures/ADT/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi, state: icon } productEntity: WeaponRevolverPirate cost: - Piastre: 1000 + Piastre: 3000 categories: - ADTPirate @@ -52,7 +52,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Launchers/pirate_cannon.rsi, state: icon } productEntity: WeaponLauncherPirateCannon cost: - Piastre: 2000 + Piastre: 21000 categories: - ADTPirate @@ -63,7 +63,7 @@ icon: { sprite: /Textures/Clothing/OuterClothing/Armor/podwars_armor.rsi, state: icon } productEntity: ClothingOuterArmorPodWars cost: - Piastre: 2000 + Piastre: 12000 categories: - ADTPirate @@ -74,7 +74,7 @@ icon: { sprite: /Textures/Clothing/Head/Helmets/podwars_helmet.rsi, state: icon } productEntity: ClothingHeadHelmetPodWars cost: - Piastre: 1500 + Piastre: 4500 categories: - ADTPirate @@ -85,7 +85,7 @@ icon: { sprite: /Textures/Corvax/Clothing/OuterClothing/Coats/captain.rsi, state: icon } productEntity: ClothingOuterCoatCaptain cost: - Piastre: 2500 + Piastre: 18000 categories: - ADTPirate @@ -96,7 +96,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Battery/svalinn.rsi, state: icon } productEntity: WeaponLaserSvalinn cost: - Piastre: 1000 + Piastre: 6000 categories: - ADTPirate @@ -107,7 +107,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Battery/laser_retro.rsi, state: icon } productEntity: WeaponLaserGun cost: - Piastre: 1900 + Piastre: 5000 categories: - ADTPirate @@ -118,7 +118,7 @@ icon: { sprite: /Textures/ADT/Objects/Weapons/Guns/Battery/cutteradv.rsi, state: icon } productEntity: ADTWeaponCutterAdv cost: - Piastre: 2500 + Piastre: 4000 categories: - ADTPirate @@ -129,7 +129,7 @@ icon: { sprite: /Textures/Objects/Power/power_cells.rsi, state: microreactor } productEntity: PowerCellMicroreactor cost: - Piastre: 3000 + Piastre: 9000 categories: - ADTPirate @@ -138,9 +138,9 @@ name: uplink-pirate-pirate-name description: uplink-pirate-pirate-desc icon: { sprite: /Textures/Mobs/Species/Skeleton/parts.rsi, state: skull_icon } - productEntity: ADTMobSkeletonPirate + productEntity: ADTSpawnPointPirate cost: - Piastre: 6000 + Piastre: 40000 categories: - ADTPirate @@ -149,9 +149,9 @@ name: uplink-pirate-cannon-name description: uplink-pirate-cannon-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Shuttles/pirate_cannon.rsi, state: base } - productEntity: ShuttleGunPirateCannon + productEntity: ShuttleGunPirateCannon cost: - Piastre: 4500 + Piastre: 18500 categories: - ADTPirate @@ -162,7 +162,7 @@ icon: { sprite: /Textures/Objects/Weapons/Grenades/grenade.rsi, state: icon } productEntity: ExGrenade cost: - Piastre: 500 + Piastre: 1000 categories: - ADTPirate @@ -173,7 +173,7 @@ icon: { sprite: /Textures/Objects/Weapons/Grenades/empgrenade.rsi, state: icon } productEntity: EmpGrenade cost: - Piastre: 500 + Piastre: 2500 categories: - ADTPirate @@ -184,7 +184,7 @@ icon: { sprite: /Textures/Objects/Consumable/Drinks/glass_white.rsi, state: icon } productEntity: DrinkMilkCarton cost: - Piastre: 500 + Piastre: 2000 categories: - ADTPirate @@ -195,7 +195,7 @@ icon: { sprite: /Textures/Mobs/Animals/cow.rsi, state: cow } productEntity: MobCow cost: - Piastre: 7000 + Piastre: 21000 categories: - ADTPirate @@ -206,18 +206,7 @@ icon: { sprite: /Textures/Clothing/OuterClothing/Armor/bulletproof.rsi, state: icon } productEntity: ClothingOuterArmorBulletproof cost: - Piastre: 4000 - categories: - - ADTPirate - -- type: listing - id: ADTPirateMagnum - name: uplink-pirate-bullet-magnum-name - description: uplink-pirate-bullet-magnum-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: base } - productEntity: SpeedLoaderMagnum - cost: - Piastre: 300 + Piastre: 3000 categories: - ADTPirate @@ -228,7 +217,7 @@ icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: base } productEntity: SpeedLoaderMagnum cost: - Piastre: 300 + Piastre: 900 categories: - ADTPirate @@ -239,6 +228,6 @@ icon: { sprite: /Textures/Objects/Storage/boxes.rsi, state: shelllethal } productEntity: BoxLethalshot cost: - Piastre: 300 + Piastre: 1100 categories: - ADTPirate diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 1e24745999a..688131319ca 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -327,7 +327,7 @@ - VoiceTrigger - Igniter - HandHeldMassScanner - - PowerCellMicroreactor + # - PowerCellMicroreactor #ADT tweak - RCD #ADT Tweak - RCDAmmo #ADT Tweak - RPDAmmo #ADT Tweak diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index 555f3cdfac8..9db290ec2ce 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -199,16 +199,17 @@ - ClothingBackpackSatchelHolding - ClothingBackpackDuffelHolding -- type: technology - id: PortableFission - name: research-technology-portable-fission - icon: - sprite: Objects/Power/power_cells.rsi - state: microreactor - discipline: Industrial - tier: 3 - cost: 10000 - recipeUnlocks: - - PowerCellMicroreactor - technologyPrerequisites: - - AdvancedPowercells +#ADT TWEAK +# - type: technology +# id: PortableFission +# name: research-technology-portable-fission +# icon: +# sprite: Objects/Power/power_cells.rsi +# state: microreactor +# discipline: Industrial +# tier: 3 +# cost: 10000 +# recipeUnlocks: +# - PowerCellMicroreactor +# technologyPrerequisites: +# - AdvancedPowercells