From: Ubaser <134914314+UbaserB@users.noreply.github.com> Date: Tue, 13 Aug 2024 11:08:40 +0000 (+1000) Subject: Add capfruit, a gatfruit mutation. (#30850) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=135d52406ab5bae018bfee5b046ecd31e2003d69;p=space-station-14.git Add capfruit, a gatfruit mutation. (#30850) * add base * add fake suffix and flavor fix * address some reviews * parent it * fix test fail * add FoodSequence support and address small review --- diff --git a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl index 5679dd1b52..442534bdcb 100644 --- a/Resources/Locale/en-US/nutrition/components/food-sequence.ftl +++ b/Resources/Locale/en-US/nutrition/components/food-sequence.ftl @@ -52,6 +52,7 @@ food-sequence-burger-content-ambrosia = ambro food-sequence-burger-content-galaxy = galaxy food-sequence-burger-content-glasstle = glass food-sequence-burger-content-gatfruit = gat +food-sequence-burger-content-capfruit = cap food-sequence-burger-content-rice = rice food-sequence-burger-content-soy = soy food-sequence-burger-content-koibean = koi diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index f98118c23e..edf9275f84 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -124,3 +124,5 @@ seeds-cotton-name = cotton seeds-cotton-display-name = cotton plant seeds-pyrotton-name = pyrotton seeds-pyrotton-display-name = pyrotton plant +seeds-capfruit-name = capfruit +seeds-capfruit-display-name = capfruit tree diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 76256bb81e..fea880706d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -1850,6 +1850,54 @@ sprite: Objects/Specific/Hydroponics/gatfruit.rsi state: produce +- type: entity + name: capfruit + parent: FoodProduceBase + id: FoodRealCapfruit + description: A soft but smooth gun-shaped fruit. + components: + - type: FlavorProfile + flavors: + - plastic + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Sulfur + Quantity: 5 + - type: Sprite + sprite: Objects/Specific/Hydroponics/capfruit.rsi + - type: Produce + seedId: realCapfruit + - type: Food + trash: + - RevolverCapGun + - type: Tag + tags: + - Fruit + - type: FoodSequenceElement + entries: + burger: + name: food-sequence-burger-content-capfruit + sprite: + sprite: Objects/Specific/Hydroponics/capfruit.rsi + state: produce + +- type: entity + name: capfruit + parent: FoodRealCapfruit + id: FoodFakeCapfruit + suffix: Fake + components: + - type: Produce + seedId: fakeCapfruit + - type: Food + trash: + - RevolverCapGunFake + - type: entity name: rice bushel description: Can be ground into rice, perfect for pudding or sake. diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index 61da1a95fc..65f7988be0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -633,3 +633,22 @@ seedId: pyrotton - type: Sprite sprite: Objects/Specific/Hydroponics/pyrotton.rsi + +- type: entity + parent: SeedBase + id: RealCapfruitSeeds + name: packet of capfruit seeds + description: "Is it real, or is it fake?" + components: + - type: Seed + seedId: realCapfruit + - type: Sprite + sprite: Objects/Specific/Hydroponics/capfruit.rsi + +- type: entity + parent: RealCapfruitSeeds + id: FakeCapfruitSeeds + suffix: Fake + components: + - type: Seed + seedId: fakeCapfruit diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index 73ded93e0f..46dd2939bb 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1102,4 +1102,4 @@ - type: flavor id: paintthinner flavorType: Complex - description: flavor-complex-paint-thinner \ No newline at end of file + description: flavor-complex-paint-thinner diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 65fbf0b91d..86bce962b8 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -1319,6 +1319,61 @@ packetPrototype: GatfruitSeeds productPrototypes: - FoodGatfruit + mutationPrototypes: + - fakeCapfruit + - realCapfruit + lifespan: 65 + maturation: 25 + production: 25 + yield: 1 + potency: 10 + growthStages: 2 + idealLight: 6 + chemicals: + Nutriment: + Min: 1 + Max: 5 + PotencyDivisor: 20 + Sulfur: + Min: 1 + Max: 5 + PotencyDivisor: 20 + +- type: seed + id: fakeCapfruit + name: seeds-capfruit-name + noun: seeds-noun-seeds + displayName: seeds-capfruit-display-name + plantRsi: Objects/Specific/Hydroponics/capfruit.rsi + packetPrototype: FakeCapfruitSeeds + productPrototypes: + - FoodFakeCapfruit + lifespan: 65 + maturation: 25 + production: 25 + yield: 1 + potency: 10 + growthStages: 2 + idealLight: 6 + chemicals: + Nutriment: + Min: 1 + Max: 5 + PotencyDivisor: 20 + Sulfur: + Min: 1 + Max: 5 + PotencyDivisor: 20 + +- type: seed + id: realCapfruit + name: seeds-capfruit-name + noun: seeds-noun-seeds + displayName: seeds-capfruit-display-name + plantRsi: Objects/Specific/Hydroponics/capfruit.rsi + packetPrototype: RealCapfruitSeeds + productPrototypes: + - FoodRealCapfruit lifespan: 65 maturation: 25 production: 25 diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/dead.png new file mode 100644 index 0000000000..e5ac23c722 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/harvest.png new file mode 100644 index 0000000000..a39a7943ee Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json new file mode 100644 index 0000000000..037593e124 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a, redrawn by Ubaser.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce.png new file mode 100644 index 0000000000..e4c043f889 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/seed.png new file mode 100644 index 0000000000..021f448ed7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-1.png new file mode 100644 index 0000000000..b62b6da82a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-2.png new file mode 100644 index 0000000000..62c5d75920 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/capfruit.rsi/stage-2.png differ