Trading content (#1010)

* reroll positions * more trading content * bugfixes * more content * guidebook uodate * Update buy.yml
2025-03-12 00:51:58 +03:00
parent 56f4012a49
commit 93ed28d34c
53 changed files with 827 additions and 157 deletions
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/buy.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/buy.yml
@@ -185,4 +185,45 @@
  - type: StorageFill
    contents:
      - id: CP14VialSmallRainbow
-        amount: 5
+        amount: 5
+
+
+- type: storePositionBuy
+  id: Candles
+  code: CANDLES
+  price: 100
+  iconOverride: 
+    sprite: Objects/Misc/candles.rsi
+    state: loadout
+  factions:
+  - BradFamily
+  service: !type:CP14BuyItemsService
+    product: CP14WoodenChestFilledCandles
+
+- type: entity
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledCandles
+  name: candles chest
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14CandleRed
+        amount: 2
+      - id: CP14CandleBlue
+        amount: 2
+      - id: CP14CandleBlack
+        amount: 2
+      - id: CP14CandleGreen
+        amount: 2
+      - id: CP14CandlePurple
+        amount: 2
+      - id: CP14CandleRedSmall
+        amount: 2
+      - id: CP14CandleBlueSmall
+        amount: 2
+      - id: CP14CandleBlackSmall
+        amount: 2
+      - id: CP14CandleGreenSmall
+        amount: 2
+      - id: CP14CandlePurpleSmall
+        amount: 2
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/sell_special.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/sell_special.yml
@@ -78,16 +78,6 @@
    proto: CP14AirLily
    count: 5

- type: storePositionSell
-  id: CP14CrystalShardBase
-  special: true
-  price: 50
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14CrystalShardBase
-    count: 5
-
 - type: storePositionSell
  id: CP14BaseAlchemyBomb
  special: true
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/General/buy.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/General/buy.yml
@@ -0,0 +1,21 @@
+- type: storePositionBuy
+  id: RerollSell
+  code: REROLL_SELL
+  price: 20
+  nameOverride: cp14-buy-position-reroll-sell
+  iconOverride: 
+    sprite: _CP14/Interface/Misc/reroll.rsi
+    state: reroll
+  service: !type:CP14RerollSpecialPositionsService
+    rerollSell: 5
+
+#- type: storePositionBuy #Неактуально, т.к. позиций таких нет
+#  id: RerollBuy
+#  code: REROLL_BUY
+#  price: 20
+#  nameOverride: cp14-buy-position-reroll-buy
+#  iconOverride: 
+#    sprite: _CP14/Interface/Misc/reroll.rsi
+#    state: reroll
+#  service: !type:CP14RerollSpecialPositionsService
+#    rerollBuy: 5
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/General/sell_special.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/General/sell_special.yml
@@ -1,23 +0,0 @@
- type: storePositionSell
-  id: CP14FoodPieMeat
-  special: true
-  price: 60
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodPieMeat
-    count: 1
-
- type: storePositionSell
-  id: CP14FoodPiePumpkin
-  special: true
-  price: 60
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodPiePumpkin
-    count: 1
-
- type: storePositionSell
-  id: CP14FoodBreadBun
-  special: true
-  price: 20
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodBreadBun
-    count: 3
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy_special.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy_special.yml
@@ -0,0 +1,45 @@
+# ANCHORABLE PROBLEMS
+
+#- type: storePositionBuy
+#  id: DwarfBeer
+#  code: BEER_DWARF
+#  special: true
+#  nameOverride: cp14-reagent-name-dwarfbeer
+#  price: 150
+#  factions:
+#  - SpiceStream
+#  service: !type:CP14BuyItemsService
+#    product: CP14CraneBarrelDwarfBeer
+#
+#- type: storePositionBuy
+#  id: BeerGerbil
+#  code: BEER_BREEZE
+#  special: true
+#  nameOverride: cp14-reagent-name-breeze
+#  price: 70
+#  factions:
+#  - SpiceStream
+#  service: !type:CP14BuyItemsService
+#    product: CP14CraneBarrelSmallBeerBreeze
+#
+#- type: storePositionBuy
+#  id: AleBottomless
+#  code: BEER_BOTTOMLESS
+#  special: true
+#  nameOverride: cp14-reagent-name-bottomless
+#  price: 70
+#  factions:
+#  - SpiceStream
+#  service: !type:CP14BuyItemsService
+#    product: CP14CraneBarrelSmallAleBottomless
+#
+#- type: storePositionBuy
+#  id: WineZellasian
+#  code: WINE_ZELLASIAN
+#  special: true
+#  nameOverride: cp14-reagent-name-zellasian-pleasure
+#  price: 150
+#  factions:
+#  - SpiceStream
+#  service: !type:CP14BuyItemsService
+#    product: CP14CraneBarrelWineZellasianPleasure
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell_special.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell_special.yml
@@ -26,4 +26,104 @@
  - SpiceStream
  service: !type:CP14SellPrototypeService
    proto: CP14DyeBlue
-    count: 5
+    count: 5
+
+- type: storePositionSell
+  id: CP14FoodPieMeat
+  special: true
+  price: 60
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodPieMeat
+    count: 1
+
+- type: storePositionSell
+  id: CP14FoodPiePumpkin
+  special: true
+  price: 60
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodPiePumpkin
+    count: 1
+
+- type: storePositionSell
+  id: CP14FoodBreadBun
+  special: true
+  price: 20
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodBreadBun
+    count: 3
+
+- type: storePositionSell
+  id: CP14FoodCabbage
+  special: true
+  price: 80
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodCabbage
+    count: 10
+
+- type: storePositionSell
+  id: CP14FoodPumpkin
+  special: true
+  price: 80
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodPumpkin
+    count: 10
+
+- type: storePositionSell
+  id: CP14FoodPotato
+  special: true
+  price: 80
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodPotato
+    count: 10
+
+- type: storePositionSell
+  id: CP14FoodCucumber
+  special: true
+  price: 80
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodCucumber
+    count: 10
+
+- type: storePositionSell
+  id: CP14FoodTomatoes
+  special: true
+  price: 80
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodTomatoes
+    count: 10
+
+- type: storePositionSell
+  id: CP14FoodPepper
+  special: true
+  price: 80
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodPepper
+    count: 10
+
+- type: storePositionSell
+  id: CP14FoodOnion
+  special: true
+  price: 80
+  factions:
+  - SpiceStream
+  service: !type:CP14SellPrototypeService
+    proto: CP14FoodOnion
+    count: 10
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/buy.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/buy.yml
@@ -0,0 +1,68 @@
+- type: storePositionBuy
+  id: CP14SpellScrollResurrection
+  code: SCROLL_RESURRECTION
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollResurrection
+
+- type: storePositionBuy
+  id: CP14SpellScrollCureWounds
+  code: CURE_WOUNDS
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollCureWounds
+    count: 5
+
+- type: storePositionBuy
+  id: CP14SpellScrollCureBurn
+  code: CURE_BURN
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollCureBurn
+    count: 5
+
+- type: storePositionBuy
+  id: CP14SpellScrollBloodPurification
+  code: BLOOD_PURE
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollBloodPurification
+    count: 5
+
+- type: storePositionBuy
+  id: CP14SpellscrollSignalLightBlue
+  code: SIGNAL_BLUE
+  price: 50
+  factions:
+  - Sylphoria
+  service: !type:CP14BuyItemsService
+    product: CP14SpellscrollSignalLightBlue
+    count: 5
+
+- type: storePositionBuy
+  id: CP14SpellscrollSignalLightYellow
+  code: SIGNAL_YELLOW
+  price: 50
+  factions:
+  - Sylphoria
+  service: !type:CP14BuyItemsService
+    product: CP14SpellscrollSignalLightYellow
+    count: 5
+
+- type: storePositionBuy
+  id: CP14SpellscrollSignalLightRed
+  code: SIGNAL_RED
+  price: 50
+  factions:
+  - Sylphoria
+  service: !type:CP14BuyItemsService
+    product: CP14SpellscrollSignalLightRed
+    count: 5
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/sell_special.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/sell_special.yml
@@ -1,17 +1,17 @@
 - type: storePositionSell
  id: BountyTorch
  special: true
-  price: 200
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14Torch
-    count: 20
+    count: 5

 - type: storePositionSell
  id: BountyLucenPlanks
  special: true
-  price: 300
+  price: 200
  factions:
  - Sylphoria
  service: !type:CP14SellStackService
@@ -21,152 +21,122 @@
 - type: storePositionSell
  id: CP14SpellScrollIceShards
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollIceShards
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollShadowGrab
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollShadowGrab
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollSphereOfLight
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollSphereOfLight
-    count: 3
-
- type: storePositionSell
-  id: CP14SpellScrollCureWounds
-  special: true
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollCureWounds
-    count: 3
-
- type: storePositionSell
-  id: CP14SpellScrollBloodPurification
-  special: true
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollBloodPurification
-    count: 3
-
- type: storePositionSell
-  id: CP14SpellScrollCureBurn
-  special: true
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollCureBurn
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollFlameCreation
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollFlameCreation
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollEarthWall
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollEarthWall
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollFlashLight
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollFlashLight
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollWaterCreation
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollWaterCreation
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollPlantGrowth
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollPlantGrowth
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollMagicSplitting
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollMagicSplitting
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollMagicalAcceleration
  special: true
-  price: 50
+  price: 20
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollMagicalAcceleration
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollShadowStep
  special: true
-  price: 100
+  price: 40
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollShadowStep
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollFireball
  special: true
-  price: 100
+  price: 40
  factions:
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollFireball
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14SpellScrollBeerCreation
@@ -176,7 +146,7 @@
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14SpellScrollBeerCreation
-    count: 3
+    count: 1

 - type: storePositionSell
  id: CP14EnergyCrystalSmallEmpty
@@ -186,4 +156,104 @@
  - Sylphoria
  service: !type:CP14SellPrototypeService
    proto: CP14EnergyCrystalSmallEmpty
-    count: 5
+    count: 5
+
+- type: storePositionSell
+  id: CP14EnergyCrystalMediumEmpty
+  special: true
+  price: 80
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14EnergyCrystalMediumEmpty
+    count: 3
+
+- type: storePositionSell
+  id: CP14ClothingRingIceShards
+  special: true
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14ClothingRingIceShards
+    count: 1
+
+- type: storePositionSell
+  id: CP14ClothingRingFlashLight
+  special: true
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14ClothingRingFlashLight
+    count: 1
+
+- type: storePositionSell
+  id: CP14BaseLockpick
+  special: true
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14BaseLockpick
+    count: 10
+
+- type: storePositionSell
+  id: CP14MobRabbit
+  special: true
+  price: 20
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14MobRabbit
+    count: 5
+
+- type: storePositionSell
+  id: CP14MobPig
+  special: true
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14MobPig
+    count: 5
+
+- type: storePositionSell
+  id: CP14MobBoar
+  special: true
+  price: 120
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14MobBoar
+    count: 5
+
+- type: storePositionSell
+  id: CP14MobFrog
+  special: true
+  price: 10
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14MobFrog
+    count: 5
+
+- type: storePositionSell
+  id: CP14MobMonsterMole
+  special: true
+  price: 30
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14MobMonsterMole
+    count: 1
+
+- type: storePositionSell
+  id: CP14PartsMonsterGlands
+  special: true
+  price: 80
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14PartsMonsterGlands
+    count: 1
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_board.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_board.yml
@@ -20,4 +20,8 @@
  - type: UserInterface
    interfaces:
      enum.CP14StoreUiKey.Key:
-        type: CP14StoreBoundUserInterface
+        type: CP14StoreBoundUserInterface
+  - type: GuideHelp
+    guides:
+    - CP14_RU_Trading
+    - CP14_EN_Trading
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_portal.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_portal.yml
@@ -46,6 +46,10 @@
    stateBaseClosed: base
    stateDoorOpen: base_open
    stateDoorClosed: base_door
+  - type: GuideHelp
+    guides:
+    - CP14_RU_Trading
+    - CP14_EN_Trading

 - type: entity
  parent: CP14TradingPortalBase
@@ -62,7 +66,7 @@
    - state: flag_sylphoria
  - type: CP14TradingPortal
    faction: Sylphoria
-    specialSellPositionCount: 3
+    specialSellPositionCount: 5

 - type: entity
  parent: CP14TradingPortalBase
@@ -79,6 +83,7 @@
    - state: flag_helmir
  - type: CP14TradingPortal
    faction: HelmirWeapon
+    specialSellPositionCount: 5

 - type: entity
  parent: CP14TradingPortalBase
@@ -95,7 +100,7 @@
    - state: flag_bard
  - type: CP14TradingPortal
    faction: BradFamily
-    specialSellPositionCount: 3
+    specialSellPositionCount: 5

 - type: entity
  parent: CP14TradingPortalBase
@@ -111,4 +116,5 @@
      shader: unshaded
    - state: flag_spice
  - type: CP14TradingPortal
-    faction: SpiceStream
+    faction: SpiceStream
+    specialSellPositionCount: 5
--- a/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml
@@ -2,7 +2,7 @@
  crystallPunkAllowed: true
  id: CP14_EN_Alchemy
  name: Alchemy
-  text: "/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml"
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AlchemistTabs/Alchemy.xml"
  children:
  - CP14_EN_Precurser
  - CP14_EN_ThaumaturgyEssence
@@ -13,19 +13,19 @@
  crystallPunkAllowed: true
  id: CP14_EN_Precurser
  name: Precursers
-  text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Precurser.xml"
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AlchemistTabs/AlchemyTabs/Precurser.xml"
  filterEnabled: True

 - type: guideEntry
  crystallPunkAllowed: true
  id: CP14_EN_ThaumaturgyEssence
  name: Thaumaturgic essences
-  text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Essence.xml"
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml"
  filterEnabled: True

 - type: guideEntry
  crystallPunkAllowed: true
  id: CP14_EN_TargetEffects
  name: Target alchemical solutions
-  text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/TargetEffects.xml"
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AlchemistTabs/AlchemyTabs/TargetEffects.xml"
  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/Eng/jobs.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Eng/jobs.yml
@@ -0,0 +1,39 @@
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_Jobs
+  name: Jobs
+  text: "/ServerInfo/_CP14/Guidebook_EN/Jobs.xml"
+  children:
+  - CP14_EN_JobAdventurer
+  - CP14_EN_JobAlchemist
+  - CP14_EN_JobMerchant
+  filterEnabled: True
+
+
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_JobAdventurer
+  name: Adventurers
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Adventurers.xml"
+  children:
+  - CP14_EN_Demiplanes
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_JobAlchemist
+  name: Alchemist
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Alchemist.xml"
+  children:
+  - CP14_EN_Alchemy
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_JobMerchant
+  name: Merchant
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Merchant.xml"
+  children:
+  - CP14_EN_Trading
+  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/Eng/misc.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Eng/misc.yml
@@ -1,13 +1,20 @@
- type: guideEntry
-  crystallPunkAllowed: true
-  id: CP14_EN_Demiplanes
-  name: Demiplanes exploration
-  text: "/ServerInfo/_CP14/Guidebook_EN/Demiplanes.xml"
-  filterEnabled: True
-
 - type: guideEntry
  crystallPunkAllowed: true
  id: CP14_EN_Imperial_Laws
  name: Imperial laws
  text: "/ServerInfo/_CP14/Guidebook_EN/ImperialLaws.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_Demiplanes
+  name: Demiplanes exploration
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AdventurersTabs/Demiplanes.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_EN_Trading
+  name: External trade
+  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/MerchantTabs/Trading.xml"
  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml
@@ -2,7 +2,7 @@
  crystallPunkAllowed: true
  id: CP14_RU_Alchemy
  name: Алхимия
-  text: "/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml"
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/Alchemy.xml"
  children:
  - CP14_RU_Precurser
  - CP14_RU_ThaumaturgyEssence
@@ -13,19 +13,19 @@
  crystallPunkAllowed: true
  id: CP14_RU_Precurser
  name: Природные исходники
-  text: "/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Precurser.xml"
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/AlchemyTabs/Precurser.xml"
  filterEnabled: True

 - type: guideEntry
  crystallPunkAllowed: true
  id: CP14_RU_ThaumaturgyEssence
  name: Тауматургические эссенции
-  text: "/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Essence.xml"
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/AlchemyTabs/Essence.xml"
  filterEnabled: True

 - type: guideEntry
  crystallPunkAllowed: true
  id: CP14_RU_TargetEffects
  name: Целевые алхимические растворы
-  text: "/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/TargetEffects.xml"
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AlchemistTabs/AlchemyTabs/TargetEffects.xml"
  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/Ru/jobs.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Ru/jobs.yml
@@ -0,0 +1,39 @@
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_Jobs
+  name: Игровые роли
+  text: "/ServerInfo/_CP14/Guidebook_RU/Jobs.xml"
+  children:
+  - CP14_RU_JobAdventurer
+  - CP14_RU_JobAlchemist
+  - CP14_RU_JobMerchant
+  filterEnabled: True
+
+
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_JobAdventurer
+  name: Авантюрист
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Adventurers.xml"
+  children:
+  - CP14_RU_Demiplanes
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_JobAlchemist
+  name: Алхимик
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Alchemist.xml"
+  children:
+  - CP14_RU_Alchemy
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_JobMerchant
+  name: Торговец
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Merchant.xml"
+  children:
+  - CP14_RU_Trading
+  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/Ru/misc.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Ru/misc.yml
@@ -1,13 +1,20 @@
- type: guideEntry
-  crystallPunkAllowed: true
-  id: CP14_RU_Demiplanes
-  name: Исследование демипланов
-  text: "/ServerInfo/_CP14/Guidebook_RU/Demiplanes.xml"
-  filterEnabled: True
-
 - type: guideEntry
  crystallPunkAllowed: true
  id: CP14_RU_Imperial_Laws
  name: Имперские законы
  text: "/ServerInfo/_CP14/Guidebook_RU/ImperialLaws.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_Demiplanes
+  name: Исследование демипланов
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AdventurersTabs/Demiplanes.xml"
+  filterEnabled: True
+
+- type: guideEntry
+  crystallPunkAllowed: true
+  id: CP14_RU_Trading
+  name: Внешняя торговля
+  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/MerchantTabs/Trading.xml"
  filterEnabled: True
--- a/Resources/Prototypes/_CP14/Guidebook/entry.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/entry.yml
@@ -6,8 +6,7 @@
  text: "/ServerInfo/_CP14/Guidebook_EN/Welcome.xml"
  children:
  - CP14_EN_Species
-  - CP14_EN_Alchemy
-  - CP14_EN_Demiplanes
+  - CP14_EN_Jobs
  - CP14_EN_Imperial_Laws

 - type: guideEntry
@@ -18,6 +17,5 @@
  text: "/ServerInfo/_CP14/Guidebook_RU/Welcome.xml"
  children:
  - CP14_RU_Species
-  - CP14_RU_Alchemy
-  - CP14_RU_Demiplanes
+  - CP14_RU_Jobs
  - CP14_RU_Imperial_Laws