More merchant content (#1349)

* energy crystals * thaumaturgy trading
2025-06-01 19:21:41 +03:00
parent 6fce9dcdaa
commit 5c5a473ec0
25 changed files with 362 additions and 14 deletions
--- a/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.cs
+++ b/Content.Server/_CP14/MagicEnergy/CP14MagicEnergySystem.cs
@@ -1,4 +1,6 @@
+using Content.Server.Cargo.Systems;
 using Content.Shared._CP14.MagicEnergy;
+using Content.Shared._CP14.MagicEnergy.Components;
 using Robust.Shared.Timing;

 namespace Content.Server._CP14.MagicEnergy;
@@ -14,6 +16,13 @@ public sealed partial class CP14MagicEnergySystem : SharedCP14MagicEnergySystem

        InitializeDraw();
        InitializePortRelay();
+
+        SubscribeLocalEvent<CP14MagicEnergyContainerComponent, PriceCalculationEvent>(OnMagicPrice);
+    }
+
+    private void OnMagicPrice(Entity<CP14MagicEnergyContainerComponent> ent, ref PriceCalculationEvent args)
+    {
+        args.Price += ent.Comp.Energy.Double() * 0.1;
    }

    public override void Update(float frameTime)
--- a/Resources/Locale/en-US/_CP14/trading/factions.ftl
+++ b/Resources/Locale/en-US/_CP14/trading/factions.ftl
@@ -1,4 +1,5 @@
 cp14-trade-faction-contracts = Zellasian Trade Guild
 cp14-trade-faction-victoria-gardens = Victoria Gardens
 cp14-trade-faction-brad-potions = Brad's marvelous potions
-cp14-trade-faction-dwarf-mining = 'Dwarf Steel' mining branch
+cp14-trade-faction-dwarf-mining = 'Dwarf Steel' mining branch
+cp14-trade-faction-thaumaturgy = Academy of Thaumaturgy
--- a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl
+++ b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl
@@ -1,4 +1,5 @@
 cp14-trade-faction-contracts = Торговая гильдия Зелласиан
 cp14-trade-faction-victoria-gardens = Сады Виктории
 cp14-trade-faction-brad-potions = Великолепные зелья Брада
-cp14-trade-faction-dwarf-mining = Шахтерский филиал 'Дворфийская сталь'
+cp14-trade-faction-dwarf-mining = Шахтерский филиал 'Дворфийская сталь'
+cp14-trade-faction-thaumaturgy = Тауматургическая академия
--- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml
@@ -46,6 +46,8 @@
      - id: HandLabeler #TODO custom cp14 labeler
      - id: CP14StampDenied
      - id: CP14StampApproved
+      - id: CP14ManaOperationGlove
+      - id: AppraisalTool
      - id: CP14PaperFolderRed
        amount: 2
      - id: CP14PaperFolderBlue
--- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml
@@ -30,13 +30,13 @@
    - !type:NestedSelector
      tableId: CP14StationCrateLootTools
      rolls: !type:RangeNumberSelector
-        range: 1, 5
+        range: 4, 5
    # Fluff
    - !type:NestedSelector
      tableId: CP14StationCrateLootFluff
-      prob: 0.33
+      prob: 0.5
      rolls: !type:RangeNumberSelector
-        range: 0, 2
+        range: 4, 5

 - type: entityTable
  id: CP14StationCrateLootTools
@@ -51,11 +51,17 @@
      - id: CP14Scissors
      - id: CP14Torch
      - id: CP14Lighter
-      - id: CP14ManaOperationGlove
      - id: CP14ModularIronShovel
+      - id: CP14KeyFile
      - id: CP14BaseMop
+      - id: CP14LockCopper
      - id: CP14ModularIronPickaxe
      - id: CP14ModularIronSickle
+      - !type:GroupSelector
+        children:
+        - id: CP14FluteInstrument
+        - id: CP14LyraInstrument
+        - id: CP14LuteInstrument
      - !type:GroupSelector
        children:
        - id: CP14Candle
@@ -88,9 +94,11 @@
  id: CP14StationCrateLootFluff
  table: !type:GroupSelector
    children:
+    - id: CP14PaperFolderBlue
+    - id: CP14PaperFolderRed
+    - id: CP14PenFeather
    - id: CP14FoodPotato
    - id: CP14FoodOnion
-    - id: CP14AgaricMushroom #dont eat
    - id: CP14Cloth10
    - id: CP14CrayonWhite
    - !type:GroupSelector
@@ -112,6 +120,17 @@
      - id: CP14DyePurple
      - id: CP14DyeBlack
      - id: CP14DyeBlue
+    - !type:GroupSelector
+      children:
+      - id: CP14BloodFlower
+      - id: CP14AgaricMushroom
+      - id: CP14ChromiumSlime
+        weight: 0.5
+      - id: CP14WildSage
+      - id: CP14LumiMushroom
+      - id: CP14BlueAmanita
+      - id: CP14Dayflin
+      - id: CP14AirLily

 - type: entityTable
  id: CP14RandomVials
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
@@ -74,3 +74,11 @@
      color: "#db35c8"
      shader: unshaded

+- type: entity
+  parent: CP14BaseSpellScrollHealing
+  id: CP14SpellScrollSheepPolymorph
+  name: sheep polymorph spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellSheepPolymorph
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
@@ -89,3 +89,11 @@
      tags:
      - HideContextMenu

+- type: entity
+  parent: CP14BaseSpellScrollLight
+  id: CP14SpellScrollSearchOfLife
+  name: search of life spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellSearchOfLife
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
@@ -88,5 +88,4 @@
  components:
  - type: CP14SpellStorage
    spells:
-    - CP14ActionSpellBeerCreation
-
+    - CP14ActionSpellBeerCreation
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml
@@ -63,6 +63,8 @@
    energy: 30
    maxEnergy: 50
  - type: CP14MagicUnsafeDamage
+  - type: StaticPrice
+    price: 5

 - type: entity
  abstract: true
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -210,7 +210,7 @@
    attributes:
      proper: true
  - type: MobPrice
-    price: 1500 # Kidnapping a living person and selling them for cred is a good move.
+    price: 150 # Kidnapping a living person and selling them for cred is a good move.
    deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
  - type: Tag
    tags:
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml
@@ -35,6 +35,8 @@
  - type: ContainerContainer
    containers:
      storagebase: !type:Container
+  - type: StaticPrice
+    price: 1

 - type: entity
  id: CP14PaperFolderBlue
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml
@@ -60,6 +60,8 @@
  - type: Tag
    tags:
    - Document
+  - type: StaticPrice
+    price: 2

 - type: entity
  parent: CP14BasePaper
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml
@@ -22,6 +22,11 @@
      collection: PaperScribbles
      params:
        variation: 0.1
+  - type: StaticPrice
+    price: 3
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 0 #Parenting from vanilla moment

 # TODO: Чернильницу нужно доделать. Перо должно быть видно, пока оно внутри чернильницы. Предмет должен быть через ItemSlots, чтобы перо вставлять забирать можно было кликом. Нужно добавить прикольные звуки вставляния, выставляния. И добавить механ, который будет требовать периодически макать перо в чернильницу.
 - type: entity
--- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml
@@ -50,3 +50,14 @@
  - type: CP14TradingContract
    faction: DwarfMining

+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractThaumaturgy
+  description: Trading contract with the "Academy of Thaumaturgy". Allows you to purchase various omagic device, tools and scrolls.
+  suffix: Thaumaturgy
+  components:
+  - type: Sprite
+    state: magic
+  - type: CP14TradingContract
+    faction: Thaumaturgy
+
--- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml
@@ -21,6 +21,8 @@
    tags:
    - CP14Wheat
    - CP14FarmFood
+  - type: StaticPrice
+    price: 1

 - type: entity
  id: CP14Cotton
@@ -45,3 +47,5 @@
  - type: Tag
    tags:
    - CP14FarmFood
+  - type: StaticPrice
+    price: 1
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml
@@ -15,6 +15,8 @@
  - type: Tag
    tags:
    - CP14EnergyCrystal
+  - type: StaticPrice
+    price: 10

 - type: entity
  id: CP14EnergyCrystalMedium
@@ -25,7 +27,6 @@
  - type: Sprite
    layers:
      - state: medium
-      - state: medium_connector
  - type: CP14MagicEnergyContainer
    energy: 50
    maxEnergy: 50
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml
@@ -57,6 +57,8 @@
      collection: MetalThud
    cPAnimationLength: 0.25
    cPAnimationOffset: -1.3
+  - type: StaticPrice
+    price: 50
  - type: NetworkConfigurator
  - type: ActivatableUI
    key: enum.NetworkConfiguratorUiKey.List
--- a/Resources/Prototypes/_CP14/Trading/contracts.yml
+++ b/Resources/Prototypes/_CP14/Trading/contracts.yml
@@ -31,3 +31,13 @@
    product: CP14TradeContractDwarfMining
    count: 1

+- type: cp14TradingPosition
+  id: CP14TradeContractThaumaturgy
+  faction: ContractGuild
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: magic
+  service: !type:CP14BuyItemsService
+    product: CP14TradeContractThaumaturgy
+    count: 1
--- a/Resources/Prototypes/_CP14/Trading/factions.yml
+++ b/Resources/Prototypes/_CP14/Trading/factions.yml
@@ -18,3 +18,7 @@
  color: "#b05a3e"
  name: cp14-trade-faction-dwarf-mining

+- type: cp14TradingFaction
+  id: Thaumaturgy
+  color: "#a43ae0"
+  name: cp14-trade-faction-thaumaturgy
--- a/Resources/Prototypes/_CP14/Trading/thaumaturgy.yml
+++ b/Resources/Prototypes/_CP14/Trading/thaumaturgy.yml
@@ -0,0 +1,258 @@
+
+# Rep 0
+
+- type: cp14TradingPosition
+  id: CP14EnergyCrystalMediumEmpty
+  faction: Thaumaturgy
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Thaumaturgy/crystal.rsi
+    state: medium
+  service: !type:CP14BuyItemsService
+    product: CP14EnergyCrystalMediumEmpty
+
+- type: cp14TradingPosition
+  id: CP14Paper
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 2
+  icon:
+    sprite: _CP14/Objects/Bureaucracy/paper.rsi
+    state: paper
+  service: !type:CP14BuyItemsService
+    product: CP14Paper
+
+- type: cp14TradingPosition
+  id: CP14PenFeather
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Bureaucracy/pens.rsi
+    state: feather
+  service: !type:CP14BuyItemsService
+    product: CP14PenFeather
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollShadowGrab
+  faction: Thaumaturgy
+  priceMarkup: 5
+  reputationLevel: 0
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: shadow_grab
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollShadowGrab
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFlameCreation
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: flame_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFlameCreation
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollBloodPurification
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_poison
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollBloodPurification
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSheepPolymorph
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Actions/Spells/misc.rsi
+    state: polymorph
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSheepPolymorph
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSearchOfLife
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 11
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: search_of_life
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSearchOfLife
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSphereOfLight
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 12
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: sphere_of_light
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSphereOfLight
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollWaterCreation
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: water_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollWaterCreation
+
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14ManaOperationGlove
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14ManaOperationGlove
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollDemiplaneInfiltration
+  priceMarkup: 5 #Unique trade spells
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: rift_arrow
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollDemiplaneInfiltration
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollEarthWall
+  faction: Thaumaturgy
+  priceMarkup: 2
+  reputationLevel: 1
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Actions/Spells/earth.rsi
+    state: earth_wall
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollEarthWall
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollCureBurn
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_burn
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollCureBurn
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollCureWounds
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_wounds
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollCureWounds
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFlashLight
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 11
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: flash_light
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFlashLight
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollMagicSplitting
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 13
+  icon:
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: counter_spell
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollMagicSplitting
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollIceShards
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_shards
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollIceShards
+
+# Rep 2
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFireball
+  faction: Thaumaturgy
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: fireball
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFireball
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollBeerCreation
+  faction: Thaumaturgy
+  priceMarkup: 5
+  reputationLevel: 2
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: beer_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollBeerCreation
+
+# Rep 3
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollResurrection
+  faction: Thaumaturgy
+  reputationLevel: 3
+  priceMarkup: 5
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/necromancy.rsi
+    state: resurrection
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollResurrection
+
+# Rep 4
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollShadowStep
+  priceMarkup: 15 #Unique trade spells
+  faction: Thaumaturgy
+  reputationLevel: 4
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: shadow_step
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollShadowStep
--- a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/magic.png
+++ b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/magic.png
--- a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json
@@ -18,6 +18,9 @@
    },
    {
      "name": "dwarf_mining"
+    },
+    {
+      "name": "magic"
    }
  ]
 }
--- a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium.png
+++ b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium.png
--- a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium_connector.png
+++ b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/medium_connector.png
--- a/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/meta.json
+++ b/Resources/Textures/_CP14/Objects/Specific/Thaumaturgy/crystal.rsi/meta.json
@@ -9,9 +9,6 @@
  "states": [
    {
      "name": "medium"
-    },
-    {
-      "name": "medium_connector"
    }
  ]
 }