juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tomatoes + farming trading (#513)

Browse Source 
* farm trading

* ruond prices

* add tomatoes sprites

* TOMATOES

* Update tomatoes.yml
This commit is contained in:
Ed
2024-10-27 01:26:22 +03:00
committed by GitHub
parent 08a4c4340d
commit 546e1d8fa1
36 changed files with 328 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/_CP14/Cargo/CP14CargoSystem.cs
View File

@@ -98,14 +98,14 @@ public sealed partial class CP14CargoSystem : CP14SharedCargoSystem
{
foreach (var buyPos in _buyProto)
{
station.Comp.CurrentBuyPositions.Add(buyPos, buyPos.Price.Next(_random));
station.Comp.CurrentBuyPositions.Add(buyPos, buyPos.Price.Next(_random)/10*10);
}
}
if (_sellProto is not null)
{
foreach (var sellPos in _sellProto)
{
station.Comp.CurrentSellPositions.Add(sellPos, sellPos.Price.Next(_random));
station.Comp.CurrentSellPositions.Add(sellPos, sellPos.Price.Next(_random)/10*10);
}
}
}

1
Resources/Locale/en-US/_CP14/nutrition/food-sequence.ftl
View File

@@ -5,6 +5,7 @@ cp14-food-sequence-plate-gen = {$content} dish
cp14-food-sequence-plate-cucumber = cucumber
cp14-food-sequence-plate-pumpkin = pumpkin
cp14-food-sequence-plate-cabbage = cabbage
cp14-food-sequence-plate-tomatoes = tomatoes
cp14-food-sequence-plate-cheese = cheese
cp14-food-sequence-plate-shroom = shrooms
cp14-food-sequence-plate-grass = herbs

5
Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl
View File

@@ -7,4 +7,7 @@ cp14-store-buy-alchemy-vials-name = Alchemical vials
cp14-store-buy-alchemy-vials-desc = Now the problem of shortage of potion vessels is no longer a problem! After all, for a rather modest price you can order batches of shiny vials directly from the glassblowing factory! Random alchemical devices as a gift.
cp14-store-buy-alchemy-bureaucracy-name = Bureaucratic reserve
cp14-store-buy-alchemy-bureaucracy-desc = Feather pens, inkwells and a big stack of paper. In folders of different colors, or without folders at all: because we make sure that you can choose the option that is most comfortable for you.
cp14-store-buy-alchemy-bureaucracy-desc = Feather pens, inkwells and a big stack of paper. In folders of different colors, or without folders at all: because we make sure that you can choose the option that is most comfortable for you.
cp14-store-buy-alchemy-farm-seeds-name = Seeds for farming
cp14-store-buy-alchemy-farm-seeds-desc = A set of different seeds, for farming of all kinds! Don't limit yourself, buy several boxes at once, just in case the farmers eat everything and don't have any food left to process into seeds.

5
Resources/Locale/en-US/_CP14/travelingStoreship/positions_sell.ftl
View File

@@ -7,4 +7,7 @@ cp14-store-sell-ironbar-name = 10 iron bars
cp14-store-sell-ironbar-desc = Iron is an indispensable material for the production of... almost anything that has any durability in this world. And surely the Empire could use an extra shipment.
cp14-store-sell-copperbar-name = 10 copper bars
cp14-store-sell-copperbar-desc = We're waiting for a description from the lorekeepers.
cp14-store-sell-copperbar-desc = We're waiting for a description from the lorekeepers.
cp14-store-sell-wheat-name = 10 sheaves of wheat
cp14-store-sell-wheat-desc = Stockpile food for winter for livestock.

1
Resources/Locale/ru-RU/_CP14/nutrition/food-sequence.ftl
View File

@@ -5,6 +5,7 @@ cp14-food-sequence-plate-gen = блюдо с {$content}
cp14-food-sequence-plate-cucumber = огурчиками
cp14-food-sequence-plate-pumpkin = тыквой
cp14-food-sequence-plate-cabbage = капустой
cp14-food-sequence-plate-tomatoes = томатами
cp14-food-sequence-plate-cheese = сыром
cp14-food-sequence-plate-shroom = грибами
cp14-food-sequence-plate-grass = травами

5
Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl
View File

@@ -7,4 +7,7 @@ cp14-store-buy-alchemy-vials-name = Алхимические пузырьки
cp14-store-buy-alchemy-vials-desc = Теперь проблема дефицита емкостей для зелий больше не проблема! Ведь по довольно скромной цене вы можете заказывать партии блестящих склянок прямо с стеклодульного завода! Случайные алхимические приборы в подарок.
cp14-store-buy-alchemy-bureaucracy-name = Бюрократический запас
cp14-store-buy-alchemy-bureaucracy-desc = Ручки, чернильницы и большая пачка бумаги. В папках разных цветов, и вовсе без папок: ведь мы заботимся о том, чтобы вы могли выбирать тот вариант, который вам комфортнее.
cp14-store-buy-alchemy-bureaucracy-desc = Ручки, чернильницы и большая пачка бумаги. В папках разных цветов, и вовсе без папок: ведь мы заботимся о том, чтобы вы могли выбирать тот вариант, который вам комфортнее.
cp14-store-buy-alchemy-farm-seeds-name = Семена для фермерства
cp14-store-buy-alchemy-farm-seeds-desc = Набор разных семян, для фермерства всех видов! Не ограничивайте себя, купите сразу несколько ящиков, на случай, если фермеры все съедят и не оставят еды на переработку в семена.

5
Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_sell.ftl
View File

@@ -7,4 +7,7 @@ cp14-store-sell-ironbar-name = 10 железных слитков
cp14-store-sell-ironbar-desc = Железо - незаменимый материал для производства... почти всего, что имеет какую либо долговечность в этом мире. И конечно же, Империя не откажется от дополнительной партии.
cp14-store-sell-copperbar-name = 10 медных слитков
cp14-store-sell-copperbar-desc = Ждем описания от лороведов.
cp14-store-sell-copperbar-desc = Ждем описания от лороведов.
cp14-store-sell-wheat-name = 10 снопов пшеницы
cp14-store-sell-wheat-desc = Запасы продовольствия на зиму для скота.

20
Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml
View File

@@ -41,4 +41,22 @@
#Gift
- id: CP14Inkwell
amount: 1
prob: 0.2
prob: 0.2
- type: entity
parent: CP14BrassChest
id: CP14BrassChestFilledFarmSeeds
suffix: Farm Seeds
components:
- type: StorageFill
contents:
- id: CP14SeedWheat
amount: 3
- id: CP14SeedPumpkin
amount: 3
- id: CP14SeedCabbage
amount: 3
- id: CP14SeedCucumber
amount: 3
- id: CP14SeedTomato
amount: 3

73
Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml
View File

@@ -220,4 +220,75 @@
Quantity: 3
- type: FoodSequenceElement
entries:
CP14Plate: CP14PlateCucumber
CP14Plate: CP14PlateCucumber
- type: entity
id: CP14FoodTomatoes
parent: FoodInjectableBase
categories: [ ForkFiltered ]
name: tomatoes
description: A red, juicy tomato. You just want to throw it in someone's face!
components:
- type: Item
size: Tiny
- type: FlavorProfile
flavors:
- tomato
- type: Sprite
sprite: _CP14/Objects/Flora/Farm/tomatoes.rsi
layers:
- state: base1
map: [ "random" ]
- type: RandomSprite
available:
- random:
base1: ""
base2: ""
base3: ""
- type: SolutionContainerManager
solutions:
food:
maxVol: 8
reagents:
- ReagentId: Nutriment
Quantity: 3
- ReagentId: Vitamin
Quantity: 3
- type: SliceableFood
count: 3
sliceTime: 1
slice: CP14FoodTomatoesSlice
- type: entity
id: CP14FoodTomatoesSlice
parent: FoodInjectableBase
categories: [ ForkFiltered ]
name: tomato slice
description: Thin red tomato slice. It's no longer as nice to throw at people as whole tomatoes.
components:
- type: Item
size: Tiny
- type: FlavorProfile
flavors:
- tomato
- type: Sprite
sprite: _CP14/Objects/Flora/Farm/tomatoes.rsi
layers:
- state: slice1
map: [ "random" ]
- type: RandomSprite
available:
- random:
slice1: ""
- type: SolutionContainerManager
solutions:
food:
maxVol: 3 # 1/3 pumpkin
reagents:
- ReagentId: Nutriment
Quantity: 1
- ReagentId: Vitamin
Quantity: 1
- type: FoodSequenceElement
entries:
CP14Plate: CP14PlateTomatoesSlice

5
Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml
View File

@@ -17,4 +17,7 @@
available:
- random:
base1: ""
base2: ""
base2: ""
- type: Tag
tags:
- CP14Wheat

4
Resources/Prototypes/_CP14/Entities/Objects/Specific/Farming/seeds.yml
View File

@@ -71,5 +71,5 @@
layers:
- state: bag
- state: tomato
#- type: CP14Seed
# plantProto: CP14PlantWheat
- type: CP14Seed
plantProto: CP14PlantTomatoes

6
Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/cucumber.yml
View File

@@ -19,11 +19,11 @@
- type: CP14PlantGrowing
energyCost: 1
resourceCost: 1
growthPerUpdate: 0.1 # 10 minute to full grow
growthPerUpdate: 0.05 # 20 minute to full grow
- type: CP14PlantFading
resourcePerMinute: 0.25 #20 minute from water
resourcePerMinute: 0.15
- type: CP14PlantGatherable
deleteAfterHarvest: true
deleteAfterHarvest: false
loot:
All: CP14GatherCucumber
- type: Destructible

69
Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/tomatoes.yml Normal file
View File

@@ -0,0 +1,69 @@
- type: entity
id: CP14PlantTomatoes
parent: CP14GatherablePlantBase
name: tomatoes
description: OOO # TODO
components:
- type: Sprite
sprite: _CP14/Structures/Flora/Farm/tomatoes.rsi
layers:
- state: grow-1
map: ["enum.PlantVisualLayers.Base"]
- type: CP14PlantMetabolizer
metabolizerId: Base
- type: CP14PlantEnergyFromLight
energy: 1
daytime: true
- type: CP14PlantVisuals
growthSteps: 6
- type: CP14PlantGrowing
energyCost: 1
resourceCost: 1
growthPerUpdate: 0.05 # 20 minute to full grow
- type: CP14PlantFading
resourcePerMinute: 0.15
- type: CP14PlantGatherable
deleteAfterHarvest: false
loot:
All: CP14GatherTomatoes
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 25
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTypeTrigger
damageType: Cellular
damage: 1
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:SpawnEntitiesBehavior
spawn:
CP14PlantTomatoesDeath:
min: 1
max: 1
- type: entity
id: CP14PlantTomatoesDeath
name: dead tomatoes
description: The sad spectacle of wasted food.
parent: CP14GatherableBase
components:
- type: Sprite
sprite: _CP14/Structures/Flora/Farm/tomatoes.rsi
state: death
- type: Gatherable
toolWhitelist:
tags:
- CP14HerbalGathering
- type: entityLootTable
id: CP14GatherTomatoes
entries:
- id: CP14FoodTomatoes
amount: 1
maxAmount: 3

22
Resources/Prototypes/_CP14/Objectives/empire_orders.yml
View File

@@ -53,12 +53,28 @@
- type: entity
parent: CP14BaseTownBankEarningObjective
id: CP14TownBankEarningObjective
id: CP14TownBankEarningObjectiveSmall
components:
- type: CP14CurrencyStoredCondition
currency: 50000
currency: 10000
- type: entity
parent: CP14BaseTownBankEarningObjective
id: CP14TownBankEarningObjectiveMedium
components:
- type: CP14CurrencyStoredCondition
currency: 20000
- type: entity
parent: CP14BaseTownBankEarningObjective
id: CP14TownBankEarningObjectiveBig
components:
- type: CP14CurrencyStoredCondition
currency: 30000
- type: weightedRandom
id: CP14BankEarningObjectiveGroup
weights:
CP14TownBankEarningObjective: 1
CP14TownBankEarningObjectiveSmall: 1
CP14TownBankEarningObjectiveMedium: 0.6
CP14TownBankEarningObjectiveBig: 0.3

8
Resources/Prototypes/_CP14/Objectives/personal_objectives.yml
View File

@@ -41,7 +41,7 @@
- type: Objective
difficulty: 0.5
- type: CP14CurrencyCollectCondition
currency: 650
currency: 750
- type: entity
parent: CP14BasePersonalCurrencyCollectObjective
@@ -50,11 +50,11 @@
- type: Objective
difficulty: 1
- type: CP14CurrencyCollectCondition
currency: 800
currency: 1000
- type: weightedRandom
id: CP14PersonalCurrencyCollectObjectiveGroup
weights:
CP14PersonalCurrencyCollectObjectiveSmall: 1
CP14PersonalCurrencyCollectObjectiveSmall: 0.25
CP14PersonalCurrencyCollectObjectiveMedium: 0.5
CP14PersonalCurrencyCollectObjectiveBig: 0.25
CP14PersonalCurrencyCollectObjectiveBig: 1

9
Resources/Prototypes/_CP14/Recipes/Cooking/food_sequence_elements.yml
View File

@@ -31,6 +31,15 @@
- sprite: _CP14/Objects/Flora/Farm/cabbage.rsi
state: plate3
- type: foodSequenceElement
id: CP14PlateTomatoesSlice
name: cp14-food-sequence-plate-tomatoes
sprites:
- sprite: _CP14/Objects/Flora/Farm/tomatoes.rsi
state: plate1
- sprite: _CP14/Objects/Flora/Farm/tomatoes.rsi
state: plate2
- type: foodSequenceElement
id: CP14PlateCheeseSlice
name: cp14-food-sequence-plate-cheese

32
Resources/Prototypes/_CP14/Store/buy.yml
View File

@@ -1,5 +1,5 @@
- type: storePositionBuy
id: CP14AlchemyNormalizer
id: AlchemyNormalizer
name: cp14-store-buy-alchemy-normalizer-name
desc: cp14-store-buy-alchemy-normalizer-desc
code: NORMALIZER
@@ -15,7 +15,7 @@
CP14AlchemyNormalizer: 1
- type: storePositionBuy
id: CP14AlchemyVials
id: AlchemyVials
name: cp14-store-buy-alchemy-vials-name
desc: cp14-store-buy-alchemy-vials-desc
code: VIALS
@@ -23,15 +23,15 @@
sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
state: vial
price:
min: 200
max: 300
min: 80
max: 180
services:
- !type:CP14BuyItemsService
product:
CP14BrassChestFilledAlchemy: 1
- type: storePositionBuy
id: CP14Bureaucracy
id: Bureaucracy
name: cp14-store-buy-alchemy-bureaucracy-name
desc: cp14-store-buy-alchemy-bureaucracy-desc
code: PAPER
@@ -39,9 +39,25 @@
sprite: _CP14/Objects/Bureaucracy/paper.rsi
state: folder_red
price:
min: 200
max: 300
min: 50
max: 150
services:
- !type:CP14BuyItemsService
product:
CP14BrassChestFilledBureaucracy: 1
CP14BrassChestFilledBureaucracy: 1
- type: storePositionBuy
id: FarmSeeds
name: cp14-store-buy-alchemy-farm-seeds-name
desc: cp14-store-buy-alchemy-farm-seeds-desc
code: SEEDS
icon:
sprite: _CP14/Objects/Specific/Farming/seeds.rsi
state: seeds
price:
min: 30
max: 100
services:
- !type:CP14BuyItemsService
product:
CP14BrassChestFilledFarmSeeds: 1

16
Resources/Prototypes/_CP14/Store/sell.yml
View File

@@ -38,4 +38,20 @@
max: 500
service: !type:CP14SellStackService
stackId: CP14CopperBar
count: 10
- type: storePositionSell
id: Wheat
name: cp14-store-sell-wheat-name
desc: cp14-store-sell-wheat-desc
icon:
sprite: _CP14/Objects/Flora/Farm/wheat.rsi
state: base1
price:
min: 10
max: 50
service: !type:CP14SellWhitelistService
whitelist:
tags:
- CP14Wheat
count: 10

3
Resources/Prototypes/_CP14/tags.yml
View File

@@ -51,3 +51,6 @@
- type: Tag
id: CP14Rabbit
- type: Tag
id: CP14Wheat

BIN
Resources/Textures/_CP14/Objects/Flora/Farm/tomatoes.rsi/base1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B

BIN
Resources/Textures/_CP14/Objects/Flora/Farm/tomatoes.rsi/base2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 316 B

BIN
Resources/Textures/_CP14/Objects/Flora/Farm/tomatoes.rsi/base3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 265 B

29
Resources/Textures/_CP14/Objects/Flora/Farm/tomatoes.rsi/meta.json Normal file
View File

@@ -0,0 +1,29 @@
{
"version": 1,
"license": "CLA",
"copyright": "Created by omsoyk (Discord), slice created by Artista, plate created by TheShuEd",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "base1"
},
{
"name": "base2"
},
{
"name": "base3"
},
{
"name": "slice1"
},
{
"name": "plate1"
},
{
"name": "plate2"
}
]
}

BIN
Resources/Textures/_CP14/Objects/Flora/Farm/tomatoes.rsi/plate1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 184 B

BIN
Resources/Textures/_CP14/Objects/Flora/Farm/tomatoes.rsi/plate2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 235 B

BIN
Resources/Textures/_CP14/Objects/Flora/Farm/tomatoes.rsi/slice1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 314 B

3
Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/meta.json
View File

@@ -22,6 +22,9 @@
{
"name": "pumpkin"
},
{
"name": "seeds"
},
{
"name": "tomato"
},

BIN
Resources/Textures/_CP14/Objects/Specific/Farming/seeds.rsi/seeds.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 845 B

BIN
Resources/Textures/_CP14/Structures/Flora/Farm/tomatoes.rsi/death.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
Resources/Textures/_CP14/Structures/Flora/Farm/tomatoes.rsi/grow-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 428 B

BIN
Resources/Textures/_CP14/Structures/Flora/Farm/tomatoes.rsi/grow-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 534 B

BIN
Resources/Textures/_CP14/Structures/Flora/Farm/tomatoes.rsi/grow-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 627 B

BIN
Resources/Textures/_CP14/Structures/Flora/Farm/tomatoes.rsi/grow-4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
Resources/Textures/_CP14/Structures/Flora/Farm/tomatoes.rsi/grow-5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
Resources/Textures/_CP14/Structures/Flora/Farm/tomatoes.rsi/grow-6.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

32
Resources/Textures/_CP14/Structures/Flora/Farm/tomatoes.rsi/meta.json Normal file
View File

@@ -0,0 +1,32 @@
{
"version": 1,
"license": "CLA",
"copyright": "Created by omsoyk (Discord)",
"size": {
"x": 48,
"y": 48
},
"states": [
{
"name": "grow-1"
},
{
"name": "grow-2"
},
{
"name": "grow-3"
},
{
"name": "grow-4"
},
{
"name": "grow-5"
},
{
"name": "grow-6"
},
{
"name": "death"
}
]
}