From 9c393ff8b5e595ee676ddc32f08f5e91560e00ac Mon Sep 17 00:00:00 2001 From: Alexsey Bezyuk <41479614+PhantornRU@users.noreply.github.com> Date: Fri, 27 Jun 2025 01:18:19 +1000 Subject: [PATCH] [TRADE] Reagent and Food price rework and 4 new contracts: Butchers, Diary, Gardeners and Tailors (#1453) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * contracts * meat prices * cheese and egg * blue and aged cheese * aged and blue parts and slices * cheese json * contracts * cheese and egg * blue and aged cheese * aged and blue parts and slices * cheese json * revert meat prices * Cheese prices * egg price remove * revert meat prices * factions * contracts * meta.json * remove monster part price * sickle, hoe * up price per unit * Trade ref, cheese fix, plate PhysCompos * Update coins.yml * prices reagents rework, raw nutrient decrease, food container rework * prices * materials, remove bars * tailors faction * factions * sprite fixes * enyity fix * Physical compositions * tailord dye and loot in crate * comment * Ore buy to bar * move to buy positions * factions and contracts in main page * move flint position * Квартц вместо стекла * quartz price up * glass sheet sell position * price precurser. Again * essences prices * english comment * ooops missed * price up * sell requests and small flowers variations * yaml fix * test fix? * flowers => to vials * 2 => 1 count * flowers icons * remove small variations * clear --------- Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com> --- .../Locale/en-US/_CP14/trading/factions.ftl | 6 +- .../Locale/ru-RU/_CP14/trading/factions.ftl | 6 +- .../Reagents/Consumable/Food/food.yml | 7 +- .../Reagents/Consumable/Food/ingredients.yml | 2 + Resources/Prototypes/Reagents/biological.yml | 1 + Resources/Prototypes/Reagents/toxins.yml | 1 + .../Prototypes/_CP14/Catalog/Fills/crates.yml | 18 ++ .../Objects/Consumable/Food/cheese.yml | 200 +++++++++++++++++- .../Objects/Consumable/Food/dough.yml | 9 +- .../Entities/Objects/Consumable/Food/egg.yml | 3 +- .../Entities/Objects/Consumable/Food/meat.yml | 141 ++++++------ .../Entities/Objects/Consumable/Food/pie.yml | 46 +++- .../Objects/Consumable/Food/plate.yml | 6 + .../Objects/Consumable/Food/produce.yml | 50 ++--- .../Objects/Consumable/Food/salad.yml | 2 +- .../Consumable/Smokeables/Pipes/pipe.yml | 3 + .../_CP14/Entities/Objects/Economy/coins.yml | 22 +- .../Objects/Economy/trade_contracts.yml | 43 ++++ .../_CP14/Entities/Objects/Flora/wild.yml | 12 +- .../_CP14/Entities/Objects/Materials/dye.yml | 2 + .../_CP14/Entities/Objects/Materials/misc.yml | 2 +- .../_CP14/Entities/Objects/Misc/candles.yml | 2 + .../_CP14/Entities/Objects/Misc/crayons.yml | 2 + .../Entities/Objects/Misc/monster_parts.yml | 2 + .../Alchemy/vials_filled_reagents.yml | 116 ++++++++++ .../Entities/Objects/Tools/flashlight.yml | 4 + .../Specific/Economy/cash_converter.yml | 1 + .../Specific/Economy/trade_platform.yml | 2 + .../Reagents/Consumable/Drink/alcohol.yml | 22 +- Resources/Prototypes/_CP14/Reagents/blood.yml | 4 + .../_CP14/Reagents/magic_essence.yml | 33 ++- .../Prototypes/_CP14/Reagents/precurser.yml | 22 +- .../_CP14/Reagents/target_effects.yml | 59 +++--- .../_CP14/Recipes/Workbench/Anvil/misc.yml | 4 +- .../_CP14/Trading/BuyPositions/butchers.yml | 168 +++++++++++++++ .../_CP14/Trading/BuyPositions/cozy_house.yml | 49 ----- .../Trading/BuyPositions/dairy_products.yml | 58 +++++ .../Trading/BuyPositions/dwarf_mining.yml | 75 ++++--- .../Trading/BuyPositions/horticulture.yml | 196 +++++++++++++++++ .../_CP14/Trading/BuyPositions/tailors.yml | 165 +++++++++++++++ .../Trading/SellRequests/dwarf_mining.yml | 21 +- .../_CP14/Trading/SellRequests/food.yml | 58 +++++ .../_CP14/Trading/SellRequests/gardens.yml | 30 +++ .../{brad_potions.yml => horticulture.yml} | 18 +- .../Trading/SellRequests/monster_loot.yml | 9 + .../Trading/SellRequests/thaumaturgy.yml | 62 +++++- .../Trading/{BuyPositions => }/contracts.yml | 45 ++++ .../Trading/{BuyPositions => }/factions.yml | 20 ++ .../Food/cheese.rsi/aged_cheese_part.png | Bin 0 -> 1624 bytes .../Food/cheese.rsi/aged_cheese_part2.png | Bin 0 -> 1627 bytes .../Food/cheese.rsi/aged_cheese_part3.png | Bin 0 -> 1661 bytes .../Food/cheese.rsi/aged_cheese_slice.png | Bin 0 -> 1579 bytes .../Food/cheese.rsi/aged_cheese_slice2.png | Bin 0 -> 1576 bytes .../Food/cheese.rsi/aged_cheese_slice3.png | Bin 0 -> 1576 bytes .../Food/cheese.rsi/aged_cheese_wheel.png | Bin 0 -> 1808 bytes .../Food/cheese.rsi/blue_cheese_part.png | Bin 0 -> 1865 bytes .../Food/cheese.rsi/blue_cheese_part2.png | Bin 0 -> 2020 bytes .../Food/cheese.rsi/blue_cheese_part3.png | Bin 0 -> 1845 bytes .../Food/cheese.rsi/blue_cheese_slice.png | Bin 0 -> 1681 bytes .../Food/cheese.rsi/blue_cheese_slice2.png | Bin 0 -> 1636 bytes .../Food/cheese.rsi/blue_cheese_slice3.png | Bin 0 -> 1668 bytes .../Food/cheese.rsi/blue_cheese_wheel.png | Bin 0 -> 2138 bytes .../Consumable/Food/cheese.rsi/meta.json | 81 ++++++- .../Economy/trade_contracts.rsi/butchers.png | Bin 0 -> 1926 bytes .../Economy/trade_contracts.rsi/dairy.png | Bin 0 -> 1946 bytes .../trade_contracts.rsi/horticulture.png | Bin 0 -> 1954 bytes .../Economy/trade_contracts.rsi/meta.json | 76 ++++--- .../Economy/trade_contracts.rsi/tailors.png | Bin 0 -> 1960 bytes 68 files changed, 1668 insertions(+), 318 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled_reagents.yml create mode 100644 Resources/Prototypes/_CP14/Trading/BuyPositions/butchers.yml create mode 100644 Resources/Prototypes/_CP14/Trading/BuyPositions/dairy_products.yml create mode 100644 Resources/Prototypes/_CP14/Trading/BuyPositions/horticulture.yml create mode 100644 Resources/Prototypes/_CP14/Trading/BuyPositions/tailors.yml create mode 100644 Resources/Prototypes/_CP14/Trading/SellRequests/food.yml create mode 100644 Resources/Prototypes/_CP14/Trading/SellRequests/gardens.yml rename Resources/Prototypes/_CP14/Trading/SellRequests/{brad_potions.yml => horticulture.yml} (89%) create mode 100644 Resources/Prototypes/_CP14/Trading/SellRequests/monster_loot.yml rename Resources/Prototypes/_CP14/Trading/{BuyPositions => }/contracts.yml (56%) rename Resources/Prototypes/_CP14/Trading/{BuyPositions => }/factions.yml (61%) create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part2.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_part3.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice2.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_slice3.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/aged_cheese_wheel.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part2.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_part3.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice2.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_slice3.png create mode 100644 Resources/Textures/_CP14/Objects/Consumable/Food/cheese.rsi/blue_cheese_wheel.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/butchers.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/dairy.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/horticulture.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/tailors.png 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 0000000000000000000000000000000000000000..29a85eb741209dfa5a6ae4f92774f7acbb8596c4 GIT binary patch literal 1624 zcmbVMZEO=|9KTwFj19yWWKN04E%Fk$*RI|ANSRx&vsJFlQCx|M_ICGNds*+E^X|HK zjU;m_LH#mgq6SPBV}u2bSrnDTS0w2CU=|ZiL>D3=Br3rr@MQ_fe6DW+MTuPQ<$0d_ z{eS=W|8xDx2bM2uTSgGX@r(C{>KTTGAmqQTEw|S3`*!Nm1LELy= zPo>?ov<)c8U}O~yL8fF_7)=mcx=WU<3`3V3f?3^+P=9{(8Aa-9gc=M=oMc5|PLG#u zxTBm*Ddk}$tWw=u$t@*-2@L4UWXZ^z4k$&a3NOHG@0g{?3d9|bP(7YPGA;F!QDj3h z%<#0raRS*HW@KJbc|qGu3Y^fv@;tt2J`A`n&=DeQ7lqZ?ss;wczM3+;i%>b&wE)W& zi$$gwV33_<`EWSQasn#|G)Bj<-^q)`x@Ik-{ zS3q&isIn_x6RavgL$)Dfhjl~FLe?^~6xj$Ph@w2Qv0`jppkjq2frRO}vZ=s?7@@Gw zjIOJogI72{%mrzc3u|;2*P+r~0TpjM6$m>6NxdojiP|c!la(p}vf@>Dgi^e;LY1l=>(?EDDs3?bG3kG#y9#rV z<`!ie_GEFiu31hjHlFqRu<8fmV#FNX$BWi4ldXyl1 zD-&W*D*dc-X>qap*!?#g@V&qLJKq~CS__{~`IkKHPw(A1Gc&U^J305>t#4im6`Qi+ z;P(72v+={deSJrc{~{dPV6&5RUs^5SubH1eyRi82ljALu-Jg8**7-9p{nT=nIVJ9Y z$i4mC$?2DS;_->2N7uJTSDbhl%S}&wvGd#{&)X(d`_7(5h zDxTWk)|T1%;m9L5C#22q_7bn0;rd^^GkUmvPcrcXzq?6^t@H1h-S&;K(Iyi2t__XR sNA5eou01*Tt+p`b?_0zDKK9fILFAmr;;%2x{p!vBL@X)3)0-Lp3tt5sHUIzs literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..86cc71cad44b8217fc3f61bf5a4be3ae073be90d GIT binary patch literal 1627 zcmbVMTWl0n7@lD(D7G5Xhz$`vOyi}>Tz9*$CmolzTf0lyvX(Wh^3vIvv%8b-T$q{d zUJ?>kO07Pqh%wd>5+zzq6pTtjC{dI4q38pe6eXbsh^Z0N=nDy&G~$`P1r#MRnVEC@ z&iCK{7h{9{Evwh9CJ3S>5)KXF5xC!-EAihhm9F67E;IbBO%Qjtx*tirb*POXntoN| z2`3TV24zEIB*jP~rl6S^O%Pqdf+@)($N@=|R&|m3ZTbresESDK?2K|zvlnI5aLGbD zN`rB^G$IESD)=PmDnLx2Ax8oQEvwtGAW{`xi0AG$OMwc+84;;&S0G44W1!ct5C||l zEpwazHU$`omla+}Z3F@*_*kCDFU5h%Dd;@D{49BoD#=lTEj&BfveH)E7 zWZYC2O>2m-oxV|QM$I8NMceVBiP#}z8#zlxeWO^-cGnsc_F71C3@dIJ*?Od6b(MkO zX9V!rPE}Woyxno#1r(ATBvLqPoiyjC1uib|u+s~@{wH`2a$FS}H54^f{3ld^yblV# z8=yF66v>fp307p7GAvEP2CJHsMy#o)DbR2u>@~86g#}~nycI2?Q5ex}N77{!35gW8 znNd{*CI!Wd{7IhPgan@UDZUh)l>JFMsRU$2^7AP#lIr(EhMaRFTfeXT&->dg6_=Kj zy=@-1;M|meVb#XLD%L7u2ijemWmQng0w~FDc8iqkh7~DPZCkx<4^(OM8H7pyBivP( zZKRyMWTEaf_SP-aiN(sZZXH(bVE=AnhPFf-_rIyhk42Gfy75r!Dv8`<|8iJc)^C=H})mHjG+lw!UsHEIjl*{EyS5D6~Pi=p2JRJKOy!KW3_@||d9pB9_terYJ zeeXj<7s&f2`6fEJ=g$@2u06O!B=>&sHhH=4$bE?N}|B=4I(9xdZ=l=q0-XRG9 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..66c32122d7a5b4be18ce710e0ea74d3b49bad41d GIT binary patch literal 1661 zcmbVNTWl0n7@lPjyKO-$LTV#%G9`-9x$Xt_$XeUoZFeKv8!O$$mz|wCyF2OboN;EB zy+mHHXn}+fFNlIE#Apl>Ln1ULfKu?X4;o{Dh*(L*fDf9|2Ocybsb}^UP?X5YT+YmV z|M%bj**@6cx3syVnIMRz;ZR^0-%0CiT7s`esdOFR99n49Ac&Ub)@dW&-rr6Ti|3SR z%#1}g010IoQAP>K6tWsd6U6$if+k91&?FNurKmpY+VRgQQjvYsh&#eXG(Su$p^^?a zminVoX-x9URM*qw`U1cNS!jx6A)8SRQ1DR|UV!)3YnCD_5Od5&bz2I_SY(j&BOQ`n zhNmTt6Uen*M&u=#7m`ns0w=gwp2r8xdjYo&xIAQSQCOWWC&6%_x26m~`KYvMYJg?) z`8<<%GDuIcyw~exIe`@f8Y5_fA7YfCoUP+^$C&Df1vKyHgRqD2j|!_YuEU4p^Q*vwAL8x8n%D4Ix*B9y6TYOroH zDR>xxTr;AmGRhl|-y{G7q6vKz&YGL%JhZ??1s=Ga!0CB{=K#l5p%El2$>Kku0^ps% z<-7%oYep7L@s40w0!gH2MeMMW6;qJa)D%TF!U+5*gLJGITj#7;5s84XYM7!b!EnGw zVV@aAk%8}{ER>N5(0YZv_lU1yB#76i+ZI@BVN)-T6vZ~uhNmg2+Ox0d1cO8K$Z9WY#>3^iV z3NujB%!@kgPT^?Xv7A_JJZtq~)erXXE>^zX)U$Os9t765F@o?zV~9Z&Pc9vgD7)6z zK@c`~IM5x9ZIf;+EOecDX3_h$V_VMI-d)z7JN1Em$xHUw#B=3xxhXX{^YH`k-SFfc zsldoUrtRC%(VpJkPrkS;99pBZlQUmxt>;(G&tLs>;lztuTPM3te)ZwpmDhf3y~_L? z*!QgY;P01??CB1Lc27?~*6v^S!w{A`vitPJ${i0A_Isxe2Uo;@ftqIcSNL~QhrsMl zPfeh0-#PCeUcU3udxnC^*6(&5*kQk9NzVV~94&3{ zA76F$O>UDc#Q*sE+|0_$6ZvZojjt~7*V`7Yeq;OsF*Q54_tWu$(YNnPJt`M%#5W0L Uv}fwAPU{B|4)zB=>WOdt3wxX|y#N3J literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b970fdf9132610027f117ce3ff807c44dd608283 GIT binary patch literal 1579 zcmbVMZD<>19KV>YbF~}D=IDll^QxkldrgxxkGp1Vt}}sMSF=Fl2Vqa2dy*W@-E-bu zmNX)0)q*fV{2)#QKTKqlGSs5n7e*Wv|q9c+sn+k*JBDmNAwWDEKfnloU}>c#7b?IopSI-u8yN3>x;3YdXG3Y&KwoGo2fka%v7PftlV&xvzDHES~W%4i7z0Wropt05U zo{gLOVp%;Co*g&92TnkdcrUgq_bnFtx_QD9#q(WS3n0gm&d7Pwk zX#gdGk{H4fK9;~yJ_d*5JfvHEf=Y_wVsR!m67QbZ2&x8|?VdOO=lKJ!Nm~n6Zks1) zxS%9J#`I{i<~kj55I@yfRZO;31puO;x>XJZX~hQD**0%G0&Ut_8B@~#NOv3Nk)mIN zE*>k`qCR>*rt=qr6X!Ow34Oc?T4&3 zmM^@B{%kf=D|_#FCv@tWi=ks%2dm4+!~1qG(`$U`?CR2`=6s~N^M$wXxw`oDwe`@- zAE_e)zkIbLn)^B=U3fA)zq7diXLSC&cy`ggws2}-{M@e9z2n=LBj0}n`SfS&4;(q2 zSo&n~ix~U*hAW?E!Y4v!22MV@*hDAGpPn1dy*xD9|K;xIwjR3gSVTOK3qK#(blJUF z>04;NTjqAWvVEiY)_29rKW@{`(8a=qD@WJltG{nn){d^-Z9O>jp8o#oQsLG4*Dh5u oAB4*r`#!w?-nRSFPtQKSiE3O+eKYv&EDFYXc4AUHF@9+NFOAL%h5!Hn literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5f760fc4ab35eb90986ab59aef02e67690357eb7 GIT binary patch literal 1576 zcmbVMTWB0r7@jpjVoi!DN-Go(Q?E30-OaXh?3koGsaff!Azf%h1<#&2vpek0oN;D0 zdl4Z9FNk^Z$xwZ0trRJ-wFRH5xY~!r*2_ax3L+>{P|zAAAVpz4vo~9<7CX%4%*=Pb z|Ns8mOVd*i4{f+}1IKYg=}BXTJwbF0+{o@hy}r&KH+hqf1{`qV@Y{OChqXB9F6hlB`Jost{Cs?N7~AzMeEB_6aOVNvJDBZFWzGYwMICqNSw z0n4%qwre6%u&JolFi>SRAt?$w1x17M4wy)S&cQQtzG=Z3V|T|Gd(-(s7@ ziHp?FONypxlB`OqDlmi))Z7qN1vl8*WiUv9ecKCd>Vk+7Nc}9OrEaFCyDkGYDXQT9 z{kCh;O7OsC8;F5IqVp_kBZ8b1R5`0Ea3l`n$!&@ZWw{N_P}8<*|AeYgQCW_!fU=q~ zQHZVyHZioQ?;s}Fc2J&3o}1@EFN`onOVnqEnRoG)7nux9yFrLtOwxwVGtHuHn~vY6E@>FM4vO%i~Ai_~~>pYIqN=&}<*}m=wv}r2^!btxk-ECMvt+0Z8GM;DA zx@I{^%y}v5!?q6T?-E=8F6-GYoDG6#*&9LZr8mTg%O;o4M$}`$%G+$beVaDMv$N0R zKbp%)V-nY8;>&MQZVlEEv9R#rdtK;8%(s*YsexyIC+{%4lc+LAu cz&b;b0W0DSe*gdg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e76676b9a928dcafa589e52698409fae6ee6b9bc GIT binary patch literal 1576 zcmbVMU1%Id9N#sfrrJ^z<=R+SH&!BMKkuX2q1!aMOOu0c8n35`K6P$)?rzQP&bqso z`>>H16pRFg2yKzRh()A?LLd4R#k8Rmd=W8)f_V`1samZiV2i>zdml@y)nbR8o!On= z{Qlqng^BUety^|(p(tu=dMuS8D-+B|9wKkAUf(23w=?#NM^TSH5lou;=wyVV9{k13 zPWe;XL7-!chX&3ezG^uHO;LLXs}9tsk#xzuRGOmf5lSD;xtnQ-2 z_3^A;pVk$F9o)z4tpY+|As;eTt7Lnis_0W^J=yatDNoib{JB~(_Pc?O>8p(Bh2Blud+ndmJOB@(%N3z zPsC$F6*_{%i-Ao|prMC2r|g!R!VO(OC1fGn_Xt)Bu}%^D*el|Hp$?Dl5I}sZX`zg} z>S9@;2+tpxA!f84a#ysMtvN`@AP<*a9gWNoHG2bV9FTMo^s$@8xYUW%L`P*tPVh3* zH)+}iu6WPib^)cJk5raKEzXGvP8PGW1maN;O}rq9Konb04I5^@_D`q`BngP|JD?tMuxY^p5*)k0GNBtm5|^+`1QYF|O)WGHq;1cKwvN&%l_fUwrfGnI zoG9j@VsMHwAajZyL*$h}oRl|UY`{Q@l#6%nr?6fQBHOud{LlM`T$7X*EZsLxP;fy? zfHBh}!K$?@;xKx>y(^haGYbIJgX~sWJqRl@*!FMpzCF;QtrQU<{f}_BU>?r<73iX& z0`b;8(@7x83qc*W>=6ELV)N{_n(e?zBM7!(3nCw36GJxXTrO!*Kkd9pllJy~IyID? zdPo1W(HLCY|G=m8x!HC4lWmdm>StXCcCC^zynNxSF~CPd$14^c%l#(rbSV zEYqo4XfR_AKwd9J%rIoc;0iesS&R_pdh2(C3|6hW^H+>}R^VHil0`5{a{O zr?yvb{g~KTI)2EGUcb>T2lMlzZqLZUuTvisqdOL?rI+#-m)2)`6FrY#qh5WB7P?1w iiC5=de0UKYS*NMv{OEi8=8v5SdU<+eJauOH$oyXgv literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bdd6622067cc63c79754fc31774867e6fd25bbf5 GIT binary patch literal 1808 zcmbVN4Q$j@9Pf^Ouo;FK%ccgf6r=m#t{=PGu9e#|b{m_cV;LvgOayxEySuu(wre}? zZeW0cxP@;sCPOA<3jqm?AORwTFBRfMK13qHp=eB02n-2?40Ph_?REi!5^4I{_g;VR z_y7L4t-5OZn3NY%5Cj=hQSPjPZ`2s06X8>9ZoUIw$x3;>h9J+3Ge#V;ano}M5hwBx2E)q%3n$2KUEH{K8918RDVRcz~jIV0zlF=h$UlK#V6~s=9B-0I`;Vy z0noQB8^oa2u&}Y56y@=t_DOyrv>!bOoxo|PdAa!Goi8IP<6IB2jK;Jg4=Brk@>+{l#3ep!Wrp>}x@Em)SRkTji> zcu?VVV9;iZC<=_*4oCrTyxD5avzckyYBRg-9@Bj<(x zd48rU!qVdWPt9W#oRJbtxv0Tlg`*WQ3p7S&ei4mi0mJb|b~`ZM2rCe<=(hOO9vG$# z`T!*Tk8lseG})sEITaLpp|_rxPB>H^H|lWM4*Z`cM!r2%vm~jwmfxINq0tKimfoEr>$jc+sVnko}^>r zeoMX+f4=UcRT&c(``o$d)%RL!rtCq|lDfN2zp&wuc)nywHJUy+)-*I{LI-%hfA^W03+MKJ_2t3F?u$#k;rTujqx*!*Yi17J`XTGK zIWFPu(!#!sRb^erk55X&JnelucP>y(Hy5`Q^>yqin&h6rR-N-*C|Z@gBV*9DMQOaY zlHC>;3QHzMTaYyG@~-T!m)Mc97Zc8(YB+i5r*LxInbfh*epb;jyEd+TTjracXx1@M zxMt_;ot>L+jlWsHq-z)JwXUDmdbh>d-Mg~Za{J!uD<99^>h8Zj@Z#HtO({Dv>Nk8a z6hA1oBp~Fb_$_rgc^h9le4x$l?EWQrH-0pC%S)Gk9*tC9(tln2pes3j?Y_4b9C-Qn zr0q;jlU{ta*R;;(tzX}oSo`DZ%Kp-Yb3eUteRt3Rua*wO*+Z{L37TG6GnAqN1Sk`}OOmOYhz`5g$jtBqTyJlVX!IjyJ p>+Jgpf8{tHOixc)W^!bPMkVgM&=S7CE7kaCRg_jad#BB7`5ROSb?N{B literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b1e56608c6e643b12849f7d52a56c6d9ee4a7035 GIT binary patch literal 1865 zcmbVN4Nw$S9N!Zy5z$G>7{_W`LL|N0kK;~m<@h|5(+&vF0YV-2cHeQ^-QF&{3wKZ& znvOcdpk`^QrH$q|X?~Prjc70xI#GsNgdadNTBxHb6WFLR+S}u}(XyP}*|+=N+u!^B zzyG_cFn?C;sEMNx1c|lh*^1yB)yBxj;8Urs?T4>uDX&yPkeKn>&>t!t*mXVI81!+hi0F^<5g3qteK`R#GrQuxL#xXPmQN30yOB0BeI114mQ3j~R zKn5JFAR#4IX7Kon;8}cS60lUsuGRk zfk40zFd9U;0w*mN3rF0x(Grn-c_3PG)<^&^0*Y8Avmmz`s+pi!BhfiBU{q0dilT2Q zQiVe*qm0d%2BT)u6J|X{I4P1g8EIq6RFa?xVi4*OIo@6K zPbftb7CI&MJ}Ar?j!~J1f;pCUi?YB#gL#3e0J!9@z|e>r=^W7~%1|)W&KT0d;h^n) zMP>Xfu-mK{wAsM(96gSKZQzF=SX$mGNe2Tqg}j75gk!B%|pS>(%)mSm5dEk32YbWH_~Nyy4c2QBqqx4h>X z)94#};d<91=`a$tZau#wy86uIiF0)J9mkjLc9z-LWH^b>E!;U~+Xn9(YRe{F^Oc)9 zO$!d*>OQlh=z6*1UG9{I&5JKh>{?6pdM+o=>>vG^`0I)yjXEpqklXvLbb?S)-qdT+PP*#AdQRPT%! zL|Kk4pZe+MQ8ylUL^p8n6!AB1>X7QPhLXjHry%zGtRpq8h r{W-0st)0;Ytw+;iqqKm;&uGT$SMAxi_SCDBwV$0mH{Z4=yL{p-z-h+y?rVFa?VY`Y7BthS z+x&~!VssM?ZqvlEMMSedgBvPKjhn`d%*`(U_q_)Mek5wo&I_yxjG^yL;Z} zecqq%?b@n}xyeZ{CLsutY%jA_!#k>8i3#vmZfzZcxA9V0y^J6eCaISOY1^KGAY;3Q znmVPJY7SRG}qe z0H9_qg>xiHqb9SKr8u6VUHK?Y(t3iT;E7XahAd$8Ml^b0&|QFcG1ay?QD^YUf_W50 zVhAD_3~GZqtr&0#& z=X)H$+&Ua_9}m>x^Tl1rN@+6;Bbty0qUD+v2@usl7MlVbC~bx^v(;!MrX&DZMGVx4 zqBmBls+eSyHfm{fdadB+#h^UnE(2g=6=1<&)eJak#A&jIrWk{c(dlPWBtw#;P>0A1 zu9p8pX@)d2I`chH*fTt|@n_alUN%FYMtY`58+GWIbEC8GV0Gcy7WA-+YYf>v4 zv*)3`!D!G?E)$8HoTLF~^?Ds%U^LJ;>oQU%m==yQ8DsX90Re6;*89{v>V{KWf+-VZ zSge-lj#vPeL|0w`jdTISa%y*5FitHi;IZgy;Q<+VvIs_LgB}1$A5rd6m@K-KAR7Qy zH_X;!+lhFXc$sZ}wDcz{-ovEd*M3hUJ(^a|!}{F-&PoDPgCW$RGFlYk{(42e-8Fz> za5&Y}Wqh8(hxkMWen=gF^ERu!n?n%INxRKjQ}^cJ<`eU#STn-QyZgHaQuA`CsROHi zpXf_T{xG#_bz<9WynSR^C^hBWuHk8+8-45F%PO}Xe1F|wQhC~#=f54h_U)u&TM~{} zW7l^6vMMv><-=!OsrHmxM-DxA@b99Yv*X%-Se-hwf2jSFrAXF_aTheVQ;<6;2MW8t zLeG7(_2Ty3;avTx$!(Wjt;*lJI6d#wj;WKVMMuMl;cH6{51d{qq~=W6QoJW|#eAl} zo?X8FXkvKAK=puJ?@CYK)l=TT(s?ZHm~F$}ZMmCYZ{x9qLqpxmcDt|iPTae{cYpRN zr2o3}E}=`Sm~zN@IM?Cr3h-1Nl<@63DGK6l@soOB?~ePi-VJ(m%wx+v#z z`uvRtx4iI5Lg?3}ouwtc{kMg#XAX_Ay*sUXPY=d}@qeA=o*km%od zr%QD?3Tajp3=Ah$0YgxbAR0k3=L98&^#T>G0@b|Vh7IrCkD)wg!zxS;!Xf1V51(Hz zgR=S}CtL4jtsFLIHkuivA%Or?1`P^6zd{FXScsQ~Ywb0Tp&^LswP9JBK-A?ZL32bI zpjHE^X9v^rIRhQzh1_HVmpd zW`iI_X#GmqPtap{kdbiGKxj6FfE*jaNwu;sB%EV$-~$5is|v)D5v=49RZ;PX|3V%4 z{D=VPTZbbeMbj=!x&XED5in3D_ zedCcT8CMylG7J=&T*3P}F`%S8bO6{H71%HsHItsm&{KqyB59M6HkwjNf+mPDs6*s< zcilgsR4BlfN1!lgI7Vfj2L4nk+m2tCX?A}9zSmv*;*~K zWLPD=?opI2b8>cSOK25Q19ACHEzfM!@NyKNY&g%xmE_%;93 z9vGtycmO2*k8qE{6w$2)7#U<$LvKAXop7i;uGQg~9r)i(41Ig3X2;>M5opUu3xb$)jkJC&IC%bF`YO6J{O;Lc4h+qwl@ zJhvjDCir7R#o)1f;`d)Q)s1}9o&Cz{BA2=GfKF*#e>wI8Z%IRJcfuQ)`ID2Dn{zsv zGI!r;{BC$~@yNd8_cm=zu3ED;>FV`KXw-~l(KqHG?|(RQBKzR|_9ew{dbci}aMkfv zpR=#LfArGu$zMlZ-@a_CBeMFZl&rtiNu-=O>iLq%tH12qFQm_k{=8w`toW`=9~JP0 zZLY&V9LY~ZmVv#6*QT!9X78Wk8Cvv3|J!Llr+8m|z5LSXN@MoK0f*VP9?9`F3xh)7R2K^!DCVYWil(U(r(`mhL*=-&Xd{+CxWTPOnT| zK0tIGPdj61C*xCEVlTu!v)nu|ys>G5uDf~U^u5FPcMdMym-wJVH!6IBJU4fO&T=vK Zvt4_Rz0h*tkoIFM$StyeoxR|_zW~0`m4pBQ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2b6070e4bc9e6bd19a6e9444f08fff653dfdba82 GIT binary patch literal 1681 zcmbVNeM}o=96mO-xj7aCDoBvL-r{7i>wUBZdQuTv1`Rtz)<|dg!|UB!IO*Mc+#PMf zxydpzG+8n;Nfx&WF~Ru}=E%&VvdE$aSqx-THJw3nR+giPThe;6k=GkW!@y3w? zg2?_^35KkYu#K0H>JViVhK_`)V>CfjRVQ>&>VOsq!!||plJjHZBv528+2R%$LHEIS zrM}02+j|;=Qcs8Ek;&>OKvjar1S+&dkWizV$tS#Il9$J8`!!91B*g0Qk~OwL5E7bz z4;c`694sX<3wt|qcaa&(hHDkiGYGYVNDj>H-o55}!(#_CBU4{f}W7y4&wi=!H8Bny45kx4O z&Qw#{Wx$m?I8f4}XfleMn{V0x{h|fEB+iw2Wi_q%J$N>HYHm z-2b$p;MNkOcg0WV5+b$dz4PAinj)NAFgBd|;x zZ-YVdmZ?uF84 z?jM~T{qWpeF37SE;tT)EpQg6HUM7bcMwTABzWDp}51;2f`~JvM8EBat8oqe8uykMD zmr>ardv9z!Tr_j+)WD+;?&^R0fh&9F2d-F-(dX3R>V*?yrW@b7Iz@i9HitMF&0SsmM{nJ1(~b+j{zeqdJciym1P`81R32Sfuzz1@ zU8}&m`5%8ezW=i`hc^!{JaQyE?}ZC1T8=(m1lFHc@=J$Z1I>jm ze{-_x8Ci} zy1SSAK&iE;L=-`!gjlpz&?uqCTB~5NM=L=P|40k1Qq&)c2yG<_#u`0m?~7Ke#SS~W zvpdhc@B6%8J3T%&x@qI)jTA*~iiATk@}!-4Q!BY!rP43tvB3!Mu_)^1+nnj5W)F5y z)Y^+`JYgrIJ4Fd=ZYbj9t)L#uL-neatH)EGi( zHC!^$?$TIXDrKaA%=B-kw-rPpKtnd93tCpU#6pm%$`#4l`OGnN6=G+C%z&eiPDID) zA#5T#;O1Eg0Do^!n-gV2CW9nq^^v-1(~#M z8zRT$^LcmPTE=wHBA`R)bMX-DmYoxJ_tu+1@(ar6v z6cFD=qfH&xv_;dJDlB_=iqNP#T9tH=WMC<2sxiqbeA!cxwOY~#HAKhHm4 zs-(1F_J-v+1?QxM7*;J3tYW<)cB4n@tE@^_vp|HBlifi^a>9yarv6#IVGq>A=F^A> z{f}_hU=~*FJT%cjig@d~>BJG^Ij0V5Jh;D8tnOV=vkf?D1kSSAg2+p=i6NbIE|avV zR=Y4nZfQ*%OYds6AD}(dzeloi6 z+4-LRTTUX=Y}tBUz8`wFg_SpoawA*PONxax;L~>_8gBKc<`lx v*jLY=&4!P)q}R1B_H@;FgCC#RwVt9fBNHEgW{#De|3GATEOcaW^2xsd*uE(O literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..87e906de239497e14e5fde7f80f7473b30be1e3d GIT binary patch literal 1668 zcmbVMZ)_7~9KNx^7&sK1W)R}egDlK?f7_MbWw%khZ+rp1kFIlw&!?5aLz~7FZxP32Pg#OLm-dXgh(gWK}3|o4?eV1W}2Wv5` z;#W1&X?2F45M-F7Bn3tRl}YLdjbTkK8C{aQfrUpwm#T@x%-A@AtBOc$Z45CX-3Q`o zpw|E$z2S)5+b#17(b9}JWduZ!1eSznk_pWeG9r=Z70}w=rU^U`vARXVYa7HnLv6SZ z8UW`hmXsNW!`Jha#L5cG#U8~uhI7#@i+&`_3yeo_x$)vfAajNi6WaZoipJ2JNW?8m z7ic=2PE%3R9LyAXf_- zl6r|&GmCLT5u-DbPO}taYsv!^xrEbGMj~%qk!g?sNuXIK!m=f-9)}h*$a+z0@G&0O$UHqvVcgStTmF1o8*`X#|n*3!Rd0ajKDAjXb385Ec;I= zCopco<+%llYDSSP>5gDU7GlsyN=UGpl)3<|Yh46h3ZvkI31}e0$UA4=i%>`iYNjP= zG6?!b0%@jHRS|$w0<2r+NY>4IW2zTtP7x_inG zS58{ja$f4{LDDh4@V8H&mCoSJwYh=19nYNl__=fCSa3C4o4b6%ck%qnfsMOQ4_&=J z9QbZsiulYw8av^8g_XT7*;J2rT9Uk!)FN1htlGIaFH oOnqPV@v<9^EjLy?QWW*aqSse~OOA(T+c0zmTf_e0jZgRg1^KToRR910 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..57e585d9ce8599343feefe2b665c06d0356f8354 GIT binary patch literal 2138 zcmbVN2~^W&91r49RB(zYUKoSGKzgLK9Fb0ra*kGnBB&^YB!xiR#3ayyo8p1D)1jgw z^VriN!(-?in-|RE=@=gP+!T+&=8fV+MK_&nUpe}8&&@aUlIBbD`+oob?|*f1oF>wt z&#*oa1UW=Usp7#Mwp_jKz%QSl{}|lt*{I1p1od^YTsBZisS5=4yiaSBg=BRsMlc33 zPBQ6~*lb_{8iInxn^~O5rUW>h%Ak!(Nq%z;V3vzjEV@U zR0jJ8igA=6QJKyMmPuuD35tSKga%^L08H)&cO3{Y$B{ZLUKP=03_K~3OhI5ViNs_w ziA}y@hRcwkfq{V%sZ1i1i2y>x=NSduEHd(L-3%&9KQw1HCL0;NPi))XSCpGYRv%23SL7gGd`MWvWj+6h%N zB(2MP9aQd%$>gs8}JND!WuIW*cwJGjL|b3Fbur&?eIda z#-fe9fEx)aTBSsQW-(2Zm@dE{r~D~gB=^JRB9f5HMYtl}Uqtw!0Res#a0XR$?^iKI zjwQ3*`^o>ge*#B?*248~&0}deOG#i+G!K%M*VPdT)Qql`o`yTB0K*AObt@6Vl2(dD zx?a<79f3|-QzivS|0CUwJ1|-mqD?MrDZZ+43UOJmX;OUFal0{>&!-$|t{dEL0ZjXQQ}y(>3tX-sSz7VNOu?!kEIJne8>*#E_g_8~_% zOcFOX+)Ye9?`_6T&B=l8hL86swl8$+=aAA9esRa4!fvdl!LeXYO5(baHrn}*Vm20r z2Cl_(<|NKrQ*l__!`B9#y=Ajg+Q?mlq0moOLiOkBugr}xr?|2qX&wa=IVcxP5!FT9 zL}MIB+cm9jIp*XAY26o3B`i(9{$cDpULN(gpJqu&=_ z(ygj>PaW=&V4I!gS`dra*3?#Er=RA3?@gDC8D2K-O3K51^v!2P!Q#rb`|sSkq5Npn zi+;hW)hpWXYnt1_TX*hW)BNDMCtal9QJ&|sXIts-x0=f~RqN94QEf{LMKLoP(@geF z&CBmXU+r_XtL^2xF$!0#QQ04EGC2S0+*E(yXgWGOXK0&4?%I;6rO@Njap9F0A-&Hb zO@l_}Joq!`Ut*r`hJK1X?p)AE3$#{jom{da`_dsp!EEOP?U7pB?KbzYn*M`MBn;UZ SUw6;)?;jnmQSAy%oBKB%PZHq( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..adc43c0080cfb4c29eee7f217a3f6460de891331 GIT binary patch literal 1926 zcmbVN3ry5z94|gV7!Veppu}1=itertxI34PXv7H$rzj0XXyh`N!gw_ogR1t~ z;1mP2F1g=N&||ol5phyWs5be592>xiZmHNWoMUlN44lBF$Ph~gu%bgy1lb|{3w7Z0 zQv#rGZMJ}nXX@f~21Lk8S}8Q6-yzRL%l0x6;MqVH+!71YN}-w)Rck~#RRWA6NOnOe z9*9)tfXXPP*HY-zMZAj>JaXI<2Y`i9fC+<9(`g93h9d10Ns|dQ5kH+IXoBd2+60a- zD0?Q<00aCK6y^-aD9m%g97`7nl9Pc3^G>D^;G(M#Lj!K4Q-xwdf`XxT@qR6AHrncv z6~@H^tHp#to3%X8(OjaD(vd8w(Qz@1tC1Zz z&;8Hy^CcdZ7E}DfJZizIDM6?6G7MH(e?=?+CH=Ev9`$Dd&9G{An=n=lE8wvHZT^Kl z&`0ZW07&{D;qHUULV@C8B#=@Fz4hF5!lClGT8Djh;Quty|LuvI9e~3|piToV2rdFm z47gzDl3$gZkU?gvCB>do*;PwAhG&gAwrccDsdMMsxAI=L%#G7t9!Gy(Jxw_o zH6_+EIwk6Ac3k(G)zNc_?jPvg8-&c3pn>|5I$m2m3%{8s(#KY1V7e5x67hL$! ztU6aT8WVY|uzZ~RuDU_yRNNay-Pey98xA^weBFBMYe(>R8yLayIjQZf`EUI%v z1rk3Zd*gy89RJ3ZbeFk(cAzDs#5YqgyX2$A2Hy z6@-L)8$%cOl=XzK|MN!AuB|$4ZG(*5_+#s9RjrkeN;+dV9@(;nF*JNZRew6wjHjCM zQ@x?rJXA~;@eUiNG(;V13Rx%L4IjF+swAmQ+_NN4Yd~}xt~EW1TQ=!jE>gRv>QtMz z;k_ZfJ)l$yX}=>Z@i~Jw*I4Vt6YIqC?gQJ8jMbiPS$RGeX}vi#%19hCV=Z03Ms9v% z{E-z)6Bc~4u+09j`O?Kj@f~Mx-fy`dfjB3hy0`azx+|9bHbp;se(Y(6pPu_5WFK-SX-96v`d2qhTGG6taqNV~ x>XV7wl$z}59c}s~b9+V1gIm4P?x5b~6-#e`3%=n8@+tLCX-&(pG|tRh{WqP9vONF* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9f8976a4714af2eadacef8ca0ac32335ddbec8fd GIT binary patch literal 1946 zcmbVN3sBQ$91k);a2#_Uo)6S4KBllVO(=y%3OdS0rmdPwiCq#7yd;<_+ZY1(L1c#>nW+ebGfZYUffrd= zr@~QMttQ}Tor=O~1}Cg)9ElZfe{1>5U7;T$&?4>q=|zJ23Dd)yCBttOlCrbc}d$B?eFY{6k|1Z?u z&rb;ezBQS=GM=f6%jFdz$%zYq83PV^CR$3%7g#KXmH0f7W)l|xH76?82xNlDQZg^5 z@w{^|QszOGVM41S;Hl|$j^W+Xv?mU*21;i22#8t~s@9?eo<`s#t|8Uh2wY97)%{Qt z&)BW`&w>(aQbRli1v$e|GWA?ALz7lsbWy-yyNj~1n84W(*y~0zfp_vE5Dc`7?9;+z zB8{9RQyk424SEFFtg_n~QX8dK(^^d=s$mHo8WX9}qB^ZM8;y?6CSr8BHJW9k2G1LK zI!}r0;CbeMo=+C-ptLCG3-c%ir=$d#WS2m&@&_s+mCYTPIqh&?7LXLJWVarnm9Vl5 zGO%rbVGs1vx^q}S`XAx$he^Cuc2god(+0ft+;qZ#@|aSG{dQpgG_mj76E!;s2aQ0P zdRq`!c$*l@fzBm@7InWpZ#)DINiiB`re!SqwY+gwS#H>mS&eIKjU7Ve&9#$Kw24EL zk+bv5huq01-g>UfY%b;^9|w%_-}K?uPYh`C`wcZ6ub%#9)Z7(&OjJ%8vZJ`pme3=A zx#&`JVNdKz>P$;@_x(qO4;r!x_s7S@uC2LIwcYu8SBrm+@8e<6xObOcKm6J`_k!rX z!3VG2+s()qOuna`eTPri`kgC$i<%EL?t^!T z>w}w399hK04z46=@{Xp;R-O!g}|ad~Rx zG^jUrJQ5K&WSj5Rx~h_VV#2zj<+dMg7lmEeRyw`6q&3}dOYlazp&}H2Sh#7`>f9;S zwxj#U=2x^V-76%Ohb}zbd;e&NHB}P;wT&B(e0}YhV=ukRVsVXwdN<#$s4b6M9Z(eD z?jD|LELoF0Y?kF3KgrQ#4llj3%F%RV`N{{2W-sAJ9{w#gOzIIG9>b}o_FXHpZd)ve zR&40R+CrU3Bau8sBoauKQ>%Q5blmt~FJ!x7_`1_VNkS zTcMQVItql+Sz1g2ut_d(w_b9mgvRvT9K)x%q2y>aoSS2`;lS!2J53NeTOd3cKZ zr-NY@QJ?r%+vv}819pFUWn|LYBfF|YeiutWn(LFfC-r;~Wa)UPcVE{f{J4MbUFGj-Oq^q=d2{~KzX2t7!=V5G literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ea45dfbb7d7416473a813d0a0a8f048b6f3b0d5a GIT binary patch literal 1954 zcmbVN3s4kg9A7{|1$0U>b5hsE0I|D$z#Vt1hYE*6(*eRIWWM%x_qgRAyX-C=V55wP z;$zCp(gB;md@+rvOlX0MnPMsmYJiL=rcDl|V59j6jlSh^qmAY0&OW|x_xFGN{;yq~ zoH#3R*qC7u1O+C<8&kj&R<0qw;4bCm-35=KLj3y@1o@9tE-$Ef%V-E1)XACC<#f}# zB+Wb36vJCsb&gX2Xb74*Ek~eeJ1fH$HiL5+kgl3q1m+k6lBO|XCLxx!aq)Q~o0^ws zrt|Eyo6rAI9xFj;ifb{Am!CHBZB5*H6wi}Qcia|Ktlnlr6A`9!) zxQfOw0*=zFDV%0-!umE$U_>N}|u!4=3dCA8AhicE~ zrwoADnoJ%W&-BIV^q7$3xW#}*e?Xpzmdv>Vi>9y=pDogC++yHnu);stDXn;3OVNVw%Y~Mq*eW)WkEK zHTRiNkYnvrP*5`rB~#A@Gc;-CMJELab51IQMFm#|0(-(p#_|qc1crfk5xriROk{#f zk|`I>CKwF};H>62hSafIf{M~asAyUrrP5g<36%xcYE@QUgvDZEagByy2IP%Aovmbc zK%RL)`6Q78twlLrT949jN=cCMoCK1U+usqXY*zou!NI*%KvJ|)-3EkK(#iq`eXqHf zjzFKh+r|Q=|C8=Mn8aIUHzl$&GC;JRTTUo&9##6Vj|cj1ioM^S=-B}{7zE1FGlIaz zGsIXIm|P+lQCrg|7eJ8r+yvtcb9&*eO$OUYYV?U^?rkUMk1!oOj>NAkE4sFAZOo{` z>Tl(}$>l-kz^*)Kr+QRbwrb^Kn?r~%&k~9X*2bxd3dXBmJFi_)7i7FN{LH2adkXG3 zqcb(Wzn))Fa(`p1dwiqD=M~e0t&@sF)aN?*P5NqU{>3&?7c^&O?9a7_m!(2p z?fH8%wNOZ6o9}d87gTB-?_Kg49-Mk3zx$`Gl#Xn2LvUE){4qY2;nfu--dM}vn89zM zsB{S37jU%UbOZa|m83&uyzLuHt3TU0@e$pbw&%xCb)=u}mj1xG?iwh$^hCw)zbxzt zBicXOAK0jg4!ho%zCPmfniX}+Yy3;?Ge60?nu(U}gRku8=2-OA^P9St&Vry%4Ub=q zX$j!+t`-$G-yypfUM8yA_glYbl4{pI_8)h!lY;>Ik^i{1Q0JdsVPk7guO75&?%Xxv z*#&oRJ32-mn?OV)eb8N4eCBI!=;GMnZ|vD!QMo04lvUo;^u(O40)X!$?3yvADq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..44d1a40553611f9cdc3bfe592fdb58dcec4a65bd GIT binary patch literal 1960 zcmbVN2~ZPP7~W8i;!!)|)YhVGL#t&p+1-$kWF^WGEI5WUDy?>4v-<*zNj78`6H-*5 zY89DUY^_#_9ope^N;}|fE2veb)LSTEr{FLh)Ow((Aj&v>%aPHJty6dQ?Y{T+d*6Tm zyD>iYy@}(djYAM*VobC?5x!AzygUXzdAIu>eEHg=-{%ozyq`EE$d2OI5oFXY)|f0L z8y1l?XO&Y7X99AU)eg}J5<1^yr|1$7!wN_3MG(#xNb5I4YP+|lDZyBK_aSf>qL5D9X6z5>fWTJk-urRpNNz(6ANz<(wl8BeYsAhAS|ILIx2sKHDZxE}4xF9AVG{o_4Tyf#qzd$Vi#EEI}uQ zst(y;wR>r8{IH*($1oRV#|Swt+B67cXfMv5<**D2XJ`yqfECyT9%2bE)}GD@9G}kp z3$^$2Qv#rG4F<1_XX;|LdPVR;)JkZ^utT1S=8f5QfF%N+%W}{lY9&-NP_)KQMmhi` za1JBKSwsWgDuZD~@}>qat?vv3Y57-|a}P0>K6)hY>@Myb-u6ecw=hcGx$s!Sv2 z^&FigMt0;p^FPnWIapX)l;wqa#DWu3f{bQ)7_98!ibw*P!!rwu4rT#K(PDP%q_h}T zz(|L;*%$V}5Un#EK+^vR_YjQd%z~40fbcZvt>>l_29?LeIvlbC`=^P6-=3)15jboF z;?&!M;KJL)fDLvo2W(O5rbht?;*%Pq4>u;SyZL2GdSZfq!~BA4S(B#)X1qgqCX}}Z zuDpORkFiBslG54ue5-mWud z)ck(@fOAJlU-i#32IhJ0&h6XPab@6)wyxuR%ohEu((Z~rdDzs;YY;rWUo*|O@<{D6 z(<`}iH}AT-V^w+5&avMVeI^`eXiaU|xpvIX?Tz-P)e#bQOi7SWjbij{WOZMA_x#ZT zNONaZ*Fodgc{1XY_P0|*L-ISU_1z)%ZmN(eYb;4DXuLAD_>ChzVWq~d=DVYi{u^C& z63sP-a{B({kFGzg-IVE>aDGwM{>zuXJACMN)7n2LB}bd9kO`XQ^^af6$(cTuU1O-- zbf;`=ykD4d@|MDU-`tC7XM=i6OTmT8EX20_ex)b2s4Vny&%yqLhh_fzK6th5V4KAj z5N36CpFQw_%3D(O=D6s($+0#*m+7Gq5n ztZE>sU)SEUw53BnNedE`y&)j`_{exRS zb%xgV<`Js)X5_|_Bj2ifmGuL1!gE5~I%!XJ?%s@kbmM}EE&iPgD+?3wgrKdGzb@_l ow0X)~&B)Cq4FRPe=F00ajpo