From ddbca29b730d994707f73f074f22c882fc6b1292 Mon Sep 17 00:00:00 2001
From: Red <96445749+TheShuEd@users.noreply.github.com>
Date: Thu, 26 Jun 2025 22:20:18 +0300
Subject: [PATCH] Add LumeraMagicVision skill and update trading requests
 (#1477)

Introduces the LumeraMagicVision skill to the Lumera demigod skill tree, granting access to the Magic Vision action. Also removes several 30-minute jewelry trading requests (Ruby, Emerald, Sapphire, Topaz) from thaumaturgy.yml. Additionally, improves price scanner logic to skip items with non-positive price.
---
 .../_CP14/Trading/CP14PriceScannerSystem.cs   |  5 +-
 .../_CP14/Skill/Demigods/lumera.yml           | 14 ++++++
 .../Trading/SellRequests/thaumaturgy.yml      | 47 -------------------
 3 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/Content.Server/_CP14/Trading/CP14PriceScannerSystem.cs b/Content.Server/_CP14/Trading/CP14PriceScannerSystem.cs
index 94f191774b..17e1f9ccf8 100644
--- a/Content.Server/_CP14/Trading/CP14PriceScannerSystem.cs
+++ b/Content.Server/_CP14/Trading/CP14PriceScannerSystem.cs
@@ -39,9 +39,10 @@ public sealed class CP14PriceScannerSystem : EntitySystem
         if (HasComp<MobStateComponent>(uid))
             return;
 
-        var getPrice = _price.GetPrice(args.Examined);
+        var price = Math.Round(_price.GetPrice(args.Examined));
 
-        var price = Math.Round(getPrice);
+        if (price <= 0)
+            return;
 
         var priceMsg = Loc.GetString("cp14-currency-examine-title");
 
diff --git a/Resources/Prototypes/_CP14/Skill/Demigods/lumera.yml b/Resources/Prototypes/_CP14/Skill/Demigods/lumera.yml
index d90834111a..e88ca9ca5b 100644
--- a/Resources/Prototypes/_CP14/Skill/Demigods/lumera.yml
+++ b/Resources/Prototypes/_CP14/Skill/Demigods/lumera.yml
@@ -58,6 +58,20 @@
   - !type:NeedPrerequisite
     prerequisite: LumeraT1
 
+- type: cp14Skill
+  id: LumeraMagicVision
+  skillUiPosition: 2, 5
+  tree: GodLumera
+  icon:
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: magic_vision
+  effects:
+  - !type:AddAction
+    action: CP14ActionToggleMagicVision
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: LumeraT1
+
 # T2
 
 - type: cp14Skill
diff --git a/Resources/Prototypes/_CP14/Trading/SellRequests/thaumaturgy.yml b/Resources/Prototypes/_CP14/Trading/SellRequests/thaumaturgy.yml
index 8aceccb8c3..1fa79c2bcf 100644
--- a/Resources/Prototypes/_CP14/Trading/SellRequests/thaumaturgy.yml
+++ b/Resources/Prototypes/_CP14/Trading/SellRequests/thaumaturgy.yml
@@ -8,53 +8,6 @@
     count: 5
 
 # 30 minutes
-- type: cp14TradingRequest
-  id: ThaumaturgyRuby
-  possibleFactions:
-  - Thaumaturgy
-  - Tailors
-  - DwarfMining
-  fromMinutes: 30
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14JewelryRuby
-    count: 1
-
-- type: cp14TradingRequest
-  id: ThaumaturgyEmerald
-  possibleFactions:
-  - Thaumaturgy
-  - Tailors
-  - DwarfMining
-  fromMinutes: 30
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14JewelryEmerald
-    count: 1
-
-- type: cp14TradingRequest
-  id: ThaumaturgySapphire
-  possibleFactions:
-  - Thaumaturgy
-  - Tailors
-  - DwarfMining
-  fromMinutes: 30
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14JewelrySapphire
-    count: 1
-
-- type: cp14TradingRequest
-  id: ThaumaturgyTopaz
-  possibleFactions:
-  - Thaumaturgy
-  - Tailors
-  - DwarfMining
-  fromMinutes: 30
-  requirements:
-  - !type:ProtoIdResource
-    protoId: CP14JewelryTopaz
-    count: 1
 
 - type: cp14TradingRequest
   id: ThaumaturgyGoldAmulet