From 14be42767222874a50dadc610ee4f41105beca77 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 6 Nov 2023 16:49:35 +0100 Subject: [PATCH 1/7] Reverse engineering guidebook --- .../en-US/nyanotrasen/guidebook/guides.ftl | 1 + Resources/Prototypes/Guidebook/science.yml | 1 + .../Machines/reverseEngineering.yml | 6 ++-- .../Nyanotrasen/Guidebook/epistemics.yml | 4 +++ .../Epistemics/ReverseEngineering.xml | 36 +++++++++++++++++++ 5 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl create mode 100644 Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml create mode 100644 Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml diff --git a/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl b/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl new file mode 100644 index 00000000000..407621b6e4b --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl @@ -0,0 +1 @@ +guide-entry-reverse-engineering = Reverse Engineering diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml index 03840ec15ee..4fed3bd3b9f 100644 --- a/Resources/Prototypes/Guidebook/science.yml +++ b/Resources/Prototypes/Guidebook/science.yml @@ -8,6 +8,7 @@ - Xenoarchaeology - Robotics - MachineUpgrading + - ReverseEngineering # Nyanotrasen - Reverse Engineering guidebook - type: guideEntry id: Technologies diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/reverseEngineering.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/reverseEngineering.yml index b3233a5c4df..620bf68bc8c 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/reverseEngineering.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/reverseEngineering.yml @@ -62,9 +62,9 @@ range: 5 sound: path: /Audio/Ambience/Objects/revMachine_ambience.ogg -# - type: GuideHelp -# guides: -# - ReverseEngineering + - type: GuideHelp + guides: + - ReverseEngineering - type: Appearance - type: GenericVisualizer visuals: diff --git a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml new file mode 100644 index 00000000000..4dfb37da4cf --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml @@ -0,0 +1,4 @@ +- type: guideEntry + id: ReverseEngineering + name: guide-entry-reverse-engineering + text: "/ServerInfo/Nyanotrasen/Guidebook/Engineering/ReverseEngineering.xml" diff --git a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml new file mode 100644 index 00000000000..4b8b9178142 --- /dev/null +++ b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml @@ -0,0 +1,36 @@ + +# Reverse Engineering + + + +The reverse engineering machine allows salvage to bootstrap their way into unlocking powerful lathe recipes that are otherwise unacquirable. + + + + +The machine's power is very limited without upgrades to its scanning module and manipulator. +The scanning module increases its analysis power and the manipulator decreases the chance of destruction with safety turned off. + +## Operation + +The machine will only accept items it can reverse engineer. Currently this is most circuit boards and machine parts, but it accepts quite a variety of objects. + +It does not accept firearms and never will. + +To use the machine, insert an item and use the buttons on the left. + +- [color=#a4885c]Analyze:[/color] +This starts a new reverse engineering attempt. + +- [color=#a4885c]Safety:[/color] +With safety off, you have more analysis power, but there is a chance to destroy the item. + +- [color=#a4885c]AutoProbe:[/color] +This will automatically start a new attempt when the last one ends. + +- [color=#a4885c]Stop:[/color] +Stops the current attempt. + +- [color=#a4885c]Item:[/color] +Ejects the item. + From 167bc75f22ef8291ca96fd85e669e0e252b9c4f4 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 6 Nov 2023 16:54:05 +0100 Subject: [PATCH 2/7] Make it so upgrades actually increase scan bonus --- .../Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs index 7fc3f8c2d0a..96fb3dc2703 100644 --- a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs +++ b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs @@ -107,7 +107,7 @@ private void OnRefreshParts(EntityUid uid, ReverseEngineeringMachineComponent co private void OnExamineParts(EntityUid uid, ReverseEngineeringMachineComponent component, UpgradeExamineEvent args) { - args.AddNumberUpgrade("reverse-engineering-machine-bonus-upgrade", component.ScanBonus - 1); + args.AddNumberUpgrade("reverse-engineering-machine-bonus-upgrade", component.ScanBonus + 1); // DeltaV: Change the '-' to a '+' so it actually increase the analysis power args.AddNumberUpgrade("reverse-engineering-machine-aversion-upgrade", component.DangerAversionScore - 1); } From 2e0f610d256baee9654c69b817533c12fcefcc53 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 6 Nov 2023 17:03:29 +0100 Subject: [PATCH 3/7] i love when uncommenting creates spaces --- .../Entities/Structures/Machines/reverseEngineering.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/reverseEngineering.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/reverseEngineering.yml index 620bf68bc8c..c28c395261a 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/reverseEngineering.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/reverseEngineering.yml @@ -62,9 +62,9 @@ range: 5 sound: path: /Audio/Ambience/Objects/revMachine_ambience.ogg - - type: GuideHelp - guides: - - ReverseEngineering + - type: GuideHelp + guides: + - ReverseEngineering - type: Appearance - type: GenericVisualizer visuals: From 958f4781aba949bd301416314d59a6a1c988f3d8 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 6 Nov 2023 17:14:02 +0100 Subject: [PATCH 4/7] the code checks for capacitor --- .../Entities/Objects/Devices/CircuitBoards/production.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml index 36e8263439c..53c35ef1370 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml @@ -9,7 +9,7 @@ - type: MachineBoard prototype: ReverseEngineeringMachine requirements: - MatterBin: 1 + Capacitor: 1 Manipulator: 1 materialRequirements: Glass: 1 @@ -43,4 +43,4 @@ Cable: 4 - type: ReverseEngineering recipes: - - DeepFryerMachineCircuitboard \ No newline at end of file + - DeepFryerMachineCircuitboard From 9933e7050024e9a7f82bf1b2fd081cc04e6b2a4e Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 6 Nov 2023 17:22:20 +0100 Subject: [PATCH 5/7] Revert capacitor changes and change code --- .../ReverseEngineering/ReverseEngineeringMachineComponent.cs | 2 +- .../Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs | 2 +- .../Entities/Objects/Devices/CircuitBoards/production.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineComponent.cs b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineComponent.cs index 4dba64a06f3..5bf4c505921 100644 --- a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineComponent.cs +++ b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringMachineComponent.cs @@ -17,7 +17,7 @@ public sealed partial class ReverseEngineeringMachineComponent : Component public string DiskPrototype = "TechnologyDisk"; [DataField("machinePartScanBonus", customTypeSerializer: typeof(PrototypeIdSerializer))] - public string MachinePartScanBonus = "Capacitor"; + public string MachinePartScanBonus = "MatterBin"; // DeltaV Code: Change part checked for bonus to MatterBin as it is what is used in the crafting recipe /// /// Added to the 3d6, scales off of scanner. diff --git a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs index 96fb3dc2703..7fc3f8c2d0a 100644 --- a/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs +++ b/Content.Server/Nyanotrasen/ReverseEngineering/ReverseEngineeringSystem.cs @@ -107,7 +107,7 @@ private void OnRefreshParts(EntityUid uid, ReverseEngineeringMachineComponent co private void OnExamineParts(EntityUid uid, ReverseEngineeringMachineComponent component, UpgradeExamineEvent args) { - args.AddNumberUpgrade("reverse-engineering-machine-bonus-upgrade", component.ScanBonus + 1); // DeltaV: Change the '-' to a '+' so it actually increase the analysis power + args.AddNumberUpgrade("reverse-engineering-machine-bonus-upgrade", component.ScanBonus - 1); args.AddNumberUpgrade("reverse-engineering-machine-aversion-upgrade", component.DangerAversionScore - 1); } diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml index 53c35ef1370..a1a7a859e08 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Devices/CircuitBoards/production.yml @@ -9,7 +9,7 @@ - type: MachineBoard prototype: ReverseEngineeringMachine requirements: - Capacitor: 1 + MatterBin: 1 Manipulator: 1 materialRequirements: Glass: 1 From d0d84f3b8b23c41c4ead67cd224916113809e333 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 6 Nov 2023 17:24:10 +0100 Subject: [PATCH 6/7] fix the guidebook still using scanning module --- .../Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml index 4b8b9178142..4d5355c1a8b 100644 --- a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml +++ b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml @@ -8,8 +8,8 @@ The reverse engineering machine allows salvage to bootstrap their way into unloc -The machine's power is very limited without upgrades to its scanning module and manipulator. -The scanning module increases its analysis power and the manipulator decreases the chance of destruction with safety turned off. +The machine's power is very limited without upgrades to its matter bin and manipulator. +The matter bin increases its analysis power and the manipulator decreases the chance of destruction with safety turned off. ## Operation From a710d5938c6f89e7b7adf554ee9f06d7018129b0 Mon Sep 17 00:00:00 2001 From: Fluffiest Floofers Date: Mon, 6 Nov 2023 17:35:02 +0100 Subject: [PATCH 7/7] woops --- Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml index 4dfb37da4cf..1e2ace9a287 100644 --- a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml +++ b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml @@ -1,4 +1,4 @@ - type: guideEntry id: ReverseEngineering name: guide-entry-reverse-engineering - text: "/ServerInfo/Nyanotrasen/Guidebook/Engineering/ReverseEngineering.xml" + text: "/ServerInfo/Nyanotrasen/Guidebook/Epistemics/ReverseEngineering.xml"