Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Money Tree Expedition Reward, and Pears. #124

Merged
merged 12 commits into from Aug 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/flavors/flavor-profiles.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ flavor-complex-tomato = like tomatoes
flavor-complex-corn = like corn
flavor-complex-banana = like bananas
flavor-complex-apple = like apples
flavor-complex-pear = like pears
flavor-complex-bungo = like bungo
flavor-complex-raisins = like dried grapes
flavor-complex-orange = like oranges
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
OnionSeeds: 5
OnionRedSeeds: 5
OrangeSeeds: 5
PearSeeds: 3
PoppySeeds: 3
PotatoSeeds: 5
RiceSeeds: 5
Expand Down
3 changes: 2 additions & 1 deletion Resources/Prototypes/Procedural/salvage_rewards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@
MaterialReclaimerMachineCircuitboard: 1.0
CratePirateChest: 0.5
ClothingOuterArmorReflective: 0.5

MoneyTreeSeeds: 0.5


- type: weightedRandom
id: SalvageRewardEpic
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
- type: entity
name: pear
parent: FoodProduceBase
id: FoodPear
description: it's peary good.
components:
- type: FlavorProfile
flavors:
- pear
- type: SolutionContainerManager
solutions:
food:
maxVol: 15
reagents:
- ReagentId: Nutriment
Quantity: 10
- ReagentId: Vitamin
Quantity: 5
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/pear.rsi
- type: Produce
seedId: pear
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
- type: entity
parent: SeedBase
name: packet of money tree seeds
description: "these seeds seem like a miracle, but expert farmers get rich from the kitchen"
id: MoneytreeSeeds
components:
- type: Seed
seedId: moneytree
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/moneytree.rsi
#Description Is Sneaky KitchenFarms Tribute, LLKF, CentCom Owes Us a Million! =)

# - type: entity
# parent: MoneytreeSeeds
# name: packet of money tree seeds
# suffix: "1000"
# description: "these seeds really are a miracle!"
# id: MoneytreeSeeds1000
# components:
# - type: Seed
# seedId: moneytree1000
# commented out at present, intended to be admin spawn item? can be changed easily.

- type: entity
parent: SeedBase
name: packet of pear seeds
description: "they are peary good for you."
id: PearSeeds
components:
- type: Seed
seedId: pear
- type: Sprite
sprite: _NF/Objects/Specific/Hydroponics/pear.rsi
61 changes: 61 additions & 0 deletions Resources/Prototypes/_NF/Hydroponics/seeds.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
- type: seed
id: moneytree
name: money tree
noun: seeds-noun-seeds
displayName: money
plantRsi: _NF/Objects/Specific/Hydroponics/moneytree.rsi
packetPrototype: MoneytreeSeeds
productPrototypes:
- SpaceCash
harvestRepeat: Repeat
lifespan: 45
maturation: 15
production: 8
yield: 3
potency: 10
growthStages: 2
idealLight: 6

# - type: seed
# id: moneytree1000
# name: money tree
# noun: seeds-noun-seeds
# displayName: money
# plantRsi: _NF/Objects/Specific/Hydroponics/moneytree.rsi
# packetPrototype: MoneytreeSeeds1000
# productPrototypes:
# - SpaceCash1000
# harvestRepeat: Repeat
# lifespan: 45
# maturation: 15
# production: 8
# yield: 3
# potency: 10
# growthStages: 2
# idealLight: 6

- type: seed
id: pear
name: pear
noun: seeds-noun-seeds
displayName: pear tree
plantRsi: _NF/Objects/Specific/Hydroponics/pear.rsi
packetPrototype: PearSeeds
productPrototypes:
- FoodPear
harvestRepeat: Repeat
lifespan: 55
maturation: 6
production: 6
yield: 3
potency: 10
idealLight: 6
chemicals:
Nutriment:
Min: 2
Max: 10
PotencyDivisor: 10
Vitamin:
Min: 1
Max: 5
PotencyDivisor: 25
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a edited by terezi",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "dead"
},
{
"name": "harvest"
},
{
"name": "seed"
},
{
"name": "stage-1"
},
{
"name": "stage-2"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Taken from https://ninjikin.itch.io/fruit edited by terezi4real github",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "dead"
},
{
"name": "seed"
},
{
"name": "stage-1"
},
{
"name": "stage-2"
},
{
"name": "stage-3"
},
{
"name": "stage-4"
},
{
"name": "stage-5"
},
{
"name": "stage-6"
},
{
"name": "harvest"
},
{
"name": "produce"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading