Trade orders (#1037)

* orders

* sprite

* fix orders

* different

* layers

* scrolls

* flora

* loot

* groups

* entity-group

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

Resources/Locale/en-US/_CP14/catalog/groups.ftl

@@ -0,0 +1,2 @@
+cp14-entity-group-spell-scrolls = scrolls
+cp14-entity-group-alchemical-herbals = alchemical herbals

Resources/Locale/ru-RU/_CP14/catalog/groups.ftl

@@ -0,0 +1,2 @@
+cp14-entity-group-spell-scrolls = свитки
+cp14-entity-group-alchemical-herbals = алхимические травы

Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/buy.yml

@@ -226,4 +226,28 @@
       - id: CP14CandleGreenSmall
         amount: 2
       - id: CP14CandlePurpleSmall
-        amount: 2
+        amount: 2
+
+- type: storePositionBuy
+  id: SmokePowder
+  code: TOBACCO
+  price: 80
+  iconOverride: 
+    sprite: _CP14/Objects/Misc/reagent_fillings.rsi
+    state: tobacco_small
+  factions:
+  - BradFamily
+  service: !type:CP14BuyItemsService
+    product: CP14WoodenChestFilledSmokePowder
+
+- type: entity
+  parent: CP14WoodenChest
+  id: CP14WoodenChestFilledSmokePowder
+  name: smoking powder chest
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14GroundTobacco
+        amount: 10
+      - id: CP14GroundSage
+        amount: 5

Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/sell.yml

@@ -0,0 +1,14 @@
+- type: storePositionSell
+  id: CP14AlchemicalHerbals
+  price: 50
+  factions:
+  - BradFamily
+  service: !type:CP14SellWhitelistService
+    whitelist:
+      tags:
+      - CP14AlchemicalHerbals
+    count: 10
+    name: cp14-entity-group-alchemical-herbals
+    sprite:
+      sprite: _CP14/Objects/Flora/Wild/store_position.rsi
+      state: sell

Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/sell_special.yml

@@ -1,82 +1,82 @@
 - type: storePositionSell
   id: CP14BloodFlower
   special: true
-  price: 50
+  price: 200
   factions:
   - BradFamily
   service: !type:CP14SellPrototypeService
     proto: CP14BloodFlower
-    count: 5
+    count: 20
 
 - type: storePositionSell
   id: CP14AgaricMushroom
   special: true
-  price: 50
+  price: 200
   factions:
   - BradFamily
   service: !type:CP14SellPrototypeService
     proto: CP14AgaricMushroom
-    count: 5
+    count: 20
 
 - type: storePositionSell
   id: CP14ChromiumSlime
   special: true
-  price: 150
+  price: 600
   factions:
   - BradFamily
   service: !type:CP14SellPrototypeService
     proto: CP14ChromiumSlime
-    count: 5
+    count: 20
 
 - type: storePositionSell
   id: CP14WildSage
   special: true
-  price: 50
+  price: 200
   factions:
   - BradFamily
   service: !type:CP14SellPrototypeService
     proto: CP14WildSage
-    count: 5
+    count: 20
 
 - type: storePositionSell
   id: CP14LumiMushroom
   special: true
-  price: 100
+  price: 400
   factions:
   - BradFamily
   service: !type:CP14SellPrototypeService
     proto: CP14LumiMushroom
-    count: 5
+    count: 20
 
 - type: storePositionSell
   id: CP14BlueAmanita
   special: true
-  price: 50
+  price: 200
   factions:
   - BradFamily
   service: !type:CP14SellPrototypeService
     proto: CP14BlueAmanita
-    count: 5
+    count: 20
 
 - type: storePositionSell
   id: CP14Dayflin
   special: true
-  price: 50
+  price: 200
   factions:
   - BradFamily
   service: !type:CP14SellPrototypeService
     proto: CP14Dayflin
-    count: 5
+    count: 20
 
 - type: storePositionSell
   id: CP14AirLily
   special: true
-  price: 75
+  price: 300
   factions:
   - BradFamily
   service: !type:CP14SellPrototypeService
     proto: CP14AirLily
-    count: 5
+    count: 20
 
 - type: storePositionSell
   id: CP14BaseAlchemyBomb

Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/sell.yml

@@ -0,0 +1,32 @@
+- type: storePositionSell
+  id: LucenPlanks
+  price: 100
+  factions:
+  - Sylphoria
+  service: !type:CP14SellStackService
+    stackId: CP14LucensWoodenPlanks
+    count: 10
+
+- type: storePositionSell
+  id: CP14SpellScroll
+  price: 150
+  factions:
+  - Sylphoria
+  service: !type:CP14SellWhitelistService
+    whitelist:
+      tags:
+      - CP14SpellScroll
+    count: 5
+    name: cp14-entity-group-spell-scrolls
+    sprite:
+      sprite: _CP14/Objects/Bureaucracy/paper.rsi
+      state: scrolls
+
+- type: storePositionSell
+  id: CP14ClothingCloakAmuletGold
+  price: 80
+  factions:
+  - Sylphoria
+  service: !type:CP14SellPrototypeService
+    proto: CP14ClothingCloakAmuletGold
+    count: 1

Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/sell_special.yml

@@ -18,110 +18,10 @@
     stackId: CP14LucensWoodenPlanks
     count: 10
 
-- type: storePositionSell
-  id: CP14SpellScrollIceShards
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollIceShards
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollShadowGrab
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollShadowGrab
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollSphereOfLight
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollSphereOfLight
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollFlameCreation
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollFlameCreation
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollEarthWall
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollEarthWall
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollFlashLight
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollFlashLight
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollWaterCreation
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollWaterCreation
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollPlantGrowth
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollPlantGrowth
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollMagicSplitting
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollMagicSplitting
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollMagicalAcceleration
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollMagicalAcceleration
-    count: 1
-
 - type: storePositionSell
   id: CP14SpellScrollShadowStep
   special: true
-  price: 40
+  price: 80
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService
@@ -131,7 +31,7 @@
 - type: storePositionSell
   id: CP14SpellScrollFireball
   special: true
-  price: 40
+  price: 80
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService
@@ -171,7 +71,7 @@
 - type: storePositionSell
   id: CP14ClothingRingIceShards
   special: true
-  price: 100
+  price: 150
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService
@@ -181,7 +81,7 @@
 - type: storePositionSell
   id: CP14ClothingRingFlashLight
   special: true
-  price: 100
+  price: 150
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService
@@ -201,7 +101,7 @@
 - type: storePositionSell
   id: CP14MobRabbit
   special: true
-  price: 20
+  price: 50
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService
@@ -211,7 +111,7 @@
 - type: storePositionSell
   id: CP14MobPig
   special: true
-  price: 100
+  price: 130
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService
@@ -221,7 +121,7 @@
 - type: storePositionSell
   id: CP14MobBoar
   special: true
-  price: 120
+  price: 170
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService
@@ -241,7 +141,7 @@
 - type: storePositionSell
   id: CP14MobMonsterMole
   special: true
-  price: 30
+  price: 50
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService
@@ -251,7 +151,7 @@
 - type: storePositionSell
   id: CP14PartsMonsterGlands
   special: true
-  price: 80
+  price: 100
   factions:
   - Sylphoria
   service: !type:CP14SellPrototypeService

Resources/Prototypes/_CP14/Entities/Clothing/Cloak/amulet.yml

@@ -0,0 +1,33 @@
+- type: entity
+  parent: 
+  - CP14ClothingCloakBase
+  - ClothingSlotBase
+  id: CP14ClothingCloakAmuletGold
+  name: gold amulet
+  description: A gold amulet, a valuable trinket.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Amulet/amulet.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Amulet/amulet.rsi
+  - type: CP14Material
+    materials:
+      CP14Gold: 5
+
+- type: entity
+  parent: 
+  - CP14ClothingCloakBase
+  - ClothingSlotBase
+  id: CP14ClothingCloakAmuletMana
+  name: mana amulet
+  description: A gold amulet with a magical stone inside that helps you conjure more easily.
+  components:
+  - type: Sprite
+    sprite: _CP14/Clothing/Cloak/Amulet/amulet_mana.rsi
+    layers:
+    - state: icon
+    - state: amethyst_stone
+  - type: Clothing
+    sprite: _CP14/Clothing/Cloak/Amulet/amulet_mana.rsi
+  - type: CP14MagicManacostModify
+    globalModifier: 0.9

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml

@@ -48,6 +48,7 @@
       children:
       - id: CP14BaseLockpick
       - id: CP14EnergyCrystalMediumEmpty
+      - id: CP14ClothingCloakAmuletGold
       # Rare standard village crates loot
       - !type:NestedSelector
         tableId: CP14StationCrateLoot
@@ -99,4 +100,5 @@
         children:
         - id: CP14SpellScrollResurrection
         - id: CP14ClothingRingIceShards
-        - id: CP14ClothingRingFlashLight
+        - id: CP14ClothingRingFlashLight
+        - id: CP14ClothingCloakAmuletMana

Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet.rsi/meta.json

@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by trushnikov_daniel (discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Cloak/Amulet/amulet_mana.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-4.0",
+    "copyright": "Created by trushnikov_daniel (discord)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+            "name": "amethyst_stone"
+        }
+    ]
+}

Resources/Textures/_CP14/Clothing/Rings/rings.rsi/meta.json

@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Created by TheShuEd",
+    "copyright": "Created by TheShuEd, gold_ring by trushnikov_daniel",
     "size": {
         "x": 32,
         "y": 32
@@ -10,6 +10,9 @@
         {
             "name": "brass_ring"
         },
+        {
+            "name": "gold_ring"
+        },
         {
             "name": "saphhire_stone_small"
         },

Resources/Textures/_CP14/Objects/Bureaucracy/paper.rsi/meta.json

@@ -45,6 +45,9 @@
     },
     {
       "name": "passport"
+    },
+    {
+      "name": "scrolls"
     }
   ]
 }