diff --git a/Content.Server/Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs b/Content.Server/Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs index 07da5576d1f..05a447fc131 100644 --- a/Content.Server/Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs +++ b/Content.Server/Imperial/Medieval/Magic/MedievalMagicSystem.EntityAiming.cs @@ -35,6 +35,8 @@ private void OnTargetCaptured(TargetOverlayShootEvent args) var performer = GetEntity(args.Performer); var sender = GetEntity(args.Sender.Value); + if (!PassesSpellPrerequisites(sender, performer, Transform(performer).Coordinates)) return; + if (!TryComp(performer, out var spellCasterComponent)) return; if (!TryComp(sender, out var actionComponent)) return; if (actionComponent.Cooldown.HasValue && actionComponent.Cooldown.Value.End >= _timing.CurTime) return; diff --git a/Content.Shared/Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs b/Content.Shared/Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs index ac42ed12671..08454d3316e 100644 --- a/Content.Shared/Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs +++ b/Content.Shared/Imperial/Medieval/Magic/SharedMedievalMagicSystem.cs @@ -109,7 +109,7 @@ protected bool PassesSpellPrerequisites(EntityUid spell, EntityUid performer, En RaiseLocalEvent(spell, ref ev); if (_handsSystem.TryGetEmptyHand(performer, out _) == false) // TODO: Если в игре появятся магические катализаторы (посохи, палочки), что дают баффы при сотворении чар, то нужно будет добавить их в исключение - return ev.Cancelled; + return false; return !ev.Cancelled; } diff --git a/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl b/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl index 39cf908a2e3..0734ae06604 100644 --- a/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl +++ b/Resources/Locale/ru-RU/Imperial/Medieval/medieval.ftl @@ -1319,6 +1319,12 @@ ent-MedievalGallows = виселица ent-MedievalMedicalBed2Craft = заготовка роскошной кровати .desc = Кликните с заготовкой в активной руке по месту, куда вы хотите разместить объект, чтобы смастерить старинную кровать. .suffix = { "Средневековье" } +ent-MedievalBedT2 = кровать + .desc = Обычная кровать. + .suffix = { "Средневековье, декор" } +ent-MedievalBedT2Craft = заготовка кровати + .desc = Кликните с заготовкой в активной руке по месту, куда вы хотите разместить объект, чтобы смастерить кровать. + .suffix = { "Средневековье, декор" } ent-MedievalGoldOre = золотая руда .desc = Драгоценный металл. .suffix = { "Средневековье, ресурс" } diff --git a/Resources/Prototypes/Imperial/Medieval/decor.yml b/Resources/Prototypes/Imperial/Medieval/decor.yml index ec577d8d452..febb3f75080 100644 --- a/Resources/Prototypes/Imperial/Medieval/decor.yml +++ b/Resources/Prototypes/Imperial/Medieval/decor.yml @@ -1361,6 +1361,61 @@ - type: MedievalPlagueHealStrapped level: 2 +- type: entity + parent: Bed + id: MedievalBedT2 + components: + - type: Strap + buckleTime: 0.5 + unbuckleTime: 0.5 + buckleSound: + path: /Audio/Imperial/Medieval/Effects/lay_on_bed1.ogg + unbuckleSound: + path: /Audio/Imperial/Medieval/Effects/lay_on_bed2.ogg + - type: Buckle + - type: BloodRegenBed + bloodRegenMultiplier: 2.0 + - type: Sprite + sprite: Imperial/Medieval/Decor/medieval_decor.rsi + state: bedT2 + - type: HealOnBuckle + damage: + groups: + Brute: -0.2 + Burn: -0.2 + Airloss: -0.4 + types: + Poison: -0.16 + Caustic: -0.05 + Radiation: -0.07 + - type: MedievalPlagueHealStrapped + +- type: entity + id: MedievalBedT2Craft + parent: BaseItem + components: + - type: RDWeight + value: 25 + - type: Item + size: Normal + - type: SpawnAfterInteract + prototype: MedievalBedT2 + doAfter: 15 + deleteOnInteract: true + - type: Sprite + sprite: Imperial/Medieval/CraftBosses/stockade.rsi + state: icon + +- type: CP14Recipe + id: MedievalBedT2Recipe + craftTime: 10 + stacks: + Cloth: 10 + WoodPlank: 10 + MedievalGrass: 3 + Cotton: 2 + result: MedievalBedT2Craft + - type: entity id: MedievalDecorAnons parent: MedievalBannerBase diff --git a/Resources/Prototypes/Imperial/Medieval/lathes.yml b/Resources/Prototypes/Imperial/Medieval/lathes.yml index e9a28f2534f..5b59d775917 100644 --- a/Resources/Prototypes/Imperial/Medieval/lathes.yml +++ b/Resources/Prototypes/Imperial/Medieval/lathes.yml @@ -962,6 +962,7 @@ - MedievalCartRecipe - MedievalDecorBoxEmptyRecipe - MedievalFlagpoleShipRecipe + - MedievalBedT2Recipe - type: entity parent: MedievalFoundry diff --git a/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/bedT2.png b/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/bedT2.png new file mode 100644 index 00000000000..8d70cdc8a4b Binary files /dev/null and b/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/bedT2.png differ diff --git a/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/meta.json b/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/meta.json index ca89ac4f3b9..dda4f3d6457 100644 --- a/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/meta.json +++ b/Resources/Textures/Imperial/Medieval/Decor/medieval_decor.rsi/meta.json @@ -115,6 +115,9 @@ { "name": "bed2" }, + { + "name": "bedT2" + }, { "name": "wheat2" }, diff --git a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_1.rsi/blood_splatter.png b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_1.rsi/blood_splatter.png index b148bd88d30..0fabfdb3549 100644 Binary files a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_1.rsi/blood_splatter.png and b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_1.rsi/blood_splatter.png differ diff --git a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_2.rsi/blood_splatter.png b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_2.rsi/blood_splatter.png index 6cbf4f876fc..fd44f66a637 100644 Binary files a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_2.rsi/blood_splatter.png and b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_2.rsi/blood_splatter.png differ diff --git a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_3.rsi/blood_splatter.png b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_3.rsi/blood_splatter.png index ad50496130b..12d758c2521 100644 Binary files a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_3.rsi/blood_splatter.png and b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_3.rsi/blood_splatter.png differ diff --git a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_4.rsi/blood_splatter.png b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_4.rsi/blood_splatter.png index 1d7b13b504b..12d758c2521 100644 Binary files a/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_4.rsi/blood_splatter.png and b/Resources/Textures/Imperial/Medieval/Effects/BloodSplatter/blood_splatter_4.rsi/blood_splatter.png differ diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png index 81418d83ee0..772e013e4e0 100644 Binary files a/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png and b/Resources/Textures/Structures/Decoration/bonfire.rsi/bonfire.png differ diff --git a/Resources/Textures/Structures/Decoration/bonfire.rsi/burning.png b/Resources/Textures/Structures/Decoration/bonfire.rsi/burning.png index 4f5e2fc1269..356b3955568 100644 Binary files a/Resources/Textures/Structures/Decoration/bonfire.rsi/burning.png and b/Resources/Textures/Structures/Decoration/bonfire.rsi/burning.png differ