From: BombasterDS <115770678+BombasterDS@users.noreply.github.com> Date: Sat, 27 Jul 2024 15:08:49 +0000 (+1000) Subject: Some plant mutations (#28993) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=de7df2a76001f64ae23deb07447331dc04905821;p=space-station-14.git Some plant mutations (#28993) * Some new plants mutations * glasstle inhand * gapple trico increase ↑ 1-10 to 3-16 * replace trico with doc delight --- diff --git a/Resources/Locale/en-US/seeds/seeds.ftl b/Resources/Locale/en-US/seeds/seeds.ftl index 2dc0b88c74..f98118c23e 100644 --- a/Resources/Locale/en-US/seeds/seeds.ftl +++ b/Resources/Locale/en-US/seeds/seeds.ftl @@ -32,6 +32,8 @@ seeds-potato-name = potato seeds-potato-display-name = potatoes seeds-sugarcane-name = sugarcane seeds-sugarcane-display-name = sugarcanes +seeds-papercane-name = papercane +seeds-papercane-display-name = papercanes seeds-towercap-name = tower cap seeds-towercap-display-name = tower caps seeds-steelcap-name = steel cap @@ -48,6 +50,8 @@ seeds-eggplant-name = eggplant seeds-eggplant-display-name = eggplants seeds-apple-name = apple seeds-apple-display-name = apple tree +seeds-goldenapple-name = golden apple +seeds-goldenapple-display-name = golden apple tree seeds-corn-name = corn seeds-corn-display-name = ears of corn seeds-onion-name = onion @@ -88,6 +92,8 @@ seeds-ambrosiadeus-name = ambrosia deus seeds-ambrosiadeus-display-name = ambrosia deus seeds-galaxythistle-name = galaxythistle seeds-galaxythistle-display-name = galaxythistle +seeds-glasstle-name = glasstle +seeds-glasstle-display-name = glasstle seeds-flyamanita-name = fly amanita seeds-flyamanita-display-name = fly amanita seeds-gatfruit-name = gatfruit diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index b2375a2dbf..75ed63a4ce 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -95,6 +95,21 @@ - type: Produce seedId: sugarcane +- type: entity + name: papercane roll + description: Why do we even need to grow paper? + id: Papercane + parent: ProduceBase + components: + - type: Sprite + sprite: Objects/Specific/Hydroponics/papercane.rsi + - type: SolutionContainerManager + - type: Produce + seedId: papercane + - type: Log + spawnedPrototype: SheetPaper1 + spawnCount: 2 + - type: entity parent: FoodProduceBase id: FoodLaughinPeaPod @@ -869,6 +884,42 @@ tags: - Fruit +- type: entity + name: golden apple + parent: FoodProduceBase + id: FoodGoldenApple + description: It should be shaped like a cube, shouldn't it? + components: + - type: FlavorProfile + flavors: + - apple + - metallic + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 4 + - ReagentId: DoctorsDelight + Quantity: 13 + - type: Sprite + sprite: Objects/Specific/Hydroponics/golden_apple.rsi + - type: Produce + seedId: goldenApple + - type: Extractable + juiceSolution: + reagents: + - ReagentId: JuiceApple + Quantity: 10 + - ReagentId: Gold + Quantity: 10 + - type: Tag + tags: + - Fruit + - type: entity name: cocoa pod parent: FoodProduceBase @@ -1411,6 +1462,71 @@ - Galaxythistle - Fruit # Probably? +- type: entity + name: glasstle + parent: FoodProduceBase + id: FoodGlasstle + description: A fragile crystal plant with lot of spiky thorns. + components: + - type: Item + size: Small + sprite: Objects/Specific/Hydroponics/glasstle.rsi + heldPrefix: produce + - type: FlavorProfile + flavors: + - sharp + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Razorium + Quantity: 15 + - type: Sprite + sprite: Objects/Specific/Hydroponics/glasstle.rsi + - type: Produce + seedId: glasstle + - type: Extractable + grindableSolutionName: food + - type: Damageable + damageContainer: Inorganic + - type: ToolRefinable + refineResult: + - id: SheetGlass1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + params: + volume: -4 + - !type:SpawnEntitiesBehavior + spawn: + ShardGlass: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnHit + damage: + types: + Blunt: 10 + - type: MeleeWeapon + wideAnimationRotation: 60 + damage: + types: + Slash: 15 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + - type: Tag + tags: + - Galaxythistle + + - type: entity name: fly amanita parent: FoodProduceBase diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml index abde52d406..5f6cf903aa 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -163,6 +163,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/sugarcane.rsi +- type: entity + parent: SeedBase + name: packet of papercane seeds + id: PapercaneSeeds + components: + - type: Seed + seedId: papercane + - type: Sprite + sprite: Objects/Specific/Hydroponics/papercane.rsi + - type: entity parent: SeedBase name: packet of tower cap spores @@ -243,6 +253,16 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/apple.rsi +- type: entity + parent: SeedBase + name: packet of golden apple seeds + id: GoldenAppleSeeds + components: + - type: Seed + seedId: goldenApple + - type: Sprite + sprite: Objects/Specific/Hydroponics/golden_apple.rsi + - type: entity parent: SeedBase name: packet of corn seeds @@ -427,6 +447,17 @@ - type: Sprite sprite: Objects/Specific/Hydroponics/galaxythistle.rsi +- type: entity + parent: SeedBase + name: packet of glasstle seeds + description: "Scars of gloomy nights." + id: GlasstleSeeds + components: + - type: Seed + seedId: glasstle + - type: Sprite + sprite: Objects/Specific/Hydroponics/glasstle.rsi + - type: entity parent: SeedBase name: packet of fly amanita spores diff --git a/Resources/Prototypes/Hydroponics/seeds.yml b/Resources/Prototypes/Hydroponics/seeds.yml index 5aef050fec..65fbf0b91d 100644 --- a/Resources/Prototypes/Hydroponics/seeds.yml +++ b/Resources/Prototypes/Hydroponics/seeds.yml @@ -341,6 +341,8 @@ packetPrototype: SugarcaneSeeds productPrototypes: - Sugarcane + mutationPrototypes: + - papercane harvestRepeat: Repeat lifespan: 60 maturation: 6 @@ -355,6 +357,24 @@ Max: 5 PotencyDivisor: 5 +- type: seed + id: papercane + name: seeds-papercane-name + noun: seeds-noun-seeds + displayName: seeds-papercane-display-name + plantRsi: Objects/Specific/Hydroponics/papercane.rsi + packetPrototype: PapercaneSeeds + productPrototypes: + - Papercane + harvestRepeat: Repeat + lifespan: 60 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + growthStages: 3 + idealHeat: 298 + - type: seed id: towercap name: seeds-towercap-name @@ -625,6 +645,34 @@ packetPrototype: AppleSeeds productPrototypes: - FoodApple + mutationPrototypes: + - goldenApple + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 6 + chemicals: + Nutriment: + Min: 1 + Max: 10 + PotencyDivisor: 10 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + +- type: seed + id: goldenApple + name: seeds-goldenapple-name + noun: seeds-noun-seeds + displayName: seeds-goldenapple-display-name + plantRsi: Objects/Specific/Hydroponics/golden_apple.rsi + packetPrototype: GoldenAppleSeeds + productPrototypes: + - FoodGoldenApple harvestRepeat: Repeat lifespan: 55 maturation: 6 @@ -632,6 +680,8 @@ yield: 3 potency: 10 idealLight: 6 + waterConsumption: 0.75 + nutrientConsumption: 0.75 chemicals: Nutriment: Min: 1 @@ -641,6 +691,10 @@ Min: 1 Max: 4 PotencyDivisor: 25 + DoctorsDelight: + Min: 3 + Max: 13 + PotencyDivisor: 10 - type: seed id: corn @@ -1192,6 +1246,8 @@ packetPrototype: GalaxythistleSeeds productPrototypes: - FoodGalaxythistle + mutationPrototypes: + - glasstle lifespan: 25 maturation: 10 production: 3 @@ -1205,6 +1261,28 @@ Max: 25 PotencyDivisor: 4 +- type: seed + id: glasstle + name: seeds-glasstle-name + noun: seeds-noun-seeds + displayName: seeds-glasstle-display-name + plantRsi: Objects/Specific/Hydroponics/glasstle.rsi + packetPrototype: GlasstleSeeds + productPrototypes: + - FoodGlasstle + lifespan: 25 + maturation: 10 + production: 3 + yield: 3 + potency: 10 + growthStages: 3 + waterConsumption: 0.5 + chemicals: + Razorium: + Min: 1 + Max: 25 + PotencyDivisor: 4 + - type: seed id: flyAmanita name: seeds-flyamanita-name diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png new file mode 100644 index 0000000000..fb10912e69 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png new file mode 100644 index 0000000000..924aedcea7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json new file mode 100644 index 0000000000..1359fd7f8c --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "produce-inhand-left", + "directions": 4 + }, + { + "name": "produce-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png new file mode 100644 index 0000000000..0527f86b93 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-left.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png new file mode 100644 index 0000000000..cd3cc3216e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce-inhand-right.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png new file mode 100644 index 0000000000..11c43d8d13 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png new file mode 100644 index 0000000000..f3e99168dd Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png new file mode 100644 index 0000000000..d4204913b5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png new file mode 100644 index 0000000000..804aa02012 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png new file mode 100644 index 0000000000..1e6923c9e2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/glasstle.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png new file mode 100644 index 0000000000..817c0f4bff Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png new file mode 100644 index 0000000000..5a49c3f5c5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json new file mode 100644 index 0000000000..775f8df408 --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + }, + { + "name": "stage-4" + }, + { + "name": "stage-5" + }, + { + "name": "stage-6" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png new file mode 100644 index 0000000000..4c36982960 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png new file mode 100644 index 0000000000..9fc96ba7c2 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png new file mode 100644 index 0000000000..e65be188b1 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png new file mode 100644 index 0000000000..165e17b57c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png new file mode 100644 index 0000000000..9b193a59e3 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-3.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png new file mode 100644 index 0000000000..e66ff1ddc9 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-4.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png new file mode 100644 index 0000000000..fc1807e089 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-5.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png new file mode 100644 index 0000000000..e2790c179a Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/golden_apple.rsi/stage-6.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png new file mode 100644 index 0000000000..6c7185bb1e Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/dead.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png new file mode 100644 index 0000000000..d1f2111b25 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/harvest.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json new file mode 100644 index 0000000000..3f97a14afa --- /dev/null +++ b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/1dbcf389b0ec6b2c51b002df5fef8dd1519f8068", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dead" + }, + { + "name": "harvest" + }, + { + "name": "produce" + }, + { + "name": "seed" + }, + { + "name": "stage-1" + }, + { + "name": "stage-2" + }, + { + "name": "stage-3" + } + ] +} diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png new file mode 100644 index 0000000000..fe787f35f5 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/produce.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png new file mode 100644 index 0000000000..3ba27fa5b7 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/seed.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png new file mode 100644 index 0000000000..5b26285f7c Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-1.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png new file mode 100644 index 0000000000..df5aff42b0 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-2.png differ diff --git a/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png new file mode 100644 index 0000000000..1c926be364 Binary files /dev/null and b/Resources/Textures/Objects/Specific/Hydroponics/papercane.rsi/stage-3.png differ