From 5699b4a7a0cf67e634bee70d8c262379389db997 Mon Sep 17 00:00:00 2001
From: Alexsey Bezyuk <41479614+PhantornRU@users.noreply.github.com>
Date: Sat, 23 Aug 2025 22:03:09 +1000
Subject: [PATCH] Villagers and lumera trade vision (#1657)

* villagers and lumera trade vision

* Revert "Merge branch 'traders_vision_for_villagers' of https://github.com/PhantornRU/crystall-punk-14 into traders_vision_for_villagers"

This reverts commit 7689e87dfbd77a6faee52a78d8a06b8774386aab, reversing
changes made to e87e021f1bacfce7cfe08ef2d6249d0facf1d812.

* lumera and workers visions

* Update Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml

* linter fix

* Comments WHY
---
 .../_CP14/Entities/Mobs/Player/Patrons/gods.yml        |  6 ++++--
 .../Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml  |  8 ++++++++
 .../Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml |  8 ++++++++
 .../Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml |  8 ++++++++
 .../Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml  | 10 ++++++++++
 5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/Patrons/gods.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/Patrons/gods.yml
index 6780f4f1a4..78b4fd769a 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/Patrons/gods.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/Patrons/gods.yml
@@ -90,7 +90,7 @@
     - GodMerkas
   - type: CP14ReligionEntity
     religion: Merkas
-  - type: CP14ReligionVision 
+  - type: CP14ReligionVision
     shaderColor:  0.02, 0.36, 0.05
 
 - type: entity
@@ -117,4 +117,6 @@
       enum.CP14ReligionEntityUiKey.Key:
         toggleAction: CP14ActionSpellGodLumeraWarp
   - type: CP14ReligionSpeaker
-    speaker: CP14LumeraSpeakImpact
\ No newline at end of file
+    speaker: CP14LumeraSpeakImpact
+  - type: CP14PriceScanner
+  - type: SolutionScanner
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml
index 5dcd6a9936..3717dbfabf 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml
@@ -8,9 +8,17 @@
   supervisors: cp14-job-supervisors-command
   canBeAntag: false
   special:
+    - !type:CP14AddTradingReputationSpecial
+      factions:
+      - VictoriaGardens
+      - BradPotions
+      - Thaumaturgy
+      - HomeDecor
+      - Horticulture
     - !type:CP14LearnSkillsSpecial
       skills:
       - AlchemyVision
+      - TraderWit # Craftsmen have always taken this perk. The main purpose of craftsmen is trade.
   requirements:
     - !type:DepartmentTimeRequirement
       department: CP14Artisan
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml
index be68284c3e..1acdd40e8d 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml
@@ -7,6 +7,14 @@
   icon: "CP14JobIconApprentice"
   supervisors: cp14-job-supervisors-command
   special:
+    - !type:CP14AddTradingReputationSpecial
+      factions:
+      - DwarfMining
+      - HomeDecor
+      - Tailors
+      - Horticulture
+      - Butchers
+      - Dairy
     - !type:CP14LearnSkillsSpecial
       skills:
       - CopperMelting
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml
index ebd4f216c5..60805cda28 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml
@@ -8,6 +8,13 @@
   supervisors: cp14-job-supervisors-command
   canBeAntag: false
   special:
+    - !type:CP14AddTradingReputationSpecial
+      factions:
+      - DwarfMining
+      - Thaumaturgy
+      - HomeDecor
+      - Butchers # For leather
+      - Tailors
     - !type:CP14LearnSkillsSpecial
       skills:
       - CopperMelting
@@ -15,6 +22,7 @@
       - GoldMelting
       - GlassMelting
       - MithrilMelting
+      - TraderWit # Craftsmen have always taken this perk. The main purpose of craftsmen is trade.
   requirements:
     - !type:DepartmentTimeRequirement
       department: CP14Artisan
diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml
index a43046c7eb..6a1c3c533c 100644
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml
@@ -6,6 +6,16 @@
   startingGear: CP14InnkeeperGear
   icon: "CP14JobIconInnkeeper"
   supervisors: cp14-job-supervisors-command
+  special:
+    - !type:CP14AddTradingReputationSpecial
+      factions:
+      - VictoriaGardens
+      - HomeDecor
+      - Butchers
+      - Dairy
+    - !type:CP14LearnSkillsSpecial
+      skills:
+      - TraderWit # Craftsmen have always taken this perk. The main purpose of craftsmen is trade.
 
 - type: startingGear
   id: CP14InnkeeperGear