From 9690077532bc92d6c65480c08d43d19bf7cb6da3 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 18 May 2024 15:16:20 +0300 Subject: [PATCH] Bloodgrass gatherable entity + gatherable system cleanup + bugfix (#154) * added 4 basic reagent effects * entrance bugfixes * add bloodgrass world sprites * preuso cherry pick * add planet bloodgrass and sickle gathering * +1 gather sound --- .../Components/GatherableComponent.cs | 18 ++-- .../Gatherable/GatherableSystem.Projectile.cs | 14 ++- Content.Server/Gatherable/GatherableSystem.cs | 27 +++--- Resources/Audio/_CP14/Items/attributions.yml | 7 +- Resources/Audio/_CP14/Items/grass_gather.ogg | Bin 0 -> 12761 bytes Resources/Audio/_CP14/Items/grass_gather2.ogg | Bin 0 -> 17589 bytes Resources/Audio/_CP14/Items/grass_gather3.ogg | Bin 0 -> 13573 bytes .../reagents/meta/basic-effect-reagent.ftl | 14 +++ .../reagents/meta/basic-effect-reagent.ftl | 14 +++ .../Entities/Objects/Misc/spaceshroom.yml | 17 ++-- .../Entities/Structures/Walls/asteroid.yml | 4 +- .../Entities/Objects/Weapons/Melee/sickle.yml | 5 +- .../Entities/Structures/Specific/herbals.yml | 82 ++++++++++++++++++ .../Entities/Structures/dungeon_entrance.yml | 3 +- .../_CP14/Reagents/basic-effects.yml | 73 ++++++++++++++++ .../_CP14/Recipes/Reactions/biological.yml | 30 ++++--- .../_CP14/SoundCollections/alchemy.yml | 9 +- Resources/Prototypes/_CP14/tags.yml | 3 + .../Guidebook_EN/AlchemyTabs/BasicAlchemy.xml | 4 +- .../Guidebook_RU/AlchemyTabs/BasicAlchemy.xml | 4 +- .../Alchemy/Herbal/bloodgrass.rsi/grass1.png | Bin 0 -> 1152 bytes .../Alchemy/Herbal/bloodgrass.rsi/grass2.png | Bin 0 -> 1162 bytes .../Alchemy/Herbal/bloodgrass.rsi/grass3.png | Bin 0 -> 1076 bytes .../Alchemy/Herbal/bloodgrass.rsi/grass4.png | Bin 0 -> 705 bytes .../Alchemy/Herbal/bloodgrass.rsi/grass5.png | Bin 0 -> 710 bytes .../Alchemy/Herbal/bloodgrass.rsi/meta.json | 17 +++- 26 files changed, 285 insertions(+), 60 deletions(-) create mode 100644 Resources/Audio/_CP14/Items/grass_gather.ogg create mode 100644 Resources/Audio/_CP14/Items/grass_gather2.ogg create mode 100644 Resources/Audio/_CP14/Items/grass_gather3.ogg create mode 100644 Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl create mode 100644 Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml create mode 100644 Resources/Prototypes/_CP14/Reagents/basic-effects.yml create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass1.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass2.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass3.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass4.png create mode 100644 Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass5.png diff --git a/Content.Server/Gatherable/Components/GatherableComponent.cs b/Content.Server/Gatherable/Components/GatherableComponent.cs index f1d0c6ef74..5480f4404f 100644 --- a/Content.Server/Gatherable/Components/GatherableComponent.cs +++ b/Content.Server/Gatherable/Components/GatherableComponent.cs @@ -1,4 +1,6 @@ +using Content.Shared.EntityList; using Content.Shared.Whitelist; +using Robust.Shared.Prototypes; namespace Content.Server.Gatherable.Components; @@ -10,7 +12,7 @@ public sealed partial class GatherableComponent : Component /// Whitelist for specifying the kind of tools can be used on a resource /// Supports multiple tags. /// - [DataField("whitelist", required: true)] + [DataField(required: true)] public EntityWhitelist? ToolWhitelist; /// @@ -18,14 +20,20 @@ public sealed partial class GatherableComponent : Component /// (Tag1, Tag2, LootTableID1, LootTableID2 are placeholders for example) /// -------------------- /// useMappedLoot: true - /// whitelist: + /// toolWhitelist: /// tags: /// - Tag1 /// - Tag2 - /// mappedLoot: + /// loot: /// Tag1: LootTableID1 /// Tag2: LootTableID2 /// - [DataField("loot")] - public Dictionary? MappedLoot = new(); + [DataField] + public Dictionary>? Loot = new(); + + /// + /// Random shift of the appearing entity during gathering + /// + [DataField] + public float GatherOffset = 0.3f; } diff --git a/Content.Server/Gatherable/GatherableSystem.Projectile.cs b/Content.Server/Gatherable/GatherableSystem.Projectile.cs index f773ca2dbb..3ab8872fd7 100644 --- a/Content.Server/Gatherable/GatherableSystem.Projectile.cs +++ b/Content.Server/Gatherable/GatherableSystem.Projectile.cs @@ -1,7 +1,5 @@ using Content.Server.Gatherable.Components; -using Content.Server.Projectiles; using Content.Shared.Projectiles; -using Content.Shared.Weapons.Ranged.Systems; using Robust.Shared.Physics.Events; namespace Content.Server.Gatherable; @@ -13,20 +11,20 @@ public sealed partial class GatherableSystem SubscribeLocalEvent(OnProjectileCollide); } - private void OnProjectileCollide(EntityUid uid, GatheringProjectileComponent component, ref StartCollideEvent args) + private void OnProjectileCollide(Entity gathering, ref StartCollideEvent args) { if (!args.OtherFixture.Hard || args.OurFixtureId != SharedProjectileSystem.ProjectileFixture || - component.Amount <= 0 || + gathering.Comp.Amount <= 0 || !TryComp(args.OtherEntity, out var gatherable)) { return; } - Gather(args.OtherEntity, uid, gatherable); - component.Amount--; + Gather(args.OtherEntity, gathering, gatherable); + gathering.Comp.Amount--; - if (component.Amount <= 0) - QueueDel(uid); + if (gathering.Comp.Amount <= 0) + QueueDel(gathering); } } diff --git a/Content.Server/Gatherable/GatherableSystem.cs b/Content.Server/Gatherable/GatherableSystem.cs index 11295bb3a3..44e60cb102 100644 --- a/Content.Server/Gatherable/GatherableSystem.cs +++ b/Content.Server/Gatherable/GatherableSystem.cs @@ -1,11 +1,9 @@ using Content.Server.Destructible; using Content.Server.Gatherable.Components; -using Content.Shared.EntityList; using Content.Shared.Interaction; using Content.Shared.Tag; using Content.Shared.Weapons.Melee.Events; using Robust.Server.GameObjects; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Prototypes; using Robust.Shared.Random; @@ -14,7 +12,7 @@ namespace Content.Server.Gatherable; public sealed partial class GatherableSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly DestructibleSystem _destructible = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; @@ -30,20 +28,20 @@ public sealed partial class GatherableSystem : EntitySystem InitializeProjectile(); } - private void OnAttacked(EntityUid uid, GatherableComponent component, AttackedEvent args) + private void OnAttacked(Entity gatherable, ref AttackedEvent args) { - if (component.ToolWhitelist?.IsValid(args.Used, EntityManager) != true) + if (gatherable.Comp.ToolWhitelist?.IsValid(args.Used, EntityManager) != true) return; - Gather(uid, args.User, component); + Gather(gatherable, args.User); } - private void OnActivate(EntityUid uid, GatherableComponent component, ActivateInWorldEvent args) + private void OnActivate(Entity gatherable, ref ActivateInWorldEvent args) { - if (component.ToolWhitelist?.IsValid(args.User, EntityManager) != true) + if (gatherable.Comp.ToolWhitelist?.IsValid(args.User, EntityManager) != true) return; - Gather(uid, args.User, component); + Gather(gatherable, args.User); } public void Gather(EntityUid gatheredUid, EntityUid? gatherer = null, GatherableComponent? component = null) @@ -60,25 +58,22 @@ public sealed partial class GatherableSystem : EntitySystem _destructible.DestroyEntity(gatheredUid); // Spawn the loot! - if (component.MappedLoot == null) + if (component.Loot == null) return; var pos = _transform.GetMapCoordinates(gatheredUid); - foreach (var (tag, table) in component.MappedLoot) + foreach (var (tag, table) in component.Loot) { if (tag != "All") { if (gatherer != null && !_tagSystem.HasTag(gatherer.Value, tag)) continue; } - var getLoot = _prototypeManager.Index(table); + var getLoot = _proto.Index(table); var spawnLoot = getLoot.GetSpawns(_random); - var spawnPos = pos.Offset(_random.NextVector2(0.3f)); + var spawnPos = pos.Offset(_random.NextVector2(component.GatherOffset)); Spawn(spawnLoot[0], spawnPos); } } } - - - diff --git a/Resources/Audio/_CP14/Items/attributions.yml b/Resources/Audio/_CP14/Items/attributions.yml index 542085c891..e4f851dd87 100644 --- a/Resources/Audio/_CP14/Items/attributions.yml +++ b/Resources/Audio/_CP14/Items/attributions.yml @@ -21,4 +21,9 @@ - files: ["campfire_whoosh.ogg"] license: "CC0-1.0" copyright: 'by GrimGrum of Freesound.org. Cropped and mixed from stereo to mono.' - source: "https://freesound.org/people/GrimGrum/sounds/412558/" \ No newline at end of file + source: "https://freesound.org/people/GrimGrum/sounds/412558/" + +- files: ["grass_gather.ogg", "grass_gather2.ogg", "grass_gather3.ogg"] + license: "CC0-1.0" + copyright: 'by hadescolossus of Freesound.org. Cropped and mixed from stereo to mono.' + source: "https://freesound.org/people/hadescolossus/sounds/705228/" \ No newline at end of file diff --git a/Resources/Audio/_CP14/Items/grass_gather.ogg b/Resources/Audio/_CP14/Items/grass_gather.ogg new file mode 100644 index 0000000000000000000000000000000000000000..84a675571ad03f450bc85fba0f2c9330448f1a50 GIT binary patch literal 12761 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 literal 0 HcmV?d00001 diff --git a/Resources/Audio/_CP14/Items/grass_gather2.ogg b/Resources/Audio/_CP14/Items/grass_gather2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4428e0187773a98de364b76867b865966b4c2be1 GIT binary patch literal 17589 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl new file mode 100644 index 0000000000..437df1f011 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -0,0 +1,14 @@ +cp14-reagent-name-basic-heal-blunt = Healing solution for bruises +cp14-reagent-desc-basic-heal-blunt = Effectively treats bones and bruises. + +cp14-reagent-name-basic-heal-piercing = Healing solution for puncture wounds +cp14-reagent-desc-basic-heal-piercing = Effectively heals puncture wounds. + +cp14-reagent-name-basic-heal-slash = Healing solution for cuts. +cp14-reagent-desc-basic-heal-slash = Effectively heals torn tissue. + +cp14-reagent-name-basic-satiate-hunger = Saturating solution +cp14-reagent-desc-basic-satiate-hunger = A mixture that effectively restores hunger. + +cp14-reagent-name-basic-satiate-thirst = Life-giving moisture. +cp14-reagent-desc-basic-satiate-thirst = A liquid that tastes very much like water. It tastes strange, but it's a good thirst quencher. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl new file mode 100644 index 0000000000..9d0e28fa9c --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl @@ -0,0 +1,14 @@ +cp14-reagent-name-basic-heal-blunt = Лечебный раствор от ушибов +cp14-reagent-desc-basic-heal-blunt = Эффективно лечит кости и ушибы. + +cp14-reagent-name-basic-heal-piercing = Лечебный раствор от уколов +cp14-reagent-desc-basic-heal-piercing = Эффективно заращивает колотые раны. + +cp14-reagent-name-basic-heal-slash = Лечебный раствор от порезов +cp14-reagent-desc-basic-heal-slash = Эффективно залечивает разорванные ткани. + +cp14-reagent-name-basic-satiate-hunger = Насыщающий раствор +cp14-reagent-desc-basic-satiate-hunger = Смесь, эффективно восстанавливающая голод. + +cp14-reagent-name-basic-satiate-thirst = Живительная влага +cp14-reagent-desc-basic-satiate-thirst = Жилкость, очень похожая на воду. Странная на вкус, но неплохо восполняет жажду. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml index 9ec6ce0ed1..347371330b 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/spaceshroom.yml @@ -19,14 +19,12 @@ !type:PhysShapeCircle radius: 0.2 - type: InteractionOutline - # TODO: Nuke this shit - - type: OreVein - oreChance: 1.0 - currentOre: SpaceShrooms - type: Gatherable - whitelist: + toolWhitelist: components: - Hands + loot: + All: SpaceshroomGather - type: Damageable damageContainer: Inorganic damageModifierSet: Wood @@ -39,6 +37,13 @@ - !type:DoActsBehavior acts: [ "Destruction" ] +- type: entityLootTable + id: SpaceshroomGather + entries: + - id: FoodSpaceshroom + amount: 1 + maxAmount: 1 + - type: entity name: spaceshroom parent: FoodProduceBase @@ -120,4 +125,4 @@ state: spaceshroom_cooked - type: Produce - type: StaticPrice - price: 40 + price: 40 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml index a8cb0b1cb8..8053a4196c 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/asteroid.yml @@ -374,8 +374,8 @@ - type: Transform noRot: true - type: SoundOnGather - - type: Gatherable - whitelist: + - type: Gatherable + toolWhitelist: tags: - Pickaxe - type: Damageable diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml index d3c9a9334c..8a8b96f042 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sickle.yml @@ -35,4 +35,7 @@ Slash: 5 Piercing: 3 soundHit: - collection: MetalThud \ No newline at end of file + collection: MetalThud + - type: Tag + tags: + - CP14HerbalGathering \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml new file mode 100644 index 0000000000..b10b589327 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml @@ -0,0 +1,82 @@ +- type: entity + id: CP14GatherableHerbalBase + parent: BaseStructure + abstract: true + components: + - type: Transform + anchored: true + - type: Physics + canCollide: false + - type: Gatherable + toolWhitelist: + tags: + - CP14HerbalGathering + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: MeleeSound + soundGroups: + Brute: + collection: CP14GrassGathering + params: + variation: 0.03 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 25 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + +# Bloodgrass + +- type: entityLootTable + id: CP14GatherBloodgrass + entries: + - id: CP14BloodGrass + amount: 1 + maxAmount: 1 + +- type: entity + id: CP14GatherableBloodgrass + parent: CP14GatherableHerbalBase + name: bloodgrass + description: The dullest and most common plant to be found in the wild is the dark brown grass. + suffix: Gatherable + components: + - type: Sprite + drawdepth: FloorTiles + sprite: _CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi + state: grass1 + - type: Gatherable + loot: + All: CP14GatherBloodgrass + +- type: entity + id: CP14GatherableBloodgrass2 + parent: CP14GatherableBloodgrass + components: + - type: Sprite + state: grass2 + +- type: entity + id: CP14GatherableBloodgrass3 + parent: CP14GatherableBloodgrass + components: + - type: Sprite + state: grass3 + +- type: entity + id: CP14GatherableBloodgrass4 + parent: CP14GatherableBloodgrass + components: + - type: Sprite + state: grass4 + +- type: entity + id: CP14GatherableBloodgrass5 + parent: CP14GatherableBloodgrass + components: + - type: Sprite + state: grass5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml b/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml index fdceac744c..57c5d479fa 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/dungeon_entrance.yml @@ -34,7 +34,7 @@ randomTeleport: false - type: entity - parent: PortalBlue + parent: CP14DungeonEntrance id: CP14DungeonEntranceAutolink suffix: Autolink Dungeon components: @@ -49,6 +49,7 @@ description: A way out of the dark underworld into the overworld. components: - type: Sprite + noRot: true sprite: /Textures/_CP14/Structures/Dungeon/holes.rsi drawdepth: Mobs layers: diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml new file mode 100644 index 0000000000..74c91d0e26 --- /dev/null +++ b/Resources/Prototypes/_CP14/Reagents/basic-effects.yml @@ -0,0 +1,73 @@ +- type: reagent + id: CP14BasicEffectHealBlunt + name: cp14-reagent-name-basic-heal-blunt + desc: cp14-reagent-desc-basic-heal-blunt + group: CP14BasicEffect + flavor: medicine + color: "#c71aaa" + physicalDesc: cp14-reagent-physical-desc-scarlet + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Blunt: -1 + +- type: reagent + id: CP14BasicEffectHealPiercing + name: cp14-reagent-name-basic-heal-piercing + desc: cp14-reagent-desc-basic-heal-piercing + group: CP14BasicEffect + flavor: medicine + color: "#e03895" + physicalDesc: cp14-reagent-physical-desc-scarlet + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Piercing: -1 + +- type: reagent + id: CP14BasicEffectHealSlash + name: cp14-reagent-name-basic-heal-slash + desc: cp14-reagent-desc-basic-heal-slash + group: CP14BasicEffect + flavor: medicine + color: "#cf153a" + physicalDesc: cp14-reagent-physical-desc-scarlet + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Slash: -1 + +- type: reagent + id: CP14BasicEffectSatiateHunger + name: cp14-reagent-name-basic-satiate-hunger + desc: cp14-reagent-desc-basic-satiate-hunger + group: CP14BasicEffect + flavor: nutriment + color: "#a35629" + physicalDesc: cp14-reagent-physical-desc-scarlet #TODO + metabolisms: + Food: + effects: + - !type:SatiateHunger + +- type: reagent + id: CP14BasicEffectSatiateThirst + name: cp14-reagent-name-basic-satiate-thirst + desc: cp14-reagent-desc-basic-satiate-thirst + group: CP14BasicEffect + flavor: nutriment + color: "#2b7fed" + physicalDesc: cp14-reagent-physical-desc-scarlet #TODO + metabolisms: + Drink: + effects: + - !type:SatiateThirst \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml index 67e01ea993..ab4bde8da1 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/biological.yml @@ -1,5 +1,5 @@ - type: reaction - id: CP14VitalExtract + id: CP14BloodGrassProcessing1 minTemp: 350 reactants: CP14Blood: @@ -7,17 +7,19 @@ CP14BloodGrassSap: amount: 2 products: - CP14VitalExtract: 3 + CP14BasicEffectSatiateHunger: 2 + CP14BasicEffectHealSlash: 0.5 + CP14BasicEffectHealPiercing: 0.5 -- type: reaction - id: CP14VitalExtractOverheating - minTemp: 450 - reactants: - CP14VitalExtract: - amount: 1 - effects: - - !type:AreaReactionEffect - duration: 20 - prototypeId: CP14MistVitalExtract - sound: - path: /Audio/Effects/smoke.ogg \ No newline at end of file +#- type: reaction +# id: CP14BloodGrassProcessingFail1 +# minTemp: 450 +# reactants: +# CP14VitalExtract: +# amount: 1 +# effects: +# - !type:AreaReactionEffect +# duration: 20 +# prototypeId: CP14MistVitalExtract +# sound: +# path: /Audio/Effects/smoke.ogg \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/SoundCollections/alchemy.yml b/Resources/Prototypes/_CP14/SoundCollections/alchemy.yml index 26c19f03b8..3e1b0111d4 100644 --- a/Resources/Prototypes/_CP14/SoundCollections/alchemy.yml +++ b/Resources/Prototypes/_CP14/SoundCollections/alchemy.yml @@ -11,4 +11,11 @@ id: CP14Bubbles files: - /Audio/Effects/Chemistry/bubbles.ogg - - /Audio/_CP14/Effects/bubbles.ogg \ No newline at end of file + - /Audio/_CP14/Effects/bubbles.ogg + +- type: soundCollection + id: CP14GrassGathering + files: + - /Audio/_CP14/Items/grass_gather.ogg + - /Audio/_CP14/Items/grass_gather2.ogg + - /Audio/_CP14/Items/grass_gather3.ogg diff --git a/Resources/Prototypes/_CP14/tags.yml b/Resources/Prototypes/_CP14/tags.yml index 7f899e8d79..260538a00c 100644 --- a/Resources/Prototypes/_CP14/tags.yml +++ b/Resources/Prototypes/_CP14/tags.yml @@ -12,3 +12,6 @@ - type: Tag id: CP14FireplaceFuel + +- type: Tag + id: CP14HerbalGathering \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/BasicAlchemy.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/BasicAlchemy.xml index ef71006f75..931c6f4df7 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/BasicAlchemy.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/BasicAlchemy.xml @@ -2,8 +2,8 @@ # Basic alchemical reagents -In the world of Eberron, there are 12 basic alchemical reagents called Extracts. They can be obtained in a variety of ways, and act as starting points for more complex alchemical recipes. +Many potions consist of the individual basic reagent effects described below: - + diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/BasicAlchemy.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/BasicAlchemy.xml index d6024d7358..2f7f5b36ee 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/BasicAlchemy.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/BasicAlchemy.xml @@ -2,8 +2,8 @@ # Основные алхимические реагенты -В мире Эберрона существует 12 базовых алхимических реагентов, называемых экстрактами. Они могут быть получены различными способами и служат отправной точкой для более сложных алхимических рецептов. +Многие зелья состоят из отдельных основных реагентных эффектов, описанных ниже: - + diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass1.png new file mode 100644 index 0000000000000000000000000000000000000000..46c9a5b349ca34ac2b9c057b99af34737f3b5c1a GIT binary patch literal 1152 zcmV-`1b_R9P)Px(I!Q!9R9JwY&e+RirxP3PaOI(4e*+-r@WG~crFrfmc8emK+shOV2N z_xIQ@KO21X(&n-C0Kg_vdDFHT^gE{y=H&N+s01){-Mbvj<|_c2woSuv0NAgOblV;q zrSfH#ed|M0w^52^meq!?n-BUOX7kleDt*h!$D>#F>m$idu}xC|8jiz9l5lT%Gy~(& zD{s+P-feq@AXQmN3HIwFkF5uyMNH50@Sbd3?w_n zN0Pt-mRUA!rfJ~!o?!u>aRTuVpSQ|W2iPdZetl%n@32i%z2KTHv#j=!BrLORy3Dfa z&~*a=4CrjTZI6cIuuW5D^A*WXUHGbt!)S4WEDQGQBO7(OzyL7?FoO^J9bJ2X$JPTM zNkYSM=(aul-ZRl6)@wBYvHkkUHcjcaJ^Aof7l%M7?8$ohzfp>}=!<2RO}A;vW9vb` zzh)EPvhqKBzvjMW<-p|p_pSMsm5*DkeCWFQUw`~oUOxdQL)SH*Yb!M2GRvkc;=rV+ zY%)$Vw({J2vI{H#zYksaZ@GCt9CXRf_cb`{fXPBBSYSBN8XL( zY`$Wn6ywpWzJEU)YGox1%}mW;8>RAwJPh(axlRe+Ef^OT>Qz6z!+8Hvy|V_PGZ>?OD{`$5yT3w7?c zJ@)G(e(#y>JjHvm@q5oY83A1hV3}n#k|aNW6qsyu@pR@QUT@KtP#U}+4z-O^G)hVd z1jL9EN~lolfONN9o3tjoQ!r^fIPD$M3#Ry-6PTJClGvc%;WJJyg-9AsX7zj>0HHWb zc1m~nE%A}eB*=L5iZrE|Z&?B7hOe93Z&^xBXQKV)i-zOy87J42Q%{s^a#buHbd79%r#Bh)_rnq zlhadBmQpQ5bMlQ+S~$$Zgosb!zyZZIP!ObYsp`PQ%qCjIh{GFw0T7B*i|WnhE1kfF z>VYZKnk7Ak0^-gt*9Npmf?`|n1X#eM_syWsl!GT{FMpbX+x@T%_t!hZq5I*?3! SWm#kZ0000Px(L`g(JR9JBDp~{94^0-zx=P+aO=1X`>3#Ja^okfGEl9K=58e*D6gLP0zCO(ZIoa zvjqT*1`YsV{y5;nbkH=mS1Rwd+c@q{cuVB9i-SCL+?_C;46zRtgK5TEH{3+#)5#F= z>%VwQBzo<3p)@G~g;BzWJN*_q{TAFr;E-iFWEn;S2c3Qk0PqsNpLv09zus&y?GND! z@fCuZZRewbgX8W5Z~TD6CWF%z@Wu}Sz@Bl1Ko})(6Tx1g+mrF*?o@cL5(>IKhw96V zXzrCl??d5LN+1Gat$hH&v_Ircv_}6Fo=(4o5sL8bl>z{a9S5!uaD~XL#3av>S7WUk z%~)$6Qj&52z$#7seW(I}0m1w(KNP!=;_nK9Rhs&4mIW7y86~+191#FuLFg8r|I5ld zuNf({nAvvFYqxR8GML7~D8blq;B*B8GrX|yEGw8l4(Rqi09?&m5|c!GrSLp|!b|v$ z(v9%N7XVdavO&+XOm8oLe8>27Qf9FHPza+0>&=$GQyN!^=~-4Oq~zJ=EdX^427p&7 zaW64Vqo&;SK&*8mj1p$>bTVWHSBZJtotO)hJ-_|@9j{Wd=gew)mj_6kt|;9e1yPru zAbm&~jNzDG0f6OyfB%E|;{ct0t5gB0CtUTw%(inv97YM8t|&3skY%j3Uo}3n?fiNE zR7%yVum^56nlMW0jF&*rGjP2EmHn_0*Qj`rUI6ec zt7ylNGOx?$m++m*(`&a&H#E6Iz|Cq{6;}wz55?)c-fRmF)HRwgN;ri8Fc@=Ex`Sv- za~N4~wtNu|0g9M%Dp5#CC^W7ReE7IKu{-Mu6`hZ@ZV;KNiSay8@zOHZ+IO?;t6@Y* z@H~IQad(3JP{kCq$l5TopflGrv7@fOV literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass3.png new file mode 100644 index 0000000000000000000000000000000000000000..f9d2e37a4571f160225a4893dba922d488b3bdfd GIT binary patch literal 1076 zcmV-41k3x0P)Px&?ny*JR9JhB_dkw_@$o_i{HdU`*@~E=I1E+7n4;&; zpPoARyX2OXvowBRt)R9|1HD#3Js%F9>wxLx5sPxAdO@Jq62=sl(z)N3n}jjd3j!>w zHI~&Hyxs!%DE~VE$9#xjc`1`Ma@UjsY z4kEm41a{RCy&ym>gj0FjG~o3fSsG(mtuY)#&V8K@jKfg%f&jeUBN^QT8$i6hr+-o0JDU#!j3XwtT;zW>)HY8hi%h3a>OvLbdkKcdr@W=Yk+zjH^UxvkRgIgWUvRY%?G?-2v^*cGynJU{@Ed(Y%4;E~WRasJdx0&ZYETHm9cA zHVugBlF>bgxEAFKwGfEz-iha1QPo-kN+UH;-}ki>MhbJ_gczd)Uq#h842w2uHx<^cmNmwcKysUT{DDSL#wq30bn?YG=>d|)sbD{=*7M)jWsMuoDOg)y;=x} zw+6#OWD>~CwT~Rl(%3l*XdeajvJu+RE*R$I#F=PxSKD_3a+I=QJF3rg46QCG%zzVo z`o2$;>zQ?bJ{&X*?O{ZEfF3?Gnky!KclE%WG6Co=wy$0q+oti4@rPm*Maa?^SsEi@ zOpU{^pm(!bJE<5Jlqm2N9Xq?JSKoDcN0YI6*%>NogRJuNwf+0n|e1GPGvERr5u; zy87y64kQ|Altpr89ENTtBylm9VLV40+@$o%*A2LoISrpSYVV|CSIy0C?-FxnbTOtA z1zp!|%XsTe+4W7IWt6ZJhIIS+p6j+Npb;Vr2N8aH_z`s}fR+-H%;-+wx&wTNIM3^B uLYv|KuQ<+|e=VhU#9cMNM$Gf(0Pr8>bTUqt5ISxE0000^{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/grass4.png new file mode 100644 index 0000000000000000000000000000000000000000..5163ba74b1dbe1c7e9c044f7f3437db3e32ea385 GIT binary patch literal 705 zcmV;y0zUnTP)Px%dr3q=R9J=WRm+O%KoC7%h9+haot6PfR#61k5?uHPLgs4~<`1%v!S%o}aWz4Z z)v4;P)4&4{`~ZfIqi)^%=O=;(15cB51$Rt}!ywAT847{_MwQL)oNrs-w5yc4>d0xATfO(#&5NO%<$<2#A zuSIbJ-n7uNZ8X|-nhJrUazn>a<}sG-r?NxDi5j=NXxTPWA;6c`$&xPe{1tIB8FgH| zMPG%z4?gO+n$#+i>cz4U47_6F9BQ`R)}E@IZk9WwLR?%@B0<3cOlj_Y{tciwR;uV` zxkJz8SV^g>9EUz*lTpW|;73lY_88xKozIvWkGj|_cgWTfsSp5)JHwk6qBub%f&FGP zqjLm~Kt})ojdmSx(HHuhgEuX0FY^4gstcw7a8GbTww8$ELqlt* z46zGOZoUNN_NrJyfy=fYJL&?{(QLb|nPX(rSTOK_In+u@(6_k;$47T`lm`T~Q-bMy zZ_l>d8m%Lxq*l8HngHoPIit6LZZZIv8Q=Q`5DwaqGFyE7)ly8oOQHl6is>_^`kW&b z0>Qwen||>dK+qK!I*#hO9Gm41e*YQiT!1$%`2A-9g`$;O6TDeGQbt>axUyw6ft8eK zttCFP42ZQ3OoFyoF7FgTXubg@#k>k;$-)ZtgU{FmKv|MQbN(LDDxVoSo|fz?$5ldd nwPIdPx%fJsC_R9J=WR>7*`Fcduwk5IdKYUDw1R(T?HJq)w(4+`~b75oFgp&+l_m4X;` zQ%g6QMNLd&TYWq`Z!-r(l9t|+d(S<&z<=C<&zS7;`#fuflvsX(lfX> z0w<(GrgH*5W73~bA&xl!z@zk;aqkmQrw35^4~6KSfSqP>%t40^Hc^7OD0-a|P{Q*l z#U@I?y%7Ll!20Ty;F$zo>Vn7Np$r^epRG3^h>K$J%;12PfwsCE!B@{Da8plChN=yg4IhME zn#$UrPqE&7NIJZ>GABgZcS-9!@Kt!U^b=+6byxbQ3HXdjqt>-B2br)#q z3zX3S*Et{#5BfPBI(q+dS=D_f;Djva?-SdYDq?LU@a8z!<+&CP_eMCSXNY4CGcy31 zP8VFhwQO_MMjyDe%tD<)omi1j^;ATgvS6)mT(waHChKh?FhiM%O_bQrmo0PRQ-+s- s6C(e-zDmn}|0#m+46aFhXYkJO7g!8>GM7;j!vFvP07*qoM6N<$g8W%dhyVZp literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/meta.json index c589efac42..3d030c7049 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "copyright": "Base Created by TheShuEd (Github) for CrystallPunk14, Grass taken from tgstation at commits https://github.com/tgstation/tgstation/commit/729d858807905263adab8b5a331c1d8a04982dd3, and recolored", "states": [ { "name": "base1" @@ -21,6 +21,21 @@ }, { "name": "base5" + }, + { + "name": "grass1" + }, + { + "name": "grass2" + }, + { + "name": "grass3" + }, + { + "name": "grass4" + }, + { + "name": "grass5" } ] } \ No newline at end of file