diff --git a/Resources/Locale/en-US/_CP14/trading/factions.ftl b/Resources/Locale/en-US/_CP14/trading/factions.ftl index bbbadb22a6..c8cec8ee15 100644 --- a/Resources/Locale/en-US/_CP14/trading/factions.ftl +++ b/Resources/Locale/en-US/_CP14/trading/factions.ftl @@ -3,4 +3,8 @@ 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-thaumaturgy = Academy of Thaumaturgy -cp14-trade-faction-home-decor = Cozy home \ No newline at end of file +cp14-trade-faction-home-decor = Cozy home +cp14-trade-faction-horticulture = Horticulture Consortium +cp14-trade-faction-butchers = Master Butchers Union +cp14-trade-faction-dairy = Golden Udder Dairy +cp14-trade-faction-tailors = Silk & Needle Tailors Guild diff --git a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl index 51995ca5e4..615c4933a1 100644 --- a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl +++ b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl @@ -3,4 +3,8 @@ cp14-trade-faction-victoria-gardens = Сады Виктории cp14-trade-faction-brad-potions = Великолепные зелья Брада cp14-trade-faction-dwarf-mining = Шахтерский филиал 'Дворфийская сталь' cp14-trade-faction-thaumaturgy = Тауматургическая академия -cp14-trade-faction-home-decor = Уютный дом \ No newline at end of file +cp14-trade-faction-home-decor = Уютный дом +cp14-trade-faction-horticulture = Консорциум садоводов +cp14-trade-faction-butchers = Союз мастеровых мясников +cp14-trade-faction-dairy = Молочная ферма 'Златовымя' +cp14-trade-faction-tailors = Гильдия портных 'Шелк и игла' diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index 89f949a23f..8f7e45f1d8 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -20,7 +20,7 @@ amount: 1.5 - !type:PlantAdjustHealth amount: 0.75 - pricePerUnit: 0.05 + pricePerUnit: 0.35 - type: reagent id: Vitamin #Anything "healthy" @@ -53,7 +53,7 @@ amount: 0.5 - !type:PlantAdjustHealth amount: 1.5 - pricePerUnit: 0.07 + pricePerUnit: 0.34 - type: reagent id: Protein #Meat and beans @@ -78,7 +78,7 @@ - !type:OrganType type: CP14Vampire shouldHave: false - pricePerUnit: 0.1 + pricePerUnit: 1.13 - type: reagent id: Sugar #Candy and grains @@ -122,3 +122,4 @@ desc: reagent-desc-pumpkin-flesh flavor: pumpkin color: "#fc9300" + pricePerUnit: 0.15 diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 6e4114cecf..1fdb0e3a5d 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -78,6 +78,7 @@ - !type:AdjustReagent reagent: UncookedAnimalProteins amount: 0.5 + pricePerUnit: 0.45 - type: reagent id: EggCooked @@ -94,6 +95,7 @@ - !type:AdjustReagent reagent: Protein amount: 1 + pricePerUnit: 0.6 - type: reagent id: Blackpepper diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml index 1a4fc93426..d00c0cb276 100644 --- a/Resources/Prototypes/Reagents/biological.yml +++ b/Resources/Prototypes/Reagents/biological.yml @@ -197,6 +197,7 @@ collection: FootstepBlood params: volume: 6 + pricePerUnit: 0.5 - type: reagent id: Vomit diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 72730c7990..524e685fa5 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -517,6 +517,7 @@ type: Vox reagent: Protein amount: 0.25 + pricePerUnit: 0.25 - type: reagent id: Allicin diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index f4d7f5696c..75eefe1940 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -87,6 +87,7 @@ - id: CP14Rope - id: CP14EnergyCrystalMediumEmpty - id: CP14BookTieflingGambit + weight: 0.3 # too often - id: CP14d20Dice - id: CP14d6Dice - id: CP14CopperCoin5 @@ -105,6 +106,23 @@ - id: CP14FoodOnion - id: CP14Cloth10 - id: CP14CrayonWhite + # Cheeese! + - !type:GroupSelector + children: + - id: CP14FoodBlueCheeseWheel + weight: 0.1 + - id: CP14FoodAgedCheeseWheel + weight: 0.05 + - id: CP14FoodAgedCheesePart + weight: 0.3 + - id: CP14FoodBlueCheesePart + weight: 0.5 + - id: CP14FoodCheeseSlice + weight: 0.3 # groop chance + - id: CP14FoodBlueCheeseSlice + weight: 0.4 + - id: CP14FoodAgedCheeseSlice + weight: 0.3 - !type:GroupSelector children: - id: CP14ClothingCloakGreen diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cheese.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cheese.yml index 575c7efd5f..1f006db337 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cheese.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/cheese.yml @@ -1,3 +1,4 @@ +# Cheeses - type: entity id: CP14FoodCheeseWheel parent: FoodInjectableBase @@ -21,6 +22,8 @@ reagents: - ReagentId: Nutriment Quantity: 21 + - ReagentId: Protein + Quantity: 15 # 5 parts * 3 slices * 1 protein - type: SliceableFood count: 5 slice: CP14FoodCheesePart @@ -51,10 +54,11 @@ - type: SolutionContainerManager solutions: food: - maxVol: 6 # 1/5 cheese wheel reagents: - ReagentId: Nutriment Quantity: 4.2 + - ReagentId: Protein + Quantity: 3 # 3 slices * 1 protein - type: SliceableFood count: 3 slice: CP14FoodCheeseSlice @@ -89,6 +93,200 @@ reagents: - ReagentId: Nutriment Quantity: 1.4 + - ReagentId: Protein + Quantity: 1 - type: FoodSequenceElement entries: CP14Sandwich: CP14CheeseSandwich + +# Blue Cheese (50% more protein) +- type: entity + id: CP14FoodBlueCheeseWheel + parent: CP14FoodCheeseWheel + name: blue cheese wheel + description: A wheel of cheese with distinctive blue veins. Strong aroma! + components: + - type: Sprite + layers: + - state: blue_cheese_wheel + - type: FlavorProfile + flavors: + - cheesy + - pungent + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 30 + - ReagentId: Protein + Quantity: 22.5 # 15 * 1.5 (50% more) + - type: SliceableFood + count: 5 + slice: CP14FoodBlueCheesePart + - type: StaticPrice + price: 20 + +- type: entity + id: CP14FoodBlueCheesePart + parent: CP14FoodCheesePart + name: blue cheese wedge + description: A triangle of pungent blue-veined cheese. + components: + - type: FlavorProfile + flavors: + - cheesy + - pungent + - type: Sprite + layers: + - state: blue_cheese_part + map: [ "random" ] + - type: RandomSprite + available: + - random: + blue_cheese_part: "" + blue_cheese_part2: "" + blue_cheese_part3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 # 1/5 of wheel + reagents: + - ReagentId: Nutriment + Quantity: 6 # 30/5 + - ReagentId: Protein + Quantity: 4.5 # 22.5/5 + - type: SliceableFood + count: 3 + slice: CP14FoodBlueCheeseSlice + - type: StaticPrice + price: 4 + +- type: entity + id: CP14FoodBlueCheeseSlice + parent: CP14FoodCheeseSlice + name: blue cheese slice + description: A thin slice of pungent blue cheese. + components: + - type: FlavorProfile + flavors: + - cheesy + - pungent + - type: Sprite + layers: + - state: blue_cheese_slice + map: [ "random" ] + - type: RandomSprite + available: + - random: + blue_cheese_slice: "" + blue_cheese_slice2: "" + blue_cheese_slice3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 # 1/3 of part + reagents: + - ReagentId: Nutriment + Quantity: 2 # 6/3 + - ReagentId: Protein + Quantity: 1.5 # 4.5/3 + - type: StaticPrice + price: 1 + +# Aged Cheese (100% more protein) +- type: entity + id: CP14FoodAgedCheeseWheel + parent: CP14FoodCheeseWheel + name: aged cheese wheel + description: Hard cheese aged for months to develop rich flavor. + components: + - type: Sprite + layers: + - state: aged_cheese_wheel + - type: FlavorProfile + flavors: + - cheesy + - savory + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 45 + - ReagentId: Protein + Quantity: 30 # 15 * 2 (100% more) + - type: SliceableFood + count: 5 + slice: CP14FoodAgedCheesePart + - type: StaticPrice + price: 35 + +- type: entity + id: CP14FoodAgedCheesePart + parent: CP14FoodCheesePart + name: aged cheese wedge + description: A triangle of richly flavored aged cheese. + components: + - type: FlavorProfile + flavors: + - cheesy + - savory + - type: Sprite + layers: + - state: aged_cheese_part + map: [ "random" ] + - type: RandomSprite + available: + - random: + aged_cheese_part: "" + aged_cheese_part2: "" + aged_cheese_part3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 # 1/5 of wheel + reagents: + - ReagentId: Nutriment + Quantity: 9 # 45/5 + - ReagentId: Protein + Quantity: 6 # 30/5 + - type: SliceableFood + count: 3 + slice: CP14FoodAgedCheeseSlice + - type: StaticPrice + price: 7 + +- type: entity + id: CP14FoodAgedCheeseSlice + parent: CP14FoodCheeseSlice + name: aged cheese slice + description: A thin slice of richly flavored aged cheese. + components: + - type: FlavorProfile + flavors: + - cheesy + - savory + - type: Sprite + layers: + - state: aged_cheese_slice + map: [ "random" ] + - type: RandomSprite + available: + - random: + aged_cheese_slice: "" + aged_cheese_slice2: "" + aged_cheese_slice3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 2 # 1/3 of part + reagents: + - ReagentId: Nutriment + Quantity: 3 # 9/3 + - ReagentId: Protein + Quantity: 2 # 6/3 + - type: StaticPrice + price: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml index 0442709030..53b22865f8 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/dough.yml @@ -20,7 +20,7 @@ maxVol: 30 reagents: - ReagentId: Nutriment - Quantity: 21 + Quantity: 10 - ReagentId: UncookedAnimalProteins Quantity: 2 - type: SliceableFood @@ -100,7 +100,7 @@ maxVol: 7 # 1/4 large dough reagents: - ReagentId: Nutriment - Quantity: 5.2 + Quantity: 1.3 - ReagentId: UncookedAnimalProteins Quantity: 0.5 - type: CP14TemperatureTransformation @@ -216,11 +216,10 @@ maxVol: 7 # 1/4 large dough reagents: - ReagentId: Nutriment - Quantity: 5.2 + Quantity: 1.3 - ReagentId: UncookedAnimalProteins Quantity: 0.5 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 - transformTo: CP14Ash1 #TODO: лаваш? - + transformTo: CP14Ash1 #TODO: лаваш? \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml index a892b9a468..662cecb3e6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/egg.yml @@ -22,6 +22,8 @@ reagents: - ReagentId: Egg Quantity: 6 + - ReagentId: Protein + Quantity: 2 - type: DrawableSolution solution: food - type: SolutionSpiker @@ -100,4 +102,3 @@ - random: brown: "" icon: "" - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml index e53eb718fa..ae2c9e6fc5 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/meat.yml @@ -1,5 +1,4 @@ # Base - - type: entity parent: FoodInjectableBase id: CP14FoodMeatBase @@ -17,11 +16,11 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 2.5 - ReagentId: UncookedAnimalProteins Quantity: 1 - ReagentId: Fat - Quantity: 6 + Quantity: 2 - type: Temperature currentTemperature: 290 - type: InternalTemperature @@ -43,11 +42,11 @@ maxVol: 5 reagents: - ReagentId: Nutriment - Quantity: 2 + Quantity: 0.75 - ReagentId: UncookedAnimalProteins Quantity: 0.33 - ReagentId: Fat - Quantity: 2 + Quantity: 0.75 - type: InternalTemperature thickness: 0.006 area: 0.006 # 1\3 of meat value @@ -56,7 +55,6 @@ - CP14MeatSlice # Lamb Meat - - type: entity id: CP14FoodMeatLamb parent: CP14FoodMeatBase @@ -69,6 +67,17 @@ - type: SliceableFood count: 3 slice: CP14FoodMeatLambSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 4 + - ReagentId: Fat + Quantity: 6 - type: Item size: Small shape: @@ -94,9 +103,9 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 8 - ReagentId: Protein - Quantity: 1 + Quantity: 4 - ReagentId: Fat Quantity: 6 - type: CP14TemperatureTransformation @@ -123,6 +132,17 @@ sheepmeat_slice: "" sheepmeat_slice2: "" sheepmeat_slice3: "" + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 1 + - ReagentId: Fat + Quantity: 4 - type: Tag tags: - CP14RawMeatSlice @@ -152,9 +172,9 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 2 - ReagentId: Protein - Quantity: 0.33 + Quantity: 2 - ReagentId: Fat Quantity: 6 - type: CP14TemperatureTransformation @@ -177,11 +197,11 @@ maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 2 - ReagentId: UncookedAnimalProteins Quantity: 0.66 - ReagentId: Fat - Quantity: 4 + Quantity: 2 - ReagentId: Egg Quantity: 6 - type: FoodSequenceElement @@ -221,6 +241,7 @@ - temperatureRange: 400, 500 transformTo: CP14Ash1 +# Frog Leg - type: entity id: CP14FoodMeatFrogLeg parent: CP14FoodMeatBase @@ -238,7 +259,7 @@ maxVol: 5 reagents: - ReagentId: Nutriment - Quantity: 3 + Quantity: 1.75 - ReagentId: UncookedAnimalProteins Quantity: 1 - type: CP14TemperatureTransformation @@ -270,7 +291,6 @@ transformTo: CP14Ash1 # Human Meat - - type: entity id: CP14FoodMeatHuman parent: CP14FoodMeatBase @@ -290,7 +310,7 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 2 - ReagentId: UncookedAnimalProteins Quantity: 10 - ReagentId: Fat @@ -336,7 +356,6 @@ transformTo: CP14Ash1 # Dino Meat - - type: entity id: CP14FoodMeatDino parent: CP14FoodMeatBase @@ -354,7 +373,7 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 3.6 - ReagentId: UncookedAnimalProteins Quantity: 6 - ReagentId: Fat @@ -404,7 +423,7 @@ maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 5.5 + Quantity: 2.15 - ReagentId: UncookedAnimalProteins Quantity: 3 - type: CP14TemperatureTransformation @@ -434,7 +453,6 @@ transformTo: CP14Ash1 # Rabbit Meat - - type: entity id: CP14FoodMeatRabbit parent: CP14FoodMeatBase @@ -454,7 +472,7 @@ maxVol: 5 reagents: - ReagentId: Nutriment - Quantity: 3 + Quantity: 1.15 - ReagentId: UncookedAnimalProteins Quantity: 1.5 - type: RandomSprite @@ -500,7 +518,6 @@ transformTo: CP14Ash1 # Pig and Boar Meat - - type: entity id: CP14FoodMeatPig parent: CP14FoodMeatBase @@ -523,11 +540,11 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 4 - ReagentId: UncookedAnimalProteins Quantity: 4 - ReagentId: Fat - Quantity: 8 + Quantity: 6 - type: RandomSprite available: - random: @@ -556,11 +573,11 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 8 - ReagentId: Protein Quantity: 4 - ReagentId: Fat - Quantity: 8 + Quantity: 14 - type: RandomSprite available: - random: @@ -588,11 +605,11 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 8 + Quantity: 3.5 - ReagentId: UncookedAnimalProteins - Quantity: 6 + Quantity: 10 - ReagentId: Fat - Quantity: 4 + Quantity: 6 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -613,9 +630,9 @@ - ReagentId: Nutriment Quantity: 8 - ReagentId: Protein - Quantity: 6 + Quantity: 10 - ReagentId: Fat - Quantity: 4 + Quantity: 12 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -643,11 +660,11 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 2.25 - ReagentId: UncookedAnimalProteins - Quantity: 4 - - ReagentId: Fat Quantity: 8 + - ReagentId: Fat + Quantity: 7 - type: RandomSprite available: - random: @@ -679,9 +696,9 @@ - ReagentId: Nutriment Quantity: 6 - ReagentId: Protein - Quantity: 4 - - ReagentId: Fat Quantity: 8 + - ReagentId: Fat + Quantity: 12 - type: RandomSprite available: - random: @@ -710,7 +727,7 @@ maxVol: 5 reagents: - ReagentId: Nutriment - Quantity: 1.5 + Quantity: 1.45 - ReagentId: UncookedAnimalProteins Quantity: 1 - ReagentId: Fat @@ -737,18 +754,17 @@ maxVol: 5 reagents: - ReagentId: Nutriment - Quantity: 1.5 + Quantity: 2.75 - ReagentId: Protein Quantity: 1 - ReagentId: Fat - Quantity: 2 + Quantity: 4 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 transformTo: CP14Ash1 # Monster Meat - - type: entity id: CP14FoodMeatMonster parent: CP14FoodMeatBase @@ -771,11 +787,11 @@ maxVol: 20 # Add a reagent that restores mana, possibly poisonous reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 2 - ReagentId: UncookedAnimalProteins - Quantity: 6 + Quantity: 3 - ReagentId: Fat - Quantity: 6 + Quantity: 2.5 - type: RandomSprite available: - random: @@ -809,7 +825,7 @@ - ReagentId: Nutriment Quantity: 6 - ReagentId: Protein - Quantity: 6 + Quantity: 3 - ReagentId: Fat Quantity: 6 - type: RandomSprite @@ -841,11 +857,11 @@ maxVol: 20 # Add a reagent that restores mana, possibly poisonous reagents: - ReagentId: Nutriment - Quantity: 8 + Quantity: 3.25 - ReagentId: UncookedAnimalProteins - Quantity: 6 + Quantity: 3 - ReagentId: Fat - Quantity: 4 + Quantity: 1.5 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -867,7 +883,7 @@ - ReagentId: Nutriment Quantity: 8 - ReagentId: Protein - Quantity: 6 + Quantity: 3 - ReagentId: Fat Quantity: 4 - type: CP14TemperatureTransformation @@ -893,11 +909,11 @@ maxVol: 5 # Add a reagent that restores mana, possibly poisonous reagents: - ReagentId: Nutriment - Quantity: 1.5 + Quantity: 0.5 - ReagentId: UncookedAnimalProteins - Quantity: 1.5 + Quantity: 0.5 - ReagentId: Fat - Quantity: 1.5 + Quantity: 0.5 - type: Tag tags: - CP14RawMeatSlice @@ -923,7 +939,7 @@ - ReagentId: Nutriment Quantity: 1.5 - ReagentId: Protein - Quantity: 1.5 + Quantity: 0.5 - ReagentId: Fat Quantity: 1.5 - type: CP14TemperatureTransformation @@ -931,8 +947,7 @@ - temperatureRange: 400, 500 transformTo: CP14Ash1 - #Flem meat - +# Flem meat - type: entity id: CP14FoodMeatFlemHead parent: CP14FoodMeatBase @@ -955,11 +970,11 @@ maxVol: 30 reagents: - ReagentId: Nutriment - Quantity: 7 + Quantity: 2 - ReagentId: UncookedAnimalProteins - Quantity: 18 + Quantity: 12 - ReagentId: Fat - Quantity: 5 + Quantity: 2 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -980,7 +995,7 @@ - ReagentId: Nutriment Quantity: 7 - ReagentId: Protein - Quantity: 18 + Quantity: 12 - ReagentId: Fat Quantity: 5 - type: CP14TemperatureTransformation @@ -1013,11 +1028,11 @@ maxVol: 35 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 2 - ReagentId: UncookedAnimalProteins Quantity: 24 - ReagentId: Fat - Quantity: 2 + Quantity: 1 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 @@ -1041,7 +1056,7 @@ - ReagentId: Nutriment Quantity: 6 - ReagentId: Protein - Quantity: 24 + Quantity: 15 - ReagentId: Fat Quantity: 2 - type: CP14TemperatureTransformation @@ -1070,7 +1085,7 @@ maxVol: 10 reagents: - ReagentId: Nutriment - Quantity: 2 + Quantity: 1 - ReagentId: UncookedAnimalProteins Quantity: 5 - ReagentId: Fat @@ -1154,11 +1169,11 @@ reagents: - ReagentId: Nutriment Quantity: 0.2 - - ReagentId: UncookedAnimalProteins + - ReagentId: Protein Quantity: 5 - ReagentId: Fat Quantity: 0.1 - type: CP14TemperatureTransformation entries: - temperatureRange: 400, 500 - transformTo: CP14Ash1 + transformTo: CP14Ash1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml index 2b51953b20..87dac7fc8a 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/pie.yml @@ -30,6 +30,11 @@ - type: Tag tags: - Pie + - type: StaticPrice + price: 6 # price for crafting and plate + - type: PhysicalComposition + materialComposition: + CP14Iron: 10 # 1 iron bar = 1 plate pie in craft - type: entity parent: FoodInjectableBase @@ -58,6 +63,9 @@ - type: Food trash: - CP14PlatePie + - type: PhysicalComposition + materialComposition: + CP14Iron: 10 # 1 iron bar = 1 plate pie in craft # pie @@ -77,7 +85,7 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 6 - ReagentId: UncookedAnimalProteins Quantity: 2 - ReagentId: Vitamin @@ -110,11 +118,11 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 15 - ReagentId: Protein - Quantity: 2 + Quantity: 4 - ReagentId: Vitamin - Quantity: 5 + Quantity: 14 - type: Sprite layers: - state: tin @@ -159,6 +167,17 @@ - type: FlavorProfile flavors: - meaty + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Protein + Quantity: 12 + - ReagentId: Vitamin + Quantity: 2 - type: Sprite layers: - state: tin @@ -203,6 +222,17 @@ - type: FlavorProfile flavors: - fishy + - type: SolutionContainerManager + solutions: + food: + maxVol: 20 + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Protein + Quantity: 8 + - ReagentId: Vitamin + Quantity: 6 - type: Sprite layers: - state: tin @@ -236,11 +266,11 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 2 - ReagentId: UncookedAnimalProteins Quantity: 2 - ReagentId: PumpkinFlesh - Quantity: 5 + Quantity: 10 - ReagentId: Vitamin Quantity: 4 - type: Tag @@ -270,11 +300,11 @@ maxVol: 20 reagents: - ReagentId: Nutriment - Quantity: 6 + Quantity: 4 - ReagentId: Protein Quantity: 2 - ReagentId: PumpkinFlesh - Quantity: 5 + Quantity: 10 - ReagentId: Vitamin Quantity: 4 - type: Tag diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml index c1bd15e878..157191d52e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/plate.yml @@ -14,6 +14,9 @@ - type: Tag tags: - CP14Plate + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 # 2 wooden plank in craft - type: entity id: CP14PlatePie @@ -31,3 +34,6 @@ - type: Tag tags: - CP14PlatePie + - type: PhysicalComposition + materialComposition: + CP14Iron: 10 # 1 iron bar = 1 plate pie in craft \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml index bf45ea892d..89ba9190e9 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml @@ -27,9 +27,9 @@ maxVol: 12 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 3 - ReagentId: Vitamin - Quantity: 1 + Quantity: 0.5 - type: SliceableFood count: 4 sliceTime: 1.5 @@ -68,9 +68,9 @@ maxVol: 3 # 1/4 cabbage reagents: - ReagentId: Nutriment - Quantity: 2.5 + Quantity: 0.83 - ReagentId: Vitamin - Quantity: 0.25 + Quantity: 0.14 - type: FoodSequenceElement entries: CP14Sandwich: CP14CabbageSandwich @@ -105,9 +105,9 @@ maxVol: 30 reagents: - ReagentId: PumpkinFlesh - Quantity: 20 + Quantity: 10 - ReagentId: Vitamin - Quantity: 5 + Quantity: 2 - type: SliceableFood count: 5 sliceTime: 2 @@ -146,9 +146,9 @@ maxVol: 6 # 1/5 pumpkin reagents: - ReagentId: PumpkinFlesh - Quantity: 4 + Quantity: 1.33 - ReagentId: Vitamin - Quantity: 1 + Quantity: 0.57 - type: FoodSequenceElement entries: CP14Sandwich: CP14PumpkinSandwich @@ -183,9 +183,9 @@ maxVol: 11 reagents: - ReagentId: Nutriment - Quantity: 7 + Quantity: 2.33 - ReagentId: Vitamin - Quantity: 2 + Quantity: 1.14 - type: CP14Seed plantProto: CP14PlantPotato #TODO sliceable potato - type: Tag @@ -232,9 +232,9 @@ maxVol: 11 reagents: - ReagentId: Nutriment - Quantity: 4 + Quantity: 1.33 - ReagentId: Vitamin - Quantity: 2 + Quantity: 1.14 - ReagentId: Water Quantity: 3 - type: SliceableFood @@ -306,9 +306,9 @@ maxVol: 12 reagents: - ReagentId: Nutriment - Quantity: 3 + Quantity: 1 - ReagentId: Vitamin - Quantity: 3 + Quantity: 1.71 - ReagentId: JuiceTomato Quantity: 6 - type: SliceableFood @@ -372,9 +372,9 @@ maxVol: 3 # 1/3 pumpkin reagents: - ReagentId: Nutriment - Quantity: 1 + Quantity: 0.33 - ReagentId: Vitamin - Quantity: 1 + Quantity: 0.57 - type: FoodSequenceElement entries: CP14Sandwich: CP14TomatoesSandwich @@ -397,9 +397,9 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 3.33 - ReagentId: Vitamin - Quantity: 4 + Quantity: 2.29 - type: Sprite sprite: _CP14/Objects/Flora/Farm/apple.rsi layers: @@ -439,9 +439,9 @@ maxVol: 4 reagents: - ReagentId: Nutriment - Quantity: 2.5 + Quantity: 0.83 - ReagentId: Vitamin - Quantity: 1 + Quantity: 0.57 - type: FoodSequenceElement entries: CP14Sandwich: CP14AppleSandwich @@ -479,9 +479,9 @@ maxVol: 15 reagents: - ReagentId: Nutriment - Quantity: 8 + Quantity: 2.67 - ReagentId: Vitamin - Quantity: 6 + Quantity: 3.43 - type: Tag tags: - CP14FarmFood @@ -544,9 +544,9 @@ maxVol: 17 reagents: - ReagentId: Nutriment - Quantity: 9 + Quantity: 3 - ReagentId: Vitamin - Quantity: 4 + Quantity: 2.29 - ReagentId: Allicin Quantity: 3 - type: SliceableFood @@ -588,4 +588,4 @@ Quantity: 0.8 - type: FoodSequenceElement entries: - CP14Sandwich: CP14OnionSandwich + CP14Sandwich: CP14OnionSandwich \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/salad.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/salad.yml index 73bcbda07c..aab06861c4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/salad.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/salad.yml @@ -18,7 +18,7 @@ - ReagentId: PumpkinFlesh Quantity: 12 - ReagentId: Nutriment - Quantity: 22 + Quantity: 16 - ReagentId: Vitamin Quantity: 10 - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml index 9a0dd8347a..7d43f6d254 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Smokeables/Pipes/pipe.yml @@ -20,6 +20,9 @@ unlitIcon: unlit-icon - type: CP14IgnitionModifier hideCaution: true + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 # 2 wooden plank in craft - type: entity id: CP14SmokingPipeFilledTobacco diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml index c6c873a42d..eb5a96544e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml @@ -44,7 +44,7 @@ parent: CP14BaseCoin name: copper coin description: The smallest denomination coin. Copper. - suffix: 10 coins + suffix: 10 coins - trade components: - type: Sprite sprite: /Textures/_CP14/Objects/Economy/cp_coin.rsi @@ -60,7 +60,7 @@ - type: entity id: CP14CopperCoin5 parent: CP14CopperCoin - suffix: 5 coins + suffix: 5 coins - trade components: - type: Sprite state: coin5 @@ -70,7 +70,7 @@ - type: entity id: CP14CopperCoin1 parent: CP14CopperCoin - suffix: 1 coin + suffix: 1 coin - trade components: - type: Sprite state: coin1 @@ -84,7 +84,7 @@ parent: CP14BaseCoin name: silver coin description: A valuable coin made from a precisely calibrated silver alloy..... and something else. Equal in value to ten coppers. - suffix: 10 coins + suffix: 10 coins - trade components: - type: Sprite sprite: /Textures/_CP14/Objects/Economy/sp_coin.rsi @@ -100,7 +100,7 @@ - type: entity id: CP14SilverCoin5 parent: CP14SilverCoin - suffix: 5 coins + suffix: 5 coins - trade components: - type: Sprite state: coin5 @@ -124,7 +124,7 @@ parent: CP14BaseCoin name: gold coin description: A gold, big, beautiful coin. Valuable enough to be stolen by bandits. Equal in value to ten silver coins. - suffix: 10 coins + suffix: 10 coins - trade components: - type: Sprite sprite: /Textures/_CP14/Objects/Economy/gp_coin.rsi @@ -140,7 +140,7 @@ - type: entity id: CP14GoldCoin5 parent: CP14GoldCoin - suffix: 5 coins + suffix: 5 coins - trade components: - type: Sprite state: coin5 @@ -150,7 +150,7 @@ - type: entity id: CP14GoldCoin1 parent: CP14GoldCoin - suffix: 1 coin + suffix: 1 coin - trade components: - type: Sprite state: coin1 @@ -164,7 +164,7 @@ parent: CP14BaseCoin name: platinum coin description: A platinum coin? It's so rare. Ten gold pieces is the price of one. - suffix: 10 coins + suffix: 10 coins - trade components: - type: Sprite sprite: /Textures/_CP14/Objects/Economy/pp_coin.rsi @@ -180,7 +180,7 @@ - type: entity id: CP14PlatinumCoin5 parent: CP14PlatinumCoin - suffix: 5 coins + suffix: 5 coins - trade components: - type: Sprite state: coin5 @@ -190,7 +190,7 @@ - type: entity id: CP14PlatinumCoin1 parent: CP14PlatinumCoin - suffix: 1 coin + suffix: 1 coin - trade components: - type: Sprite state: coin1 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml index 6b2bc47a50..5b0425215e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml @@ -72,3 +72,46 @@ - type: CP14TradingContract faction: HomeDecor +- type: entity + parent: CP14TradeContractBase + id: CP14TradeContractHorticulture + description: Trading contract with "Horticulture Consortium". Allows you to purchase seeds, plants and gardening tools. + suffix: Horticulture + components: + - type: Sprite + state: horticulture + - type: CP14TradingContract + faction: Horticulture + +- type: entity + parent: CP14TradeContractBase + id: CP14TradeContractButchers + description: Trading contract with "Master Butchers Union". Allows you to purchase fresh meat products and butchering equipment. + suffix: Butchers + components: + - type: Sprite + state: butchers + - type: CP14TradingContract + faction: Butchers + +- type: entity + parent: CP14TradeContractBase + id: CP14TradeContractDairy + description: Trading contract with "Golden Udder Dairy". Allows you to purchase fresh dairy products and eggs. + suffix: Dairy + components: + - type: Sprite + state: dairy + - type: CP14TradingContract + faction: Dairy + +- type: entity + parent: CP14TradeContractBase + id: CP14TradeContractTailors + description: Trading contract with the "Silk & Needle Tailors Guild". Allows you to purchase fabrics, clothing and tailoring tools. + suffix: Tailors + components: + - type: Sprite + state: tailors + - type: CP14TradingContract + faction: Tailors \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index a17976f902..80dd236113 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -34,14 +34,14 @@ juiceSolution: reagents: - ReagentId: CP14BloodFlowerSap - Quantity: 12 + Quantity: 10 - type: SolutionContainerManager solutions: food: maxVol: 14 reagents: - ReagentId: CP14BloodFlowerSap - Quantity: 12 + Quantity: 10 - type: Tag tags: - CP14FitInMortar @@ -255,14 +255,14 @@ juiceSolution: reagents: - ReagentId: CP14YellowDayflinPulp - Quantity: 4 + Quantity: 8 - type: SolutionContainerManager solutions: food: maxVol: 5 reagents: - ReagentId: CP14YellowDayflinPulp - Quantity: 4 + Quantity: 8 - type: Tag tags: - CP14FitInMortar @@ -288,14 +288,14 @@ juiceSolution: reagents: - ReagentId: CP14AirLily - Quantity: 4 + Quantity: 6 - type: SolutionContainerManager solutions: food: maxVol: 5 reagents: - ReagentId: CP14AirLily - Quantity: 4 + Quantity: 6 - type: Tag tags: - CP14FitInMortar diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml index 46f5b2b079..1517ddad46 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml @@ -13,6 +13,8 @@ - type: Tag tags: - CP14Dye + - type: StaticPrice + price: 7 - type: entity id: CP14DyeRed diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml index c358672b78..6ef4b7b4f7 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml @@ -100,7 +100,7 @@ - state: core1 map: ["random"] - type: StaticPrice - price: 10 + price: 15 - type: RandomSprite available: - random: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/candles.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/candles.yml index aec861a4e4..a5db860f04 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/candles.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/candles.yml @@ -83,6 +83,8 @@ right: - state: inhand-right color: "#a12349" + - type: StaticPrice + price: 3 - type: entity name: blue candle diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml index 27d40db71f..e9b1c3fdb3 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/crayons.yml @@ -24,6 +24,8 @@ type: CrayonBoundUserInterface - type: Crayon capacity: 15 + - type: StaticPrice + price: 5 - type: entity parent: CP14Crayon diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Misc/monster_parts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Misc/monster_parts.yml index 1d48119876..d2d904c37e 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Misc/monster_parts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Misc/monster_parts.yml @@ -30,4 +30,6 @@ - type: Tag tags: - CP14FitInMortar + - type: StaticPrice + price: 8 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_reagents.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_reagents.yml new file mode 100644 index 0000000000..315767812c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_reagents.yml @@ -0,0 +1,116 @@ +- type: entity + id: CP14VialBloodFlowerSap + parent: CP14VialTiny + name: vial of blood rose sap + description: A tiny vial containing concentrated blood rose sap. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14BloodFlowerSap + Quantity: 5 + +- type: entity + id: CP14VialWildSageSap + parent: CP14VialTiny + name: vial of wild sage sap + description: A tiny vial containing concentrated wild sage sap. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14WildSageSap + Quantity: 5 + +- type: entity + id: CP14VialYellowDayflinPulp + parent: CP14VialTiny + name: vial of dayflin pulp + description: A tiny vial containing concentrated yellow dayflin pulp. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14YellowDayflinPulp + Quantity: 5 + +- type: entity + id: CP14VialBlueAmanita + parent: CP14VialTiny + name: vial of blue amanita extract + description: A tiny vial containing concentrated blue amanita extract. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14BlueAmanita + Quantity: 5 + +- type: entity + id: CP14VialLumiMushroom + parent: CP14VialTiny + name: vial of lumishroom extract + description: A tiny vial containing concentrated lumishroom extract. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14LumiMushroom + Quantity: 5 + +- type: entity + id: CP14VialSilverNeedle + parent: CP14VialTiny + name: vial of silver needle extract + description: A tiny vial containing concentrated silver needle extract. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14SilverNeedle + Quantity: 5 + +- type: entity + id: CP14VialChromiumSlime + parent: CP14VialTiny + name: vial of chromium slime + description: A tiny vial containing concentrated chromium slime. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14ChromiumSlime + Quantity: 5 + +- type: entity + id: CP14VialAgaricMushroom + parent: CP14VialTiny + name: vial of fly agaric extract + description: A tiny vial containing concentrated fly agaric extract. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14AgaricMushroom + Quantity: 5 + +- type: entity + id: CP14VialAirLily + parent: CP14VialTiny + name: vial of air lily extract + description: A tiny vial containing concentrated air lily extract. + components: + - type: SolutionContainerManager + solutions: + vial: + reagents: + - ReagentId: CP14AirLily + Quantity: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml index 2e8945dcfe..2cff1bb58f 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/flashlight.yml @@ -102,6 +102,10 @@ whitelist: components: - CP14MagicEnergyCrystal + - type: PhysicalComposition + materialComposition: + CP14Copper: 20 # 2 copper bar + CP14Iron: 10 # 1 iron bar - type: entity parent: CP14CrystalLamp diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/cash_converter.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/cash_converter.yml index 244519bac8..9ceaf731a7 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/cash_converter.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/cash_converter.yml @@ -3,6 +3,7 @@ parent: BaseStructure categories: [ ForkFiltered ] name: cash converter + suffix: Trade description: A simple magical device connected by small portals to the empire's central bank. It allows you to convert coins between denominations, and doesn't even charge interest! That's generous. components: - type: InteractionOutline diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml index b9032e66e5..b3eedea3c9 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml @@ -2,6 +2,7 @@ parent: BaseStructure id: CP14TradingPlatform name: buying dimensional platform + suffix: Trade description: Allows you to trade with the outside world, through retail trade transactions. categories: [ ForkFiltered ] components: @@ -52,6 +53,7 @@ parent: BaseStructure id: CP14TradingSellingPlatform name: selling dimensional platform + suffix: Trade description: Allows you to sell any items and structures to the outside world. Fill the platform completely with mana to sell whatever you place on it. categories: [ ForkFiltered ] components: diff --git a/Resources/Prototypes/_CP14/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_CP14/Reagents/Consumable/Drink/alcohol.yml index 2c358bd780..120c1fbd27 100644 --- a/Resources/Prototypes/_CP14/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_CP14/Reagents/Consumable/Drink/alcohol.yml @@ -56,7 +56,7 @@ - !type:Drunk boozePower: 2 fizziness: 0.8 - pricePerUnit: 2 + pricePerUnit: 4 - type: reagent id: CP14Beer @@ -75,7 +75,7 @@ - !type:Emote emote: Laugh probability: 0.05 - pricePerUnit: 0.1 + pricePerUnit: 0.23 - type: reagent id: CP14BeerGerbil @@ -93,7 +93,7 @@ - !type:AdjustReagent reagent: CP14Beer amount: 0.2 - pricePerUnit: 0.13 + pricePerUnit: 0.26 - type: reagent id: CP14BeerBreeze @@ -111,7 +111,7 @@ - !type:AdjustReagent reagent: CP14Beer amount: 0.2 - pricePerUnit: 0.04 + pricePerUnit: 0.15 - type: reagent id: CP14BeerBlowLaw @@ -129,7 +129,7 @@ - !type:AdjustReagent reagent: CP14Beer amount: 0.3 - pricePerUnit: 0.15 + pricePerUnit: 0.35 - type: reagent id: CP14Wine @@ -145,7 +145,7 @@ effects: - !type:ModifyBloodLevel amount: 0.4 - pricePerUnit: 0.2 + pricePerUnit: 0.5 - type: reagent id: CP14WineZellasianPleasure @@ -164,7 +164,7 @@ - !type:AdjustReagent reagent: CP14Wine amount: 0.3 - pricePerUnit: 1.012 + pricePerUnit: 1.5 - type: reagent id: CP14WineLeeks @@ -182,7 +182,7 @@ - !type:AdjustReagent reagent: CP14Wine amount: 0.2 - pricePerUnit: 0.1 + pricePerUnit: 0.2 - type: reagent id: CP14WineDurandate @@ -220,7 +220,7 @@ - !type:Emote emote: Laugh probability: 0.05 - pricePerUnit: 0.05 + pricePerUnit: 0.1 - type: reagent id: CP14AleBloodyTear @@ -238,7 +238,7 @@ - !type:AdjustReagent reagent: CP14Ale amount: 0.2 - pricePerUnit: 0.1 + pricePerUnit: 0.2 - type: reagent id: CP14AleBottomless @@ -257,7 +257,7 @@ - !type:AdjustReagent reagent: CP14Ale amount: 0.2 - pricePerUnit: 0.2 + pricePerUnit: 0.35 # Magic beer from spell, cost nothing - type: reagent diff --git a/Resources/Prototypes/_CP14/Reagents/blood.yml b/Resources/Prototypes/_CP14/Reagents/blood.yml index 290845c61c..f6264e1a68 100644 --- a/Resources/Prototypes/_CP14/Reagents/blood.yml +++ b/Resources/Prototypes/_CP14/Reagents/blood.yml @@ -73,6 +73,7 @@ collection: FootstepBlood params: volume: 6 + pricePerUnit: 0.45 - type: reagent id: CP14BloodTiefling @@ -122,6 +123,7 @@ conditions: - !type:OrganType type: CP14Vampire + pricePerUnit: 0.15 - type: reagent id: CP14BloodElf @@ -163,6 +165,7 @@ groups: Brute: -3 Burn: -3 + pricePerUnit: 0.25 - type: reagent id: CP14BloodGoblin @@ -205,4 +208,5 @@ walkSpeedModifier: 1.1 sprintSpeedModifier: 1.1 statusLifetime: 1.5 + pricePerUnit: 0.05 diff --git a/Resources/Prototypes/_CP14/Reagents/magic_essence.yml b/Resources/Prototypes/_CP14/Reagents/magic_essence.yml index ea3605fcb6..c4cd3539be 100644 --- a/Resources/Prototypes/_CP14/Reagents/magic_essence.yml +++ b/Resources/Prototypes/_CP14/Reagents/magic_essence.yml @@ -9,10 +9,9 @@ effects: - !type:ChemVomit probability: 0.25 - pricePerUnit: 0.05 - -# Basic 6 + pricePerUnit: 0.25 # Base price for all T0 essences +# Basic 6 (T0) - type: reagent parent: CP14EssenceBase id: CP14EssenceEarth @@ -20,6 +19,7 @@ desc: cp14-reagent-desc-essence-earth group: CP14MagicEssenceT0 color: "#70533f" + pricePerUnit: 0.25 # From Wild Sage (0.5) or Lumi Mushroom (0.5) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceEarth @@ -31,6 +31,7 @@ desc: cp14-reagent-desc-essence-fire group: CP14MagicEssenceT0 color: "#d9741c" + pricePerUnit: 0.25 # From Yellow Dayflin (0.5) or Blood Flower + Tiefling Blood (1) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceFire @@ -42,6 +43,7 @@ desc: cp14-reagent-desc-essence-water group: CP14MagicEssenceT0 color: "#1c94d9" + pricePerUnit: 0.25 # From Air Lily (0.5) or Blood Flower (0.5) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceWater @@ -53,6 +55,7 @@ desc: cp14-reagent-desc-essence-air group: CP14MagicEssenceT0 color: "#fdfe86" + pricePerUnit: 0.25 # From Air Lily (0.5) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceAir @@ -64,6 +67,7 @@ desc: cp14-reagent-desc-essence-order group: CP14MagicEssenceT0 color: "#d9d9d9" + pricePerUnit: 0.25 # From Wild Sage (0.5) or Blood Flower + Elf Blood (1) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceOrder @@ -75,17 +79,17 @@ desc: cp14-reagent-desc-essence-chaos group: CP14MagicEssenceT0 color: "#5c5c5c" + pricePerUnit: 0.25 # From Blood Flower + Goblin Blood (1) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceChaos -# Complex tier 1 - +# Complex tier 1 (T1) - type: reagent parent: CP14EssenceBase id: CP14EssenceBaseT1 abstract: true - pricePerUnit: 0.1 + pricePerUnit: 0.20 # Cheaper than T0 as it's crafted from them (1+1 → 2) - type: reagent parent: CP14EssenceBaseT1 @@ -94,6 +98,7 @@ desc: cp14-reagent-desc-essence-frost group: CP14MagicEssenceT1 color: "#4f91bd" + pricePerUnit: 0.20 # From Silver Needle (0.5) or craft (Fire + Chaos → 2) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceFrost @@ -105,6 +110,7 @@ desc: cp14-reagent-desc-essence-light group: CP14MagicEssenceT1 color: "#ba97b8" + pricePerUnit: 0.20 # From Lumi Mushroom (0.5) or craft (Fire + Air → 2) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceLight @@ -116,6 +122,7 @@ desc: cp14-reagent-desc-essence-motion group: CP14MagicEssenceT1 color: "#575100" + pricePerUnit: 0.20 # From Yellow Dayflin (0.5) or craft (Order + Air → 2) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceMotion @@ -127,6 +134,7 @@ desc: cp14-reagent-desc-essence-cycle group: CP14MagicEssenceT1 color: "#063b1f" + pricePerUnit: 0.20 # From Chromium Slime (1) or craft (Order + Chaos → 2) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceCycle @@ -138,6 +146,7 @@ desc: cp14-reagent-desc-essence-energia group: CP14MagicEssenceT1 color: "#c0ffff" + pricePerUnit: 0.20 # Craft (Order + Fire → 2) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceEnergia @@ -149,6 +158,7 @@ desc: cp14-reagent-desc-essence-void group: CP14MagicEssenceT1 color: "#12021c" + pricePerUnit: 0.20 # Craft (Chaos + Air → 2) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceVoid @@ -160,6 +170,7 @@ desc: cp14-reagent-desc-essence-poison group: CP14MagicEssenceT1 color: "#619e20" + pricePerUnit: 0.20 # From Agaric Mushroom (0.5) or Whistler Poison (1) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssencePoison @@ -171,6 +182,7 @@ desc: cp14-reagent-desc-essence-life group: CP14MagicEssenceT1 color: "#eb1a3d" + pricePerUnit: 0.20 # From Blood Flower (0.5) or Silver Needle (0.5) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceLife @@ -182,17 +194,17 @@ desc: cp14-reagent-desc-essence-crystal group: CP14MagicEssenceT1 color: "#538cb8" + pricePerUnit: 0.20 # From Ground Quartz (0.5) or craft (Order + Earth → 2) tileReactions: - !type:CreateEntityTileReaction entity: CP14EssenceCrystal -# Complex tier 2 - +# Complex tier 2 (T2) - type: reagent parent: CP14EssenceBase id: CP14EssenceBaseT2 abstract: true - pricePerUnit: 0.2 + pricePerUnit: 0.40 # More expensive as it requires T1 essences - type: reagent parent: CP14EssenceBaseT2 @@ -201,6 +213,7 @@ desc: cp14-reagent-desc-essence-magic group: CP14MagicEssenceT2 color: "#5497d6" + pricePerUnit: 0.40 # From Blue Amanita (0.5) or craft (Void + Energia → 2) tileReactions: - !type:CreateEntityTileReaction - entity: CP14EssenceMagic + entity: CP14EssenceMagic \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/precurser.yml b/Resources/Prototypes/_CP14/Reagents/precurser.yml index 135c62f1bb..ac2a44f4ed 100644 --- a/Resources/Prototypes/_CP14/Reagents/precurser.yml +++ b/Resources/Prototypes/_CP14/Reagents/precurser.yml @@ -14,7 +14,7 @@ collection: FootstepBlood params: volume: 6 - pricePerUnit: 0.1 + pricePerUnit: 0.40 - type: reagent id: CP14YellowDayflinPulp @@ -24,7 +24,7 @@ flavor: CP14Sweetly color: "#ffe269" physicalDesc: cp14-reagent-physical-desc-pureed - pricePerUnit: 0.1 + pricePerUnit: 0.35 - type: reagent id: CP14AirLily @@ -51,7 +51,7 @@ showInChat: false emote: Cough probability: 0.3 - pricePerUnit: 0.2 + pricePerUnit: 0.62 - type: reagent id: CP14WildSageSap @@ -74,7 +74,7 @@ type: Add time: 3 refresh: false - pricePerUnit: 0.15 + pricePerUnit: 0.44 # Fungus based @@ -103,7 +103,7 @@ type: Add time: 6 refresh: false - pricePerUnit: 0.2 + pricePerUnit: 0.46 - type: reagent id: CP14LumiMushroom @@ -130,7 +130,7 @@ type: Add time: 6 refresh: false - pricePerUnit: 0.2 + pricePerUnit: 0.94 - type: reagent id: CP14BlueAmanita @@ -155,7 +155,7 @@ damage: types: Poison: 0.1 - pricePerUnit: 0.2 + pricePerUnit: 0.86 - type: reagent id: CP14SilverNeedle @@ -178,7 +178,7 @@ damage: types: Poison: 0.1 - pricePerUnit: 0.2 + pricePerUnit: 1.20 # Slime based @@ -198,7 +198,7 @@ - !type:SatiateThirst - !type:ChemVomit probability: 0.05 - pricePerUnit: 0.7 + pricePerUnit: 2.20 # Inorganic @@ -215,6 +215,7 @@ effects: - !type:ChemVomit probability: 0.05 + pricePerUnit: 0.15 - type: reagent id: CP14WhistlerPoison @@ -240,5 +241,4 @@ component: ForcedSleeping refresh: false type: Add - pricePerUnit: 1.2 - + pricePerUnit: 3.52 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/target_effects.yml b/Resources/Prototypes/_CP14/Reagents/target_effects.yml index 2c8eac1358..db4fc26a33 100644 --- a/Resources/Prototypes/_CP14/Reagents/target_effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/target_effects.yml @@ -6,10 +6,9 @@ flavor: CP14Bitterly color: "#858585" physicalDesc: cp14-reagent-physical-desc-colorless + pricePerUnit: 0 # Basic empty solution, should cost nothing -# T1 / Simple or Basic solutions -# Have simple effects, shouldn't be able to replace their occupational - +# T1 / Simple effects (basic) - type: reagent id: CP14BasicEffectHealBrute name: cp14-reagent-name-basic-heal-brute @@ -28,7 +27,7 @@ - !type:EvenHealthChange damage: Brute: -6 - pricePerUnit: 2 + pricePerUnit: 3.0 # 2×Life (0.4) + Order (0.25) + Water (0.1) = 1.05 → x3 for balance - type: reagent id: CP14BasicEffectDamageBrute @@ -47,7 +46,7 @@ damage: groups: Brute: 3 - pricePerUnit: 2 + pricePerUnit: 3.0 # Similar to healing but with Chaos instead of Order - type: reagent id: CP14BasicEffectHealHeat @@ -66,7 +65,7 @@ damage: types: Heat: -10 - pricePerUnit: 2 + pricePerUnit: 3.5 # 1×Life (0.2) + 1×Fire (0.25) + 1×Order (0.25) + Water (0.1) = 0.8 → x4.375 - type: reagent id: CP14BasicEffectDamageHeat @@ -89,7 +88,7 @@ - !type:AdjustTemperature amount: 2000 - !type:Ignite - pricePerUnit: 2 + pricePerUnit: 3.5 # Similar to healing but with Chaos instead of Order - type: reagent id: CP14BasicEffectHealCold @@ -108,7 +107,7 @@ damage: types: Cold: -10 - pricePerUnit: 2 + pricePerUnit: 4.0 # 1×Life (0.2) + 1×Frost (0.2) + 1×Order (0.25) + Water (0.1) = 0.75 → x5.33 - type: reagent id: CP14BasicEffectDamageCold @@ -127,7 +126,7 @@ damage: types: Cold: 3 - pricePerUnit: 2 + pricePerUnit: 4.0 # Similar to healing but with Chaos instead of Order - type: reagent id: CP14BasicEffectHealPoison @@ -146,7 +145,7 @@ damage: types: Poison: -10 - pricePerUnit: 2 + pricePerUnit: 3.5 # 1×Life (0.2) + 1×Poison (0.2) + 1×Order (0.25) + Water (0.1) = 0.75 → x4.66 - type: reagent id: CP14BasicEffectDamagePoison @@ -165,7 +164,7 @@ damage: types: Poison: 3 - pricePerUnit: 2 + pricePerUnit: 3.5 # Similar to healing but with Chaos instead of Order - type: reagent id: CP14BasicEffectHealAirloss @@ -184,7 +183,7 @@ damage: types: Asphyxiation: -10 - pricePerUnit: 3 + pricePerUnit: 4.0 # 1×Life (0.2) + 1×Air (0.25) + 1×Order (0.25) + Water (0.1) = 0.8 → x5 - type: reagent id: CP14BasicEffectDamageAirloss @@ -203,7 +202,7 @@ damage: types: Asphyxiation: 3 - pricePerUnit: 3 + pricePerUnit: 4.0 # Similar to healing but with Chaos instead of Order - type: reagent id: CP14BasicEffectHealManaDepletion @@ -222,7 +221,7 @@ damage: types: CP14ManaDepletion: -10 - pricePerUnit: 2 + pricePerUnit: 3.0 # 1×Life (0.2) + 2×Energia (0.4) + Water (0.1) = 0.7 → x4.28 - type: reagent id: CP14BasicEffectDamageManaDepletion @@ -241,7 +240,7 @@ damage: types: CP14ManaDepletion: 3 - pricePerUnit: 2 + pricePerUnit: 3.0 # 2×Energia (0.4) + 1×Poison (0.2) + Water (0.1) = 0.7 → x4.28 - type: reagent id: CP14BasicEffectBloodRestore @@ -262,7 +261,7 @@ damage: types: Bloodloss: -10 - pricePerUnit: 2 + pricePerUnit: 4.0 # 1×Life (0.2) + 1×Water (0.25) + 1×Order (0.25) + Water (0.1) = 0.8 → x5 - type: reagent id: CP14BasicEffectBloodAbsorption @@ -283,7 +282,7 @@ damage: types: Bloodloss: 3 - pricePerUnit: 2 + pricePerUnit: 4.0 # Similar to restoration but with Chaos instead of Order - type: reagent id: CP14BasicEffectSatiateHunger @@ -303,7 +302,7 @@ - !type:OrganType type: CP14Vampire shouldHave: false - pricePerUnit: 1 + pricePerUnit: 1.5 # Simple effect, low cost - type: reagent id: CP14BasicEffectSatiateThirst @@ -319,7 +318,7 @@ effects: - !type:SatiateThirst factor: 15 - pricePerUnit: 1 + pricePerUnit: 1.0 # Most basic effect - type: reagent id: CP14BasicEffectHealMana @@ -336,7 +335,7 @@ - !type:CP14ManaChange manaDelta: 1.5 safe: true - pricePerUnit: 3 + pricePerUnit: 5.0 # 2×Energia (0.4) + 1×Motion (0.2) + Water (0.1) = 0.7 → x7.14 (high value) - type: reagent id: CP14BasicEffectDamageMana @@ -353,7 +352,7 @@ - !type:CP14ManaChange manaDelta: -1.5 safe: false - pricePerUnit: 3 + pricePerUnit: 5.0 # 2×Energia (0.4) + 1×Void (0.2) + Water (0.1) = 0.7 → x7.14 - type: reagent id: CP14BasicEffectSpeedUp @@ -374,7 +373,7 @@ - !type:GenericStatusEffect key: Stutter component: StutteringAccent - pricePerUnit: 2 + pricePerUnit: 4.0 # 2×Motion (0.4) + 1×Order (0.25) + Water (0.1) = 0.75 → x5.33 - type: reagent id: CP14BasicEffectSpeedDown @@ -395,7 +394,7 @@ - !type:GenericStatusEffect key: Stutter component: StutteringAccent - pricePerUnit: 2 + pricePerUnit: 4.0 # Similar to speed up but with Chaos instead of Order - type: reagent id: CP14BasicEffectSleep @@ -417,7 +416,7 @@ key: ForcedSleep component: ForcedSleeping type: Add - pricePerUnit: 3 + pricePerUnit: 6.0 # High cost due to powerful effect - type: reagent id: CP14BasicEffectUnsleep @@ -451,10 +450,9 @@ min: 1 reagent: CP14BasicEffectSleep amount: -10 - pricePerUnit: 1 - -# Gimmick solutions, otherwise doesn't give a mechanical benefit + pricePerUnit: 2.0 # Cheaper than sleep as it's less in demand +# Side effects (gimmick) - type: reagent id: CP14BasicEffectRainbow name: cp14-reagent-name-see-rainbow @@ -473,7 +471,7 @@ type: Add time: 25 refresh: false - pricePerUnit: 1 + pricePerUnit: 0.5 # Purely decorative effect - type: reagent id: CP14BasicEffectEmoteCough @@ -491,6 +489,7 @@ showInChat: false emote: Cough probability: 0.3 + pricePerUnit: 0.3 # Minimal cost - type: reagent id: CP14BasicEffectVomit @@ -506,6 +505,7 @@ effects: - !type:ChemVomit probability: 0.25 + pricePerUnit: 0.5 # Negative effect but not lethal - type: reagent id: CP14BasicEffectDrunk @@ -521,7 +521,7 @@ effects: - !type:Drunk boozePower: 15 - pricePerUnit: 0.5 + pricePerUnit: 0.5 # Similar to vomit - type: reagent id: CP14BasicEffectJitter @@ -536,3 +536,4 @@ metabolismRate: 0.05 effects: - !type:Jitter + pricePerUnit: 0.3 # Weakest negative effect \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index af67557339..f1a2a441f2 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -38,7 +38,7 @@ skills: - IronMelting - !type:StackResource - stack: CP14IronBar + stack: CP14IronBar # Physical Composition in item count: 1 result: CP14PlatePie @@ -53,7 +53,7 @@ - CopperMelting - IronMelting - !type:StackResource - stack: CP14CopperBar + stack: CP14CopperBar # Physical Composition in item count: 2 - !type:StackResource stack: CP14IronBar diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml new file mode 100644 index 0000000000..f40d38d187 --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml @@ -0,0 +1,168 @@ +# Reputation Level 0 - Common Meats +- type: cp14TradingPosition + id: CP14FoodMeatLamb + faction: Butchers + uiPosition: 0 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: sheepmeat + service: !type:CP14BuyItemsService + product: CP14FoodMeatLamb + count: 2 + +- type: cp14TradingPosition + id: CP14FoodMeatPig + faction: Butchers + uiPosition: 1 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: pig_meat1 + service: !type:CP14BuyItemsService + product: CP14FoodMeatPig + count: 2 + +- type: cp14TradingPosition + id: CP14FoodMeatRabbit + faction: Butchers + uiPosition: 2 + priceMarkup: 10 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: rabbit_meat1 + service: !type:CP14BuyItemsService + product: CP14FoodMeatRabbit + count: 3 + +# Reputation Level 1 - Special Meats + +- type: cp14TradingPosition + id: CP14FoodMeatLambCutlet + faction: Butchers + reputationLevel: 1 + uiPosition: 0 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: cutlet + service: !type:CP14BuyItemsService + product: CP14FoodMeatLambCutlet + count: 3 + +- type: cp14TradingPosition + id: CP14FoodMeatPigLeg + faction: Butchers + reputationLevel: 1 + uiPosition: 1 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: pig_meat5 + service: !type:CP14BuyItemsService + product: CP14FoodMeatPigLeg + count: 1 + +- type: cp14TradingPosition + id: CP14FoodMeatBoar + faction: Butchers + reputationLevel: 1 + uiPosition: 2 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: pig_meat2 + service: !type:CP14BuyItemsService + product: CP14FoodMeatBoar + count: 1 + +- type: cp14TradingPosition + id: CP14FoodMeatFrogLeg + faction: Butchers + reputationLevel: 1 + uiPosition: 4 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: frog_leg + service: !type:CP14BuyItemsService + product: CP14FoodMeatFrogLeg + count: 4 + +# Reputation Level 2 - Exotic Meats +- type: cp14TradingPosition + id: CP14FoodMeatHydra + faction: Butchers + reputationLevel: 2 + uiPosition: 4 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: dino_meat2 + service: !type:CP14BuyItemsService + product: CP14FoodMeatHydra + count: 1 + +- type: cp14TradingPosition + id: CP14FoodMeatMonster + faction: Butchers + reputationLevel: 2 + uiPosition: 5 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: mole_meat1 + service: !type:CP14BuyItemsService + product: CP14FoodMeatMonster + count: 1 + + +# Reputation Level 3 - Rare Meats + +- type: cp14TradingPosition + id: CP14FoodMeatDino + faction: Butchers + reputationLevel: 3 + uiPosition: 4 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: dino_meat1 + service: !type:CP14BuyItemsService + product: CP14FoodMeatDino + count: 1 + +- type: cp14TradingPosition + id: CP14FoodMeatMonsterLeg + faction: Butchers + reputationLevel: 3 + uiPosition: 5 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: mole_meat5 + service: !type:CP14BuyItemsService + product: CP14FoodMeatMonsterLeg + count: 1 + +- type: cp14TradingPosition + id: CP14FoodMeatFlemHead + faction: Butchers + reputationLevel: 3 + uiPosition: 1 + priceMarkup: 15 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: flem_head + service: !type:CP14BuyItemsService + product: CP14FoodMeatFlemHead + count: 1 + +- type: cp14TradingPosition + id: CP14FoodMeatFlemTorso + faction: Butchers + reputationLevel: 3 + uiPosition: 2 + priceMarkup: 10 + icon: + sprite: _CP14/Objects/Consumable/Food/meat.rsi + state: flem_torso + service: !type:CP14BuyItemsService + product: CP14FoodMeatFlemTorso + count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/cozy_house.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/cozy_house.yml index a1bf3d4f8a..2e92c11da2 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/cozy_house.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/cozy_house.yml @@ -42,7 +42,6 @@ product: CP14LockCopper - - type: cp14TradingPosition id: CP14WallpaperBlack faction: HomeDecor @@ -120,28 +119,6 @@ service: !type:CP14BuyItemsService product: CP14WallpaperYellow -- type: cp14TradingPosition - id: CP14PottedPlant1 - faction: HomeDecor - reputationLevel: 0 - uiPosition: 14 - icon: - sprite: _CP14/Structures/Furniture/flowerpots.rsi - state: plant1 - service: !type:CP14BuyItemsService - product: CP14PottedPlant1 - -- type: cp14TradingPosition - id: CP14PottedPlant3 - faction: HomeDecor - reputationLevel: 0 - uiPosition: 15 - icon: - sprite: _CP14/Structures/Furniture/flowerpots.rsi - state: plant3 - service: !type:CP14BuyItemsService - product: CP14PottedPlant3 - # Rep 1 - type: cp14TradingPosition @@ -188,8 +165,6 @@ service: !type:CP14BuyItemsService product: CP14LockIron - - - type: cp14TradingPosition id: CP14WallpaperBank faction: HomeDecor @@ -214,30 +189,6 @@ service: !type:CP14BuyItemsService product: CP14WallpaperBank2 - - -- type: cp14TradingPosition - id: CP14PottedPlant2 - faction: HomeDecor - reputationLevel: 1 - uiPosition: 14 - icon: - sprite: _CP14/Structures/Furniture/flowerpots.rsi - state: plant2 - service: !type:CP14BuyItemsService - product: CP14PottedPlant2 - -- type: cp14TradingPosition - id: CP14PottedPlant4 - faction: HomeDecor - reputationLevel: 1 - uiPosition: 15 - icon: - sprite: _CP14/Structures/Furniture/flowerpots.rsi - state: plant4 - service: !type:CP14BuyItemsService - product: CP14PottedPlant4 - # Rep 2 - type: cp14TradingPosition diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/dairy_products.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/dairy_products.yml new file mode 100644 index 0000000000..f9e7a03048 --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/dairy_products.yml @@ -0,0 +1,58 @@ +# Basic Dairy Products +- type: cp14TradingPosition + id: CP14FoodEgg + faction: Dairy + uiPosition: 0 + icon: + sprite: _CP14/Objects/Consumable/Food/egg.rsi + state: brown + service: !type:CP14BuyItemsService + product: CP14FoodEgg + count: 6 + +- type: cp14TradingPosition + id: CP14FoodCheeseWheel + faction: Dairy + uiPosition: 1 + icon: + sprite: _CP14/Objects/Consumable/Food/cheese.rsi + state: cheese_wheel + service: !type:CP14BuyItemsService + product: CP14FoodCheeseWheel + count: 1 + +- type: cp14TradingPosition + id: CP14FoodCheesePart + faction: Dairy + uiPosition: 2 + icon: + sprite: _CP14/Objects/Consumable/Food/cheese.rsi + state: cheese_part + service: !type:CP14BuyItemsService + product: CP14FoodCheesePart + count: 3 + +# Premium Dairy (Requires Reputation) +- type: cp14TradingPosition + id: CP14FoodBlueCheeseWheel + faction: Dairy + reputationLevel: 1 + uiPosition: 1 + icon: + sprite: _CP14/Objects/Consumable/Food/cheese.rsi + state: blue_cheese_wheel + service: !type:CP14BuyItemsService + product: CP14FoodBlueCheeseWheel + count: 1 + +- type: cp14TradingPosition + id: CP14FoodAgedCheeseWheel + faction: Dairy + reputationLevel: 2 + uiPosition: 1 + icon: + sprite: _CP14/Objects/Consumable/Food/cheese.rsi + state: aged_cheese_wheel + service: !type:CP14BuyItemsService + product: CP14FoodAgedCheeseWheel + count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml index aaea718713..4f5036c46b 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml @@ -2,30 +2,30 @@ # Rep 0 - type: cp14TradingPosition - id: CP14CopperBar5 + id: CP14OreCopper5 faction: DwarfMining - priceMarkup: 5 - uiPosition: 4 + uiPosition: 0 icon: - sprite: _CP14/Objects/Materials/copper_bar.rsi - state: bar_2 + sprite: _CP14/Objects/Materials/copper_ore.rsi + state: ore2 service: !type:CP14BuyItemsService - product: CP14CopperBar5 + product: CP14OreCopper5 - type: cp14TradingPosition - id: CP14GlassSheet5 + id: CP14CrystalShardQuartz faction: DwarfMining - uiPosition: 5 + uiPosition: 1 + priceMarkup: 3 icon: - sprite: _CP14/Objects/Materials/glass.rsi - state: glass_2 + sprite: _CP14/Structures/Flora/Crystal/crystal_shard.rsi + state: shard3 service: !type:CP14BuyItemsService - product: CP14GlassSheet5 + product: CP14CrystalShardQuartz - type: cp14TradingPosition id: CP14ModularIronPickaxe faction: DwarfMining - uiPosition: 8 + uiPosition: 3 icon: sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi state: tool @@ -35,7 +35,7 @@ - type: cp14TradingPosition id: CP14ModularIronShovel faction: DwarfMining - uiPosition: 9 + uiPosition: 4 icon: sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi state: tool @@ -45,7 +45,7 @@ - type: cp14TradingPosition id: CP14BaseSharpeningStone faction: DwarfMining - uiPosition: 10 + uiPosition: 5 icon: sprite: _CP14/Objects/sharpening_stone.rsi state: base @@ -55,37 +55,58 @@ # Rep 1 - type: cp14TradingPosition - id: CP14IronBar5 + id: CP14OreIron5 faction: DwarfMining reputationLevel: 1 - priceMarkup: 5 - uiPosition: 4 + uiPosition: 0 icon: - sprite: _CP14/Objects/Materials/iron_bar.rsi - state: bar_2 + sprite: _CP14/Objects/Materials/iron_ore.rsi + state: ore2 service: !type:CP14BuyItemsService - product: CP14IronBar5 + product: CP14OreIron5 + +- type: cp14TradingPosition + id: CP14Lighter + faction: DwarfMining + reputationLevel: 1 + uiPosition: 5 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Tools/flint.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14Lighter # Rep 2 - type: cp14TradingPosition - id: CP14GoldBar5 + id: CP14OreGold5 faction: DwarfMining reputationLevel: 2 - priceMarkup: 5 - uiPosition: 4 + uiPosition: 0 icon: - sprite: _CP14/Objects/Materials/gold_bar.rsi - state: bar_2 + sprite: _CP14/Objects/Materials/gold_ore.rsi + state: ore2 service: !type:CP14BuyItemsService - product: CP14GoldBar5 + 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: CP14BaseSharpeningStoneStructure faction: DwarfMining reputationLevel: 2 priceMarkup: 5 - uiPosition: 10 + uiPosition: 5 icon: sprite: _CP14/Structures/Specific/Blacksmith/sharpening_stone.rsi state: base diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/horticulture.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/horticulture.yml new file mode 100644 index 0000000000..b5095f896a --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/horticulture.yml @@ -0,0 +1,196 @@ +# Reputation Level 0 - Basic Herbs & Tools +- type: cp14TradingPosition + id: CP14VialBloodFlowerSap + faction: Horticulture + uiPosition: 0 + icon: + sprite: _CP14/Objects/Flora/Wild/red_rose.rsi + state: base2 + service: !type:CP14BuyItemsService + product: CP14VialBloodFlowerSap + count: 1 + +- type: cp14TradingPosition + id: CP14VialWildSageSap + faction: Horticulture + uiPosition: 1 + icon: + sprite: _CP14/Objects/Flora/Wild/wild_sage.rsi + state: base4 + service: !type:CP14BuyItemsService + product: CP14VialWildSageSap + count: 1 + +- type: cp14TradingPosition + id: CP14VialYellowDayflinPulp + faction: Horticulture + uiPosition: 2 + icon: + sprite: _CP14/Objects/Flora/Wild/yellow_dayflin.rsi + state: base1 + service: !type:CP14BuyItemsService + product: CP14VialYellowDayflinPulp + count: 1 + +- type: cp14TradingPosition + id: CP14ModularIronHoe + faction: Horticulture + uiPosition: 4 + icon: + sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ModularIronHoe + count: 1 + +- type: cp14TradingPosition + id: CP14CrystalLampBlueEmpty + faction: Horticulture + uiPosition: 6 + icon: + sprite: _CP14/Objects/Tools/crystal_lamp.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14CrystalLampBlueEmpty + count: 1 + +- type: cp14TradingPosition + id: CP14WoodenPlanks10 + faction: Horticulture + uiPosition: 7 + icon: + sprite: _CP14/Objects/Materials/wood.rsi + state: planks_2 + service: !type:CP14BuyItemsService + product: CP14WoodenPlanks10 + count: 1 + +- type: cp14TradingPosition + id: CP14PottedPlant1 + faction: Horticulture + reputationLevel: 0 + uiPosition: 9 + icon: + sprite: _CP14/Structures/Furniture/flowerpots.rsi + state: plant1 + service: !type:CP14BuyItemsService + product: CP14PottedPlant1 + +- type: cp14TradingPosition + id: CP14PottedPlant3 + faction: Horticulture + reputationLevel: 0 + uiPosition: 10 + icon: + sprite: _CP14/Structures/Furniture/flowerpots.rsi + state: plant3 + service: !type:CP14BuyItemsService + product: CP14PottedPlant3 + +# Reputation Level 1 - Advanced Herbs & Tools +- type: cp14TradingPosition + id: CP14VialBlueAmanita + faction: Horticulture + reputationLevel: 1 + uiPosition: 0 + icon: + sprite: _CP14/Objects/Flora/Wild/blue_amanita.rsi + state: base1 + service: !type:CP14BuyItemsService + product: CP14VialBlueAmanita + count: 1 + +- type: cp14TradingPosition + id: CP14VialLumiMushroom + faction: Horticulture + reputationLevel: 1 + uiPosition: 1 + icon: + sprite: _CP14/Objects/Flora/Wild/lumishroom.rsi + state: base3 + service: !type:CP14BuyItemsService + product: CP14VialLumiMushroom + count: 1 + +- type: cp14TradingPosition + id: CP14ModularIronSickle + faction: Horticulture + reputationLevel: 1 + uiPosition: 4 + icon: + sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ModularIronSickle + count: 1 + +- type: cp14TradingPosition + id: CP14CrystalLampOrangeEmpty + faction: Horticulture + reputationLevel: 1 + uiPosition: 6 + icon: + sprite: _CP14/Objects/Tools/crystal_lamp.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14CrystalLampOrangeEmpty + count: 1 + +- type: cp14TradingPosition + id: CP14BirchWoodenPlanks10 + faction: Horticulture + reputationLevel: 1 + uiPosition: 7 + icon: + sprite: _CP14/Objects/Materials/wood_birch.rsi + state: planks_2 + service: !type:CP14BuyItemsService + product: CP14BirchWoodenPlanks10 + count: 1 + +- type: cp14TradingPosition + id: CP14PottedPlant2 + faction: Horticulture + reputationLevel: 1 + uiPosition: 9 + icon: + sprite: _CP14/Structures/Furniture/flowerpots.rsi + state: plant2 + service: !type:CP14BuyItemsService + product: CP14PottedPlant2 + +- type: cp14TradingPosition + id: CP14PottedPlant4 + faction: Horticulture + reputationLevel: 1 + uiPosition: 10 + icon: + sprite: _CP14/Structures/Furniture/flowerpots.rsi + state: plant4 + service: !type:CP14BuyItemsService + product: CP14PottedPlant4 + +# Reputation Level 2 - Rare Herbs +- type: cp14TradingPosition + id: CP14VialSilverNeedle + faction: Horticulture + reputationLevel: 2 + uiPosition: 0 + icon: + sprite: _CP14/Objects/Flora/Wild/silver_needle.rsi + state: base1 + service: !type:CP14BuyItemsService + product: CP14VialSilverNeedle + count: 1 + +- type: cp14TradingPosition + id: CP14VialChromiumSlime + faction: Horticulture + reputationLevel: 2 + uiPosition: 1 + icon: + sprite: _CP14/Objects/Flora/Wild/chromium_slime.rsi + state: base3 + service: !type:CP14BuyItemsService + product: CP14VialChromiumSlime + count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/tailors.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/tailors.yml new file mode 100644 index 0000000000..bf787e23ca --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/tailors.yml @@ -0,0 +1,165 @@ +# Reputation Level 0 - Basic & Tools +- type: cp14TradingPosition + id: CP14Cloth10 + faction: Tailors + uiPosition: 0 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Materials/cloth.rsi + state: cloth_3 + service: !type:CP14BuyItemsService + product: CP14Cloth10 + count: 1 + +- type: cp14TradingPosition + id: CP14Scissors + faction: Tailors + uiPosition: 2 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Tools/scissors.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14Scissors + count: 1 + +- type: cp14TradingPosition + id: CP14DyeRed + faction: Tailors + uiPosition: 4 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Materials/dye.rsi + state: base + service: !type:CP14BuyItemsService + product: CP14DyeRed + count: 5 + +- type: cp14TradingPosition + id: CP14DyeBlue + faction: Tailors + uiPosition: 5 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Materials/dye.rsi + state: base + service: !type:CP14BuyItemsService + product: CP14DyeBlue + count: 5 + +# Clothing rep 0 +- type: cp14TradingPosition + id: CP14ClothingHeadBeretMercenary + faction: Tailors + uiPosition: 7 + priceMarkup: 10 + icon: + sprite: _CP14/Clothing/Head/Roles/General/beret_mercenary.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ClothingHeadBeretMercenary + count: 1 + +- type: cp14TradingPosition + id: CP14ClothingShirtMercenary + faction: Tailors + uiPosition: 8 + priceMarkup: 10 + icon: + sprite: _CP14/Clothing/Shirt/Roles/General/Shirts/mercenary.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ClothingShirtMercenary + count: 1 + +- type: cp14TradingPosition + id: CP14ClothingPantsMercenaryTrousers + faction: Tailors + uiPosition: 9 + priceMarkup: 10 + icon: + sprite: _CP14/Clothing/Pants/Trousers/trousers_mercenary.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ClothingPantsMercenaryTrousers + count: 1 + +# Reputation Level 1 - Advanced +- type: cp14TradingPosition + id: CP14Rope + faction: Tailors + reputationLevel: 1 + uiPosition: 0 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Tools/rope.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14Rope + count: 1 + +- type: cp14TradingPosition + id: CP14DyeYellow + faction: Tailors + reputationLevel: 1 + uiPosition: 4 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Materials/dye.rsi + state: base + service: !type:CP14BuyItemsService + product: CP14DyeYellow + count: 5 + +- type: cp14TradingPosition + id: CP14DyeGreen + faction: Tailors + reputationLevel: 1 + uiPosition: 5 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Materials/dye.rsi + state: base + service: !type:CP14BuyItemsService + product: CP14DyeGreen + count: 5 + +- type: cp14TradingPosition + id: CP14ClothingYellowWizardDress + faction: Tailors + reputationLevel: 1 + uiPosition: 8 + priceMarkup: 15 + icon: + sprite: _CP14/Clothing/Shirt/Roles/General/Dress/yellow_wizard_dress.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14ClothingYellowWizardDress + count: 1 + +# Reputation Level 2 +- type: cp14TradingPosition + id: CP14DyePurple + faction: Tailors + reputationLevel: 2 + uiPosition: 4 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Materials/dye.rsi + state: base + service: !type:CP14BuyItemsService + product: CP14DyePurple + count: 5 + +- type: cp14TradingPosition + id: CP14DyeBlack + faction: Tailors + reputationLevel: 2 + uiPosition: 5 + priceMarkup: 5 + icon: + sprite: _CP14/Objects/Materials/dye.rsi + state: base + service: !type:CP14BuyItemsService + product: CP14DyeBlack + count: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/SellRequests/dwarf_mining.yml b/Resources/Prototypes/_CP14/Trading/SellRequests/dwarf_mining.yml index 1fc7ea97e5..426eee3981 100644 --- a/Resources/Prototypes/_CP14/Trading/SellRequests/dwarf_mining.yml +++ b/Resources/Prototypes/_CP14/Trading/SellRequests/dwarf_mining.yml @@ -4,7 +4,7 @@ - DwarfMining requirements: - !type:StackResource - stack: CP14OreCopper + stack: CP14CopperBar count: 10 - type: cp14TradingRequest @@ -13,7 +13,7 @@ - DwarfMining requirements: - !type:StackResource - stack: CP14OreIron + stack: CP14IronBar count: 10 - type: cp14TradingRequest @@ -23,7 +23,7 @@ requirements: - !type:StackResource stack: CP14Dirt - count: 50 + count: 30 - type: cp14TradingRequest id: DwarfMiningStone @@ -32,7 +32,7 @@ requirements: - !type:StackResource stack: CP14Stone - count: 50 + count: 30 - type: cp14TradingRequest id: DwarfMiningTorch @@ -43,6 +43,15 @@ protoId: CP14Torch count: 10 +- type: cp14TradingRequest + id: CP14GlassSheet + possibleFactions: + - DwarfMining + requirements: + - !type:StackResource + stack: CP14GlassSheet + count: 20 + # 30 minutes - type: cp14TradingRequest @@ -52,7 +61,7 @@ fromMinutes: 30 requirements: - !type:StackResource - stack: CP14OreGold + stack: CP14GoldBar count: 10 # 60 minutes @@ -64,5 +73,5 @@ fromMinutes: 60 requirements: - !type:StackResource - stack: CP14OreMithril + stack: CP14MithrilBar count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/SellRequests/food.yml b/Resources/Prototypes/_CP14/Trading/SellRequests/food.yml new file mode 100644 index 0000000000..8b8e828887 --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/SellRequests/food.yml @@ -0,0 +1,58 @@ +- type: cp14TradingRequest + id: DairyApplePie + possibleFactions: + - Dairy + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPieApple + count: 3 + +- type: cp14TradingRequest + id: DairyPumpkinPie + possibleFactions: + - Dairy + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPiePumpkin + count: 3 + +- type: cp14TradingRequest + id: ButchersMeatPie + possibleFactions: + - Butchers + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPieMeat + count: 1 + +- type: cp14TradingRequest + id: ButchersFishPie + possibleFactions: + - Butchers + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPieFish + count: 1 + +# 30 minutes + +- type: cp14TradingRequest + id: HorticulturePumpkinPie + possibleFactions: + - Horticulture + fromMinutes: 30 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPiePumpkin + count: 2 + +# 60 minutes +- type: cp14TradingRequest + id: HorticultureApplePie + possibleFactions: + - Horticulture + fromMinutes: 60 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodPieApple + count: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/SellRequests/gardens.yml b/Resources/Prototypes/_CP14/Trading/SellRequests/gardens.yml new file mode 100644 index 0000000000..0456d825dd --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/SellRequests/gardens.yml @@ -0,0 +1,30 @@ +- type: cp14TradingRequest + id: VictoriaGardensGreenSalad + possibleFactions: + - VictoriaGardens + - Dairy + requirements: + - !type:ProtoIdResource + protoId: CP14FoodSaladGreen + count: 5 + +- type: cp14TradingRequest + id: VictoriaGardensBreadBuns + possibleFactions: + - VictoriaGardens + - Dairy + requirements: + - !type:ProtoIdResource + protoId: CP14FoodBreadBun + count: 6 + +- type: cp14TradingRequest + id: ButchersBread + possibleFactions: + - VictoriaGardens + - Dairy + fromMinutes: 30 + requirements: + - !type:ProtoIdResource + protoId: CP14FoodBread + count: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/SellRequests/brad_potions.yml b/Resources/Prototypes/_CP14/Trading/SellRequests/horticulture.yml similarity index 89% rename from Resources/Prototypes/_CP14/Trading/SellRequests/brad_potions.yml rename to Resources/Prototypes/_CP14/Trading/SellRequests/horticulture.yml index 9df0beb534..94c0236396 100644 --- a/Resources/Prototypes/_CP14/Trading/SellRequests/brad_potions.yml +++ b/Resources/Prototypes/_CP14/Trading/SellRequests/horticulture.yml @@ -2,6 +2,7 @@ id: BradPotionsWildSage possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14WildSage @@ -11,6 +12,7 @@ id: BradPotionsAirLily possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14AirLily @@ -20,6 +22,7 @@ id: BradPotionsChromiumSlime possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14ChromiumSlime @@ -29,6 +32,7 @@ id: BradPotionsAgaricMushroom possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14AgaricMushroom @@ -38,6 +42,7 @@ id: BradPotionsDayflin possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14Dayflin @@ -47,6 +52,7 @@ id: BradPotionsBloodFlower possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14BloodFlower @@ -56,6 +62,7 @@ id: BradPotionsSilverNeedle possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14SilverNeedle @@ -65,6 +72,7 @@ id: BradPotionsLumiMushroom possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14LumiMushroom @@ -74,16 +82,8 @@ id: BradPotionsBlueAmanita possibleFactions: - BradPotions + - Horticulture requirements: - !type:ProtoIdResource protoId: CP14BlueAmanita count: 5 - -- type: cp14TradingRequest - id: BradPotionsQuartz - possibleFactions: - - BradPotions - requirements: - - !type:ProtoIdResource - protoId: CP14CrystalShardQuartz - count: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/SellRequests/monster_loot.yml b/Resources/Prototypes/_CP14/Trading/SellRequests/monster_loot.yml new file mode 100644 index 0000000000..4bebee59c7 --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/SellRequests/monster_loot.yml @@ -0,0 +1,9 @@ +# - type: cp14TradingRequest +# id: BradPotionsMonsterGlands +# possibleFactions: +# - BradPotions +# - Butchers +# requirements: +# - !type:ProtoIdResource +# protoId: CP14PartsMonsterGlands +# count: 4 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/SellRequests/thaumaturgy.yml b/Resources/Prototypes/_CP14/Trading/SellRequests/thaumaturgy.yml index 944ecd9ab9..8aceccb8c3 100644 --- a/Resources/Prototypes/_CP14/Trading/SellRequests/thaumaturgy.yml +++ b/Resources/Prototypes/_CP14/Trading/SellRequests/thaumaturgy.yml @@ -5,4 +5,64 @@ requirements: - !type:ProtoIdResource protoId: CP14DimensitCrystal - count: 5 \ No newline at end of file + count: 5 + +# 30 minutes +- type: cp14TradingRequest + id: ThaumaturgyRuby + possibleFactions: + - Thaumaturgy + - Tailors + - DwarfMining + fromMinutes: 30 + requirements: + - !type:ProtoIdResource + protoId: CP14JewelryRuby + count: 1 + +- type: cp14TradingRequest + id: ThaumaturgyEmerald + possibleFactions: + - Thaumaturgy + - Tailors + - DwarfMining + fromMinutes: 30 + requirements: + - !type:ProtoIdResource + protoId: CP14JewelryEmerald + count: 1 + +- type: cp14TradingRequest + id: ThaumaturgySapphire + possibleFactions: + - Thaumaturgy + - Tailors + - DwarfMining + fromMinutes: 30 + requirements: + - !type:ProtoIdResource + protoId: CP14JewelrySapphire + count: 1 + +- type: cp14TradingRequest + id: ThaumaturgyTopaz + possibleFactions: + - Thaumaturgy + - Tailors + - DwarfMining + fromMinutes: 30 + requirements: + - !type:ProtoIdResource + protoId: CP14JewelryTopaz + count: 1 + +- type: cp14TradingRequest + id: ThaumaturgyGoldAmulet + possibleFactions: + - Thaumaturgy + - Tailors + fromMinutes: 30 + requirements: + - !type:ProtoIdResource + protoId: CP14ClothingCloakAmuletGold + count: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/contracts.yml b/Resources/Prototypes/_CP14/Trading/contracts.yml similarity index 56% rename from Resources/Prototypes/_CP14/Trading/BuyPositions/contracts.yml rename to Resources/Prototypes/_CP14/Trading/contracts.yml index af0f86b118..3f3266db6f 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/contracts.yml +++ b/Resources/Prototypes/_CP14/Trading/contracts.yml @@ -51,4 +51,49 @@ state: house service: !type:CP14BuyItemsService product: CP14TradeContractHomeDecor + count: 1 + +- type: cp14TradingPosition + id: CP14TradeContractHorticulture + faction: ContractGuild + uiPosition: 5 + icon: + sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi + state: horticulture + service: !type:CP14BuyItemsService + product: CP14TradeContractHorticulture + count: 1 + +- type: cp14TradingPosition + id: CP14TradeContractButchers + faction: ContractGuild + uiPosition: 6 + icon: + sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi + state: butchers + service: !type:CP14BuyItemsService + product: CP14TradeContractButchers + count: 1 + +- type: cp14TradingPosition + id: CP14TradeContractDairy + faction: ContractGuild + uiPosition: 7 + icon: + sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi + state: dairy + service: !type:CP14BuyItemsService + product: CP14TradeContractDairy + count: 1 + + +- type: cp14TradingPosition + id: CP14TradeContractTailors + faction: ContractGuild + uiPosition: 8 + icon: + sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi + state: tailors + service: !type:CP14BuyItemsService + product: CP14TradeContractTailors count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/factions.yml b/Resources/Prototypes/_CP14/Trading/factions.yml similarity index 61% rename from Resources/Prototypes/_CP14/Trading/BuyPositions/factions.yml rename to Resources/Prototypes/_CP14/Trading/factions.yml index 17d5141cf3..fb95c4c2b7 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/factions.yml +++ b/Resources/Prototypes/_CP14/Trading/factions.yml @@ -27,3 +27,23 @@ id: HomeDecor color: "#95f542" name: cp14-trade-faction-home-decor + +- type: cp14TradingFaction + id: Horticulture + color: "#3cb371" + name: cp14-trade-faction-horticulture + +- type: cp14TradingFaction + id: Butchers + color: "#c93756" + name: cp14-trade-faction-butchers + +- type: cp14TradingFaction + id: Dairy + color: "#f5f5dc" + name: cp14-trade-faction-dairy + +- type: cp14TradingFaction + id: Tailors + color: "#d67fd6" + name: cp14-trade-faction-tailors \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part.png new file mode 100644 index 0000000000..29a85eb741 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part2.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part2.png new file mode 100644 index 0000000000..86cc71cad4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part2.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part3.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part3.png new file mode 100644 index 0000000000..66c32122d7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part3.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice.png new file mode 100644 index 0000000000..b970fdf913 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice2.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice2.png new file mode 100644 index 0000000000..5f760fc4ab Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice2.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice3.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice3.png new file mode 100644 index 0000000000..e76676b9a9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice3.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_wheel.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_wheel.png new file mode 100644 index 0000000000..bdd6622067 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_wheel.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part.png new file mode 100644 index 0000000000..b1e56608c6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part2.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part2.png new file mode 100644 index 0000000000..6976b23fe7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part2.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part3.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part3.png new file mode 100644 index 0000000000..9d505a6b72 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part3.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice.png new file mode 100644 index 0000000000..2b6070e4bc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice2.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice2.png new file mode 100644 index 0000000000..f0b83e8cd3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice2.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice3.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice3.png new file mode 100644 index 0000000000..87e906de23 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice3.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_wheel.png b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_wheel.png new file mode 100644 index 0000000000..57e585d9ce Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_wheel.png differ diff --git a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/meta.json b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/meta.json index 5bad2ecbe0..b468afb4b8 100644 --- a/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/meta.json @@ -1,32 +1,95 @@ { "version": 1, "license": "All right reserved", - "copyright": "Created by Artista.rar", + "copyright": "Created by Artista.rar. Aged and blue wheel - by PhantomRU", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "cheese_part" + "name": "cheese_part", + "description": "Standard cheese wedge" }, { - "name": "cheese_part2" + "name": "cheese_part2", + "description": "Alternative standard cheese wedge" }, { - "name": "cheese_part3" + "name": "cheese_part3", + "description": "Third variant of standard cheese wedge" }, { - "name": "cheese_slice" + "name": "cheese_slice", + "description": "Standard cheese slice" }, { - "name": "cheese_slice2" + "name": "cheese_slice2", + "description": "Alternative standard cheese slice" }, { - "name": "cheese_slice3" + "name": "cheese_slice3", + "description": "Third variant of standard cheese slice" }, { - "name": "cheese_wheel" + "name": "cheese_wheel", + "description": "Standard cheese wheel" + }, + { + "name": "blue_cheese_wheel", + "description": "Blue cheese wheel with visible mold veins" + }, + { + "name": "aged_cheese_wheel", + "description": "Aged hard cheese wheel with rustic crust" + }, + { + "name": "blue_cheese_part", + "description": "Blue cheese wedge with characteristic veins" + }, + { + "name": "blue_cheese_part2", + "description": "Alternative blue cheese wedge" + }, + { + "name": "blue_cheese_part3", + "description": "Third variant of blue cheese wedge" + }, + { + "name": "blue_cheese_slice", + "description": "Blue cheese slice with mold patterns" + }, + { + "name": "blue_cheese_slice2", + "description": "Alternative blue cheese slice" + }, + { + "name": "blue_cheese_slice3", + "description": "Third variant of blue cheese slice" + }, + { + "name": "aged_cheese_part", + "description": "Aged cheese wedge with dense texture" + }, + { + "name": "aged_cheese_part2", + "description": "Alternative aged cheese wedge" + }, + { + "name": "aged_cheese_part3", + "description": "Third variant of aged cheese wedge" + }, + { + "name": "aged_cheese_slice", + "description": "Aged cheese slice with crystalline structure" + }, + { + "name": "aged_cheese_slice2", + "description": "Alternative aged cheese slice" + }, + { + "name": "aged_cheese_slice3", + "description": "Third variant of aged cheese slice" } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/butchers.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/butchers.png new file mode 100644 index 0000000000..adc43c0080 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/butchers.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/dairy.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/dairy.png new file mode 100644 index 0000000000..9f8976a471 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/dairy.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/horticulture.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/horticulture.png new file mode 100644 index 0000000000..ea45dfbb7d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/horticulture.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json index 52f084133e..a3e226edb4 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json @@ -1,29 +1,51 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", - "states": [ - { - "name": "blank" + "version": 1, + "size": { + "x": 32, + "y": 32 }, - { - "name": "victoria_garden" - }, - { - "name": "brad_potions" - }, - { - "name": "dwarf_mining" - }, - { - "name": "magic" - }, - { - "name": "house" - } - ] -} \ No newline at end of file + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) and PhantomRU (Diary, Butchers, horticulture)", + "states": [ + { + "name": "blank", + "description": "Empty contract template" + }, + { + "name": "victoria_garden", + "description": "Victoria Gardens trade contract" + }, + { + "name": "brad_potions", + "description": "Brad's Potions trade contract" + }, + { + "name": "dwarf_mining", + "description": "Dwarf Mining trade contract" + }, + { + "name": "magic", + "description": "Thaumaturgy trade contract" + }, + { + "name": "house", + "description": "Home Decor trade contract" + }, + { + "name": "horticulture", + "description": "Horticulture trade contract" + }, + { + "name": "butchers", + "description": "Butchers trade contract" + }, + { + "name": "dairy", + "description": "Dairy trade contract" + }, + { + "name": "tailors", + "description": "Tailors trade contract" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/tailors.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/tailors.png new file mode 100644 index 0000000000..44d1a40553 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/tailors.png differ