From d2db31bafbd09f734720a260d9f608bf43eddccb Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 04:16:45 +0300 Subject: [PATCH 01/45] Replaced "Debug" build target with "Tools" --- .vscode/tasks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c5588f44f07..c7875a69efe 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -12,7 +12,7 @@ "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names. "/consoleloggerparameters:NoSummary", // Do not generate summary otherwise it leads to duplicate errors in Problems panel "-c", - "Release" + "Tools" ], "group": { "kind": "build", @@ -36,4 +36,4 @@ "problemMatcher": "$msCompile" } ] -} \ No newline at end of file +} From 4ca9899ec8fb061f643f2c77ffd4ab69f8a17a71 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 07:10:56 +0300 Subject: [PATCH 02/45] Added Crusher Glaive to Salvage Vendor --- .../Prototypes/Catalog/VendingMachines/Inventories/salvage.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index 3dd4367f403..6c8167041c0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SalvageEquipmentInventory startingInventory: Crowbar: 8 @@ -12,3 +12,4 @@ WeaponCrusher: 5 WeaponCrusherDagger: 5 WeaponProtoKineticAccelerator: 5 + WeaponCrusherGlaive: 5 From 319d2612c4321874f7fc9f77ef06fa9dbbadc323 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 07:15:01 +0300 Subject: [PATCH 03/45] Re-balanced YouTool and Engi-Vend prices --- .../Prototypes/Entities/Clothing/Eyes/glasses.yml | 2 +- .../Prototypes/Entities/Clothing/Hands/colored.yml | 2 +- .../Prototypes/Entities/Clothing/Head/welding.yml | 2 +- .../Entities/Objects/Misc/inflatable_wall.yml | 1 + .../Prototypes/Entities/Objects/Power/powercells.yml | 2 ++ .../Prototypes/Entities/Objects/Specific/atmos.yml | 2 +- .../Entities/Objects/Tools/airlock_painter.yml | 2 +- .../Prototypes/Entities/Objects/Tools/cable_coils.yml | 2 +- .../Prototypes/Entities/Objects/Tools/flashlights.yml | 2 +- .../Entities/Objects/Tools/inflatable_wall.yml | 4 ++++ Resources/Prototypes/Entities/Objects/Tools/t-ray.yml | 2 +- Resources/Prototypes/Entities/Objects/Tools/tools.yml | 10 +++++----- .../Prototypes/Entities/Objects/Tools/welders.yml | 2 +- .../Entities/Structures/Machines/vending_machines.yml | 4 ++-- 14 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 1e6486a213f..ba786fb342f 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -75,7 +75,7 @@ sprite: Clothing/Eyes/Glasses/meson.rsi - type: EyeProtection - type: StaticPrice - price: 300 + price: 155 - type: entity parent: ClothingEyesBase diff --git a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml index a88511651a4..555b3c58287 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/colored.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/colored.yml @@ -168,7 +168,7 @@ fiberColor: fibers-yellow - type: FingerprintMask - type: StaticPrice - price: 60 + price: 45.5 - type: entity parent: ClothingHandsGlovesColorYellow diff --git a/Resources/Prototypes/Entities/Clothing/Head/welding.yml b/Resources/Prototypes/Entities/Clothing/Head/welding.yml index 2068c3e8873..539326097c9 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/welding.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/welding.yml @@ -30,7 +30,7 @@ - HamsterWearable - WhitelistChameleon - type: StaticPrice - price: 60 + price: 35.5 - type: entity parent: WeldingMaskBase diff --git a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml index d11aa714cb5..803b4050744 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/inflatable_wall.yml @@ -39,6 +39,7 @@ placement: mode: SnapgridCenter + - type: entity id: InflatableDoor name: inflatable door diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 28ebbb8d5c3..202f4b348a7 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -96,6 +96,8 @@ - type: Battery maxCharge: 720 startingCharge: 720 + - type: StaticPrice + price: 75 - type: entity id: PowerCellMediumPrinted diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml index ff946aefe91..6fb64ff457e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml @@ -30,7 +30,7 @@ tags: - DroneUsable - type: StaticPrice - price: 80 + price: 150 - type: PhysicalComposition materialComposition: Steel: 400 diff --git a/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml b/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml index 8e387db3402..e5d2863b16f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/airlock_painter.yml @@ -18,4 +18,4 @@ tags: - PaintableAirlock - type: StaticPrice - price: 40 + price: 250 diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index adfd022c96f..726639fa0eb 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -25,7 +25,7 @@ - type: StaticPrice price: 0 - type: StackPrice - price: 5 + price: 0.334 - type: entity id: CableHVStack diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index f58cae975fd..ee53e349cf3 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -70,7 +70,7 @@ netsync: false - type: Appearance - type: StaticPrice - price: 40 + price: 15.5 - type: entity name: seclite diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml index 35cf2f54dcf..227063e2581 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml @@ -22,6 +22,8 @@ - type: Tag tags: - DroneUsable + - type: StaticPrice + price: 7.5 # TODO: Add stack sprites + visuals. - type: entity @@ -48,6 +50,8 @@ - type: Tag tags: - DroneUsable + - type: StaticPrice + price: 15 # TODO: Add stack sprites + visuals. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml index 57e832200ca..e6788e4d3c0 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml @@ -22,4 +22,4 @@ tags: - DroneUsable - type: StaticPrice - price: 60 + price: 150 diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index fa1ddca1d26..f2f9207b3bd 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -41,7 +41,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 30 + price: 19.5 - type: entity name: screwdriver @@ -84,7 +84,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 30 + price: 15 - type: entity name: wrench @@ -154,7 +154,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 22 + price: 15.5 - type: entity parent: Crowbar @@ -216,7 +216,7 @@ Steel: 100 Plastic: 100 - type: StaticPrice - price: 56 + price: 165 - type: entity name: network configurator @@ -264,7 +264,7 @@ tags: - DroneUsable - type: StaticPrice - price: 56 + price: 100 - type: GuideHelp guides: - NetworkConfigurator diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 710e7d5be0b..bd6e8a2eb68 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -63,7 +63,7 @@ materialComposition: Steel: 200 - type: StaticPrice - price: 40 + price: 25.5 - type: IgnitionSource temperature: 700 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index e9e63b33958..974e3d11d2c 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -703,8 +703,8 @@ energy: 1.6 color: "#b89e2a" - type: MarketModifier - mod: 5 - + mod: 10 + - type: entity parent: VendingMachine id: VendingMachineMedical From a5eabc68f32a29a03fa08aceed9ef8a1765c7cac Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 07:17:58 +0300 Subject: [PATCH 04/45] Added Industrial Welder, and Advanced Industrial Welder to Salvage Vendor --- .../Catalog/VendingMachines/Inventories/salvage.yml | 4 +++- .../Entities/Structures/Machines/vending_machines.yml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index 6c8167041c0..29071a0f7d8 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -1,4 +1,4 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SalvageEquipmentInventory startingInventory: Crowbar: 8 @@ -13,3 +13,5 @@ WeaponCrusherDagger: 5 WeaponProtoKineticAccelerator: 5 WeaponCrusherGlaive: 5 + WelderIndustrial: 3 + WelderIndustrialAdvanced: 2 diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 974e3d11d2c..68af50ef2a4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1279,7 +1279,7 @@ energy: 1.6 color: "#9dc5c9" - type: MarketModifier - mod: 5 + mod: 10 - type: entity parent: VendingMachine @@ -1794,7 +1794,7 @@ shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - + - type: entity parent: VendingMachine id: VendingMachineCentDrobe From 23a73d74fe5f58219e0375a944c69ddf81e84e4a Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 08:15:58 +0300 Subject: [PATCH 05/45] Added MV and HV cables to YouTool --- .../Prototypes/Catalog/VendingMachines/Inventories/youtool.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 210f0de3b68..4af0391811f 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -7,6 +7,8 @@ Wirecutter: 15 Wrench: 15 Screwdriver: 15 + CableMVStack: 20 + CableHVStack: 20 trayScanner: 15 NetworkConfigurator: 13 GasAnalyzer: 15 From eaf14577f595836039fd8eb22a5097c6750a77eb Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 08:16:46 +0300 Subject: [PATCH 06/45] Sorted YouTool inventory by putting more demanded items above --- .../Catalog/VendingMachines/Inventories/youtool.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml index 4af0391811f..4a4fbc6c87a 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/youtool.yml @@ -1,19 +1,19 @@ - type: vendingMachineInventory id: YouToolInventory startingInventory: - CableApcStack: 20 + Screwdriver: 15 Crowbar: 15 - Welder: 13 Wirecutter: 15 Wrench: 15 - Screwdriver: 15 + Welder: 13 + ClothingHandsGlovesColorYellowBudget: 30 + CableApcStack: 20 CableMVStack: 20 CableHVStack: 20 + FlashlightLantern: 15 trayScanner: 15 - NetworkConfigurator: 13 GasAnalyzer: 15 - FlashlightLantern: 15 - ClothingHandsGlovesColorYellowBudget: 30 + NetworkConfigurator: 13 AirlockPainter: 20 # Some engineer forgot to take the multitool out the youtool when working on it, happens. contrabandInventory: From 4477aa2bbde3c2be52acc8a6ddbd3b570d0f3d12 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 08:22:10 +0300 Subject: [PATCH 07/45] Sorted Engi-Vend inventory by putting more demanded items above --- .../Catalog/VendingMachines/Inventories/engivend.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index 50c4253ccff..57ebdf2b022 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -1,11 +1,11 @@ - type: vendingMachineInventory id: EngiVendInventory startingInventory: + ClothingHandsGlovesColorYellow: 8 + Multitool: 8 ClothingEyesGlassesMeson: 10 ClothingHeadHatWelding: 6 - Multitool: 8 - NetworkConfigurator: 15 - PowerCellMedium: 15 - ClothingHandsGlovesColorYellow: 8 InflatableWallStack1: 24 InflatableDoorStack1: 8 + PowerCellMedium: 15 + NetworkConfigurator: 15 From 9bdd07965ddc39bf776b9c1c1174426467b3178c Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 08:27:24 +0300 Subject: [PATCH 08/45] Added mining drill to Salvage Vendor --- .../Prototypes/Catalog/VendingMachines/Inventories/salvage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index 29071a0f7d8..8ac10874310 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -2,6 +2,7 @@ id: SalvageEquipmentInventory startingInventory: Crowbar: 8 + MiningDrill: 8 Pickaxe: 8 OreBag: 6 Flare: 4 From 4647c3a23275980718181cde9e247ed9fc5aec37 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 09:31:48 +0300 Subject: [PATCH 09/45] Added CrusherGlaive and Industrial Welders to Salvage Vendor --- .../Catalog/VendingMachines/Inventories/salvage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index 8ac10874310..596140d7113 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -1,12 +1,12 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SalvageEquipmentInventory startingInventory: - Crowbar: 8 + WeaponCrusherGlaive: 5 MiningDrill: 8 Pickaxe: 8 OreBag: 6 - Flare: 4 - FlashlightLantern: 15 + WelderIndustrialAdvanced: 2 + WelderIndustrial: 3 Floodlight: 10 HandheldGPSBasic: 14 RadioHandheld: 5 From 2858da85d3163e9e99318c5525e85414ff5aaa62 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 09:32:50 +0300 Subject: [PATCH 10/45] Sorted Salvage Vendor inventory by putting more demanded items above --- .../VendingMachines/Inventories/salvage.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml index 596140d7113..c1a1eee603e 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml @@ -1,18 +1,18 @@ -- type: vendingMachineInventory +- type: vendingMachineInventory id: SalvageEquipmentInventory startingInventory: WeaponCrusherGlaive: 5 + WeaponProtoKineticAccelerator: 5 + WeaponCrusher: 5 + WeaponCrusherDagger: 5 MiningDrill: 8 Pickaxe: 8 + Crowbar: 8 OreBag: 6 WelderIndustrialAdvanced: 2 WelderIndustrial: 3 Floodlight: 10 - HandheldGPSBasic: 14 RadioHandheld: 5 - WeaponCrusher: 5 - WeaponCrusherDagger: 5 - WeaponProtoKineticAccelerator: 5 - WeaponCrusherGlaive: 5 - WelderIndustrial: 3 - WelderIndustrialAdvanced: 2 + HandheldGPSBasic: 14 + Flare: 20 + FlashlightLantern: 15 From 4d0b321c2ebc031b2a02735095bab18e91ab1eb2 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 09:34:08 +0300 Subject: [PATCH 11/45] Re-balanced Salvage Vendor prices --- Resources/Prototypes/Entities/Objects/Devices/radio.yml | 2 ++ Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml | 2 ++ .../Entities/Objects/Specific/Salvage/ore_bag.yml | 2 ++ Resources/Prototypes/Entities/Objects/Tools/flare.yml | 2 ++ Resources/Prototypes/Entities/Objects/Tools/welders.yml | 4 ++++ .../Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml | 2 ++ .../Prototypes/Entities/Objects/Weapons/Melee/mining.yml | 6 ++++++ .../Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml | 4 ++++ 8 files changed, 24 insertions(+) diff --git a/Resources/Prototypes/Entities/Objects/Devices/radio.yml b/Resources/Prototypes/Entities/Objects/Devices/radio.yml index 6c2f2c0722a..8c07da31a61 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/radio.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/radio.yml @@ -22,3 +22,5 @@ - type: Tag tags: - Radio + - type: StaticPrice + price: 85.5 diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index 90c377f4e77..76814812a05 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -155,6 +155,8 @@ max: 1 - !type:DoActsBehavior acts: [ "Destruction" ] + - type: StaticPrice + price: 75 - type: entity name: broken floodlight diff --git a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml index a2afb788e32..16e353fb1aa 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Salvage/ore_bag.yml @@ -22,3 +22,5 @@ tags: - Ore - type: Dumpable + - type: StaticPrice + price: 55.5 diff --git a/Resources/Prototypes/Entities/Objects/Tools/flare.yml b/Resources/Prototypes/Entities/Objects/Tools/flare.yml index 169cc911db2..a50df4dd076 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flare.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flare.yml @@ -74,3 +74,5 @@ startValue: 10.0 endValue: 1.0 property: Radius + - type: StaticPrice + price: 7.5 diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index bd6e8a2eb68..e66e5314325 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -84,6 +84,8 @@ - ReagentId: WeldingFuel Quantity: 250 maxVol: 250 + - type: StaticPrice + price: 1755 - type: entity name: advanced industrial welding tool @@ -104,6 +106,8 @@ maxVol: 250 - type: Tool speed: 1.3 + - type: StaticPrice + price: 2575 - type: entity name: experimental welding tool diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index ec854093a4c..e3d3c9fbaad 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -11,3 +11,5 @@ - state: empty visible: false map: [ "overlay" ] + - type: StaticPrice + price: 325 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 68303d91522..c64baab1ae4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -17,6 +17,8 @@ color: "#ffeead" enabled: false radius: 4 + - type: StaticPrice + price: 295 - type: entity name: crusher @@ -78,6 +80,8 @@ Slash: 6.5 - type: Item size: 10 + - type: StaticPrice + price: 135.5 # Like a crusher... but better - type: entity @@ -103,3 +107,5 @@ attackRate: 1.25 - type: Item size: 150 + - type: StaticPrice + price: 350 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index 36ae62c8044..5c4fb81a5fb 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -23,6 +23,8 @@ - type: Item size: 24 sprite: Objects/Weapons/Melee/pickaxe.rsi + - type: StaticPrice + price: 15.5 - type: entity name: mining drill @@ -54,3 +56,5 @@ damage: types: Structural: 30 + - type: StaticPrice + price: 101.5 From 97b22f353f4f7ac29a32fcb61edd20b89e43a8f6 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 09:34:43 +0300 Subject: [PATCH 12/45] Added basic hardsuit to AstroVend --- Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml b/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml index 21df2f6a7e7..15907ba2c71 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml @@ -2,6 +2,7 @@ id: AstroVendInventory startingInventory: ClothingOuterHardsuitEVA: 15 + ClothingOuterHardsuitBasic: 5 ClothingHeadHelmetEVA: 15 ClothingOuterHardsuitSpatio: 4 ClothingShoesBootsMag: 15 From eea10056ece70522bb597778eecad746d0fd79d2 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 09:34:54 +0300 Subject: [PATCH 13/45] Sorted AstroVend inventory by putting more demanded items above --- .../Prototypes/_NF/Catalog/Fills/AstroVend.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml b/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml index 15907ba2c71..1106ec00366 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/AstroVend.yml @@ -1,16 +1,17 @@ - type: vendingMachineInventory id: AstroVendInventory startingInventory: - ClothingOuterHardsuitEVA: 15 + ClothingOuterHardsuitSpatio: 5 + ClothingShoesBootsMag: 15 ClothingOuterHardsuitBasic: 5 + ClothingOuterHardsuitEVA: 10 ClothingHeadHelmetEVA: 15 - ClothingOuterHardsuitSpatio: 4 - ClothingShoesBootsMag: 15 - AirTank: 10 - HandheldGPSBasic: 15 RadioHandheld: 15 - EncryptionKeyCommand: 15 + HandheldGPSBasic: 15 + AirTank: 10 JetpackMiniFilled: 10 + EncryptionKeyCommand: 30 + - type: vendingMachineInventory id: CircuitVendInventory @@ -55,4 +56,4 @@ ClothingShoesBootsMagSyndie: 4 ClothingShoesChameleonNoSlips: 8 ClothingBackpackDuffelSyndicateEVABundle: 12 - BoxHoloparasite: 2 \ No newline at end of file + BoxHoloparasite: 2 From 313d7fec921739db789da8a0c60457956cd04c2f Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 09:35:31 +0300 Subject: [PATCH 14/45] Re-balanced AstroVend prices --- .../Prototypes/Entities/Clothing/Head/eva-helmets.yml | 4 +++- .../Clothing/OuterClothing/base_clothingouter.yml | 1 + .../Entities/Clothing/OuterClothing/hardsuits.yml | 8 ++++++-- .../Entities/Clothing/OuterClothing/softsuits.yml | 4 +++- .../Entities/Objects/Devices/encryption_keys.yml | 2 ++ Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml | 2 ++ Resources/Prototypes/Entities/Objects/Tools/gps.yml | 2 ++ Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml | 2 ++ 8 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml index 0b79409ecd9..44aa3d76d05 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml @@ -12,6 +12,8 @@ - type: Tag tags: - HelmetEVA + - type: StaticPrice + price: 25 #Large EVA Helmet - type: entity @@ -36,7 +38,7 @@ sprite: Clothing/Head/Helmets/eva_syndicate.rsi - type: Clothing sprite: Clothing/Head/Helmets/eva_syndicate.rsi - + #Cosmonaut Helmet - type: entity parent: ClothingHeadEVAHelmetBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index d92c3ded0f4..98bb93608fd 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -76,6 +76,7 @@ tags: - Hardsuit + - type: entity abstract: true parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 8d45fc6f793..6127090672d 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -28,6 +28,8 @@ sprintModifier: 0.80 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitBasic + - type: StaticPrice + price: 155 #Atmospherics Hardsuit - type: entity @@ -121,6 +123,8 @@ Caustic: 0.9 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSpatio + - type: StaticPrice + price: 275 #Salvage Hardsuit - type: entity @@ -169,7 +173,7 @@ lowPressureMultiplier: 10000 - type: ClothingSpeedModifier walkModifier: 0.7 - sprintModifier: 0.7 + sprintModifier: 0.7 - type: Armor modifiers: coefficients: @@ -239,7 +243,7 @@ damageCoefficient: 0.4 - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitWarden - + #Captain's Hardsuit - type: entity parent: ClothingOuterHardsuitBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml index 02c92903ca0..d0e8ebd50e3 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/softsuits.yml @@ -12,6 +12,8 @@ - type: Tag tags: - SuitEVA + - type: StaticPrice + price: 75 #Syndicate EVA - type: entity @@ -107,4 +109,4 @@ Heat: 0.90 Radiation: 0.75 Caustic: 0.5 - - type: GroupExamine \ No newline at end of file + - type: GroupExamine diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index cfe9a648337..7f782d7dc08 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -92,6 +92,8 @@ layers: - state: crypt_silver - state: com_label + - type: StaticPrice + price: 7.5 - type: entity parent: EncryptionKey diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 84e25a33553..438c2262216 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -184,6 +184,8 @@ slots: - Back - suitStorage + - type: StaticPrice + price: 32.5 - type: entity parent: GasTankBase diff --git a/Resources/Prototypes/Entities/Objects/Tools/gps.yml b/Resources/Prototypes/Entities/Objects/Tools/gps.yml index 973b2fe9c83..c73234e1db3 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/gps.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gps.yml @@ -12,3 +12,5 @@ - type: Item sprite: Objects/Devices/gps.rsi - type: HandheldGPS + - type: StaticPrice + price: 55 diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index c7291c25136..7b1a5524e43 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -185,6 +185,8 @@ outputPressure: 42.6 air: volume: 20 + - type: StaticPrice + price: 125 # Filled mini - type: entity From 408051cd42e83aa2fbe481d5a82bb29ba5f2a9a7 Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 10:20:17 +0300 Subject: [PATCH 15/45] Shipyard prices re-evaluated --- Resources/Prototypes/_NF/Shipyard/dartx.yml | 10 +++++----- .../_NF/Shipyard/default_shipyard_catalog.yml | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Resources/Prototypes/_NF/Shipyard/dartx.yml b/Resources/Prototypes/_NF/Shipyard/dartx.yml index 54be5610fa7..e257d400443 100644 --- a/Resources/Prototypes/_NF/Shipyard/dartx.yml +++ b/Resources/Prototypes/_NF/Shipyard/dartx.yml @@ -1,18 +1,18 @@ - type: vessel id: DartX - name: NT Dart-X + name: NT Dart-X description: A light emergency response cruiser outfitted for extended rescue missions. - price: 89650 + price: 80500 category: Medium group: Civilian shuttlePath: /Maps/Shuttles/dartx.yml - + - type: gameMap id: DartX mapName: 'NT Dart-X' mapPath: /Maps/Shuttles/dartx.yml minPlayers: 0 - stations: + stations: DartX: stationProto: StandardFrontierVessel components: @@ -28,4 +28,4 @@ StationEngineer: [ 1, 1 ] Clown: [ 1, 1 ] Paramedic: [ 1, 1 ] - Mercenary: [ 1, 1 ] \ No newline at end of file + Mercenary: [ 1, 1 ] diff --git a/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml b/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml index 44f69a03c35..f87fe0f5a46 100644 --- a/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml +++ b/Resources/Prototypes/_NF/Shipyard/default_shipyard_catalog.yml @@ -30,7 +30,7 @@ id: PTS name: NC Personal Transport description: A small transport shuttle with space for 5 passengers. - price: 14650 + price: 15000 category: Small group: Civilian shuttlePath: /Maps/Shuttles/pts.yml @@ -90,7 +90,7 @@ id: Construct name: NT Construct description: A technically spacefaring vessel. No livery. - price: 10975 + price: 12075 category: Small group: Civilian shuttlePath: /Maps/Shuttles/construct.yml @@ -146,7 +146,7 @@ id: Barge name: NC Barge description: A medium shipping vessel repurposed into a salvage bar. - price: 38700 + price: 42300 category: Medium group: Civilian shuttlePath: /Maps/Shuttles/barge.yml @@ -177,7 +177,7 @@ id: Prospector name: NC Prospector description: A small mining vessel designed to assist salvage operations. - price: 18750 + price: 23000 category: Small group: Civilian shuttlePath: /Maps/Shuttles/prospector.yml @@ -205,7 +205,7 @@ id: Sparrow name: NR Sparrow description: A combined research and engineering vessel suited for xeno-archeological expeditions. - price: 32500 + price: 45875 category: Small group: Civilian shuttlePath: /Maps/Shuttles/sparrow.yml @@ -235,7 +235,7 @@ id: Condor name: NR Condor description: A combined research and engineering vessel suited for xeno-archeological expeditions. - price: 58450 + price: 72000 category: Medium group: Civilian shuttlePath: /Maps/Shuttles/condor.yml @@ -355,7 +355,7 @@ id: Pulse name: NM Pulse description: A small rapid response medical ship - price: 17450 + price: 17765 category: Small group: Civilian shuttlePath: /Maps/Shuttles/pulse.yml @@ -384,7 +384,7 @@ id: Helix name: NM Helix description: A medium, modular hospital. Standard issue equipped with chem lab, cloning, and treatment ward - price: 52250 + price: 52400 category: Medium group: Civilian shuttlePath: /Maps/Shuttles/helix.yml @@ -416,7 +416,7 @@ id: Skipper name: NC Skipper description: A small service ship with a full service kitchen and hydroponics garden - price: 27850 + price: 32650 category: Small group: Civilian shuttlePath: /Maps/Shuttles/skipper.yml From 386e0993030ea30d80c1c21564fe91f6749cf06a Mon Sep 17 00:00:00 2001 From: sTiKyt <35602029+sTiKyt@users.noreply.github.com> Date: Sun, 23 Jul 2023 10:38:49 +0300 Subject: [PATCH 16/45] Reverted unintentional tasks.json change --- .vscode/tasks.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c7875a69efe..9c9cb42cd0d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -10,9 +10,7 @@ "args": [ "build", "/property:GenerateFullPaths=true", // Ask dotnet build to generate full paths for file names. - "/consoleloggerparameters:NoSummary", // Do not generate summary otherwise it leads to duplicate errors in Problems panel - "-c", - "Tools" + "/consoleloggerparameters:NoSummary" // Do not generate summary otherwise it leads to duplicate errors in Problems panel ], "group": { "kind": "build", From 11fd0ffe5b8b008dcf0222cc5b5d9530c562d0dc Mon Sep 17 00:00:00 2001 From: Alexander Evgrashin Date: Sun, 23 Jul 2023 22:30:45 +0200 Subject: [PATCH 17/45] Remove recomended price --- .../UI/BountyContractUiFragmentCreate.xaml.cs | 13 ++++++------- .../_NF/BountyContracts/BountyContractSystem.Ui.cs | 3 --- .../BountyContracts/SharedBountyContractSystem.cs | 3 +-- .../en-US/_NF/bounty-contracts/bounty-contracts.ftl | 2 +- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs index 16c15f0a954..69a30da563f 100644 --- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs +++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml.cs @@ -30,7 +30,7 @@ public BountyContractUiFragmentCreate() var descPlaceholder = Loc.GetString("bounty-contracts-ui-create-description-placeholder"); DescriptionEdit.Placeholder = new Rope.Leaf(descPlaceholder); - RewardEdit.Text = SharedBountyContractSystem.MinimalReward.ToString(); + RewardEdit.Text = SharedBountyContractSystem.DefaultReward.ToString(); CreateButton.OnPressed += _ => OnCreatePressed?.Invoke(GetBountyContract()); CancelButton.OnPressed += _ => OnCancelPressed?.Invoke(); @@ -133,10 +133,9 @@ private void UpdateDisclaimer() { // check if reward is valid var reward = GetReward(); - if (reward < SharedBountyContractSystem.MinimalReward) + if (reward == null || reward < 0) { - var err = Loc.GetString("bounty-contracts-ui-create-error-too-cheap", - ("reward", SharedBountyContractSystem.MinimalReward)); + var err = Loc.GetString("bounty-contracts-ui-create-error-invalid-price"); DisclaimerLabel.SetMessage(err); CreateButton.Disabled = true; return; @@ -157,10 +156,10 @@ private void UpdateDisclaimer() CreateButton.Disabled = false; } - public int GetReward() + public int? GetReward() { var priceStr = RewardEdit.Text; - return int.TryParse(priceStr, out var price) ? price : 0; + return int.TryParse(priceStr, out var price) ? price : null; } public BountyContractTargetInfo? GetTargetInfo() @@ -222,7 +221,7 @@ public BountyContractRequest GetBountyContract() DNA = GetTargetDna(), Vessel = GetVessel(), Description = Rope.Collapse(DescriptionEdit.TextRope), - Reward = GetReward() + Reward = GetReward() ?? 0 }; return info; } diff --git a/Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs b/Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs index 7704ed9ffd0..4885767e7f5 100644 --- a/Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs +++ b/Content.Server/_NF/BountyContracts/BountyContractSystem.Ui.cs @@ -130,9 +130,6 @@ private void OnTryCreateContract(EntityUid uid, CartridgeLoaderComponent compone return; var c = args.Contract; - if (c.Reward < MinimalReward) - return; - var author = GetContractAuthor(args.Entity); CreateBountyContract(c.Name, c.Reward, c.Description, c.Vessel, c.DNA, author); diff --git a/Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs b/Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs index f1f04280ae0..c50f094f93f 100644 --- a/Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs +++ b/Content.Shared/_NF/BountyContracts/SharedBountyContractSystem.cs @@ -129,6 +129,5 @@ public BountyContractTryCreateMsg(BountyContractRequest contract) public abstract class SharedBountyContractSystem : EntitySystem { - // TODO: Cvar? - public const int MinimalReward = 10000; + public const int DefaultReward = 5000; } diff --git a/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl b/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl index 4aed85afdb8..41c5f084b58 100644 --- a/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl +++ b/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl @@ -34,7 +34,7 @@ bounty-contracts-ui-create-description = Description: bounty-contracts-ui-create-description-placeholder = Crimes, additional details... bounty-contracts-ui-create-button-cancel = Cancel bounty-contracts-ui-create-button-create = Create -bounty-contracts-ui-create-error-too-cheap = Error: Invalid price! Minimal contract reward is {$reward}$. +bounty-contracts-ui-create-error-invalid-price = Error: Invalid price! bounty-contracts-ui-create-error-no-name = Error: Invalid bounty target name! bounty-contracts-ui-create-ready = Your contract is ready to be published! From 1fa6c1f550ce441796b888b1cd54528422670a3c Mon Sep 17 00:00:00 2001 From: Alexander Evgrashin Date: Sun, 23 Jul 2023 22:47:14 +0200 Subject: [PATCH 18/45] Reword some stuff --- .../en-US/_NF/bounty-contracts/bounty-contracts.ftl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl b/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl index 41c5f084b58..d6b909b7f77 100644 --- a/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl +++ b/Resources/Locale/en-US/_NF/bounty-contracts/bounty-contracts.ftl @@ -8,21 +8,21 @@ bounty-contracts-program-name = Bounty Contracts ## Radio Announcements bounty-contracts-radio-name = Bounty Contracts Service -bounty-contracts-radio-create = New bounty placed for {$target}. Reward: {$reward}$. +bounty-contracts-radio-create = New bounty placed for "{$target}". Reward: {$reward}$. ## UI - List contracts bounty-contracts-ui-list-no-contracts = No bounties posted yet... bounty-contracts-ui-list-no-description = No additional description provided... bounty-contracts-ui-list-create = New Contract bounty-contracts-ui-list-refresh = Refresh -bounty-contracts-ui-list-vessel = Last Known Vessel: {$vessel} +bounty-contracts-ui-list-vessel = Vessel: {$vessel} bounty-contracts-ui-list-author = Posted by: {$author} bounty-contracts-ui-list-remove = Remove ## UI - Create contract bounty-contracts-ui-create-name = Name:{" "} bounty-contracts-ui-create-custom = Custom -bounty-contracts-ui-create-name-placeholder = Target name... +bounty-contracts-ui-create-name-placeholder = Bounty name... bounty-contracts-ui-create-dna = DNA:{" "} bounty-contracts-ui-create-dna-unknown = N/A bounty-contracts-ui-create-vessel = Vessel:{" "} @@ -31,11 +31,11 @@ bounty-contracts-ui-create-vessel-placeholder = Vessel name... bounty-contracts-ui-create-reward = Reward:{" "} bounty-contracts-ui-create-reward-currency = $ bounty-contracts-ui-create-description = Description: -bounty-contracts-ui-create-description-placeholder = Crimes, additional details... +bounty-contracts-ui-create-description-placeholder = Additional details... bounty-contracts-ui-create-button-cancel = Cancel bounty-contracts-ui-create-button-create = Create bounty-contracts-ui-create-error-invalid-price = Error: Invalid price! -bounty-contracts-ui-create-error-no-name = Error: Invalid bounty target name! +bounty-contracts-ui-create-error-no-name = Error: Invalid bounty name! bounty-contracts-ui-create-ready = Your contract is ready to be published! From 3292d89f4aaf9d9a41ebb8c5a2b4ad15ee4f5179 Mon Sep 17 00:00:00 2001 From: Alexander Evgrashin Date: Mon, 24 Jul 2023 00:21:14 +0200 Subject: [PATCH 19/45] Added category --- .../UI/BountyContractUiFragmentCreate.xaml | 4 ++ .../UI/BountyContractUiFragmentCreate.xaml.cs | 16 +++++++ .../SharedBountyContractSystem.cs | 46 +++++++++++++++++++ .../_NF/bounty-contracts/bounty-contracts.ftl | 8 ++++ 4 files changed, 74 insertions(+) diff --git a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml index cb2ad5bf5d0..3b813a4b785 100644 --- a/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml +++ b/Content.Client/_NF/BountyContracts/UI/BountyContractUiFragmentCreate.xaml @@ -4,6 +4,10 @@ + +