From 731ee8ae37634d7a412a5bcf86f165d32176fb5d Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 18 Sep 2024 22:06:42 -0400 Subject: [PATCH] last feedback --- .../Locale/en-US/{_white => }/store/sales.ftl | 0 .../Locale/ru-RU/{_white => }/store/sales.ftl | 0 .../Prototypes/Catalog/uplink_catalog.yml | 74 +++++++++---------- Resources/Prototypes/Store/presets.yml | 4 +- 4 files changed, 39 insertions(+), 39 deletions(-) rename Resources/Locale/en-US/{_white => }/store/sales.ftl (100%) rename Resources/Locale/ru-RU/{_white => }/store/sales.ftl (100%) diff --git a/Resources/Locale/en-US/_white/store/sales.ftl b/Resources/Locale/en-US/store/sales.ftl similarity index 100% rename from Resources/Locale/en-US/_white/store/sales.ftl rename to Resources/Locale/en-US/store/sales.ftl diff --git a/Resources/Locale/ru-RU/_white/store/sales.ftl b/Resources/Locale/ru-RU/store/sales.ftl similarity index 100% rename from Resources/Locale/ru-RU/_white/store/sales.ftl rename to Resources/Locale/ru-RU/store/sales.ftl diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 94a5cc94a64..bdd27e83a89 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -10,7 +10,7 @@ Telecrystal: 3 categories: - UplinkWeapons - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkRevolverPython @@ -21,7 +21,7 @@ Telecrystal: 8 # Originally was 13 TC but was not used due to high cost categories: - UplinkWeapons - saleLimit: 1 # WD EDIT + saleLimit: 1 # Inbuilt suppressor so it's sneaky + more expensive. - type: listing @@ -33,7 +33,7 @@ Telecrystal: 4 categories: - UplinkWeapons - saleLimit: 1 # WD EDIT + saleLimit: 1 # Poor accuracy, slow to fire, cheap option - type: listing @@ -45,7 +45,7 @@ Telecrystal: 1 categories: - UplinkWeapons - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkEsword @@ -57,7 +57,7 @@ Telecrystal: 8 categories: - UplinkWeapons - saleLimit: 2 # WD EDIT + saleLimit: 2 - type: listing id: UplinkEnergyDagger @@ -69,7 +69,7 @@ Telecrystal: 2 categories: - UplinkWeapons - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkThrowingKnivesKit @@ -91,7 +91,7 @@ Telecrystal: 8 categories: - UplinkWeapons - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkDisposableTurret @@ -107,7 +107,7 @@ blacklist: tags: - NukeOpsUplink - saleLimit: 2 # WD EDIT + saleLimit: 2 - type: listing id: BaseBallBatHomeRun @@ -120,7 +120,7 @@ Telecrystal: 16 categories: - UplinkWeapons - saleLimit: 1 # WD EDIT + saleLimit: 1 # Explosives @@ -223,7 +223,7 @@ whitelist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkC4Bundle @@ -234,7 +234,7 @@ Telecrystal: 12 #you're buying bulk so its a 25% discount categories: - UplinkExplosives - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkEmpGrenade @@ -272,7 +272,7 @@ blacklist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkSyndicateBombNukie @@ -288,7 +288,7 @@ whitelist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkClusterGrenade @@ -464,7 +464,7 @@ blacklist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkReinforcementRadioSyndicateNukeops # Version for Nukeops that spawns an agent with the NukeOperative component. @@ -481,7 +481,7 @@ whitelist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkReinforcementRadioSyndicateCyborgAssault @@ -498,7 +498,7 @@ whitelist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkReinforcementRadioSyndicateMonkey @@ -531,7 +531,7 @@ whitelist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkStealthBox @@ -764,7 +764,7 @@ blacklist: tags: - NukeOpsUplink - saleBlacklist: true # WD EDIT + saleBlacklist: true - type: listing id: UplinkDeathRattle @@ -838,7 +838,7 @@ blacklist: components: - SurplusBundle - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkChemistryKitBundle @@ -880,7 +880,7 @@ blacklist: components: - SurplusBundle - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkSniperBundle @@ -892,7 +892,7 @@ Telecrystal: 12 categories: - UplinkBundles - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkC20RBundle @@ -904,7 +904,7 @@ Telecrystal: 17 categories: - UplinkBundles - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkBulldogBundle @@ -916,7 +916,7 @@ Telecrystal: 20 categories: - UplinkBundles - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkGrenadeLauncherBundle @@ -928,7 +928,7 @@ Telecrystal: 25 categories: - UplinkBundles - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkL6SawBundle @@ -940,7 +940,7 @@ Telecrystal: 30 categories: - UplinkBundles - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkZombieBundle @@ -961,7 +961,7 @@ blacklist: components: - SurplusBundle - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkSurplusBundle @@ -981,7 +981,7 @@ blacklist: components: - SurplusBundle - saleBlacklist: true # WD EDIT + saleBlacklist: true - type: listing id: UplinkSuperSurplusBundle @@ -1001,7 +1001,7 @@ blacklist: components: - SurplusBundle - saleBlacklist: true # WD EDIT + saleBlacklist: true # Tools @@ -1140,7 +1140,7 @@ - !type:BuyerJobCondition whitelist: - Chaplain - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: uplinkRevolverCapGunFake @@ -1156,7 +1156,7 @@ whitelist: - Mime - Clown - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: uplinkBananaPeelExplosive @@ -1201,7 +1201,7 @@ - !type:BuyerJobCondition whitelist: - Clown - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: uplinkHotPotato @@ -1365,7 +1365,7 @@ Telecrystal: 8 categories: - UplinkArmor - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkHardsuitSyndieElite @@ -1377,7 +1377,7 @@ Telecrystal: 10 categories: - UplinkArmor - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkClothingOuterHardsuitJuggernaut @@ -1389,7 +1389,7 @@ Telecrystal: 12 categories: - UplinkArmor - saleLimit: 1 # WD EDIT + saleLimit: 1 # Misc @@ -1458,7 +1458,7 @@ whitelist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkSoapSyndie @@ -1549,7 +1549,7 @@ Telecrystal: 12 categories: - UplinkMisc - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkBribe @@ -1576,7 +1576,7 @@ whitelist: tags: - NukeOpsUplink - saleLimit: 1 # WD EDIT + saleLimit: 1 - type: listing id: UplinkBackpackSyndicate diff --git a/Resources/Prototypes/Store/presets.yml b/Resources/Prototypes/Store/presets.yml index 43b457a3933..bbf96997956 100644 --- a/Resources/Prototypes/Store/presets.yml +++ b/Resources/Prototypes/Store/presets.yml @@ -13,10 +13,10 @@ - UplinkJob - UplinkArmor - UplinkPointless - - UplinkSales # WD EDIT + - UplinkSales currencyWhitelist: - Telecrystal - sales: # WD EDIT + sales: enabled: true minMultiplier: 0.2 maxMultiplier: 0.8