diff --git a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml index 82a7edf418..63e80de2ae 100644 --- a/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml +++ b/Content.Client/Guidebook/Controls/GuideReagentReaction.xaml @@ -1,44 +1,53 @@  - - - - - - - - - - - - - - diff --git a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs index fa55ce024e..76aa7458f4 100644 --- a/Content.Server/Physics/Controllers/ChasingWalkSystem.cs +++ b/Content.Server/Physics/Controllers/ChasingWalkSystem.cs @@ -72,8 +72,16 @@ public sealed class ChasingWalkSystem : VirtualController _lookup.GetEntitiesInRange(compType, _transform.GetMapCoordinates(xform), range, _potentialChaseTargets, LookupFlags.Uncontained); //If there are no required components in the radius, don't moving. + //if (_potentialChaseTargets.Count <= 0) + // return; + + //CP14 clear chasing ent if (_potentialChaseTargets.Count <= 0) + { + component.ChasingEntity = null; return; + } + //CP14 end //In the case of finding required components, we choose a random one of them and remember its uid. component.ChasingEntity = _random.Pick(_potentialChaseTargets).Owner; diff --git a/Content.Server/_CP14/Alchemy/Components/CP14SolutionNormalizerComponent.cs b/Content.Server/_CP14/Alchemy/Components/CP14SolutionCleanerComponent.cs similarity index 69% rename from Content.Server/_CP14/Alchemy/Components/CP14SolutionNormalizerComponent.cs rename to Content.Server/_CP14/Alchemy/Components/CP14SolutionCleanerComponent.cs index df26556a94..c38e604cfa 100644 --- a/Content.Server/_CP14/Alchemy/Components/CP14SolutionNormalizerComponent.cs +++ b/Content.Server/_CP14/Alchemy/Components/CP14SolutionCleanerComponent.cs @@ -7,23 +7,17 @@ namespace Content.Server._CP14.Alchemy.Components; /// /// gradually rounds down all reagents in the specified solution /// -[RegisterComponent, Access(typeof(CP14SolutionNormalizerSystem))] -public sealed partial class CP14SolutionNormalizerComponent : Component +[RegisterComponent, Access(typeof(CP14SolutionCleanerSystem))] +public sealed partial class CP14SolutionCleanerComponent : Component { [DataField(required: true)] public string Solution = string.Empty; - /// - /// will round down any reagent in solution until it is divisible by this value - /// - [DataField] - public float Factor = 0.25f; - /// /// the reagent will flow gradually by the specified number until it becomes normalized /// [DataField] - public FixedPoint2 LeakageQuantity = 0.05f; + public FixedPoint2 LeakageQuantity = 0.25f; [DataField] public TimeSpan UpdateFrequency = TimeSpan.FromSeconds(4f); diff --git a/Content.Server/_CP14/Alchemy/EntitySystems/CP14SolutionNormalizerSystem.cs b/Content.Server/_CP14/Alchemy/EntitySystems/CP14SolutionCleanerSystem.cs similarity index 62% rename from Content.Server/_CP14/Alchemy/EntitySystems/CP14SolutionNormalizerSystem.cs rename to Content.Server/_CP14/Alchemy/EntitySystems/CP14SolutionCleanerSystem.cs index 8c570f336f..52056b47ae 100644 --- a/Content.Server/_CP14/Alchemy/EntitySystems/CP14SolutionNormalizerSystem.cs +++ b/Content.Server/_CP14/Alchemy/EntitySystems/CP14SolutionCleanerSystem.cs @@ -1,3 +1,4 @@ +using Content.Server._CP14.Alchemy.Components; using Content.Server._CP14.MagicEnergy; using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.EntitySystems; @@ -8,7 +9,7 @@ using Robust.Shared.Timing; namespace Content.Server._CP14.Alchemy.EntitySystems; -public sealed partial class CP14SolutionNormalizerSystem : EntitySystem +public sealed partial class CP14SolutionCleanerSystem : EntitySystem { [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly IGameTiming _timing = default!; @@ -19,7 +20,7 @@ public sealed partial class CP14SolutionNormalizerSystem : EntitySystem { base.Update(frameTime); - var query = EntityQueryEnumerator(); + var query = EntityQueryEnumerator(); while (query.MoveNext(out var uid, out var normalizer, out var containerManager)) { if (_timing.CurTime <= normalizer.NextUpdateTime) @@ -41,31 +42,22 @@ public sealed partial class CP14SolutionNormalizerSystem : EntitySystem if (solution.Volume == 0) continue; - Dictionary affect = new(); + var minQuantity = FixedPoint2.MaxValue; + ReagentId? reagentId = null; foreach (var (id, quantity) in solution.Contents) { - FixedPoint2 roundedQuantity = Math.Floor((float) quantity / normalizer.Factor) * normalizer.Factor; - - var leakQuantity = quantity - roundedQuantity; - - if (leakQuantity == 0) continue; - - if (quantity - normalizer.LeakageQuantity < roundedQuantity) - affect.Add(id, leakQuantity); - else - affect.Add(id, normalizer.LeakageQuantity); - } - - if (affect.Count > 0) - { - //Telegraphy - _audio.PlayPvs(normalizer.NormalizeSound, uid); - - foreach (var (id, count) in affect) + if (quantity < minQuantity) { - _solutionContainer.RemoveReagent(solutionEnt.Value, id, count); + reagentId = id; + minQuantity = quantity; } } + + if (reagentId == null) + continue; + + _solutionContainer.RemoveReagent(solutionEnt.Value, reagentId.Value, normalizer.LeakageQuantity); + _audio.PlayPvs(normalizer.NormalizeSound, uid); } } } diff --git a/Content.Shared/_CP14/MagicEssence/CP14MagicEssenceSystem.cs b/Content.Shared/_CP14/MagicEssence/CP14MagicEssenceSystem.cs index d3cf371748..d41594302e 100644 --- a/Content.Shared/_CP14/MagicEssence/CP14MagicEssenceSystem.cs +++ b/Content.Shared/_CP14/MagicEssence/CP14MagicEssenceSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Chemistry.Components.SolutionManager; using Content.Shared.Chemistry.EntitySystems; using Content.Shared.Examine; using Content.Shared.Inventory; +using Content.Shared.Stacks; using Content.Shared.Throwing; using Content.Shared.Whitelist; using Robust.Shared.Audio.Systems; @@ -53,6 +54,9 @@ public partial class CP14MagicEssenceSystem : EntitySystem private void OnCollectorCollide(Entity ent, ref StartCollideEvent args) { + if (!Transform(ent).Anchored) + return; + if (!TryComp(args.OtherEntity, out var essenceComp)) return; @@ -68,7 +72,9 @@ public partial class CP14MagicEssenceSystem : EntitySystem if (!_solution.TryGetSolution((ent, collectorSolutionManager), ent.Comp.Solution, out var collectorSoln, out var collectorSolution)) return; - _solution.TryTransferSolution(collectorSoln.Value, essenceSolution, essenceSolution.Volume); + if (!_solution.TryTransferSolution(collectorSoln.Value, essenceSolution, essenceSolution.Volume)) + return; + _audio.PlayPvs(essenceComp.ConsumeSound, ent); if (_net.IsServer) @@ -110,14 +116,24 @@ public partial class CP14MagicEssenceSystem : EntitySystem if (!TryComp(uid, out var essenceContainer)) return false; + var count = 1; + + if (TryComp(uid, out var stack)) + { + count = stack.Count; + } + foreach (var essence in essenceContainer.Essences) { if (_proto.TryIndex(essence.Key, out var magicType)) { for (var i = 0; i < essence.Value; i++) { - var spawned = SpawnAtPosition(magicType.EssenceProto, Transform(uid).Coordinates); - _transform.AttachToGridOrMap(spawned); + for (var j = 0; j < count; j++) + { + var spawned = SpawnAtPosition(magicType.EssenceProto, Transform(uid).Coordinates); + _transform.AttachToGridOrMap(spawned); + } } } } @@ -134,13 +150,21 @@ public partial class CP14MagicEssenceSystem : EntitySystem if (!scanEvent.CanScan) return; + var count = 1; + + if (TryComp(ent, out var stack)) + { + count = stack.Count; + } + + var sb = new StringBuilder(); sb.Append(Loc.GetString("cp14-magic-essence-title") + "\n"); foreach (var essence in ent.Comp.Essences) { if (_proto.TryIndex(essence.Key, out var magicType)) { - sb.Append($"[color={magicType.Color.ToHex()}]{Loc.GetString(magicType.Name)}[/color]: x{essence.Value}\n"); + sb.Append($"[color={magicType.Color.ToHex()}]{Loc.GetString(magicType.Name)}[/color]: x{essence.Value * count}\n"); } } diff --git a/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellMixSolution.cs b/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellMixSolution.cs new file mode 100644 index 0000000000..cf307a5e65 --- /dev/null +++ b/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellMixSolution.cs @@ -0,0 +1,34 @@ +using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.Components.SolutionManager; +using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Chemistry.Reaction; +using Robust.Shared.Prototypes; + +namespace Content.Shared._CP14.MagicSpell.Spells; + +public sealed partial class CP14SpellMixSolution : CP14SpellEffect +{ + [DataField] + public List> ReactionTypes = default!; + + public override void Effect(EntityManager entManager, CP14SpellEffectBaseArgs args) + { + if (args.Target is null) + return; + + if (!entManager.TryGetComponent(args.Target.Value, out var solutionContainerManager)) + return; + + if (!entManager.TryGetComponent(args.Target.Value, out var mixableSolution)) + return; + + var solutionContainerSystem = entManager.System(); + + if (!solutionContainerSystem.TryGetSolution((args.Target.Value, solutionContainerManager), mixableSolution.Solution, out var solution)) + return; + + var reactionSystem = entManager.System(); + + reactionSystem.FullyReactSolution(solution.Value, new ReactionMixerComponent { ReactionTypes = ReactionTypes }); + } +} diff --git a/Resources/Locale/en-US/_CP14/chemistry/mixing-component.ftl b/Resources/Locale/en-US/_CP14/chemistry/mixing-component.ftl new file mode 100644 index 0000000000..3cd9d41f6c --- /dev/null +++ b/Resources/Locale/en-US/_CP14/chemistry/mixing-component.ftl @@ -0,0 +1 @@ +cp14-mixing-verb-magic-splitting = magic splitting \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/magicEnergy/magic-types.ftl b/Resources/Locale/en-US/_CP14/magicEnergy/magic-types.ftl index 451493ce06..2ba3c95ea1 100644 --- a/Resources/Locale/en-US/_CP14/magicEnergy/magic-types.ftl +++ b/Resources/Locale/en-US/_CP14/magicEnergy/magic-types.ftl @@ -1,12 +1,25 @@ -cp14-magic-type-fire = Fire -cp14-magic-type-water = Water -cp14-magic-type-earth = Earth -cp14-magic-type-healing = Life -cp14-magic-type-light = Light -cp14-magic-type-dimension = Dimension -cp14-magic-type-meta = Metamagic -cp14-magic-type-death = Death +# Complex tier 0 +cp14-essence-earth = Terra +cp14-essence-fire = Ignis +cp14-essence-water = Aqua +cp14-essence-air = Aer +cp14-essence-order = Ordo +cp14-essence-chaos = Perditio + +# Complex tier 1 +cp14-essence-frost = Gelum +cp14-essence-light = Lux +cp14-essence-motion = Motus +cp14-essence-cycle = Permutatio +cp14-essence-energia = Energia +cp14-essence-poison = Venenum +cp14-essence-void = Vacuos +cp14-essence-life = Victus +cp14-essence-crystal = Vitreus + +# Complex tier 2 +cp14-essence-magic = Praecantatio cp14-magic-manacost = Manacost -cp14-magic-magic-type = Magic type +cp14-magic-essence = Magic type cp14-magic-essence-title = From here, essences can be extracted: \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/archaic.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/archaic.ftl deleted file mode 100644 index b7f01662d2..0000000000 --- a/Resources/Locale/en-US/_CP14/reagents/meta/archaic.ftl +++ /dev/null @@ -1,2 +0,0 @@ -cp14-reagent-name-chromium-slime = Chromium slime -cp14-reagent-desc-chromium-slime = A rare substance found in water streams, it has unique properties that allow it to invert the effects of reagents, but can completely ruin a potion if dosed incorrectly. diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/essence.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/essence.ftl deleted file mode 100644 index b01306837b..0000000000 --- a/Resources/Locale/en-US/_CP14/reagents/meta/essence.ftl +++ /dev/null @@ -1,23 +0,0 @@ -cp14-reagent-name-essence-earth = Essence of earth -cp14-reagent-desc-essence-earth = Liquid embodiment of the element earth - -cp14-reagent-name-essence-fire = Essence of fire -cp14-reagent-desc-essence-fire = Liquid embodiment of the element fire - -cp14-reagent-name-essence-life = Essence of life -cp14-reagent-desc-essence-life = Liquid embodiment of the element life - -cp14-reagent-name-essence-water = Essence of water -cp14-reagent-desc-essence-water = Liquid embodiment of the element water - -cp14-reagent-name-essence-light = Essence of light -cp14-reagent-desc-essence-light = Liquid embodiment of the element light - -cp14-reagent-name-essence-dimension = Essence of dimension -cp14-reagent-desc-essence-dimension = Liquid embodiment of the element dimension - -cp14-reagent-name-essence-death = Essence of death -cp14-reagent-desc-essence-death = Liquid embodiment of the element death - -cp14-reagent-name-essence-electric = Essence of electric -cp14-reagent-desc-essence-electric = Liquid embodiment of the element electric \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/inorganic.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/inorganic.ftl deleted file mode 100644 index 3de93f3011..0000000000 --- a/Resources/Locale/en-US/_CP14/reagents/meta/inorganic.ftl +++ /dev/null @@ -1,11 +0,0 @@ -cp14-reagent-name-grounded-quartz = Ground quartz -cp14-reagent-desc-grounded-quartz = A powder obtained from grinding quartz fragments. It has weak cleaning properties. - -cp14-reagent-name-base-alchemistsalt = Alchemist Salt -cp14-reagent-desc-base-alchemistsalt = Purified salt extracted and distilled by Alchemists, often using water and ground quartz. - -cp14-reagent-name-base-alchemistsaltwater = Alchemist Saltwater -cp14-reagent-desc-base-alchemistsaltwater = An amount of Alchemist Salt disolved into water. - -cp14-reagent-name-base-alchemistoil = Alchemist Oil -cp14-reagent-desc-base-alchemistoil = A slick black liquid of rare origin. It burns easily. diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/precurser.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/precurser.ftl deleted file mode 100644 index 0687c25d0d..0000000000 --- a/Resources/Locale/en-US/_CP14/reagents/meta/precurser.ftl +++ /dev/null @@ -1,24 +0,0 @@ -cp14-reagent-name-alchemizedblood = Alchemized Blood -cp14-reagent-desc-alchemizedblood = The reduced blood of a living warm-blooded creatures. - -cp14-reagent-name-alchemizedblood-tiefling = Alchemized Tiefling blood -cp14-reagent-desc-alchemizedblood-tiefling = The reduced blood of a fire-blooded creature. - -cp14-reagent-name-alchemizedblood-elf = Alchemized Elf blood -cp14-reagent-desc-alchemizedblood-elf = The reduced blood of a magical creature. - -cp14-reagent-name-alchemizedblood-goblin = Alchemized Goblin blood -cp14-reagent-desc-alchemizedblood-goblin = The reduced blood of green-skinned creatures. - -cp14-reagent-name-essence = Essence -cp14-reagent-desc-essence = An alchemically pure extract of warm-blooded creatures. - -cp14-reagent-name-essence-tiefling = Teifling Essence -cp14-reagent-desc-essence-tiefling = An alchemically pure extract of fire-blooded creatures. - -cp14-reagent-name-essence-elf = Elf Essence -cp14-reagent-desc-essence-elf = An alchemically pure extract of magical creatures. - -cp14-reagent-name-essence-goblin = Goblin Essence -cp14-reagent-desc-essence-goblin = An alchemically pure extract of green-skinned creatures. - diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/essence.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/essence.ftl new file mode 100644 index 0000000000..b5ec8288f3 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/essence.ftl @@ -0,0 +1,58 @@ +# Basic 6 + +cp14-reagent-name-essence-earth = Terra essence +cp14-reagent-desc-essence-earth = Liquid embodiment of the element earth. + +cp14-reagent-name-essence-fire = Ignis essence +cp14-reagent-desc-essence-fire = Liquid embodiment of the element fire. + +cp14-reagent-name-essence-water = Aqua essence +cp14-reagent-desc-essence-water = Liquid embodiment of the element water. + +cp14-reagent-name-essence-air = Aer essence +cp14-reagent-desc-essence-air = Liquid embodiment of the element air. + +cp14-reagent-name-essence-order = Ordo essence +cp14-reagent-desc-essence-order = A liquid embodiment of the elements of order, organization and cleanliness. + +cp14-reagent-name-essence-chaos = Perditio essence +cp14-reagent-desc-essence-chaos = The liquid embodiment of the elements of entropy, chaos and destruction. + +# Complex tier 1 + +cp14-reagent-name-essence-frost = Gelum essence +cp14-reagent-desc-essence-frost = The liquid embodiment of the elements of ice, frost and cold. + +cp14-reagent-name-essence-light = Lux essence +cp14-reagent-desc-essence-light = The liquid embodiment of the elements of light. + +cp14-reagent-name-essence-motion = Motus essence +cp14-reagent-desc-essence-motion = The liquid embodiment of the elements of movement and animation. + +cp14-reagent-name-essence-cycle = Permutatio essence +cp14-reagent-desc-essence-cycle = The liquid embodiment of the elements of circulation and exchange. + +cp14-reagent-name-essence-energia = Energia essence +cp14-reagent-desc-essence-energia = The liquid embodiment of the elements of energy, force, and lightning. + +cp14-reagent-name-essence-poison = Venenum essence +cp14-reagent-desc-essence-poison = The liquid embodiment of the elements of poison, narcotic, and filth. + +cp14-reagent-name-essence-void = Vacuos essence +cp14-reagent-desc-essence-void = The liquid embodiment of the elements of emptiness, obscurity, and secrecy. + +cp14-reagent-name-essence-life = Victus essence +cp14-reagent-desc-essence-life = The liquid embodiment of the elements of life, food, and sustenance. + +cp14-reagent-name-essence-crystal = Vitreus essence +cp14-reagent-desc-essence-crystal = The liquid embodiment of the elements of glass, crystal, and transparency. + +# Complex tier 2 + +cp14-reagent-name-essence-magic = Praecantatio essence +cp14-reagent-desc-essence-magic = The liquid embodiment of the elements of magic, enchantment and sorcery. + + + + + diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/precurser.ftl similarity index 76% rename from Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl rename to Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/precurser.ftl index 06ccb04613..5a6e9adaad 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/precurser.ftl @@ -33,3 +33,12 @@ cp14-reagent-desc-wild-sage-sap = Juice of a ubiquitous medicinal plant, not bad cp14-reagent-name-sleepy-poison = Whistler poison cp14-reagent-desc-sleepy-poison = A poison secreted by dangerous magical monsters to quickly put their victim to sleep. + +cp14-reagent-name-whistler-poison = Whistler poison +cp14-reagent-desc-whistler-poison = A poison secreted by a dangerous magical monster to quickly put its victim to sleep. + +cp14-reagent-name-grounded-quartz = Ground quartz +cp14-reagent-desc-grounded-quartz = A powder obtained from grinding quartz fragments. It has weak cleaning properties. + +cp14-reagent-name-chromium-slime = Chromium slime +cp14-reagent-desc-chromium-slime = A rare substance found in water streams, it has unique properties that allow it to invert the effects of reagents, but can completely ruin a potion if dosed incorrectly. diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/target_effects.ftl similarity index 84% rename from Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl rename to Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/target_effects.ftl index be5a701513..678878874e 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/target_effects.ftl @@ -1,12 +1,6 @@ -cp14-reagent-name-basic-impurity = Mild impurities -cp14-reagent-desc-basic-impurity = The natural, undesirable by products of alchemy. Worse than useless, being difficult for the body to process. - cp14-reagent-name-basic-empty = Empty solution cp14-reagent-desc-basic-empty = Natural solvent. Essentially a useless liquid that dilutes useful effects. Getting rid of it will give you much more concentrated solutions. -cp14-reagent-name-basic-simplebase = Simple solvent -cp14-reagent-desc-basic-simplebase = Simple solvent, often used in brewing basic potions in place of water or more specialized solvents. - cp14-reagent-name-basic-heal-brute = Healing solution cp14-reagent-desc-basic-heal-brute = Can heal all types of physical damage. @@ -31,9 +25,6 @@ cp14-reagent-desc-basic-heal-poison = An effective antidote used for treating mo cp14-reagent-name-basic-damage-poison = Poisonous solution cp14-reagent-desc-basic-damage-poison = Capable of causing extreme indigestion, ulcers, intoxication, and in sufficient dosage to cause death. -cp14-reagent-name-basic-purification = Cleansing salt -cp14-reagent-desc-basic-purification = An alchemical salt that binds with impurities and renders them harmless - cp14-reagent-name-basic-damage-airloss = Asphyxiating Solution cp14-reagent-desc-basic-damage-airloss = A viscous slurry that rapidly glues the victim's insides together, causing severe shortness of breath. @@ -58,9 +49,6 @@ cp14-reagent-desc-basic-heal-mana = A substance that causes a rapid regeneration cp14-reagent-name-basic-damage-mana = Antimagic solution cp14-reagent-desc-basic-damage-mana = A substance that rapidly drains all magical energy from the body. -cp14-reagent-name-basic-unstable = Unstable solution -cp14-reagent-desc-basic-unstable = When cooled, immediately converts all reagents into a chemical cloud, the size of which depends on the amount of unstable solution in it. - cp14-reagent-name-basic-speed-up = Accelerating solution cp14-reagent-desc-basic-speed-up = Increases muscle tone, allowing creatures to move and react faster than normal. diff --git a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl index f6ab7bc9e6..09afa056e2 100644 --- a/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl +++ b/Resources/Locale/en-US/_CP14/travelingStoreship/positions_buy.ftl @@ -3,9 +3,6 @@ cp14-store-buy-hint = To purchase "{$name}", leave your money and order in the t cp14-store-buy-alchemy-unlock-t1-name = Trade Alliance: Alchemists cp14-store-buy-alchemy-unlock-t1-desc = The Alchemists Guild of the Kingdom of Klanir is willing to include the settlement in their trade route in return for small gifts and payment. -cp14-store-buy-alchemy-normalizer-name = Solution normalizer -cp14-store-buy-alchemy-normalizer-desc = Tired of constantly cleaning potion drops from everywhere? Fix it with a state-of-the-art technological device of imperial manufacture! “Alchemical Normalizer” - will remove unpleasant excess from your potions! - cp14-store-buy-alchemy-vials-name = Alchemical vials cp14-store-buy-alchemy-vials-desc = Now the 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 best artisans! Random alchemical devices as a gift. diff --git a/Resources/Locale/ru-RU/_CP14/chemistry/mixing-component.ftl b/Resources/Locale/ru-RU/_CP14/chemistry/mixing-component.ftl new file mode 100644 index 0000000000..1e4793b305 --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/chemistry/mixing-component.ftl @@ -0,0 +1 @@ +cp14-mixing-verb-magic-splitting = магическое расщепление \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-types.ftl b/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-types.ftl index a69f58494b..c0166d6b3f 100644 --- a/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-types.ftl +++ b/Resources/Locale/ru-RU/_CP14/magicEnergy/magic-types.ftl @@ -1,13 +1,25 @@ -cp14-magic-type-fire = Огонь -cp14-magic-type-water = Вода -cp14-magic-type-earth = Земля -cp14-magic-type-healing = Жизнь -cp14-magic-type-light = Свет -cp14-magic-type-dimension = Пространство -cp14-magic-type-meta = Метамагия -cp14-magic-type-death = Смерть -cp14-magic-type-electric = Молния +# Complex tier 0 +cp14-essence-earth = Terra +cp14-essence-fire = Ignis +cp14-essence-water = Aqua +cp14-essence-air = Aer +cp14-essence-order = Ordo +cp14-essence-chaos = Perditio + +# Complex tier 1 +cp14-essence-frost = Gelum +cp14-essence-light = Lux +cp14-essence-motion = Motus +cp14-essence-cycle = Permutatio +cp14-essence-energia = Energia +cp14-essence-poison = Venenum +cp14-essence-void = Vacuos +cp14-essence-life = Victus +cp14-essence-crystal = Vitreus + +# Complex tier 2 +cp14-essence-magic = Praecantatio cp14-magic-manacost = Затраты маны -cp14-magic-magic-type = Тип магии +cp14-magic-essence = Тип магии cp14-magic-essence-title = Отсюда можно извлечь эссенции: \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/archaic.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/archaic.ftl deleted file mode 100644 index 9584f75dfd..0000000000 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/archaic.ftl +++ /dev/null @@ -1,2 +0,0 @@ -cp14-reagent-name-chromium-slime = Хромиевая слизь -cp14-reagent-desc-chromium-slime = Редкая субстанция, которую можно встретить в водных потоках, имеет уникальные свойства, позволяющие инвертировать эффекты реагентов, но при неправильной дозировке может полностью испортить зелье. diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/essence.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/essence.ftl deleted file mode 100644 index 0045c260de..0000000000 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/essence.ftl +++ /dev/null @@ -1,23 +0,0 @@ -cp14-reagent-name-essence-earth = Эссенция земли -cp14-reagent-desc-essence-earth = Жидкое воплощение стихии земли - -cp14-reagent-name-essence-fire = Эссенция огня -cp14-reagent-desc-essence-fire = Жидкое воплощение стихии огня - -cp14-reagent-name-essence-life = Эссенция жизни -cp14-reagent-desc-essence-life = Жидкое воплощение стихии жизни - -cp14-reagent-name-essence-water = Эссенция воды -cp14-reagent-desc-essence-water = Жидкое воплощение стихии воды - -cp14-reagent-name-essence-light = Эссенция света -cp14-reagent-desc-essence-light = Жидкое воплощение стихии света - -cp14-reagent-name-essence-dimension = Эссенция пространства -cp14-reagent-desc-essence-dimension = Жидкое воплощение стихии пространства - -cp14-reagent-name-essence-death = Эссенция смерти -cp14-reagent-desc-essence-death = Жидкое воплощение стихии смерти - -cp14-reagent-name-essence-electric = Эссенция молний -cp14-reagent-desc-essence-electric = Жидкое воплощение стихии молнии \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/inorganic.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/inorganic.ftl deleted file mode 100644 index 034bd5ab8f..0000000000 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/inorganic.ftl +++ /dev/null @@ -1,11 +0,0 @@ -cp14-reagent-name-grounded-quartz = Размолотый кварц -cp14-reagent-desc-grounded-quartz = Порошок, получаемый из размалывания осколков кварца. Имеет слабые очищающие свойства. - -cp14-reagent-name-base-alchemistsalt = Алхимическая соль -cp14-reagent-desc-base-alchemistsalt = Очищенная соль, собранная и перегнанная алхимиками, часто с использованием воды и молотого кварца. - -cp14-reagent-name-base-alchemistsaltwater = Алхимическая соленая вода -cp14-reagent-desc-base-alchemistsaltwater = Некоторое количество алхимической соли, растворенной в воде. - -cp14-reagent-name-base-alchemistoil = Алхимическое масло -cp14-reagent-desc-base-alchemistoil = Вязкая черная жидкость редкого происхождения. Легко горит. diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/precurser.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/precurser.ftl deleted file mode 100644 index 16ad1b6d4b..0000000000 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/precurser.ftl +++ /dev/null @@ -1,24 +0,0 @@ -cp14-reagent-name-alchemizedblood = Алхимизированная кровь -cp14-reagent-desc-alchemizedblood = Обработанная кровь живых теплокровных существ. - -cp14-reagent-name-alchemizedblood-tiefling = Алхимизированная кровь тифлинга -cp14-reagent-desc-alchemizedblood-tiefling = Обработанная кровь огненнокровного существа. - -cp14-reagent-name-alchemizedblood-elf = Алхимизированная эльфийская кровь -cp14-reagent-desc-alchemizedblood-elf = Обработанная кровь магического существа. - -cp14-reagent-name-alchemizedblood-goblin = Алхимизированная кровь гоблинов -cp14-reagent-desc-alchemizedblood-goblin = Обработанная кровь зеленокожих существ. - -cp14-reagent-name-essence = Чистая эссенция жизни -cp14-reagent-desc-essence = Алхимически чистый экстракт теплокровных существ. - -cp14-reagent-name-essence-tiefling = Эссенция Тифлинга -cp14-reagent-desc-essence-tiefling = Алхимически чистый экстракт огненных существ. - -cp14-reagent-name-essence-elf = Эссенция Эльфа -cp14-reagent-desc-essence-elf = Алхимически чистый экстракт магических существ. - -cp14-reagent-name-essence-goblin = Эссенция Гоблина -cp14-reagent-desc-essence-goblin = Алхимически чистый экстракт зеленокожих существ. - diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/essence.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/essence.ftl new file mode 100644 index 0000000000..de7a3f87ce --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/essence.ftl @@ -0,0 +1,53 @@ +# Basic 6 + +cp14-reagent-name-essence-earth = Эссенция Terra +cp14-reagent-desc-essence-earth = Жидкое воплощение стихии земли. + +cp14-reagent-name-essence-fire = Эссенция Ignis +cp14-reagent-desc-essence-fire = Жидкое воплощение стихии огня. + +cp14-reagent-name-essence-water = Эссенция Aqua +cp14-reagent-desc-essence-water = Жидкое воплощение стихии воды. + +cp14-reagent-name-essence-air = Эссенция Aer +cp14-reagent-desc-essence-air = Жидкое воплощение стихии воздуха. + +cp14-reagent-name-essence-order = Эссенция Ordo +cp14-reagent-desc-essence-order = Жидкое воплощение стихии порядка, организованности и чистоты. + +cp14-reagent-name-essence-chaos = Эссенция Perditio +cp14-reagent-desc-essence-chaos = Жидкое воплощение стихии энтропии, хаоса и разрушения. + +# Complex tier 1 + +cp14-reagent-name-essence-frost = Эссенция Gelum +cp14-reagent-desc-essence-frost = Жидкое воплощение стихии льда, мороза и холода. + +cp14-reagent-name-essence-light = Эссенция Lux +cp14-reagent-desc-essence-light = Жидкое воплощение стихии света. + +cp14-reagent-name-essence-motion = Эссенция Motus +cp14-reagent-desc-essence-motion = Жидкое воплощение стихии движения и оживления. + +cp14-reagent-name-essence-cycle = Эссенция Permutatio +cp14-reagent-desc-essence-cycle = Жидкое воплощение стихии круговорота и обмена. + +cp14-reagent-name-essence-energia = Эссенция Energia +cp14-reagent-desc-essence-energia = Жидкое воплощение стихии энергии, силы и молнии. + +cp14-reagent-name-essence-poison = Эссенция Venenum +cp14-reagent-desc-essence-poison = Жидкое воплощение стихии яда, наркотика, грязи. + +cp14-reagent-name-essence-void = Эссенция Vacuos +cp14-reagent-desc-essence-void = Жидкое воплощение стихии пустоты, неизвестности и скрытности. + +cp14-reagent-name-essence-life = Эссенция Victus +cp14-reagent-desc-essence-life = Жидкое воплощение стихии жизни, еды и пропитания. + +cp14-reagent-name-essence-crystal = Эссенция Vitreus +cp14-reagent-desc-essence-crystal = Жидкое воплощение стихии стекла, кристалла, прозрачности. + +# Complex tier 2 + +cp14-reagent-name-essence-magic = Эссенция Praecantatio +cp14-reagent-desc-essence-magic = Жидкое воплощение магии, чар и колдовства. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/precurser.ftl similarity index 80% rename from Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl rename to Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/precurser.ftl index 449e2d930d..2c880675d1 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/precurser.ftl @@ -33,3 +33,9 @@ cp14-reagent-desc-wild-sage-sap = Сок вездерастущего лечеб cp14-reagent-name-whistler-poison = Яд свистуна cp14-reagent-desc-whistler-poison = Яд, выделяемый опасным магическим монстром, чтобы быстро усыпить свою жертву. + +cp14-reagent-name-grounded-quartz = Размолотый кварц +cp14-reagent-desc-grounded-quartz = Порошок, получаемый из размалывания осколков кварца. Имеет слабые очищающие свойства. + +cp14-reagent-name-chromium-slime = Хромиевая слизь +cp14-reagent-desc-chromium-slime = Редкая субстанция, которую можно встретить в водных потоках, имеет уникальные свойства, позволяющие инвертировать эффекты реагентов, но при неправильной дозировке может полностью испортить зелье. diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/target_effects.ftl similarity index 81% rename from Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl rename to Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/target_effects.ftl index ec7efb5042..547819c29e 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/target_effects.ftl @@ -1,12 +1,6 @@ -cp14-reagent-name-basic-impurity = Легкие примеси -cp14-reagent-desc-basic-impurity = Естественные, нежелательные побочные продукты алхимии. Хуже, чем бесполезные, поскольку организму трудно их перерабатывать. - cp14-reagent-name-basic-empty = Пустой раствор cp14-reagent-desc-basic-empty = Природный растворитель. По сути бесполезная жидкость, разбавляющая полезные эффекты. Избавившись от нее, вы получите куда более концентрированные растворы. -cp14-reagent-name-basic-simplebase = Простой растворитель -cp14-reagent-desc-basic-simplebase = Простой растворитель, часто используемый при приготовлении базовых зелий вместо воды или более специализированных растворителей. - cp14-reagent-name-basic-heal-brute = Лечебный раствор cp14-reagent-desc-basic-heal-brute = Способен залечивать все виды физических повреждений. @@ -31,9 +25,6 @@ cp14-reagent-desc-basic-heal-poison = Эффективен как хорошее cp14-reagent-name-basic-damage-poison = Ядовитый раствор cp14-reagent-desc-basic-damage-poison = Способен вызвать крайне сильное несварение, язвы, интоксикацию, и при достаточной дозировке привести к смерти. -cp14-reagent-name-basic-purification = Очищающая соль -cp14-reagent-desc-basic-purification = Алхимическая соль, которая связывает примеси и делает их безвредными. - cp14-reagent-name-basic-damage-airloss = Удушающий раствор cp14-reagent-desc-basic-damage-airloss = Вязкая жижа, стремительно склеивающая внутренности жертвы, вызывая острую нехватку воздуха. @@ -61,12 +52,6 @@ cp14-reagent-desc-basic-damage-mana = Вещество, стремительно cp14-reagent-name-basic-unstable = Нестабильный раствор cp14-reagent-desc-basic-unstable = При остывании, немедленно преобразует все реагенты в химическое облако, размер которого зависит от количества нестабильного вещества. -cp14-reagent-name-basic-speed-up = Ускоряющий раствор -cp14-reagent-desc-basic-speed-up = Повышает тонус мышц, что позволяет существам двигаться и реагировать быстрее обычного. - -cp14-reagent-name-basic-speed-down = Замедляющий раствор -cp14-reagent-desc-basic-speed-down = Заставляет мыслить и двигаться медленнее. - cp14-reagent-name-see-rainbow = Галлюциногенный раствор cp14-reagent-desc-see-rainbow = Вызывает веселые галлюцинации, окрашивает весь мир в радужные яркие тона. diff --git a/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl b/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl index 9d67fa9af7..b493e85445 100644 --- a/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl +++ b/Resources/Locale/ru-RU/_CP14/travelingStoreship/positions_buy.ftl @@ -3,9 +3,6 @@ cp14-store-buy-hint = Чтобы приобрести "{$name}", оставьт cp14-store-buy-alchemy-unlock-t1-name = Торговый союз: Алхимики cp14-store-buy-alchemy-unlock-t1-desc = Гильдия алхимиков королевства Кланира готова включить поселение в свой торговый путь взамен на небольшие дары и оплату. -cp14-store-buy-alchemy-normalizer-name = Нормализатор растворов -cp14-store-buy-alchemy-normalizer-desc = Надоело постоянно отмывать капли зелья ото всюду? Исправьте это при помощи современного технологического устройства имперского производства! "Алхимический нормализатор" - удалит из ваших зелий неприятные излишки! - cp14-store-buy-alchemy-vials-name = Алхимические пузырьки cp14-store-buy-alchemy-vials-desc = Теперь проблема дефицита емкостей для зелий больше не проблема! Ведь по довольно скромной цене вы можете заказывать партии блестящих склянок прямо от лучших ремесленников! Случайные алхимические приборы в подарок. diff --git a/Resources/Maps/_CP14/comoss.yml b/Resources/Maps/_CP14/comoss.yml index c6530bd8b1..fb6a18ee8e 100644 --- a/Resources/Maps/_CP14/comoss.yml +++ b/Resources/Maps/_CP14/comoss.yml @@ -4,8 +4,8 @@ meta: engineVersion: 247.2.0 forkId: "" forkVersion: "" - time: 02/26/2025 10:59:13 - entityCount: 15073 + time: 03/01/2025 18:56:38 + entityCount: 15071 maps: - 1 grids: @@ -141,11 +141,11 @@ entities: version: 6 1,0: ind: 1,0 - tiles: BQAAAAADBwAAAAABBgAAAAAAHgAAAAAAAwAAAAAFAwAAAAAIHgAAAAAFAwAAAAAABQAAAAABDQAAAAAADQAAAAAADQAAAAAAAwAAAAAAHAAAAAAFHAAAAAAFHAAAAAAFBQAAAAABBQAAAAABBgAAAAAAHgAAAAABAwAAAAAFAwAAAAAIHgAAAAAAAwAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABwAAAAAABgAAAAAABgAAAAAAHgAAAAABAwAAAAAIAwAAAAABGAAAAAAEAwAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAwAAAAAHAwAAAAAAAwAAAAAABwAAAAAABQAAAAAABgAAAAAAHgAAAAABAwAAAAAHAwAAAAAEAgAAAAAOAwAAAAAAAwAAAAAHAwAAAAAEBQAAAAACDQAAAAAADQAAAAAAAwAAAAAGAwAAAAAIAwAAAAAABgAAAAADBgAAAAAABgAAAAAAHgAAAAAEAwAAAAABAwAAAAACAgAAAAAKAwAAAAAHAwAAAAACAwAAAAAGBQAAAAAADQAAAAAADQAAAAAAAwAAAAADAwAAAAADAwAAAAAABgAAAAAABgAAAAACBgAAAAAAHgAAAAAAAwAAAAAEAwAAAAACAgAAAAAPAwAAAAAAAwAAAAAHAwAAAAAHAwAAAAAEDQAAAAAADQAAAAAADQAAAAAADQAAAAAAAwAAAAAABQAAAAADBgAAAAAABgAAAAAAHgAAAAACAwAAAAAAAwAAAAAHGAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAABAgAAAAAOHgAAAAACHgAAAAAAAwAAAAAFAwAAAAAAGAAAAAAEGAAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAACHgAAAAAAAwAAAAAIAwAAAAAAAwAAAAAFAwAAAAADAwAAAAAHAwAAAAADAwAAAAABAwAAAAAFAwAAAAAIAwAAAAAGAwAAAAABAwAAAAAHAwAAAAAGAwAAAAAFAwAAAAADAwAAAAAHAwAAAAADAwAAAAAEAwAAAAAFAwAAAAACAwAAAAAGAwAAAAAGAwAAAAAFAwAAAAAFAwAAAAAFAwAAAAAEAwAAAAACAwAAAAAEAwAAAAAIAwAAAAACAwAAAAAGAwAAAAACGAAAAAABAgAAAAABAgAAAAAKAgAAAAABHgAAAAAEHgAAAAAFHQAAAAAAHgAAAAABHgAAAAAAHQAAAAAFHgAAAAAAHgAAAAAAAgAAAAALAgAAAAALAgAAAAAAHgAAAAAEHgAAAAAEBgAAAAAABwAAAAABBgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHgAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAHgAAAAADBgAAAAAABwAAAAADBgAAAAABBQAAAAADBgAAAAACBwAAAAACBgAAAAAAGAAAAAACAwAAAAAADQAAAAAADQAAAAAAAwAAAAAEAwAAAAADAwAAAAADAwAAAAAAHQAAAAADBgAAAAAABQAAAAAABQAAAAAABgAAAAAABwAAAAACBwAAAAACBgAAAAAAGAAAAAACAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAwAAAAABAwAAAAAFAwAAAAAAHQAAAAAABgAAAAAABgAAAAABBgAAAAADBgAAAAAABwAAAAAABwAAAAABBgAAAAAAHAAAAAACAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAIAwAAAAAAHQAAAAACBgAAAAAABgAAAAABBgAAAAAABQAAAAACBQAAAAACBQAAAAACBgAAAAAAHAAAAAACAwAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAA + tiles: BQAAAAADBwAAAAABBgAAAAAAHgAAAAAAAwAAAAAFAwAAAAAIHgAAAAAFAwAAAAAABQAAAAABDQAAAAAADQAAAAAADQAAAAAAAwAAAAAAHAAAAAAFHAAAAAAFHAAAAAAFBQAAAAABBQAAAAABBgAAAAAAHgAAAAABAwAAAAAFAwAAAAAIHgAAAAAAAwAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAABwAAAAAABgAAAAAABgAAAAAAHgAAAAABAwAAAAAIAwAAAAABGAAAAAAEAwAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAwAAAAAHAwAAAAAAAwAAAAAABwAAAAAABQAAAAAABgAAAAAAHgAAAAABAwAAAAAHAwAAAAAEAgAAAAAOAwAAAAAAAwAAAAAHAwAAAAAEBQAAAAACDQAAAAAADQAAAAAAAwAAAAAGAwAAAAAIAwAAAAAABgAAAAADBgAAAAAABgAAAAAAHgAAAAAEAwAAAAABAwAAAAACAgAAAAAKAwAAAAAHAwAAAAACAwAAAAAGBQAAAAAADQAAAAAADQAAAAAAAwAAAAADAwAAAAADAwAAAAAABgAAAAAABgAAAAACBgAAAAAAHgAAAAAAAwAAAAAEAwAAAAACAgAAAAAPAwAAAAAAAwAAAAAHAwAAAAAHAwAAAAAEDQAAAAAADQAAAAAADQAAAAAADQAAAAAAAwAAAAAABQAAAAADBgAAAAAABgAAAAAAHgAAAAACAwAAAAAAAwAAAAAHGAAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAABAgAAAAAOHgAAAAACHgAAAAAAAwAAAAAFAwAAAAAAGAAAAAAEGAAAAAAAHgAAAAACHgAAAAABHgAAAAAAHgAAAAAAHgAAAAADHgAAAAABHgAAAAACHgAAAAAAAwAAAAAIAwAAAAAAAwAAAAAFAwAAAAADAwAAAAAHAwAAAAADAwAAAAABAwAAAAAFAwAAAAAIAwAAAAAGAwAAAAABAwAAAAAHAwAAAAAGAwAAAAAFAwAAAAADAwAAAAAHAwAAAAADAwAAAAAEAwAAAAAFAwAAAAACAwAAAAAGAwAAAAAGAwAAAAAFAwAAAAAFAwAAAAAFAwAAAAAEAwAAAAACAwAAAAAEAwAAAAAIAwAAAAACAwAAAAAGAwAAAAACGAAAAAABAgAAAAABAgAAAAAKAgAAAAABHgAAAAAEHgAAAAAFHQAAAAAAHgAAAAABHgAAAAAAHQAAAAAFHgAAAAAAHgAAAAAAAgAAAAALAgAAAAALAgAAAAAAHgAAAAAEHgAAAAAEBgAAAAAABwAAAAABBgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHgAAAAABAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAAHgAAAAADBgAAAAAABwAAAAADBgAAAAABBQAAAAADBgAAAAACBwAAAAACBQAAAAAAGAAAAAACAwAAAAAADQAAAAAADQAAAAAAAwAAAAAEAwAAAAADAwAAAAADAwAAAAAAHQAAAAADBgAAAAAABQAAAAAABQAAAAAABgAAAAAABwAAAAACBwAAAAACBQAAAAAAGAAAAAACAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAwAAAAABAwAAAAAFAwAAAAAAHQAAAAAABgAAAAAABgAAAAABBgAAAAADBgAAAAAABwAAAAAABwAAAAABBgAAAAAAHAAAAAACAwAAAAAADQAAAAAADQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAIAwAAAAAAHQAAAAACBgAAAAAABgAAAAABBgAAAAAABQAAAAACBQAAAAACBQAAAAACBgAAAAAAHAAAAAACAwAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAA version: 6 1,-1: ind: 1,-1 - tiles: BQAAAAACBQAAAAACAwAAAAAAAwAAAAADAwAAAAACAwAAAAAHAwAAAAAAAwAAAAAAHgAAAAAAHgAAAAAEHAAAAAAEHAAAAAAECQAAAAAHCQAAAAAFCQAAAAADCQAAAAAEBQAAAAADBQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAHAwAAAAAHAwAAAAAAAwAAAAAAHgAAAAACHAAAAAAEHAAAAAABHAAAAAAAHAAAAAAEHAAAAAAFHAAAAAABHAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAJAgAAAAACAgAAAAAOHgAAAAACAwAAAAAAHgAAAAAEHAAAAAAEHAAAAAADHAAAAAADHAAAAAACHAAAAAADHAAAAAAEHAAAAAACAgAAAAAIAgAAAAAJAgAAAAADAgAAAAANAwAAAAAEAwAAAAAAAgAAAAAOHgAAAAAEHgAAAAAAHgAAAAAFHgAAAAAAHgAAAAAAHgAAAAAEHgAAAAABHAAAAAAAHAAAAAAEAwAAAAADAwAAAAAAAwAAAAADAwAAAAAEAwAAAAAGAwAAAAAGHgAAAAABBgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHgAAAAABHAAAAAABHAAAAAAEAwAAAAACAwAAAAABAwAAAAAHAwAAAAAAAwAAAAADAwAAAAAFHgAAAAADBgAAAAAABQAAAAABBgAAAAAABgAAAAAABQAAAAABBgAAAAAAHgAAAAAAHAAAAAAFHAAAAAAEHgAAAAABHgAAAAABHgAAAAAAHgAAAAABAwAAAAAHAwAAAAABAgAAAAAIBgAAAAACBQAAAAABBgAAAAACBgAAAAACBwAAAAABBgAAAAAAHgAAAAADHAAAAAABHAAAAAAEAgAAAAABAgAAAAAAHgAAAAAEHgAAAAABAwAAAAAEAwAAAAAGAgAAAAAJBgAAAAAABQAAAAABBQAAAAAABwAAAAACBwAAAAADBgAAAAAAHgAAAAAFHAAAAAACHAAAAAAFAgAAAAAIHgAAAAAAAgAAAAANHgAAAAAEAwAAAAACAwAAAAABAgAAAAABBgAAAAAABQAAAAADBQAAAAABBgAAAAAABgAAAAAABgAAAAAAHgAAAAACHAAAAAADHAAAAAAFAgAAAAAPAgAAAAABAgAAAAACHgAAAAAEAwAAAAABAwAAAAAHHgAAAAACBgAAAAAABgAAAAACBQAAAAAABgAAAAAAAwAAAAAEAwAAAAAGHgAAAAACHAAAAAAEHAAAAAABAgAAAAAOAgAAAAAIHgAAAAACHgAAAAACAwAAAAAAAwAAAAAEGAAAAAADBgAAAAAABwAAAAACBwAAAAADBgAAAAAAHgAAAAACFgAAAAACHgAAAAAEHAAAAAACHAAAAAACAgAAAAAPAgAAAAADAgAAAAAEHgAAAAACAwAAAAABAwAAAAAIHgAAAAAEBgAAAAAABwAAAAADBwAAAAAABgAAAAAABgAAAAAAHgAAAAADFgAAAAACHAAAAAAFHAAAAAAAAgAAAAAEAgAAAAADAgAAAAAHAgAAAAAIAwAAAAABAwAAAAAEHgAAAAAFBgAAAAAABgAAAAAABgAAAAAABgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAEHAAAAAABHAAAAAADAgAAAAAIAgAAAAAHAgAAAAADHgAAAAACAwAAAAAIAwAAAAAHHgAAAAAAHgAAAAABHgAAAAADHgAAAAAFHgAAAAABHgAAAAABHgAAAAAEHgAAAAABHAAAAAAAHAAAAAACAgAAAAACAgAAAAAFHgAAAAABHgAAAAAFAwAAAAAEAwAAAAAFHgAAAAAEAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADQAAAAAAAwAAAAAAHgAAAAAFHAAAAAADHAAAAAADBgAAAAAABgAAAAAABgAAAAAAHgAAAAACAwAAAAAEAwAAAAADHgAAAAADAwAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAwAAAAAAHgAAAAAEHAAAAAABHAAAAAAE + tiles: BQAAAAACBQAAAAACAwAAAAAAAwAAAAADAwAAAAACAwAAAAAHAwAAAAAAAwAAAAAAHgAAAAAAHgAAAAAEHAAAAAAEHAAAAAAECQAAAAAHCQAAAAAFCQAAAAADCQAAAAAEBQAAAAADBQAAAAAAAwAAAAAAAwAAAAAAAwAAAAAHAwAAAAAHAwAAAAAAAwAAAAAAHgAAAAACHAAAAAAEHAAAAAABHAAAAAAAHAAAAAAEHAAAAAAFHAAAAAABHAAAAAACAwAAAAAAAwAAAAAAAwAAAAAAAgAAAAAJAgAAAAACAgAAAAAOHgAAAAACAwAAAAAAHgAAAAAEHAAAAAAEHAAAAAADHAAAAAADHAAAAAACHAAAAAADHAAAAAAEHAAAAAACAgAAAAAIAgAAAAAJAgAAAAADAgAAAAANAwAAAAAEAwAAAAAAAgAAAAAOHgAAAAAEHgAAAAAAHgAAAAAFHgAAAAAAHgAAAAAAHgAAAAAEHgAAAAABHAAAAAAAHAAAAAAEAwAAAAADAwAAAAAAAwAAAAADAwAAAAAEAwAAAAAGAwAAAAAGHgAAAAABBgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAABgAAAAAAHgAAAAABHAAAAAABHAAAAAAEAwAAAAACAwAAAAABAwAAAAAHAwAAAAAAAwAAAAADAwAAAAAFHgAAAAADBgAAAAAABQAAAAABBgAAAAAABgAAAAAABQAAAAABBgAAAAAAHgAAAAAAHAAAAAAFHAAAAAAEHgAAAAABHgAAAAABHgAAAAAAHgAAAAABAwAAAAAHAwAAAAABAgAAAAAIBgAAAAACBQAAAAABBgAAAAACBgAAAAACBwAAAAABBgAAAAAAHgAAAAADHAAAAAABHAAAAAAEAgAAAAABAgAAAAAAHgAAAAAEHgAAAAABAwAAAAAEAwAAAAAGAgAAAAAJBgAAAAAABQAAAAABBQAAAAAABwAAAAACBwAAAAADBgAAAAAAHgAAAAAFHAAAAAACHAAAAAAFAgAAAAAIHgAAAAAAAgAAAAANHgAAAAAEAwAAAAACAwAAAAABAgAAAAABBgAAAAAABQAAAAADBQAAAAABBgAAAAAABgAAAAAABgAAAAAAHgAAAAACHAAAAAADHAAAAAAFAgAAAAAPAgAAAAABAgAAAAACHgAAAAAEAwAAAAABAwAAAAAHHgAAAAACBwAAAAAABgAAAAACBQAAAAAABgAAAAAAAwAAAAAEAwAAAAAGHgAAAAACHAAAAAAEHAAAAAABAgAAAAAOAgAAAAAIHgAAAAACHgAAAAACAwAAAAAAAwAAAAAEGAAAAAADBwAAAAAABwAAAAACBwAAAAADBgAAAAAAHgAAAAACFgAAAAACHgAAAAAEHAAAAAACHAAAAAACAgAAAAAPAgAAAAADAgAAAAAEHgAAAAACAwAAAAABAwAAAAAIHgAAAAAEBgAAAAAABwAAAAADBwAAAAAABgAAAAAABgAAAAAAHgAAAAADFgAAAAACHAAAAAAFHAAAAAAAAgAAAAAEAgAAAAADAgAAAAAHAgAAAAAIAwAAAAABAwAAAAAEHgAAAAAFBgAAAAAABgAAAAAABgAAAAAABgAAAAAAHgAAAAAAHgAAAAAAHgAAAAAEHAAAAAABHAAAAAADAgAAAAAIAgAAAAAHAgAAAAADHgAAAAACAwAAAAAIAwAAAAAHHgAAAAAAHgAAAAABHgAAAAADHgAAAAAFHgAAAAABHgAAAAABHgAAAAAEHgAAAAABHAAAAAAAHAAAAAACAgAAAAACAgAAAAAFHgAAAAABHgAAAAAFAwAAAAAEAwAAAAAFHgAAAAAEAwAAAAAAAwAAAAAAAwAAAAAAAwAAAAAADQAAAAAAAwAAAAAAHgAAAAAFHAAAAAADHAAAAAADBgAAAAAABgAAAAAABgAAAAAAHgAAAAACAwAAAAAEAwAAAAADHgAAAAADAwAAAAAADQAAAAAADQAAAAAADQAAAAAADQAAAAAAAwAAAAAAHgAAAAAEHAAAAAABHAAAAAAE version: 6 1,-2: ind: 1,-2 @@ -3023,6 +3023,18 @@ entities: rot: -1.5707963267948966 rad pos: 22.5,15.5 parent: 2 +- proto: CP14AlchemySolutionCleaner + entities: + - uid: 2245 + components: + - type: Transform + pos: 22.5,14.5 + parent: 2 + - uid: 4088 + components: + - type: Transform + pos: 15.5,0.5 + parent: 2 - proto: CP14BankStorageMarker entities: - uid: 2252 @@ -42352,6 +42364,7 @@ entities: - type: Transform pos: 6.771952,-30.18434 parent: 2 + - type: ItemSlots - proto: CP14Bonfire entities: - uid: 10139 @@ -44796,55 +44809,7 @@ entities: rot: -1.5707963267948966 rad pos: -1.751207,-15.858576 parent: 2 -- proto: CP14CrystalElementalElectricBig - entities: - - uid: 12937 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 5.5089397,23.222403 - parent: 2 -- proto: CP14CrystalElementalElectricSmall - entities: - - uid: 8018 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -1.439316,22.62645 - parent: 2 - - uid: 8019 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 4.4403806,21.389568 - parent: 2 -- proto: CP14CrystalElementalHealingBig - entities: - - uid: 1772 - components: - - type: Transform - pos: 19.470413,26.68387 - parent: 2 -- proto: CP14CrystalElementalHealingMedium - entities: - - uid: 569 - components: - - type: Transform - pos: 21.506302,21.545189 - parent: 2 - - uid: 1788 - components: - - type: Transform - pos: 21.506302,28.437994 - parent: 2 -- proto: CP14CrystalElementalHealingSmall - entities: - - uid: 1787 - components: - - type: Transform - pos: 16.422209,24.940992 - parent: 2 -- proto: CP14CrystalElementalLightBig +- proto: CP14CrystalAir entities: - uid: 2870 components: @@ -44857,13 +44822,83 @@ entities: rot: 1.5707963267948966 rad pos: 0.5933609,19.47803 parent: 2 -- proto: CP14CrystalElementalWaterBig + - uid: 8018 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -1.439316,22.62645 + parent: 2 + - uid: 8019 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 4.4403806,21.389568 + parent: 2 + - uid: 12937 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 5.5089397,23.222403 + parent: 2 +- proto: CP14CrystalOrder entities: + - uid: 569 + components: + - type: Transform + pos: 21.506302,21.545189 + parent: 2 + - uid: 1772 + components: + - type: Transform + pos: 19.470413,26.68387 + parent: 2 + - uid: 1787 + components: + - type: Transform + pos: 16.422209,24.940992 + parent: 2 + - uid: 1788 + components: + - type: Transform + pos: 21.506302,28.437994 + parent: 2 +- proto: CP14CrystalWater + entities: + - uid: 1584 + components: + - type: Transform + pos: 5.539493,16.672426 + parent: 2 - uid: 3988 components: - type: Transform pos: -27.606766,38.58238 parent: 2 + - uid: 9139 + components: + - type: Transform + pos: -23.68489,42.129253 + parent: 2 + - uid: 9142 + components: + - type: Transform + pos: -25.731766,38.535503 + parent: 2 + - uid: 9759 + components: + - type: Transform + pos: -32.450516,45.30113 + parent: 2 + - uid: 11428 + components: + - type: Transform + pos: -29.544266,44.160503 + parent: 2 + - uid: 11441 + components: + - type: Transform + pos: -26.294266,44.348003 + parent: 2 - uid: 11442 components: - type: Transform @@ -44874,6 +44909,11 @@ entities: - type: Transform pos: -24.617723,43.346436 parent: 2 + - uid: 11488 + components: + - type: Transform + pos: -28.575516,40.14488 + parent: 2 - uid: 11571 components: - type: Transform @@ -44895,63 +44935,24 @@ entities: rot: -1.5707963267948966 rad pos: 20.058619,-33.687397 parent: 2 - - uid: 12932 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 9.563785,-43.047474 - parent: 2 -- proto: CP14CrystalElementalWaterMedium - entities: - - uid: 9139 - components: - - type: Transform - pos: -23.68489,42.129253 - parent: 2 - - uid: 9142 - components: - - type: Transform - pos: -25.731766,38.535503 - parent: 2 - - uid: 11441 - components: - - type: Transform - pos: -26.294266,44.348003 - parent: 2 - - uid: 11488 - components: - - type: Transform - pos: -28.575516,40.14488 - parent: 2 - uid: 12930 components: - type: Transform rot: -1.5707963267948966 rad pos: 16.559088,-40.410233 parent: 2 -- proto: CP14CrystalElementalWaterSmall - entities: - - uid: 1584 - components: - - type: Transform - pos: 5.539493,16.672426 - parent: 2 - - uid: 9759 - components: - - type: Transform - pos: -32.450516,45.30113 - parent: 2 - - uid: 11428 - components: - - type: Transform - pos: -29.544266,44.160503 - parent: 2 - uid: 12931 components: - type: Transform rot: -1.5707963267948966 rad pos: 9.578799,-38.467766 parent: 2 + - uid: 12932 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 9.563785,-43.047474 + parent: 2 - uid: 12933 components: - type: Transform @@ -47964,12 +47965,14 @@ entities: - type: Transform pos: -1.5248553,16.594898 parent: 2 + - type: ItemSlots - uid: 1804 components: - type: Transform rot: -1.5707963267948966 rad pos: 13.10843,24.68416 parent: 2 + - type: ItemSlots - proto: CP14GreenBottle2 entities: - uid: 1802 @@ -47977,6 +47980,7 @@ entities: - type: Transform pos: -1.2998962,16.85352 parent: 2 + - type: ItemSlots - proto: CP14HeadSkeleton entities: - uid: 4245 @@ -67728,6 +67732,12 @@ entities: parent: 2 - proto: CP14TableWooden entities: + - uid: 440 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 16.5,2.5 + parent: 2 - uid: 568 components: - type: Transform @@ -68098,6 +68108,12 @@ entities: - type: Transform pos: 18.5,17.5 parent: 2 + - uid: 12671 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.5,2.5 + parent: 2 - uid: 12880 components: - type: Transform @@ -68977,6 +68993,36 @@ entities: - type: Transform pos: -17.5,-68.5 parent: 2 +- proto: CP14VialMediumReinforced + entities: + - uid: 1302 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.666626,14.043741 + parent: 2 + - type: ItemSlots + - uid: 12668 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.295242,14.099963 + parent: 2 + - type: ItemSlots + - uid: 12672 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.423852,2.6853378 + parent: 2 + - type: ItemSlots + - uid: 12673 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 15.783979,2.6066272 + parent: 2 + - type: ItemSlots - proto: CP14VialSmall entities: - uid: 2158 @@ -68984,74 +69030,14 @@ entities: - type: Transform pos: -8.223879,-30.36517 parent: 2 + - type: ItemSlots - uid: 2247 components: - type: Transform rot: -6.283185307179586 rad pos: 16.449919,0.89076805 parent: 2 -- proto: CP14VialSmallGroundQuartz - entities: - - uid: 2241 - components: - - type: Transform - rot: -6.283185307179586 rad - pos: 16.21371,0.68836915 - parent: 2 - - uid: 2245 - components: - - type: Transform - rot: -6.283185307179586 rad - pos: 16.112478,0.92450154 - parent: 2 - - uid: 14996 - components: - - type: Transform - pos: 22.574104,14.631483 - parent: 2 - - uid: 14997 - components: - - type: Transform - pos: 22.709152,14.429085 - parent: 2 - - uid: 14998 - components: - - type: Transform - pos: 22.540344,14.209819 - parent: 2 - - uid: 14999 - components: - - type: Transform - pos: 22.726036,14.05802 - parent: 2 -- proto: CP14VialSmallHealthPotion - entities: - - uid: 440 - components: - - type: Transform - parent: 439 - - type: Physics - canCollide: False - - uid: 17922 - components: - - type: Transform - parent: 17920 - - type: Physics - canCollide: False -- proto: CP14VialSmallManaPotion - entities: - - uid: 17836 - components: - - type: Transform - parent: 17835 - - type: Physics - canCollide: False - - uid: 17921 - components: - - type: Transform - parent: 17920 - - type: Physics - canCollide: False + - type: ItemSlots - proto: CP14VialTiny entities: - uid: 441 @@ -69060,50 +69046,59 @@ entities: parent: 439 - type: Physics canCollide: False + - type: ItemSlots - uid: 2126 components: - type: Transform rot: -1.5707963267948966 rad pos: 12.326101,2.8135571 parent: 2 + - type: ItemSlots - uid: 2248 components: - type: Transform pos: 15.344066,5.5884895 parent: 2 + - type: ItemSlots - uid: 2249 components: - type: Transform pos: 15.502547,5.496072 parent: 2 + - type: ItemSlots - uid: 5564 components: - type: Transform pos: -8.595063,-30.263971 parent: 2 + - type: ItemSlots - uid: 14975 components: - type: Transform pos: 18.438482,17.353796 parent: 2 + - type: ItemSlots - uid: 17915 components: - type: Transform parent: 17835 - type: Physics canCollide: False + - type: ItemSlots - uid: 17923 components: - type: Transform parent: 17920 - type: Physics canCollide: False + - type: ItemSlots - uid: 17924 components: - type: Transform parent: 17920 - type: Physics canCollide: False + - type: ItemSlots - proto: CP14WallCyan entities: - uid: 894 @@ -69812,9 +69807,6 @@ entities: parent: 2 - type: Storage storedItems: - 440: - position: 0,0 - _rotation: South 441: position: 1,0 _rotation: South @@ -69824,7 +69816,6 @@ entities: showEnts: False occludes: True ents: - - 440 - 441 - type: Fixtures fixtures: {} @@ -69865,12 +69856,6 @@ entities: parent: 2 - type: Storage storedItems: - 17921: - position: 0,0 - _rotation: South - 17922: - position: 1,0 - _rotation: South 17923: position: 2,0 _rotation: South @@ -69883,22 +69868,12 @@ entities: showEnts: False occludes: True ents: - - 17921 - - 17922 - 17923 - 17924 - type: Fixtures fixtures: {} - proto: CP14WallmountBarShelfB entities: - - uid: 1302 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,14.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 8566 components: - type: Transform @@ -69913,6 +69888,21 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 12669 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 22.5,16.5 + parent: 2 + - type: Fixtures + fixtures: {} + - uid: 12670 + components: + - type: Transform + pos: 21.5,17.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 13409 components: - type: Transform @@ -69920,14 +69910,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 14863 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 22.5,12.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 17835 components: - type: Transform @@ -69935,9 +69917,6 @@ entities: parent: 2 - type: Storage storedItems: - 17836: - position: 0,0 - _rotation: South 17915: position: 1,0 _rotation: South @@ -69947,7 +69926,6 @@ entities: showEnts: False occludes: True ents: - - 17836 - 17915 - type: Fixtures fixtures: {} @@ -70638,6 +70616,14 @@ entities: parent: 2 - type: Fixtures fixtures: {} + - uid: 2241 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: 20.5,18.5 + parent: 2 + - type: Fixtures + fixtures: {} - uid: 2267 components: - type: Transform @@ -70670,13 +70656,6 @@ entities: parent: 2 - type: Fixtures fixtures: {} - - uid: 4088 - components: - - type: Transform - pos: 21.5,17.5 - parent: 2 - - type: Fixtures - fixtures: {} - uid: 4090 components: - type: Transform diff --git a/Resources/Maps/_CP14/comoss_d.yml b/Resources/Maps/_CP14/comoss_d.yml index d74c57f274..f9887ca1ca 100644 --- a/Resources/Maps/_CP14/comoss_d.yml +++ b/Resources/Maps/_CP14/comoss_d.yml @@ -95346,214 +95346,6 @@ entities: - type: Transform pos: -18.5,-7.5 parent: 2 -- proto: CP14CrystalElementalDarknessBig - entities: - - uid: 526 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -52.513706,-31.587868 - parent: 2 - - uid: 4750 - components: - - type: Transform - pos: -4.4530544,-12.664821 - parent: 2 -- proto: CP14CrystalElementalDarknessMedium - entities: - - uid: 4189 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -5.4564304,-20.670996 - parent: 2 - - uid: 20393 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -70.47718,27.537062 - parent: 2 -- proto: CP14CrystalElementalDarknessSmall - entities: - - uid: 676 - components: - - type: Transform - pos: -3.4852087,-11.596605 - parent: 2 - - uid: 727 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: 0.57572365,-20.50233 - parent: 2 - - uid: 4191 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -4.4548235,-17.556303 - parent: 2 - - uid: 4721 - components: - - type: Transform - pos: 2.7045028,-12.631088 - parent: 2 - - uid: 4770 - components: - - type: Transform - pos: -6.4675236,-14.508899 - parent: 2 -- proto: CP14CrystalElementalElectricBig - entities: - - uid: 4906 - components: - - type: Transform - rot: 1.5707963267948966 rad - pos: -36.05168,31.938839 - parent: 2 - - uid: 9902 - components: - - type: Transform - pos: -105.57984,21.24656 - parent: 2 - - uid: 11334 - components: - - type: Transform - pos: -106.56642,24.367363 - parent: 2 - - uid: 11507 - components: - - type: Transform - pos: -41.252434,23.25334 - parent: 2 - - uid: 11527 - components: - - type: Transform - pos: -31.018059,30.22209 - parent: 2 - - uid: 11548 - components: - - type: Transform - pos: -30.018059,25.925215 - parent: 2 - - uid: 11569 - components: - - type: Transform - pos: -30.924309,22.78459 - parent: 2 - - uid: 11589 - components: - - type: Transform - pos: -41.54931,28.25334 - parent: 2 - - uid: 11590 - components: - - type: Transform - pos: -35.17431,19.706465 - parent: 2 -- proto: CP14CrystalElementalElectricMedium - entities: - - uid: 11355 - components: - - type: Transform - pos: -104.53287,22.474747 - parent: 2 - - uid: 11400 - components: - - type: Transform - pos: -32.37684,20.860218 - parent: 2 - - uid: 11421 - components: - - type: Transform - pos: -38.93934,20.297718 - parent: 2 - - uid: 11528 - components: - - type: Transform - pos: -40.81434,25.266468 - parent: 2 - - uid: 11549 - components: - - type: Transform - pos: -43.06434,29.321156 - parent: 2 - - uid: 11570 - components: - - type: Transform - pos: -33.1034,30.516468 - parent: 2 - - uid: 11591 - components: - - type: Transform - pos: -29.236214,24.469593 - parent: 2 - - uid: 15255 - components: - - type: Transform - rot: -1.5707963267948966 rad - pos: -56.54992,-10.055402 - parent: 2 -- proto: CP14CrystalElementalElectricSmall - entities: - - uid: 11401 - components: - - type: Transform - pos: -31.430351,32.15894 - parent: 2 - - uid: 11422 - components: - - type: Transform - pos: -28.180351,26.12769 - parent: 2 - - uid: 11463 - components: - - type: Transform - pos: -40.0241,30.518314 - parent: 2 - - uid: 18709 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 12.46924,50.596863 - parent: 2 -- proto: CP14CrystalElementalFireMedium - entities: - - uid: 437 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -54.41131,-14.440628 - parent: 2 - - uid: 18692 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 30.503544,54.41658 - parent: 2 -- proto: CP14CrystalElementalHealingBig - entities: - - uid: 18698 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: 38.46467,38.340416 - parent: 2 -- proto: CP14CrystalElementalHealingMedium - entities: - - uid: 440 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -59.91631,-3.0338006 - parent: 2 -- proto: CP14CrystalElementalLightSmall - entities: - - uid: 15225 - components: - - type: Transform - rot: 3.141592653589793 rad - pos: -55.453403,-5.6048665 - parent: 2 - proto: CP14CrystalLampBlueEmpty entities: - uid: 8973 @@ -110629,7 +110421,7 @@ entities: - type: Transform pos: 56.5,55.5 parent: 2 -- proto: CP14SpellScrollCounterSpell +- proto: CP14ActionSpellMagicSplitting entities: - uid: 17519 components: @@ -111064,28 +110856,28 @@ entities: - type: Transform pos: 70.53315,33.730537 parent: 2 -- proto: CP14VialSmallAgaricMushroom +- proto: CP14VialSmall entities: - uid: 12720 components: - type: Transform pos: -48.855915,-73.34486 parent: 2 -- proto: CP14VialSmallBloodFlowerSap +- proto: CP14VialSmall entities: - uid: 2159 components: - type: Transform pos: -49.230915,-73.12611 parent: 2 -- proto: CP14VialSmallBlueAmanita +- proto: CP14VialSmall entities: - uid: 2161 components: - type: Transform pos: -48.93404,-73.18861 parent: 2 -- proto: CP14VialSmallDayflin +- proto: CP14VialSmall entities: - uid: 9521 components: @@ -111097,21 +110889,21 @@ entities: - type: Transform pos: -49.230915,-73.34486 parent: 2 -- proto: CP14VialSmallGroundQuartz +- proto: CP14VialSmall entities: - uid: 12734 components: - type: Transform pos: -48.68404,-73.14173 parent: 2 -- proto: CP14VialSmallWildSage +- proto: CP14VialSmall entities: - uid: 12751 components: - type: Transform pos: -48.59029,-73.29798 parent: 2 -- proto: CP14VialTinyChromiumSlime +- proto: CP14VialTiny entities: - uid: 9522 components: @@ -111123,7 +110915,7 @@ entities: - type: Transform pos: -48.199665,-73.07923 parent: 2 -- proto: CP14VialTinyLumiMushroom +- proto: CP14VialTiny entities: - uid: 12733 components: diff --git a/Resources/Maps/_CP14/dev_map.yml b/Resources/Maps/_CP14/dev_map.yml index 8d24ba95ed..c803c40c6a 100644 --- a/Resources/Maps/_CP14/dev_map.yml +++ b/Resources/Maps/_CP14/dev_map.yml @@ -68677,7 +68677,7 @@ entities: - type: Transform pos: -1.5163221,-8.256644 parent: 1 -- proto: CP14VialSmallAgaricMushroom +- proto: CP14VialSmall entities: - uid: 991 components: @@ -68689,7 +68689,7 @@ entities: - type: Transform pos: 0.7443149,-2.2132106 parent: 1 -- proto: CP14VialSmallBloodFlowerSap +- proto: CP14VialSmall entities: - uid: 989 components: @@ -68701,7 +68701,7 @@ entities: - type: Transform pos: 1.0817542,-2.2132106 parent: 1 -- proto: CP14VialSmallGroundQuartz +- proto: CP14VialSmall entities: - uid: 985 components: @@ -68713,7 +68713,7 @@ entities: - type: Transform pos: 1.6891469,-2.224455 parent: 1 -- proto: CP14VialSmallWildSage +- proto: CP14VialSmall entities: - uid: 987 components: diff --git a/Resources/Maps/_CP14/factoria.yml b/Resources/Maps/_CP14/factoria.yml index 9f66708d70..ef0594d820 100644 --- a/Resources/Maps/_CP14/factoria.yml +++ b/Resources/Maps/_CP14/factoria.yml @@ -63415,7 +63415,7 @@ entities: rot: 1.5707963267948966 rad pos: -38.64112,-14.336575 parent: 2 -- proto: CP14CrystalElementalDarknessBig +- proto: CP14CrystalChaos entities: - uid: 13443 components: @@ -63427,7 +63427,7 @@ entities: - type: Transform pos: -45.897987,1.9787674 parent: 2 -- proto: CP14CrystalElementalDarknessMedium +- proto: CP14CrystalChaos entities: - uid: 13444 components: @@ -63439,7 +63439,7 @@ entities: - type: Transform pos: -48.444862,2.4943924 parent: 2 -- proto: CP14CrystalElementalDarknessSmall +- proto: CP14CrystalChaos entities: - uid: 13448 components: @@ -63451,20 +63451,6 @@ entities: - type: Transform pos: -47.804237,1.7756424 parent: 2 -- proto: CP14CrystalElementalHealingMedium - entities: - - uid: 14479 - components: - - type: Transform - pos: 2.5575833,-7.520762 - parent: 2 -- proto: CP14CrystalElementalHealingSmall - entities: - - uid: 14478 - components: - - type: Transform - pos: 0.46383393,-3.6145117 - parent: 2 - proto: CP14CrystalShardElectric entities: - uid: 14492 @@ -85262,7 +85248,7 @@ entities: rot: 3.141592653589793 rad pos: -27.5,-34.5 parent: 1 -- proto: CP14VialSmallGroundQuartz +- proto: CP14VialSmall entities: - uid: 14506 components: diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/buy.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/buy.yml index 09fe9f1883..8c16d7c54d 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/buy.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/buy.yml @@ -10,26 +10,10 @@ services: - !type:CP14UnlockPositionsService addBuyPositions: - - AlchemyNormalizer - AlchemyVials removeBuyPositions: - AlchemyUnlockT1 -- type: storePositionBuy - id: AlchemyNormalizer - roundstartAvailable: false - name: cp14-store-buy-alchemy-normalizer-name - desc: cp14-store-buy-alchemy-normalizer-desc - code: NORMALIZER - icon: - sprite: _CP14/Structures/Specific/Alchemy/normalizer.rsi - state: base - price: 200 - services: - - !type:CP14BuyItemsService - product: - CP14AlchemyNormalizer: 1 - - type: storePositionBuy id: AlchemyVials roundstartAvailable: false diff --git a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml index 6841e299d0..97155b250e 100644 --- a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml @@ -6,20 +6,11 @@ - type: StorageFill contents: - id: CP14VialTiny - amount: 9 + amount: 5 - id: CP14VialSmall - amount: 8 - #Gift - - id: CP14Dropper - prob: 0.2 - - id: CP14Mortar - prob: 0.2 - - id: CP14Pestle - prob: 0.2 - - id: CP14VialSmall - prob: 0.2 - - id: CP14VialTiny - prob: 0.2 + amount: 5 + - id: CP14VialMedium + amount: 5 - id: CP14GlassShard #Lol. Something broken prob: 0.2 diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index 5f7c4a3720..4ebd2060df 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -5,7 +5,8 @@ components: - type: StorageFill contents: - - id: HandLabeler #TODO custom cp14 labeler + - id: CP14Lighter + - id: CP14ManaOperationGlove - id: CP14Syringe amount: 2 - id: CP14Cauldron @@ -27,18 +28,12 @@ - id: CP14PenFeather amount: 1 #Random start resource - - id: CP14VialSmallHealthPotion - - id: CP14VialSmallHealthPotion - - id: CP14VialSmallHealthPotion - - id: CP14VialSmallManaPotion - - id: CP14VialSmallManaPotion - - id: CP14VialSmallManaPotion - - id: CP14VialSmallGroundQuartz - - id: CP14VialSmallGroundQuartz - - id: CP14VialSmallBloodFlowerSap - - id: CP14VialSmallAgaricMushroom - - id: CP14VialSmallWildSage - - id: CP14VialSmallBlueAmanita + - id: CP14VialMediumEarthEssence + - id: CP14VialMediumFireEssence + - id: CP14VialMediumWaterEssence + - id: CP14VialMediumAirEssence + - id: CP14VialMediumOrderEssence + - id: CP14VialMediumChaosEssence - type: entity parent: CP14WoodenCloset diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index afebd54fce..5428c3d017 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -121,20 +121,4 @@ - id: CP14GreenBottle2 - id: CP14BlueBottle - id: CP14OrangeBottle - - id: CP14RedBottle - #Common - - !type:GroupSelector - weight: 0.5 - children: - - id: CP14VialSmallDayflin - - id: CP14VialSmallBlueAmanita - - id: CP14VialSmallWildSage - - id: CP14VialSmallGroundQuartz - - id: CP14VialSmallAgaricMushroom - - id: CP14VialSmallBloodFlowerSap - #Rare - - !type:GroupSelector - weight: 0.15 - children: - - id: CP14VialTinyLumiMushroom - - id: CP14VialTinyChromiumSlime \ No newline at end of file + - id: CP14RedBottle \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Chemistry/mixing_types.yml b/Resources/Prototypes/_CP14/Chemistry/mixing_types.yml new file mode 100644 index 0000000000..49726e1dc2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Chemistry/mixing_types.yml @@ -0,0 +1,6 @@ +- type: mixingCategory + id: CP14MagicSplitting + verbText: cp14-mixing-verb-magic-splitting + icon: + sprite: _CP14/Actions/Spells/meta.rsi + state: counter_spell \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/T1_resurrection.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/T1_resurrection.yml index f0081b5028..20112fb163 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/T1_resurrection.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/T1_resurrection.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 100 - type: CP14MagicEffect - magicType: Death telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml index eb82ae622a..064976214f 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml @@ -9,7 +9,6 @@ - type: CP14MagicEffectManaCost manaCost: 25 - type: CP14MagicEffect - magicType: Dimension telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml index 6c4a5f8794..a0157d747e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml @@ -9,7 +9,6 @@ - type: CP14MagicEffectManaCost manaCost: 25 - type: CP14MagicEffect - magicType: Dimension telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml index 5501f407a2..1858233184 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml @@ -9,7 +9,6 @@ - type: CP14MagicEffectManaCost manaCost: 10 - type: CP14MagicEffect - magicType: Dimension telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml index d145de798c..4d0c32258e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 20 - type: CP14MagicEffect - magicType: Dimension telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml index cb869c83e5..3d198db97e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 15 - type: CP14MagicEffect - magicType: Earth telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml index 1b891a9076..6235a18ed8 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_flame_creation.yml @@ -9,7 +9,6 @@ - type: CP14MagicEffectManaCost manaCost: 5 - type: CP14MagicEffect - magicType: Fire effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_hell_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_hell_ballade.yml index b9132616b2..09b14b8f9d 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_hell_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_hell_ballade.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 1 - type: CP14MagicEffect - magicType: Fire effects: - !type:CP14SpellSpawnEntityOnTarget spawns: @@ -52,7 +51,7 @@ effects: - !type:Jitter - !type:FlammableReaction - multiplier: 0.1 + multiplier: 0.5 - !type:AdjustTemperature amount: 500 - !type:Ignite diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_tiefling_inner_fire.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_tiefling_inner_fire.yml index 1a0d411c4c..71eb62d6c1 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_tiefling_inner_fire.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T0_tiefling_inner_fire.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectCastingVisual proto: CP14RuneTieflingRevenge - type: CP14MagicEffect - magicType: Fire effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml index e4555bc7ce..df2866ce24 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fire_rune.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 15 - type: CP14MagicEffect - magicType: Fire telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml index 4ca926c72f..3a5fd69f76 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/T1_fireball.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 20 - type: CP14MagicEffect - magicType: Fire effects: - !type:CP14SpellSpawnEntityOnUser spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_heat.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_heat.yml index 81f330444f..bd213515b3 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_heat.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_heat.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 10 - type: CP14MagicEffect - magicType: Life telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_poison.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_poison.yml index ae5a4c9821..7aa25927fa 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_poison.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_poison.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 10 - type: CP14MagicEffect - magicType: Life telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_wounds.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_wounds.yml index f03fd8c036..9fea5d685b 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_wounds.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_cure_wounds.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 10 - type: CP14MagicEffect - magicType: Life telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_heal_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_heal_ballade.yml index daf274b153..d2a072dc20 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_heal_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_heal_ballade.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 1 - type: CP14MagicEffect - magicType: Life effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_peace_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_peace_ballade.yml index 56743f7d73..5864833683 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_peace_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_peace_ballade.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 2 - type: CP14MagicEffect - magicType: Life effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_plant_growth.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_plant_growth.yml index db43b443b8..a940f21fda 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_plant_growth.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_plant_growth.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 5 - type: CP14MagicEffect - magicType: Life telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_speed_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_speed_ballade.yml index cb43f73e39..933f549656 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_speed_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/T0_speed_ballade.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 1 - type: CP14MagicEffect - magicType: Life effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml index a176183c80..fa0f98544d 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T0_sphere_of_light.yml @@ -9,7 +9,6 @@ - type: CP14MagicEffectManaCost manaCost: 10 - type: CP14MagicEffect - magicType: Light effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_flash_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_flash_light.yml index c726ce99e7..cff03890db 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_flash_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_flash_light.yml @@ -9,7 +9,6 @@ - type: CP14MagicEffectManaCost manaCost: 10 - type: CP14MagicEffect - magicType: Light telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_signal_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_signal_light.yml index d6cd9e9331..fc7291674b 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_signal_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/T1_signal_light.yml @@ -7,7 +7,6 @@ - type: CP14MagicEffectManaCost manaCost: 5 - type: CP14MagicEffect - magicType: Light - type: CP14MagicEffectSomaticAspect - type: InstantAction itemIconStyle: BigAction diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_ballade.yml index c2f18a6219..d3349f2dd3 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_ballade.yml @@ -12,7 +12,6 @@ manaCost: 5 canModifyManacost: false - type: CP14MagicEffect - magicType: Meta effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml index ba3503d267..c64c85ca14 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml @@ -7,7 +7,6 @@ sprite: _CP14/Actions/Spells/meta.rsi state: mana_consume - type: CP14MagicEffect - magicType: Meta telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml index 2f5fdad860..e95fb60f91 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_gift.yml @@ -20,7 +20,6 @@ manaCost: 10 canModifyManacost: false - type: CP14MagicEffect - magicType: Meta telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_splitting.yml similarity index 63% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_splitting.yml index 7f554d47a7..8f63afc69d 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_counter_spell.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_splitting.yml @@ -1,7 +1,7 @@ - type: entity - id: CP14ActionSpellCounterSpell - name: Counter spell - description: By affecting the magical energy itself, you can interrupt the cast of someone else's spell. + id: CP14ActionSpellMagicSplitting + name: Magic splitting + description: You destroy the very essence of magic, interrupting spell casts, destroying mana and more. components: - type: Sprite sprite: _CP14/Actions/Spells/meta.rsi @@ -11,19 +11,27 @@ - type: CP14MagicEffectManaCost manaCost: 15 - type: CP14MagicEffect - magicType: Meta telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: - - CP14ImpactEffectCounterSpell + - CP14ImpactEffectMagicSplitting effects: + - !type:CP14SpellMixSolution + reactionTypes: + - CP14MagicSplitting - !type:CP14SpellInterruptSpell + - !type:CP14SpellApplyEntityEffect + effects: + - !type:CP14ManaChange + manaDelta: -50 + safe: true - type: CP14MagicEffectCastingVisual - proto: CP14RuneCounterSpell + proto: CP14RuneMagicSplitting - type: EntityTargetAction whitelist: components: - CP14MagicEnergyContainer + - ExaminableSolution itemIconStyle: BigAction interactOnMiss: false range: 60 @@ -33,12 +41,12 @@ sprite: _CP14/Actions/Spells/meta.rsi state: counter_spell event: !type:CP14DelayedEntityTargetActionEvent - cooldown: 10 + cooldown: 15 castDelay: 0.25 breakOnMove: false - type: entity - id: CP14RuneCounterSpell + id: CP14RuneMagicSplitting parent: CP14BaseMagicRune categories: [ HideSpawnMenu ] components: @@ -51,24 +59,22 @@ shader: unshaded - type: entity - id: CP14ImpactEffectCounterSpell + id: CP14ImpactEffectMagicSplitting parent: CP14BaseMagicImpact categories: [ HideSpawnMenu ] components: - type: Sprite + sprite: Effects/electricity.rsi layers: - - state: circle_decrease - color: "#5096d4" - shader: unshaded - - state: circle_increase - color: "#5096d4" + - state: electrified + color: "#601fc2" shader: unshaded - type: entity parent: CP14BaseSpellScrollMeta - id: CP14SpellScrollCounterSpell - name: counter spell spell scroll #Spell spell spell spell + id: CP14SpellScrollMagicSplitting + name: magic splitting spell scroll components: - type: CP14SpellStorage spells: - - CP14ActionSpellCounterSpell \ No newline at end of file + - CP14ActionSpellMagicSplitting \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml index 9e306eeb20..67f42497ba 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 7 - type: CP14MagicEffect - magicType: Water effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml index 34a67b7bdf..a3fe7c9fb9 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml @@ -9,7 +9,6 @@ - type: CP14MagicEffectManaCost manaCost: 10 - type: CP14MagicEffect - magicType: Water effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml index f4e68e9399..e836c104e0 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml @@ -9,7 +9,6 @@ - type: CP14MagicEffectManaCost manaCost: 50 - type: CP14MagicEffect - magicType: Water effects: - !type:CP14SpellSpawnEntityOnTarget spawns: diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml index b04e2a9926..fff5c06171 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml @@ -11,7 +11,6 @@ - type: CP14MagicEffectManaCost manaCost: 5 - type: CP14MagicEffect - magicType: Water effects: - !type:CP14SpellProjectile prototype: CP14IceShard diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml index 7611707eec..080c12b8a2 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/Roles/general.yml @@ -125,8 +125,6 @@ sprite: _CP14/Clothing/Head/Roles/General/triangularhat.rsi - type: Clothing sprite: _CP14/Clothing/Head/Roles/General/triangularhat.rsi - - type: CP14MagicManacostModify - globalModifier: 0.8 - type: entity parent: CP14ClothingHeadBase @@ -138,8 +136,6 @@ sprite: _CP14/Clothing/Head/Roles/General/triangularhat_golden.rsi - type: Clothing sprite: _CP14/Clothing/Head/Roles/General/triangularhat_golden.rsi - - type: CP14MagicManacostModify - globalModifier: 0.8 - type: entity parent: CP14ClothingHeadBase diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml index 305c3d112a..ae9928de79 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml @@ -37,7 +37,7 @@ - id: CP14SpellScrollFlashLight - id: CP14SpellScrollWaterCreation - id: CP14SpellScrollPlantGrowth - - id: CP14SpellScrollCounterSpell + - id: CP14SpellScrollMagicSplitting - id: CP14SpellScrollMagicalAcceleration - id: CP14EnergyCrystalSmallEmpty - id: CP14BaseSharpeningStone @@ -47,15 +47,6 @@ - !type:GroupSelector weight: 25 children: - - !type:GroupSelector - children: - - id: CP14VialSmallBloodFlowerSap - - id: CP14VialSmallAgaricMushroom - - id: CP14VialSmallGroundQuartz - - id: CP14VialSmallWildSage - - id: CP14VialSmallBlueAmanita - - id: CP14VialTinyChromiumSlime - - id: CP14VialTinyLumiMushroom - id: CP14BaseLockpick - id: CP14EnergyCrystalMediumEmpty # Rare standard village crates loot diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index 1f988446e4..f07505d52f 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -34,6 +34,9 @@ - type: PhysicalComposition # точно ли это нужно? materialComposition: CP14Dirt: 100 + - type: CP14MagicEssenceContainer + essences: + Earth: 1 - type: entity id: CP14DirtBlock10 @@ -79,6 +82,9 @@ - type: PhysicalComposition # точно ли это нужно? materialComposition: CP14Stone: 100 + - type: CP14MagicEssenceContainer + essences: + Earth: 1 - type: entity id: CP14StoneBlock10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml index 3a139640de..966a54c7e5 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml @@ -4,6 +4,8 @@ abstract: true categories: [ ForkFiltered ] components: + - type: Sprite + noRot: true - type: MeleeWeapon soundNoDamage: path: "/Audio/Effects/Fluids/splat.ogg" @@ -54,6 +56,26 @@ - type: Tag tags: - CP14Vial + - type: PaperLabel + labelSlot: + insertVerbText: comp-paper-label-insert + ejectVerbText: comp-paper-label-eject + whitelist: + components: + - Paper + blacklist: + tags: + - Book + - type: GenericVisualizer + visuals: + enum.PaperLabelVisuals.HasLabel: + enum.PaperLabelVisuals.Layer: + True: {visible: true} + False: {visible: false} + - type: ContainerContainer + containers: + paper_label: !type:ContainerSlot + - type: ItemSlots - type: entity parent: CP14BaseVial @@ -110,6 +132,9 @@ - state: liq-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] - type: Item size: Tiny sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi @@ -138,6 +163,9 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: false - state: reinforcement + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] - type: Item size: Tiny sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi @@ -164,6 +192,9 @@ - state: liq-1 map: ["enum.SolutionContainerLayers.Fill"] visible: false + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] - type: Item size: Tiny sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi @@ -190,6 +221,9 @@ map: ["enum.SolutionContainerLayers.Fill"] visible: false - state: reinforcement + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] - type: Item size: Tiny sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi @@ -200,3 +234,64 @@ - type: SolutionContainerVisuals maxFillLevels: 5 fillBaseName: liq- + +- type: entity + id: CP14VialMedium + parent: CP14BaseVialFragile + name: medium vial + description: A fragile glass vial to hold a medium amount of liquid. + components: + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi + layers: + - state: vial + - state: liq-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] + - type: Item + size: Small + shape: + - 0,0,1,1 + sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi + - type: SolutionContainerManager + solutions: + vial: + maxVol: 30 + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: liq- + +- type: entity + id: CP14VialMediumReinforced + parent: CP14BaseVial + name: reinforced medium vial + description: A reinforced glass vial to hold a medium amount of liquid. + components: + - type: Sprite + sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi + layers: + - state: vial + - state: liq-1 + map: ["enum.SolutionContainerLayers.Fill"] + visible: false + - state: reinforcement + - state: label + visible: false + map: ["enum.PaperLabelVisuals.Layer"] + - type: Item + size: Small + shape: + - 0,0,1,1 + sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi + - type: SolutionContainerManager + solutions: + vial: + maxVol: 50 + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: liq- + - type: Injector + transferAmount: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled.yml index fce6eb51fc..fae3da3e38 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials_filled.yml @@ -1,151 +1,73 @@ # Raw materials - type: entity - id: CP14VialSmallBloodFlowerSap - parent: CP14VialSmall - suffix: Bloodflower sap + id: CP14VialMediumEarthEssence + parent: CP14VialMedium + suffix: Terra components: - type: SolutionContainerManager solutions: vial: reagents: - - ReagentId: CP14BloodFlowerSap - Quantity: 10 + - ReagentId: CP14EssenceEarth + Quantity: 50 - type: entity - id: CP14VialSmallAgaricMushroom - parent: CP14VialSmall - suffix: Fly agaric juice + id: CP14VialMediumFireEssence + parent: CP14VialMedium + suffix: Ignis components: - type: SolutionContainerManager solutions: vial: reagents: - - ReagentId: CP14AgaricMushroom - Quantity: 10 + - ReagentId: CP14EssenceFire + Quantity: 50 - type: entity - id: CP14VialSmallGroundQuartz - parent: CP14VialSmall - suffix: Ground Quartz + id: CP14VialMediumWaterEssence + parent: CP14VialMedium + suffix: Aqua components: - type: SolutionContainerManager solutions: vial: reagents: - - ReagentId: CP14GroundQuartz - Quantity: 10 + - ReagentId: CP14EssenceWater + Quantity: 50 - type: entity - id: CP14VialSmallWildSage - parent: CP14VialSmall - suffix: Wild sage Sap + id: CP14VialMediumAirEssence + parent: CP14VialMedium + suffix: Aer components: - type: SolutionContainerManager solutions: vial: reagents: - - ReagentId: CP14WildSageSap - Quantity: 10 + - ReagentId: CP14EssenceAir + Quantity: 50 - type: entity - id: CP14VialSmallBlueAmanita - parent: CP14VialSmall - suffix: Blue Amanita + id: CP14VialMediumOrderEssence + parent: CP14VialMedium + suffix: Ordo components: - type: SolutionContainerManager solutions: vial: reagents: - - ReagentId: CP14BlueAmanita - Quantity: 10 + - ReagentId: CP14EssenceOrder + Quantity: 50 - type: entity - id: CP14VialSmallAirLily - parent: CP14VialSmall - suffix: Air lily + id: CP14VialMediumChaosEssence + parent: CP14VialMedium + suffix: Perditio components: - type: SolutionContainerManager solutions: vial: reagents: - - ReagentId: CP14AirLily - Quantity: 10 - -- type: entity - id: CP14VialSmallDayflin - parent: CP14VialSmall - suffix: Dayflin - components: - - type: SolutionContainerManager - solutions: - vial: - reagents: - - ReagentId: CP14YellowDayflinPulp - Quantity: 10 - -- type: entity - id: CP14VialTinyChromiumSlime - parent: CP14VialTiny - suffix: Chromium Slime - components: - - type: SolutionContainerManager - solutions: - vial: - reagents: - - ReagentId: CP14ChromiumSlime - Quantity: 5 - -- type: entity - id: CP14VialTinyLumiMushroom - parent: CP14VialTiny - suffix: LumiShroom - components: - - type: SolutionContainerManager - solutions: - vial: - reagents: - - ReagentId: CP14LumiMushroom - Quantity: 5 - -# Ready potions - -- type: entity - id: CP14VialSmallHealthPotion - parent: CP14VialSmall - suffix: Health potion 50% - components: - - type: Label - currentLabel: cp14-potion-label-health - - type: SolutionContainerManager - solutions: - vial: - reagents: - - ReagentId: CP14BasicEffectHealBrute - Quantity: 4 - - ReagentId: CP14BasicEffectBloodRestore - Quantity: 2 - - ReagentId: CP14BasicEffectEmoteCough - Quantity: 1 - - ReagentId: CP14BasicEffectEmpty - Quantity: 3 - -- type: entity - id: CP14VialSmallManaPotion - parent: CP14VialSmall - suffix: Mana potion 50% - components: - - type: Label - currentLabel: cp14-potion-label-mana - - type: SolutionContainerManager - solutions: - vial: - reagents: - - ReagentId: CP14BasicEffectHealMana - Quantity: 4 - - ReagentId: CP14BasicEffectSatiateThirst - Quantity: 2 - - ReagentId: CP14BasicEffectDrunk - Quantity: 1 - - ReagentId: CP14BasicEffectEmpty - Quantity: 3 \ No newline at end of file + - ReagentId: CP14EssenceChaos + Quantity: 50 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml index 5e1dbce84c..4d3e364b69 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/essence.yml @@ -42,10 +42,12 @@ - type: CP14MagicEssenceAttractor - type: CP14MagicEssence +# Basic 6 + - type: entity parent: CP14BaseEssence id: CP14EssenceEarth - name: earth essence + name: terra components: - type: Sprite color: "#70533f" @@ -60,7 +62,7 @@ - type: entity parent: CP14BaseEssence id: CP14EssenceFire - name: fire essence + name: ignis components: - type: Sprite color: "#d9741c" @@ -72,25 +74,10 @@ - ReagentId: CP14EssenceFire Quantity: 1 -- type: entity - parent: CP14BaseEssence - id: CP14EssenceLife - name: life essence - components: - - type: Sprite - color: "#89e04f" - - type: SolutionContainerManager - solutions: - essence: - maxVol: 1 - reagents: - - ReagentId: CP14EssenceLife - Quantity: 1 - - type: entity parent: CP14BaseEssence id: CP14EssenceWater - name: water essence + name: aqua components: - type: Sprite color: "#1c94d9" @@ -102,10 +89,72 @@ - ReagentId: CP14EssenceWater Quantity: 1 +- type: entity + parent: CP14BaseEssence + id: CP14EssenceAir + name: aer + components: + - type: Sprite + color: "#def9ff" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceAir + Quantity: 1 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceOrder + name: ordo + components: + - type: Sprite + color: "#d9d9d9" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceOrder + Quantity: 1 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceChaos + name: perditio + components: + - type: Sprite + color: "#d9d9d9" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceChaos + Quantity: 1 + +# Complex tier 1 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceFrost + name: gelum + components: + - type: Sprite + color: "#4f91bd" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceFrost + Quantity: 1 + - type: entity parent: CP14BaseEssence id: CP14EssenceLight - name: light essence + name: lux components: - type: Sprite color: "#ba97b8" @@ -119,38 +168,38 @@ - type: entity parent: CP14BaseEssence - id: CP14EssenceDimension - name: dimension essence + id: CP14EssenceMotion + name: motus components: - type: Sprite - color: "#391c57" + color: "#575100" - type: SolutionContainerManager solutions: essence: maxVol: 1 reagents: - - ReagentId: CP14EssenceDimension + - ReagentId: CP14EssenceMotion Quantity: 1 - type: entity parent: CP14BaseEssence - id: CP14EssenceDeath - name: death essence + id: CP14EssenceCycle + name: permutatio components: - type: Sprite - color: "#55877a" + color: "#063b1f" - type: SolutionContainerManager solutions: essence: maxVol: 1 reagents: - - ReagentId: CP14EssenceDeath + - ReagentId: CP14EssenceCycle Quantity: 1 - type: entity parent: CP14BaseEssence - id: CP14EssenceElectric - name: electric essence + id: CP14EssenceEnergia + name: energia components: - type: Sprite color: "#caed72" @@ -159,5 +208,82 @@ essence: maxVol: 1 reagents: - - ReagentId: CP14EssenceElectric + - ReagentId: CP14EssenceEnergia + Quantity: 1 + +- type: entity + parent: CP14BaseEssence + id: CP14EssencePoison + name: venenum + components: + - type: Sprite + color: "#619e20" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssencePoison + Quantity: 1 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceVoid + name: vacuos + components: + - type: Sprite + color: "#12021c" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceVoid + Quantity: 1 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceLife + name: victus + components: + - type: Sprite + color: "#eb1a3d" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceLife + Quantity: 1 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceCrystal + name: vitreus + components: + - type: Sprite + color: "#538cb8" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceCrystal + Quantity: 1 + +# Complex tier 2 + +- type: entity + parent: CP14BaseEssence + id: CP14EssenceMagic + name: praecantatio + components: + - type: Sprite + color: "#5497d6" + - type: SolutionContainerManager + solutions: + essence: + maxVol: 1 + reagents: + - ReagentId: CP14EssenceMagic Quantity: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml index b0cf0cc450..ddcf8cefe7 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/tools.yml @@ -41,6 +41,7 @@ spells: - CP14ActionSpellManaGift - CP14ActionSpellManaConsume + - CP14ActionSpellMagicSplitting - type: ThrowingAngle #Fun angle: 225 - type: MeleeWeapon diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml index 452d86133f..8cf22922e9 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml @@ -64,9 +64,9 @@ - CP14ActionSpellCureBurn - CP14ActionSpellBloodPurification - CP14ActionSpellResurrection - - type: CP14MagicManacostModify - modifiers: - Life: 1.4 + #- type: CP14MagicManacostModify + # modifiers: + # Life: 1.4 - type: CP14MagicEnergyExaminable - type: CP14MagicEnergyContainer energy: 80 @@ -80,9 +80,9 @@ categories: [ DoNotMap ] suffix: Artifact components: - - type: CP14MagicManacostModify - modifiers: - Dimension: 1.4 + #- type: CP14MagicManacostModify + # modifiers: + # Dimension: 1.4 - type: CP14SpellStorage spells: - CP14ActionSpellShadowStep diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml deleted file mode 100644 index 0a08759c72..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml +++ /dev/null @@ -1,129 +0,0 @@ -- type: entity - id: CP14CrystalBase - abstract: true - parent: BaseRock - name: sparkling quartz - description: Natural quartz crystals that can absorb the magical energy of the world around them. - categories: [ ForkFiltered ] - components: - - type: Sprite - drawdepth: Mobs - offset: 0, 0.25 - noRot: true - - type: InteractionPopup - interactSuccessString: popup-cp14crystal-ding - messagePerceivedByOthers: popup-cp14crystal-ding - interactSuccessSound: - collection: CP14CrystalDings - params: - variation: 0.03 - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Glass - - type: MeleeSound - soundGroups: - Brute: - collection: GlassSmash - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.30 - density: 60 - mask: - - MachineMask - layer: - - MidImpassable - - LowImpassable - - BulletImpassable - - Opaque - - type: PointLight - netSync: false - -- type: entity - parent: CP14CrystalBase - id: CP14CrystalBigBase - abstract: true - components: - - type: Sprite - sprite: _CP14/Structures/Flora/Crystal/crystal_big.rsi - layers: - - state: big1 - shader: unshaded - map: ["random"] - - type: InteractionPopup - interactSuccessSound: - collection: CP14CrystalDings - params: - pitch: 0.5 - variation: 0.03 - - type: PointLight - radius: 4 - energy: 1.5 - - type: RandomSprite - available: - - random: - big0: Inherit - big1: Inherit - big2: Inherit - -- type: entity - parent: CP14CrystalBase - id: CP14CrystalMediumBase - abstract: true - components: - - type: Sprite - sprite: _CP14/Structures/Flora/Crystal/crystal_medium.rsi - layers: - - state: medium4 - shader: unshaded - map: ["random"] - - type: InteractionPopup - interactSuccessSound: - collection: CP14CrystalDings - params: - pitch: 1 - variation: 0.03 - - type: PointLight - radius: 2.5 - energy: 1 - - type: RandomSprite - available: - - random: - medium0: Inherit - medium1: Inherit - medium2: Inherit - medium3: Inherit - medium4: Inherit - -- type: entity - parent: CP14CrystalBase - id: CP14CrystalSmallBase - abstract: true - components: - - type: Sprite - sprite: _CP14/Structures/Flora/Crystal/crystal_small.rsi - layers: - - state: small1 - shader: unshaded - map: ["random"] - - type: InteractionPopup - interactSuccessSound: - collection: CP14CrystalDings - params: - pitch: 1.5 - variation: 0.03 - - type: PointLight - radius: 1.5 - energy: 0.5 - - type: RandomSprite - available: - - random: - small0: Inherit - small1: Inherit - small2: Inherit - small3: Inherit - small4: Inherit - small5: Inherit - - type: Appearance \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml index d25e4f9a2b..110ce351cb 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml @@ -1,330 +1,85 @@ -# Normal - - type: entity - id: CP14CrystalSmall - suffix: Normal, Small - parent: CP14CrystalSmallBase + id: CP14CrystalBase + abstract: true + parent: BaseRock + name: quartz + description: Natural quartz crystals that can absorb the magical energy of the world around them. + categories: [ ForkFiltered ] components: - type: Sprite - sprite: _CP14/Structures/Flora/Crystal/crystal_small.rsi - layers: - - state: small1 - map: ["random"] - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardBase: - min: 1 - max: 1 - - !type:TriggerBehavior - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: PointLight - enabled: false - -- type: entity - id: CP14CrystalMedium - suffix: Normal, Medium - parent: CP14CrystalMediumBase - components: - - type: Sprite - sprite: _CP14/Structures/Flora/Crystal/crystal_medium.rsi + drawdepth: Mobs + sprite: _CP14/Structures/Flora/Crystal/crystal.rsi layers: - state: medium1 map: ["random"] - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardBase: - min: 1 - max: 2 - - !type:TriggerBehavior - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: PointLight - enabled: false - -- type: entity - id: CP14CrystalBig - suffix: Normal, Big - parent: CP14CrystalBigBase - components: - - type: Sprite - sprite: _CP14/Structures/Flora/Crystal/crystal_big.rsi - layers: - - state: big1 - map: ["random"] - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardBase: - min: 2 - max: 3 - - !type:TriggerBehavior - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: PointLight - enabled: false - -# Water - -- type: entity - id: CP14CrystalWaterBase - abstract: true - description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of cold and water. - components: - - type: PointLight - color: "#5eabeb" - - type: Sprite - color: "#5eabeb" - - type: ExplodeOnTrigger - - type: Explosive - explosionType: Cryo - maxIntensity: 30 - intensitySlope: 1.5 - totalIntensity: 30 - canCreateVacuum: false - -- type: entity - id: CP14CrystalElementalWaterSmall - suffix: Water, Small - parent: - - CP14CrystalSmallBase - - CP14CrystalWaterBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardWater: - min: 1 - max: 1 - - !type:TriggerBehavior - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Explosive - totalIntensity: 15 - -- type: entity - id: CP14CrystalElementalWaterMedium - suffix: Water, Medium - parent: - - CP14CrystalMediumBase - - CP14CrystalWaterBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 15 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardWater: - min: 1 - max: 2 - - !type:TriggerBehavior - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Explosive - totalIntensity: 20 - -- type: entity - id: CP14CrystalElementalWaterBig - suffix: Water, Big - parent: - - CP14CrystalBigBase - - CP14CrystalWaterBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardWater: - min: 2 - max: 3 - - !type:TriggerBehavior - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Explosive - totalIntensity: 25 - intensitySlope: 0.5 - -# Healing - -- type: entity - id: CP14AreaEntityEffectCrystalHealing - parent: CP14BaseMagicImpact - categories: [ HideSpawnMenu ] - components: - - type: PointLight - color: "#79b330" - - type: Sprite + shader: unshaded + offset: 0, 0.25 noRot: true - drawdepth: BelowFloor - sprite: _CP14/Effects/Magic/area_impact.rsi + - type: InteractionPopup + interactSuccessString: popup-cp14crystal-ding + messagePerceivedByOthers: popup-cp14crystal-ding + interactSuccessSound: + collection: CP14CrystalDings + params: + variation: 0.03 + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: MeleeSound + soundGroups: + Brute: + collection: GlassSmash + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.30 + density: 60 + mask: + - MachineMask + layer: + - MidImpassable + - LowImpassable + - BulletImpassable + - Opaque + - type: RandomSprite + available: + - random: + big0: Inherit + big1: Inherit + big2: Inherit + medium0: Inherit + medium1: Inherit + medium2: Inherit + medium3: Inherit + medium4: Inherit + small0: Inherit + small1: Inherit + small2: Inherit + small3: Inherit + small4: Inherit + small5: Inherit + - type: PointLight + netSync: false + radius: 2.5 + energy: 1 + +# Normal + +- type: entity + id: CP14CrystalEmpty + suffix: Normal + parent: CP14CrystalBase + components: + - type: Sprite layers: - - state: area_impact_out - color: "#79b330" - shader: unshaded - - type: TimedDespawn - lifetime: 0.8 - - type: CP14AreaEntityEffect - range: 1 - whitelist: - components: - - Damageable - effects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectCureWounds - - !type:CP14SpellApplyEntityEffect - effects: - - !type:HealthChange - damage: - types: - Slash: -10 - Blunt: -10 - Piercing: -10 - - !type:Jitter - -- type: entity - id: CP14CrystalHealingBase - abstract: true - description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of life. - components: + - state: medium1 + map: ["random"] #Disabling unshaded - type: PointLight - color: "#3de063" - - type: Sprite - color: "#3de063" - -- type: entity - id: CP14CrystalElementalHealingSmall - suffix: Healing, Small - parent: - - CP14CrystalSmallBase - - CP14CrystalHealingBase - components: + enabled: false - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardHealing: - min: 1 - max: 1 - - !type:SpawnEntitiesBehavior - spawn: - CP14AreaEntityEffectCrystalHealing: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - id: CP14CrystalElementalHealingMedium - suffix: Healing, Medium - parent: - - CP14CrystalMediumBase - - CP14CrystalHealingBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - trigger: !type:DamageTrigger damage: 15 @@ -334,119 +89,51 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CP14CrystalShardHealing: + CP14CrystalShardBase: min: 1 max: 2 - - !type:SpawnEntitiesBehavior - spawn: - CP14AreaEntityEffectCrystalHealing: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - id: CP14CrystalElementalHealingBig - suffix: Healing, Big - parent: - - CP14CrystalBigBase - - CP14CrystalHealingBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardHealing: - min: 2 - max: 3 - - !type:SpawnEntitiesBehavior - spawn: - CP14AreaEntityEffectCrystalHealing: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -# Fire - -- type: entity - id: CP14CrystalFireBase - abstract: true - description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of fire. - components: - - type: PointLight - color: "#ed731c" - - type: Sprite - color: "#ed731c" - - type: ExplodeOnTrigger - - type: Explosive - explosionType: FireBomb - maxIntensity: 10 - intensitySlope: 1.5 - totalIntensity: 30 - canCreateVacuum: false - -- type: entity - id: CP14CrystalElementalFireSmall - suffix: Fire, Small - parent: - - CP14CrystalSmallBase - - CP14CrystalFireBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardFire: - min: 1 - max: 1 - !type:TriggerBehavior - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Explosive - totalIntensity: 5 - + - type: entity - id: CP14CrystalElementalFireMedium - suffix: Fire, Medium - parent: - - CP14CrystalMediumBase - - CP14CrystalFireBase + id: CP14CrystalEarth + parent: CP14CrystalBase + suffix: Terra components: + - type: PointLight + color: "#70533f" + - type: Sprite + color: "#70533f" - type: Destructible thresholds: - trigger: - !type:DamageTrigger - damage: 40 + !type:DamageTrigger + damage: 15 behaviors: + - !type:PlaySoundBehavior + sound: + collection: GlassBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14CrystalShardEarth: + min: 1 + max: 2 + - !type:TriggerBehavior - !type:DoActsBehavior acts: [ "Destruction" ] + +- type: entity + id: CP14CrystalFire + parent: CP14CrystalBase + suffix: Ignis + components: + - type: PointLight + color: "#d9741c" + - type: Sprite + color: "#d9741c" + - type: Destructible + thresholds: - trigger: !type:DamageTrigger damage: 15 @@ -462,105 +149,45 @@ - !type:TriggerBehavior - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Explosive - totalIntensity: 10 - type: entity - id: CP14CrystalElementalFireBig - suffix: Fire, Big - parent: - - CP14CrystalBigBase - - CP14CrystalFireBase + id: CP14CrystalWater + parent: CP14CrystalBase + suffix: Aqua components: + - type: PointLight + color: "#1c94d9" + - type: Sprite + color: "#1c94d9" - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 20 + damage: 15 behaviors: - !type:PlaySoundBehavior sound: collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CP14CrystalShardFire: - min: 2 - max: 3 + CP14CrystalShardWater: + min: 1 + max: 2 - !type:TriggerBehavior - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Explosive - totalIntensity: 20 - intensitySlope: 0.5 - -# Light - type: entity - id: CP14CrystalLightBase - abstract: true - description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of light. + id: CP14CrystalAir + parent: CP14CrystalBase + suffix: Aer components: - type: PointLight - color: "#f1c7ff" + color: "#def9ff" - type: Sprite - color: "#f1c7ff" - -- type: entity - id: CP14CrystalElementalLightSmall - suffix: Light, Small - parent: - - CP14CrystalSmallBase - - CP14CrystalLightBase - components: + color: "#def9ff" - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardLight: - min: 1 - max: 1 - - !type:SpawnEntitiesBehavior - spawn: - AdminInstantEffectFlash: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - id: CP14CrystalElementalLightMedium - suffix: Light, Medium - parent: - - CP14CrystalMediumBase - - CP14CrystalLightBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - trigger: !type:DamageTrigger damage: 15 @@ -570,123 +197,24 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CP14CrystalShardLight: + CP14CrystalShardAir: min: 1 max: 2 - - !type:SpawnEntitiesBehavior - spawn: - AdminInstantEffectFlash: - min: 1 - max: 1 + - !type:TriggerBehavior - !type:DoActsBehavior acts: [ "Destruction" ] - type: entity - id: CP14CrystalElementalLightBig - suffix: Light, Big - parent: - - CP14CrystalBigBase - - CP14CrystalLightBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardLight: - min: 2 - max: 3 - - !type:SpawnEntitiesBehavior - spawn: - AdminInstantEffectFlash: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -# Electric - -- type: entity - id: CP14CrystalElectricBase - abstract: true - description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of electricity. + id: CP14CrystalOrder + parent: CP14CrystalBase + suffix: Ordo components: - type: PointLight - color: "#e6ff6b" + color: "#d9d9d9" - type: Sprite - color: "#e6ff6b" - - type: Electrified - requirePower: false - shockTime: 8 - - type: TriggerOnCollide - fixtureID: fix1 - - type: SpawnOnTrigger - proto: CP14ElectrifiedEffect - -- type: entity - id: CP14CrystalElementalElectricSmall - suffix: Electric, Small - parent: - - CP14CrystalSmallBase - - CP14CrystalElectricBase - components: + color: "#d9d9d9" - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardElectric: - min: 1 - max: 1 - - !type:SpawnEntitiesBehavior - spawn: - CP14ElectrifiedEffect: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Electrified - shockTime: 2 - -- type: entity - id: CP14CrystalElementalElectricMedium - suffix: Electric, Medium - parent: - - CP14CrystalMediumBase - - CP14CrystalElectricBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - trigger: !type:DamageTrigger damage: 15 @@ -696,118 +224,24 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CP14CrystalShardElectric: + CP14CrystalShardOrder: min: 1 max: 2 - - !type:SpawnEntitiesBehavior - spawn: - CP14ElectrifiedEffect: - min: 1 - max: 1 + - !type:TriggerBehavior - !type:DoActsBehavior acts: [ "Destruction" ] - - type: Electrified - shockTime: 4 - type: entity - id: CP14CrystalElementalElectricBig - suffix: Electric, Big - parent: - - CP14CrystalBigBase - - CP14CrystalElectricBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardElectric: - min: 2 - max: 3 - - !type:SpawnEntitiesBehavior - spawn: - CP14ElectrifiedEffect: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - - type: Electrified - shockTime: 6 - -# Darkness - -- type: entity - id: CP14CrystalDarknessBase - abstract: true - description: Natural quartz crystals that can absorb the magical energy of the world around them. This crystal seems to have absorbed the energy of darkness. + id: CP14CrystalChaos + parent: CP14CrystalBase + suffix: Perditio components: - type: PointLight - color: "#391c57" + color: "#5c5c5c" - type: Sprite - color: "#391c57" - -- type: entity - id: CP14CrystalElementalDarknessSmall - suffix: Darkness, Small - parent: - - CP14CrystalSmallBase - - CP14CrystalDarknessBase - components: + color: "#5c5c5c" - type: Destructible thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 10 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardDarkness: - min: 1 - max: 1 - - !type:SpawnEntitiesBehavior - spawn: - CP14AstralHaze: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] - -- type: entity - id: CP14CrystalElementalDarknessMedium - suffix: Darkness, Medium - parent: - - CP14CrystalMediumBase - - CP14CrystalDarknessBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - trigger: !type:DamageTrigger damage: 15 @@ -817,48 +251,9 @@ collection: GlassBreak - !type:SpawnEntitiesBehavior spawn: - CP14CrystalShardDarkness: + CP14CrystalShardChaos: min: 1 max: 2 - - !type:SpawnEntitiesBehavior - spawn: - CP14AstralHaze: - min: 1 - max: 1 + - !type:TriggerBehavior - !type:DoActsBehavior acts: [ "Destruction" ] - -- type: entity - id: CP14CrystalElementalDarknessBig - suffix: Darkness, Big - parent: - - CP14CrystalBigBase - - CP14CrystalDarknessBase - components: - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - - trigger: - !type:DamageTrigger - damage: 20 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: GlassBreak - - !type:SpawnEntitiesBehavior - spawn: - CP14CrystalShardDarkness: - min: 2 - max: 3 - - !type:SpawnEntitiesBehavior - spawn: - CP14AstralHaze: - min: 1 - max: 1 - - !type:DoActsBehavior - acts: [ "Destruction" ] \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml index 82c05dcf49..3e9636f2d3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/shards.yml @@ -30,66 +30,73 @@ - type: entity parent: CP14CrystalShardBase - id: CP14CrystalShardWater - suffix: Water + id: CP14CrystalShardEarth + suffix: Terra components: - type: Sprite - color: "#5eabeb" + color: "#70533f" - type: CP14MagicEssenceContainer essences: - Water: 3 - -- type: entity - parent: CP14CrystalShardBase - id: CP14CrystalShardHealing - suffix: Life - components: - - type: Sprite - color: "#3de063" - - type: CP14MagicEssenceContainer - essences: - Life: 3 + Earth: 3 + Crystal: 1 - type: entity parent: CP14CrystalShardBase id: CP14CrystalShardFire - suffix: Fire + suffix: Ignis components: - type: Sprite - color: "#ed731c" + color: "#d9741c" - type: CP14MagicEssenceContainer essences: Fire: 3 + Crystal: 1 - type: entity parent: CP14CrystalShardBase - id: CP14CrystalShardLight - suffix: Light + id: CP14CrystalShardWater + suffix: Ignis components: - type: Sprite - color: "#f1c7ff" + color: "#1c94d9" - type: CP14MagicEssenceContainer essences: - Light: 3 + Water: 3 + Crystal: 1 - type: entity parent: CP14CrystalShardBase - id: CP14CrystalShardElectric - suffix: Electric + id: CP14CrystalShardAir + suffix: Aer components: - type: Sprite - color: "#e6ff6b" + color: "#def9ff" - type: CP14MagicEssenceContainer essences: - Electric: 3 + Air: 3 + Crystal: 1 - type: entity parent: CP14CrystalShardBase - id: CP14CrystalShardDarkness - suffix: Dimension + id: CP14CrystalShardOrder + suffix: Ordo components: - type: Sprite - color: "#391c57" + color: "#d9d9d9" - type: CP14MagicEssenceContainer essences: - Dimension: 3 \ No newline at end of file + Order: 3 + Crystal: 1 + +- type: entity + parent: CP14CrystalShardBase + id: CP14CrystalShardChaos + suffix: Perditio + components: + - type: Sprite + color: "#5c5c5c" + - type: CP14MagicEssenceContainer + essences: + Chaos: 3 + Crystal: 1 + diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/normalizer.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/cleaner.yml similarity index 78% rename from Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/normalizer.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/cleaner.yml index a7ff349737..aad86a76da 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/normalizer.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/cleaner.yml @@ -1,10 +1,10 @@ - type: entity - id: CP14AlchemyNormalizer + id: CP14AlchemySolutionCleaner parent: - BaseStructureDynamic - CP14BaseCrystalSlot - name: solution normalizer - description: An alchemical device that removes fine precipitates from solutions, and stabilizes it for further work + name: solution cleaner + description: An alchemical device that destroys from a solution poured into it the reagent that is least in the solution. Requires an energy crystal to operate. categories: [ ForkFiltered ] components: - type: InteractionOutline @@ -12,7 +12,7 @@ drawdepth: Items noRot: true offset: 0, 0.2 - sprite: _CP14/Structures/Specific/Alchemy/normalizer.rsi + sprite: _CP14/Structures/Specific/Alchemy/cleaner.rsi layers: - state: rotate_back_stop map: ["poweredBack"] @@ -50,23 +50,23 @@ - TabletopMachineMask - type: SolutionContainerManager solutions: - normalizer: + cleaner: maxVol: 50 - type: CP14SolutionTemperature - type: DrainableSolution - solution: normalizer + solution: cleaner - type: ExaminableSolution - solution: normalizer + solution: cleaner - type: MixableSolution - solution: normalizer + solution: cleaner - type: RefillableSolution - solution: normalizer + solution: cleaner - type: DrawableSolution - solution: normalizer + solution: cleaner - type: DumpableSolution - solution: normalizer - - type: CP14SolutionNormalizer - solution: normalizer + solution: cleaner + - type: CP14SolutionCleaner + solution: cleaner - type: CP14MagicEnergyAmbientSound - type: AmbientSound enabled: false diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml index 59d200b6e5..15ba236926 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Alchemy/heater.yml @@ -128,3 +128,13 @@ whitelist: tags: - CP14FireplaceFuel + +- type: entity + parent: CP14AlchemyFurnace + id: CP14AlchemyFurnaceDebug + suffix: Ignited, Infinity + categories: [ DoNotMap ] + components: + - type: CP14AutoIgnite + - type: CP14Fireplace + fuelDrainingPerUpdate: 0 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_collelctor.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_collector.yml similarity index 99% rename from Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_collelctor.yml rename to Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_collector.yml index 485a4c3efd..95deeb9d39 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_collelctor.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Thaumaturgy/essence_collector.yml @@ -47,7 +47,7 @@ shape: !type:PhysShapeAabb bounds: "-0.25,-0.25,0.25,0.25" - density: 125 + density: 525 mask: - TabletopMachineMask layer: diff --git a/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml b/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml index 078607e366..083b881293 100644 --- a/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml +++ b/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml @@ -4,36 +4,28 @@ name: Alchemy text: "/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml" children: - - CP14_EN_BasicAlchemy - - CP14_EN_Organic - - CP14_EN_Inorganic - - CP14_EN_Arcane + - CP14_EN_Precurser + - CP14_EN_ThaumaturgyEssence + - CP14_EN_TargetEffects filterEnabled: True - type: guideEntry crystallPunkAllowed: true - id: CP14_EN_BasicAlchemy - name: Basic effects solutions - text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/BasicAlchemy.xml" + id: CP14_EN_Precurser + name: Precursers + text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Precurser.xml" filterEnabled: True - type: guideEntry crystallPunkAllowed: true - id: CP14_EN_Organic - name: Organic solutions - text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Organic.xml" + id: CP14_EN_ThaumaturgyEssence + name: Thaumaturgic essences + text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Essence.xml" filterEnabled: True - type: guideEntry crystallPunkAllowed: true - id: CP14_EN_Inorganic - name: Inorganic solutions - text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Inorganic.xml" - filterEnabled: True - -- type: guideEntry - crystallPunkAllowed: true - id: CP14_EN_Arcane - name: Alchemized solutions - text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Arcane.xml" + id: CP14_EN_TargetEffects + name: Target alchemical solutions + text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/TargetEffects.xml" filterEnabled: True \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml b/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml index f3956ce487..3e1f42cb6d 100644 --- a/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml +++ b/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml @@ -4,36 +4,28 @@ name: Алхимия text: "/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml" children: - - CP14_RU_BasicAlchemy - - CP14_RU_Organic - - CP14_RU_Inorganic - - CP14_RU_Arcane + - CP14_RU_Precurser + - CP14_RU_ThaumaturgyEssence + - CP14_RU_TargetEffects filterEnabled: True - type: guideEntry crystallPunkAllowed: true - id: CP14_RU_BasicAlchemy - name: Базовые алхимические растворы - text: "/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/BasicAlchemy.xml" + id: CP14_RU_Precurser + name: Природные исходники + text: "/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Precurser.xml" filterEnabled: True - type: guideEntry crystallPunkAllowed: true - id: CP14_RU_Organic - name: Органические решения - text: "/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Organic.xml" + id: CP14_RU_ThaumaturgyEssence + name: Тауматургические эссенции + text: "/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Essence.xml" filterEnabled: True - type: guideEntry crystallPunkAllowed: true - id: CP14_RU_Inorganic - name: Неорганический растворы - text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Inorganic.xml" - filterEnabled: True - -- type: guideEntry - crystallPunkAllowed: true - id: CP14_RU_Arcane - name: Алхимизированные решения - text: "/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Arcane.xml" + id: CP14_RU_TargetEffects + name: Целевые алхимические растворы + text: "/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/TargetEffects.xml" filterEnabled: True \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/apprentice.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/apprentice.yml deleted file mode 100644 index 0271ba29cc..0000000000 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/apprentice.yml +++ /dev/null @@ -1,50 +0,0 @@ -# Equip groups - -- type: loadoutGroup - id: CP14ApprenticeBundle - name: cp14-loadout-apprentice-bundle - minLimit: 0 - loadouts: - - CP14BundleAlchemy - - CP14BundleBlacksmith - -- type: entity - id: CP14LoadoutDummyBundleAlchemy - categories: [ HideSpawnMenu ] - name: alchemy bundle - components: - - type: Sprite - sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi - state: full - -- type: loadout - id: CP14BundleAlchemy - dummyEntity: CP14LoadoutDummyBundleAlchemy - storage: - back: - - CP14Syringe - - CP14VialTinyReinforced - - CP14VialSmallReinforced - - CP14VialSmallReinforced - - CP14VialSmallGroundQuartz - - CP14VialSmallBloodFlowerSap - - CP14VialSmallAgaricMushroom - - CP14VialSmallWildSage - - CP14VialSmallBlueAmanita - -- type: entity - id: CP14LoadoutDummyBundleBlacksmith - categories: [ HideSpawnMenu ] - name: blacksmith bundle - components: - - type: Sprite - sprite: _CP14/Objects/Materials/copper_bar.rsi - state: bar_3 - -- type: loadout - id: CP14BundleBlacksmith - dummyEntity: CP14LoadoutDummyBundleBlacksmith - storage: - back: - - CP14CopperBar10 - - CP14IronBar10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml index b8818a9cd7..002e9cd80d 100644 --- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml @@ -28,7 +28,6 @@ - CP14GeneralShoes - CP14GeneralBack - CP14GeneralTrinkets - - CP14ApprenticeBundle - CP14GeneralKeys - type: roleLoadout diff --git a/Resources/Prototypes/_CP14/Loadouts/spells.yml b/Resources/Prototypes/_CP14/Loadouts/spells.yml index 82e50e5b1c..9e3cdbe6fd 100644 --- a/Resources/Prototypes/_CP14/Loadouts/spells.yml +++ b/Resources/Prototypes/_CP14/Loadouts/spells.yml @@ -24,7 +24,7 @@ - CP14ActionSpellSphereOfLight #Meta - CP14ActionSpellManaManipulation - - CP14ActionSpellCounterSpell + - CP14ActionSpellMagicSplitting - CP14ActionSpellMagicBallade #Physical - CP14ActionSpellSprint @@ -150,10 +150,10 @@ - CP14ManaWasting - type: loadout - id: CP14ActionSpellCounterSpell - dummyEntity: CP14ActionSpellCounterSpell + id: CP14ActionSpellMagicSplitting + dummyEntity: CP14ActionSpellMagicSplitting actions: - - CP14ActionSpellCounterSpell + - CP14ActionSpellMagicSplitting effects: - !type:JobRequirementLoadoutEffect requirement: diff --git a/Resources/Prototypes/_CP14/MagicTypes/magic.yml b/Resources/Prototypes/_CP14/MagicTypes/magic.yml index cc48954430..0b1dbaa1b9 100644 --- a/Resources/Prototypes/_CP14/MagicTypes/magic.yml +++ b/Resources/Prototypes/_CP14/MagicTypes/magic.yml @@ -1,52 +1,101 @@ +# Basic 6 + - type: magicType id: Earth - name: cp14-magic-type-earth + name: cp14-essence-earth color: "#70533f" essenceProto: CP14EssenceEarth - type: magicType id: Fire - name: cp14-magic-type-fire + name: cp14-essence-fire color: "#d9741c" essenceProto: CP14EssenceFire -- type: magicType - id: Life - name: cp14-magic-type-healing - color: "#89e04f" - essenceProto: CP14EssenceLife - -- type: magicType - id: Light - name: cp14-magic-type-light - color: "#ba97b8" - essenceProto: CP14EssenceLight - -- type: magicType - id: Dimension - name: cp14-magic-type-dimension - color: "#4e0691" - essenceProto: CP14EssenceDimension - -- type: magicType - id: Meta - name: cp14-magic-type-meta - color: "#dcffdb" - - type: magicType id: Water - name: cp14-magic-type-water + name: cp14-essence-water color: "#1c94d9" essenceProto: CP14EssenceWater - type: magicType - id: Death - name: cp14-magic-type-death - color: "#55877a" - essenceProto: CP14EssenceDeath + id: Air + name: cp14-essence-air + color: "#def9ff" + essenceProto: CP14EssenceAir - type: magicType - id: Electric - name: cp14-magic-type-electric + id: Order + name: cp14-essence-order + color: "#d9d9d9" + essenceProto: CP14EssenceOrder + +- type: magicType + id: Chaos + name: cp14-essence-chaos + color: "#5c5c5c" + essenceProto: CP14EssenceChaos + +# Complex tier 1 + +- type: magicType + id: Frost + name: cp14-essence-frost + color: "#4f91bd" + essenceProto: CP14EssenceFrost + +- type: magicType + id: Light + name: cp14-essence-light + color: "#ba97b8" + essenceProto: CP14EssenceLight + +- type: magicType + id: Motion + name: cp14-essence-motion + color: "#575100" + essenceProto: CP14EssenceMotion + +- type: magicType + id: Cycle + name: cp14-essence-cycle + color: "#063b1f" + essenceProto: CP14EssenceCycle + +- type: magicType + id: Energia + name: cp14-essence-energia color: "#caed72" - essenceProto: CP14EssenceElectric \ No newline at end of file + essenceProto: CP14EssenceEnergia + +- type: magicType + id: Void + name: cp14-essence-void + color: "#12021c" + essenceProto: CP14EssenceVoid + +- type: magicType + id: Poison + name: cp14-essence-poison + color: "#619e20" + essenceProto: CP14EssencePoison + +- type: magicType + id: Life + name: cp14-essence-life + color: "#eb1a3d" + essenceProto: CP14EssenceLife + +- type: magicType + id: Crystal + name: cp14-essence-crystal + color: "#538cb8" + essenceProto: CP14EssenceCrystal + +# Complex tier 2 + +- type: magicType + id: Magic + name: cp14-essence-magic + color: "#5497d6" + essenceProto: CP14EssenceMagic diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml index 4ffe173efc..e8fba7c400 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml @@ -10,252 +10,113 @@ - !type:OreDunGen tileMask: - CP14FloorBase - entity: CP14CrystalSmall + entity: CP14CrystalEmpty count: 30 minGroupSize: 1 - maxGroupSize: 3 - - !type:OreDunGen - tileMask: - - CP14FloorBase - entity: CP14CrystalMedium - count: 20 - minGroupSize: 1 - maxGroupSize: 2 - - !type:OreDunGen - tileMask: - - CP14FloorBase - entity: CP14CrystalBig - count: 10 - minGroupSize: 1 - maxGroupSize: 1 + maxGroupSize: 5 + +# TIER 2 - type: cp14DemiplaneModifier id: CrystalFire tiers: + - 1 - 2 - - 3 generationWeight: 0.1 categories: Reward: 0.1 requiredTags: #TODO: Hot places - - CP14DemiplaneOres - CP14DemiplaneUnderground blacklistTags: - CP14DemiplaneCold layers: - !type:OreDunGen - tileMask: - - CP14FloorBase - entity: CP14CrystalElementalFireSmall + entity: CP14CrystalFire count: 30 minGroupSize: 1 - maxGroupSize: 3 - - !type:OreDunGen - tileMask: - - CP14FloorBase - entity: CP14CrystalElementalFireMedium - count: 20 - minGroupSize: 1 - maxGroupSize: 2 - - !type:OreDunGen - tileMask: - - CP14FloorBase - entity: CP14CrystalElementalFireBig - count: 10 - minGroupSize: 1 - maxGroupSize: 1 - -# TIER 2 + maxGroupSize: 5 - type: cp14DemiplaneModifier - id: CrystalElectric + id: CrystalEarth tiers: + - 1 - 2 - - 3 - generationWeight: 0.1 - categories: - Reward: 0.1 - layers: - - !type:OreDunGen - tileMask: - - CP14FloorBase - - CP14FloorSand - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalElectricSmall - count: 30 - minGroupSize: 1 - maxGroupSize: 3 - - !type:OreDunGen - tileMask: - - CP14FloorBase - - CP14FloorSand - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalElectricMedium - count: 20 - minGroupSize: 1 - maxGroupSize: 2 - - !type:OreDunGen - tileMask: - - CP14FloorBase - - CP14FloorSand - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalElectricBig - count: 10 - minGroupSize: 1 - maxGroupSize: 1 - -- type: cp14DemiplaneModifier - id: CrystalHealing - tiers: - - 2 - - 3 - generationWeight: 0.1 - categories: - Reward: 0.1 - requiredTags: - - CP14DemiplaneHerbals - layers: - - !type:OreDunGen - tileMask: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalElectricSmall - count: 30 - minGroupSize: 1 - maxGroupSize: 3 - - !type:OreDunGen - tileMask: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalElectricMedium - count: 20 - minGroupSize: 1 - maxGroupSize: 2 - - !type:OreDunGen - tileMask: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalElectricBig - count: 10 - minGroupSize: 1 - maxGroupSize: 1 - -- type: cp14DemiplaneModifier - id: CrystalWater - tiers: - - 2 - - 3 - generationWeight: 0.1 - categories: - Reward: 0.1 - requiredTags: - - CP14DemiplaneCold - layers: - - !type:OreDunGen - tileMask: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalWaterSmall - count: 30 - minGroupSize: 1 - maxGroupSize: 3 - - !type:OreDunGen - tileMask: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalWaterMedium - count: 20 - minGroupSize: 1 - maxGroupSize: 2 - - !type:OreDunGen - tileMask: - - CP14FloorGrass - - CP14FloorGrassLight - - CP14FloorGrassTall - - CP14FloorSnow - - CP14FloorSnowDeep - - CP14FloorSnowDeepDeep - entity: CP14CrystalElementalWaterBig - count: 10 - minGroupSize: 1 - maxGroupSize: 1 - -- type: cp14DemiplaneModifier - id: CrystalDarkness - tiers: - - 2 - - 3 generationWeight: 0.1 categories: Reward: 0.1 requiredTags: - CP14DemiplaneUnderground + blacklistTags: + - CP14DemiplaneOpenSky layers: - !type:OreDunGen - entity: CP14CrystalElementalDarknessSmall + entity: CP14CrystalEarth count: 30 minGroupSize: 1 - maxGroupSize: 3 - - !type:OreDunGen - entity: CP14CrystalElementalDarknessMedium - count: 20 - minGroupSize: 1 - maxGroupSize: 2 - - !type:OreDunGen - entity: CP14CrystalElementalDarknessBig - count: 10 - minGroupSize: 1 - maxGroupSize: 1 + maxGroupSize: 5 - type: cp14DemiplaneModifier - id: CrystalLight + id: CrystalWater tiers: + - 1 + - 2 + generationWeight: 0.1 + categories: + Reward: 0.1 + requiredTags: + - CP14DemiplaneWater + layers: + - !type:OreDunGen + entity: CP14CrystalWater + count: 30 + minGroupSize: 1 + maxGroupSize: 5 + +- type: cp14DemiplaneModifier + id: CrystalAir + tiers: + - 1 - 2 - - 3 generationWeight: 0.1 categories: Reward: 0.1 requiredTags: - CP14DemiplaneOpenSky + blacklistTags: + - CP14DemiplaneUnderground layers: - !type:OreDunGen - entity: CP14CrystalElementalLightSmall + entity: CP14CrystalAir count: 30 minGroupSize: 1 - maxGroupSize: 3 + maxGroupSize: 5 + +- type: cp14DemiplaneModifier + id: CrystalOrder + tiers: + - 1 + - 2 + generationWeight: 0.1 + categories: + Reward: 0.1 + layers: - !type:OreDunGen - entity: CP14CrystalElementalLightMedium - count: 20 + entity: CP14CrystalOrder + count: 30 minGroupSize: 1 - maxGroupSize: 2 + maxGroupSize: 5 + +- type: cp14DemiplaneModifier + id: CrystalChaos + tiers: + - 1 + - 2 + generationWeight: 0.1 + categories: + Reward: 0.1 + layers: - !type:OreDunGen - entity: CP14CrystalElementalLightBig - count: 10 + entity: CP14CrystalChaos + count: 30 minGroupSize: 1 - maxGroupSize: 1 \ No newline at end of file + maxGroupSize: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/Biological/animal_origin.yml b/Resources/Prototypes/_CP14/Reagents/Biological/animal_origin.yml deleted file mode 100644 index 3a353f6417..0000000000 --- a/Resources/Prototypes/_CP14/Reagents/Biological/animal_origin.yml +++ /dev/null @@ -1,26 +0,0 @@ -# Poison - -- type: reagent - id: CP14WhistlerPoison - group: CP14Biological - name: cp14-reagent-name-whistler-poison - desc: cp14-reagent-desc-whistler-poison - flavor: CP14VerySweet - color: "#6bb4bf" - physicalDesc: reagent-physical-desc-powdery - metabolisms: - Narcotic: - effects: - - !type:Emote - emote: Yawn - showInChat: true - probability: 0.2 - - !type:GenericStatusEffect - conditions: - - !type:ReagentThreshold - reagent: CP14WhistlerPoison - min: 8 - key: ForcedSleep - component: ForcedSleeping - refresh: false - type: Add diff --git a/Resources/Prototypes/_CP14/Reagents/Biological/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_CP14/Reagents/Consumable/Drink/alcohol.yml similarity index 100% rename from Resources/Prototypes/_CP14/Reagents/Biological/Consumable/Drink/alcohol.yml rename to Resources/Prototypes/_CP14/Reagents/Consumable/Drink/alcohol.yml diff --git a/Resources/Prototypes/_CP14/Reagents/Precurser/arcane.yml b/Resources/Prototypes/_CP14/Reagents/Precurser/arcane.yml deleted file mode 100644 index 96359e5a1b..0000000000 --- a/Resources/Prototypes/_CP14/Reagents/Precurser/arcane.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Contains Magical or archaic resources, like slime - -- type: reagent - id: CP14ChromiumSlime - group: CP14Arcane - name: cp14-reagent-name-chromium-slime - desc: cp14-reagent-desc-chromium-slime - flavor: CP14Vomit - color: "#3b4872" - physicalDesc: cp14-reagent-physical-desc-colorless - slippery: true - metabolisms: - Food: - effects: - - !type:SatiateThirst - - !type:ChemVomit - probability: 0.05 diff --git a/Resources/Prototypes/_CP14/Reagents/Precurser/essence.yml b/Resources/Prototypes/_CP14/Reagents/Precurser/essence.yml deleted file mode 100644 index 7f10f19ee8..0000000000 --- a/Resources/Prototypes/_CP14/Reagents/Precurser/essence.yml +++ /dev/null @@ -1,187 +0,0 @@ -# Alchemized Blood / Raw Essence - -- type: reagent - id: CP14AlchemizedBlood - group: CP14Arcane - name: cp14-reagent-name-alchemizedblood - desc: cp14-reagent-desc-alchemizedblood - flavor: CP14Bitterly - color: "#562020" - recognizable: false - physicalDesc: cp14-reagent-physical-desc-powdery - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: -2 - - !type:ChemVomit - probability: 0.10 - -- type: reagent - id: CP14AlchemizedBloodTiefling - group: CP14Arcane - desc: cp14-reagent-desc-alchemizedblood-tiefling - name: cp14-reagent-name-alchemizedblood-tiefling - flavor: CP14Bitterly - color: "#593722" - recognizable: false - physicalDesc: cp14-reagent-physical-desc-powdery - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: -2 - - !type:HealthChange - damage: - types: - Heat: 2 - -- type: reagent - id: CP14AlchemizedBloodElf - group: CP14Arcane - desc: cp14-reagent-desc-alchemizedblood-elf - name: cp14-reagent-name-alchemizedblood-elf - flavor: CP14Bitterly - color: "#592840" - recognizable: false - physicalDesc: cp14-reagent-physical-desc-powdery - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: -2 - - !type:CP14ManaChange - manaDelta: -1 - -- type: reagent - id: CP14AlchemizedBloodGoblin - group: CP14Arcane - desc: cp14-reagent-desc-alchemizedblood-goblin - name: cp14-reagent-name-alchemizedblood-goblin - flavor: CP14Bitterly - color: "#6E7563" - recognizable: false - physicalDesc: cp14-reagent-physical-desc-powdery - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: -2 - - !type:HealthChange - damage: - types: - Poison: 1.5 - -# Refined / Processed Essence - -- type: reagent - id: CP14Essence - group: CP14Arcane - name: cp14-reagent-name-essence - desc: cp14-reagent-desc-essence - flavor: CP14Magic - color: "#7F3E13" - recognizable: false - physicalDesc: cp14-reagent-physical-desc-shimmering - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Drink: - effects: - - !type:ModifyBloodLevel - amount: 2 - - !type:ChemVomit - probability: 0.25 - -- type: reagent - id: CP14EssenceTiefling - group: CP14Arcane - desc: cp14-reagent-desc-essence-tiefling - name: cp14-reagent-name-essence-tiefling - flavor: CP14Magic - color: "#A37130" - recognizable: false - physicalDesc: cp14-reagent-physical-desc-shimmering - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Drink: - effects: - - !type:ModifyBloodLevel - amount: 2 - - !type:HealthChange - damage: - types: - Heat: 2 - -- type: reagent - id: CP14EssenceElf - group: CP14Arcane - name: cp14-reagent-name-essence-elf - desc: cp14-reagent-desc-essence-elf - flavor: CP14Magic - color: "#933E53" - recognizable: false - physicalDesc: cp14-reagent-physical-desc-shimmering - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Drink: - effects: - - !type:ModifyBloodLevel - amount: 2 - - !type:CP14ManaChange - manaDelta: -5 - -- type: reagent - id: CP14EssenceGoblin - group: CP14Arcane - name: cp14-reagent-name-essence-goblin - desc: cp14-reagent-desc-essence-goblin - flavor: CP14Magic - color: "#83993D" - recognizable: false - physicalDesc: cp14-reagent-physical-desc-shimmering - slippery: false - footstepSound: - collection: FootstepBlood - params: - volume: 6 - metabolisms: - Poison: - effects: - - !type:ModifyBloodLevel - amount: 2 - - !type:HealthChange - damage: - types: - Poison: 3 diff --git a/Resources/Prototypes/_CP14/Reagents/Precurser/inorganic.yml b/Resources/Prototypes/_CP14/Reagents/Precurser/inorganic.yml deleted file mode 100644 index 3dc9ca38cd..0000000000 --- a/Resources/Prototypes/_CP14/Reagents/Precurser/inorganic.yml +++ /dev/null @@ -1,69 +0,0 @@ -# Contains inorganic, but natural materials, like gems, and rocks & salts - -- type: reagent - id: CP14GroundQuartz - group: CP14Inorganic - name: cp14-reagent-name-grounded-quartz - desc: cp14-reagent-desc-grounded-quartz - flavor: CP14Quartz - color: "#9aa6ad" - physicalDesc: cp14-reagent-physical-desc-colorless - metabolisms: - Food: - effects: - - !type:ChemVomit - probability: 0.05 - -- type: reagent - id: CP14AlchemistSalt - name: cp14-reagent-name-base-alchemistsalt - desc: cp14-reagent-desc-base-alchemistsalt - group: CP14Inorganic - flavor: CP14Salty - color: "#D8CEC5" - physicalDesc: cp14-reagent-physical-desc-grainy - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: -3 - -- type: reagent - id: CP14SaltedWater - name: cp14-reagent-name-base-alchemistsaltwater - desc: cp14-reagent-desc-base-alchemistsaltwater - group: CP14Inorganic - flavor: CP14Salty - color: "#7C9BA8" - physicalDesc: cp14-reagent-physical-desc-grainy - metabolisms: - Drink: - effects: - - !type:HealthChange - damage: - types: - Poison: 0.5 - - !type:SatiateThirst - factor: -2 - - !type:ModifyBloodLevel - amount: 4 - -- type: reagent - id: CP14AlchemistOil - name: cp14-reagent-name-base-alchemistoil - desc: cp14-reagent-desc-base-alchemistoil - group: CP14Inorganic - flavor: CP14Metallic - color: "#3A342B" - recognizable: true - physicalDesc: cp14-reagent-physical-desc-slick - slippery: true - metabolisms: - Poison: - effects: - - !type:HealthChange - damage: - types: - Poison: 2.5 - - !type:FlammableReaction - multiplier: 2 diff --git a/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml b/Resources/Prototypes/_CP14/Reagents/blood.yml similarity index 91% rename from Resources/Prototypes/_CP14/Reagents/Biological/blood.yml rename to Resources/Prototypes/_CP14/Reagents/blood.yml index 959fbe2fe4..d332f12af0 100644 --- a/Resources/Prototypes/_CP14/Reagents/Biological/blood.yml +++ b/Resources/Prototypes/_CP14/Reagents/blood.yml @@ -1,6 +1,6 @@ - type: reagent id: CP14Blood - group: CP14Biological + group: CP14Precurser name: cp14-reagent-name-blood desc: cp14-reagent-desc-blood flavor: CP14Metallic @@ -12,10 +12,10 @@ collection: FootstepBlood params: volume: 6 - + - type: reagent id: CP14BloodTiefling - group: CP14Biological + group: CP14Precurser desc: cp14-reagent-desc-blood-tiefling name: cp14-reagent-name-blood-tiefling flavor: CP14Metallic @@ -27,10 +27,10 @@ collection: FootstepBlood params: volume: 6 - + - type: reagent id: CP14BloodElf - group: CP14Biological + group: CP14Precurser desc: cp14-reagent-desc-blood-elf name: cp14-reagent-name-blood-elf flavor: CP14Metallic @@ -42,10 +42,10 @@ collection: FootstepBlood params: volume: 6 - + - type: reagent id: CP14BloodGoblin - group: CP14Biological + group: CP14Precurser desc: cp14-reagent-desc-blood-goblin name: cp14-reagent-name-blood-goblin flavor: CP14Metallic diff --git a/Resources/Prototypes/_CP14/Reagents/magic-essence.yml b/Resources/Prototypes/_CP14/Reagents/magic-essence.yml deleted file mode 100644 index 9c59d0259f..0000000000 --- a/Resources/Prototypes/_CP14/Reagents/magic-essence.yml +++ /dev/null @@ -1,103 +0,0 @@ -- type: reagent - id: CP14EssenceEarth - name: cp14-reagent-name-essence-earth - desc: cp14-reagent-desc-essence-earth - group: CP14MagicEssence - flavor: CP14Bitterly - recognizable: true - physicalDesc: cp14-reagent-physical-desc-sparkling - color: "#70533f" - tileReactions: - - !type:CreateEntityTileReaction - entity: CP14EssenceEarth - -- type: reagent - id: CP14EssenceFire - name: cp14-reagent-name-essence-fire - desc: cp14-reagent-desc-essence-fire - group: CP14MagicEssence - flavor: CP14Bitterly - recognizable: true - physicalDesc: cp14-reagent-physical-desc-sparkling - color: "#d9741c" - tileReactions: - - !type:CreateEntityTileReaction - entity: CP14EssenceFire - -- type: reagent - id: CP14EssenceLife - name: cp14-reagent-name-essence-life - desc: cp14-reagent-desc-essence-life - group: CP14MagicEssence - flavor: CP14Bitterly - recognizable: true - physicalDesc: cp14-reagent-physical-desc-sparkling - color: "#89e04f" - tileReactions: - - !type:CreateEntityTileReaction - entity: CP14EssenceLife - -- type: reagent - id: CP14EssenceWater - name: cp14-reagent-name-essence-water - desc: cp14-reagent-desc-essence-water - group: CP14MagicEssence - flavor: CP14Bitterly - recognizable: true - physicalDesc: cp14-reagent-physical-desc-sparkling - color: "#1c94d9" - tileReactions: - - !type:CreateEntityTileReaction - entity: CP14EssenceWater - -- type: reagent - id: CP14EssenceLight - name: cp14-reagent-name-essence-light - desc: cp14-reagent-desc-essence-light - group: CP14MagicEssence - flavor: CP14Bitterly - recognizable: true - physicalDesc: cp14-reagent-physical-desc-sparkling - color: "#ba97b8" - tileReactions: - - !type:CreateEntityTileReaction - entity: CP14EssenceLight - -- type: reagent - id: CP14EssenceDimension - name: cp14-reagent-name-essence-dimension - desc: cp14-reagent-desc-essence-dimension - group: CP14MagicEssence - flavor: CP14Bitterly - recognizable: true - physicalDesc: cp14-reagent-physical-desc-sparkling - color: "#391c57" - tileReactions: - - !type:CreateEntityTileReaction - entity: CP14EssenceDimension - -- type: reagent - id: CP14EssenceDeath - name: cp14-reagent-name-essence-death - desc: cp14-reagent-desc-essence-death - group: CP14MagicEssence - flavor: CP14Bitterly - recognizable: true - physicalDesc: cp14-reagent-physical-desc-sparkling - color: "#55877a" - tileReactions: - - !type:CreateEntityTileReaction - entity: CP14EssenceDeath - -- type: reagent - id: CP14EssenceElectric - name: cp14-reagent-name-essence-electric - desc: cp14-reagent-desc-essence-electric - group: CP14MagicEssence - flavor: CP14Bitterly - recognizable: true - physicalDesc: cp14-reagent-physical-desc-sparkling - color: "#caed72" - tileReactions: - - !type:CreateEntityTileReaction - entity: CP14EssenceElectric \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/magic_essence.yml b/Resources/Prototypes/_CP14/Reagents/magic_essence.yml new file mode 100644 index 0000000000..f3a7d11390 --- /dev/null +++ b/Resources/Prototypes/_CP14/Reagents/magic_essence.yml @@ -0,0 +1,193 @@ +- type: reagent + id: CP14EssenceBase + abstract: true + physicalDesc: cp14-reagent-physical-desc-sparkling + flavor: CP14Bitterly + metabolisms: + Food: + metabolismRate: 0.05 + effects: + - !type:ChemVomit + probability: 0.25 + +# Basic 6 + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceEarth + name: cp14-reagent-name-essence-earth + desc: cp14-reagent-desc-essence-earth + group: CP14MagicEssenceT0 + color: "#70533f" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceEarth + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceFire + name: cp14-reagent-name-essence-fire + desc: cp14-reagent-desc-essence-fire + group: CP14MagicEssenceT0 + color: "#d9741c" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceFire + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceWater + name: cp14-reagent-name-essence-water + desc: cp14-reagent-desc-essence-water + group: CP14MagicEssenceT0 + color: "#1c94d9" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceWater + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceAir + name: cp14-reagent-name-essence-air + desc: cp14-reagent-desc-essence-air + group: CP14MagicEssenceT0 + color: "#def9ff" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceAir + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceOrder + name: cp14-reagent-name-essence-order + desc: cp14-reagent-desc-essence-order + group: CP14MagicEssenceT0 + color: "#d9d9d9" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceOrder + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceChaos + name: cp14-reagent-name-essence-chaos + desc: cp14-reagent-desc-essence-chaos + group: CP14MagicEssenceT0 + color: "#5c5c5c" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceChaos + +# Complex tier 1 + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceFrost + name: cp14-reagent-name-essence-frost + desc: cp14-reagent-desc-essence-frost + group: CP14MagicEssenceT1 + color: "#4f91bd" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceFrost + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceLight + name: cp14-reagent-name-essence-light + desc: cp14-reagent-desc-essence-light + group: CP14MagicEssenceT1 + color: "#ba97b8" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceLight + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceMotion + name: cp14-reagent-name-essence-motion + desc: cp14-reagent-desc-essence-motion + group: CP14MagicEssenceT1 + color: "#575100" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceMotion + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceCycle + name: cp14-reagent-name-essence-cycle + desc: cp14-reagent-desc-essence-cycle + group: CP14MagicEssenceT1 + color: "#063b1f" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceCycle + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceEnergia + name: cp14-reagent-name-essence-energia + desc: cp14-reagent-desc-essence-energia + group: CP14MagicEssenceT1 + color: "#caed72" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceEnergia + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceVoid + name: cp14-reagent-name-essence-void + desc: cp14-reagent-desc-essence-void + group: CP14MagicEssenceT1 + color: "#12021c" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceVoid + +- type: reagent + parent: CP14EssenceBase + id: CP14EssencePoison + name: cp14-reagent-name-essence-poison + desc: cp14-reagent-desc-essence-poison + group: CP14MagicEssenceT1 + color: "#619e20" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssencePoison + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceLife + name: cp14-reagent-name-essence-life + desc: cp14-reagent-desc-essence-life + group: CP14MagicEssenceT1 + color: "#eb1a3d" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceLife + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceCrystal + name: cp14-reagent-name-essence-crystal + desc: cp14-reagent-desc-essence-crystal + group: CP14MagicEssenceT1 + color: "#538cb8" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceCrystal + +# Complex tier 2 + +- type: reagent + parent: CP14EssenceBase + id: CP14EssenceMagic + name: cp14-reagent-name-essence-magic + desc: cp14-reagent-desc-essence-magic + group: CP14MagicEssenceT2 + color: "#5497d6" + tileReactions: + - !type:CreateEntityTileReaction + entity: CP14EssenceMagic \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/Precurser/organic.yml b/Resources/Prototypes/_CP14/Reagents/precurser.yml similarity index 69% rename from Resources/Prototypes/_CP14/Reagents/Precurser/organic.yml rename to Resources/Prototypes/_CP14/Reagents/precurser.yml index d45019ce13..0bf58ea82b 100644 --- a/Resources/Prototypes/_CP14/Reagents/Precurser/organic.yml +++ b/Resources/Prototypes/_CP14/Reagents/precurser.yml @@ -4,7 +4,7 @@ - type: reagent id: CP14BloodFlowerSap - group: CP14Organic + group: CP14Precurser name: cp14-reagent-name-bloodflowersap desc: cp14-reagent-desc-bloodflowersap flavor: CP14Metallic @@ -15,20 +15,10 @@ collection: FootstepBlood params: volume: 6 - metabolisms: - Food: - effects: - - !type:ModifyBloodLevel - Poison: - effects: - - !type:HealthChange - damage: - types: - Poison: 0.15 - type: reagent id: CP14YellowDayflinPulp - group: CP14Organic + group: CP14Precurser name: cp14-reagent-name-yellow-dayflin-pulp desc: cp14-reagent-desc-yellow-dayflin-pulp flavor: CP14Sweetly @@ -38,7 +28,7 @@ - type: reagent id: CP14AirLily - group: CP14Organic + group: CP14Precurser name: cp14-reagent-name-air-lily-juice desc: cp14-reagent-desc-air-lily-juice flavor: fizzy @@ -66,7 +56,7 @@ - type: reagent id: CP14AgaricMushroom - group: CP14Organic + group: CP14Precurser name: cp14-reagent-name-agaric-shroom desc: cp14-reagent-desc-agaric-shroom flavor: CP14Bitterly @@ -93,7 +83,7 @@ - type: reagent id: CP14LumiMushroom - group: CP14Organic + group: CP14Precurser name: cp14-reagent-name-lumi-shroom desc: cp14-reagent-desc-lumi-shroom flavor: CP14Vomit @@ -120,7 +110,7 @@ - type: reagent id: CP14BlueAmanita - group: CP14Organic + group: CP14Precurser name: cp14-reagent-name-blue-amanita desc: cp14-reagent-desc-blue-amanita flavor: CP14Magic @@ -142,7 +132,7 @@ - type: reagent id: CP14WildSageSap - group: CP14Organic + group: CP14Precurser name: cp14-reagent-name-wild-sage-sap desc: cp14-reagent-desc-wild-sage-sap flavor: CP14Sweetly @@ -159,3 +149,62 @@ emote: Cough showInChat: true probability: 0.15 + +# Slime based + +- type: reagent + id: CP14ChromiumSlime + group: CP14Precurser + name: cp14-reagent-name-chromium-slime + desc: cp14-reagent-desc-chromium-slime + flavor: CP14Vomit + color: "#3b4872" + physicalDesc: cp14-reagent-physical-desc-colorless + slippery: true + metabolisms: + Food: + effects: + - !type:SatiateThirst + - !type:ChemVomit + probability: 0.05 + +# Inorganic + +- type: reagent + id: CP14GroundQuartz + group: CP14Precurser + name: cp14-reagent-name-grounded-quartz + desc: cp14-reagent-desc-grounded-quartz + flavor: CP14Quartz + color: "#9aa6ad" + physicalDesc: cp14-reagent-physical-desc-colorless + metabolisms: + Food: + effects: + - !type:ChemVomit + probability: 0.05 + +- type: reagent + id: CP14WhistlerPoison + group: CP14Precurser + name: cp14-reagent-name-whistler-poison + desc: cp14-reagent-desc-whistler-poison + flavor: CP14VerySweet + color: "#6bb4bf" + physicalDesc: reagent-physical-desc-powdery + metabolisms: + Narcotic: + effects: + - !type:Emote + emote: Yawn + showInChat: true + probability: 0.2 + - !type:GenericStatusEffect + conditions: + - !type:ReagentThreshold + reagent: CP14WhistlerPoison + min: 8 + key: ForcedSleep + component: ForcedSleeping + refresh: false + type: Add \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml b/Resources/Prototypes/_CP14/Reagents/target_effects.yml similarity index 87% rename from Resources/Prototypes/_CP14/Reagents/basic-effects.yml rename to Resources/Prototypes/_CP14/Reagents/target_effects.yml index 9504dd51f0..8c8059e423 100644 --- a/Resources/Prototypes/_CP14/Reagents/basic-effects.yml +++ b/Resources/Prototypes/_CP14/Reagents/target_effects.yml @@ -1,26 +1,3 @@ -# This file contains Tier 0 and Tier 1 effects & solutions - -# T0 / Precurser - - -- type: reagent - id: CP14BasicEffectImpurity - name: cp14-reagent-name-basic-impurity - desc: cp14-reagent-desc-basic-impurity - group: CP14BasicEffect - flavor: CP14Bitterly - color: "#82ba3d" - physicalDesc: cp14-reagent-physical-desc-powdery - metabolisms: - Medicine: - effects: - - !type:ChemVomit - probability: 0.3 - - !type:HealthChange - damage: - types: - Poison: -1 - - type: reagent id: CP14BasicEffectEmpty name: cp14-reagent-name-basic-empty @@ -30,15 +7,6 @@ color: "#858585" physicalDesc: cp14-reagent-physical-desc-colorless -- type: reagent - id: CP14BasicEffectSimpleBase - name: cp14-reagent-name-basic-simplebase - desc: cp14-reagent-desc-basic-simplebase - group: CP14BasicEffect - flavor: CP14Salty - color: "#AFBFBF" - physicalDesc: cp14-reagent-physical-desc-powdery - # T1 / Simple or Basic solutions # Have simple effects, shouldn't be able to replace their occupational @@ -192,26 +160,6 @@ types: Poison: 3 -- type: reagent - id: CP14BasicEffectPurification - name: cp14-reagent-name-basic-purification - desc: cp14-reagent-desc-basic-purification - group: CP14BasicEffect - flavor: CP14Salty - color: "#977CB2" - physicalDesc: cp14-reagent-physical-desc-grainy - worksOnTheDead: true - metabolisms: - Medicine: - metabolismRate: 0.05 - effects: - - !type:HealthChange - damage: - types: - Poison: -4 - - !type:SatiateThirst - factor: -2 - - type: reagent id: CP14BasicEffectHealAirloss name: cp14-reagent-name-basic-heal-airloss @@ -340,23 +288,6 @@ - !type:CP14ManaChange manaDelta: -20 -- type: reagent - id: CP14BasicEffectUnstable - name: cp14-reagent-name-basic-unstable - desc: cp14-reagent-desc-basic-unstable - group: CP14BasicEffect - flavor: CP14Vomit - color: "#fa7d00" - physicalDesc: cp14-reagent-physical-desc-viscous - metabolisms: - Poison: - metabolismRate: 0.05 - effects: - - !type:HealthChange - damage: - types: - Poison: 2.5 - - type: reagent id: CP14BasicEffectSpeedUp name: cp14-reagent-name-basic-speed-up diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/agaric.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/agaric.yml deleted file mode 100644 index a24f249607..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/agaric.yml +++ /dev/null @@ -1,41 +0,0 @@ - -# Simple brewing - -- type: reaction - id: CP14AgaricShroomBrewing - minTemp: 530 - priority: 2 - reactants: - CP14AgaricMushroom: - amount: 1 - CP14BasicEffectSimpleBase: - amount: 1 - products: - CP14BasicEffectEmpty: 0.75 - CP14BasicEffectDamagePoison: 0.5 - CP14BasicEffectRainbow: 0.25 - cp14RandomProducts: - - CP14BasicEffectVomit: 0.25 - CP14BasicEffectDamageBrute: 0.25 - - CP14BasicEffectSatiateHunger: 0.25 - CP14BasicEffectRainbow: 0.25 - - CP14BasicEffectSatiateThirst: 0.25 - CP14BasicEffectVomit: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - -# Splitting - -- type: reaction - id: CP14AgaricShroomSplitting - minTemp: 450 - priority: 3 - reactants: - CP14BasicEffectHealBrute: - amount: 0.5 - CP14AgaricMushroom: - amount: 0.5 - products: - CP14BasicEffectSatiateHunger: 0.5 - CP14BasicEffectSatiateThirst: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/air_lily.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/air_lily.yml deleted file mode 100644 index a00c41419e..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/air_lily.yml +++ /dev/null @@ -1,37 +0,0 @@ -# Simple brewing - -- type: reaction - id: CP14AirLilyBrewing - minTemp: 530 - priority: 2 - reactants: - CP14AirLily: - amount: 1 - CP14BasicEffectSimpleBase: - amount: 1 - products: - CP14BasicEffectEmpty: 1 - CP14BasicEffectHealAirloss: 0.5 - CP14BasicEffectSatiateThirst: 0.25 - cp14RandomProducts: - - CP14BasicEffectSpeedDown: 0.25 - - CP14BasicEffectDamagePoison: 0.25 - - CP14BasicEffectHealPoison: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - -# Splitting - -- type: reaction - id: CP14AirLilySplitting - minTemp: 450 - priority: 3 - reactants: - CP14BasicEffectEmoteCough: - amount: 0.5 - CP14AirLily: - amount: 0.5 - products: - CP14BasicEffectHealAirloss: 0.5 - CP14BasicEffectSpeedDown: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml deleted file mode 100644 index ad8f254754..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/bloodflower.yml +++ /dev/null @@ -1,117 +0,0 @@ -# Idea: -# BloodFlower is a special reagent that can react with essence to create simple solutions - -# Splitting - -- type: reaction - id: CP14BloodFlowerSplitting - minTemp: 450 - priority: 3 - reactants: - CP14BasicEffectDamagePoison: - amount: 0.5 - CP14BloodFlowerSap: - amount: 0.5 - products: - CP14BasicEffectDamageBrute: 0.5 - cp14RandomProducts: - - CP14BasicEffectBloodRestore: 0.5 - - CP14BasicEffectRainbow: 0.5 - - CP14BasicEffectDamageCold: 0.5 - - CP14BasicEffectDrunk: 0.5 - -# Flower brewing - -- type: reaction - id: CP14BloodFlowerBrewingRestoration - minTemp: 474 - priority: 2 - reactants: - CP14SaltedWater: - amount: 0.5 - CP14BloodFlowerSap: - amount: 0.5 - products: - CP14BasicEffectImpurity: 0.75 - CP14BasicEffectBloodRestore: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -119 - -# Essence brewing - -- type: reaction - id: CP14BloodFlowerBrewingEssenceHuman - minTemp: 560 - priority: 2 - reactants: - CP14Essence: - amount: 0.5 - CP14BloodFlowerSap: - amount: 0.5 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14BasicEffectHealBrute: 0.50 - CP14BasicEffectImpurity: 0.5 - CP14BasicEffectBloodRestore: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -200 - -- type: reaction - id: CP14BloodFlowerBrewingEssenceTiefling - minTemp: 620 - priority: 2 - reactants: - CP14EssenceTiefling: - amount: 0.5 - CP14BloodFlowerSap: - amount: 0.5 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14BasicEffectImpurity: 0.75 - CP14BasicEffectHealCold: 0.5 - CP14BasicEffectDamageHeat: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -270 - -- type: reaction - id: CP14BloodFlowerBrewingEssenceElf - minTemp: 560 - priority: 2 - reactants: - CP14EssenceElf: - amount: 0.5 - CP14BloodFlowerSap: - amount: 0.5 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14BasicEffectImpurity: 0.75 - CP14BasicEffectHealPoison: 0.5 - CP14BasicEffectHealMana: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -200 - -- type: reaction - id: CP14BloodFlowerBrewingEssenceGoblin - minTemp: 520 - priority: 2 - reactants: - CP14EssenceGoblin: - amount: 0.5 - CP14BloodFlowerSap: - amount: 0.5 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14BasicEffectDamagePoison: 0.75 - CP14BasicEffectImpurity: 0.5 - CP14BasicEffectSpeedUp: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -160 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/blue_amanita.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/blue_amanita.yml deleted file mode 100644 index f7f720d7e4..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/blue_amanita.yml +++ /dev/null @@ -1,37 +0,0 @@ -# Simple brewing - -- type: reaction - id: CP14BlueAmanitaBrewing - minTemp: 530 - priority: 2 - reactants: - CP14BlueAmanita: - amount: 1 - CP14BasicEffectSimpleBase: - amount: 1 - products: - CP14BasicEffectEmpty: 1 - CP14BasicEffectHealMana: 0.5 - CP14BasicEffectJitter: 0.25 - cp14RandomProducts: - - CP14BasicEffectHealPoison: 0.25 - - CP14BasicEffectHealCold: 0.25 - - CP14BasicEffectHealBrute: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - -# Splitting - -- type: reaction - id: CP14BlueAmanitaSplitting - minTemp: 450 - priority: 3 - reactants: - CP14BasicEffectSatiateHunger: - amount: 0.5 - CP14BlueAmanita: - amount: 0.5 - products: - CP14BasicEffectHealMana: 0.5 - CP14BasicEffectHealBrute: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml deleted file mode 100644 index 6115a8e3ed..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/dayflin.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Simple brewing - -- type: reaction - id: CP14DayflinBrewing - impact: Low - minTemp: 530 - priority: 2 - reactants: - CP14YellowDayflinPulp: - amount: 1 - CP14BasicEffectSimpleBase: - amount: 1 - products: - CP14BasicEffectEmpty: 0.75 - CP14BasicEffectSpeedUp: 0.5 - CP14BasicEffectSatiateThirst: 0.5 - CP14BasicEffectEmoteCough: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - -# Splitting - -- type: reaction - id: CP14DayflinSplitting - minTemp: 450 - priority: 3 - reactants: - CP14BasicEffectJitter: - amount: 0.5 - CP14YellowDayflinPulp: - amount: 0.5 - products: - CP14BasicEffectSpeedDown: 0.5 - cp14RandomProducts: - - CP14BasicEffectUnstable: 0.5 - - CP14BasicEffectDamageMana: 0.5 - - CP14BasicEffectHealCold: 0.5 - - CP14BasicEffectSatiateThirst: 0.5 - - CP14BasicEffectDamageHeat: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/essense.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/essense.yml deleted file mode 100644 index 067d9b2b89..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/essense.yml +++ /dev/null @@ -1,142 +0,0 @@ -# Idea: -# Alchemized Blood, and Essence, are states of blood processed for use in alchemical reactions. - -# Blood Alchemization - -- type: reaction - id: CP14HumanBloodAlchemization - minTemp: 424 - priority: 2 - reactants: - CP14Blood: - amount: 0.75 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14AlchemizedBlood: 0.75 - CP14BasicEffectImpurity: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -116 - -- type: reaction - id: CP14TieflingBloodAlchemization - minTemp: 464 - priority: 2 - reactants: - CP14BloodTiefling: - amount: 0.75 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14AlchemizedBloodTiefling: 0.75 - CP14BasicEffectImpurity: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -156 - -- type: reaction - id: CP14ElfBloodAlchemization - minTemp: 424 - priority: 2 - reactants: - CP14BloodElf: - amount: 0.75 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14AlchemizedBloodElf: 0.75 - CP14BasicEffectImpurity: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -116 - -- type: reaction - id: CP14GoblinBloodAlchemization - minTemp: 414 - priority: 2 - reactants: - CP14BloodGoblin: - amount: 0.75 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14AlchemizedBloodGoblin: 0.75 - CP14BasicEffectImpurity: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -106 - -# Essence Refining - -- type: reaction - id: CP14HumanEssenceRefinement - minTemp: 510 - priority: 2 - reactants: - CP14AlchemizedBlood: - amount: 0.75 - CP14BloodFlowerSap: - amount: 0.25 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14Essence: 1 - CP14BasicEffectEmpty: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14TieflingEssenceRefinement - minTemp: 550 - priority: 2 - reactants: - CP14AlchemizedBloodTiefling: - amount: 0.75 - CP14BloodFlowerSap: - amount: 0.25 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14EssenceTiefling: 1 - CP14BasicEffectEmpty: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -190 - -- type: reaction - id: CP14ElfEssenceRefinement - minTemp: 510 - priority: 2 - reactants: - CP14AlchemizedBloodElf: - amount: 0.75 - CP14BloodFlowerSap: - amount: 0.25 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14EssenceElf: 1 - CP14BasicEffectEmpty: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -150 - -- type: reaction - id: CP14GoblinEssenceRefinement - minTemp: 500 - priority: 2 - reactants: - CP14AlchemizedBloodGoblin: - amount: 0.75 - CP14BloodFlowerSap: - amount: 0.25 - CP14AlchemistSalt: - amount: 0.25 - products: - CP14EssenceGoblin: 1 - CP14BasicEffectEmpty: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -140 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/general.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/general.yml deleted file mode 100644 index 21c7dc10db..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/general.yml +++ /dev/null @@ -1,87 +0,0 @@ -- type: reaction - id: CP14OverbrewingFail - minTemp: 780 - reactants: - CP14BasicEffectEmpty: - amount: 1 - effects: - - !type:AreaReactionEffect - duration: 20 - prototypeId: CP14Mist - sound: - path: /Audio/Effects/smoke.ogg - -- type: reaction - id: CP14UnstableCooling - maxTemp: 300 - reactants: - CP14BasicEffectUnstable: - amount: 1 - effects: - - !type:AreaReactionEffect - duration: 20 - prototypeId: CP14Mist - sound: - path: /Audio/Effects/smoke.ogg - -- type: reaction - id: CP14SaltProcessing - minTemp: 600 - reactants: - Water: - amount: 0.5 - CP14GroundQuartz: - amount: 0.5 - products: - CP14AlchemistSalt: 0.75 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -300 - -- type: reaction - id: CP14SaltDehydrating - minTemp: 620 - reactants: - CP14SaltedWater: - amount: 0.5 - products: - CP14AlchemistSalt: 0.5 - -- type: reaction - id: CP14SaltDisolving - minTemp: 350 - reactants: - Water: - amount: 0.5 - CP14AlchemistSalt: - amount: 0.5 - products: - CP14SaltedWater: 0.5 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -350 - -- type: reaction - id: CP14SimpleSolvent - minTemp: 420 - reactants: - CP14SaltedWater: - amount: 0.5 - CP14GroundQuartz: - amount: 0.5 - products: - CP14BasicEffectSimpleBase: 1 - -- type: reaction - id: CP14PurifyingSaltAntidote - minTemp: 580 - reactants: - CP14BasicEffectHealPoison: - amount: 0.25 - CP14AlchemistSalt: - amount: 1 - products: - CP14BasicEffectPurification: 1 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -220 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/lumishroom.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/lumishroom.yml deleted file mode 100644 index 263b758ae1..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/lumishroom.yml +++ /dev/null @@ -1,47 +0,0 @@ - -# Simple brewing - -- type: reaction - id: CP14LumiMushroomBrewing - minTemp: 530 - priority: 2 - reactants: - CP14LumiMushroom: - amount: 1 - CP14BasicEffectSimpleBase: - amount: 1 - products: - CP14BasicEffectEmpty: 0.75 - CP14BasicEffectVomit: 0.5 - CP14BasicEffectRainbow: 0.5 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - -- type: reaction - id: CP14PurifyingSaltLumi - minTemp: 600 - reactants: - CP14LumiMushroom: - amount: 1 - CP14AlchemistSalt: - amount: 0.5 - products: - CP14BasicEffectPurification: 1 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -300 - -# Splitting - -- type: reaction - id: CP14EmptySplitting - priority: 3 - reactants: - CP14BasicEffectEmpty: - amount: 0.5 - CP14LumiMushroom: - amount: 0.5 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/purification.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/purification.yml deleted file mode 100644 index 8b909d205d..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/purification.yml +++ /dev/null @@ -1,45 +0,0 @@ -# T0 - T1 - -# Cleansing salt needs to have 1-1 water to work, can't disolve right otherwise - -- type: reaction - id: CP14CleansingImpurity - priority: 3 - reactants: - Water: - amount: 0.25 - CP14BasicEffectPurification: - amount: 0.25 - CP14BasicEffectImpurity: - amount: 1 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -200 - -- type: reaction - id: CP14CleansingPoison - priority: 3 - reactants: - Water: - amount: 0.5 - CP14BasicEffectPurification: - amount: 0.5 - CP14BasicEffectDamagePoison: - amount: 1 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -230 - -- type: reaction - id: CP14CleansingVomit - priority: 3 - reactants: - Water: - amount: 0.25 - CP14BasicEffectPurification: - amount: 0.25 - CP14BasicEffectVomit: - amount: 1 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -200 diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/whistler_poison.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/whistler_poison.yml deleted file mode 100644 index ee1387930a..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/whistler_poison.yml +++ /dev/null @@ -1,34 +0,0 @@ -# Simple brewing - -- type: reaction - id: CP14WhistlerPoisonBrewing - minTemp: 530 - priority: 2 - reactants: - CP14WhistlerPoison: - amount: 1 - CP14BasicEffectSimpleBase: - amount: 1 - products: - CP14BasicEffectEmpty: 1 - CP14BasicEffectSleep: 0.5 - CP14BasicEffectSpeedDown: 0.25 - cp14RandomProducts: - - CP14BasicEffectSpeedDown: 0.25 - - CP14BasicEffectDrunk: 0.25 - - CP14BasicEffectUnstable: 0.25 - -# Splitting - -- type: reaction - id: CP14WhistlerPoisonSplitting - minTemp: 450 - priority: 3 - reactants: - CP14BasicEffectDamageHeat: - amount: 0.5 - CP14WhistlerPoison: - amount: 0.5 - products: - CP14BasicEffectRainbow: 0.5 - CP14BasicEffectSpeedUp: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml deleted file mode 100644 index dae138fdfe..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/wild_sage.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Simple brewing - -- type: reaction - id: CP14WildSageSapBrewing - minTemp: 530 - priority: 2 - reactants: - CP14WildSageSap: - amount: 1 - CP14BasicEffectSimpleBase: - amount: 1 - products: - CP14BasicEffectEmpty: 0.75 - CP14BasicEffectHealBrute: 0.25 - CP14BasicEffectEmoteCough: 0.25 - cp14RandomProducts: - - CP14BasicEffectRainbow: 0.25 - CP14BasicEffectHealCold: 0.25 - - CP14BasicEffectEmoteCough: 0.25 - CP14BasicEffectHealPoison: 0.25 - - CP14BasicEffectEmoteCough: 0.25 - CP14BasicEffectHealPoison: 0.25 - - CP14BasicEffectImpurity: 0.25 - CP14BasicEffectEmpty: 0.25 - - CP14BasicEffectImpurity: 0.25 - CP14BasicEffectDamageHeat: 0.25 - effects: - - !type:CP14AffectSolutionTemperature - addTemperature: -250 - -# Splitting - -- type: reaction - id: CP14WildSageSapSplitting - minTemp: 450 - priority: 3 - reactants: - CP14BasicEffectSatiateHunger: - amount: 0.5 - CP14WildSageSap: - amount: 0.5 - products: - CP14BasicEffectHealBrute: 0.5 - cp14RandomProducts: - - CP14BasicEffectEmoteCough: 0.5 - - CP14BasicEffectDrunk: 0.5 - - CP14BasicEffectJitter: 0.5 - -- type: reaction - id: CP14SatiateThirstSplitting - minTemp: 450 - priority: 3 - reactants: - CP14BasicEffectSatiateThirst: - amount: 0.5 - CP14WildSageSap: - amount: 0.5 - products: - CP14BasicEffectHealBrute: 0.25 - CP14BasicEffectEmoteCough: 0.25 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml new file mode 100644 index 0000000000..1b8baae732 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml @@ -0,0 +1,47 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14AgaricShroomSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14AgaricMushroom: + amount: 1 + products: + CP14EssencePoison: 0.5 + cp14RandomProducts: + - CP14EssenceWater: 0.5 + - CP14EssenceEarth: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +# invert Brute treatment into poison and back + +- type: reaction + id: CP14AgaricShroomAdmixture1 + minTemp: 500 + reactants: + CP14AgaricMushroom: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectHealBrute: + amount: 1 + products: + CP14BasicEffectDamageBrute: 2 + CP14BasicEffectRainbow: 1 + +- type: reaction + id: CP14AgaricShroomAdmixture2 + minTemp: 500 + reactants: + CP14AgaricMushroom: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectDamageBrute: + amount: 1 + products: + CP14BasicEffectHealBrute: 2 + CP14BasicEffectRainbow: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml new file mode 100644 index 0000000000..38ef054ab0 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml @@ -0,0 +1,33 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14AirLilySplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14AirLily: + amount: 1 + products: + CP14EssenceAir: 0.5 + cp14RandomProducts: + - CP14EssenceWater: 0.5 + - CP14EssenceLife: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +# Emote cough -> Heal airloss + +- type: reaction + id: CP14AirLilyAdmixture + minTemp: 500 + reactants: + CP14AirLily: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectEmoteCough: + amount: 1 + products: + CP14BasicEffectHealAirloss: 2 + CP14BasicEffectDrunk: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blood_flower.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blood_flower.yml new file mode 100644 index 0000000000..c464c47b42 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blood_flower.yml @@ -0,0 +1,64 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14BloodFlowerSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + products: + CP14EssenceLife: 0.5 + CP14EssenceWater: 0.5 + +- type: reaction + id: CP14BloodFlowerBloodSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + CP14BloodTiefling: + amount: 1 + products: + CP14EssenceFire: 1 + CP14EssenceLife: 1 + +- type: reaction + id: CP14BloodFlowerTieflingSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + CP14Blood: + amount: 1 + products: + CP14EssenceLife: 2 + +- type: reaction + id: CP14BloodFlowerElfSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + CP14BloodElf: + amount: 1 + products: + CP14EssenceOrder: 1 + CP14EssenceLife: 1 + +- type: reaction + id: CP14BloodFlowerGoblinSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BloodFlowerSap: + amount: 1 + CP14BloodGoblin: + amount: 1 + products: + CP14EssenceChaos: 1 + CP14EssenceLife: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml new file mode 100644 index 0000000000..81ac81f7ac --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml @@ -0,0 +1,31 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14BlueAmanitaSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14BlueAmanita: + amount: 1 + products: + CP14EssenceMagic: 0.5 + cp14RandomProducts: + - CP14EssenceWater: 0.5 + - CP14EssenceLife: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +- type: reaction + id: CP14BlueAmanitaAdmixture + minTemp: 500 + reactants: + CP14BlueAmanita: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectRainbow: + amount: 1 + products: + CP14BasicEffectHealMana: 2 + CP14BasicEffectDrunk: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml similarity index 86% rename from Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml rename to Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml index 537b5eabe8..77b54734e5 100644 --- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_slime.yml +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/chromium_slime.yml @@ -1,8 +1,18 @@ -# Idea: -# Chromium slime is a special reagent that inverts solution properties. -# Rules: -# 1) all values must be multiples of 0.25 +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14ChromiumSlimeSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14ChromiumSlime: + amount: 1 + products: + CP14EssenceCycle: 1 + + +# Chromium slime is a special reagent that inverts solution properties. - type: reaction id: CP14ChromiumInverseEffect @@ -13,7 +23,7 @@ CP14ChromiumSlime: amount: 1 products: - CP14BasicEffectSimpleBase: 1 + CP14BasicEffectEmpty: 1 effects: - !type:CP14InverseEffect inversion: @@ -49,16 +59,4 @@ CP14BasicEffectSleep: CP14BasicEffectUnsleep # CP14BasicEffectRainbow: CP14BasicEffectEmoteCough - CP14BasicEffectEmoteCough: CP14BasicEffectRainbow - -# Simple brewing - -- type: reaction - id: CP14ChromiumBrewing - minTemp: 500 - priority: 2 - reactants: - CP14ChromiumSlime: - amount: 1 - products: - CP14BasicEffectUnstable: 1 \ No newline at end of file + CP14BasicEffectEmoteCough: CP14BasicEffectRainbow \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml new file mode 100644 index 0000000000..58039336e2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml @@ -0,0 +1,45 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14DayflinSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14YellowDayflinPulp: + amount: 1 + products: + CP14EssenceFire: 0.5 + cp14RandomProducts: + - CP14EssenceLife: 0.5 + - CP14EssenceMotion: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +- type: reaction + id: CP14DayflinAdmixture1 + minTemp: 500 + reactants: + CP14YellowDayflinPulp: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectSatiateThirst: + amount: 1 + products: + CP14BasicEffectSpeedUp: 2 + CP14BasicEffectJitter: 1 + +- type: reaction + id: CP14DayflinAdmixture2 + minTemp: 500 + reactants: + CP14YellowDayflinPulp: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectSatiateHunger: + amount: 1 + products: + CP14BasicEffectSpeedUp: 2 + CP14BasicEffectJitter: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml new file mode 100644 index 0000000000..7c27980f2d --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml @@ -0,0 +1,71 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14GroundQuartzSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14GroundQuartz: + amount: 1 + products: + CP14EssenceCrystal: 0.5 + cp14RandomProducts: + - CP14EssenceOrder: 0.5 + - CP14EssenceChaos: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +# Idea: Clear all gimmick useless solutions + +- type: reaction + id: CP14GroundQuartzAdmixture1 + minTemp: 500 + reactants: + CP14GroundQuartz: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectJitter: + amount: 1 + products: + CP14BasicEffectEmpty: 3 + +- type: reaction + id: CP14GroundQuartzAdmixture2 + minTemp: 500 + reactants: + CP14GroundQuartz: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectDrunk: + amount: 1 + products: + CP14BasicEffectEmpty: 3 + +- type: reaction + id: CP14GroundQuartzAdmixture3 + minTemp: 500 + reactants: + CP14GroundQuartz: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectEmoteCough: + amount: 1 + products: + CP14BasicEffectEmpty: 3 + +- type: reaction + id: CP14GroundQuartzAdmixture4 + minTemp: 500 + reactants: + CP14GroundQuartz: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectRainbow: + amount: 1 + products: + CP14BasicEffectEmpty: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml new file mode 100644 index 0000000000..d25e86487f --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml @@ -0,0 +1,49 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14LumiMushroomSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14LumiMushroom: + amount: 1 + products: + CP14EssenceLight: 0.5 + cp14RandomProducts: + - CP14EssenceWater: 0.5 + - CP14EssenceEarth: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +# Idea: Full randomness + +- type: reaction + id: CP14LumiMushroomAdmixture + minTemp: 500 + reactants: + CP14LumiMushroom: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + cp14RandomProducts: + - CP14BasicEffectHealBrute: 2 + - CP14BasicEffectDamageBrute: 2 + - CP14BasicEffectHealHeat: 2 + - CP14BasicEffectDamageHeat: 2 + - CP14BasicEffectHealCold: 2 + - CP14BasicEffectDamageCold: 2 + - CP14BasicEffectHealPoison: 2 + - CP14BasicEffectDamagePoison: 2 + - CP14BasicEffectHealAirloss: 2 + - CP14BasicEffectDamageAirloss: 2 + - CP14BasicEffectBloodRestore: 2 + - CP14BasicEffectBloodAbsorption: 2 + - CP14BasicEffectSatiateHunger: 2 + - CP14BasicEffectSatiateThirst: 2 + - CP14BasicEffectHealMana: 2 + - CP14BasicEffectDamageMana: 2 + - CP14BasicEffectSpeedUp: 2 + - CP14BasicEffectSpeedDown: 2 + - CP14BasicEffectSleep: 2 + - CP14BasicEffectUnsleep: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/whistler_poison.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/whistler_poison.yml new file mode 100644 index 0000000000..8a07270753 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/whistler_poison.yml @@ -0,0 +1,13 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14WhistlerPoisonSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14WhistlerPoison: + amount: 1 + products: + CP14EssencePoison: 1 + #CP14EssencePoison: 0.5 #TODO Tenebrae diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml new file mode 100644 index 0000000000..03bf3cab22 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml @@ -0,0 +1,17 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14WildSageSplitting + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14WildSageSap: + amount: 1 + products: + CP14EssenceEarth: 0.5 + cp14RandomProducts: + - CP14EssenceOrder: 0.5 + - CP14EssenceChaos: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml new file mode 100644 index 0000000000..ef9f75b1dd --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/essence_combining.yml @@ -0,0 +1,143 @@ +# Combine 1 + +- type: reaction + id: CP14EssenceFrost + minTemp: 500 + reactants: + CP14EssenceFire: + amount: 1 + CP14EssenceChaos: + amount: 1 + products: + CP14EssenceFrost: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceLight + minTemp: 500 + reactants: + CP14EssenceFire: + amount: 1 + CP14EssenceAir: + amount: 1 + products: + CP14EssenceLight: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceMotion + minTemp: 500 + reactants: + CP14EssenceOrder: + amount: 1 + CP14EssenceAir: + amount: 1 + products: + CP14EssenceMotion: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceCycle + minTemp: 500 + reactants: + CP14EssenceOrder: + amount: 1 + CP14EssenceChaos: + amount: 1 + products: + CP14EssenceCycle: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceEnergia + minTemp: 500 + reactants: + CP14EssenceOrder: + amount: 1 + CP14EssenceFire: + amount: 1 + products: + CP14EssenceEnergia: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceVoid + minTemp: 500 + reactants: + CP14EssenceChaos: + amount: 1 + CP14EssenceAir: + amount: 1 + products: + CP14EssenceVoid: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssencePoison + minTemp: 500 + reactants: + CP14EssenceChaos: + amount: 1 + CP14EssenceWater: + amount: 1 + products: + CP14EssencePoison: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceLife + minTemp: 500 + reactants: + CP14EssenceEarth: + amount: 1 + CP14EssenceWater: + amount: 1 + products: + CP14EssenceLife: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14EssenceCrystal + minTemp: 500 + reactants: + CP14EssenceOrder: + amount: 1 + CP14EssenceEarth: + amount: 1 + products: + CP14EssenceCrystal: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +# Complex tier 2 + +- type: reaction + id: CP14EssenceMagic + minTemp: 500 + reactants: + CP14EssenceVoid: + amount: 1 + CP14EssenceEnergia: + amount: 1 + products: + CP14EssenceMagic: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_precurser.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_precurser.yml new file mode 100644 index 0000000000..322d6d190e --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_precurser.yml @@ -0,0 +1,41 @@ +# More complex recipes made from T1-T2 essences and precursors as a base +# T1 +# The result is always 50% empty solution + +- type: reaction + id: CP14PrecurserBrewingHealMana + minTemp: 600 + priority: 1 + reactants: + CP14EssenceMagic: + amount: 2 + CP14EssenceMotion: + amount: 1 + CP14BlueAmanita: + amount: 1 + products: + CP14BasicEffectEmpty: 1 + CP14BasicEffectDrunk: 1 + CP14BasicEffectHealMana: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14PrecurserBrewingDamageMana + minTemp: 600 + priority: 1 + reactants: + CP14EssenceMagic: + amount: 2 + CP14EssenceVoid: + amount: 1 + CP14BlueAmanita: + amount: 1 + products: + CP14BasicEffectEmpty: 1 + CP14BasicEffectDrunk: 1 + CP14BasicEffectDamageMana: 2 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml new file mode 100644 index 0000000000..ed7ba35075 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/target_effect_creation_on_water.yml @@ -0,0 +1,333 @@ +# Simple recipes made from T0 and T1 essences and water +# T1 +# The result is always 75% empty solution + +- type: reaction + id: CP14WaterBrewingHealBrute + minTemp: 600 + priority: 1 + reactants: + CP14EssenceLife: + amount: 2 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealBrute: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageBrute + minTemp: 600 + priority: 1 + reactants: + CP14EssenceLife: + amount: 2 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamageBrute: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingHealHeat + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceFire: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealHeat: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageHeat + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceFire: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamageHeat: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingHealCold + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceFrost: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealCold: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageCold + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceFrost: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamageCold: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingHealPoison + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssencePoison: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealPoison: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamagePoison + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssencePoison: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamagePoison: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingHealAirloss + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceAir: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectHealAirloss: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageAirloss + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceAir: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectEmoteCough: 1 + CP14BasicEffectDamageAirloss: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingBloodRestore + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceWater: + amount: 1 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectRainbow: 1 + CP14BasicEffectBloodRestore: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingBloodAbsorption + minTemp: 600 + priority: 2 + reactants: + CP14EssenceLife: + amount: 1 + CP14EssenceWater: + amount: 1 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectRainbow: 1 + CP14BasicEffectBloodAbsorption: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +# CP14BasicEffectSatiateHunger +# CP14BasicEffectSatiateThirst + +- type: reaction + id: CP14WaterBrewingHealMana + minTemp: 600 + priority: 1 + reactants: + CP14EssenceEnergia: + amount: 2 + CP14EssenceMotion: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectDrunk: 1 + CP14BasicEffectHealMana: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingDamageMana + minTemp: 600 + priority: 1 + reactants: + CP14EssenceEnergia: + amount: 2 + CP14EssenceVoid: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectDrunk: 1 + CP14BasicEffectDamageMana: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingSpeedUp + minTemp: 600 + priority: 2 + reactants: + CP14EssenceMotion: + amount: 2 + CP14EssenceOrder: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectJitter: 1 + CP14BasicEffectSpeedUp: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +- type: reaction + id: CP14WaterBrewingSpeedDown + minTemp: 600 + priority: 2 + reactants: + CP14EssenceMotion: + amount: 2 + CP14EssenceChaos: + amount: 1 + Water: + amount: 1 + products: + CP14BasicEffectEmpty: 2 + CP14BasicEffectJitter: 1 + CP14BasicEffectSpeedDown: 1 + effects: + - !type:CP14AffectSolutionTemperature + addTemperature: -150 + +# CP14BasicEffectSleep +# CP14BasicEffectUnsleep \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_inlay.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_inlay.yml deleted file mode 100644 index a7ede74b9a..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_inlay.yml +++ /dev/null @@ -1,89 +0,0 @@ -- type: CP14Recipe - id: CP14ModularInlayQuartzWater - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - - !type:ProtoIdResource - protoId: CP14CrystalShardWater - count: 4 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ModularInlayQuartzWater - -- type: CP14Recipe - id: CP14ModularInlayQuartzHealing - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - - !type:ProtoIdResource - protoId: CP14CrystalShardHealing - count: 4 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ModularInlayQuartzHealing - -- type: CP14Recipe - id: CP14ModularInlayQuartzFire - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - - !type:ProtoIdResource - protoId: CP14CrystalShardFire - count: 4 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ModularInlayQuartzFire - -- type: CP14Recipe - id: CP14ModularInlayQuartzLight - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - - !type:ProtoIdResource - protoId: CP14CrystalShardLight - count: 4 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ModularInlayQuartzLight - -- type: CP14Recipe - id: CP14ModularInlayQuartzElectric - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - - !type:ProtoIdResource - protoId: CP14CrystalShardElectric - count: 4 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ModularInlayQuartzElectric - -- type: CP14Recipe - id: CP14ModularInlayQuartzDarkness - tag: CP14RecipeAnvil - craftTime: 4 - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - - !type:ProtoIdResource - protoId: CP14CrystalShardDarkness - count: 4 - - !type:KnowledgeRequired - knowledge: MetallForging - result: CP14ModularInlayQuartzDarkness \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml index 364d3a7e7e..c15871bcf0 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml @@ -122,4 +122,31 @@ - !type:KnowledgeRequired knowledge: Glasswork result: CP14VialSmallReinforced + +- type: CP14Recipe + id: CP14VialMedium + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14GlassSheet + count: 6 + - !type:KnowledgeRequired + knowledge: Glasswork + result: CP14VialMedium + +- type: CP14Recipe + id: CP14VialMediumReinforced + tag: CP14RecipeMeltingFurnace + craftTime: 3 + requirements: + - !type:StackResource + stack: CP14CopperBar + count: 1 + - !type:StackResource + stack: CP14GlassSheet + count: 6 + - !type:KnowledgeRequired + knowledge: Glasswork + result: CP14VialMediumReinforced \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml index fe1226e0bc..f782f99c2b 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml @@ -14,6 +14,10 @@ - !type:RoleTimeRequirement role: CP14JobApprentice time: 3600 # 1 hours + - !type:TraitsRequirement + inverted: true + traits: + - CP14ManaWasting - type: startingGear id: CP14AlchemistGear diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml index 77cfcb1a3d..db80d2345c 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml @@ -1,86 +1,8 @@  # Alchemy -Alchemy is one of the activities that can be practiced during the expedition. - -The main task of alchemy is to produce various substances, from medicines to poisons, by processing, mixing and transforming reagents. - -The produced substances, your character as a mercenary, can use for anything. Selling healing potions, smearing weapons with poison, or poisoning your target as an antagonist. - -## What you have to work with - -A large number of “raw” substances can be found in the world. The juices of plants, the blood of living creatures, or even crushed crystals. A skilled alchemist can transform these, to most people, useless items into something valuable. - - - - - - - - - - - - - -Most of these “raw” ingredients can first be pulverized using a pestle and mortar: - - - - - - - -After putting the raw substances inside the mortar, you need to grind them thoroughly, clicking them frequently with the pestle. Gradually, all the objects will disappear and there will be a liquid left in the mortar, which you can pour wherever you want. - -To learn what kind of liquids are in the vessels, you can use special alchemical glasses, available only for the “Alchemist” role. - - - - - - -Also, the following tools can help you in your science: -- Dropper. Allows you to transfer small doses of liquids, from 0.25u to 1u -- Vials of various sizes and strength. -- Small cauldron. Not a bad vessel to heat on an alchemical stove. -- Large Vat. A huge container that can be heated on a campfire. Will help to produce substances on an industrial scale. -- Alchemical furnace. A wood-fueled stove that allows you to heat your solutions. -- Solution Normalizer. A technological device capable of rounding down to the nearest multiple of 0.25u all the reagents poured into it. Helps get rid of tiny interfering residues if something went wrong. Requires an energy crystal to work. - - - - - - - - - - - - - -## Basic Reagent System - -All alchemy is based on the idea of [textlink="Basic Reagents" link="CP14_EN_BasicAlchemy"]. Each basic reagent is a liquid with one strong effect. - -There is also an “Empty Solution”. This is a special basic reagent that has no effects. - -Chances are 50% or more of your potions will be filled with Empty Solution, and that's okay: The balance is built so that even highly diluted base reagents are quite effective. - -Given that you [color=red]do not have the ability to separate mixed substances[/color], your job as an alchemist is to find methods of brewing pure potions without impurities, or brewing effective combinations of effects in a single potion. - -## Random Reagent Generation - -As you study recipes for brewing basic reagents, you may notice a “Random Reagents” box. Each game round, most recipes have unknown additional reagents. In one round, the fly reagents may yield only poison, while in another round they may additionally yield a hallucinogen, or vomit solution. - -These additional reagents are stable throughout the round, but it still means you have to find your way to pure solutions each time anew. - -## Impurities - -Most raw reagents can be boiled down to produce a set of base reagents. -But also, most raw reagents have a second use: impurities. - -By interfering a raw, uncooked reagent into a potion of base reagents, you can edit it. For example, by adding chromium slime to a potion, you can invert all of its effects - turning poison into medicine. +. +. +. diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Arcane.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Arcane.xml deleted file mode 100644 index 7b217e10d0..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Arcane.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -# Arcane - -There is a number of arcane substances from before our time. Knowledge of their characteristics can make the difference between an apprentice and a master alchemist. - - - - diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/BasicAlchemy.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/BasicAlchemy.xml deleted file mode 100644 index 931c6f4df7..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/BasicAlchemy.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -# Basic alchemical reagents - -Many potions consist of the individual basic reagent effects described below: - - - - diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Essence.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Essence.xml new file mode 100644 index 0000000000..8acf6b2b78 --- /dev/null +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Essence.xml @@ -0,0 +1,19 @@ + + +# Thaumaturgical essences + +Minimal units of being. By obtaining them from splitting items and precursers, and folding them into more complex variants, you can use them to create the alchemical potions you require. + +## Basic 6 essences: + + + +## First Compound Essences: + + + +## Second Compound Essences: + + + + \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Inorganic.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Inorganic.xml deleted file mode 100644 index 03b83af4fc..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Inorganic.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -# Inorganic - -There are a large number of inorganic substances - collected from the land and sea. Knowledge of their characteristics may be useful to you many times. - - - - diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Organic.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Organic.xml deleted file mode 100644 index ba173eaf18..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Organic.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -# Organic - -There are a large number of organic substances - extracted from plants or living things. Knowledge of their characteristics may be useful to you many times. - - - - diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Precurser.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Precurser.xml new file mode 100644 index 0000000000..e2cfb6526d --- /dev/null +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/Precurser.xml @@ -0,0 +1,9 @@ + + +# Natural precursers + +There are a large number of source substances in the world that can be split into thaumaturgical essences, for later recombination into target potion effects. + + + + \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/TargetEffects.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/TargetEffects.xml new file mode 100644 index 0000000000..a7585882e8 --- /dev/null +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/AlchemyTabs/TargetEffects.xml @@ -0,0 +1,9 @@ + + +# Target alchemical solutions + +Using combinations of thaumaturgical essences in the right proportions, you can create a variety of alchemical substances, from powerful medicines to deadly poisons: + + + + diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml index 133c3e5dd2..2b41be6e76 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml @@ -1,11 +1,7 @@  # Алхимия -Алхимия - одна из активностей, которой можно заниматься в течении экспедиции. - -Основная задача алхимии - производство различных веществ, от лекарств до ядов, при помощи обработки, смешивания и трансформации подручных реагентов. - -Произведенные вещества, ваш персонаж как наемник, может использовать для чего угодно. Продажа зелий лечения, смазывание оружия ядом, или отравление вашей цели, как антагониста. +. ## С чем вам придется работать @@ -46,12 +42,12 @@ - Небольшой котел. Неплохая емкость, которую можно греть на алхимической плите. - Большой чан. Огромная емкость, которую можно разогревать на костре. Поможет для производства веществ в промышленных масштабах. - Алхимическая печь. Печь, работающая на древесном топливе, позволяющая нагревать ваши растворы. -- Нормализатор растворов. Технологичное устройство, способное округлять вниз до ближайшего кратному 0.25u значению все залитые в него реагенты. Поможет избавиться от крохотных мешающих остатков, если что-то пошло не так. Требуется энергокристалл для работы. +- Очиститель растворов. Технологичное устройство, убирающая из раствора реагент, которого в нем меньше всего. Требует энергокрисалла для работы. - + @@ -60,27 +56,12 @@ -## Система базовых реагентов +## Система базовых реагентов -Вся алхимия стоит на идее [textlink="Базовых реагентов" link="CP14_RU_BasicAlchemy"]. Каждый базовый реагент представляет из себя жидкость с одним сильно выраженным эффектом. - -Так же существует "Пустой раствор". Это особенный базовый реагент, не имеющий никаких эффектов. - -Скорее всего 50% и больше ваших зелий будут заполнены пустым раствором, и это нормально: Баланс построен так, что даже сильно разбавленные базовые реагенты достаточно эффективны. - -Учитывая, что у вас [color=red]нет возможности разделять смешанные вещества[/color], ваша задача как алхимика заключается в поиске методов варки чистых зелий без примесей, либо варке эффективных комбинаций эффектов в одном зелье. +. ## Случайная генерация реакций -Изучая рецепты варки базовых реагентов, можно заметить поле "Случайные реагенты". Каждый игровой раунд большинство рецептов имеют неизвестные дополнительные реагенты. В одном раунде мухоморы могут давать только яд, в другом - дополнительно галлюциноген, или рвотный раствор. - -Эти дополнительные реагенты стабильны в течении всего раунда, но тем не менее это означает, что вам придется искать путь к чистым растворам каждый раз по новой. - -## Примеси - -Большинство сырых реагентов можно сварить, чтобы получить набор базовых реагентов. -Но так же, у большинства сырых реагентов есть еще второй способ применения - примеси. - -Вмешивая сырой, не сваренный реагент в зелье из базовых реагентов, можно отредактировать его. Например, вмешав хромиевую слизь в зелье, можно инвертировать все его эффекты - превратив яд в лекарство. +. diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Arcane.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Arcane.xml deleted file mode 100644 index 80cc7cc4c3..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Arcane.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -# Мистический - -Существует ряд мистических веществ, существовавших до нашего времени. Знание их характеристик может стать решающим фактором между учеником и мастером алхимии. - - - - diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/BasicAlchemy.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/BasicAlchemy.xml deleted file mode 100644 index 2f7f5b36ee..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/BasicAlchemy.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -# Основные алхимические реагенты - -Многие зелья состоят из отдельных основных реагентных эффектов, описанных ниже: - - - - diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Essence.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Essence.xml new file mode 100644 index 0000000000..ad16caa1bd --- /dev/null +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Essence.xml @@ -0,0 +1,19 @@ + + +# Тауматургические эссенции + +Минимальные единицы сущего. Получая их из расщепления предметов и веществ, и складывая в более сложные варианты, вы можете использовать их для создания требуемых для вас алхимических зелий. + +## Базовые 6 эссенций: + + + +## Эссенции первого сложения: + + + +## Эссенции второго сложения: + + + + \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Inorganic.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Inorganic.xml deleted file mode 100644 index 77ae924635..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Inorganic.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -# Неорганический - -Существует большое количество неорганических веществ, собранных с суши и моря. Знание их характеристик может быть вам полезно много раз. - - - - diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Organic.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Organic.xml deleted file mode 100644 index 0a573922ad..0000000000 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Organic.xml +++ /dev/null @@ -1,9 +0,0 @@ - - -# Органический вещества - -Существует большое количество Органический веществ - добытых из растений или живых существ. Знание их свойств может не раз пригодиться. - - - - diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Precurser.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Precurser.xml new file mode 100644 index 0000000000..84ecbc7727 --- /dev/null +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/Precurser.xml @@ -0,0 +1,9 @@ + + +# Природные исходники + +В мире есть большое количество исходных веществ, которые могут быть расщеплены в тауматургическую эссенцию, для последующей рекомбинации в целевые эффекты зелий. + + + + \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/TargetEffects.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/TargetEffects.xml new file mode 100644 index 0000000000..5d733ab477 --- /dev/null +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/AlchemyTabs/TargetEffects.xml @@ -0,0 +1,9 @@ + + +# Целевые алхимические растворы + +Используя комбинации тауматургических эссенций в правильных пропорциях, вы можете создавать различные алхимические вещества, от мощных лекарств до смертельных ядов: + + + + diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/label.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/label.png new file mode 100644 index 0000000000..023f5c6b01 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/label.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-1.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-1.png new file mode 100644 index 0000000000..971dd8b3d2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-1.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-2.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-2.png new file mode 100644 index 0000000000..1ef46d8137 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-2.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-3.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-3.png new file mode 100644 index 0000000000..aa4471240f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-3.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-4.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-4.png new file mode 100644 index 0000000000..2ea27dda50 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-4.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-5.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-5.png new file mode 100644 index 0000000000..9b43def8fc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/liq-5.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/meta.json new file mode 100644 index 0000000000..641bba9d6e --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "name": "vial" + }, + { + "name": "label" + }, + { + "name": "liq-1" + }, + { + "name": "liq-2" + }, + { + "name": "liq-3" + }, + { + "name": "liq-4" + }, + { + "name": "liq-5" + }, + { + "name": "reinforcement" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement.png new file mode 100644 index 0000000000..e67b215265 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/reinforcement.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/vial.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/vial.png new file mode 100644 index 0000000000..6054350d84 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_medium.rsi/vial.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/label.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/label.png new file mode 100644 index 0000000000..f50ce0a103 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/label.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json index 6dc4f396d9..974cbd3c0f 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "vial" }, + { + "name": "label" + }, { "name": "liq-1" }, diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/label.png b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/label.png new file mode 100644 index 0000000000..76cedd47e4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/label.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json index 6dc4f396d9..974cbd3c0f 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "vial" }, + { + "name": "label" + }, { "name": "liq-1" }, diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big0.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/big0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big0.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/big0.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big1.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/big1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big1.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/big1.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big2.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/big2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/big2.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/big2.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium0.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium0.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium0.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium1.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium1.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium1.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium2.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium2.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium2.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium3.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium3.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium3.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium4.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/medium4.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/medium4.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/meta.json similarity index 55% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/meta.json index 1c39c69adc..a5db8ac141 100644 --- a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/meta.json +++ b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/meta.json @@ -7,6 +7,30 @@ "y": 32 }, "states": [ + { + "name": "big0" + }, + { + "name": "big1" + }, + { + "name": "big2" + }, + { + "name": "medium0" + }, + { + "name": "medium1" + }, + { + "name": "medium2" + }, + { + "name": "medium3" + }, + { + "name": "medium4" + }, { "name": "small0" }, diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small0.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small0.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small0.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small0.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small1.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small1.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small1.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small2.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small2.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small2.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small3.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small3.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small3.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small4.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small4.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small4.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small5.png b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_small.rsi/small5.png rename to Resources/Textures/_CP14/Structures/Flora/Crystal/crystal.rsi/small5.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/meta.json deleted file mode 100644 index 853152af1e..0000000000 --- a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_big.rsi/meta.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 1, - "license": "All right reserved", - "copyright": "by vladimir.s", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "big0" - }, - { - "name": "big1" - }, - { - "name": "big2" - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/meta.json deleted file mode 100644 index 185872767d..0000000000 --- a/Resources/Textures/_CP14/Structures/Flora/Crystal/crystal_medium.rsi/meta.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "license": "All right reserved", - "copyright": "by vladimir.s", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "medium0" - }, - { - "name": "medium1" - }, - { - "name": "medium2" - }, - { - "name": "medium3" - }, - { - "name": "medium4" - } - ] -} diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/base.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/base.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/base.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/base.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/crystal.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/crystal.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/crystal.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/crystal.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-1.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-1.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-1.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-2.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-2.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-2.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-3.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-3.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-3.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-4.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-4.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-4.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-5.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/liq-5.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/liq-5.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/meta.json b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/rotate_back.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/rotate_back.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/rotate_back.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/rotate_back.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/rotate_back_stop.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/rotate_back_stop.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/rotate_back_stop.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/rotate_back_stop.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/rotate_front.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/rotate_front.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/rotate_front.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/rotate_front.png diff --git a/Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/rotate_front_stop.png b/Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/rotate_front_stop.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Specific/Alchemy/normalizer.rsi/rotate_front_stop.png rename to Resources/Textures/_CP14/Structures/Specific/Alchemy/cleaner.rsi/rotate_front_stop.png diff --git a/Resources/migration.yml b/Resources/migration.yml index dcc3d6e46a..fe7f2b9194 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -67,7 +67,7 @@ CP14BloodGrass: CP14BloodFlower CP14FlowersRed: CP14BloodFlower CP14GatherableBloodgrass: CP14GatherableBloodFlower CP14GatherableFlowersRed: CP14GatherableBloodFlower -CP14VialSmallBloodgrassSap: CP14VialSmallBloodFlowerSap +CP14VialSmallBloodgrassSap: null CP14BarrelBloodGrassSap: CP14BarrelBloodFlowerSap #2024-10-11 @@ -81,8 +81,8 @@ CP14WallpaperGreen30: CP14WallpaperGreen #2024-10-18 CP14WoodenCupboard: CP14WoodenCloset -CP14VialSmallChromiumSlime: CP14VialTinyChromiumSlime -CP14VialSmallLumiMushroom: CP14VialTinyLumiMushroom +CP14VialSmallChromiumSlime: null +CP14VialSmallLumiMushroom: null #2024-10-20 CP14SpawnPointHouseKeeper: CP14SpawnPointCommandant @@ -211,26 +211,26 @@ CP14BaseLightHammer: CP14ModularIronHammer CP14BaseBattleHammer: CP14ModularIronHammer #2025-28-01 -CP14CrystalRubiesSmall: CP14CrystalElementalFireSmall -CP14CrystalRubiesMedium: CP14CrystalElementalFireMedium -CP14CrystalRubiesBig: CP14CrystalElementalFireBig -CP14CrystalTopazesSmall: CP14CrystalElementalElectricSmall -CP14CrystalTopazesMedium: CP14CrystalElementalElectricMedium -CP14CrystalTopazesBig: CP14CrystalElementalElectricBig -CP14CrystalEmeraldsSmall: CP14CrystalElementalHealingSmall -CP14CrystalEmeraldsMedium: CP14CrystalElementalHealingMedium -CP14CrystalEmeraldsBig: CP14CrystalElementalHealingBig -CP14CrystalSapphiresSmall: CP14CrystalElementalWaterSmall -CP14CrystalSapphiresMedium: CP14CrystalElementalWaterMedium -CP14CrystalSapphiresBig: CP14CrystalElementalWaterBig -CP14CrystalAmethystsSmall: CP14CrystalElementalDarknessSmall -CP14CrystalAmethystsMedium: CP14CrystalElementalDarknessMedium -CP14CrystalAmethystsBig: CP14CrystalElementalDarknessBig -CP14CrystalDiamondsSmall: CP14CrystalElementalLightSmall -CP14CrystalDiamondsMedium: CP14CrystalElementalLightMedium -CP14CrystalDiamondsBig: CP14CrystalElementalLightBig +CP14CrystalRubiesSmall: CP14CrystalFire +CP14CrystalRubiesMedium: CP14CrystalFire +CP14CrystalRubiesBig: CP14CrystalFire +CP14CrystalTopazesSmall: CP14CrystalAir +CP14CrystalTopazesMedium: CP14CrystalAir +CP14CrystalTopazesBig: CP14CrystalAir +CP14CrystalEmeraldsSmall: CP14CrystalOrder +CP14CrystalEmeraldsMedium: CP14CrystalOrder +CP14CrystalEmeraldsBig: CP14CrystalOrder +CP14CrystalSapphiresSmall: CP14CrystalWater +CP14CrystalSapphiresMedium: CP14CrystalWater +CP14CrystalSapphiresBig: CP14CrystalWater +CP14CrystalAmethystsSmall: CP14CrystalChaos +CP14CrystalAmethystsMedium: CP14CrystalChaos +CP14CrystalAmethystsBig: CP14CrystalChaos +CP14CrystalDiamondsSmall: CP14CrystalAir +CP14CrystalDiamondsMedium: CP14CrystalAir +CP14CrystalDiamondsBig: CP14CrystalAir -CP14QuartzCrystal: CP14CrystalMedium +CP14QuartzCrystal: CP14CrystalEmpty CP14QuartzShard: CP14CrystalShardBase #2025-30-01 @@ -263,6 +263,48 @@ CP14Crossbolt: CP14CrossboltIron #2025-26-02 CP14BookImperialLawsHandBook: CP14GuidebookImperialLaws +#2025-28-02 +CP14CrystalSmall: CP14CrystalEmpty +CP14CrystalMedium: CP14CrystalEmpty +CP14CrystalBig: CP14CrystalEmpty +CP14CrystalElementalWaterSmall: CP14CrystalWater +CP14CrystalElementalWaterMedium: CP14CrystalWater +CP14CrystalElementalWaterBig: CP14CrystalWater +CP14CrystalElementalHealingSmall: CP14CrystalOrder +CP14CrystalElementalHealingMedium: CP14CrystalOrder +CP14CrystalElementalHealingBig: CP14CrystalOrder +CP14CrystalElementalFireSmall: CP14CrystalFire +CP14CrystalElementalFireMedium: CP14CrystalFire +CP14CrystalElementalFireBig: CP14CrystalFire +CP14CrystalElementalLightSmall: CP14CrystalAir +CP14CrystalElementalLightMedium: CP14CrystalAir +CP14CrystalElementalLightBig: CP14CrystalAir +CP14CrystalElementalElectricSmall: CP14CrystalAir +CP14CrystalElementalElectricMedium: CP14CrystalAir +CP14CrystalElementalElectricBig: CP14CrystalAir +CP14CrystalElementalDarknessSmall: CP14CrystalChaos +CP14CrystalElementalDarknessMedium: CP14CrystalChaos +CP14CrystalElementalDarknessBig: CP14CrystalChaos + +CP14CrystalShardHealing: CP14CrystalShardOrder +CP14CrystalShardLight: CP14CrystalShardAir +CP14CrystalShardElectric: CP14CrystalShardAir +CP14CrystalShardDarkness: CP14CrystalShardChaos + +CP14AlchemyNormalizer: CP14AlchemySolutionCleaner +CP14VialSmallBloodFlowerSap: CP14VialSmall +CP14VialSmallAgaricMushroom: CP14VialSmall +CP14VialSmallGroundQuartz: CP14VialSmall +CP14VialSmallWildSage: CP14VialSmall +CP14VialSmallBlueAmanita: CP14VialSmall +CP14VialSmallAirLily: CP14VialSmall +CP14VialSmallDayflin: CP14VialSmall +CP14VialTinyChromiumSlime: CP14VialSmall +CP14VialTinyLumiMushroom: CP14VialSmall +CP14VialSmallHealthPotion: CP14VialSmall +CP14VialSmallManaPotion: CP14VialSmall +CP14SpellScrollCounterSpell: CP14ActionSpellMagicSplitting + # <---> CrystallEdge migration zone end