Trade reputation rework + Merchants back + Mining contract (#1347)

* refactor unlocking * fix contract debug crashing * Update dev_map.yml * bugfixes and content rebalance * ore buy contract
2025-06-01 15:10:36 +03:00
parent a99f2fcd50
commit a3ae67a762
28 changed files with 426 additions and 299 deletions
--- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml
@@ -39,3 +39,14 @@
  - type: CP14TradingContract
    faction: BradPotions

+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractDwarfMining
+  description: Trading contract with the "Dwarf Steel" mining branch. Allows you to purchase various ore and mining tools.
+  suffix: Dwarf Miners
+  components:
+  - type: Sprite
+    state: dwarf_mining
+  - type: CP14TradingContract
+    faction: DwarfMining
+
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml
@@ -60,6 +60,10 @@
  - type: Tag
    tags:
    - CP14Torch
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Cloth: 10

 - type: entity
  parent: CP14Torch
--- a/Resources/Prototypes/_CP14/Trading/brad_potions.yml
+++ b/Resources/Prototypes/_CP14/Trading/brad_potions.yml
@@ -1,77 +1,21 @@
+
+# Rep 0
+
 - type: cp14TradingPosition
  id: CP14VialSmallHealingBrute
  faction: BradPotions
-  uiPosition: 0, 0
+  uiPosition: 0
  icon:
    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
    state: vial
  service: !type:CP14BuyItemsService
    product: CP14VialSmallHealingBrute

- type: cp14TradingPosition
-  id: CP14VialSmallHealingPoison
-  faction: BradPotions
-  uiPosition: 0, 1
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallHealingPoison
-
- type: cp14TradingPosition
-  id: CP14VialSmallHealingAirloss
-  faction: BradPotions
-  uiPosition: 0, 2
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallHealingAirloss
-
- type: cp14TradingPosition
-  id: CP14VialSmallHealingBlood
-  faction: BradPotions
-  uiPosition: 0, 3
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallHealingBlood
-
- type: cp14TradingPosition
-  id: CP14VialSmallSpeedUp
-  faction: BradPotions
-  uiPosition: 1, 0
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallSpeedUp
-
- type: cp14TradingPosition
-  id: CP14VialSmallRainbow
-  faction: BradPotions
-  uiPosition: 1, 1
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallRainbow
-
- type: cp14TradingPosition
-  id: CP14VialSmallHealingManaDepletion
-  faction: BradPotions
-  uiPosition: 1, 2
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallHealingManaDepletion
-
 - type: cp14TradingPosition
  id: CP14VialSmallHealingMana
  faction: BradPotions
-  uiPosition: 1, 3
+  reputationLevel: 0
+  uiPosition: 1
  icon:
    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
    state: vial
@@ -79,12 +23,10 @@
    product: CP14VialSmallHealingMana


-
-
 - type: cp14TradingPosition
  id: CP14VialTiny
  faction: BradPotions
-  uiPosition: 3, 0
+  uiPosition: 3
  icon:
    sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
    state: vial
@@ -93,83 +35,21 @@

 - type: cp14TradingPosition
  id: CP14VialTinyReinforced
-  prerequisite: CP14VialTiny
  priceMarkup: 1
  faction: BradPotions
-  uiPosition: 3, 1
+  uiPosition: 4
  icon:
    sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
    state: vial
  service: !type:CP14BuyItemsService
    product: CP14VialTinyReinforced

- type: cp14TradingPosition
-  id: CP14VialSmall
-  prerequisite: CP14VialTiny
-  priceMarkup: 1
-  faction: BradPotions
-  uiPosition: 4, 0
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmall
-
- type: cp14TradingPosition
-  id: CP14VialSmallReinforced
-  prerequisite: CP14VialSmall
-  priceMarkup: 2
-  faction: BradPotions
-  uiPosition: 4, 1
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialSmallReinforced
-
- type: cp14TradingPosition
-  id: CP14VialMedium
-  prerequisite: CP14VialSmall
-  priceMarkup: 2
-  faction: BradPotions
-  uiPosition: 5, 0
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialMedium
-
- type: cp14TradingPosition
-  id: CP14VialMediumReinforced
-  prerequisite: CP14VialMedium
-  priceMarkup: 3
-  faction: BradPotions
-  uiPosition: 5, 1
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
-    state: vial
-  service: !type:CP14BuyItemsService
-    product: CP14VialMediumReinforced
-
-
-
-
- type: cp14TradingPosition
-  id: CP14Cauldron
-  priceMarkup: 5
-  faction: BradPotions
-  uiPosition: 7, 0
-  icon:
-    sprite: _CP14/Objects/Specific/Alchemy/cauldron.rsi
-    state: icon
-  service: !type:CP14BuyItemsService
-    product: CP14Cauldron

 - type: cp14TradingPosition
  id: CP14Pestle
  priceMarkup: 2
  faction: BradPotions
-  uiPosition: 8, 0
+  uiPosition: 6
  icon:
    sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
    state: pestle
@@ -180,18 +60,67 @@
  id: CP14Mortar
  priceMarkup: 2
  faction: BradPotions
-  uiPosition: 9, 0
+  uiPosition: 7
  icon:
    sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
    state: mortar_base
  service: !type:CP14BuyItemsService
    product: CP14Mortar

+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingBlood
+  faction: BradPotions
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingBlood
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingManaDepletion
+  faction: BradPotions
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingManaDepletion
+
+- type: cp14TradingPosition
+  id: CP14VialSmall
+  reputationLevel: 1
+  priceMarkup: 1
+  faction: BradPotions
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmall
+
+- type: cp14TradingPosition
+  id: CP14VialSmallReinforced
+  reputationLevel: 1
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallReinforced
+
 - type: cp14TradingPosition
  id: CP14Dropper
  priceMarkup: 1
+  reputationLevel: 1
  faction: BradPotions
-  uiPosition: 7, 1
+  uiPosition: 6
  icon:
    sprite: _CP14/Objects/Specific/Alchemy/dropper.rsi
    state: dropper
@@ -201,12 +130,96 @@
 - type: cp14TradingPosition
  id: CP14Syringe
  priceMarkup: 2
+  reputationLevel: 1
  faction: BradPotions
-  uiPosition: 8, 1
+  uiPosition: 7
  icon:
    sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
    state: base
  service: !type:CP14BuyItemsService
    product: CP14Syringe

+# Rep 2

+- type: cp14TradingPosition
+  id: CP14VialSmallHealingPoison
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingPoison
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingAirloss
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingAirloss
+
+
+- type: cp14TradingPosition
+  id: CP14VialMedium
+  reputationLevel: 2
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialMedium
+
+- type: cp14TradingPosition
+  id: CP14VialMediumReinforced
+  reputationLevel: 2
+  priceMarkup: 3
+  faction: BradPotions
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialMediumReinforced
+
+- type: cp14TradingPosition
+  id: CP14Cauldron
+  priceMarkup: 5
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/cauldron.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14Cauldron
+
+# Rep 3
+
+- type: cp14TradingPosition
+  id: CP14VialSmallSpeedUp
+  faction: BradPotions
+  reputationLevel: 3
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallSpeedUp
+
+- type: cp14TradingPosition
+  id: CP14VialSmallRainbow
+  faction: BradPotions
+  reputationLevel: 3
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallRainbow
--- a/Resources/Prototypes/_CP14/Trading/contracts.yml
+++ b/Resources/Prototypes/_CP14/Trading/contracts.yml
@@ -1,8 +1,7 @@
 - type: cp14TradingPosition
  id: CP14TradeContractVictoriaGardens
  faction: ContractGuild
-  uiPosition: 0, 0
-  unlockReputationCost: 1
+  uiPosition: 0
  icon:
    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
    state: victoria_garden
@@ -13,8 +12,7 @@
 - type: cp14TradingPosition
  id: CP14TradeContractBradPotions
  faction: ContractGuild
-  uiPosition: 0, 1
-  unlockReputationCost: 1
+  uiPosition: 1
  icon:
    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
    state: brad_potions
@@ -22,3 +20,14 @@
    product: CP14TradeContractBradPotions
    count: 1

+- type: cp14TradingPosition
+  id: CP14TradeContractDwarfMining
+  faction: ContractGuild
+  uiPosition: 2
+  icon:
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: dwarf_mining
+  service: !type:CP14BuyItemsService
+    product: CP14TradeContractDwarfMining
+    count: 1
+
--- a/Resources/Prototypes/_CP14/Trading/dwarf_mining.yml
+++ b/Resources/Prototypes/_CP14/Trading/dwarf_mining.yml
@@ -0,0 +1,138 @@
+
+# Rep 0
+
+- type: cp14TradingPosition
+  id: CP14OreCopper5
+  faction: DwarfMining
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/copper_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreCopper5
+
+- type: cp14TradingPosition
+  id: CP14CopperBar5
+  faction: DwarfMining
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/copper_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14CopperBar5
+
+- type: cp14TradingPosition
+  id: CP14GlassSheet5
+  faction: DwarfMining
+  uiPosition: 5
+  icon:
+    sprite: _CP14/Objects/Materials/glass.rsi
+    state: glass_2
+  service: !type:CP14BuyItemsService
+    product: CP14GlassSheet5
+
+- type: cp14TradingPosition
+  id: CP14Torch
+  faction: DwarfMining
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Objects/Tools/torch.rsi
+    state: torch-unlit
+  service: !type:CP14BuyItemsService
+    product: CP14Torch
+
+- type: cp14TradingPosition
+  id: CP14ModularIronPickaxe
+  faction: DwarfMining
+  priceMarkup: 15
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+    state: tool
+  service: !type:CP14BuyItemsService
+    product: CP14ModularIronPickaxe
+
+- type: cp14TradingPosition
+  id: CP14ModularIronShovel
+  faction: DwarfMining
+  priceMarkup: 10
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+    state: tool
+  service: !type:CP14BuyItemsService
+    product: CP14ModularIronShovel
+
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14OreIron5
+  faction: DwarfMining
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/iron_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreIron5
+
+- type: cp14TradingPosition
+  id: CP14IronBar5
+  faction: DwarfMining
+  reputationLevel: 1
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/iron_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14IronBar5
+
+# Rep 2
+
+- type: cp14TradingPosition
+  id: CP14OreGold5
+  faction: DwarfMining
+  reputationLevel: 2
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/gold_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreGold5
+
+- type: cp14TradingPosition
+  id: CP14OreMithril5
+  faction: DwarfMining
+  reputationLevel: 2
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Materials/mithril_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreMithril5
+
+- type: cp14TradingPosition
+  id: CP14GoldBar5
+  faction: DwarfMining
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/gold_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14GoldBar5
+
+- type: cp14TradingPosition
+  id: CP14MithrilBar5
+  faction: DwarfMining
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 5
+  icon:
+    sprite: _CP14/Objects/Materials/mithril_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14MithrilBar5
--- a/Resources/Prototypes/_CP14/Trading/factions.yml
+++ b/Resources/Prototypes/_CP14/Trading/factions.yml
@@ -5,9 +5,16 @@

 - type: cp14TradingFaction
  id: VictoriaGardens
+  color: "#67db67"
  name: cp14-trade-faction-victoria-gardens

 - type: cp14TradingFaction
  id: BradPotions
+  color: "#ad67db"
  name: cp14-trade-faction-brad-potions

+- type: cp14TradingFaction
+  id: DwarfMining
+  color: "#b05a3e"
+  name: cp14-trade-faction-dwarf-mining
+
--- a/Resources/Prototypes/_CP14/Trading/victoria_gardens.yml
+++ b/Resources/Prototypes/_CP14/Trading/victoria_gardens.yml
@@ -1,7 +1,9 @@
+# Rep 0
+
 - type: cp14TradingPosition
  id: CP14FoodCabbage
  faction: VictoriaGardens
-  uiPosition: 0, 0
+  uiPosition: 0
  icon:
    sprite: _CP14/Objects/Flora/Farm/cabbage.rsi
    state: base1
@@ -9,21 +11,10 @@
    product: CP14FoodCabbage
    count: 3

- type: cp14TradingPosition
-  id: CP14FoodPumpkin
-  faction: VictoriaGardens
-  uiPosition: 0, 1
-  icon:
-    sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi
-    state: base1
-  service: !type:CP14BuyItemsService
-    product: CP14FoodPumpkin
-    count: 3
-
 - type: cp14TradingPosition
  id: CP14FoodPotato
  faction: VictoriaGardens
-  uiPosition: 0, 2
+  uiPosition: 1
  icon:
    sprite: _CP14/Objects/Flora/Farm/potato.rsi
    state: base1
@@ -34,7 +25,7 @@
 - type: cp14TradingPosition
  id: CP14FoodCucumber
  faction: VictoriaGardens
-  uiPosition: 0, 3
+  uiPosition: 2
  icon:
    sprite: _CP14/Objects/Flora/Farm/cucumber.rsi
    state: base1
@@ -45,7 +36,7 @@
 - type: cp14TradingPosition
  id: CP14FoodTomatoes
  faction: VictoriaGardens
-  uiPosition: 1, 0
+  uiPosition: 3
  icon:
    sprite: _CP14/Objects/Flora/Farm/tomatoes.rsi
    state: base1
@@ -53,21 +44,10 @@
    product: CP14FoodTomatoes
    count: 3

- type: cp14TradingPosition
-  id: CP14FoodApple
-  faction: VictoriaGardens
-  uiPosition: 1, 1
-  icon:
-    sprite: _CP14/Objects/Flora/Farm/apple.rsi
-    state: base1
-  service: !type:CP14BuyItemsService
-    product: CP14FoodApple
-    count: 3
-
 - type: cp14TradingPosition
  id: CP14FoodPepper
  faction: VictoriaGardens
-  uiPosition: 1, 2
+  uiPosition: 4
  icon:
    sprite: _CP14/Objects/Flora/Farm/pepper.rsi
    state: base1
@@ -78,7 +58,7 @@
 - type: cp14TradingPosition
  id: CP14FoodOnion
  faction: VictoriaGardens
-  uiPosition: 1, 3
+  uiPosition: 5
  icon:
    sprite: _CP14/Objects/Flora/Farm/onion.rsi
    state: base1
@@ -86,3 +66,28 @@
    product: CP14FoodOnion
    count: 3

+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14FoodApple
+  faction: VictoriaGardens
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Flora/Farm/apple.rsi
+    state: base1
+  service: !type:CP14BuyItemsService
+    product: CP14FoodApple
+    count: 3
+
+- type: cp14TradingPosition
+  id: CP14FoodPumpkin
+  faction: VictoriaGardens
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi
+    state: base1
+  service: !type:CP14BuyItemsService
+    product: CP14FoodPumpkin
+    count: 3