From 920ecbae8d83f65c2e4c4b6b402102b78b88a61d Mon Sep 17 00:00:00 2001 From: pheenty Date: Thu, 14 Nov 2024 14:37:44 +0700 Subject: [PATCH 1/6] buff python --- .../Locale/en-US/store/uplink-catalog.ftl | 9 +++++--- .../Prototypes/Catalog/uplink_catalog.yml | 23 ++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index a78f39d5696f..1aa6d2fa5704 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -3,7 +3,7 @@ uplink-pistol-viper-name = Viper uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto). uplink-revolver-python-name = Python -uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum. +uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with regular rounds, but can also shoot armor-piercing ones. Uses .45 magnum. uplink-pistol-cobra-name = Cobra uplink-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. Uses pistol magazines (.25 caseless). @@ -88,8 +88,11 @@ uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 catridges. Compatible uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless) uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra. -uplink-speedloader-magnum-name = Speedloader (.45 magnum AP) -uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python. +uplink-speedloader-magnum-name = Speedloader (.45 magnum) +uplink-speedloader-magnum-desc = Revolver speedloader with 6 regular catridges. Compatible with the Python. + +uplink-speedloader-magnum-ap-name = Speedloader (.45 magnum AP) +uplink-speedloader-magnum-ap-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python. uplink-mosin-ammo-name = Ammunition box (.30 rifle) uplink-mosin-ammo-desc = A box of 60 cartridges for the surplus rifle. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f31d85414d47..eb2449d99ba1 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -18,12 +18,12 @@ id: UplinkRevolverPython name: uplink-revolver-python-name description: uplink-revolver-python-desc - productEntity: WeaponRevolverPythonAP - discountCategory: usualDiscounts + productEntity: WeaponRevolverPython + discountCategory: rareDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 2 cost: - Telecrystal: 8 # Originally was 13 TC but was not used due to high cost + Telecrystal: 4 # Originally was 13 and then 8 TC, preloaded with AP rounds, but was not used due to high cost categories: - UplinkWeaponry @@ -499,9 +499,20 @@ # For the Python - type: listing - id: UplinkSpeedLoaderMagnumAP + id: UplinkSpeedLoaderMagnum name: uplink-speedloader-magnum-name - description: uplink-speedloader-magnu-desc + description: uplink-speedloader-magnum-desc + icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon } + productEntity: SpeedLoaderMagnum + cost: + Telecrystal: 2 + categories: + - UplinkAmmo + +- type: listing + id: UplinkSpeedLoaderMagnumAP + name: uplink-speedloader-magnum-ap-name + description: uplink-speedloader-magnum-ap-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon } productEntity: SpeedLoaderMagnumAP cost: From e9a63869c315b1f812b261e270c0d16d7407d93d Mon Sep 17 00:00:00 2001 From: pheenty Date: Tue, 11 Feb 2025 13:56:07 +0700 Subject: [PATCH 2/6] asdf --- .../Locale/en-US/store/uplink-catalog.ftl | 9 ++---- .../Prototypes/Catalog/uplink_catalog.yml | 28 ++++++------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 1aa6d2fa5704..f30170de794a 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -3,7 +3,7 @@ uplink-pistol-viper-name = Viper uplink-pistol-viper-desc = A small, easily concealable, but somewhat underpowered gun. Retrofitted with a fully automatic receiver. Uses pistol magazines (.35 auto). uplink-revolver-python-name = Python -uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with regular rounds, but can also shoot armor-piercing ones. Uses .45 magnum. +uplink-revolver-python-desc = A brutally simple, effective, and loud Syndicate revolver. Comes loaded with armor-piercing rounds. Uses .45 magnum. uplink-pistol-cobra-name = Cobra uplink-pistol-cobra-desc = A rugged, robust operator handgun with inbuilt silencer. Uses pistol magazines (.25 caseless). @@ -88,11 +88,8 @@ uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 catridges. Compatible uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless) uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra. -uplink-speedloader-magnum-name = Speedloader (.45 magnum) -uplink-speedloader-magnum-desc = Revolver speedloader with 6 regular catridges. Compatible with the Python. - -uplink-speedloader-magnum-ap-name = Speedloader (.45 magnum AP) -uplink-speedloader-magnum-ap-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python. +uplink-speedloader-magnu-name = Speedloader (.45 magnum AP) +uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python. uplink-mosin-ammo-name = Ammunition box (.30 rifle) uplink-mosin-ammo-desc = A box of 60 cartridges for the surplus rifle. diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index eb2449d99ba1..86c8e310c6db 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -18,12 +18,12 @@ id: UplinkRevolverPython name: uplink-revolver-python-name description: uplink-revolver-python-desc - productEntity: WeaponRevolverPython + productEntity: WeaponRevolverPythonAP discountCategory: rareDiscounts discountDownTo: Telecrystal: 2 cost: - Telecrystal: 4 # Originally was 13 and then 8 TC, preloaded with AP rounds, but was not used due to high cost + Telecrystal: 4 # Originally was 13 and then 8 TC but was not used due to high cost categories: - UplinkWeaponry @@ -498,21 +498,11 @@ - UplinkAmmo # For the Python -- type: listing - id: UplinkSpeedLoaderMagnum - name: uplink-speedloader-magnum-name - description: uplink-speedloader-magnum-desc - icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon } - productEntity: SpeedLoaderMagnum - cost: - Telecrystal: 2 - categories: - - UplinkAmmo - type: listing id: UplinkSpeedLoaderMagnumAP - name: uplink-speedloader-magnum-ap-name - description: uplink-speedloader-magnum-ap-desc + name: uplink-speedloader-magnu-name + description: uplink-speedloader-magnu-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon } productEntity: SpeedLoaderMagnumAP cost: @@ -1846,9 +1836,9 @@ productEntity: GatfruitSeeds discountCategory: usualDiscounts discountDownTo: - Telecrystal: 3 + Telecrystal: 2 cost: - Telecrystal: 6 + Telecrystal: 4 categories: - UplinkJob conditions: @@ -1933,11 +1923,11 @@ name: uplink-revolver-cap-gun-fake-name description: uplink-revolver-cap-gun-fake-desc productEntity: RevolverCapGunFake - discountCategory: usualDiscounts + discountCategory: rareDiscounts discountDownTo: - Telecrystal: 5 + Telecrystal: 3 cost: - Telecrystal: 9 + Telecrystal: 5 categories: - UplinkJob conditions: From aa2030829380ca0cce30c701753d91cbf9191e66 Mon Sep 17 00:00:00 2001 From: pheenty Date: Tue, 11 Feb 2025 13:57:10 +0700 Subject: [PATCH 3/6] ghjk --- Resources/Locale/en-US/store/uplink-catalog.ftl | 2 +- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index f30170de794a..a78f39d5696f 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -88,7 +88,7 @@ uplink-pistol-magazine-c20r-desc = Rifle magazine with 30 catridges. Compatible uplink-pistol-magazine-caseless-name = Pistol Magazine (.25 caseless) uplink-pistol-magazine-caseless-desc = Pistol magazine with 10 catridges. Compatible with the Cobra. -uplink-speedloader-magnu-name = Speedloader (.45 magnum AP) +uplink-speedloader-magnum-name = Speedloader (.45 magnum AP) uplink-speedloader-magnu-desc = Revolver speedloader with 6 armor-piercing catridges, capable of ignoring armor entirely. Compatible with the Python. uplink-mosin-ammo-name = Ammunition box (.30 rifle) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 86c8e310c6db..67004c6ff3bc 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -501,7 +501,7 @@ - type: listing id: UplinkSpeedLoaderMagnumAP - name: uplink-speedloader-magnu-name + name: uplink-speedloader-magnum-name description: uplink-speedloader-magnu-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Magnum/magnum_speed_loader.rsi, state: icon } productEntity: SpeedLoaderMagnumAP From 08945d955651527da10b144468140254d48bd5eb Mon Sep 17 00:00:00 2001 From: pheenty Date: Tue, 11 Feb 2025 13:57:54 +0700 Subject: [PATCH 4/6] yikes --- Resources/Prototypes/Catalog/uplink_catalog.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 67004c6ff3bc..e32766a3b39c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -498,7 +498,6 @@ - UplinkAmmo # For the Python - - type: listing id: UplinkSpeedLoaderMagnumAP name: uplink-speedloader-magnum-name From adb3e894949ce0f69bb9f49b6b6fc2bc480c42f9 Mon Sep 17 00:00:00 2001 From: pheenty Date: Tue, 11 Feb 2025 16:19:39 +0700 Subject: [PATCH 5/6] revert gatfruit --- Resources/Prototypes/Catalog/uplink_catalog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index e32766a3b39c..7453a1076dae 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1835,9 +1835,9 @@ productEntity: GatfruitSeeds discountCategory: usualDiscounts discountDownTo: - Telecrystal: 2 - cost: Telecrystal: 4 + cost: + Telecrystal: 6 categories: - UplinkJob conditions: From b85e83077973fdf733cc25b9088faa644ae81cbe Mon Sep 17 00:00:00 2001 From: pheenty Date: Tue, 11 Feb 2025 16:20:22 +0700 Subject: [PATCH 6/6] revert gatfruit --- Resources/Prototypes/Catalog/uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 7453a1076dae..3c070ffd2688 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1835,7 +1835,7 @@ productEntity: GatfruitSeeds discountCategory: usualDiscounts discountDownTo: - Telecrystal: 4 + Telecrystal: 3 cost: Telecrystal: 6 categories: