From b13769a82cb4320bc46d13fd8041d837f46d6e76 Mon Sep 17 00:00:00 2001 From: Ed Date: Mon, 25 Aug 2025 17:00:57 +0300 Subject: [PATCH] adapt codebase --- .../_CP14/Cooking/CP14ClientCookingSystem.cs | 1 - .../_CP14/FarSound/CP14FarSoundSystem.cs | 1 + .../GameTicking/Rules/CP14CrashingShipRule.cs | 8 ++---- ...le.cs => CP14ExpeditionToWindlandsRule.cs} | 10 ++----- .../MagicWeakness/CP14MagicWeaknessSystem.cs | 21 -------------- .../Modifiers/EditIncreaseDamageOnWield.cs | 28 ------------------- .../_CP14/PVS/CP14ConstrainSpawnerSystem.cs | 1 + .../CP14LocationGenerationSystem.cs | 9 +----- .../_CP14/Religion/CP14ReligionSystem.cs | 1 + .../_CP14/Roles/CP14VampireRoleComponent.cs | 2 +- .../EntitySystems/CP14StationZLevelsSystem.cs | 9 +----- Content.Shared/Chat/SharedChatSystem.cs | 2 +- .../Trigger/Systems/TriggerSystem.cs | 1 + .../Components/CP14FoodHolderComponent.cs | 2 +- .../CP14TriggerOnDamageReceivedComponent.cs | 4 +-- .../EntitySystems/CP14TriggerSystem.Damage.cs | 4 +-- .../CP14SharedMagicWeaknessSystem.cs | 15 ++++++++++ .../Entities/Structures/Windows/windows.yml | 2 +- .../_CP14/ModularCraft/Blade/axe.yml | 9 ------ .../_CP14/ModularCraft/Blade/base.yml | 6 ---- .../_CP14/ModularCraft/Blade/dagger.yml | 4 --- .../_CP14/ModularCraft/Blade/hammer.yml | 4 --- .../_CP14/ModularCraft/Blade/hoe.yml | 4 --- .../_CP14/ModularCraft/Blade/mace.yml | 5 ---- .../_CP14/ModularCraft/Blade/mop.yml | 4 --- .../_CP14/ModularCraft/Blade/pickaxe.yml | 5 ---- .../_CP14/ModularCraft/Blade/shovel.yml | 5 ---- .../_CP14/ModularCraft/Blade/sickle.yml | 4 --- .../_CP14/ModularCraft/Blade/skimitar.yml | 4 --- .../_CP14/ModularCraft/Blade/spear.yml | 8 ------ .../_CP14/ModularCraft/Blade/sword.yml | 9 ------ .../_CP14/ModularCraft/Garde/guildmaster.yml | 2 -- .../_CP14/ModularCraft/Garde/sharp.yml | 4 --- 33 files changed, 33 insertions(+), 165 deletions(-) rename Content.Server/_CP14/GameTicking/Rules/{CP14CrashToWildlandsRule.cs => CP14ExpeditionToWindlandsRule.cs} (89%) delete mode 100644 Content.Server/_CP14/ModularCraft/Modifiers/EditIncreaseDamageOnWield.cs rename {Content.Server => Content.Shared}/_CP14/Explosion/Components/CP14TriggerOnDamageReceivedComponent.cs (69%) rename {Content.Server => Content.Shared}/_CP14/Explosion/EntitySystems/CP14TriggerSystem.Damage.cs (82%) diff --git a/Content.Client/_CP14/Cooking/CP14ClientCookingSystem.cs b/Content.Client/_CP14/Cooking/CP14ClientCookingSystem.cs index 6baeff6572..60d6f61511 100644 --- a/Content.Client/_CP14/Cooking/CP14ClientCookingSystem.cs +++ b/Content.Client/_CP14/Cooking/CP14ClientCookingSystem.cs @@ -10,7 +10,6 @@ using Content.Shared._CP14.Cooking.Components; using Content.Shared.DisplacementMap; using Content.Shared.Rounding; using Robust.Client.GameObjects; -using Robust.Shared.Random; namespace Content.Client._CP14.Cooking; diff --git a/Content.Server/_CP14/FarSound/CP14FarSoundSystem.cs b/Content.Server/_CP14/FarSound/CP14FarSoundSystem.cs index 2bb2167490..526689d50d 100644 --- a/Content.Server/_CP14/FarSound/CP14FarSoundSystem.cs +++ b/Content.Server/_CP14/FarSound/CP14FarSoundSystem.cs @@ -1,5 +1,6 @@ using Content.Server.Explosion.EntitySystems; using Content.Shared._CP14.FarSound; +using Content.Shared.Trigger; using Robust.Shared.Audio.Systems; using Robust.Shared.Player; diff --git a/Content.Server/_CP14/GameTicking/Rules/CP14CrashingShipRule.cs b/Content.Server/_CP14/GameTicking/Rules/CP14CrashingShipRule.cs index 50f73a55a4..691b47c781 100644 --- a/Content.Server/_CP14/GameTicking/Rules/CP14CrashingShipRule.cs +++ b/Content.Server/_CP14/GameTicking/Rules/CP14CrashingShipRule.cs @@ -5,6 +5,7 @@ using Content.Server.Shuttles.Events; using Content.Server.Station.Components; using Content.Server.Station.Systems; using Content.Shared.GameTicking.Components; +using Content.Shared.Station.Components; using Robust.Shared.Prototypes; using Robust.Shared.Random; using Robust.Shared.Timing; @@ -42,13 +43,8 @@ public sealed class CP14CrashingShipRule : GameRuleSystem(station, out var stationData)) - { - _sawmill.Error($"Station {station} does not have a StationDataComponent."); - return; - } - var largestStationGrid = _station.GetLargestGrid(stationData); + var largestStationGrid = _station.GetLargestGrid(station); if (largestStationGrid is null) { diff --git a/Content.Server/_CP14/GameTicking/Rules/CP14CrashToWildlandsRule.cs b/Content.Server/_CP14/GameTicking/Rules/CP14ExpeditionToWindlandsRule.cs similarity index 89% rename from Content.Server/_CP14/GameTicking/Rules/CP14CrashToWildlandsRule.cs rename to Content.Server/_CP14/GameTicking/Rules/CP14ExpeditionToWindlandsRule.cs index 5a9d9e678a..6bd70576f9 100644 --- a/Content.Server/_CP14/GameTicking/Rules/CP14CrashToWildlandsRule.cs +++ b/Content.Server/_CP14/GameTicking/Rules/CP14ExpeditionToWindlandsRule.cs @@ -5,9 +5,9 @@ using Content.Server._CP14.Procedural; using Content.Server.GameTicking.Rules; using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Systems; -using Content.Server.Station.Components; using Content.Server.Station.Systems; using Content.Shared.GameTicking.Components; +using Content.Shared.Station.Components; using Robust.Shared.Map; namespace Content.Server._CP14.GameTicking.Rules; @@ -36,13 +36,7 @@ public sealed class CP14ExpeditionToWindlandsRule : GameRuleSystem(station, out var stationData)) - { - _sawmill.Error($"Station {station} does not have a StationDataComponent."); - return; - } - - var largestStationGrid = _station.GetLargestGrid(stationData); + var largestStationGrid = _station.GetLargestGrid(station); if (largestStationGrid is null) { diff --git a/Content.Server/_CP14/MagicWeakness/CP14MagicWeaknessSystem.cs b/Content.Server/_CP14/MagicWeakness/CP14MagicWeaknessSystem.cs index 81a6ceecc1..50583cedcc 100644 --- a/Content.Server/_CP14/MagicWeakness/CP14MagicWeaknessSystem.cs +++ b/Content.Server/_CP14/MagicWeakness/CP14MagicWeaknessSystem.cs @@ -1,28 +1,7 @@ -using Content.Server.Explosion.EntitySystems; -using Content.Shared._CP14.MagicEnergy; using Content.Shared._CP14.MagicWeakness; namespace Content.Server._CP14.MagicWeakness; public class CP14MagicWeaknessSystem : CP14SharedMagicWeaknessSystem { - [Dependency] private readonly TriggerSystem _trigger = default!; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnMagicEnergyBurnOutTrigger); - SubscribeLocalEvent(OnMagicEnergyOverloadTrigger); - } - - private void OnMagicEnergyOverloadTrigger(Entity ent, ref CP14MagicEnergyOverloadEvent args) - { - _trigger.Trigger(ent); - } - - private void OnMagicEnergyBurnOutTrigger(Entity ent, ref CP14MagicEnergyBurnOutEvent args) - { - _trigger.Trigger(ent); - } } diff --git a/Content.Server/_CP14/ModularCraft/Modifiers/EditIncreaseDamageOnWield.cs b/Content.Server/_CP14/ModularCraft/Modifiers/EditIncreaseDamageOnWield.cs deleted file mode 100644 index 4c9397edba..0000000000 --- a/Content.Server/_CP14/ModularCraft/Modifiers/EditIncreaseDamageOnWield.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Content.Shared._CP14.ModularCraft; -using Content.Shared._CP14.ModularCraft.Components; -using Content.Shared.Damage; -using Content.Shared.Wieldable.Components; - -namespace Content.Server._CP14.ModularCraft.Modifiers; - -public sealed partial class EditIncreaseDamageOnWield : CP14ModularCraftModifier -{ - [DataField] - public DamageSpecifier? BonusDamage; - - [DataField] - public float? DamageMultiplier; - - public override void Effect(EntityManager entManager, Entity start, Entity? part) - { - if (!entManager.TryGetComponent(start, out var wield)) - return; - - if (BonusDamage is not null) - wield.BonusDamage += BonusDamage; - - if (DamageMultiplier is not null) - wield.BonusDamage *= DamageMultiplier.Value; - } - -} diff --git a/Content.Server/_CP14/PVS/CP14ConstrainSpawnerSystem.cs b/Content.Server/_CP14/PVS/CP14ConstrainSpawnerSystem.cs index 67989f3f16..b6ac8e7eb7 100644 --- a/Content.Server/_CP14/PVS/CP14ConstrainSpawnerSystem.cs +++ b/Content.Server/_CP14/PVS/CP14ConstrainSpawnerSystem.cs @@ -4,6 +4,7 @@ using Content.Server.GameTicking; using Content.Shared.Ghost; using Content.Shared.Mind; using Content.Shared.Mind.Components; +using Content.Shared.Trigger; using MyNamespace; using Robust.Shared.Random; diff --git a/Content.Server/_CP14/Procedural/CP14LocationGenerationSystem.cs b/Content.Server/_CP14/Procedural/CP14LocationGenerationSystem.cs index 3142572c08..1ad9c2a66f 100644 --- a/Content.Server/_CP14/Procedural/CP14LocationGenerationSystem.cs +++ b/Content.Server/_CP14/Procedural/CP14LocationGenerationSystem.cs @@ -2,7 +2,6 @@ using System.Threading; using Content.Server._CP14.Demiplane; using Content.Server._CP14.Procedural.GlobalWorld.Components; using Content.Server.Procedural; -using Content.Server.Station.Components; using Content.Server.Station.Events; using Content.Server.Station.Systems; using Content.Shared._CP14.Procedural.Prototypes; @@ -42,13 +41,7 @@ public sealed class CP14LocationGenerationSystem : EntitySystem private void OnStationPostInit(Entity ent, ref StationPostInitEvent args) { - if (!TryComp(ent, out var stationData)) - { - _sawmill.Error($"Station {ent} does not have a StationDataComponent, cannot generate location on it."); - return; - } - - var largestStationGrid = _station.GetLargestGrid(stationData); + var largestStationGrid = _station.GetLargestGrid(ent.Owner); if (largestStationGrid is null) { diff --git a/Content.Server/_CP14/Religion/CP14ReligionSystem.cs b/Content.Server/_CP14/Religion/CP14ReligionSystem.cs index 5bac92fd75..785525bb04 100644 --- a/Content.Server/_CP14/Religion/CP14ReligionSystem.cs +++ b/Content.Server/_CP14/Religion/CP14ReligionSystem.cs @@ -9,6 +9,7 @@ using Content.Shared._CP14.Religion.Systems; using Content.Shared.Chat; using Content.Shared.Eye; using Content.Shared.FixedPoint; +using Content.Shared.Speech; using Robust.Server.GameObjects; using Robust.Server.GameStates; using Robust.Shared.Network; diff --git a/Content.Server/_CP14/Roles/CP14VampireRoleComponent.cs b/Content.Server/_CP14/Roles/CP14VampireRoleComponent.cs index a0f3e25eb9..ed93475a7e 100644 --- a/Content.Server/_CP14/Roles/CP14VampireRoleComponent.cs +++ b/Content.Server/_CP14/Roles/CP14VampireRoleComponent.cs @@ -1,4 +1,4 @@ -using Content.Shared.Roles; +using Content.Shared.Roles.Components; namespace Content.Server._CP14.Roles; diff --git a/Content.Server/_CP14/ZLevels/EntitySystems/CP14StationZLevelsSystem.cs b/Content.Server/_CP14/ZLevels/EntitySystems/CP14StationZLevelsSystem.cs index e80f9bf21f..ec00060e24 100644 --- a/Content.Server/_CP14/ZLevels/EntitySystems/CP14StationZLevelsSystem.cs +++ b/Content.Server/_CP14/ZLevels/EntitySystems/CP14StationZLevelsSystem.cs @@ -35,14 +35,7 @@ public sealed partial class CP14StationZLevelsSystem : EntitySystem if (ent.Comp.Initialized) return; - if (!TryComp(ent, out StationDataComponent? dataComp)) - { - Log.Error($"Failed to init CP14StationZLevelsSystem: no StationData"); - return; - } - - var defaultMap = _station.GetLargestGrid(dataComp); - + var defaultMap = _station.GetLargestGrid(ent.Owner); if (defaultMap is null) { Log.Error($"Failed to init CP14StationZLevelsSystem: defaultMap is null"); diff --git a/Content.Shared/Chat/SharedChatSystem.cs b/Content.Shared/Chat/SharedChatSystem.cs index 34e955a50e..bb25a8749a 100644 --- a/Content.Shared/Chat/SharedChatSystem.cs +++ b/Content.Shared/Chat/SharedChatSystem.cs @@ -27,7 +27,7 @@ public abstract class SharedChatSystem : EntitySystem public const int VoiceRange = 10; // how far voice goes in world units public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units public const int WhisperMuffledRange = 5; // how far whisper goes at all, in world units - public const string DefaultAnnouncementSound = "/Audio/Announcements/announce.ogg"; + public const string DefaultAnnouncementSound = "/Audio/_CP14/Announce/event_boom.ogg"; //CP14 replaced default announce sound public static readonly ProtoId CommonChannel = "Common"; diff --git a/Content.Shared/Trigger/Systems/TriggerSystem.cs b/Content.Shared/Trigger/Systems/TriggerSystem.cs index 6a749b87ab..f419221364 100644 --- a/Content.Shared/Trigger/Systems/TriggerSystem.cs +++ b/Content.Shared/Trigger/Systems/TriggerSystem.cs @@ -45,6 +45,7 @@ public sealed partial class TriggerSystem : EntitySystem { base.Initialize(); + InitializeDamageReceived(); //CP14 InitializeCollide(); InitializeCondition(); InitializeInteraction(); diff --git a/Content.Shared/_CP14/Cooking/Components/CP14FoodHolderComponent.cs b/Content.Shared/_CP14/Cooking/Components/CP14FoodHolderComponent.cs index 59bd759976..0bb319ac75 100644 --- a/Content.Shared/_CP14/Cooking/Components/CP14FoodHolderComponent.cs +++ b/Content.Shared/_CP14/Cooking/Components/CP14FoodHolderComponent.cs @@ -12,7 +12,7 @@ namespace Content.Shared._CP14.Cooking.Components; /// /// Food of the specified type can be transferred to this entity. /// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true), Access(typeof(CP14SharedCookingSystem))] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState(fieldDeltas: true, raiseAfterAutoHandleState: true), Access(typeof(CP14SharedCookingSystem))] public sealed partial class CP14FoodHolderComponent : Component { /// diff --git a/Content.Server/_CP14/Explosion/Components/CP14TriggerOnDamageReceivedComponent.cs b/Content.Shared/_CP14/Explosion/Components/CP14TriggerOnDamageReceivedComponent.cs similarity index 69% rename from Content.Server/_CP14/Explosion/Components/CP14TriggerOnDamageReceivedComponent.cs rename to Content.Shared/_CP14/Explosion/Components/CP14TriggerOnDamageReceivedComponent.cs index cc606d0464..06f713118f 100644 --- a/Content.Server/_CP14/Explosion/Components/CP14TriggerOnDamageReceivedComponent.cs +++ b/Content.Shared/_CP14/Explosion/Components/CP14TriggerOnDamageReceivedComponent.cs @@ -1,7 +1,7 @@ -namespace Content.Server.Explosion.Components; +namespace Content.Shared._CP14.Explosion.Components; /// /// Triggers when the entity is damaged. /// [RegisterComponent] -public sealed partial class CP14TriggerOnDamageReceivedComponent : Component { } +public sealed partial class CP14TriggerOnDamageReceivedComponent : Component; diff --git a/Content.Server/_CP14/Explosion/EntitySystems/CP14TriggerSystem.Damage.cs b/Content.Shared/_CP14/Explosion/EntitySystems/CP14TriggerSystem.Damage.cs similarity index 82% rename from Content.Server/_CP14/Explosion/EntitySystems/CP14TriggerSystem.Damage.cs rename to Content.Shared/_CP14/Explosion/EntitySystems/CP14TriggerSystem.Damage.cs index 5d570090ef..1a5d3b8804 100644 --- a/Content.Server/_CP14/Explosion/EntitySystems/CP14TriggerSystem.Damage.cs +++ b/Content.Shared/_CP14/Explosion/EntitySystems/CP14TriggerSystem.Damage.cs @@ -1,7 +1,7 @@ -using Content.Server.Explosion.Components; +using Content.Shared._CP14.Explosion.Components; using Content.Shared.Damage; -namespace Content.Server.Explosion.EntitySystems; +namespace Content.Shared.Trigger.Systems; public sealed partial class TriggerSystem { diff --git a/Content.Shared/_CP14/MagicWeakness/CP14SharedMagicWeaknessSystem.cs b/Content.Shared/_CP14/MagicWeakness/CP14SharedMagicWeaknessSystem.cs index b85210ba51..7763e1a0e5 100644 --- a/Content.Shared/_CP14/MagicWeakness/CP14SharedMagicWeaknessSystem.cs +++ b/Content.Shared/_CP14/MagicWeakness/CP14SharedMagicWeaknessSystem.cs @@ -4,6 +4,7 @@ using Content.Shared.Damage; using Content.Shared.IdentityManagement; using Content.Shared.Popups; using Content.Shared.StatusEffectNew; +using Content.Shared.Trigger.Systems; namespace Content.Shared._CP14.MagicWeakness; @@ -12,6 +13,7 @@ public abstract class CP14SharedMagicWeaknessSystem : EntitySystem [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; [Dependency] private readonly DamageableSystem _damageable = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly TriggerSystem _trigger = default!; public override void Initialize() { @@ -22,6 +24,9 @@ public abstract class CP14SharedMagicWeaknessSystem : EntitySystem SubscribeLocalEvent(OnMagicEnergyBurnOutSleep); SubscribeLocalEvent(OnMagicEnergyOverloadSleep); + + SubscribeLocalEvent(OnMagicEnergyBurnOutTrigger); + SubscribeLocalEvent(OnMagicEnergyOverloadTrigger); } private void OnMagicEnergyBurnOutSleep(Entity ent, @@ -56,6 +61,16 @@ public abstract class CP14SharedMagicWeaknessSystem : EntitySystem } } + private void OnMagicEnergyOverloadTrigger(Entity ent, ref CP14MagicEnergyOverloadEvent args) + { + _trigger.Trigger(ent); + } + + private void OnMagicEnergyBurnOutTrigger(Entity ent, ref CP14MagicEnergyBurnOutEvent args) + { + _trigger.Trigger(ent); + } + private void OnMagicEnergyBurnOutDamage(Entity ent, ref CP14MagicEnergyBurnOutEvent args) { diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml b/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml index d8d78e412e..63ce05cb69 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/windows.yml @@ -86,7 +86,7 @@ slipData: launchForwardsMultiplier: 0 - type: TriggerOnStepTrigger - - type: DamageUserOnTrigger + - type: DamageOnTrigger damage: types: Slash: 10 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml index 779005655e..bb4301c37d 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml @@ -17,11 +17,6 @@ types: Slash: 14 Piercing: 3 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 11 - Piercing: 3 - !type:EditItem newSize: Normal adjustShape: 0, 1 @@ -102,10 +97,6 @@ bonusDamage: types: Blunt: 1 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 1 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml index c96094201d..76c6fa259a 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml @@ -7,8 +7,6 @@ sharpnessDamageMultiplier: 3 - !type:EditMeleeWeapon damageMultiplier: 0.75 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 0.75 - type: modularPart id: BaseBladeWooden @@ -19,8 +17,6 @@ sharpnessDamageMultiplier: 3 - !type:EditMeleeWeapon damageMultiplier: 0.25 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 0.25 - type: modularPart id: BaseBladeIron @@ -55,6 +51,4 @@ sharpnessDamageMultiplier: 0.80 - !type:EditMeleeWeapon damageMultiplier: 1.25 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 1.25 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml index 5b94f7dfa1..f8a4244abd 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml @@ -24,10 +24,6 @@ types: Slash: 4 Piercing: 3 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 3 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml index fea5329389..5122796227 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml @@ -34,10 +34,6 @@ bonusDamage: types: Blunt: 7 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 5 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml index dad8465f91..9a6dd6e8ea 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml @@ -33,10 +33,6 @@ bonusDamage: types: Piercing: 6 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 3 - !type:EditDamageableModifier # Improvised weapon multiplier: 1.2 - !type:EditItem diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml index bb578b9d3e..0f34c7ccd5 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml @@ -16,11 +16,6 @@ types: Blunt: 5 Piercing: 2 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 8 - Piercing: 4 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml index cb14574735..797bbbfa56 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml @@ -20,10 +20,6 @@ bonusDamage: types: Blunt: 5 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 5 - !type:EditDamageableModifier # Improvised weapon multiplier: 1.2 - !type:EditItem diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml index 829c85e64c..4c7bb1eecf 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml @@ -24,11 +24,6 @@ types: Piercing: 10 Structural: 4 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 6 - Structural: 17 - !type:EditItem newSize: Normal adjustShape: 1, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml index 2faa6d2e9f..8e0fef1da9 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml @@ -22,11 +22,6 @@ types: Slash: 3 Blunt: 3 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 1 - Blunt: 3 - !type:EditDamageableModifier # Improvised weapon multiplier: 1.2 - !type:EditItem diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml index 74549018fd..e171b9dcfc 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml @@ -13,10 +13,6 @@ bonusDamage: types: Slash: 5 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 3 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml index 93649b9287..f13b26c4ea 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml @@ -22,10 +22,6 @@ bonusDamage: types: Slash: 8 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 16 - !type:EditItem newSize: Large adjustShape: 0, 2 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml index c6ac26bb3f..736c359524 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml @@ -30,10 +30,6 @@ bonusDamage: types: Piercing: 8 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 3 - !type:EditItem newSize: Normal adjustShape: 0, 1 @@ -128,10 +124,6 @@ bonusDamage: types: Blunt: 1 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 1 - !type:EditItem newSize: Normal adjustShape: 0, 1 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml index 6a11385846..1c1716c434 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml @@ -23,11 +23,6 @@ types: Slash: 9 Piercing: 5 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 5 - Piercing: 2 - !type:EditItem newSize: Large adjustShape: 0, 2 @@ -123,10 +118,6 @@ bonusDamage: types: Blunt: 1 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 1 - !type:EditItem newSize: Large adjustShape: 0, 2 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml index 556e8571d0..e7841363ee 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml @@ -10,8 +10,6 @@ sharpnessDamageMultiplier: 0.8 - !type:EditMeleeWeapon damageMultiplier: 1.2 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 1.2 - type: modularPart id: GardeGuildmaster diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml index 2f10d093e2..c51a059386 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml @@ -6,8 +6,6 @@ modifiers: - !type:EditMeleeWeapon damageMultiplier: 1.2 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 1.2 - type: modularPart id: GardeSharpIron @@ -64,5 +62,3 @@ modifiers: - !type:EditMeleeWeapon damageMultiplier: 1.1 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 1.0