From a68da0eacd4c0d9b50ab0521fe95e830d303d69f Mon Sep 17 00:00:00 2001 From: Red <96445749+TheShuEd@users.noreply.github.com> Date: Sat, 5 Jul 2025 14:54:09 +0300 Subject: [PATCH] Magotech (#1498) * Add brass material, bars Introduces the new brass material, including its prototype, stack, and bar entities, along with associated sprites. Updates English and Russian localization files to include brass and adds a new construction condition for mana power. Also moves glass sheet entities to the correct file. * Add CP14ManaFilled construction condition Introduces a new construction condition that checks if an entity's mana container is fully filled. Includes examination feedback and construction guide entry for user clarity. * electromancy respawn * Update T2.yml * Update meta.json * ffif * Update speed_ballade.yml * Update thaumaturgy.yml * Update undead.yml --- .../Construction/Condition/CP14ManaFilled.cs | 41 ++++++++ .../en-US/_CP14/construction/conditions.ftl | 1 + .../en-US/_CP14/materials/materials.ftl | 1 + .../Locale/en-US/_CP14/stack/materials.ftl | 1 + .../ru-RU/_CP14/construction/conditions.ftl | 1 + .../ru-RU/_CP14/materials/materials.ftl | 1 + .../Locale/ru-RU/_CP14/stack/materials.ftl | 1 + .../Spells/Death/cure_dead_ballade.yml | 93 ------------------ .../Spells/Death/resurrection_dead.yml | 66 ------------- .../{Life => Electric}/resurrection.yml | 30 +++--- .../{Life => Electric}/speed_ballade.yml | 7 +- .../Player/DemiplaneAntag/Skeletons/T2.yml | 7 +- .../Entities/Mobs/Player/TownRaids/undead.yml | 4 - .../_CP14/Entities/Objects/Materials/bars.yml | 93 +++++++++--------- .../_CP14/Entities/Objects/Materials/misc.yml | 44 +++++++++ .../Prototypes/_CP14/Materials/simple.yml | 9 ++ .../_CP14/Skill/Basic/electromancy.yml | 16 ++- .../Prototypes/_CP14/Skill/Basic/healing.yml | 35 +------ .../Prototypes/_CP14/Stacks/materials.yml | 7 ++ .../Trading/BuyPositions/thaumaturgy.yml | 14 ++- .../Actions/Spells/electromancy.rsi/defib.png | Bin 0 -> 375 bytes .../Actions/Spells/electromancy.rsi/meta.json | 6 ++ .../Spells/electromancy.rsi/speed_music.png | Bin 0 -> 324 bytes .../Actions/Spells/healing.rsi/meta.json | 3 - .../Spells/healing.rsi/speed_music.png | Bin 329 -> 0 bytes .../Spells/necromancy.rsi/cure_dead.png | Bin 580 -> 0 bytes .../necromancy.rsi/dead_heal_ballade.png | Bin 515 -> 0 bytes .../Actions/Spells/necromancy.rsi/meta.json | 20 ---- .../Spells/necromancy.rsi/resurrection.png | Bin 407 -> 0 bytes .../Objects/Materials/brass_bar.rsi/bar.png | Bin 0 -> 292 bytes .../Objects/Materials/brass_bar.rsi/bar_2.png | Bin 0 -> 453 bytes .../Objects/Materials/brass_bar.rsi/bar_3.png | Bin 0 -> 518 bytes .../Objects/Materials/brass_bar.rsi/meta.json | 20 ++++ .../Constructs/magiconstruct.rsi/constuct.png | Bin 0 -> 360 bytes .../Constructs/magiconstruct.rsi/meta.json | 14 +++ 35 files changed, 235 insertions(+), 300 deletions(-) create mode 100644 Content.Server/_CP14/Construction/Condition/CP14ManaFilled.cs create mode 100644 Resources/Locale/en-US/_CP14/construction/conditions.ftl create mode 100644 Resources/Locale/ru-RU/_CP14/construction/conditions.ftl delete mode 100644 Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml rename Resources/Prototypes/_CP14/Entities/Actions/Spells/{Life => Electric}/resurrection.yml (78%) rename Resources/Prototypes/_CP14/Entities/Actions/Spells/{Life => Electric}/speed_ballade.yml (91%) create mode 100644 Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/defib.png create mode 100644 Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/speed_music.png delete mode 100644 Resources/Textures/_CP14/Actions/Spells/healing.rsi/speed_music.png delete mode 100644 Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/cure_dead.png delete mode 100644 Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/dead_heal_ballade.png delete mode 100644 Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/resurrection.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/brass_bar.rsi/bar.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/brass_bar.rsi/bar_2.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/brass_bar.rsi/bar_3.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/brass_bar.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Constructs/magiconstruct.rsi/constuct.png create mode 100644 Resources/Textures/_CP14/Structures/Constructs/magiconstruct.rsi/meta.json diff --git a/Content.Server/_CP14/Construction/Condition/CP14ManaFilled.cs b/Content.Server/_CP14/Construction/Condition/CP14ManaFilled.cs new file mode 100644 index 0000000000..22690787ff --- /dev/null +++ b/Content.Server/_CP14/Construction/Condition/CP14ManaFilled.cs @@ -0,0 +1,41 @@ +using Content.Shared._CP14.MagicEnergy.Components; +using Content.Shared.Construction; +using Content.Shared.Examine; +using JetBrains.Annotations; +using Robust.Shared.Utility; + +namespace Content.Server._CP14.Construction.Condition; + +/// +/// Makes the condition fail if any entities on a tile have (or not) a component. +/// +[UsedImplicitly] +[DataDefinition] +public sealed partial class CP14ManaFilled : IGraphCondition +{ + public bool Condition(EntityUid uid, IEntityManager entityManager) + { + if (!entityManager.TryGetComponent(uid, out CP14MagicEnergyContainerComponent? container)) + return true; + + return container.Energy >= container.MaxEnergy; + } + + public bool DoExamine(ExaminedEvent args) + { + if (Condition(args.Examined, IoCManager.Resolve())) + return false; + + args.PushMarkup(Loc.GetString("cp14-construction-condition-mana-filled")); + return true; + } + + public IEnumerable GenerateGuideEntry() + { + yield return new ConstructionGuideEntry() + { + Localization = "cp14-construction-condition-mana-filled", + Icon = new SpriteSpecifier.Rsi(new ResPath("/Textures/_CP14/Actions/Spells/meta.rsi"), "mana"), + }; + } +} diff --git a/Resources/Locale/en-US/_CP14/construction/conditions.ftl b/Resources/Locale/en-US/_CP14/construction/conditions.ftl new file mode 100644 index 0000000000..3bdcd94451 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/construction/conditions.ftl @@ -0,0 +1 @@ +cp14-construction-condition-mana-filled = The structure must be fully powered by mana. \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index 195e227c13..93678d4941 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -6,6 +6,7 @@ cp14-material-stone-block = stone cp14-material-cloth = cloth cp14-material-copper = copper cp14-material-iron = iron +cp14-material-brass = brass cp14-material-gold = gold cp14-material-mithril = mithril cp14-material-lucens-planks = lucens planks diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index e33412b8f8..317dd61775 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -9,6 +9,7 @@ cp14-stack-compost = compost piles cp14-stack-copper-bars = copper bars cp14-stack-iron-bars = iron bars +cp14-stack-brass-bars = brass bars cp14-stack-gold-bars = gold bars cp14-stack-mithril-bars = mithril bars diff --git a/Resources/Locale/ru-RU/_CP14/construction/conditions.ftl b/Resources/Locale/ru-RU/_CP14/construction/conditions.ftl new file mode 100644 index 0000000000..2952abcf5b --- /dev/null +++ b/Resources/Locale/ru-RU/_CP14/construction/conditions.ftl @@ -0,0 +1 @@ +cp14-construction-condition-mana-filled = Структура должна быть полностью запитана маной. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index d2c4acdccc..d5880829de 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -6,6 +6,7 @@ cp14-material-stone-block = камень cp14-material-cloth = ткань cp14-material-copper = медь cp14-material-iron = железо +cp14-material-brass = латунь cp14-material-gold = золото cp14-material-mithril = мифрил cp14-material-lucens-planks = люценсовые доски diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index c5074780fa..021e81565b 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -9,6 +9,7 @@ cp14-stack-compost = кучи компоста cp14-stack-copper-bars = медные слитки cp14-stack-iron-bars = железные слитки +cp14-stack-brass-bars = латунные слитки cp14-stack-gold-bars = золотые слитки cp14-stack-mithril-bars = мифриловые слитки diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml deleted file mode 100644 index 14b85b92d3..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml +++ /dev/null @@ -1,93 +0,0 @@ -- type: entity - id: CP14ActionSpellHealFromDeathBallade - parent: CP14ActionSpellBase - name: Healing from death ballade - description: Your music is filled with healing magic, fast healing all the creatures around you. - components: - - type: Sprite - sprite: _CP14/Actions/Spells/necromancy.rsi - state: dead_heal_ballade - - type: CP14MagicEffectCastSlowdown - speedMultiplier: 1.0 - - type: CP14MagicEffectManaCost - manaCost: 1 - - type: CP14MagicEffect - magicType: Life - effects: - - !type:CP14SpellSpawnEntityOnTarget # TODO заставить работать только на нежить - spawns: - - CP14AreaEntityEffectDeadHealBallade - - type: CP14MagicEffectRequiredMusicTool - - type: CP14MagicEffectCastingVisual - proto: CP14RuneDeadHealBallade - - type: Action - icon: - sprite: _CP14/Actions/Spells/necromancy.rsi - state: dead_heal_ballade - - type: InstantAction - event: !type:CP14ToggleableInstantActionEvent - effectFrequency: 1 - cooldown: 15 - castTime: 120 - hidden: true - -- type: entity - id: CP14AreaEntityEffectDeadHealBallade - categories: [ HideSpawnMenu ] - save: false - components: - - type: TimedDespawn - lifetime: 1.6 - - type: CP14AreaEntityEffect - range: 3 - maxTargets: 4 - whitelist: - components: - - MobState - effects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectDeadHealBallade - - !type:CP14SpellApplyEntityEffect - effects: - - !type:HealthChange - damage: - types: - Slash: -1.0 - Blunt: -1.0 - Piercing: -1.0 - Cold: -0.80 - Heat: -0.80 - Shock: -0.80 - Poison: -1.0 - Bloodloss: -1.5 - Caustic: -0.5 - -- type: entity - id: CP14ImpactEffectDeadHealBallade - parent: CP14BaseMagicImpact - categories: [ HideSpawnMenu ] - save: false - components: - - type: Sprite - sprite: _CP14/Effects/music.rsi - layers: - - state: notes_5 - color: "#36937b" - shader: unshaded - -- type: entity - id: CP14RuneDeadHealBallade - parent: CP14BaseMagicRune - categories: [ HideSpawnMenu ] - save: false - components: - - type: PointLight - color: "#54e194" - - type: Sprite - sprite: _CP14/Effects/music.rsi - layers: - - state: notes_3 - color: "#54e194" - shader: unshaded - diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml deleted file mode 100644 index 84504b92b8..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml +++ /dev/null @@ -1,66 +0,0 @@ -- type: entity - id: CP14ActionSpellResurrectionDead - parent: CP14ActionSpellBase - name: Death resurrection - description: You resurrect the target and cure it from damage. - components: - - type: Sprite - sprite: _CP14/Actions/Spells/necromancy.rsi - state: cure_dead - - type: CP14MagicEffectCastSlowdown - speedMultiplier: 0.9 - - type: CP14MagicEffectManaCost - manaCost: 20 - - type: CP14MagicEffectAliveTargetRequired - inverted: true - - type: CP14MagicEffect - magicType: Life - telegraphyEffects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectResurrection - effects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectResurrection - - !type:CP14SpellResurrectionEffect - - !type:CP14SpellApplyEntityEffect - effects: - - !type:HealthChange - damage: - types: - Asphyxiation: -500 - Bloodloss: -100 - Blunt: -25 - Caustic: -25 - Cold: -25 - Heat: -50 - Piercing: -25 - Poison: -25 - Radiation: -25 - Shock: -25 - Slash: -25 - - !type:Jitter - - type: CP14MagicEffectVerbalAspect - startSpeech: "Surge..." - endSpeech: "Hominem mortuum" - - type: CP14MagicEffectCastingVisual - proto: CP14RuneResurrection - - type: Action - icon: - sprite: _CP14/Actions/Spells/necromancy.rsi - state: cure_dead - - type: TargetAction - range: 10 - interactOnMiss: false - - type: EntityTargetAction - whitelist: - components: - - MobState - canTargetSelf: false - event: !type:CP14DelayedEntityTargetActionEvent - cooldown: 10 - castDelay: 2 - breakOnMove: false - breakOnDamage: false - diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/resurrection.yml similarity index 78% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/resurrection.yml index 6d436fdb80..3ddd2a7e3e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/resurrection.yml @@ -1,20 +1,17 @@ - type: entity id: CP14ActionSpellResurrection parent: CP14ActionSpellBase - name: Resurrection - description: You're trying to put the soul back into the body. + name: Revitalizing discharge + description: You strike the dying target with a safe electric shock, causing its heart to beat again. components: - - type: Sprite - sprite: _CP14/Actions/Spells/necromancy.rsi - state: resurrection - type: CP14MagicEffectCastSlowdown speedMultiplier: 0.2 - type: CP14MagicEffectManaCost - manaCost: 100 + manaCost: 50 - type: CP14MagicEffectAliveTargetRequired inverted: true - type: CP14MagicEffect - magicType: Life + magicType: Energia telegraphyEffects: - !type:CP14SpellSpawnEntityOnTarget spawns: @@ -23,20 +20,15 @@ - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14ImpactEffectResurrection + - CP14ElectrifiedEffect - !type:CP14SpellResurrectionEffect - !type:CP14SpellApplyEntityEffect effects: - - !type:ChemVomit - probability: 0.25 - - !type:Emote - showInChat: false - emote: Cough - probability: 0.3 - !type:HealthChange damage: types: Asphyxiation: -500 - Bloodloss: -10 + Shock: 10 - !type:Jitter - type: CP14MagicEffectVerbalAspect startSpeech: "Redi animam meam..." @@ -45,8 +37,8 @@ proto: CP14RuneResurrection - type: Action icon: - sprite: _CP14/Actions/Spells/necromancy.rsi - state: resurrection + sprite: _CP14/Actions/Spells/electromancy.rsi + state: defib - type: TargetAction range: 7 interactOnMiss: false @@ -56,8 +48,8 @@ components: - MobState event: !type:CP14DelayedEntityTargetActionEvent - cooldown: 300 - castDelay: 10 + cooldown: 150 + castDelay: 5 breakOnMove: true - type: entity @@ -86,7 +78,7 @@ - type: Sprite layers: - state: wave_up - color: "#55877a" + color: "#e8ff4c" shader: unshaded - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml similarity index 91% rename from Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml rename to Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml index ee51b334c1..6b3531950b 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml @@ -4,15 +4,12 @@ name: Speed ballade description: Your music is filled with accelerating magic, speeding up the movement of all creatures nearby components: - - type: Sprite - sprite: _CP14/Actions/Spells/healing.rsi - state: speed_music - type: CP14MagicEffectCastSlowdown speedMultiplier: 1 - type: CP14MagicEffectManaCost manaCost: 1 - type: CP14MagicEffect - magicType: Life + magicType: Energia effects: - !type:CP14SpellArea affectCaster: true @@ -36,7 +33,7 @@ proto: CP14RuneSpeedBallade - type: Action icon: - sprite: _CP14/Actions/Spells/healing.rsi + sprite: _CP14/Actions/Spells/electromancy.rsi state: speed_music - type: InstantAction event: !type:CP14ToggleableInstantActionEvent diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml index ea75c121c8..767633cd42 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml @@ -104,11 +104,7 @@ - CP14ActionSpellManaGiftElf - CP14ActionSpellMagicSplitting - CP14ActionSpellManaTrance - - type: CP14SpellStorage - grantAccessToSelf: true - spells: - - CP14ActionSpellResurrectionDead - - CP14ActionSpellShadowStep + - type: entity id: CP14MobUndeadSkeletonBardT2 parent: CP14MobUndeadSkeletonDemiplaneT2 @@ -121,7 +117,6 @@ - type: CP14SpellStorage grantAccessToSelf: true spells: - - CP14ActionSpellHealFromDeathBallade - CP14ActionSpellMagicBallade - CP14ActionSpellSpeedBallade - CP14ActionSpellPeaceBallade diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml index 89d6e8fa42..88f3346ec7 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml @@ -66,10 +66,6 @@ - CP14ActionSpellManaGiftElf - CP14ActionSpellMagicSplitting - CP14ActionSpellManaTrance - - type: CP14SpellStorage - grantAccessToSelf: true - spells: - - CP14ActionSpellResurrectionDead - type: Loadout prototypes: - CP14MobSkeletonWizardTownRaid diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml index 4d14347059..a223801b43 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/bars.yml @@ -43,8 +43,6 @@ - type: Stack count: 10 - - - type: entity id: CP14IronBar1 parent: BaseItem @@ -90,6 +88,50 @@ - type: Stack count: 10 +- type: entity + id: CP14BrassBar1 + parent: BaseItem + name: brass bar + suffix: 1 + description: The best friend for magotechnology. The secrets of its production are hidden. + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Materials/brass_bar.rsi + layers: + - state: bar + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14BrassBar + count: 1 + baseLayer: base + layerStates: + - bar + - bar_2 + - bar_3 + - type: Material + - type: PhysicalComposition + materialComposition: + CP14Brass: 10 + +- type: entity + id: CP14BrassBar5 + parent: CP14BrassBar1 + suffix: 5 + components: + - type: Stack + count: 5 + +- type: entity + id: CP14BrassBar10 + parent: CP14BrassBar1 + suffix: 10 + components: + - type: Stack + count: 10 - type: entity @@ -138,51 +180,6 @@ - type: Stack count: 10 - -- type: entity - id: CP14GlassSheet1 - parent: BaseItem - name: glass sheet - description: Treated quartz glass, transmits light well, and is nice to look at! - categories: [ ForkFiltered ] - components: - - type: Item - size: Normal - - type: Sprite - sprite: _CP14/Objects/Materials/glass.rsi - layers: - - state: glass - map: ["base"] - - type: Appearance - - type: Stack - stackType: CP14GlassSheet - count: 1 - baseLayer: base - layerStates: - - glass - - glass_2 - - glass_3 - - type: Material - - type: PhysicalComposition - materialComposition: - CP14Glass: 10 - -- type: entity - id: CP14GlassSheet5 - parent: CP14GlassSheet1 - suffix: 5 - components: - - type: Stack - count: 5 - -- type: entity - id: CP14GlassSheet10 - parent: CP14GlassSheet1 - suffix: 10 - components: - - type: Stack - count: 10 - - type: entity id: CP14MithrilBar1 parent: BaseItem @@ -228,3 +225,5 @@ components: - type: Stack count: 10 + + diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml index 6ef4b7b4f7..81d3b8b2f3 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/misc.yml @@ -108,3 +108,47 @@ core2: "" core3: "" core4: "" + +- type: entity + id: CP14GlassSheet1 + parent: BaseItem + name: glass sheet + description: Treated quartz glass, transmits light well, and is nice to look at! + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Materials/glass.rsi + layers: + - state: glass + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14GlassSheet + count: 1 + baseLayer: base + layerStates: + - glass + - glass_2 + - glass_3 + - type: Material + - type: PhysicalComposition + materialComposition: + CP14Glass: 10 + +- type: entity + id: CP14GlassSheet5 + parent: CP14GlassSheet1 + suffix: 5 + components: + - type: Stack + count: 5 + +- type: entity + id: CP14GlassSheet10 + parent: CP14GlassSheet1 + suffix: 10 + components: + - type: Stack + count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index 4798811412..123ad1a160 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -78,6 +78,15 @@ color: "#9093a1" price: 2 +- type: material + id: CP14Brass + stackEntity: CP14IronBar1 + name: cp14-material-brass + unit: materials-unit-bar + icon: { sprite: _CP14/Objects/Materials/brass_bar.rsi, state: bar_2 } + color: "#bb7547" + price: 2.5 + - type: material id: CP14Gold stackEntity: CP14GoldBar1 diff --git a/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml b/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml index 675127f49f..d7d6d62a8d 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml @@ -15,7 +15,7 @@ skillUiPosition: 0, 4 tree: Electromancy icon: - sprite: _CP14/Actions/Spells/healing.rsi + sprite: _CP14/Actions/Spells/electromancy.rsi state: speed_music effects: - !type:AddAction @@ -77,3 +77,17 @@ - !type:NeedPrerequisite prerequisite: ElectromancyT2 +- type: cp14Skill + id: CP14ActionSpellResurrection + skillUiPosition: 12, 4 + tree: Electromancy + icon: + sprite: _CP14/Actions/Spells/electromancy.rsi + state: defib + effects: + - !type:AddAction + action: CP14ActionSpellResurrection + restrictions: + - !type:NeedPrerequisite + prerequisite: ElectromancyT3 + diff --git a/Resources/Prototypes/_CP14/Skill/Basic/healing.yml b/Resources/Prototypes/_CP14/Skill/Basic/healing.yml index 23f2028def..44c8b863e0 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/healing.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/healing.yml @@ -111,37 +111,4 @@ action: CP14ActionSpellHealBallade restrictions: - !type:NeedPrerequisite - prerequisite: HealingT2 - -# T3 - -- type: cp14Skill - id: HealingT3 - skillUiPosition: 13, 0 - tree: Healing - name: cp14-skill-life-t3-name - learnCost: 0.5 - icon: - sprite: _CP14/Actions/skill_tree.rsi - state: heal3 - effects: - - !type:ModifyManacost - modifiers: - Life: -0.25 - restrictions: - - !type:NeedPrerequisite - prerequisite: HealingT2 - -- type: cp14Skill - id: CP14ActionSpellResurrection - skillUiPosition: 12, 4 - tree: Healing - icon: - sprite: _CP14/Actions/Spells/necromancy.rsi - state: resurrection - effects: - - !type:AddAction - action: CP14ActionSpellResurrection - restrictions: - - !type:NeedPrerequisite - prerequisite: HealingT3 + prerequisite: HealingT2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Stacks/materials.yml b/Resources/Prototypes/_CP14/Stacks/materials.yml index 84768d5c04..e4db4fbeb2 100644 --- a/Resources/Prototypes/_CP14/Stacks/materials.yml +++ b/Resources/Prototypes/_CP14/Stacks/materials.yml @@ -61,6 +61,13 @@ icon: { sprite: _CP14/Objects/Materials/iron_bar.rsi, state: bar_2 } maxCount: 10 +- type: stack + id: CP14BrassBar + name: cp14-stack-brass-bars + spawn: CP14BrassBar1 + icon: { sprite: _CP14/Objects/Materials/brass_bar.rsi, state: bar_2 } + maxCount: 10 + - type: stack id: CP14GoldBar name: cp14-stack-gold-bars diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/thaumaturgy.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/thaumaturgy.yml index 586ce12fce..296ab7fd87 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/thaumaturgy.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/thaumaturgy.yml @@ -11,6 +11,16 @@ service: !type:CP14BuyItemsService product: CP14EnergyCrystalMediumEmpty +- type: cp14TradingPosition + id: CP14BrassBar5 + faction: Thaumaturgy + uiPosition: 1 + icon: + sprite: _CP14/Objects/Materials/brass_bar.rsi + state: bar_2 + service: !type:CP14BuyItemsService + product: CP14BrassBar5 + - type: cp14TradingPosition id: CP14Paper faction: Thaumaturgy @@ -238,8 +248,8 @@ priceMarkup: 5 uiPosition: 9 icon: - sprite: _CP14/Actions/Spells/necromancy.rsi - state: resurrection + sprite: _CP14/Actions/Spells/electromancy.rsi + state: defib service: !type:CP14BuyItemsService product: CP14SpellScrollResurrection diff --git a/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/defib.png b/Resources/Textures/_CP14/Actions/Spells/electromancy.rsi/defib.png new file mode 100644 index 0000000000000000000000000000000000000000..9742f2eb7571faf433e288d2c57b5c769bea6370 GIT binary patch literal 375 zcmV--0f_#IP)Px$F-b&0R9J=WmdyXf)fS? zK{qD8lL;{IV}5YE?k|BnXfRf}$sr~MD1k6mIb)S;4n4vkE`_nmjWDzW@SvgeMk5Tx zXOh9*IoAZhg9Z*jQWDJG+mlpV%T({oa)&)=SoG_jTdM)fD%Z&pfa*r94NyIbTmwqx zJk`8K;n>6BfsrW8#^rRs;qT+&x~+v0 znYa2%ie|uA<#zk!rt6-!!&{{caX%_NR}4U#4O2`_BPx#{z*hZR9J=WRyz)ZFbqwqN?d{SfLKshH~P<6tZC6zAt<*Cs)~ywA;j{Nrz-XH7eZEe3 zQj1Dv0f1@++5)>0K4Jj1N>Kr}UqipvrJi-EXT40vP9e$oYp|vu1kQqb#sUrfT60J# z@CuNUF4M7N1)(j#kixsz0xUwLz6ykFWeadgAXDls!4}YVMMc^Bp@#li#T512|9?~f zX6#bHPE^!{Zb0nl*@=oTqFWb{G&lyq3Sh~hoW2_Y)2K;$K+?QXg`p~>8o>;ul==Wn WR)*F>Px$14%?dR9J=WR6oblO-WXrkS z#b43n|D~4|6-7pdg?;VCzV_lD9II>0W+_Z07_u1daeAs=uQnfWjy0>VPlSU<0;@t`vJq1RJQ@a=`3;-$371F~&XB zzv9gR|X%SaJxw9e|4KcDil^$e@zUfRQPBh~GN&b%FXY b{cpSgDwu%DSe%U>00000NkvXXu0mjfJcx<} diff --git a/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/cure_dead.png b/Resources/Textures/_CP14/Actions/Spells/necromancy.rsi/cure_dead.png deleted file mode 100644 index 60dde686856e90e98e5867b151c690daccf97d8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 580 zcmV-K0=xZ*P)Px${z*hZR9J=WS37RPKoFe`5j8C)0&4dl3mWGF93Xcf4WgpJE~pSqxCsqyEF@ck zO8^q)4m3_R$#~h%ED$M0o`k%{yE|{*e7pwu$DQbm#?#JdJiT@O6W2(0IVo;6VuIip z7wu|<_uJvjy5`|BPe~AEi;kueYz27b7vFaJk2^q4{ z&S*T9_n}ZKpfbQQ4gla9`@N{YO~({S+LTiz0$6g*K^;W98krWh-dmAsEW@VQ zl>*H{y>vxj9MRL`>ioSq9lQ34D+0&WxpXy=kU@=e)hrRf5;}YwqGErERM|`aqdB13 zT&E_5Q7&X{DkI%|s=#q|2AxCJDxmUpmy^QQB{3H`Y61W}TiyEEG?vFY;|Pv&>^?v} zx2fRrE-@0&d7#T`Y)H1+FYU#dgzZ({T+V*^*~3DB^)1@fQp+`Y%2h#2K$dtroQdsl zCR8NQn5+mV7qlUuva6(&k7@`xOt#is(LM0|07R`4idrS~`~Vuge%R>s!#qn90DwG8 z6P#1>NV@m@0C0^Hfkv+%;$}z$$=FE9gih;?HW{t0n8w%i#?yrap$mo6u^dU5;z|>b zlMC7qAo46tPU}tV`2k=Bm|~h|Y4Y;+`pM0OU-`(;oeNbeuwF*4(47zdB)$ME>`f71 SrRbml0000Px$y-7qtR9J=WSG#V5FciIRBmN<+lrVRvs@f%AkUvQm#MA*ZFd-K5C;5Xetpq;- z85(u%QYi~vdg;aZfpHpj=#e5wFh1u#eCz<60YMnWs%ICr6Wwl~T6al5U^e8;_c(qp zH|eN%Y4lZ|CF1kZ8L09sY3n1mAxBW*B4#!deMc~e!UdP&4?!5k*Y^*rx7U|v*U7PL zi}f5n-al7YH+LY;Yn1_<6hNO=TB5~z-d&rb8H^qDK$T~StXamA0|3yKvfmwgR}t13 zpunbNzQ^f3KCkjD3Bst0To#ytqoS%aE-!f6?*NOj}H;AXNxrYx997wfsw`9usd zKwZt26d@y51>{r$6=_=^xv3Px$QAtEWR9J;$U>FX-w79f>$Xd=sEr$#UphnOScnC0)tI@Q$w4PCctwBo5g5lZm zV+YAKhoTVp|KL{xCHff{Cv4c`t77U+Wes}nI z^9$JtkZcDaJA&cE-vi`YJ_;BZC@6?v1rP%RYMnr8bdco$N=rY24nQtskS)R206{O5 zh;eYO0cHnA0cMA%+YdJ~FhI(Rr`r!VN@-bOwVZ*0$V7-9C8u&*G4!EVPB1lQldJz@ zQ%{luV2KYs8i;WSp~Og1HYC;|=(%OIs2&CQ001h*t`@37iQE7H002ovPDHLkV1jTL Bp%4H7 diff --git a/Resources/Textures/_CP14/Objects/Materials/brass_bar.rsi/bar.png b/Resources/Textures/_CP14/Objects/Materials/brass_bar.rsi/bar.png new file mode 100644 index 0000000000000000000000000000000000000000..9c1d8de3072eaeff4b2878ebcd1b11227dc37671 GIT binary patch literal 292 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}_dH!3Ln2y} z6C_v{Cy4Yk1sWV^m>9&&^kvJx!#AY$VwG>&h=C&C+>Px$e@R3^R9J=WlQC<;P!xqfrJIFf-Lwvw0)kFmB!grUI=KY82;H3=`X35~3I%t; z(WR5%6gmW#Oce^59IDwg6yj<+$cwc#O^k(h$e9k0mwe~moIs*Pi4y&>QgI(_tBSYp zyrUZjz4Ih4`0DbMq3I(0R*H8>h{zX%z_O|UVCjZ`cWAniHxaslui&BS27&=(RY6t( zh_s0x1GH7eYv0zfbc3PkBK$sZwW+b3*;u;4%APY_ti#yh0j3KFOE;)CHM*k*-wTke zDx6>BS}8uOirTlHeB9z^~P z8Z2<|}?aO?mg vgp|ut%fH749~D4^5Izn#QKCeN{*68WxMJNNhN`pN00000NkvXXu0mjfj6T5W literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Materials/brass_bar.rsi/bar_3.png b/Resources/Textures/_CP14/Objects/Materials/brass_bar.rsi/bar_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a1aeec597e7b733c46faa32c153a11a93d08687f GIT binary patch literal 518 zcmV+h0{Q)kP)Px$z)3_wR9J=WmA^{@Q2@t3{n!jb-K+*DA;_uaa0sWMspX*Mz`d!VKcFpW2!eJ& zT5@R;oUVq;25Cr$oRsViBrXY*pg|k#omlVA^K$FH)AxS7_x-$g-@AiQp+fz4%>@~B zkj)Gx-E*oNzUE#G61=myM5)?E=10m5{6P4k^b?%QW&o(`hBK~I?M~bY&x=8W0q6Yb zN!b%(!7KdWaGTg?n^Lul%mdiX7Iw4cj8im~NIXhiH+a6i5`uV^ZYrUFnY6zN$e05{e$ z4Z8z$NXDa{0G=J#O|K7f8^cY?*ZRnOB(Wk1hW+g|Up<)k7VM_i2VxZsd$c0qw-WEa zf)!2W?Zu+58}uxbe67#b!(%W20U;(oFSq#V0nU#1h^;2Zf?>2Pe*zE?xs7=ui51Sv zErb^x0Jk1MG9C^72xJg2yBPx$B1uF+R9J=WmmvX}N&-4&MR^9Qx~@9| zN&;1YI$)kwDrizoYuoTwWL8F-fb7