diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs index 7d1dec3246..295218a546 100644 --- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs +++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.Effects.cs @@ -103,9 +103,9 @@ public sealed partial class MeleeWeaponSystem case WeaponArcAnimation.CPThrust: track = EnsureComp(animationUid); track.User = user; - _animation.Play(animationUid, CPGetThrustAnimation(sprite, -offset, spriteRotation, length), ThrustAnimationKey); + _animation.Play(animationUid, CPGetThrustAnimation(sprite, -offset * 2, spriteRotation, length), ThrustAnimationKey); if (arcComponent.Fadeout) - _animation.Play(animationUid, GetFadeAnimation(sprite, 0f, 0.15f), FadeAnimationKey); + _animation.Play(animationUid, GetFadeAnimation(sprite, length * 0.5f, length + 0.15f), FadeAnimationKey); break; //CrystallEdge MeleeUpgrade end } @@ -260,8 +260,9 @@ public sealed partial class MeleeWeaponSystem var startRotation = sprite.Rotation + (arc * 0.5f); var endRotation = sprite.Rotation - (arc * 0.5f); - var startRotationOffset = startRotation.RotateVec(new Vector2(0f, offset)); - var endRotationOffset = endRotation.RotateVec(new Vector2(0f, offset)); + var startRotationOffset = startRotation.RotateVec(new Vector2(0f, -offset * 0.9f)); + var minRotationOffset = sprite.Rotation.RotateVec(new Vector2(0f, -offset * 1.1f)); + var endRotationOffset = endRotation.RotateVec(new Vector2(0f, -offset * 0.9f)); startRotation += spriteRotation; endRotation += spriteRotation; @@ -279,6 +280,7 @@ public sealed partial class MeleeWeaponSystem KeyFrames = { new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.0f), length * 0.0f), + new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.5f), length * 0.3f), new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,1.0f), length * 0.6f), new AnimationTrackProperty.KeyFrame(Angle.Lerp(startRotation,endRotation,0.8f), length * 1.0f), } @@ -290,6 +292,7 @@ public sealed partial class MeleeWeaponSystem KeyFrames = { new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,0.0f), length * 0.0f), + new AnimationTrackProperty.KeyFrame(minRotationOffset, length * 0.3f), new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,1.0f), length * 0.6f), new AnimationTrackProperty.KeyFrame(Vector2.Lerp(startRotationOffset,endRotationOffset,0.8f), length * 1.0f), } @@ -298,10 +301,10 @@ public sealed partial class MeleeWeaponSystem }; } - private Animation CPGetThrustAnimation(SpriteComponent sprite, float distance, Angle spriteRotation, float length) + private Animation CPGetThrustAnimation(SpriteComponent sprite, float offset, Angle spriteRotation, float length) { - var startOffset = sprite.Rotation.RotateVec(new Vector2(0f, -distance / 5f)); - var endOffset = sprite.Rotation.RotateVec(new Vector2(0f, -distance)); + var startOffset = sprite.Rotation.RotateVec(new Vector2(0f, 0f)); + var endOffset = sprite.Rotation.RotateVec(new Vector2(0f, offset / 2)); sprite.Rotation += spriteRotation; diff --git a/Content.Server/_CP14/Eye/CP14ToggleableEyeOffsetSystem.cs b/Content.Server/_CP14/Eye/CP14ToggleableEyeOffsetSystem.cs new file mode 100644 index 0000000000..cb9513b946 --- /dev/null +++ b/Content.Server/_CP14/Eye/CP14ToggleableEyeOffsetSystem.cs @@ -0,0 +1,20 @@ +using Content.Server.Movement.Components; +using Content.Shared._CP14.Eye; + +namespace Content.Server._CP14.Eye; + +public sealed class CP14ToggleableEyeOffsetSystem : EntitySystem +{ + public override void Initialize() + { + SubscribeLocalEvent(OnToggleEyeOffset); + } + + private void OnToggleEyeOffset(Entity ent, ref CP14EyeOffsetToggleActionEvent args) + { + if (!HasComp(ent)) + AddComp(ent); + else + RemComp(ent); + } +} diff --git a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs index 75c85790de..2175766975 100644 --- a/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs +++ b/Content.Shared/Weapons/Melee/Events/MeleeHitEvent.cs @@ -66,13 +66,19 @@ public sealed class MeleeHitEvent : HandledEntityEventArgs /// public bool IsHit = true; - public MeleeHitEvent(List hitEntities, EntityUid user, EntityUid weapon, DamageSpecifier baseDamage, Vector2? direction) + /// + /// CP14 Heavy attack flag. + /// + public bool CP14Heavy; + + public MeleeHitEvent(List hitEntities, EntityUid user, EntityUid weapon, DamageSpecifier baseDamage, Vector2? direction, bool heavy = false) { HitEntities = hitEntities; User = user; Weapon = weapon; BaseDamage = baseDamage; Direction = direction; + CP14Heavy = heavy; //CP14 } } diff --git a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs index bfb80382d4..12c5dc00ec 100644 --- a/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs +++ b/Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs @@ -84,7 +84,7 @@ public sealed partial class MeleeWeaponComponent : Component /// Multiplies damage by this amount for single-target attacks. /// [DataField, AutoNetworkedField] - public FixedPoint2 ClickDamageModifier = FixedPoint2.New(1); + public FixedPoint2 ClickDamageModifier = FixedPoint2.New(1.3); //CP14 default bonus damage // TODO: Temporarily 1.5 until interactionoutline is adjusted to use melee, then probably drop to 1.2 /// @@ -131,7 +131,7 @@ public sealed partial class MeleeWeaponComponent : Component /// CrystallEdge Melee upgrade. how far away from the player the animation should be played. /// [DataField] - public float CPAnimationOffset = -1f; + public float CPAnimationOffset = 1f; // Sounds diff --git a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs index 8cebb0b7ae..ea41a4f45c 100644 --- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs +++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs @@ -498,7 +498,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem LogImpact.Low, $"{ToPrettyString(user):actor} melee attacked (light) using {ToPrettyString(meleeUid):tool} and missed"); } - var missEvent = new MeleeHitEvent(new List(), user, meleeUid, damage, null); + var missEvent = new MeleeHitEvent(new List(), user, meleeUid, damage, null, heavy: false); RaiseLocalEvent(meleeUid, missEvent); _meleeSound.PlaySwingSound(user, meleeUid, component); return; @@ -507,7 +507,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem // Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}"); // Raise event before doing damage so we can cancel damage if the event is handled - var hitEvent = new MeleeHitEvent(new List { target.Value }, user, meleeUid, damage, null); + var hitEvent = new MeleeHitEvent(new List { target.Value }, user, meleeUid, damage, null, heavy: false); RaiseLocalEvent(meleeUid, hitEvent); if (hitEvent.Handled) @@ -600,7 +600,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem LogImpact.Low, $"{ToPrettyString(user):actor} melee attacked (heavy) using {ToPrettyString(meleeUid):tool} and missed"); } - var missEvent = new MeleeHitEvent(new List(), user, meleeUid, damage, direction); + var missEvent = new MeleeHitEvent(new List(), user, meleeUid, damage, direction, heavy: true); RaiseLocalEvent(meleeUid, missEvent); // immediate audio feedback @@ -649,7 +649,7 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem // Sawmill.Debug($"Melee damage is {damage.Total} out of {component.Damage.Total}"); // Raise event before doing damage so we can cancel damage if the event is handled - var hitEvent = new MeleeHitEvent(targets, user, meleeUid, damage, direction); + var hitEvent = new MeleeHitEvent(targets, user, meleeUid, damage, direction, heavy: true); RaiseLocalEvent(meleeUid, hitEvent); if (hitEvent.Handled) diff --git a/Content.Shared/_CP14/Eye/CP14ToggleableEyeSystem.cs b/Content.Shared/_CP14/Eye/CP14ToggleableEyeSystem.cs new file mode 100644 index 0000000000..ded62627d5 --- /dev/null +++ b/Content.Shared/_CP14/Eye/CP14ToggleableEyeSystem.cs @@ -0,0 +1,7 @@ +using Content.Shared.Actions; + +namespace Content.Shared._CP14.Eye; + +public sealed partial class CP14EyeOffsetToggleActionEvent : InstantActionEvent +{ +} diff --git a/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellKnockdown.cs b/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellKnockdown.cs new file mode 100644 index 0000000000..15157c3b45 --- /dev/null +++ b/Content.Shared/_CP14/MagicSpell/Spells/CP14SpellKnockdown.cs @@ -0,0 +1,27 @@ +using Content.Shared.Stunnable; + +namespace Content.Shared._CP14.MagicSpell.Spells; + +public sealed partial class CP14SpellKnockdown : CP14SpellEffect +{ + [DataField] + public float ThrowPower = 10f; + + [DataField] + public TimeSpan Time = TimeSpan.FromSeconds(1f); + + [DataField] + public bool DropItems = false; + + public override void Effect(EntityManager entManager, CP14SpellEffectBaseArgs args) + { + if (args.Target is null || args.User is null) + return; + + var targetEntity = args.Target.Value; + + var stun = entManager.System(); + + stun.TryKnockdown(args.Target.Value, Time, true, true, DropItems); + } +} diff --git a/Content.Shared/_CP14/MeleeWeapon/Components/CP14BonusDistanceMeleeDamageComponent.cs b/Content.Shared/_CP14/MeleeWeapon/Components/CP14BonusDistanceMeleeDamageComponent.cs new file mode 100644 index 0000000000..2f7881e09d --- /dev/null +++ b/Content.Shared/_CP14/MeleeWeapon/Components/CP14BonusDistanceMeleeDamageComponent.cs @@ -0,0 +1,28 @@ +using Content.Shared.Damage; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared._CP14.MeleeWeapon.Components; + +/// +/// Adds bonus damage to weapons if targets are at a certain distance from the attacker. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CP14BonusDistanceMeleeDamageComponent : Component +{ + [DataField] + public DamageSpecifier BonusDamage = new(); + + [DataField] + public float MinDistance = 1f; + + [DataField] + public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/_CP14/Effects/critical.ogg") + { + Params = AudioParams.Default.WithVariation(0.125f), + }; + + [DataField] + public EntProtoId VFX = "CP14MeleeCritEffect"; +} diff --git a/Content.Shared/_CP14/MeleeWeapon/Components/CP14ComboBonusMeleeDamageComponent.cs b/Content.Shared/_CP14/MeleeWeapon/Components/CP14ComboBonusMeleeDamageComponent.cs new file mode 100644 index 0000000000..6f5771b8b6 --- /dev/null +++ b/Content.Shared/_CP14/MeleeWeapon/Components/CP14ComboBonusMeleeDamageComponent.cs @@ -0,0 +1,34 @@ +using Content.Shared.Damage; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared._CP14.MeleeWeapon.Components; + +/// +/// After several wide attacks, a light attack deals additional damage. +/// +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] +public sealed partial class CP14ComboBonusMeleeDamageComponent : Component +{ + [DataField] + public DamageSpecifier BonusDamage = new(); + + [DataField] + public int HeavyAttackNeed = 2; + + [DataField, AutoNetworkedField] + public int CurrentHeavyAttacks = 0; + + [DataField, AutoNetworkedField] + public HashSet HitEntities = new(); + + [DataField] + public SoundSpecifier Sound = new SoundPathSpecifier("/Audio/_CP14/Effects/critical_sword.ogg") + { + Params = AudioParams.Default.WithVariation(0.125f), + }; + + [DataField] + public EntProtoId VFX = "CP14MeleeCritEffect"; +} diff --git a/Content.Shared/_CP14/MeleeWeapon/Components/CP14LightMeleeKnockdownComponent.cs b/Content.Shared/_CP14/MeleeWeapon/Components/CP14LightMeleeKnockdownComponent.cs new file mode 100644 index 0000000000..64781aeec3 --- /dev/null +++ b/Content.Shared/_CP14/MeleeWeapon/Components/CP14LightMeleeKnockdownComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._CP14.MeleeWeapon.Components; + +/// +/// After several wide attacks, a light attack deals additional damage. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CP14LightMeleeKnockdownComponent : Component +{ + [DataField] + public float ThrowDistance = 0.5f; + + [DataField] + public TimeSpan KnockdownTime = TimeSpan.FromSeconds(0.25f); +} diff --git a/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeParriableComponent.cs b/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeParriableComponent.cs new file mode 100644 index 0000000000..5273bdd902 --- /dev/null +++ b/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeParriableComponent.cs @@ -0,0 +1,16 @@ +using Robust.Shared.Audio; + +namespace Content.Shared._CP14.MeleeWeapon.Components; + +/// +/// allows this item to be knocked out of your hands by a successful parry +/// +[RegisterComponent] +public sealed partial class CP14MeleeParriableComponent : Component +{ + [DataField] + public TimeSpan LastMeleeHit = TimeSpan.Zero; + + [DataField] + public SoundSpecifier ParrySound = new SoundPathSpecifier("/Audio/_CP14/Effects/parry1.ogg", AudioParams.Default.WithVariation(0.2f)); +} diff --git a/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeParryComponent.cs b/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeParryComponent.cs new file mode 100644 index 0000000000..f041c7b245 --- /dev/null +++ b/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeParryComponent.cs @@ -0,0 +1,14 @@ +namespace Content.Shared._CP14.MeleeWeapon.Components; + +/// +/// attacks with this item may knock CP14ParriableComponent items out of your hand on a hit +/// +[RegisterComponent] +public sealed partial class CP14MeleeParryComponent : Component +{ + [DataField] + public TimeSpan ParryWindow = TimeSpan.FromSeconds(1f); + + [DataField] + public float ParryPower = 1f; +} diff --git a/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeWeaponStaminaCostComponent.cs b/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeWeaponStaminaCostComponent.cs new file mode 100644 index 0000000000..c4eff377e8 --- /dev/null +++ b/Content.Shared/_CP14/MeleeWeapon/Components/CP14MeleeWeaponStaminaCostComponent.cs @@ -0,0 +1,13 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared._CP14.MeleeWeapon.Components; + +/// +/// Using this weapon damages the wearer's stamina. +/// +[RegisterComponent, NetworkedComponent] +public sealed partial class CP14MeleeWeaponStaminaCostComponent : Component +{ + [DataField] + public float Stamina = 10f; +} diff --git a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeSelfDamageSystem.cs b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeSelfDamageSystem.cs deleted file mode 100644 index 468d8e20a3..0000000000 --- a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeSelfDamageSystem.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Content.Shared._CP14.MeleeWeapon.Components; -using Content.Shared.Damage; -using Content.Shared.Weapons.Melee.Events; - -namespace Content.Shared._CP14.MeleeWeapon.EntitySystems; - -public sealed class CP14MeleeSelfDamageSystem : EntitySystem -{ - [Dependency] private readonly DamageableSystem _damageable = default!; - - public override void Initialize() - { - SubscribeLocalEvent(OnMeleeHit); - } - - private void OnMeleeHit(Entity ent, ref MeleeHitEvent args) - { - if (!args.IsHit) - return; - if (args.HitEntities.Count == 0) - return; - _damageable.TryChangeDamage(ent, ent.Comp.DamageToSelf); - } -} diff --git a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeWeaponSystem.cs b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeWeaponSystem.cs new file mode 100644 index 0000000000..026c8d322e --- /dev/null +++ b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeWeaponSystem.cs @@ -0,0 +1,210 @@ +using System.Numerics; +using Content.Shared._CP14.MeleeWeapon.Components; +using Content.Shared.Damage; +using Content.Shared.Damage.Systems; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.Popups; +using Content.Shared.Stunnable; +using Content.Shared.Throwing; +using Content.Shared.Weapons.Melee.Events; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Random; +using Robust.Shared.Timing; + +namespace Content.Shared._CP14.MeleeWeapon.EntitySystems; + +public sealed class CP14MeleeWeaponSystem : EntitySystem +{ + [Dependency] private readonly DamageableSystem _damageable = default!; + [Dependency] private readonly SharedTransformSystem _transform = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly IGameTiming _timing = default!; + [Dependency] private readonly SharedStunSystem _stun = default!; + [Dependency] private readonly ThrowingSystem _throw = default!; + [Dependency] private readonly SharedHandsSystem _hands = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedStaminaSystem _stamina = default!; + + public override void Initialize() + { + SubscribeLocalEvent(OnMeleeHit); + SubscribeLocalEvent(OnDistanceBonusDamage); + SubscribeLocalEvent(OnComboBonusDamage); + SubscribeLocalEvent(OnKnockdownAttack); + SubscribeLocalEvent(OnMeleeParryHit); + SubscribeLocalEvent(OnMeleeParriableHitAttmpt); + SubscribeLocalEvent(OnMeleeStaminaCost); + } + + private void OnMeleeStaminaCost(Entity ent, ref MeleeHitEvent args) + { + _stamina.TakeStaminaDamage(args.User, ent.Comp.Stamina); + } + + private void OnMeleeParryHit(Entity ent, ref MeleeHitEvent args) + { + if (args.HitEntities.Count != 1) + return; + + var target = args.HitEntities[0]; + + var activeTargetHand = _hands.GetActiveHand(target); + + var heldItem = _hands.GetHeldItem(target, activeTargetHand); + if (heldItem is null) + return; + + if (!TryComp(heldItem, out var meleeParriable)) + return; + + if (_timing.CurTime > meleeParriable.LastMeleeHit + ent.Comp.ParryWindow) + return; + + _hands.TryDrop(target, heldItem.Value); + _throw.TryThrow(heldItem.Value, _random.NextAngle().ToWorldVec(), ent.Comp.ParryPower, target); + _popup.PopupPredicted( Loc.GetString("cp14-successful-parry"), args.User, args.User); + _audio.PlayPredicted(meleeParriable.ParrySound, heldItem.Value, args.User); + } + + private void OnMeleeParriableHitAttmpt(Entity ent, ref AttemptMeleeEvent args) + { + ent.Comp.LastMeleeHit = _timing.CurTime; + } + + private void OnKnockdownAttack(Entity ent, ref MeleeHitEvent args) + { + if (args.CP14Heavy) + return; + + foreach (var hit in args.HitEntities) + { + _stun.TryKnockdown(hit, ent.Comp.KnockdownTime, true, drop: false); + + // Vector from splitter to item + var direction = Transform(hit).Coordinates.Position - Transform(args.User).Coordinates.Position; + if (direction != Vector2.Zero) + { + var dir = direction.Normalized() * ent.Comp.ThrowDistance; + _throw.TryThrow(hit, dir, 3); + } + } + } + + private void OnComboBonusDamage(Entity ent, ref MeleeHitEvent args) + { + // Resets combo state + void Reset() + { + ent.Comp.HitEntities.Clear(); + ent.Comp.CurrentHeavyAttacks = 0; + Dirty(ent); + } + + // No hits this swing → reset + if (args.HitEntities.Count == 0) + { + Reset(); + return; + } + + var comp = ent.Comp; + + // Not enough heavy attacks accumulated yet + if (comp.CurrentHeavyAttacks < comp.HeavyAttackNeed) + { + // Light attack before threshold → reset combo + if (!args.CP14Heavy) + { + Reset(); + return; + } + + // Heavy attack: track overlapping targets across swings + if (comp.HitEntities.Count == 0) + { + // First heavy: initialize the set with current hits + comp.HitEntities.UnionWith(args.HitEntities); + } + else + { + // Subsequent heavy: keep only targets hit every time + comp.HitEntities.IntersectWith(args.HitEntities); + + // Diverged to different targets → reset + if (comp.HitEntities.Count == 0) + { + Reset(); + return; + } + } + + comp.CurrentHeavyAttacks++; + Dirty(ent); + return; + } + + // Light attack after enough heavies → check if it hits any tracked target + if (comp.HitEntities.Overlaps(args.HitEntities) && !args.CP14Heavy) + { + if (_timing.IsFirstTimePredicted) + { + _audio.PlayPredicted(comp.Sound, ent, args.User); + args.BonusDamage += comp.BonusDamage; + + // Visual feedback on every hit entity this swing + foreach (var hit in args.HitEntities) + { + PredictedSpawnAtPosition(comp.VFX, Transform(hit).Coordinates); + } + } + Reset(); + } + } + + private void OnDistanceBonusDamage(Entity ent, ref MeleeHitEvent args) + { + var critical = true; + + if (args.HitEntities.Count == 0) + return; + + var userPos = _transform.GetWorldPosition(args.User); + //Crit only if all targets are at distance + foreach (var hit in args.HitEntities) + { + var targetPos = _transform.GetWorldPosition(hit); + + var distance = (userPos - targetPos).Length(); + if (distance < ent.Comp.MinDistance) + { + critical = false; + break; + } + } + + if (!critical) + return; + + if (!_timing.IsFirstTimePredicted) + return; + + _audio.PlayPredicted(ent.Comp.Sound, ent, args.User); + args.BonusDamage += ent.Comp.BonusDamage; + + //Visual effect! + foreach (var hit in args.HitEntities) + { + PredictedSpawnAtPosition(ent.Comp.VFX, Transform(hit).Coordinates); + } + } + + private void OnMeleeHit(Entity ent, ref MeleeHitEvent args) + { + if (!args.IsHit) + return; + if (args.HitEntities.Count == 0) + return; + _damageable.TryChangeDamage(ent, ent.Comp.DamageToSelf); + } +} diff --git a/Resources/Audio/_CP14/Effects/attributions.yml b/Resources/Audio/_CP14/Effects/attributions.yml index 22dd5ef25e..8c9d42dfed 100644 --- a/Resources/Audio/_CP14/Effects/attributions.yml +++ b/Resources/Audio/_CP14/Effects/attributions.yml @@ -132,3 +132,13 @@ license: "CC0-1.0" copyright: 'Created by qubodup on Freesound.org' source: "https://freesound.org/people/qubodup/sounds/814055/" + +- files: ["critical.ogg"] + license: "CC-BY-3.0" + copyright: 'Created by CpawsMusic on Freesound.org' + source: "https://freesound.org/people/CpawsMusic/sounds/437113/" + +- files: ["critical_sword.ogg"] + license: "CC-BY-3.0" + copyright: 'Created by Merrick079 on Freesound.org' + source: "https://freesound.org/people/Merrick079/sounds/568170/" diff --git a/Resources/Audio/_CP14/Effects/critical.ogg b/Resources/Audio/_CP14/Effects/critical.ogg new file mode 100644 index 0000000000..f3864d09f3 Binary files /dev/null and b/Resources/Audio/_CP14/Effects/critical.ogg differ diff --git a/Resources/Audio/_CP14/Effects/critical_sword.ogg b/Resources/Audio/_CP14/Effects/critical_sword.ogg new file mode 100644 index 0000000000..c85b4f1502 Binary files /dev/null and b/Resources/Audio/_CP14/Effects/critical_sword.ogg differ diff --git a/Resources/Locale/en-US/_CP14/trading/factions.ftl b/Resources/Locale/en-US/_CP14/trading/factions.ftl index f2098794a9..2082ec92d6 100644 --- a/Resources/Locale/en-US/_CP14/trading/factions.ftl +++ b/Resources/Locale/en-US/_CP14/trading/factions.ftl @@ -9,4 +9,5 @@ cp14-trade-faction-butchers = Master Butchers Union cp14-trade-faction-dairy = Golden Udder Dairy cp14-trade-faction-tailors = Silk & Needle Tailors Guild cp14-trade-faction-guard = Imperial Guard -cp14-trade-faction-vampire-market = Vampire's lair \ No newline at end of file +cp14-trade-faction-vampire-market = Vampire's lair +cp14-trade-faction-helmir-child = Helmir's childs \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl index ea25bed796..0e457ffd64 100644 --- a/Resources/Locale/ru-RU/_CP14/trading/factions.ftl +++ b/Resources/Locale/ru-RU/_CP14/trading/factions.ftl @@ -9,4 +9,5 @@ cp14-trade-faction-butchers = Союз мастеровых мясников cp14-trade-faction-dairy = Молочная ферма 'Златовымя' cp14-trade-faction-tailors = Гильдия портных 'Шелк и игла' cp14-trade-faction-guard = Имперская стража -cp14-trade-faction-vampire-market = Вампирское логово \ No newline at end of file +cp14-trade-faction-vampire-market = Вампирское логово +cp14-trade-faction-helmir-child = Хельмировы потомки \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml index 6e51650cb6..9a9a85c800 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/closets.yml @@ -98,7 +98,6 @@ - id: CP14StampDenied - id: CP14StampApproved - id: CP14PaperFolderBlue - - id: CP14ArmorIronChainmailPresets - type: entity parent: CP14WoodenCloset @@ -113,7 +112,6 @@ amount: 2 - id: CP14FryingPan - id: CP14CookingPot - - id: CP14ModularIronDagger - id: CP14SackFarmingSeed - id: CP14PlateWooden amount: 2 diff --git a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml index 9c6dadf503..83c4f784b0 100644 --- a/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_CP14/Catalog/Fills/crates.yml @@ -51,13 +51,8 @@ - id: CP14Scissors - id: CP14Torch - id: CP14Lighter - - id: CP14ModularIronShovel - id: CP14KeyFile - - id: CP14ModularWoodMop - id: CP14LockCopper - - id: CP14ModularCopperPickaxe - - id: CP14ModularIronSickle - - id: CP14ModularIronPickaxe weight: 0.3 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/keen_eye.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/keen_eye.yml new file mode 100644 index 0000000000..929fc1f78d --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/keen_eye.yml @@ -0,0 +1,15 @@ +- type: entity + id: CP14ActionToggleKeenEye + name: Keen Eye + parent: BaseMentalAction + description: You gaze into the distance, which allows you to see things that are farther away. + components: + - type: Action + useDelay: 5 # Spamming prevention + icon: + sprite: _CP14/Actions/Spells/physical.rsi + state: keen_eye + checkCanInteract: false + itemIconStyle: BigAction + - type: InstantAction + event: !type:CP14EyeOffsetToggleActionEvent \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/kick.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/kick.yml index c2276047ed..defb1e164b 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/kick.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/kick.yml @@ -13,12 +13,10 @@ stamina: 40 - type: CP14MagicEffect effects: - - !type:CP14SpellApplyEntityEffect - effects: - - !type:Paralyze - paralyzeTime: 1 + - !type:CP14SpellKnockdown - !type:CP14SpellThrowFromUser - throwPower: 9 + distance: 1.5 + throwPower: 5 - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14DustEffectKickSound diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml index ac2d47509f..21eb2a7e47 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml @@ -33,54 +33,32 @@ castDelay: 0.5 breakOnMove: false +- type: entity + parent: CP14BaseSpellScrollWater + id: CP14SpellScrollIceArrow + name: ice arrow spell scroll + components: + - type: CP14SpellStorage + spells: + - CP14ActionSpellIceArrow + - type: entity id: CP14IceArrow - parent: BaseItem + parent: CP14ArrowBase name: ice arrow description: A sharp ice arrow created with magic. It melts and will soon disappear, but you can shoot it once with your bow. - categories: [ ForkFiltered ] components: - type: Sprite sprite: _CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi - state: icon - - type: Item - storedRotation: 0 - - type: Fixtures - fixtures: - fix1: - shape: !type:PhysShapeCircle - radius: 0.2 - density: 5 - mask: - - ItemMask - restitution: 0.3 - friction: 0.2 - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.1,-0.1,0.1,0.1" - hard: false - mask: - - Impassable - - BulletImpassable - - type: EmbeddableProjectile - sound: /Audio/Weapons/star_hit.ogg - embedOnThrow: false - - type: ThrowingAngle - angle: 0 - - type: Ammo - muzzleFlash: null - - type: Tag - tags: - - CP14Arrow + layers: + - state: icon + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] - type: Projectile - deleteOnCollide: false - onlyCollideWhenShot: true damage: types: Piercing: 15 Cold: 5 - - type: Damageable - type: Destructible thresholds: - trigger: @@ -93,18 +71,4 @@ - !type:DoActsBehavior acts: ["Destruction"] - type: TimedDespawn - lifetime: 240 - - type: DamageOnLand - damage: - types: - Blunt: 10 - -- type: entity - parent: CP14BaseSpellScrollWater - id: CP14SpellScrollIceArrow - name: ice arrow spell scroll - components: - - type: CP14SpellStorage - spells: - - CP14ActionSpellIceArrow - + lifetime: 240 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml index 111f15dc53..56ff342c85 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml @@ -16,7 +16,7 @@ - CP14ImpactEffectWaterCreation - !type:CP14SpellSpawnInHandEntity spawns: - - CP14IceDagger + - CP14WeaponDaggerIce - type: CP14ActionSpeaking startSpeech: "Un pittore sulla..." endSpeech: "soglia della mano" @@ -35,92 +35,25 @@ - type: entity name: ice dagger - parent: BaseItem - id: CP14IceDagger + parent: CP14BaseWeaponDagger + id: CP14WeaponDaggerIce description: A sharp ice dagger, not very durable but can temporarily replace real weapons. - categories: [ ForkFiltered ] components: - - type: Sharp - type: Sprite - sprite: _CP14/Objects/Weapons/Melee/ice_dagger.rsi + sprite: _CP14/Objects/Weapons/Melee/Dagger/ice.rsi state: icon - type: MeleeWeapon - resetOnHandSelected: false #Fast swap - range: 1.0 # 1.5 standart - cPAnimationOffset: -0.75 #-1 standart - attackRate: 1.5 # 1 standart - angle: 45 - wideAnimationRotation: 135 - wideAnimation: CP14WeaponArcSlash damage: types: - Slash: 2 - Piercing: 5 - Cold: 3 - soundHit: - path: /Audio/Weapons/bladeslice.ogg - cPAnimationLength: 0.25 - - type: Clothing - equipDelay: 0.25 - unequipDelay: 0.25 - quickEquip: false - breakOnMove: false - slots: - - belt - - type: Item - shape: - - 0,0,0,1 - storedOffset: 0, 5 - storedRotation: 45 - size: Normal - - type: ExaminableDamage - messages: CP14WeaponMessages - - type: DisarmMalus - - type: ThrowingAngle - angle: 135 - - type: EmbeddableProjectile - offset: -0.15,-0.15 - removalTime: 0.5 - - type: LandAtCursor + Slash: 3 + Piercing: 3 + Cold: 4 - type: DamageOtherOnHit damage: types: - Piercing: 10 - Cold: 5 - - type: DamageOnLand - damage: - types: - Blunt: 5 - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - vertices: - - -0.40,-0.30 - - -0.30,-0.40 - - 0.40,0.30 - - 0.30,0.40 - density: 10 - mask: - - ItemMask - restitution: 0.3 - friction: 0.2 - - type: CP14SharpeningStone - - type: UseDelay - - type: Tool - qualities: - - Slicing - useSound: - path: /Audio/Items/Culinary/chop.ogg - - type: Utensil - types: - - Knife - - type: CP14WallpaperRemover - - type: CP14MeleeSelfDamage - damageToSelf: - types: - Blunt: 1 # 20 hits - - type: Damageable + Slash: 3 + Piercing: 3 + Cold: 4 - type: Destructible thresholds: - trigger: @@ -134,7 +67,6 @@ acts: ["Destruction"] - type: TimedDespawn lifetime: 60 - - type: Execution - type: entity parent: CP14BaseSpellScrollWater diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml index 3db1e03fa2..402b9b751d 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Belt/quiver.yml @@ -39,55 +39,11 @@ - type: entity parent: CP14ClothingBeltQuiver - id: CP14ClothingBeltQuiverIronArrow + id: CP14ClothingBeltQuiverArrows categories: [ ForkFiltered ] - suffix: Full. Iron. Arrow + suffix: Filled with arrows components: - type: StorageFill contents: - - id: CP14ModularIronArrow - amount: 16 - -- type: entity - parent: CP14ClothingBeltQuiver - id: CP14ClothingBeltQuiverCopperArrow - categories: [ ForkFiltered ] - suffix: Full. Copper. Arrow - components: - - type: StorageFill - contents: - - id: CP14ModularCopperArrow - amount: 16 - -- type: entity - parent: CP14ClothingBeltQuiver - id: CP14ClothingBeltQuiverMithrilArrow - categories: [ ForkFiltered ] - suffix: Full. Mithril. Arrow - components: - - type: StorageFill - contents: - - id: CP14ModularMithrilArrow - amount: 16 - -- type: entity - parent: CP14ClothingBeltQuiver - id: CP14ClothingBeltQuiverCrossbolt - categories: [ ForkFiltered ] - suffix: Full. Iron. Crossbolt - components: - - type: StorageFill - contents: - - id: CP14CrossboltIron - amount: 32 - -- type: entity - parent: CP14ClothingBeltQuiver - id: CP14ClothingBeltQuiverBigCrossbolt - categories: [ ForkFiltered ] - suffix: Full. Iron. BigCrossbolt - components: - - type: StorageFill - contents: - - id: CP14BigCrossboltIron + - id: CP14Arrow amount: 16 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/chainmail.yml deleted file mode 100644 index 4072b76352..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/chainmail.yml +++ /dev/null @@ -1,82 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularAventailBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: Item - size: Small - storedRotation: 0 - shape: - - 0,0,0,0 - -- type: entity - parent: CP14ModularAventailBase - id: CP14ModularAventailIronChainmail - name: iron aventail chainmail - description: A aventail of chainmail to protect the neck from blows and piercing at vital points. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - AventailIronChainmail - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularAventailBase - id: CP14ModularAventailGoldChainmail - name: golden aventail chainmail - description: A aventail of chainmail to protect the neck from blows and piercing at vital points. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - AventailGoldChainmail - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularAventailBase - id: CP14ModularAventailCopperChainmail - name: copper aventail chainmail - description: A aventail of chainmail to protect the neck from blows and piercing at vital points. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - AventailCopperChainmail - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularAventailBase - id: CP14ModularAventailMithrilChainmail - name: mithril aventail chainmail - description: A aventail of chainmail to protect the neck from blows and piercing at vital points. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - AventailMithrilChainmail - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/plate.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/plate.yml deleted file mode 100644 index 72f7712b5f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/plate.yml +++ /dev/null @@ -1,70 +0,0 @@ -- type: entity - parent: CP14ModularAventailBase - id: CP14ModularAventailIronPlate - name: iron aventail plate - description: An iron sheet aventail to protect the neck from blows and piercing in vital places. Uncomfortable. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - AventailIronPlate - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularAventailBase - id: CP14ModularAventailGoldPlate - name: golden aventail plate - description: An golden sheet aventail to protect the neck from blows and piercing in vital places. Uncomfortable. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - AventailGoldPlate - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularAventailBase - id: CP14ModularAventailCopperPlate - name: copper aventail plate - description: An copper sheet aventail to protect the neck from blows and piercing in vital places. Uncomfortable. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - AventailCopperPlate - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularAventailBase - id: CP14ModularAventailMithrilPlate - name: mithril aventail plate - description: An mithril sheet aventail to protect the neck from blows and piercing in vital places. Uncomfortable. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - AventailMithrilPlate - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/capellina.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/capellina.yml deleted file mode 100644 index 68dc1111d6..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/capellina.yml +++ /dev/null @@ -1,143 +0,0 @@ -- type: entity - parent: CP14ClothingHeadBase - id: CP14ModularHeadBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1 - - type: CP14LabeledRenaming - - type: CP14ModularCraftStartPoint - startSlots: - - Visor - - Aventail - -- type: entity - parent: CP14ModularHeadBase - id: CP14HelmetIronCapellina - name: iron capellina - description: Protects against large object strikes to the head. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi - - type: Clothing - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.93 - Slash: 0.94 - Piercing: 0.97 - - type: ClothingSpeedModifier - walkModifier: 0.97 - sprintModifier: 0.97 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14HelmetIronCapellina - - type: CP14MagicManacostModify - globalModifier: 1.05 - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularHeadBase - id: CP14HelmetGoldCapellina - name: golden capellina - description: Protects against large object strikes to the head. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi - layers: - - state: icon - color: "#ffe269" - - type: Clothing - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi - clothingVisuals: - head: - - state: equipped-HELMET - color: "#ffe269" - - type: Armor - modifiers: - coefficients: - Blunt: 0.96 - Slash: 0.98 - Piercing: 0.99 - - type: ClothingSpeedModifier - walkModifier: 0.96 - sprintModifier: 0.96 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14HelmetGoldCapellina - - type: CP14MagicManacostModify - globalModifier: 1.01 - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularHeadBase - id: CP14HelmetCopperCapellina - name: copper capellina - description: Protects against large object strikes to the head. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi - layers: - - state: icon - color: "#e28f08" - - type: Clothing - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi - clothingVisuals: - head: - - state: equipped-HELMET - color: "#e28f08" - - type: Armor - modifiers: - coefficients: - Blunt: 0.95 - Slash: 0.96 - Piercing: 0.98 - - type: ClothingSpeedModifier - walkModifier: 0.98 - sprintModifier: 0.98 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14HelmetCopperCapellina - - type: CP14MagicManacostModify - globalModifier: 1.03 - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularHeadBase - id: CP14HelmetMithrilCapellina - name: mithril capellina - description: Protects against large object strikes to the head. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi - layers: - - state: icon - color: "#38f0b3" - - type: Clothing - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/capellina.rsi - clothingVisuals: - head: - - state: equipped-HELMET - color: "#38f0b3" - - type: Armor - modifiers: - coefficients: - Blunt: 0.91 - Slash: 0.92 - Piercing: 0.95 - - type: ClothingSpeedModifier - walkModifier: 0.98 - sprintModifier: 0.98 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14HelmetMithrilCapellina - - type: CP14MagicManacostModify - globalModifier: 0.98 - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/palm_helmet.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/palm_helmet.yml deleted file mode 100644 index f760f819ef..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/palm_helmet.yml +++ /dev/null @@ -1,130 +0,0 @@ -- type: entity - parent: CP14ModularHeadBase - id: CP14HelmetIronPalmHelmet - name: iron palm helmet - description: A tight fitting helmet that protects your head from impact. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi - - type: Clothing - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.92 - Slash: 0.97 - Piercing: 0.95 - Heat: 0.98 - - type: ClothingSpeedModifier - walkModifier: 0.97 - sprintModifier: 0.97 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14HelmetIronCapellina - - type: CP14MagicManacostModify - globalModifier: 1.05 - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularHeadBase - id: CP14HelmetGoldPalmHelmet - name: golden palm helmet - description: A tight fitting helmet that protects your head from impact. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi - layers: - - state: icon - color: "#ffe269" - - type: Clothing - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi - clothingVisuals: - head: - - state: equipped-HELMET - color: "#ffe269" - - type: Armor - modifiers: - coefficients: - Blunt: 0.95 - Slash: 0.96 - Piercing: 0.96 - - type: ClothingSpeedModifier - walkModifier: 0.96 - sprintModifier: 0.96 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14HelmetGoldPalmHelmet - - type: CP14MagicManacostModify - globalModifier: 1.01 - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularHeadBase - id: CP14HelmetCopperPalmHelmet - name: copper palm helmet - description: A tight fitting helmet that protects your head from impact. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi - layers: - - state: icon - color: "#e28f08" - - type: Clothing - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi - clothingVisuals: - head: - - state: equipped-HELMET - color: "#e28f08" - - type: Armor - modifiers: - coefficients: - Blunt: 0.94 - Slash: 0.98 - Piercing: 0.96 - - type: ClothingSpeedModifier - walkModifier: 0.98 - sprintModifier: 0.98 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14HelmetCopperPalmHelmet - - type: CP14MagicManacostModify - globalModifier: 1.03 - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularHeadBase - id: CP14HelmetMithrilPalmHelmet - name: mithril palm helmet - description: A tight fitting helmet that protects your head from impact. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi - layers: - - state: icon - color: "#38f0b3" - - type: Clothing - sprite: _CP14/Clothing/Head/ModularArmor/Helmet/palm_helmet.rsi - clothingVisuals: - head: - - state: equipped-HELMET - color: "#38f0b3" - - type: Armor - modifiers: - coefficients: - Blunt: 0.90 - Slash: 0.95 - Piercing: 0.93 - Heat: 0.98 - - type: ClothingSpeedModifier - walkModifier: 0.98 - sprintModifier: 0.98 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14HelmetMithrilPalmHelmet - - type: CP14MagicManacostModify - globalModifier: 0.98 - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/chainmail.yml deleted file mode 100644 index b3794ccf6e..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/chainmail.yml +++ /dev/null @@ -1,82 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularVisorBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: Item - size: Small - storedRotation: 0 - shape: - - 0,0,0,0 - -- type: entity - parent: CP14ModularVisorBase - id: CP14ModularVisorIronChainmail - name: iron visor chainmail - description: A chainmail visor that protects the face from nasty damage and leaves the wearer looking all that beautiful. And the skin breathes. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - VisorIronChainmail - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularVisorBase - id: CP14ModularVisorGoldChainmail - name: golden visor chainmail - description: A chainmail visor that protects the face from nasty damage and leaves the wearer looking all that beautiful. And the skin breathes. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - VisorGoldChainmail - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularVisorBase - id: CP14ModularVisorCopperChainmail - name: copper visor chainmail - description: A chainmail visor that protects the face from nasty damage and leaves the wearer looking all that beautiful. And the skin breathes. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - VisorCopperChainmail - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularVisorBase - id: CP14ModularVisorMithrilChainmail - name: mithril visor chainmail - description: A chainmail visor that protects the face from nasty damage and leaves the wearer looking all that beautiful. And the skin breathes. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - VisorMithrilChainmail - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/plate.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/plate.yml deleted file mode 100644 index d9a123c378..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/plate.yml +++ /dev/null @@ -1,70 +0,0 @@ -- type: entity - parent: CP14ModularVisorBase - id: CP14ModularVisorIronPlate - name: iron visor plate - description: A iron plate visor that protects the face from nasty damage and leaves the wearer looking all that good-looking. Not as comfortable. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - VisorIronPlate - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularVisorBase - id: CP14ModularVisorGoldPlate - name: golden visor plate - description: A golden plate visor that protects the face from nasty damage and leaves the wearer looking all that good-looking. Very uncomfortable. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - VisorGoldPlate - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularVisorBase - id: CP14ModularVisorCopperPlate - name: copper visor plate - description: A copper plate visor that protects the face from nasty damage and leaves the wearer looking all that good-looking. Not as comfortable. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - VisorCopperPlate - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularVisorBase - id: CP14ModularVisorMithrilPlate - name: mithril visor plate - description: A mithril plate visor that protects the face from nasty damage and leaves the wearer looking all that good-looking. - components: - - type: Sprite - sprite: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - VisorMithrilPlate - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/ModularPresets/armour.yml b/Resources/Prototypes/_CP14/Entities/Clothing/ModularPresets/armour.yml deleted file mode 100644 index ac4b3b0adf..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/ModularPresets/armour.yml +++ /dev/null @@ -1,119 +0,0 @@ -- type: entity - id: CP14ArmorIronCuirassPresets - parent: CP14ArmorIronCuirass - name: full iron cuirass - description: A full iron armour to protect its wearer from other sharp iron. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - state: icon - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularCuissesIronPlate - - CP14ModularGreaveIronPlate - -- type: entity - id: CP14ArmorGoldCuirassPresets - parent: CP14ArmorGoldCuirass - name: full golden cuirass - description: A full armour of purest gold, it is as expensive as it is uncomfortable, it is hard to imagine who would wear it and why. - components: - - type: Sprite - layers: - - state: icon - color: "#ffaf47" - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - state: icon - color: "#ffaf47" - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - state: icon - color: "#ffaf47" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularCuissesGoldPlate - - CP14ModularGreaveGoldPlate - -- type: entity - id: CP14ArmorCopperCuirassPresets - parent: CP14ArmorCopperCuirass - name: full copper cuirass - description: Full copper armour, cheap and surly, some even find it more comfortable than iron armour. - components: - - type: Sprite - layers: - - state: icon - color: "#bd712f" - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - state: icon - color: "#bd712f" - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - state: icon - color: "#bd712f" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularCuissesCopperPlate - - CP14ModularGreaveCopperPlate - -- type: entity - id: CP14ArmorMithrilCuirassPresets - parent: CP14ArmorMithrilCuirass - name: full mithril cuirass - description: Every adventurer's dream, mithril armour is strong, sturdy and almost unrestrictive to movement. If there's an ideal, this is it. - components: - - type: Sprite - layers: - - state: icon - color: "#45d2a4" - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - state: icon - color: "#45d2a4" - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - state: icon - color: "#45d2a4" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularCuissesMithrilPlate - - CP14ModularGreaveMithrilPlate - -- type: entity - id: CP14ArmorIronChainmailPresets - parent: CP14ArmorIronChainmail - name: full iron chainmail - description: Full iron ringed armour, lightweight and has decent protection. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - state: icon - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularCuissesIronChainmail - - CP14ModularGreaveIronChainmail - -- type: entity - id: CP14ArmorMithrilChainmailPresets - parent: CP14ArmorMithrilChainmail - name: full mithril chainmail - description: A full mithril armour that may have been slowly and painstakingly assembled by dwarven smiths. A most valuable piece of work. - components: - - type: Sprite - layers: - - state: icon - color: "#45d2a4" - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - state: icon - color: "#45d2a4" - - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - state: icon - color: "#45d2a4" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularCuissesMithrilChainmail - - CP14ModularGreaveMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml deleted file mode 100644 index 64ef3d3f1c..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml +++ /dev/null @@ -1,152 +0,0 @@ -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorIronChainmail - name: iron chainmail - description: Ringed armour made of many small metal rings. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.96 - Slash: 0.85 - Piercing: 0.96 - - type: ClothingSpeedModifier - walkModifier: 0.99 - sprintModifier: 0.99 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorIronChainmail - - type: CP14MagicManacostModify - globalModifier: 1.15 - - type: PhysicalComposition - materialComposition: - CP14Iron: 40 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorGoldChainmail - name: golden chainmail - description: Ringed armour made of many small metal rings. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#ffe269" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#ffe269" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#ffe269" - right: - - state: inhand-right - color: "#ffe269" - - type: Armor - modifiers: - coefficients: - Blunt: 0.98 - Slash: 0.92 - Piercing: 0.99 - - type: ClothingSpeedModifier - walkModifier: 0.98 - sprintModifier: 0.98 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorGoldChainmail - - type: CP14MagicManacostModify - globalModifier: 1.05 - - type: PhysicalComposition - materialComposition: - CP14Gold: 40 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorCopperChainmail - name: copper chainmail - description: Ringed armour made of many small metal rings. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#e28f08" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#e28f08" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#e28f08" - right: - - state: inhand-right - color: "#e28f08" - - type: Armor - modifiers: - coefficients: - Blunt: 0.98 - Slash: 0.90 - Piercing: 0.99 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorCopperChainmail - - type: CP14MagicManacostModify - globalModifier: 1.1 - - type: PhysicalComposition - materialComposition: - CP14Copper: 40 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorMithrilChainmail - name: mithril chainmail - description: Ringed armour made of many small metal rings. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#38f0b3" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#38f0b3" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Chainmail/chainmail.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#38f0b3" - right: - - state: inhand-right - color: "#38f0b3" - - type: Armor - modifiers: - coefficients: - Blunt: 0.90 - Slash: 0.80 - Piercing: 0.95 - - type: ClothingSpeedModifier - walkModifier: 0.99 - sprintModifier: 0.99 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorMithrilChainmail - - type: CP14MagicManacostModify - globalModifier: 0.96 - - type: PhysicalComposition - materialComposition: - CP14Mithril: 40 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml deleted file mode 100644 index f55f1b2b20..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml +++ /dev/null @@ -1,174 +0,0 @@ -- type: entity - parent: CP14ClothingOuterClothingBase - id: CP14ModularArmorBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1 - - type: CP14LabeledRenaming - - type: CP14ModularCraftStartPoint - startSlots: - - Cuisses - - Greave - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorIronCuirass - name: iron cuirass - description: Light armour plate on the chest, little protection, little heaviness. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.87 - Slash: 0.95 - Piercing: 0.87 - Heat: 0.92 - - type: ClothingSpeedModifier - walkModifier: 0.95 - sprintModifier: 0.95 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorIronCuirass - - type: CP14MagicManacostModify - globalModifier: 1.2 - - type: PhysicalComposition - materialComposition: - CP14Iron: 50 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorGoldCuirass - name: golden cuirass - description: Light armour plate on the chest, little protection, little heaviness. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#ffe269" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#ffe269" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#ffe269" - right: - - state: inhand-right - color: "#ffe269" - - type: Armor - modifiers: - coefficients: - Blunt: 0.94 - Slash: 0.98 - Piercing: 0.90 - Caustic: 0.90 - - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorGoldCuirass - - type: CP14MagicManacostModify - globalModifier: 1.1 - - type: PhysicalComposition - materialComposition: - CP14Gold: 50 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorCopperCuirass - name: copper cuirass - description: Light armour plate on the chest, little protection, little heaviness. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#e28f08" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#e28f08" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#e28f08" - right: - - state: inhand-right - color: "#e28f08" - - type: Armor - modifiers: - coefficients: - Blunt: 0.92 - Slash: 0.99 - Piercing: 0.92 - Heat: 0.95 - - type: ClothingSpeedModifier - walkModifier: 0.98 - sprintModifier: 0.98 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorCopperCuirass - - type: CP14MagicManacostModify - globalModifier: 1.15 - - type: PhysicalComposition - materialComposition: - CP14Copper: 50 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorMithrilCuirass - name: mithril cuirass - description: Light armour plate on the chest, little protection, little heaviness. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#38f0b3" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#38f0b3" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#38f0b3" - right: - - state: inhand-right - color: "#38f0b3" - - type: Armor - modifiers: - coefficients: - Blunt: 0.82 - Slash: 0.92 - Piercing: 0.82 - Heat: 0.84 - - type: ClothingSpeedModifier - walkModifier: 0.98 - sprintModifier: 0.98 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorMithrilCuirass - - type: CP14MagicManacostModify - globalModifier: 0.95 - - type: PhysicalComposition - materialComposition: - CP14Mithril: 50 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml deleted file mode 100644 index b9ceef42f5..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml +++ /dev/null @@ -1,159 +0,0 @@ -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorIronInfantryCuirass - name: iron infantry cuirass - description: The light infantry cuirass, unlike the original, also protects from the back. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.84 - Slash: 0.94 - Piercing: 0.84 - Heat: 0.88 - - type: ClothingSpeedModifier - walkModifier: 0.93 - sprintModifier: 0.93 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorIronInfantryCuirass - - type: CP14MagicManacostModify - globalModifier: 1.24 - - type: PhysicalComposition - materialComposition: - CP14Iron: 60 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorGoldInfantryCuirass - name: golden infantry cuirass - description: The light infantry cuirass, unlike the original, also protects from the back. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - layers: - - state: icon - color: "#ffe269" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#ffe269" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#ffe269" - right: - - state: inhand-right - color: "#ffe269" - - type: Armor - modifiers: - coefficients: - Blunt: 0.91 - Slash: 0.98 - Piercing: 0.88 - Caustic: 0.86 - - type: ClothingSpeedModifier - walkModifier: 0.88 - sprintModifier: 0.88 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorGoldInfantryCuirass - - type: CP14MagicManacostModify - globalModifier: 1.14 - - type: PhysicalComposition - materialComposition: - CP14Gold: 60 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorCopperInfantryCuirass - name: copper infantry cuirass - description: The light infantry cuirass, unlike the original, also protects from the back. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - layers: - - state: icon - color: "#e28f08" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#e28f08" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#e28f08" - right: - - state: inhand-right - color: "#e28f08" - - type: Armor - modifiers: - coefficients: - Blunt: 0.90 - Slash: 0.98 - Piercing: 0.90 - Heat: 0.92 - - type: ClothingSpeedModifier - walkModifier: 0.96 - sprintModifier: 0.96 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorCopperInfantryCuirass - - type: CP14MagicManacostModify - globalModifier: 1.18 - - type: PhysicalComposition - materialComposition: - CP14Copper: 60 - -- type: entity - parent: CP14ModularArmorBase - id: CP14ArmorMithrilInfantryCuirass - name: mithril infantry cuirass - description: The light infantry cuirass, unlike the original, also protects from the back. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - layers: - - state: icon - color: "#38f0b3" - - type: Clothing - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - clothingVisuals: - outerClothing: - - state: equipped-OUTERCLOTHING - color: "#38f0b3" - - type: Item - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Breastplate/Cuirass/infantry_cuirass.rsi - inhandVisuals: - left: - - state: inhand-left - color: "#38f0b3" - right: - - state: inhand-right - color: "#38f0b3" - - type: Armor - modifiers: - coefficients: - Blunt: 0.80 - Slash: 0.89 - Piercing: 0.80 - Heat: 0.81 - - type: ClothingSpeedModifier - walkModifier: 0.96 - sprintModifier: 0.96 - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ArmorMithrilInfantryCuirass - - type: CP14MagicManacostModify - globalModifier: 0.92 - - type: PhysicalComposition - materialComposition: - CP14Mithril: 60 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml deleted file mode 100644 index 5a9dbb8821..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml +++ /dev/null @@ -1,70 +0,0 @@ -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesIronChainmail - name: iron chainmail cuisses - description: Ringed armour for the upper legs, the weight is virtually imperceptible. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - CuissesIronChainmail - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesGoldChainmail - name: golden chainmail cuisses - description: Ringed armour for the upper legs, the weight is virtually imperceptible. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - CuissesGoldChainmail - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesCopperChainmail - name: copper chainmail cuisses - description: Ringed armour for the upper legs, the weight is virtually imperceptible. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - CuissesCopperChainmail - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesMithrilChainmail - name: mithril chainmail cuisses - description: Ringed armour for the upper legs, the weight is virtually imperceptible. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - CuissesMithrilChainmail - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml deleted file mode 100644 index 6e33f506bd..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml +++ /dev/null @@ -1,85 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularCuissesBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: Item - size: Small - storedRotation: 0 - shape: - - 0,0,0,0 - - type: CP14ModularCraftStartPoint - startSlots: - - Greave - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesIronPlate - name: iron cuisses - description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - CuissesIronPlate - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesGoldPlate - name: golden cuisses - description: Protects the top of the legs, protection is questionable, weight is decent. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - CuissesGoldPlate - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesCopperPlate - name: copper cuisses - description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - CuissesCopperPlate - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularCuissesBase - id: CP14ModularCuissesMithrilPlate - name: mithril cuisses - description: Protects the top of your legs, it's harder to move in this one, but the extra protection might be worth it. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - CuissesMithrilPlate - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml deleted file mode 100644 index bace36defa..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml +++ /dev/null @@ -1,70 +0,0 @@ -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveIronChainmail - name: iron chainmail greave - description: Ringed greaves, comfortable and even protects a bit. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - GreaveIronChainmail - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveGoldChainmail - name: golden chainmail greave - description: Ringed greaves, comfortable and even protects a bit. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - GreaveGoldChainmail - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveCopperChainmail - name: copper chainmail greave - description: Ringed greaves, comfortable and even protects a bit. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - GreaveCopperChainmail - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveMithrilChainmail - name: mithril chainmail greave - description: Ringed greaves, comfortable and even protects a bit. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - GreaveMithrilChainmail - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml deleted file mode 100644 index 45eb969753..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml +++ /dev/null @@ -1,82 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularGreaveBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: Item - size: Small - storedRotation: 0 - shape: - - 0,0,0,0 - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveIronPlate - name: iron greave - description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - GreaveIronPlate - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveGoldPlate - name: golden greave - description: Protects the lower part of the legs, also makes it difficult to move, though the use of gold as armour seems questionable. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - GreaveGoldPlate - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveCopperPlate - name: copper greave - description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - GreaveCopperPlate - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularGreaveBase - id: CP14ModularGreaveMithrilPlate - name: mithril greave - description: Protects the lower part of the legs, also makes it difficult to move, but sometimes extra protection is more important than speed. - components: - - type: Sprite - sprite: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - GreaveMithrilPlate - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml index 51c3e0c9c5..c5761bac76 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/armor.yml @@ -17,9 +17,6 @@ - type: ClothingSpeedModifier walkModifier: 0.98 sprintModifier: 0.98 - - type: Construction - graph: CP14BoneArmor - node: cp14bonearmor - type: PhysicalComposition materialComposition: CP14Bone: 120 diff --git a/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml b/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml index 39dd9bc66a..969f13fe2f 100644 --- a/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml +++ b/Resources/Prototypes/_CP14/Entities/Effects/visual_effect.yml @@ -1,3 +1,26 @@ +- type: entity + id: CP14MeleeCritEffect + categories: [ HideSpawnMenu ] + save: false + components: + - type: Sprite + sprite: _CP14/Effects/sparks.rsi + drawdepth: Effects + noRot: true + layers: + - state: 1 + map: [ "random" ] + - type: RandomSprite + available: + - random: + 1: "" + 2: "" + - type: TimedDespawn + lifetime: 1.5 + - type: Tag + tags: + - HideContextMenu + - type: entity id: CP14DirtEffect categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml index 2bdc9fdfeb..7363dad8f8 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml @@ -64,7 +64,6 @@ - id: CP14OreIron1 - id: CP14ScrapCopper - id: CP14ScrapIron - - id: CP14ModularInlayQuartzElectric - id: CP14CopperCoin1 weight: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml index df6fd48b79..0df0a2cf97 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml @@ -66,7 +66,6 @@ - id: CP14ScrapCopper - id: CP14ScrapIron - id: CP14FoodMeatLambCutletCooked - - id: CP14ModularInlayQuartzFire - id: CP14CopperCoin1 - id: CP14Bone1 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml index 0ee2469749..4e2e8643ec 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml @@ -80,7 +80,6 @@ - id: CP14ScrapIron - id: CP14Snowball - id: CP14CopperCoin1 - - id: CP14ModularInlayQuartzWater - type: entity id: CP14AreaEntityEffectSlimeFroze diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml index c8540f3526..a143319a29 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/watcher.yml @@ -104,9 +104,6 @@ spawned: - id: CP14FoodMeatMonster amount: 1 - - id: CP14ModularInlayQuartzWater - amount: 1 - prob: 0.1 - id: CP14ScrapLeather amount: 1 maxAmount: 3 @@ -139,9 +136,6 @@ spawned: - id: CP14FoodMeatMonster amount: 1 - - id: CP14ModularInlayQuartzFire - amount: 1 - prob: 0.1 - id: CP14ScrapLeather amount: 1 maxAmount: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml index e90093add3..3b84ae00cb 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml @@ -22,8 +22,8 @@ skillPoints: Memory: max: 0 - freeLearnedSkills: - - SwordMastery + #freeLearnedSkills: + #- SwordMastery - type: CP14SpellStorage grantAccessToSelf: true spells: @@ -42,8 +42,8 @@ skillPoints: Memory: max: 0 - freeLearnedSkills: - - SwordMastery + #freeLearnedSkills: + #- SwordMastery - type: CP14SpellStorage grantAccessToSelf: true spells: @@ -63,7 +63,7 @@ Memory: max: 0 freeLearnedSkills: - - SkimitarMastery + #- SkimitarMastery - AthleticT1 - AthleticT2 - CP14ActionSpellKick 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 3c333f2197..aa2e334fb0 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml @@ -22,8 +22,8 @@ skillPoints: Memory: max: 0 - freeLearnedSkills: - - SwordMastery + #freeLearnedSkills: + #- SwordMastery - type: CP14SpellStorage grantAccessToSelf: true spells: @@ -42,8 +42,8 @@ skillPoints: Memory: max: 0 - freeLearnedSkills: - - SwordMastery + #freeLearnedSkills: + #- SwordMastery - type: CP14SpellStorage grantAccessToSelf: true spells: @@ -63,7 +63,7 @@ Memory: max: 0 freeLearnedSkills: - - SkimitarMastery + #- SkimitarMastery - AthleticT1 - AthleticT2 - AthleticT3 @@ -91,7 +91,6 @@ max: 1 freeLearnedSkills: - HydrosophistryT1 - - SwordMastery learnedSkills: - CP14ActionSpellIceArrow @@ -123,7 +122,7 @@ Memory: max: 4 freeLearnedSkills: - - SwordMastery + #- SwordMastery - HydrosophistryT1 - HydrosophistryT2 - MetamagicT1 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml index 5923a0a7b7..b4500ae84c 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/carcat.yml @@ -146,6 +146,14 @@ 32: sprite: _CP14/Mobs/Species/Carcat/displacement.rsi state: gloves + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi + state: neck + 49: + sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi + state: neck - type: Hands leftHandDisplacement: sizeMaps: @@ -222,6 +230,14 @@ 32: sprite: _CP14/Mobs/Species/Carcat/displacement.rsi state: gloves + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi + state: neck + 49: + sprite: _CP14/Mobs/Species/Carcat/displacement48.rsi + state: neck - type: Hands leftHandDisplacement: sizeMaps: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml index cbd1d3c3fb..6c654c6794 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/dwarf.yml @@ -27,6 +27,14 @@ 32: sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi state: pants + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck - type: entity parent: CP14BaseSpeciesDummy @@ -48,4 +56,12 @@ 32: sprite: _CP14/Mobs/Species/Dwarf/displacement.rsi state: pants + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml index 7c9a1ddfe6..79d65b2666 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml @@ -66,6 +66,14 @@ 32: sprite: _CP14/Mobs/Species/Elf/displacement.rsi state: male_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck femaleDisplacements: outerClothing: sizeMaps: @@ -92,6 +100,14 @@ 32: sprite: _CP14/Mobs/Species/Elf/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck - type: entity parent: CP14BaseSpeciesDummy @@ -128,6 +144,14 @@ 32: sprite: _CP14/Mobs/Species/Elf/displacement.rsi state: male_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck femaleDisplacements: outerClothing: sizeMaps: @@ -154,4 +178,12 @@ 32: sprite: _CP14/Mobs/Species/Elf/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index 30f4e3f6e0..ecdcc9174b 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -183,6 +183,14 @@ 32: sprite: _CP14/Mobs/Species/Goblin/displacement.rsi state: shoes + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: neck + 48: + sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi + state: neck - type: entity parent: CP14BaseSpeciesDummy @@ -257,3 +265,11 @@ 32: sprite: _CP14/Mobs/Species/Goblin/displacement.rsi state: shoes + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Goblin/displacement.rsi + state: neck + 48: + sprite: _CP14/Mobs/Species/Goblin/displacement48.rsi + state: neck diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml index 2614923346..07f71a2d8a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/human.yml @@ -18,6 +18,15 @@ max: 5.5 # +0.5 memory point - type: Inventory templateId: CP14Human + displacements: + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck femaleDisplacements: outerClothing: sizeMaps: @@ -39,6 +48,14 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck - type: entity parent: CP14BaseSpeciesDummy @@ -49,6 +66,15 @@ species: CP14Human - type: Inventory templateId: CP14Human + displacements: + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck femaleDisplacements: cloak: sizeMaps: @@ -75,3 +101,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml index 65f358cb79..b4f91a1126 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml @@ -99,6 +99,14 @@ 32: sprite: _CP14/Mobs/Species/Elf/displacement.rsi state: male_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck femaleDisplacements: outerClothing: sizeMaps: @@ -125,6 +133,14 @@ 32: sprite: _CP14/Mobs/Species/Elf/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck - type: entity parent: CP14BaseSpeciesDummy @@ -210,6 +226,14 @@ 32: sprite: _CP14/Mobs/Species/Elf/displacement.rsi state: male_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck femaleDisplacements: outerClothing: sizeMaps: @@ -236,4 +260,12 @@ 32: sprite: _CP14/Mobs/Species/Elf/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml index a8a267720b..0cfcf13986 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml @@ -116,6 +116,15 @@ - type: ContainerContainer - type: Inventory templateId: CP14Human + displacements: + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck - type: TransferMindOnGib - type: GhostTakeoverAvailable - type: CP14DemiplaneBlockInteractions @@ -129,3 +138,12 @@ species: CP14Skeleton - type: Inventory templateId: CP14Human + displacements: + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml index 599c208bff..00d0e8fdef 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml @@ -41,6 +41,15 @@ - PyrokineticT2 - type: Inventory templateId: CP14Human + displacements: + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck femaleDisplacements: outerClothing: sizeMaps: @@ -67,6 +76,14 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck - type: entity @@ -78,6 +95,15 @@ species: CP14Tiefling - type: Inventory templateId: CP14Human + displacements: + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck femaleDisplacements: cloak: sizeMaps: @@ -104,3 +130,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: female_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: female_neck diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml index de86d980f0..45200a944a 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml @@ -151,6 +151,15 @@ - CP14Mosquito - type: Inventory templateId: CP14Partial + displacements: + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck femaleDisplacements: outerClothing: sizeMaps: @@ -172,6 +181,14 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck - type: entity parent: CP14BaseSpeciesDummy @@ -182,6 +199,15 @@ species: CP14Zombie - type: Inventory templateId: CP14Partial + displacements: + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck femaleDisplacements: cloak: sizeMaps: @@ -208,3 +234,11 @@ 32: sprite: _CP14/Mobs/Species/Human/displacement.rsi state: female_shirt + neck: + sizeMaps: + 32: + sprite: _CP14/Mobs/Species/Human/displacement.rsi + state: male_neck + 48: + sprite: _CP14/Mobs/Species/Human/displacement48.rsi + state: male_neck diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml index a06511fe7c..832ecb9e96 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml @@ -125,4 +125,15 @@ - type: Sprite state: guard - type: CP14TradingContract - faction: Guards \ No newline at end of file + faction: Guards + +- type: entity + parent: CP14TradeContractBase + id: CP14TradeContractHelmirChild + description: Trading contract with the "Helmirs childs". Allows you to purchase various weapons and ammunition + suffix: Helmirs childs + components: + - type: Sprite + state: helmir_child + - type: CP14TradingContract + faction: HelmirChild \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml b/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml index 030e9ee075..e20d4810be 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Fun/instruments.yml @@ -18,7 +18,7 @@ - WoodwindInstrument - type: PhysicalComposition materialComposition: - CP14WoodenPlanks: 40 + CP14WoodenPlanks: 10 - type: entity parent: BaseHandheldInstrument diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml deleted file mode 100644 index afa813bb7f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml +++ /dev/null @@ -1,95 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeAxeBase - categories: [ ForkFiltered ] - abstract: true - description: A axe blade without a hilt. A blacksmith can use it as a spare part to create a weapon. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeAxeBase - id: CP14ModularBladeIronAxe - name: iron axe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronAxe - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularBladeAxeBase - id: CP14ModularBladeGoldAxe - name: golden axe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldAxe - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularBladeAxeBase - id: CP14ModularBladeCopperAxe - name: copper axe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperAxe - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularBladeAxeBase - id: CP14ModularBladeMithrilAxe - name: mithril axe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilAxe - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 - -- type: entity - parent: CP14ModularBladeAxeBase - id: CP14ModularBladeWoodenAxe - name: wooden axe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Axe/wooden_axe.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeWoodenAxe - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml deleted file mode 100644 index dec194d306..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeDaggerBase - categories: [ ForkFiltered ] - abstract: true - description: A dagger blade without a hilt. A blacksmith can use it as a spare part to create a weapon. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeDaggerBase - id: CP14ModularBladeIronDagger - name: iron dagger blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronDagger - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularBladeDaggerBase - id: CP14ModularBladeGoldDagger - name: golden dagger blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldDagger - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularBladeDaggerBase - id: CP14ModularBladeCopperDagger - name: copper dagger blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperDagger - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularBladeDaggerBase - id: CP14ModularBladeMithrilDagger - name: mithril dagger blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilDagger - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hammer.yml deleted file mode 100644 index 1a2bc2cda9..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hammer.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeHammerBase - categories: [ ForkFiltered ] - abstract: true - description: A hammerhead without a hilt. A blacksmith can use it as a spare part to create a tool. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeHammerBase - id: CP14ModularBladeIronHammer - name: iron hammerhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronHammer - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularBladeHammerBase - id: CP14ModularBladeGoldHammer - name: golden hammerhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldHammer - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularBladeHammerBase - id: CP14ModularBladeCopperHammer - name: copper hammerhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperHammer - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularBladeHammerBase - id: CP14ModularBladeMithrilHammer - name: mithril hammerhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilHammer - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hoe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hoe.yml deleted file mode 100644 index 0760032c34..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hoe.yml +++ /dev/null @@ -1,80 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeHoeBase - categories: [ ForkFiltered ] - abstract: true - description: A hoe blade without a hilt. A blacksmith can use it as a spare part to create a tool. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeHoeBase - id: CP14ModularBladeIronHoe - name: iron hoe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronHoe - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularBladeHoeBase - id: CP14ModularBladeCopperHoe - name: copper hoe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperHoe - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularBladeHoeBase - id: CP14ModularBladeGoldHoe - name: golden hoe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldHoe - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularBladeSickleBase - id: CP14ModularBladeMithrilHoe - name: mithril hoe blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilHoe - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml deleted file mode 100644 index 7cb2be31d6..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeMaceBase - categories: [ ForkFiltered ] - abstract: true - description: A mace ball without a hilt. A blacksmith can use it as a spare part to create a weapon. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeMaceBase - id: CP14ModularBladeIronMace - name: iron mace ball - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronMace - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularBladeMaceBase - id: CP14ModularBladeGoldMace - name: golden mace ball - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldMace - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularBladeMaceBase - id: CP14ModularBladeCopperMace - name: copper mace ball - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperMace - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularBladeMaceBase - id: CP14ModularBladeMithrilMace - name: mithril mace ball - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilMace - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml deleted file mode 100644 index 2d9c7c844f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mop.yml +++ /dev/null @@ -1,46 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeMopBase - categories: [ ForkFiltered ] - abstract: true - description: A mop head without a hilt. Attach it to a hilt to make a mop. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeMopBase - id: CP14ModularBladeWoodMop - name: wooden mop head - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeWoodMop - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 10 - CP14Cloth: 10 - -- type: entity - parent: CP14ModularBladeMopBase - id: CP14ModularBladeLucensMop - name: lucens mop head - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeLucensMop - - type: PhysicalComposition - materialComposition: - CP14LucensWoodenPlanks: 10 - CP14Cloth: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml deleted file mode 100644 index aa3abbe164..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladePickaxeBase - categories: [ ForkFiltered ] - abstract: true - description: A pickaxe head without a hilt. A blacksmith can use it as a spare part to create a tool. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,1,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladePickaxeBase - id: CP14ModularBladeIronPickaxe - name: iron pickaxe head - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronPickaxe - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularBladePickaxeBase - id: CP14ModularBladeGoldPickaxe - name: golden pickaxe head - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldPickaxe - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularBladePickaxeBase - id: CP14ModularBladeCopperPickaxe - name: copper pickaxe head - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperPickaxe - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularBladePickaxeBase - id: CP14ModularBladeMithrilPickaxe - name: mithril pickaxe head - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilPickaxe - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml deleted file mode 100644 index 334315213e..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml +++ /dev/null @@ -1,95 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeRapierBase - categories: [ ForkFiltered ] - abstract: true - description: A rapier blade without a hilt. A blacksmith can use it as a spare part to create a weapon. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,1 - storedOffset: 0, 10 - -- type: entity - parent: CP14ModularBladeRapierBase - id: CP14ModularBladeIronRapier - name: iron rapier blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronRapier - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularBladeRapierBase - id: CP14ModularBladeGoldRapier - name: golden rapier blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldRapier - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularBladeRapierBase - id: CP14ModularBladeCopperRapier - name: copper rapier blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperRapier - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularBladeRapierBase - id: CP14ModularBladeMithrilRapier - name: mithril rapier blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilRapier - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 - -- type: entity - parent: CP14ModularBladeRapierBase - id: CP14ModularBladeWoodenRapier - name: wooden rapier blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeWoodenRapier - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml deleted file mode 100644 index a5912b61c7..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeShovelBase - categories: [ ForkFiltered ] - abstract: true - description: A shovel blade without a hilt. A blacksmith can use it as a spare part to create a tool. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeShovelBase - id: CP14ModularBladeIronShovel - name: iron shovel blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronShovel - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularBladeShovelBase - id: CP14ModularBladeGoldShovel - name: golden shovel blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldShovel - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularBladeShovelBase - id: CP14ModularBladeCopperShovel - name: copper shovel blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperShovel - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularBladeShovelBase - id: CP14ModularBladeMithrilShovel - name: mithril shovel blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilShovel - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml deleted file mode 100644 index d5871f9222..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeSickleBase - categories: [ ForkFiltered ] - abstract: true - description: A sickle blade without a hilt. A blacksmith can use it as a spare part to create a weapon. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeSickleBase - id: CP14ModularBladeIronSickle - name: iron sickle blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronSickle - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularBladeSickleBase - id: CP14ModularBladeCopperSickle - name: copper sickle blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperSickle - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularBladeSickleBase - id: CP14ModularBladeGoldSickle - name: golden sickle blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldSickle - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularBladeSickleBase - id: CP14ModularBladeMithrilSickle - name: mithril sickle blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilSickle - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/skimitar.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/skimitar.yml deleted file mode 100644 index 44c4028722..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/skimitar.yml +++ /dev/null @@ -1,78 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeSkimitarBase - categories: [ ForkFiltered ] - abstract: true - description: A skimitar blade without a hilt. A blacksmith can use it as a spare part to create a weapon. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,1 - storedOffset: 0, 10 - -- type: entity - parent: CP14ModularBladeSkimitarBase - id: CP14ModularBladeIronSkimitar - name: iron skimitar blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronSkimitar - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularBladeSkimitarBase - id: CP14ModularBladeGoldSkimitar - name: golden skimitar blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldSkimitar - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularBladeSkimitarBase - id: CP14ModularBladeCopperSkimitar - name: copper skimitar blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperSkimitar - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularBladeSkimitarBase - id: CP14ModularBladeMithrilSkimitar - name: mithril skimitar blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilSkimitar - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml deleted file mode 100644 index ef29c95238..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml +++ /dev/null @@ -1,99 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeSpearBase - categories: [ ForkFiltered ] - abstract: true - description: Hiltless spearhead. A blacksmith can use it as a spare part to create a weapon. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - -- type: entity - parent: CP14ModularBladeSpearBase - id: CP14ModularBladeIronSpear - categories: [ ForkFiltered ] - name: iron spearhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronSpear - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularBladeSpearBase - id: CP14ModularBladeGoldSpear - categories: [ ForkFiltered ] - name: gold spearhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldSpear - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularBladeSpearBase - id: CP14ModularBladeCopperSpear - categories: [ ForkFiltered ] - name: copper spearhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperSpear - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularBladeSpearBase - id: CP14ModularBladeMithrilSpear - categories: [ ForkFiltered ] - name: mithril spearhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilSpear - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 - -- type: entity - parent: CP14ModularBladeSpearBase - id: CP14ModularBladeWoodenSpear - name: wooden spearhead - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeWoodenSpear - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml deleted file mode 100644 index a544143536..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml +++ /dev/null @@ -1,112 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeSwordBase - categories: [ ForkFiltered ] - abstract: true - description: A sword blade without a hilt. A blacksmith can use it as a spare part to create a weapon. - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,1 - storedOffset: 0, 10 - -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeIronSword - name: iron sword blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronSword - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeGoldSword - name: golden sword blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - BladeGoldSword - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeCopperSword - name: copper sword blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - BladeCopperSword - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeMithrilSword - name: mithril sword blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - BladeMithrilSword - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 - -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeBoneSword - name: bone sword blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeBoneSword - - type: Construction - graph: CP14BoneSword - node: cp14bonesword - - type: PhysicalComposition - materialComposition: - CP14Bone: 50 - -- type: entity - parent: CP14ModularBladeSwordBase - id: CP14ModularBladeWoodenSword - name: wooden sword blade - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeWoodenSword - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/base.yml deleted file mode 100644 index 9779c7065b..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/base.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularGardeBase - categories: [ ForkFiltered ] - abstract: true - description: Garde? Garde! - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml deleted file mode 100644 index 0d0646873e..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeGuildmaster - categories: [ ForkFiltered ] - name: guildmaster's rapier garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - GardeGuildmaster - - type: PhysicalComposition - materialComposition: - CP14Gold: 15 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml deleted file mode 100644 index 02c8eea6b1..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml +++ /dev/null @@ -1,87 +0,0 @@ -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSharpIron - categories: [ ForkFiltered ] - name: sharp iron garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - GardeSharpIron - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSharpGold - categories: [ ForkFiltered ] - name: sharp gold garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - GardeSharpGold - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSharpCopper - categories: [ ForkFiltered ] - name: sharp copper garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - GardeSharpCopper - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSharpMithril - categories: [ ForkFiltered ] - name: sharp mithril garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - GardeSharpMithril - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 - -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSharpWooden - categories: [ ForkFiltered ] - name: sharp wooden garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/wooden_sharp.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - GardeSharpWooden - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml deleted file mode 100644 index 2cd1dc7a00..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml +++ /dev/null @@ -1,87 +0,0 @@ -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSturdyIron - categories: [ ForkFiltered ] - name: sturdy iron garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - GardeSturdyIron - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSturdyGold - categories: [ ForkFiltered ] - name: sturdy gold garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - GardeSturdyGold - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSturdyCopper - categories: [ ForkFiltered ] - name: sturdy copper garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - GardeSturdyCopper - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSturdyMithril - categories: [ ForkFiltered ] - name: sturdy mithril garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - GardeSturdyMithril - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 - -- type: entity - parent: CP14ModularGardeBase - id: CP14ModularGardeSturdyWooden - categories: [ ForkFiltered ] - name: sturdy wooden garde - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Garde/wooden_sturdy.rsi - layers: - - state: icon - - type: CP14ModularCraftPart - possibleParts: - - GardeSturdyWooden - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/base.yml deleted file mode 100644 index c2c998d3d5..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/base.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularInlayBase - categories: [ ForkFiltered ] - description: A small piece that can be inlaid into your weapon or tool. - abstract: true - components: - - type: Item - storedRotation: 45 - shape: - - 0,0,0,0 - storedOffset: 0, 5 - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/quartz.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/quartz.yml deleted file mode 100644 index a7bd0a2450..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/quartz.yml +++ /dev/null @@ -1,107 +0,0 @@ -- type: entity - parent: CP14ModularInlayBase - id: CP14ModularInlayQuartzBase - abstract: true - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi - - type: StaticPrice - price: 50 - -- type: entity - parent: CP14ModularInlayQuartzBase - id: CP14ModularInlayQuartzWater - name: water quartz inlay - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi - layers: - - state: item - color: "#5eabeb" - - state: frame - - type: CP14ModularCraftPart - possibleParts: - - InlayQuartzWater - -- type: entity - parent: CP14ModularInlayQuartzBase - id: CP14ModularInlayQuartzHealing - name: healing quartz inlay - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi - layers: - - state: item - color: "#79b330" - - state: frame - - type: CP14ModularCraftPart - possibleParts: - - InlayQuartzHealing - -- type: entity - parent: CP14ModularInlayQuartzBase - id: CP14ModularInlayQuartzFire - name: fire quartz inlay - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi - layers: - - state: item - color: "#ed731c" - - state: frame - - type: CP14ModularCraftPart - possibleParts: - - InlayQuartzFire - - type: StaticPrice - price: 70 - -- type: entity - parent: CP14ModularInlayQuartzBase - id: CP14ModularInlayQuartzLight - name: light quartz inlay - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi - layers: - - state: item - color: "#f1c7ff" - shader: unshaded - - state: frame - - type: CP14ModularCraftPart - possibleParts: - - InlayQuartzLight - - type: PointLight - radius: 2 - color: "#f1c7ff" - netsync: false - -- type: entity - parent: CP14ModularInlayQuartzBase - id: CP14ModularInlayQuartzElectric - name: electric quartz inlay - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi - layers: - - state: item - color: "#e6ff6b" - - state: frame - - type: CP14ModularCraftPart - possibleParts: - - InlayQuartzElectric - -- type: entity - parent: CP14ModularInlayQuartzBase - id: CP14ModularInlayQuartzDarkness - name: darkness quartz inlay - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi - layers: - - state: item - color: "#391c57" - - state: frame - - type: CP14ModularCraftPart - possibleParts: - - InlayQuartzDarkness - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml deleted file mode 100644 index 70ac00016b..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml +++ /dev/null @@ -1,77 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeTipBase - categories: [ ForkFiltered ] - abstract: true - description: The tip on an arrow shaft, a well-finished little piece of metal. - components: - - type: Item - size: Tiny - storedRotation: 0 - -- type: entity - parent: CP14ModularBladeTipBase - id: CP14ModularTipIronArrow - name: iron arrow tip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi - layers: - - state: tip - - type: CP14ModularCraftPart - possibleParts: - - TipIronArrow - - type: PhysicalComposition - materialComposition: - CP14Iron: 2 - -- type: entity - parent: CP14ModularBladeTipBase - id: CP14ModularTipGoldArrow - name: golden arrow tip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi - layers: - - state: tip - color: "#ffe269" - - type: CP14ModularCraftPart - possibleParts: - - TipGoldArrow - - type: PhysicalComposition - materialComposition: - CP14Gold: 2 - -- type: entity - parent: CP14ModularBladeTipBase - id: CP14ModularTipCopperArrow - name: copper arrow tip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi - layers: - - state: tip - color: "#e28f08" - - type: CP14ModularCraftPart - possibleParts: - - TipCopperArrow - - type: PhysicalComposition - materialComposition: - CP14Copper: 2 - -- type: entity - parent: CP14ModularBladeTipBase - id: CP14ModularTipMithrilArrow - name: mithril arrow tip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi - layers: - - state: tip - color: "#38f0b3" - - type: CP14ModularCraftPart - possibleParts: - - TipMithrilArrow - - type: PhysicalComposition - materialComposition: - CP14Mithril: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml deleted file mode 100644 index 8f812d4e2b..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml +++ /dev/null @@ -1,521 +0,0 @@ -- type: entity - parent: BaseItem - id: CP14ModularGripBase - abstract: true - categories: [ ForkFiltered ] - components: - - type: Item - storedRotation: 45 - - type: ExaminableDamage - messages: CP14WeaponMessages - - type: Damageable - damageContainer: Inorganic - - type: CP14MeleeSelfDamage - damageToSelf: - types: - Blunt: 0.5 # 100 hits - - type: MeleeWeapon - angle: 45 - attackRate: 1 - wideAnimationRotation: 135 - wideAnimation: CP14WeaponArcSlash - damage: - types: - Blunt: 0 - soundHit: - collection: MetalThud - cPAnimationLength: 0.25 - - type: Clothing - equipDelay: 0.25 - unequipDelay: 0.25 - quickEquip: false - breakOnMove: false - - type: CP14LabeledRenaming - -- type: entity - parent: CP14ModularGripBase - id: CP14ModularGripShort - abstract: true - description: A tool for your purposes! - components: - - type: CP14ModularCraftStartPoint - startSlots: - - Blade - - type: Item - shape: - - 0,0,0,0 - storedOffset: 0, -5 - - type: MeleeWeapon - resetOnHandSelected: false #Fast swap - range: 1.0 # 1.5 standart - cPAnimationOffset: -0.75 #-1 standart - attackRate: 1 # 1 standart - - type: Clothing - slots: - - belt - -- type: entity - parent: CP14ModularGripBase - id: CP14ModularGripLong - abstract: true - description: A tool for your purposes! Now long enough to hold in two hands. - components: - - type: CP14ModularCraftStartPoint - startSlots: - - Blade - - type: Item - shape: - - 0,0,0,1 - storedOffset: 0, -15 - - type: MeleeWeapon - resetOnHandSelected: true - range: 1.5 # 1.5 standart - attackRate: 0.7 # 1 standart - cPAnimationOffset: -1 - - type: Clothing - slots: - - neck - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - types: - Blunt: 0 - -# Shorts -- type: entity - parent: CP14ModularGripShort - id: CP14ModularGripWooden - name: wooden grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/wooden_grip.rsi - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripWooden - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 20 - -- type: entity - parent: CP14ModularGripShort - id: CP14ModularGripLucens - name: lucens grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/wooden_grip.rsi - layers: - - state: icon - color: "#0398fc" - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripLucens - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 60 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14LucensWoodenPlanks: 20 - -- type: entity - parent: CP14ModularGripShort - id: CP14ModularGripBirch - name: birch grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/birch_grip.rsi - layers: - - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripWooden - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 60 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 20 - -- type: entity - parent: CP14ModularGripShort - id: CP14ModularGripIron - name: iron grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi - layers: - - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripIron - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 #x2 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Iron: 10 - -- type: entity - parent: CP14ModularGripIron - id: CP14ModularGripIronGuard - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripIronGuard - - type: StaticPrice - price: 10 - -- type: entity - parent: CP14ModularGripShort - id: CP14ModularGripGolden - name: golden grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripGolden - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 20 #~x0.3 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Gold: 10 - -- type: entity - parent: CP14ModularGripShort - id: CP14ModularGripCopper - name: copper grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripCopper - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 70 #~x0.66 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Copper: 10 - -- type: entity - parent: CP14ModularGripShort - id: CP14ModularGripMithril - name: mithril grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/metall_grip.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripMithril - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 120 #x2.4 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 - -- type: entity - parent: CP14ModularGripShort - id: CP14ModularGripGuildmaster - name: guildmaster's rapier grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Grip/guildmaster_grip.rsi - layers: - - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripIron - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 120 #x2.4 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Mithril: 10 - CP14Gold: 10 - -# Long -- type: entity - parent: CP14ModularGripLong - id: CP14ModularGripWoodenLong - name: long wooden grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripWoodenLong - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 40 - -- type: entity - parent: CP14ModularGripLong - id: CP14ModularGripLucensLong - name: long lucens grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi - layers: - - state: icon - color: "#0398fc" - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripLucensLong - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 60 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14LucensWoodenPlanks: 40 - -- type: entity - parent: CP14ModularGripLong - id: CP14ModularGripBirchLong - name: long birch grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/GripLong/birch_grip_long.rsi - layers: - - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripWoodenLong - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 60 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 40 - -- type: entity - parent: CP14ModularGripLong - id: CP14ModularGripIronLong - name: long iron grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripIronLong - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 #x2 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Iron: 20 - -- type: entity - parent: CP14ModularGripIronLong - id: CP14ModularGripIronLongGuard - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long_guard.rsi - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripIronLongGuard - - type: StaticPrice - price: 10 - -- type: entity - parent: CP14ModularGripLong - id: CP14ModularGripGoldLong - name: long golden grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi - layers: - - state: icon - color: "#ffe269" - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripGoldLong - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 40 #~x0.3 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Gold: 20 - -- type: entity - parent: CP14ModularGripLong - id: CP14ModularGripCopperLong - name: long copper grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi - layers: - - state: icon - color: "#e28f08" - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripCopperLong - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 70 #~x0.66 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Copper: 20 - - -- type: entity - parent: CP14ModularGripLong - id: CP14ModularGripMithrilLong - name: long mithril grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/GripLong/metall_grip_long.rsi - layers: - - state: icon - color: "#38f0b3" - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripMithrilLong - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 120 #x2.4 durability - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14Mithril: 20 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml deleted file mode 100644 index ec030e1469..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/rod.yml +++ /dev/null @@ -1,105 +0,0 @@ -- type: entity - parent: CP14ModularGripBase - id: CP14ModularRod - abstract: true - description: A thin shaft of wood, the most important part of the future arrow. - components: - - type: CP14ModularCraftStartPoint - startSlots: - - ArrowTip - - type: Item - storedRotation: 0 - - type: MeleeWeapon - resetOnHandSelected: false #Fast swap - range: 1.0 # 1.5 standart - cPAnimationOffset: -0.75 #-1 standart - attackRate: 1 # 1 standart - - type: Clothing - slots: - - belt - - type: Fixtures - fixtures: - fix1: - shape: !type:PhysShapeCircle - radius: 0.2 - density: 5 - mask: - - ItemMask - restitution: 0.3 - friction: 0.2 - projectile: - shape: - !type:PhysShapeAabb - bounds: "-0.1,-0.1,0.1,0.1" - hard: false - mask: - - Impassable - - BulletImpassable - - type: EmbeddableProjectile - sound: /Audio/Weapons/star_hit.ogg - embedOnThrow: false - - type: ThrowingAngle - angle: 0 - - type: Ammo - muzzleFlash: null - - type: Tag - tags: - - CP14Arrow - -# Rod -- type: entity - parent: CP14ModularRod - id: CP14ModularRodWooden - name: wooden grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Rod/arrow.rsi - layers: - - state: tail - - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularRodWooden - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 30 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14WoodenPlanks: 2 - -- type: entity - parent: CP14ModularRod - id: CP14ModularRodLucens - name: lucens grip - components: - - type: Sprite - sprite: _CP14/Objects/ModularTools/Rod/arrow.rsi - layers: - - state: tail - - state: icon - color: "#0398fc" - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularRodLucens - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 45 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - - type: PhysicalComposition - materialComposition: - CP14LucensWoodenPlanks: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/fork.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/fork.yml new file mode 100644 index 0000000000..8c1dcea9d4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/fork.yml @@ -0,0 +1,60 @@ +- type: entity + abstract: true + id: CP14BaseFork + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + components: + - type: Item + size: Ginormous + - type: ThrowingAngle + angle: -90 + - type: MeleeWeapon + attackRate: 1 + range: 2 + angle: 10 + wideAnimationRotation: -90 + damage: + types: + Piercing: 3 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + cPAnimationLength: 0.3 + cPAnimationOffset: 1.75 + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 3 + - type: CP14BonusDistanceMeleeDamage + minDistance: 2 + bonusDamage: + types: + Piercing: 3 + - type: Wieldable + - type: Clothing + slots: + - neck + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + - type: CP14EditTileTool + sound: + collection: CP14Digging + tileReplace: + CP14FloorDirt: CP14FloorDirtSeedbed + CP14FloorDirtSeedbed: CP14FloorDirt + +- type: entity + parent: CP14BaseFork + id: CP14WeaponFork + name: fork + description: A simple fork for digging and planting seeds in the soil. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Fork/fork.rsi + state: icon \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/mop.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/mop.yml new file mode 100644 index 0000000000..5d2cc9370b --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/mop.yml @@ -0,0 +1,53 @@ +- type: entity + abstract: true + id: CP14BaseMop + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + clickDamageModifier: 0.1 + attackRate: 1.5 + range: 1.6 + angle: 30 + wideAnimationRotation: 0 + damage: + types: + Blunt: 2 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcThrust + soundHit: + collection: MetalThud + cPAnimationLength: 0.5 + cPAnimationOffset: 1 + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2 + - type: Wieldable + - type: Clothing + slots: + - neck + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + - type: Spillable + solution: absorbed + - type: Absorbent + - type: SolutionContainerManager + solutions: + absorbed: + maxVol: 50 + +- type: entity + parent: CP14BaseMop + id: CP14Mop + name: mop + description: A simple mop for cleaning up spills and messes. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Mop/mop.rsi + state: icon \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hammer.yml new file mode 100644 index 0000000000..a73e45afe2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hammer.yml @@ -0,0 +1,64 @@ +- type: entity + abstract: true + id: CP14BaseWeaponToolHammer + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponThrowable + components: + - type: Item + size: Normal + shape: + - 0,0,2,0 + - type: DamageOtherOnHit + damage: + types: + Blunt: 5 + Structural: 3 + - type: MeleeWeapon + resetOnHandSelected: false + autoAttack: true + attackRate: 2 + range: 1.5 + angle: 60 + wideAnimationRotation: -90 + damage: + types: + Blunt: 5 + Structural: 3 + animation: CP14WeaponArcSlash + wideAnimation: CP14WeaponArcSlash + soundHit: + collection: MetalThud + cPAnimationLength: 0.25 + cPAnimationOffset: 1 + - type: Clothing + slots: + - belt + breakOnMove: false + equipDelay: 0.5 + unequipDelay: 0.5 + - type: Tool + qualities: + - CP14Hammering + useSound: + collection: CP14Hammering + params: + variation: 0.03 + volume: 2 + +- type: entity + parent: CP14BaseWeaponToolHammer + id: CP14WeaponHammerIron + name: iron hammer + description: A standard hammer made of iron. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Hammer/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + CP14Iron: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml new file mode 100644 index 0000000000..0eb011364e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml @@ -0,0 +1,63 @@ +- type: entity + abstract: true + id: CP14BaseWeaponPickaxe + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + attackRate: 1 + range: 1.6 + angle: 90 + wideAnimationRotation: -90 + damage: + types: + Piercing: 3 + Structural: 4 + animation: CP14WeaponArcSlash + wideAnimation: CP14WeaponArcSlash + soundHit: + collection: MetalThud + cPAnimationLength: 0.5 + cPAnimationOffset: 1 + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 6 + Structural: 20 + - type: Wieldable + - type: Clothing + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + slots: + - neck + - type: Tool + qualities: + - Prying + useSound: + path: /Audio/Items/crowbar.ogg + - type: ToolTileCompatible + - type: Prying + - type: EmitSoundOnLand + sound: + path: /Audio/Items/crowbar_drop.ogg + +- type: entity + parent: CP14BaseWeaponPickaxe + id: CP14WeaponPickaxeIron + name: iron pickaxe + description: A sturdy iron pickaxe, perfect for mining and not for combat. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 + CP14Iron: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml new file mode 100644 index 0000000000..6c06615322 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml @@ -0,0 +1,61 @@ +- type: entity + abstract: true + id: CP14BaseWeaponShovel + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + attackRate: 1 + range: 1.6 + angle: 170 + wideAnimationRotation: -90 + damage: + types: + Slash: 3 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcSlash + soundHit: + collection: MetalThud + cPAnimationLength: 0.5 + cPAnimationOffset: 1 + - type: IncreaseDamageOnWield + damage: + types: + Slash: 5 + - type: Wieldable + - type: Clothing + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + slots: + - neck + - type: Shovel + - type: ToolTileCompatible + - type: Tool + qualities: + - CP14Digging + useSound: + collection: CP14Digging + params: + variation: 0.03 + volume: 2 + +- type: entity + parent: CP14BaseWeaponShovel + id: CP14WeaponShovelIron + name: iron shovel + description: A sturdy iron shovel, perfect for digging and not for combat. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Shovel/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 + CP14Iron: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml index 64abc44611..f252ba6502 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/wrench.yml @@ -33,4 +33,4 @@ path: /Audio/Items/ratchet.ogg - type: PhysicalComposition materialComposition: - CP14Iron: 20 + CP14Iron: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml index 27cc852a7d..97687d97e8 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/base.yml @@ -94,6 +94,7 @@ messages: CP14WeaponMessages - type: Damageable damageContainer: Inorganic + - type: CP14MeleeParriable - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml new file mode 100644 index 0000000000..7bec8fdccf --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/dagger.yml @@ -0,0 +1,88 @@ +- type: entity + abstract: true + id: CP14BaseWeaponDagger + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + - CP14BaseWeaponThrowable + components: + - type: Item + size: Normal + shape: + - 0,0,1,0 + - type: EmbeddableProjectile + offset: -0.15,-0.15 + removalTime: 1.5 + - type: DamageOtherOnHit + damage: + types: + Slash: 4 + Piercing: 8 + - type: MeleeWeapon + resetOnHandSelected: false + autoAttack: true + attackRate: 2 + range: 1 + angle: 60 + wideAnimationRotation: -90 + damage: + types: + Slash: 2 + Piercing: 3 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcSlash + soundHit: + path: /Audio/Weapons/bladeslice.ogg + cPAnimationLength: 0.15 + cPAnimationOffset: 0.75 + - type: Clothing + slots: + - belt + breakOnMove: false + equipDelay: 0.5 + unequipDelay: 0.5 + +- type: entity + parent: CP14BaseWeaponDagger + id: CP14WeaponDaggerIron + name: iron dagger + description: A standard dagger made of iron. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Dagger/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + CP14Iron: 10 + +- type: entity + parent: CP14BaseWeaponDagger + id: CP14WeaponDaggerHatchet + name: hatchet + description: A small hatchet, commonly used as a kitchen utensil for preparing food. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + CP14Iron: 10 + +- type: entity + parent: CP14BaseWeaponDagger + id: CP14WeaponDaggerSickle + name: sickle + description: A curved blade used for harvesting crops, but can be deadly in skilled hands. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Dagger/sickle.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + CP14Iron: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/rapier.yml new file mode 100644 index 0000000000..977c92b75a --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/rapier.yml @@ -0,0 +1,46 @@ +- type: entity + abstract: true + id: CP14BaseWeaponRapier + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + attackRate: 1.5 + range: 1.2 + angle: 20 + wideAnimationRotation: -90 + damage: + types: + Piercing: 10 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + cPAnimationLength: 0.3 + cPAnimationOffset: 1 + - type: Clothing + slots: + - belt + breakOnMove: false + equipDelay: 0.5 + unequipDelay: 0.5 + +- type: entity + parent: CP14BaseWeaponRapier + id: CP14WeaponRapierIron + name: rapier + description: An elegant and finely balanced blade, favored by Zellasian officers for its reach and precision. Its craftsmanship reflects imperial tradition and deadly efficiency. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Rapier/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + CP14Iron: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml index 28d9292c0d..9b5e9b58f6 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shield.yml @@ -1,19 +1,18 @@ - type: entity - id: CP14BaseShield + id: CP14BaseWeaponShield + abstract: true parent: - BaseItem - - CP14BaseWeaponLight - - CP14BaseWeaponThrowable + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage name: shield description: A wooden shield capable of withstanding multiple blows. components: - - type: Sprite - sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi - state: icon - type: Item - sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi - size: Normal + size: Ginormous - type: Blocking + passiveBlockFraction: 0.4 + activeBlockFraction: 0.8 passiveBlockModifier: coefficients: Blunt: 0.9 @@ -22,57 +21,49 @@ Heat: 0.9 activeBlockModifier: coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.75 + Heat: 0.75 flatReductions: Blunt: 1 Slash: 1 Piercing: 1 Heat: 1 - type: Clothing - equipDelay: 0.45 - unequipDelay: 0.45 - sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi + equipDelay: 1 + unequipDelay: 1 quickEquip: false breakOnMove: false slots: - neck - type: MeleeWeapon - angle: 0 - range: 1.2 - attackRate: 0.5 - wideAnimationRotation: -30 - wideAnimation: CP14WeaponArcSlash + resetOnHandSelected: false + angle: 60 + attackRate: 1 + wideAnimationRotation: 0 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcThrust damage: types: - Blunt: 6 + Blunt: 3 soundHit: collection: MetalThud - cPAnimationLength: 0.3 - cPAnimationOffset: -0.5 - - type: DamageOnLand - damage: - types: - Blunt: 6 - - type: DamageOtherOnHit - damage: - types: - Blunt: 6 + cPAnimationLength: 0.6 + cPAnimationOffset: 0.5 - type: Damageable damageContainer: Shield - type: Destructible thresholds: - trigger: !type:DamageTrigger - damage: 140 + damage: 200 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 100 #This is probably enough damage before it breaks + damage: 100 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -84,7 +75,17 @@ CP14WoodenPlanks1: min: 1 max: 2 + +- type: entity + parent: CP14BaseWeaponShield + id: CP14WeaponShieldWooden + name: wooden shield + description: A wooden shield capable of withstanding multiple blows. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi + state: icon - type: PhysicalComposition materialComposition: CP14WoodenPlanks: 20 - CP14Iron: 20 + CP14Iron: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shieldBuckler.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shieldBuckler.yml new file mode 100644 index 0000000000..7faea34e81 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/shieldBuckler.yml @@ -0,0 +1,85 @@ +- type: entity + id: CP14BaseWeaponShieldBuckler + abstract: true + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + name: buckler + description: A small metallic shield, designed for quick parrying and blocking in close combat. + components: + - type: Item + size: Ginormous + - type: Blocking + passiveBlockFraction: 0.3 + activeBlockFraction: 0.6 + passiveBlockModifier: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 + activeBlockModifier: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 + - type: Clothing + equipDelay: 0.5 + unequipDelay: 0.5 + quickEquip: false + breakOnMove: false + slots: + - neck + - type: CP14MeleeParry + - type: MeleeWeapon + resetOnHandSelected: false + angle: 90 + attackRate: 2 + range: 0.75 + wideAnimationRotation: 0 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcSlash + damage: + types: + Blunt: 2 + soundHit: + collection: MetalThud + cPAnimationLength: 0.6 + cPAnimationOffset: 0.5 + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 150 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 1 + max: 2 + +- type: entity + parent: CP14BaseWeaponShieldBuckler + id: CP14WeaponShieldBuckler + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14Iron: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/skimitar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/skimitar.yml new file mode 100644 index 0000000000..7f85ebd36a --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/skimitar.yml @@ -0,0 +1,51 @@ +- type: entity + abstract: true + id: CP14BaseWeaponSkimitar + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + resetOnHandSelected: false + attackRate: 1.5 + range: 1.2 + angle: 60 + wideAnimationRotation: -90 + damage: + types: + Slash: 5 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcSlash + soundHit: + path: /Audio/Weapons/bladeslice.ogg + cPAnimationLength: 0.25 + cPAnimationOffset: 1 + - type: CP14ComboBonusMeleeDamage + bonusDamage: + types: + Piercing: 5 + - type: Clothing + slots: + - neck + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + +- type: entity + parent: CP14BaseWeaponSkimitar + id: CP14WeaponSkimitarIron + name: iron skimitar + description: A finely crafted skimitar favored by Bafamir carcats. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Skimitar/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + CP14Iron: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml new file mode 100644 index 0000000000..9bd5efa6c1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/spear.yml @@ -0,0 +1,66 @@ +- type: entity + abstract: true + id: CP14BaseWeaponSpear + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + - CP14BaseWeaponThrowable + components: + - type: Item + size: Ginormous + - type: ThrowingAngle + angle: -90 + - type: EmbeddableProjectile + offset: -0.15,-0.15 + removalTime: 1.5 + - type: DamageOtherOnHit + damage: + types: + Piercing: 16 + - type: MeleeWeapon + attackRate: 1 + range: 2.75 + angle: 10 #Lower in 4 times + wideAnimationRotation: -90 + damage: + types: + Piercing: 5 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcThrust + soundHit: + path: /Audio/Weapons/bladeslice.ogg + cPAnimationLength: 0.3 + cPAnimationOffset: 2 + - type: IncreaseDamageOnWield + damage: + types: + Piercing: 5 + - type: CP14BonusDistanceMeleeDamage + minDistance: 2.25 + bonusDamage: + types: + Piercing: 5 + - type: Wieldable + - type: Clothing + slots: + - neck + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + +- type: entity + parent: CP14BaseWeaponSpear + id: CP14WeaponSpearIron + name: iron spear + description: A reliable spear that is standard in the Zellasian Empire. It strikes far, but slowly. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Spear/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 + CP14Iron: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml new file mode 100644 index 0000000000..6d1de0cf88 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/sword.yml @@ -0,0 +1,50 @@ +- type: entity + abstract: true + id: CP14BaseWeaponSword + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + attackRate: 1.5 + range: 1.2 + angle: 60 + wideAnimationRotation: -90 + damage: + types: + Slash: 7.5 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcSlash + soundHit: + path: /Audio/Weapons/bladeslice.ogg + cPAnimationLength: 0.25 + cPAnimationOffset: 1 + - type: CP14ComboBonusMeleeDamage + bonusDamage: + types: + Piercing: 5 + - type: Clothing + slots: + - neck + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + +- type: entity + parent: CP14BaseWeaponSword + id: CP14WeaponSwordIron + name: iron sword + description: A finely crafted sword favored by imperial officers. Its blade gleams with authority and tradition. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Sword/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + CP14Iron: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/towerShield.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/towerShield.yml new file mode 100644 index 0000000000..47600e2da1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/towerShield.yml @@ -0,0 +1,94 @@ +- type: entity + abstract: true + id: CP14BaseWeaponTowerShield + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + name: tower wooden shield + description: A wooden shield capable of withstanding multiple blows. + components: + - type: Item + size: Ginormous + - type: Blocking + passiveBlockModifier: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 + activeBlockModifier: + coefficients: + Blunt: 0.5 + Slash: 0.5 + Piercing: 0.5 + Heat: 0.5 + flatReductions: + Blunt: 3 + Slash: 3 + Piercing: 3 + - type: Clothing + equipDelay: 1.5 + unequipDelay: 1.5 + quickEquip: false + breakOnMove: false + slots: + - neck + - type: MeleeWeapon + resetOnHandSelected: false + angle: 60 + attackRate: 0.5 + wideAnimationRotation: 0 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcThrust + damage: + types: + Blunt: 3 + Piercing: 3 + soundHit: + collection: MetalThud + cPAnimationLength: 0.6 + cPAnimationOffset: 0.5 + - type: CP14LightMeleeKnockdown + - type: Damageable + damageContainer: Shield + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:SpawnEntitiesBehavior + spawn: + CP14WoodenPlanks1: + min: 2 + max: 4 + - type: ClothingSpeedModifier + walkModifier: 0.7 + sprintModifier: 0.7 + - type: HeldSpeedModifier + +- type: entity + parent: CP14BaseWeaponTowerShield + id: CP14WeaponTowerShieldWooden + name: wooden tower shield + description: A wooden shield capable of withstanding multiple blows. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 50 + CP14Iron: 40 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml new file mode 100644 index 0000000000..731377e4c1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml @@ -0,0 +1,55 @@ +- type: entity + abstract: true + id: CP14BaseWeaponTwoHandedSword + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + attackRate: 0.5 + range: 1.6 + angle: 170 #Bigger in 2 times + wideAnimationRotation: -90 + damage: + types: + Slash: 7 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcSlash + soundHit: + path: /Audio/Weapons/bladeslice.ogg + cPAnimationLength: 0.5 + cPAnimationOffset: 1 + - type: IncreaseDamageOnWield + damage: + types: + Slash: 13 + - type: CP14ComboBonusMeleeDamage + bonusDamage: + types: + Piercing: 10 + - type: Wieldable + - type: Clothing + slots: + - neck + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + +- type: entity + parent: CP14BaseWeaponTwoHandedSword + id: CP14WeaponTwoHandedSwordIron + name: iron two-handed sword + description: A large and heavy two-handed sword. Heavy means reliable. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 10 + CP14Iron: 30 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warAxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warAxe.yml new file mode 100644 index 0000000000..c406f82118 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warAxe.yml @@ -0,0 +1,53 @@ +- type: entity + abstract: true + id: CP14BaseWeaponWarAxe + parent: + - BaseItem + - CP14BaseWeaponChemical + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponSharp + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + attackRate: 0.5 + range: 1.6 + angle: 170 #Bigger in 2 times + wideAnimationRotation: -90 + damage: + types: + Slash: 10 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcSlash + soundHit: + path: /Audio/Weapons/bladeslice.ogg + cPAnimationLength: 0.5 + cPAnimationOffset: 1 + - type: IncreaseDamageOnWield + damage: + types: + Slash: 15 + - type: CP14MeleeWeaponStaminaCost + stamina: 15 + - type: Wieldable + - type: Clothing + slots: + - neck + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + +- type: entity + parent: CP14BaseWeaponWarAxe + id: CP14WeaponWarAxeIron + name: iron war axe + description: A heavy war axe made of iron, designed for powerful strikes in battle. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/WarAxe/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 + CP14Iron: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warHammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warHammer.yml new file mode 100644 index 0000000000..8dcd03d314 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/warHammer.yml @@ -0,0 +1,52 @@ +- type: entity + abstract: true + id: CP14BaseWeaponWarHammer + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + components: + - type: Item + size: Ginormous + - type: MeleeWeapon + clickDamageModifier: 0.1 + attackRate: 0.5 + range: 1.6 + angle: 170 #Bigger in 2 times + wideAnimationRotation: -90 + damage: + types: + Blunt: 7 + animation: CP14WeaponArcThrust + wideAnimation: CP14WeaponArcSlash + soundHit: + collection: MetalThud + cPAnimationLength: 0.5 + cPAnimationOffset: 1 + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 13 + Structural: 5 + - type: CP14LightMeleeKnockdown + - type: Wieldable + - type: Clothing + slots: + - neck + breakOnMove: false + equipDelay: 1 + unequipDelay: 1 + +- type: entity + parent: CP14BaseWeaponWarHammer + id: CP14WeaponWarHammerIron + name: iron war hammer + description: A large and heavy war hammer. Heavy means reliable. + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/WarHammer/iron.rsi + state: icon + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 20 + CP14Iron: 20 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml deleted file mode 100644 index d6f5c75886..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/arrow.yml +++ /dev/null @@ -1,51 +0,0 @@ -- type: entity - id: CP14ModularIronArrow - parent: CP14ModularRodWooden - name: iron arrow - description: Standard arrow, balance between damage and reliability. - components: - - type: Sprite - layers: - - state: icon - - state: tail - - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularTipIronArrow - -- type: entity - id: CP14ModularMithrilArrow - parent: CP14ModularRodLucens - name: mithril arrow - description: An arrow made of expensive wood and magical iron, you shoot money, but the damage matches. - components: - - type: Sprite - layers: - - state: icon - color: "#0398fc" - - state: tail - - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi - state: icon - color: "#45d2a4" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularTipMithrilArrow - -- type: entity - id: CP14ModularCopperArrow - parent: CP14ModularRodLucens - name: copper arrow - description: It's the cheapest and weakest arrow you've ever seen, but it's better than nothing. - components: - - type: Sprite - layers: - - state: icon - - state: tail - - sprite: _CP14/Objects/ModularTools/Tip/arrow.rsi - state: icon - color: "#bd712f" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularTipCopperArrow - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/axe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/axe.yml deleted file mode 100644 index 30edb34906..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/axe.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: entity - id: CP14ModularIronAxe - parent: CP14ModularGripWoodenLong - name: iron axe - description: A heavy axe for cutting firewood or heads. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronAxe - -- type: entity - id: CP14ModularWoodenAxe - parent: CP14ModularGripWoodenLong - name: training wooden axe - description: Wooden training weapon, a handy tool for practising strokes. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Axe/wooden_axe.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeWoodenAxe diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml deleted file mode 100644 index 82238dea65..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - id: CP14ModularIronDagger - parent: CP14ModularGripWooden - name: iron dagger - description: A small, multi-purpose, sharp blade. You can cut meat or throw it at a goblin. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronDagger diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hammer.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hammer.yml deleted file mode 100644 index 28681b356e..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hammer.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - id: CP14ModularIronHammer - parent: CP14ModularGripWooden - name: iron hammer - description: A small hammer. Good for carpentry work as well as for cracking skulls. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronHammer - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hoe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hoe.yml deleted file mode 100644 index ef21e6aece..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/hoe.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - id: CP14ModularIronHoe - parent: CP14ModularGripWooden - name: iron hoe - description: Hoe. Your perfect tool for tilling the ground and preparing it for gardening. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronHoe - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mace.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mace.yml deleted file mode 100644 index 20fee14eff..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mace.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - id: CP14ModularIronMace - parent: CP14ModularGripWooden - name: iron mace - description: A heavy piece of metal on a long stick. What could be simpler than that? - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronMace - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml deleted file mode 100644 index 80a6a98ea5..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/mop.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - id: CP14ModularWoodMop - parent: CP14ModularGripWoodenLong - name: wooden mop - description: A mop for cleaning floors of various unpleasant liquids. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeWoodMop diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml deleted file mode 100644 index 802d283d37..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - id: CP14ModularIronPickaxe - parent: CP14ModularGripWoodenLong - name: iron pickaxe - description: Notched to perfection, for jamming it into rocks - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronPickaxe - -- type: entity - id: CP14ModularCopperPickaxe - parent: CP14ModularGripWoodenLong - name: copper pickaxe - description: It's better than by hand - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - state: icon - color: "#e28f08" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeCopperPickaxe \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml deleted file mode 100644 index 5b58bb1851..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/rapier.yml +++ /dev/null @@ -1,81 +0,0 @@ -- type: entity - id: CP14ModularIronRapier - parent: CP14ModularGripWooden - name: iron rapier - description: The gold standard of edged weapons. Medium length, comfortable grip. No frills. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronRapier - -- type: entity - id: CP14ModularCopperRapier - parent: CP14ModularGripWooden - name: copper rapier - description: You'll be lucky if it even pierces the paper. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - state: icon - color: "#e28f08" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeCopperRapier - -- type: entity - id: CP14ModularGuildmasterRapier - parent: CP14ModularGripGuildmaster - name: guildmaster's personal rapier - description: A personal weapon issued to each guildmaster. Combines reliability and killing power. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - state: icon - - sprite: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronRapier - - CP14ModularGardeGuildmaster - -- type: entity - id: CP14ModularGuardRapier - parent: CP14ModularGripIronGuard - name: "guard's rapier" - description: The standard issue armament of the imperial guard. A short rapier adorned with blue feathers and brass. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - state: icon - - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronRapier - - CP14ModularGardeSharpIron - -- type: entity - id: CP14ModularWoodenRapier - parent: CP14ModularGripWooden - name: training wooden rapier - description: A training wooden rapier that even a complete inept can handle. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeWoodenRapier diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/shovel.yml deleted file mode 100644 index aa1b889561..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/shovel.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - id: CP14ModularIronShovel - parent: CP14ModularGripWoodenLong - name: iron shovel - description: An implement for digging up earth, digging beds or graves. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronShovel - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sickle.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sickle.yml deleted file mode 100644 index 5067afef49..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sickle.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - id: CP14ModularIronSickle - parent: CP14ModularGripWooden - name: iron sickle - description: Originally developed as a weapon against grass, the sickle suddenly proved itself good at the bloodier harvest as well. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronSickle - diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml deleted file mode 100644 index b15eccb6a4..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml +++ /dev/null @@ -1,62 +0,0 @@ -- type: entity - id: CP14ModularIronSkimitar - parent: CP14ModularGripWooden - name: iron skimitar - description: the gold standard of edged weapons. Medium length, comfortable grip. No frills. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronSkimitar - -- type: entity - id: CP14ModularCopperSkimitar - parent: CP14ModularGripWooden - name: copper skimitar - description: You'll be lucky if it even pierces the paper. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - state: icon - color: "#e28f08" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeCopperSkimitar - -- type: entity - id: CP14ModularCopperSkimitarTundra - parent: CP14ModularGripWooden - name: Skimitar Tundra - description: the gold standard of edged weapons. Medium length, comfortable grip. It has "tundra" engraved on it. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeCopperSkimitar - - CP14ModularInlayQuartzWater - -- type: entity - id: CP14ModularGoldSkimitarAgony - parent: CP14ModularGripWooden - name: Skimitar Agony - description: the gold standard of edged weapons. Medium length, comfortable grip. It has "agony" engraved on it. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeGoldSkimitar - - CP14ModularInlayQuartzElectric diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/spear.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/spear.yml deleted file mode 100644 index a4a26e1bf1..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/spear.yml +++ /dev/null @@ -1,44 +0,0 @@ -- type: entity - id: CP14ModularIronSpear - parent: CP14ModularGripWoodenLong - name: iron spear - description: The spear is a weapon whose effectiveness has stood the test of time. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronSpear - -- type: entity - id: CP14ModularIronKunai - parent: CP14ModularGripWooden - name: iron kunai - description: An effective throwing weapon. Throw it at a wall, or no, better yet, at a goblin! - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronSpear - -- type: entity - id: CP14ModularWoodenSpear - parent: CP14ModularGripWoodenLong - name: training wooden spear - description: A training wooden spear, no more complicated than a mop. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeWoodenSpear diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml deleted file mode 100644 index 2cab412b08..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/sword.yml +++ /dev/null @@ -1,145 +0,0 @@ -- type: entity - id: CP14ModularIronSword - parent: CP14ModularGripWooden - name: iron sword - description: the gold standard of edged weapons. Medium length, comfortable grip. No frills. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronSword - -- type: entity - id: CP14ModularCopperSword - parent: CP14ModularGripWooden - name: copper sword - description: You'll be lucky if it even pierces the paper. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - state: icon - color: "#e28f08" - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeCopperSword - -- type: entity - id: CP14ModularGuardHalberd - parent: CP14ModularGripIronLongGuard - name: "guard's halberd" - description: The standard issue armament of the imperial guard. A long iron halberd adorned with blue feathers and brass. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - state: icon - - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronSword - - CP14ModularGardeSharpIron - -- type: entity - id: CP14ModularGuardSword - parent: CP14ModularGripIronGuard - name: "guard's sword" - description: The standard issue armament of the imperial guard. A short sword adorned with blue feathers and brass. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - state: icon - - sprite: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeIronSword - - CP14ModularGardeSharpIron - -- type: entity - id: CP14ModularSkeletonHalberd - parent: CP14ModularGripWoodenLong - name: bone halberd - description: Monstrous weapons of bone. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeBoneSword - -- type: entity - id: CP14ModularSkeletonSword - parent: CP14ModularGripWooden - name: bone sword - description: Monstrous weapons of bone. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeBoneSword - -- type: entity - id: CP14ModularSkeletonHalberdUpgrade - parent: CP14ModularGripWoodenLong - name: bone halberd - suffix: Reinforced - description: Monstrous weapons of bone. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeBoneSword - - CP14ModularGardeSharpIron - -- type: entity - id: CP14ModularSkeletonSwordUpgrade - parent: CP14ModularGripWooden - name: bone sword - suffix: Reinforced - description: Monstrous weapons of bone. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeBoneSword - - CP14ModularGardeSharpIron - -- type: entity - id: CP14ModularWoodenSword - parent: CP14ModularGripWooden - name: training wooden sword - description: A wooden sword, light and easy to use, even a complete inept, will be able to use it. - components: - - type: Sprite - layers: - - state: icon - - sprite: _CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi - state: icon - - type: CP14ModularCraftAutoAssemble - details: - - CP14ModularBladeWoodenSword diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml new file mode 100644 index 0000000000..ed67fe49d4 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/arrows.yml @@ -0,0 +1,94 @@ +- type: entity + id: CP14ArrowBase + parent: BaseItem + abstract: true + categories: [ ForkFiltered ] + components: + - type: Item + storedRotation: 0 + - type: Fixtures + fixtures: + fix1: + shape: !type:PhysShapeCircle + radius: 0.2 + density: 5 + mask: + - ItemMask + restitution: 0.3 + friction: 0.2 + projectile: + shape: + !type:PhysShapeAabb + bounds: "-0.1,-0.1,0.1,0.1" + hard: false + mask: + - Impassable + - BulletImpassable + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + removalTime: 1 + embedOnThrow: false + - type: ThrowingAngle + angle: 0 + - type: Ammo + muzzleFlash: null + - type: Tag + tags: + - CP14Arrow + - type: Projectile + deleteOnCollide: false + onlyCollideWhenShot: true + - type: Damageable + - type: DamageOnLand + damage: + types: + Blunt: 10 + - type: SolutionContainerManager + solutions: + ammo: + maxVol: 2 + - type: RefillableSolution + solution: ammo + - type: InjectableSolution + solution: ammo + - type: SolutionInjectOnEmbed + transferAmount: 2 + solution: ammo + - type: SolutionTransfer + maxTransferAmount: 2 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: solution + +- type: entity + id: CP14Arrow + parent: CP14ArrowBase + name: arrow + description: A sharp arrow made of wood and metal + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi + layers: + - state: rod + - state: solution1 + map: ["enum.SolutionContainerLayers.Fill"] + - type: Projectile + damage: + types: + Piercing: 35 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:DoActsBehavior + acts: ["Destruction"] + - type: PhysicalComposition + materialComposition: + CP14WoodenPlanks: 5 + CP14Iron: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/grave.yml b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/grave.yml index ce0ab21921..a5e682c15f 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/grave.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/grave.yml @@ -97,7 +97,6 @@ - !type:GroupSelector # Rarities weight: 0.2 children: - - id: CP14ModularSkeletonHalberd - !type:NestedSelector tableId: CP14StationCrateLoot diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 9e575ff0c8..25e40c2039 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -17,13 +17,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 350 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 100 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: @@ -51,13 +51,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 350 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 100 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: @@ -111,7 +111,7 @@ acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 50 + damage: 30 behaviors: - !type:PlaySoundBehavior sound: @@ -184,7 +184,7 @@ acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 50 + damage: 30 behaviors: - !type:PlaySoundBehavior sound: @@ -237,7 +237,7 @@ acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 50 + damage: 30 behaviors: - !type:PlaySoundBehavior sound: @@ -281,7 +281,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 350 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml index 0a6715603e..d4ef771445 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml @@ -13,13 +13,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 250 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 100 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: @@ -48,13 +48,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 100 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: @@ -84,13 +84,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 100 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: @@ -124,13 +124,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 300 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 100 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: @@ -161,13 +161,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 250 + damage: 150 behaviors: - !type:DoActsBehavior acts: ["Destruction"] - trigger: !type:DamageTrigger - damage: 100 + damage: 50 behaviors: - !type:PlaySoundBehavior sound: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml index d75c66e0a1..e9798382a0 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/stonebrick.yml @@ -172,6 +172,11 @@ !type:DamageTrigger damage: 100 behaviors: + - !type:SpawnEntitiesBehavior + spawn: + CP14StoneBlock1: + min: 1 + max: 2 - !type:PlaySoundBehavior sound: path: /Audio/Effects/break_stone.ogg diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml index b82aaa40e0..d1e8636c75 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/adventure.yml @@ -4,45 +4,71 @@ minLimit: 0 maxLimit: 1 loadouts: - - CP14ModularCopperSkimitar - - CP14ModularCopperSword - - CP14ModularCopperRapier - CP14BowCombat - #- CP14MagicDruidStaff - -- type: loadout - id: CP14ModularCopperSkimitar - dummyEntity: CP14ModularCopperSkimitar - equipment: - belt2: CP14ModularCopperSkimitar - skills: - - SkimitarMastery - -- type: loadout - id: CP14ModularCopperSword - dummyEntity: CP14ModularCopperSword - equipment: - belt2: CP14ModularCopperSword - skills: - - SwordMastery - -- type: loadout - id: CP14ModularCopperRapier - dummyEntity: CP14ModularCopperRapier - equipment: - belt2: CP14ModularCopperRapier - skills: - - RapierMastery + - CP14WeaponDaggerIron + - CP14WeaponSwordIron + - CP14WeaponSkimitarIron + - CP14WeaponSpearIron + - CP14WeaponWarHammerIron + - CP14WeaponTwoHandedSwordIron + - CP14WeaponWarAxeIron - type: loadout id: CP14BowCombat dummyEntity: CP14BowCombat equipment: - belt2: CP14ClothingBeltQuiverCopperArrow + belt2: CP14ClothingBeltQuiverArrows neck: CP14BowCombat -#- type: loadout -# id: CP14MagicDruidStaff -# dummyEntity: CP14MagicDruidStaff -# equipment: -# neck: CP14MagicDruidStaff \ No newline at end of file +- type: loadout + id: CP14WeaponDaggerIron + dummyEntity: CP14WeaponDaggerIron + equipment: + belt2: CP14WeaponDaggerIron + storage: + back: + - CP14WeaponDaggerIron + - CP14WeaponDaggerIron + - CP14WeaponDaggerIron + +- type: loadout + id: CP14WeaponSwordIron + dummyEntity: CP14WeaponSwordIron + equipment: + neck: CP14WeaponShieldWooden + inhand: + - CP14WeaponSwordIron + +- type: loadout + id: CP14WeaponSkimitarIron + dummyEntity: CP14WeaponSkimitarIron + equipment: + neck: CP14WeaponShieldBuckler + inhand: + - CP14WeaponSkimitarIron + +- type: loadout + id: CP14WeaponSpearIron + dummyEntity: CP14WeaponSpearIron + equipment: + neck: CP14WeaponSpearIron + +- type: loadout + id: CP14WeaponWarHammerIron + dummyEntity: CP14WeaponWarHammerIron + equipment: + neck: CP14WeaponTowerShieldWooden + inhand: + - CP14WeaponWarHammerIron + +- type: loadout + id: CP14WeaponTwoHandedSwordIron + dummyEntity: CP14WeaponTwoHandedSwordIron + equipment: + neck: CP14WeaponTwoHandedSwordIron + +- type: loadout + id: CP14WeaponWarAxeIron + dummyEntity: CP14WeaponWarAxeIron + equipment: + neck: CP14WeaponWarAxeIron \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index d0a112c174..691105bcee 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -705,9 +705,6 @@ - CP14Scissors - CP14Rope - CP14SilverCoin - - CP14ModularIronDagger - - CP14ModularIronSickle - - CP14ModularCopperPickaxe - CP14Lighter - CP14Torch - CP14SmokingPipeFilledTobacco @@ -752,24 +749,6 @@ back: - CP14SilverCoin -- type: loadout - id: CP14ModularIronDagger - storage: - back: - - CP14ModularIronDagger - -- type: loadout - id: CP14ModularIronSickle - storage: - back: - - CP14ModularIronSickle - -- type: loadout - id: CP14ModularCopperPickaxe - storage: - back: - - CP14ModularCopperPickaxe - - type: loadout id: CP14Lighter storage: diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml index 40d506a400..188219dbff 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/guard.yml @@ -85,37 +85,10 @@ minLimit: 1 maxLimit: 1 loadouts: - - CP14ModularGuardSword - - CP14ModularGuardHalberd - - CP14ModularGuardRapier - - CP14BowCombat + #- CP14BowCombat - CP14MagicGuardElectroStaff -- type: loadout - id: CP14ModularGuardSword - dummyEntity: CP14ModularGuardSword - equipment: - belt2: CP14ModularGuardSword - skills: - - SwordMastery - - type: loadout id: CP14MagicGuardElectroStaff equipment: - belt2: CP14MagicGuardElectroStaff - -- type: loadout - id: CP14ModularGuardHalberd - dummyEntity: CP14ModularGuardHalberd - equipment: - belt2: CP14ModularGuardHalberd - skills: - - SwordMastery - -- type: loadout - id: CP14ModularGuardRapier - dummyEntity: CP14ModularGuardRapier - equipment: - belt2: CP14ModularGuardRapier - skills: - - RapierMastery + belt2: CP14MagicGuardElectroStaff \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml index c62c494ee5..5a7f78e556 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml @@ -15,8 +15,6 @@ shirt: CP14ClothingShirtCottonBlack pants: CP14ClothingPantsBrown shoes: CP14ClothingShoesLongLeatherBoots - belt: CP14ModularSkeletonSwordUpgrade - neck: CP14ModularIronPickaxe # TIER 1 @@ -27,7 +25,6 @@ cloak: CP14ClothingCloakBone shirt: CP14ClothingShirtWarriorsGarbDress pants: CP14ClothingPantsLoincloth - neck: CP14ModularSkeletonHalberd shoes: CP14ClothingShoesSandals - type: startingGear @@ -36,19 +33,16 @@ outerClothing: CP14ClothingOuterClothingBoneArmor cloak: CP14ClothingCloakBone pants: CP14ClothingPantsLoincloth - belt: CP14ModularSkeletonSword shoes: CP14ClothingShoesSandals head: CP14ClothingHeadMetalHeadband inhand: - - CP14BaseShield + - CP14WeaponShieldWooden - type: startingGear id: CP14MobSkeletonDodgerT1 equipment: mask: CP14ClothingMaskSinner pants: CP14ClothingPantsLoincloth - belt: CP14ModularCopperSkimitar - belt2: CP14ModularIronDagger - type: startingGear id: CP14MobSkeletonArcherT1 @@ -56,7 +50,7 @@ shirt: CP14ClothingShirtWarriorsGarbDress pants: CP14ClothingPantsLoincloth neck: CP14BowCombat - belt: CP14ClothingBeltQuiverCopperArrow + belt: CP14ClothingBeltQuiverArrows # TIER 2 @@ -68,7 +62,6 @@ mask: CP14ClothingMaskSteelMask shirt: CP14ClothingShirtWarriorsGarbDress pants: CP14ClothingPantsLoincloth - neck: CP14ModularSkeletonHalberdUpgrade shoes: CP14ClothingShoesSandals - type: startingGear @@ -78,10 +71,9 @@ cloak: CP14ClothingCloakBone mask: CP14ClothingMaskSteelMask pants: CP14ClothingPantsLoincloth - belt: CP14ModularSkeletonSwordUpgrade shoes: CP14ClothingShoesSandals inhand: - - CP14BaseShield + - CP14WeaponTowerShieldWooden - type: startingGear id: CP14MobSkeletonDodgerT2 @@ -89,8 +81,6 @@ outerClothing: CP14ClothingOuterClothingBoneArmor mask: CP14ClothingMaskBoneHornedMask pants: CP14ClothingPantsLoincloth - belt: CP14ModularCopperSkimitarTundra - belt2: CP14ModularGoldSkimitarAgony shoes: CP14ClothingShoesSandals - type: startingGear @@ -101,8 +91,7 @@ shirt: CP14ClothingShirtCottonBlack pants: CP14ClothingPantsBrown neck: CP14BowCombat - belt: CP14ClothingBeltQuiverIronArrow - belt2: CP14ModularSkeletonSword + belt: CP14ClothingBeltQuiverArrows shoes: CP14ClothingShoesLongLeatherBoots - type: startingGear @@ -115,7 +104,6 @@ pants: CP14ClothingPantsBrown shoes: CP14ClothingShoesLongLeatherBoots ring2: CP14ClothingCloakAmuletMana - belt: CP14ModularSkeletonSword - type: startingGear id: CP14MobSkeletonBardT2 diff --git a/Resources/Prototypes/_CP14/Maps/comoss.yml b/Resources/Prototypes/_CP14/Maps/comoss.yml index 51bfed3575..0e8a75d8c8 100644 --- a/Resources/Prototypes/_CP14/Maps/comoss.yml +++ b/Resources/Prototypes/_CP14/Maps/comoss.yml @@ -19,7 +19,7 @@ #Artisans CP14Apprentice: [ 5, 5 ] CP14Alchemist: [ 2, 2 ] - CP14Blacksmith: [ 2, 2 ] + #CP14Blacksmith: [ 2, 2 ] CP14Innkeeper: [ 3, 4 ] CP14Merchant: [2, 2] #Guard diff --git a/Resources/Prototypes/_CP14/Maps/venicialis.yml b/Resources/Prototypes/_CP14/Maps/venicialis.yml index c36a58deae..85d45ef9df 100644 --- a/Resources/Prototypes/_CP14/Maps/venicialis.yml +++ b/Resources/Prototypes/_CP14/Maps/venicialis.yml @@ -19,7 +19,7 @@ #Artisans CP14Apprentice: [ 3, 3 ] CP14Alchemist: [ 2, 2 ] - CP14Blacksmith: [ 2, 2 ] + #CP14Blacksmith: [ 2, 2 ] CP14Innkeeper: [ 2, 3 ] CP14Merchant: [2, 2] #Guard diff --git a/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/chainmail.yml b/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/chainmail.yml deleted file mode 100644 index 8d4dec30f5..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/chainmail.yml +++ /dev/null @@ -1,78 +0,0 @@ -- type: modularPart - id: BaseCuissesChainmail - modifiers: - - !type:Inherit - copyFrom: - - BaseClothingArmor - -- type: modularPart - id: CuissesIronChainmail - slots: - - Cuisses - sourcePart: CP14ScrapIron - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.04 - Slash: -0.10 - Piercing: -0.01 - -- type: modularPart - id: CuissesGoldChainmail - slots: - - Cuisses - sourcePart: CP14ScrapGold - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.01 - Slash: -0.03 - - !type:EditClothingSpeed - walkModifier: 0.99 - sprintModifier: 0.99 - -- type: modularPart - id: CuissesCopperChainmail - slots: - - Cuisses - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.01 - Slash: -0.05 - -- type: modularPart - id: CuissesMithrilChainmail - slots: - - Cuisses - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Chainmail/chainmail.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.05 - Slash: -0.16 - Piercing: -0.03 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/plate.yml b/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/plate.yml deleted file mode 100644 index 7caa920edb..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Armor/Cuisses/plate.yml +++ /dev/null @@ -1,92 +0,0 @@ -- type: modularPart - id: BaseCuissesPlate - modifiers: - - !type:Inherit - copyFrom: - - BaseClothingArmor - -- type: modularPart - id: CuissesIronPlate - slots: - - Cuisses - sourcePart: CP14ScrapIron - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.05 - Slash: -0.07 - Piercing: -0.07 - Heat: -0.05 - - !type:EditClothingSpeed - walkModifier: 0.94 - sprintModifier: 0.94 - -- type: modularPart - id: CuissesGoldPlate - slots: - - Cuisses - sourcePart: CP14ScrapGold - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.01 - Slash: -0.01 - Piercing: -0.05 - - !type:EditClothingSpeed - walkModifier: 0.94 - sprintModifier: 0.94 - -- type: modularPart - id: CuissesCopperPlate - slots: - - Cuisses - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.03 - Piercing: -0.03 - Heat: -0.03 - - !type:EditClothingSpeed - walkModifier: 0.98 - sprintModifier: 0.98 - -- type: modularPart - id: CuissesMithrilPlate - slots: - - Cuisses - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Cuisses/Cuirass/cuirass.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseCuissesPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.10 - Slash: -0.10 - Piercing: -0.10 - Heat: -0.10 - - !type:EditClothingSpeed - walkModifier: 0.98 - sprintModifier: 0.98 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/chainmail.yml b/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/chainmail.yml deleted file mode 100644 index 0b24eaeee9..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/chainmail.yml +++ /dev/null @@ -1,79 +0,0 @@ -- type: modularPart - id: BaseGreaveChainmail - modifiers: - - !type:Inherit - copyFrom: - - BaseClothingArmor - -- type: modularPart - id: GreaveIronChainmail - slots: - - Greave - sourcePart: CP14ScrapIron - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseGreaveChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.10 - Piercing: -0.01 - -- type: modularPart - id: GreaveGoldChainmail - slots: - - Greave - sourcePart: CP14ScrapGold - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreaveChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.01 - Slash: -0.04 - - !type:EditClothingSpeed - walkModifier: 0.99 - sprintModifier: 0.99 - -- type: modularPart - id: GreaveCopperChainmail - slots: - - Greave - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreaveChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.01 - Slash: -0.06 - Piercing: -0.01 - -- type: modularPart - id: GreaveMithrilChainmail - slots: - - Greave - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Chainmail/chainmail.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreaveChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.05 - Slash: -0.18 - Piercing: -0.02 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/plate.yml b/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/plate.yml deleted file mode 100644 index dc3c9cc41e..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Armor/Greave/plate.yml +++ /dev/null @@ -1,92 +0,0 @@ -- type: modularPart - id: BaseGreavePlate - modifiers: - - !type:Inherit - copyFrom: - - BaseClothingArmor - -- type: modularPart - id: GreaveIronPlate - slots: - - Greave - sourcePart: CP14ScrapIron - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseGreavePlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.05 - Slash: -0.07 - Piercing: -0.07 - Heat: -0.05 - - !type:EditClothingSpeed - walkModifier: 0.96 - sprintModifier: 0.96 - -- type: modularPart - id: GreaveGoldPlate - slots: - - Greave - sourcePart: CP14ScrapGold - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreavePlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.01 - Slash: -0.01 - Piercing: -0.05 - - !type:EditClothingSpeed - walkModifier: 0.94 - sprintModifier: 0.94 - -- type: modularPart - id: GreaveCopperPlate - slots: - - Greave - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreavePlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.03 - Piercing: -0.03 - Heat: -0.03 - - !type:EditClothingSpeed - walkModifier: 0.98 - sprintModifier: 0.98 - -- type: modularPart - id: GreaveMithrilPlate - slots: - - Greave - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Clothing/OuterClothing/ModularArmor/Greave/Cuirass/cuirass.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseGreavePlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.10 - Slash: -0.10 - Piercing: -0.10 - Heat: -0.10 - - !type:EditClothingSpeed - walkModifier: 0.98 - sprintModifier: 0.98 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml deleted file mode 100644 index 779005655e..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml +++ /dev/null @@ -1,115 +0,0 @@ -#Concept: -# + Very high damage -# - Very low attack speed - -- type: modularPart - id: BaseBladeAxe - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseWeaponSharp - - !type:EditMeleeWeapon - resetOnHandSelected: true # Disable fast swap - attackRateMultiplier: 0.6 - angleMultiplier: 1.2 - bonusDamage: - types: - Slash: 14 - Piercing: 3 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 11 - Piercing: 3 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - BladeInlay - -- type: modularPart - id: BladeIronAxe - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeAxe - - BaseBladeIron - -- type: modularPart - id: BladeGoldAxe - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeAxe - - BaseBladeGold - -- type: modularPart - id: BladeCopperAxe - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeAxe - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilAxe - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Axe/metall_axe.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeAxe - - BaseBladeMithril - -- type: modularPart - id: BladeWoodenAxe - slots: - - Blade - rsiPath: _CP14/Objects/ModularTools/Blade/Axe/wooden_axe.rsi - modifiers: - - !type:AddComponents - components: - - type: StaminaDamageOnHit - damage: 4 - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseBladeWooden - - !type:EditMeleeWeapon - resetOnHandSelected: true # Disable fast swap - attackRateMultiplier: 0.6 - angleMultiplier: 1.2 - bonusDamage: - types: - Blunt: 1 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 1 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - BladeInlay diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml deleted file mode 100644 index c96094201d..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml +++ /dev/null @@ -1,60 +0,0 @@ -- type: modularPart - id: BaseBladeBone - modifiers: - - !type:EditDamageableModifier - multiplier: 2 - - !type:EditSharpened - sharpnessDamageMultiplier: 3 - - !type:EditMeleeWeapon - damageMultiplier: 0.75 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 0.75 - -- type: modularPart - id: BaseBladeWooden - modifiers: - - !type:EditDamageableModifier - multiplier: 3 - - !type:EditSharpened - sharpnessDamageMultiplier: 3 - - !type:EditMeleeWeapon - damageMultiplier: 0.25 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 0.25 - -- type: modularPart - id: BaseBladeIron - modifiers: - - !type:EditDamageableModifier - multiplier: 1 - - !type:EditSharpened - sharpnessDamageMultiplier: 1 - -- type: modularPart - id: BaseBladeCopper - modifiers: - - !type:EditDamageableModifier - multiplier: 1.5 - - !type:EditSharpened - sharpnessDamageMultiplier: 1.5 - -- type: modularPart - id: BaseBladeGold - modifiers: - - !type:EditDamageableModifier - multiplier: 2 - - !type:EditSharpened - sharpnessDamageMultiplier: 3 - -- type: modularPart - id: BaseBladeMithril - modifiers: - - !type:EditDamageableModifier - multiplier: 0.80 - - !type:EditSharpened - 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 deleted file mode 100644 index 5b94f7dfa1..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml +++ /dev/null @@ -1,89 +0,0 @@ -#Concept: -# + Fast attackRate -# fast swing -# - Low damage - -- type: modularPart - id: BaseBladeDagger - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponThrowable - - BaseWeaponChemical - - BaseWeaponSharp - - !type:AddComponents - components: - - type: ThrowingAngle - angle: 135 - - type: EmbeddableProjectile - offset: -0.15,-0.15 - removalTime: 0.5 - - !type:EditMeleeWeapon - attackRateMultiplier: 1.5 - bonusDamage: - types: - Slash: 4 - Piercing: 3 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 3 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay - -- type: modularPart - id: BladeIronDagger - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeDagger - - BaseBladeIron - -- type: modularPart - id: BladeGoldDagger - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeDagger - - BaseBladeGold - -- type: modularPart - id: BladeCopperDagger - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeDagger - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilDagger - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeDagger - - BaseBladeMithril diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml deleted file mode 100644 index fea5329389..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml +++ /dev/null @@ -1,101 +0,0 @@ -#Concept: -# hammer tool! -# High blunt damage -# Loow speed - -- type: modularPart - id: BaseBladeHammer - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponThrowable - - BaseWeaponExecution - - !type:AddComponents - components: - - type: Tool - qualities: - - CP14Hammering - useSound: - collection: CP14Hammering - params: - variation: 0.03 - volume: 2 - - type: DamageOtherOnHit - damage: - types: - Blunt: 7 - - type: DamageOnLand - damage: - types: - Blunt: 7 - - type: StaminaDamageOnHit - damage: 4 - - !type:EditMeleeWeapon - bonusDamage: - types: - Blunt: 7 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 5 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditDamageableModifier # How you can break a hammer? - multiplier: 0.8 - - !type:EditModularSlots - addSlots: - - BladeInlay - -- type: modularPart - id: BladeIronHammer - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHammer - - BaseBladeIron - -- type: modularPart - id: BladeGoldHammer - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHammer - - BaseBladeGold - -- type: modularPart - id: BladeCopperHammer - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHammer - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilHammer - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHammer - - BaseBladeMithril - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml deleted file mode 100644 index dad8465f91..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml +++ /dev/null @@ -1,99 +0,0 @@ -#Concept: -# Copy of dagger with bigger damage, but without throwing -- type: modularPart - id: BaseBladeHoe - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseWeaponThrowable - - BaseWeaponExecution - #components: TODO Add gathering tag - - !type:AddComponents - override: true - components: - - type: DamageOtherOnHit - damage: - types: - Piercing: 6 - - type: ThrowingAngle - angle: 135 - - type: EmbeddableProjectile - offset: -0.15,-0.15 - removalTime: 0.5 - - type: CP14EditTileTool - sound: - collection: CP14Digging - tileReplace: - CP14FloorDirt: CP14FloorDirtSeedbed - CP14FloorDirtSeedbed: CP14FloorDirt - - !type:EditMeleeWeapon - newWideAnimation: CP14WeaponArcThrust - attackRateMultiplier: 1.5 - bonusDamage: - types: - Piercing: 6 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 3 - - !type:EditDamageableModifier # Improvised weapon - multiplier: 1.2 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - Garde - -- type: modularPart - id: BladeIronHoe - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHoe - - BaseBladeIron - -- type: modularPart - id: BladeGoldHoe - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHoe - - BaseBladeGold - -- type: modularPart - id: BladeCopperHoe - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHoe - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilHoe - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeHoe - - BaseBladeMithril diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml deleted file mode 100644 index bb578b9d3e..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml +++ /dev/null @@ -1,78 +0,0 @@ -#Concept: -# + High Wielded damage -# - Low AttackRate - -- type: modularPart - id: BaseBladeMace - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseWeaponExecution - - !type:EditMeleeWeapon - resetOnHandSelected: true # Disable fast swap - attackRateMultiplier: 0.85 - bonusDamage: - types: - Blunt: 5 - Piercing: 2 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 8 - Piercing: 4 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - -- type: modularPart - id: BladeIronMace - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMace - - BaseBladeIron - -- type: modularPart - id: BladeGoldMace - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMace - - BaseBladeGold - -- type: modularPart - id: BladeCopperMace - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMace - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilMace - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMace - - BaseBladeMithril diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml deleted file mode 100644 index cb14574735..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml +++ /dev/null @@ -1,67 +0,0 @@ -# Concept: the mop -# Cleans puddles -# Standard attack speed -# Reasonable blunt damage (mop-fu real) -# Fragile; not a real weapon, should not take the place of one long-term -- type: modularPart - id: BaseBladeMop - modifiers: - - !type:AddComponents - override: true - components: - - type: Spillable - solution: absorbed - - type: Absorbent - - type: SolutionContainerManager - solutions: - absorbed: - maxVol: 50 - - !type:EditMeleeWeapon - bonusDamage: - types: - Blunt: 5 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 5 - - !type:EditDamageableModifier # Improvised weapon - multiplier: 1.2 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - Garde # Remember, Ed asked for this - - BladeInlay # Ed didn't ask for this, but it's REALLY funny - -- type: modularPart - id: BladeWoodMop - slots: - - Blade - rsiPath: _CP14/Objects/ModularTools/Blade/Mop/mop.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMop - - BaseBladeIron # TODO wood weapons are planned, revisit this when they're done - - !type:EditDamageableModifier - multiplier: 2 # For now, we treat it as weaker iron - -- type: modularPart - id: BladeLucensMop - slots: - - Blade - rsiPath: _CP14/Objects/ModularTools/Blade/Mop/lucens_mop.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeMop - - BaseBladeMithril # TODO wood weapons might mean lucens weapons? - - !type:AddComponents - override: true - components: - - type: SolutionContainerManager - solutions: - absorbed: - maxVol: 100 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml deleted file mode 100644 index 829c85e64c..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml +++ /dev/null @@ -1,89 +0,0 @@ -- type: modularPart - id: BaseBladePickaxe - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponExecution - - !type:AddComponents - override: true - components: - - type: Tool - qualities: - - Prying - useSound: - path: /Audio/Items/crowbar.ogg - - type: ToolTileCompatible - - type: Prying - - type: EmitSoundOnLand - sound: - path: /Audio/Items/crowbar_drop.ogg #Add to all modular weapons? - - !type:EditMeleeWeapon - attackRateMultiplier: 0.55 - angleMultiplier: 1.2 - bonusDamage: - types: - Piercing: 10 - Structural: 4 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 6 - Structural: 17 - - !type:EditItem - newSize: Normal - adjustShape: 1, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - BladeInlay - -- type: modularPart - id: BladeIronPickaxe - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladePickaxe - - BaseBladeIron - -- type: modularPart - id: BladeGoldPickaxe - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladePickaxe - - BaseBladeGold - -- type: modularPart - id: BladeCopperPickaxe - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladePickaxe - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilPickaxe - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladePickaxe - - BaseBladeMithril diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml deleted file mode 100644 index d86e6d83be..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml +++ /dev/null @@ -1,121 +0,0 @@ -#Concept: -# + Additional range -# + High Damage! And speed -# - Required Warcraft skill - -- type: modularPart - id: BaseBladeRapier - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseWeaponSharp - - !type:AddComponents - components: - - type: CP14MeleeWeaponSkillRequired - skills: - - RapierMastery - - !type:EditMeleeWeapon - newWideAnimation: CP14WeaponArcThrust - resetOnHandSelected: true # Disable fast swap - bonusRange: 0.2 - angleMultiplier: 0.6 - attackRateMultiplier: 1.4 - bonusDamage: - types: - Piercing: 11 - - !type:EditItem - newSize: Large - adjustShape: 0, 2 - storedOffsetBonus: 0, 10 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay - - !type:EditDamageableModifier # Only 1 ingot craft, so less health - multiplier: 2 - -- type: modularPart - id: BladeIronRapier - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeRapier - - BaseBladeIron - -- type: modularPart - id: BladeGoldRapier - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeRapier - - BaseBladeGold - -- type: modularPart - id: BladeCopperRapier - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeRapier - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilRapier - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeRapier - - BaseBladeMithril - -- type: modularPart - id: BladeWoodenRapier - slots: - - Blade - rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi - modifiers: - - !type:AddComponents - components: - - type: StaminaDamageOnHit - damage: 3 - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseBladeWooden - - !type:AddComponents - components: - - !type:EditMeleeWeapon - newWideAnimation: CP14WeaponArcThrust - resetOnHandSelected: true # Disable fast swap - bonusRange: 0.2 - angleMultiplier: 0 - attackRateMultiplier: 1.4 - bonusDamage: - types: - Blunt: 1 - - !type:EditItem - newSize: Large - adjustShape: 0, 2 - storedOffsetBonus: 0, 10 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml deleted file mode 100644 index 2faa6d2e9f..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml +++ /dev/null @@ -1,89 +0,0 @@ -- type: modularPart - id: BaseBladeShovel - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponExecution - - !type:AddComponents - components: - - type: Shovel - - type: ToolTileCompatible - - type: Tool - qualities: - - CP14Digging - useSound: - collection: CP14Digging - params: - variation: 0.03 - volume: 2 - - !type:EditMeleeWeapon - angleMultiplier: 1.2 - bonusDamage: - types: - Slash: 3 - Blunt: 3 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 1 - Blunt: 3 - - !type:EditDamageableModifier # Improvised weapon - multiplier: 1.2 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - BladeInlay - -- type: modularPart - id: BladeIronShovel - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeShovel - - BaseBladeIron - -- type: modularPart - id: BladeGoldShovel - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeShovel - - BaseBladeGold - -- type: modularPart - id: BladeCopperShovel - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeShovel - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilShovel - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeShovel - - BaseBladeMithril diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml deleted file mode 100644 index 74549018fd..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml +++ /dev/null @@ -1,78 +0,0 @@ -#Concept: -# Copy of dagger with bigger damage, but without throwing -- type: modularPart - id: BaseBladeSickle - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseWeaponSharp - #components: TODO Add gathering tag - - !type:EditMeleeWeapon - attackRateMultiplier: 1.5 - bonusDamage: - types: - Slash: 5 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 3 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay - -- type: modularPart - id: BladeIronSickle - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSickle - - BaseBladeIron - -- type: modularPart - id: BladeGoldSickle - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSickle - - BaseBladeGold - -- type: modularPart - id: BladeCopperSickle - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSickle - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilSickle - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSickle - - BaseBladeMithril diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml deleted file mode 100644 index 93649b9287..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml +++ /dev/null @@ -1,88 +0,0 @@ -#Concept: -# + Additional range -# + High Damage! + Wielded buff -# - Required Warcraft skill - -- type: modularPart - id: BaseBladeSkimitar - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseWeaponSharp - - !type:AddComponents - components: - - type: CP14MeleeWeaponSkillRequired - skills: - - SkimitarMastery - - !type:EditMeleeWeapon - resetOnHandSelected: false # We can fast swing! - bonusRange: 0.2 - angleMultiplier: 1.5 - bonusDamage: - types: - Slash: 8 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 16 - - !type:EditItem - newSize: Large - adjustShape: 0, 2 - storedOffsetBonus: 0, 10 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay - -- type: modularPart - id: BladeIronSkimitar - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSkimitar - - BaseBladeIron - -- type: modularPart - id: BladeGoldSkimitar - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSkimitar - - BaseBladeGold - -- type: modularPart - id: BladeCopperSkimitar - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSkimitar - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilSkimitar - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSkimitar - - BaseBladeMithril - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml deleted file mode 100644 index c6ac26bb3f..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml +++ /dev/null @@ -1,142 +0,0 @@ -#Concept: -# + High Throwable damage -# Piercing animation -# - Low Melee Damage - -- type: modularPart - id: BaseBladeSpear - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponThrowable - - BaseWeaponChemical - - BaseWeaponSharp - - !type:AddComponents - override: true - components: - - type: DamageOtherOnHit - damage: - types: - Piercing: 16 - - type: ThrowingAngle - angle: 135 - - type: EmbeddableProjectile - offset: -0.15,-0.15 - removalTime: 1.5 - - !type:EditMeleeWeapon - newWideAnimation: CP14WeaponArcThrust - angleMultiplier: 0 - bonusRange: 0.2 - bonusDamage: - types: - Piercing: 8 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 3 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay - -- type: modularPart - id: BladeIronSpear - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSpear - - BaseBladeIron - -- type: modularPart - id: BladeGoldSpear - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSpear - - BaseBladeGold - -- type: modularPart - id: BladeCopperSpear - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSpear - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilSpear - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSpear - - BaseBladeMithril - -- type: modularPart - id: BladeWoodenSpear - slots: - - Blade - rsiPath: _CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi - modifiers: - - !type:AddComponents - components: - - type: StaminaDamageOnHit - damage: 3 - - !type:Inherit - copyFrom: - - BaseWeaponThrowable - - BaseWeaponChemical - - BaseBladeWooden - - !type:AddComponents - override: true - components: - - type: DamageOtherOnHit - damage: - types: - Blunt: 1 - - type: ThrowingAngle - angle: 135 - - type: EmbeddableProjectile - offset: -0.15,-0.15 - removalTime: 1.5 - - !type:EditMeleeWeapon - newWideAnimation: CP14WeaponArcThrust - angleMultiplier: 0 - bonusRange: 0.2 - bonusDamage: - types: - Blunt: 1 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 1 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml deleted file mode 100644 index 6a11385846..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml +++ /dev/null @@ -1,137 +0,0 @@ -#Concept: -# + Additional range -# + High Damage! + Wielded buff -# - Required Warcraft skill - -- type: modularPart - id: BaseBladeSword - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseWeaponSharp - - !type:AddComponents - components: - - type: CP14MeleeWeaponSkillRequired - skills: - - SwordMastery - - !type:EditMeleeWeapon - resetOnHandSelected: true # Disable fast swap - bonusRange: 0.2 - angleMultiplier: 1.2 - bonusDamage: - types: - Slash: 9 - Piercing: 5 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Slash: 5 - Piercing: 2 - - !type:EditItem - newSize: Large - adjustShape: 0, 2 - storedOffsetBonus: 0, 10 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay - -- type: modularPart - id: BladeIronSword - slots: - - Blade - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSword - - BaseBladeIron - -- type: modularPart - id: BladeGoldSword - slots: - - Blade - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSword - - BaseBladeGold - -- type: modularPart - id: BladeCopperSword - slots: - - Blade - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSword - - BaseBladeCopper - -- type: modularPart - id: BladeMithrilSword - slots: - - Blade - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSword - - BaseBladeMithril - -- type: modularPart - id: BladeBoneSword - slots: - - Blade - sourcePart: CP14Bone1 - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseBladeSword - - BaseBladeBone - -- type: modularPart - id: BladeWoodenSword - slots: - - Blade - rsiPath: _CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi - modifiers: - - !type:AddComponents - components: - - type: StaminaDamageOnHit - damage: 4 - - !type:Inherit - copyFrom: - - BaseWeaponChemical - - BaseBladeWooden - - !type:AddComponents - components: - - !type:EditMeleeWeapon - resetOnHandSelected: true # Disable fast swap - bonusRange: 0.2 - angleMultiplier: 1.2 - bonusDamage: - types: - Blunt: 1 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Blunt: 1 - - !type:EditItem - newSize: Large - adjustShape: 0, 2 - storedOffsetBonus: 0, 10 - - !type:EditModularSlots - addSlots: - - Garde - - BladeInlay diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml deleted file mode 100644 index 556e8571d0..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Concept -# + Damage + durability - -- type: modularPart - id: BaseGardeGuildmaster - modifiers: - - !type:EditDamageableModifier - multiplier: 0.8 - - !type:EditSharpened - sharpnessDamageMultiplier: 0.8 - - !type:EditMeleeWeapon - damageMultiplier: 1.2 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 1.2 - -- type: modularPart - id: GardeGuildmaster - slots: - - Garde - rsiPath: _CP14/Objects/ModularTools/Garde/guildmaster_garde.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeGuildmaster - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml deleted file mode 100644 index 2f10d093e2..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml +++ /dev/null @@ -1,68 +0,0 @@ -# Concept -# + Damage - -- type: modularPart - id: BaseGardeSharp - modifiers: - - !type:EditMeleeWeapon - damageMultiplier: 1.2 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 1.2 - -- type: modularPart - id: GardeSharpIron - slots: - - Garde - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSharp - -- type: modularPart - id: GardeSharpGold - slots: - - Garde - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSharp - -- type: modularPart - id: GardeSharpCopper - slots: - - Garde - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSharp - -- type: modularPart - id: GardeSharpMithril - slots: - - Garde - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sharp.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSharp - -- type: modularPart - id: GardeSharpWooden - slots: - - Garde - rsiPath: _CP14/Objects/ModularTools/Garde/wooden_sharp.rsi - modifiers: - - !type:EditMeleeWeapon - damageMultiplier: 1.1 - - !type:EditIncreaseDamageOnWield - damageMultiplier: 1.0 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/sturdy.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/sturdy.yml deleted file mode 100644 index 2a4a6c4771..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Garde/sturdy.yml +++ /dev/null @@ -1,68 +0,0 @@ -# Concept -# + Durability - -- type: modularPart - id: BaseGardeSturdy - modifiers: - - !type:EditDamageableModifier - multiplier: 0.8 - - !type:EditSharpened - sharpnessDamageMultiplier: 0.8 - -- type: modularPart - id: GardeSturdyIron - slots: - - Garde - sourcePart: CP14ScrapIron - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSturdy - -- type: modularPart - id: GardeSturdyGold - slots: - - Garde - sourcePart: CP14ScrapGold - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSturdy - -- type: modularPart - id: GardeSturdyCopper - slots: - - Garde - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSturdy - -- type: modularPart - id: GardeSturdyMithril - slots: - - Garde - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Objects/ModularTools/Garde/metall_sturdy.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseGardeSturdy - -- type: modularPart - id: GardeSturdyWooden - slots: - - Garde - rsiPath: _CP14/Objects/ModularTools/Garde/wooden_sturdy.rsi - modifiers: - - !type:EditDamageableModifier - multiplier: 0.9 - - !type:EditSharpened - sharpnessDamageMultiplier: 0.9 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Helmet/Aventail/chainmail.yml b/Resources/Prototypes/_CP14/ModularCraft/Helmet/Aventail/chainmail.yml deleted file mode 100644 index 891a1332fa..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Helmet/Aventail/chainmail.yml +++ /dev/null @@ -1,72 +0,0 @@ -- type: modularPart - id: BaseAventailChainmail - modifiers: - - !type:Inherit - copyFrom: - - BaseClothingArmor - -- type: modularPart - id: AventailIronChainmail - slots: - - Aventail - sourcePart: CP14ScrapIron - rsiPath: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseAventailChainmail - - !type:EditArmor - modifiers: - coefficients: - Slash: -0.06 - Piercing: -0.01 - -- type: modularPart - id: AventailGoldChainmail - slots: - - Aventail - sourcePart: CP14ScrapGold - rsiPath: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseAventailChainmail - - !type:EditArmor - modifiers: - coefficients: - Slash: -0.03 - -- type: modularPart - id: AventailCopperChainmail - slots: - - Aventail - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseAventailChainmail - - !type:EditArmor - modifiers: - coefficients: - Slash: -0.04 - -- type: modularPart - id: AventailMithrilChainmail - slots: - - Aventail - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Clothing/Head/ModularArmor/Aventail/chainmail.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseAventailChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.07 - Piercing: -0.02 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Helmet/Aventail/plate.yml b/Resources/Prototypes/_CP14/ModularCraft/Helmet/Aventail/plate.yml deleted file mode 100644 index e6bfdca584..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Helmet/Aventail/plate.yml +++ /dev/null @@ -1,92 +0,0 @@ -- type: modularPart - id: BaseAventailPlate - modifiers: - - !type:Inherit - copyFrom: - - BaseClothingArmor - -- type: modularPart - id: AventailIronPlate - slots: - - Aventail - sourcePart: CP14ScrapIron - rsiPath: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseAventailPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.04 - Slash: -0.02 - Piercing: -0.05 - Heat: -0.04 - - !type:EditClothingSpeed - walkModifier: 0.99 - sprintModifier: 0.99 - -- type: modularPart - id: AventailGoldPlate - slots: - - Aventail - sourcePart: CP14ScrapGold - rsiPath: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseAventailPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.01 - Slash: -0.01 - Piercing: -0.03 - - !type:EditClothingSpeed - walkModifier: 0.98 - sprintModifier: 0.98 - -- type: modularPart - id: AventailCopperPlate - slots: - - Aventail - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseAventailPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.01 - Piercing: -0.03 - Heat: -0.02 - - !type:EditClothingSpeed - walkModifier: 0.99 - sprintModifier: 0.99 - -- type: modularPart - id: AventailMithrilPlate - slots: - - Aventail - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Clothing/Head/ModularArmor/Aventail/plate.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseAventailPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.06 - Slash: -0.03 - Piercing: -0.08 - Heat: -0.08 - - !type:EditClothingSpeed - walkModifier: 0.99 - sprintModifier: 0.99 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Helmet/Visor/chainmail.yml b/Resources/Prototypes/_CP14/ModularCraft/Helmet/Visor/chainmail.yml deleted file mode 100644 index 20dc6bd1b3..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Helmet/Visor/chainmail.yml +++ /dev/null @@ -1,72 +0,0 @@ -- type: modularPart - id: BaseVisorChainmail - modifiers: - - !type:Inherit - copyFrom: - - BaseClothingArmor - -- type: modularPart - id: VisorIronChainmail - slots: - - Visor - sourcePart: CP14ScrapIron - rsiPath: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseVisorChainmail - - !type:EditArmor - modifiers: - coefficients: - Slash: -0.06 - Piercing: -0.01 - -- type: modularPart - id: VisorGoldChainmail - slots: - - Visor - sourcePart: CP14ScrapGold - rsiPath: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseVisorChainmail - - !type:EditArmor - modifiers: - coefficients: - Slash: -0.03 - -- type: modularPart - id: VisorCopperChainmail - slots: - - Visor - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseVisorChainmail - - !type:EditArmor - modifiers: - coefficients: - Slash: -0.04 - -- type: modularPart - id: VisorMithrilChainmail - slots: - - Visor - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Clothing/Head/ModularArmor/Visor/chainmail.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseVisorChainmail - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.07 - Piercing: -0.02 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Helmet/Visor/plate.yml b/Resources/Prototypes/_CP14/ModularCraft/Helmet/Visor/plate.yml deleted file mode 100644 index f47414c4d8..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Helmet/Visor/plate.yml +++ /dev/null @@ -1,92 +0,0 @@ -- type: modularPart - id: BaseVisorPlate - modifiers: - - !type:Inherit - copyFrom: - - BaseClothingArmor - -- type: modularPart - id: VisorIronPlate - slots: - - Visor - sourcePart: CP14ScrapIron - rsiPath: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseVisorPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.04 - Slash: -0.02 - Piercing: -0.05 - Heat: -0.04 - - !type:EditClothingSpeed - walkModifier: 0.99 - sprintModifier: 0.99 - -- type: modularPart - id: VisorGoldPlate - slots: - - Visor - sourcePart: CP14ScrapGold - rsiPath: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseVisorPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.01 - Slash: -0.01 - Piercing: -0.03 - - !type:EditClothingSpeed - walkModifier: 0.98 - sprintModifier: 0.98 - -- type: modularPart - id: VisorCopperPlate - slots: - - Visor - sourcePart: CP14ScrapCopper - rsiPath: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseVisorPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.03 - Slash: -0.01 - Piercing: -0.03 - Heat: -0.02 - - !type:EditClothingSpeed - walkModifier: 0.99 - sprintModifier: 0.99 - -- type: modularPart - id: VisorMithrilPlate - slots: - - Visor - sourcePart: CP14ScrapMithril - rsiPath: _CP14/Clothing/Head/ModularArmor/Visor/plate.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseVisorPlate - - !type:EditArmor - modifiers: - coefficients: - Blunt: -0.06 - Slash: -0.03 - Piercing: -0.08 - Heat: -0.08 - - !type:EditClothingSpeed - walkModifier: 0.99 - sprintModifier: 0.99 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Inlay/quartz.yml b/Resources/Prototypes/_CP14/ModularCraft/Inlay/quartz.yml deleted file mode 100644 index 0a058bab33..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Inlay/quartz.yml +++ /dev/null @@ -1,129 +0,0 @@ -- type: modularPart - id: InlayQuartzWater - slots: - - BladeInlay - rsiPath: _CP14/Objects/ModularTools/Inlay/quartz.rsi - color: "#5eabeb" - modifiers: - - !type:AddComponents - components: - - type: CP14SpellEffectOnHit - effects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectFreeze - - !type:CP14SpellApplyEntityEffect - effects: - - !type:MovespeedModifier - walkSpeedModifier: 0.75 - sprintSpeedModifier: 0.75 - statusLifetime: 2 - - !type:AdjustTemperature - amount: -6000 - - !type:ExtinguishReaction - -- type: modularPart - id: InlayQuartzHealing - slots: - - BladeInlay - rsiPath: _CP14/Objects/ModularTools/Inlay/quartz.rsi - color: "#79b330" - modifiers: - - !type:AddComponents - components: - - type: CP14SpellEffectOnHit - effects: - - !type:CP14SpellApplyEntityEffect - effects: - - !type:HealthChange - damage: - types: - Slash: -0.5 - Blunt: -0.5 - Piercing: -0.5 - Poison: -0.5 - Bloodloss: -0.5 - Caustic: -0.5 - Cold: -0.5 - Heat: -0.5 - Shock: -0.5 - - !type:Jitter - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectCureWounds - -- type: modularPart - id: InlayQuartzFire - slots: - - BladeInlay - rsiPath: _CP14/Objects/ModularTools/Inlay/quartz.rsi - color: "#ed731c" - modifiers: - - !type:AddComponents - components: - - type: CP14SpellEffectOnHit - whitelist: - components: - - MobState #Please dont burn all map - effects: - - !type:CP14SpellApplyEntityEffect - effects: - - !type:FlammableReaction - multiplier: 0.5 - - !type:AdjustTemperature - amount: 6000 - - !type:Ignite - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectFlameCreation - -- type: modularPart - id: InlayQuartzLight - slots: - - BladeInlay - rsiPath: _CP14/Objects/ModularTools/Inlay/quartz.rsi - color: "#f1c7ff" - modifiers: - - !type:AddComponents - components: - - type: PointLight - color: "#f1c7ff" - radius: 3 - -- type: modularPart - id: InlayQuartzElectric - slots: - - BladeInlay - rsiPath: _CP14/Objects/ModularTools/Inlay/quartz.rsi - color: "#e6ff6b" - modifiers: - - !type:AddComponents - components: - - type: CP14SpellEffectOnHit - effects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ElectrifiedEffect - - !type:CP14SpellApplyEntityEffect - effects: - - !type:Jitter - - !type:CP14StaminaChange - staminaDelta: -5 - -- type: modularPart - id: InlayQuartzDarkness - slots: - - BladeInlay - rsiPath: _CP14/Objects/ModularTools/Inlay/quartz.rsi - color: "#391c57" - modifiers: - - !type:AddComponents - components: - - type: CP14SpellEffectOnHit - effects: - - !type:CP14SpellThrowFromUser - throwPower: 9 - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14ImpactEffectShadowGrab - diff --git a/Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml b/Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml deleted file mode 100644 index fb1ada2ac6..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml +++ /dev/null @@ -1,96 +0,0 @@ -- type: modularPart - id: BaseTipArrow - modifiers: - - !type:Inherit - copyFrom: - - BaseWeaponRangedChemical - - !type:EditMeleeWeapon - resetOnHandSelected: true # Disable fast swap #Ed: Wtf? Why arrows have melee buffs?? - attackRateMultiplier: 1.4 - bonusDamage: - types: - Piercing: 3 - - !type:EditItem - newSize: Small - - !type:EditModularSlots - addSlots: - - Rod - -- type: modularPart - id: TipIronArrow - slots: - - ArrowTip - rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi - modifiers: - - !type:Inherit - copyFrom: - - BaseTipArrow - - BaseBladeIron - - !type:AddComponents - components: - - type: Projectile - deleteOnCollide: false - onlyCollideWhenShot: true - damage: - types: - Piercing: 25 - -- type: modularPart - id: TipGoldArrow - slots: - - ArrowTip - rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi - color: "#ffe269" - modifiers: - - !type:Inherit - copyFrom: - - BaseTipArrow - - BaseBladeGold - - !type:AddComponents - components: - - type: Projectile - deleteOnCollide: false - onlyCollideWhenShot: true - damage: - types: - Piercing: 15 - -- type: modularPart - id: TipCopperArrow - slots: - - ArrowTip - rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi - color: "#e28f08" - modifiers: - - !type:Inherit - copyFrom: - - BaseTipArrow - - BaseBladeCopper - - !type:AddComponents - components: - - type: Projectile - deleteOnCollide: false - onlyCollideWhenShot: true - damage: - types: - Piercing: 15 - -- type: modularPart - id: TipMithrilArrow - slots: - - ArrowTip - rsiPath: _CP14/Objects/ModularTools/Tip/arrow.rsi - color: "#38f0b3" - modifiers: - - !type:Inherit - copyFrom: - - BaseTipArrow - - BaseBladeMithril - - !type:AddComponents - components: - - type: Projectile - deleteOnCollide: false - onlyCollideWhenShot: true - damage: - types: - Piercing: 30 diff --git a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml deleted file mode 100644 index 89f3fe70aa..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml +++ /dev/null @@ -1,116 +0,0 @@ -- type: modularPart - id: BaseWeaponChemical - modifiers: - - !type:AddComponents - components: - - type: SolutionContainerManager - solutions: - melee: - maxVol: 4 - - type: MeleeChemicalInjector - solution: melee - - type: RefillableSolution - solution: melee - - type: InjectableSolution - solution: melee - - type: SolutionInjectOnEmbed - transferAmount: 2 - solution: melee - - type: SolutionTransfer - maxTransferAmount: 2 - -- type: modularPart - id: BaseWeaponThrowable - modifiers: - - !type:AddComponents - components: - - type: LandAtCursor - - type: DamageOtherOnHit - damage: - types: - Piercing: 10 - - type: DamageOnLand - damage: - types: - Piercing: 3 - - type: Fixtures - fixtures: - fix1: - shape: !type:PolygonShape - vertices: - - -0.40,-0.30 - - -0.30,-0.40 - - 0.40,0.30 - - 0.30,0.40 - density: 10 - mask: - - ItemMask - restitution: 0.3 - friction: 0.2 - -- type: modularPart - id: BaseWeaponSharp - modifiers: - - !type:AddComponents - components: - - type: Sharp - - type: CP14Sharpened - - type: CP14SharpeningStone - - type: UseDelay - - type: Tool - qualities: - - Slicing - useSound: - path: /Audio/Items/Culinary/chop.ogg - - type: Utensil - types: - - Knife - - type: CP14WallpaperRemover - - type: Execution - -- type: modularPart - id: BaseWeaponRangedChemical - modifiers: - - !type:AddComponents - components: - - type: SolutionContainerManager - solutions: - ammo: - maxVol: 2 - - type: MeleeChemicalInjector - solution: ammo - - type: RefillableSolution - solution: ammo - - type: InjectableSolution - solution: ammo - - type: SolutionInjectOnEmbed - transferAmount: 2 - solution: ammo - - type: SolutionTransfer - maxTransferAmount: 2 - - type: SolutionContainerVisuals - maxFillLevels: 1 - fillBaseName: solution - -- type: modularPart - id: BaseClothingArmor - modifiers: - - !type:AddComponents - components: - - type: Item - size: Small - -- type: modularPart - id: BaseWeaponExecution - modifiers: - - !type:AddComponents - components: - - type: Execution - internalMeleeExecutionMessage: "cp14-execution-popup-melee-initial-internal" - externalMeleeExecutionMessage: "cp14-execution-popup-melee-initial-external" - completeInternalMeleeExecutionMessage: "cp14-execution-popup-melee-complete-internal" - completeExternalMeleeExecutionMessage: "cp14-execution-popup-melee-complete-external" - internalSelfExecutionMessage: "cp14-execution-popup-self-initial-internal" - externalSelfExecutionMessage: "cp14-execution-popup-self-initial-external" - completeInternalSelfExecutionMessage: "cp14-execution-popup-self-complete-internal" - completeExternalSelfExecutionMessage: "cp14-execution-popup-self-complete-external" diff --git a/Resources/Prototypes/_CP14/ModularCraft/slots.yml b/Resources/Prototypes/_CP14/ModularCraft/slots.yml deleted file mode 100644 index 2a1919c706..0000000000 --- a/Resources/Prototypes/_CP14/ModularCraft/slots.yml +++ /dev/null @@ -1,35 +0,0 @@ -- type: modularSlot - id: Blade - name: cp14-modular-slot-blade - -- type: modularSlot - id: Garde - name: cp14-modular-slot-garde - -- type: modularSlot - id: BladeInlay - name: cp14-modular-slot-blade-inlay - -- type: modularSlot - id: Rod - name: cp14-modular-slot-rod - -- type: modularSlot - id: ArrowTip - name: cp14-modular-slot-arrow-tip - -- type: modularSlot - id: Cuisses - name: cp14-modular-slot-cuisses - -- type: modularSlot - id: Greave - name: cp14-modular-slot-greave - -- type: modularSlot - id: Visor - name: cp14-modular-slot-visor - -- type: modularSlot - id: Aventail - name: cp14-modular-slot-aventail diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/armor.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/armor.yml deleted file mode 100644 index 5f5cd58a12..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/armor.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: constructionGraph - id: CP14BoneArmor - start: start - graph: - - node: start - edges: - - to: cp14bonearmor - steps: - - material: CP14Bone - amount: 10 - - material: CP14Bone - amount: 5 - doAfter: 8 - - - node: cp14bonearmor - entity: CP14ClothingOuterClothingBoneArmor diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/bone_weapon.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/bone_weapon.yml deleted file mode 100644 index d45211684d..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Crafting/Graphs/improvised/bone_weapon.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: constructionGraph - id: CP14BoneSword - start: start - graph: - - node: start - edges: - - to: cp14bonesword - steps: - - material: CP14Bone - amount: 5 - doAfter: 4 - - - node: cp14bonesword - entity: CP14ModularBladeBoneSword diff --git a/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml b/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml index 92e7899629..ca5e5d1c6f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/_CP14/Recipes/Crafting/improvised.yml @@ -23,22 +23,4 @@ startNode: start targetNode: cp14torch category: construction-category-tools - objectType: Item - -- type: construction - crystallPunkAllowed: true - id: cp14bladebonesword - graph: CP14BoneSword - startNode: start - targetNode: cp14bonesword - category: construction-category-weapons - objectType: Item - -- type: construction - crystallPunkAllowed: true - id: cp14bonearmor - graph: CP14BoneArmor - startNode: start - targetNode: cp14bonearmor - category: construction-category-clothing - objectType: Item + objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml index 6747a72474..e021a8ff75 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml @@ -1,10 +1,8 @@ - type: CP14Recipe - id: CP14BaseShield + id: CP14WeaponShieldWooden tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14WoodenPlanks @@ -12,27 +10,37 @@ - !type:StackResource stack: CP14IronBar count: 2 - result: CP14BaseShield + result: CP14WeaponShieldWooden + +- type: CP14Recipe + id: CP14WeaponTowerShieldWooden + tag: CP14RecipeAnvil + category: Weapon + craftTime: 1 + requirements: + - !type:StackResource + stack: CP14WoodenPlanks + count: 5 + - !type:StackResource + stack: CP14IronBar + count: 4 + result: CP14WeaponTowerShieldWooden - type: CP14Recipe id: CP14BaseWrench tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar - count: 2 + count: 1 result: CP14BaseWrench - type: CP14Recipe id: CP14PlatePie tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar # Physical Composition in item @@ -44,9 +52,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - IronMelting - - CopperMelting requirements: - !type:StackResource stack: CP14CopperBar # Physical Composition in item @@ -61,8 +66,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -74,8 +77,6 @@ tag: CP14RecipeAnvil category: Armor craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -87,8 +88,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - CopperMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -101,8 +100,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -115,8 +112,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - GoldMelting requirements: - !type:StackResource stack: CP14GoldBar @@ -129,8 +124,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - MithrilMelting requirements: - !type:StackResource stack: CP14MithrilBar @@ -143,8 +136,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - CopperMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -157,8 +148,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -171,8 +160,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - GoldMelting requirements: - !type:StackResource stack: CP14GoldBar @@ -185,8 +172,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - MithrilMelting requirements: - !type:StackResource stack: CP14MithrilBar @@ -199,8 +184,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -212,8 +195,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - MithrilMelting requirements: - !type:StackResource stack: CP14MithrilBar @@ -225,9 +206,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - CopperMelting - - IronMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -245,8 +223,6 @@ tag: CP14RecipeAnvil category: Weapon craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -261,8 +237,6 @@ tag: CP14RecipeAnvil category: Armor craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -274,8 +248,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - CopperMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -287,8 +259,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -300,8 +270,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - GoldMelting requirements: - !type:StackResource stack: CP14GoldBar @@ -313,8 +281,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - MithrilMelting requirements: - !type:StackResource stack: CP14MithrilBar @@ -326,8 +292,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -339,8 +303,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - CopperMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -352,8 +314,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -365,8 +325,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - GoldMelting requirements: - !type:StackResource stack: CP14GoldBar @@ -378,8 +336,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - MithrilMelting requirements: - !type:StackResource stack: CP14MithrilBar @@ -391,8 +347,6 @@ tag: CP14RecipeAnvil category: Tools craftTime: 1 - requiredSkills: - - CopperMelting requirements: - !type:ProtoIdResource protoId: CP14CrystalShardQuartz @@ -406,8 +360,6 @@ id: CP14Fork tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -419,8 +371,6 @@ id: CP14Spoon tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -432,8 +382,6 @@ id: CP14SteelGobletCopper tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - CopperMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -444,8 +392,6 @@ id: CP14SteelGobletIron tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -456,8 +402,6 @@ id: CP14SteelGobletGold tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - GoldMelting requirements: - !type:StackResource stack: CP14GoldBar @@ -468,8 +412,6 @@ id: CP14FryingPan tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -483,8 +425,6 @@ id: CP14CookingPot tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar @@ -495,8 +435,6 @@ id: CP14IronBuckleRecipe tag: CP14RecipeAnvil craftTime: 1 - requiredSkills: - - IronMelting requirements: - !type:StackResource stack: CP14IronBar diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_aventail.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_aventail.yml deleted file mode 100644 index 8d761c1b2c..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_aventail.yml +++ /dev/null @@ -1,108 +0,0 @@ - -# Plate - -- type: CP14Recipe - id: CP14ModularAventailIronPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularAventailIronPlate - -- type: CP14Recipe - id: CP14ModularAventailGoldPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularAventailGoldPlate - -- type: CP14Recipe - id: CP14ModularAventailCopperPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularAventailCopperPlate - -- type: CP14Recipe - id: CP14ModularAventailMithrilPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularAventailMithrilPlate - -# Chainmail - -- type: CP14Recipe - id: CP14ModularAventailIronChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularAventailIronChainmail - -- type: CP14Recipe - id: CP14ModularAventailGoldChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularAventailGoldChainmail - -- type: CP14Recipe - id: CP14ModularAventailCopperChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularAventailCopperChainmail - -- type: CP14Recipe - id: CP14ModularAventailMithrilChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularAventailMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml deleted file mode 100644 index dfe105ef6d..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml +++ /dev/null @@ -1,758 +0,0 @@ - -# Dagger - -- type: CP14Recipe - id: CP14ModularBladeIronDagger - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularBladeIronDagger - -- type: CP14Recipe - id: CP14ModularBladeGoldDagger - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularBladeGoldDagger - -- type: CP14Recipe - id: CP14ModularBladeCopperDagger - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularBladeCopperDagger - -- type: CP14Recipe - id: CP14ModularBladeMithrilDagger - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularBladeMithrilDagger - -# Spear - -- type: CP14Recipe - id: CP14ModularBladeIronSpear - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularBladeIronSpear - -- type: CP14Recipe - id: CP14ModularBladeCopperSpear - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularBladeCopperSpear - -- type: CP14Recipe - id: CP14ModularBladeGoldSpear - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularBladeGoldSpear - -- type: CP14Recipe - id: CP14ModularBladeMithrilSpear - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularBladeMithrilSpear - -# Mace - -- type: CP14Recipe - id: CP14ModularBladeIronMace - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularBladeIronMace - -- type: CP14Recipe - id: CP14ModularBladeGoldMace - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularBladeGoldMace - -- type: CP14Recipe - id: CP14ModularBladeCopperMace - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularBladeCopperMace - -- type: CP14Recipe - id: CP14ModularBladeMithrilMace - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularBladeMithrilMace - -# Sword - -- type: CP14Recipe - id: CP14ModularBladeIronSword - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14ModularBladeIronSword - -- type: CP14Recipe - id: CP14ModularBladeGoldSword - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14ModularBladeGoldSword - -- type: CP14Recipe - id: CP14ModularBladeCopperSword - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14ModularBladeCopperSword - -- type: CP14Recipe - id: CP14ModularBladeMithrilSword - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14ModularBladeMithrilSword - -# Sickle - -- type: CP14Recipe - id: CP14ModularBladeIronSickle - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularBladeIronSickle - -- type: CP14Recipe - id: CP14ModularBladeCopperSickle - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularBladeCopperSickle - -- type: CP14Recipe - id: CP14ModularBladeGoldSickle - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularBladeGoldSickle - -- type: CP14Recipe - id: CP14ModularBladeMithrilSickle - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularBladeMithrilSickle - -# Shovel - -- type: CP14Recipe - id: CP14ModularBladeIronShovel - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularBladeIronShovel - -- type: CP14Recipe - id: CP14ModularBladeGoldShovel - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularBladeGoldShovel - - -- type: CP14Recipe - id: CP14ModularBladeCopperShovel - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularBladeCopperShovel - -- type: CP14Recipe - id: CP14ModularBladeMithrilShovel - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularBladeMithrilShovel - -# Pickaxe - -- type: CP14Recipe - id: CP14ModularBladeIronPickaxe - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14ModularBladeIronPickaxe - -- type: CP14Recipe - id: CP14ModularBladeGoldPickaxe - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14ModularBladeGoldPickaxe - -- type: CP14Recipe - id: CP14ModularBladeCopperPickaxe - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14ModularBladeCopperPickaxe - -- type: CP14Recipe - id: CP14ModularBladeMithrilPickaxe - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14ModularBladeMithrilPickaxe - -# Grip - -- type: CP14Recipe - id: CP14ModularGripIron - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularGripIron - -- type: CP14Recipe - id: CP14ModularGripCopper - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularGripCopper - -- type: CP14Recipe - id: CP14ModularGripGolden - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularGripGolden - -- type: CP14Recipe - id: CP14ModularGripMithril - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularGripMithril - -# Grip long - -- type: CP14Recipe - id: CP14ModularGripIronLong - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14ModularGripIronLong - -- type: CP14Recipe - id: CP14ModularGripCopperLong - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14ModularGripCopperLong - -- type: CP14Recipe - id: CP14ModularGripGoldLong - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14ModularGripGoldLong - -- type: CP14Recipe - id: CP14ModularGripMithrilLong - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14ModularGripMithrilLong - -# Rapier - -- type: CP14Recipe - id: CP14ModularBladeIronRapier - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularBladeIronRapier - -- type: CP14Recipe - id: CP14ModularBladeGoldRapier - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularBladeGoldRapier - -- type: CP14Recipe - id: CP14ModularBladeCopperRapier - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularBladeCopperRapier - -- type: CP14Recipe - id: CP14ModularBladeMithrilRapier - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularBladeMithrilRapier - -# Axe - -- type: CP14Recipe - id: CP14ModularBladeIronAxe - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14ModularBladeIronAxe - -- type: CP14Recipe - id: CP14ModularBladeCopperAxe - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14ModularBladeCopperAxe - -- type: CP14Recipe - id: CP14ModularBladeGoldAxe - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14ModularBladeGoldAxe - -- type: CP14Recipe - id: CP14ModularBladeMithrilAxe - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14ModularBladeMithrilAxe - -# Hammer - -- type: CP14Recipe - id: CP14ModularBladeIronHammer - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14ModularBladeIronHammer - -- type: CP14Recipe - id: CP14ModularBladeCopperHammer - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14ModularBladeCopperHammer - -- type: CP14Recipe - id: CP14ModularBladeGoldHammer - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14ModularBladeGoldHammer - -- type: CP14Recipe - id: CP14ModularBladeMithrilHammer - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14ModularBladeMithrilHammer - -# Hoe - -- type: CP14Recipe - id: CP14ModularBladeIronHoe - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularBladeIronHoe - -- type: CP14Recipe - id: CP14ModularBladeCopperHoe - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularBladeCopperHoe - -- type: CP14Recipe - id: CP14ModularBladeGoldHoe - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularBladeGoldHoe - -- type: CP14Recipe - id: CP14ModularBladeMithrilHoe - tag: CP14RecipeAnvil - category: Tools - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularBladeMithrilHoe - -# Skimitar - -- type: CP14Recipe - id: CP14ModularBladeIronSkimitar - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14ModularBladeIronSkimitar - -- type: CP14Recipe - id: CP14ModularBladeGoldSkimitar - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14ModularBladeGoldSkimitar - -- type: CP14Recipe - id: CP14ModularBladeCopperSkimitar - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14ModularBladeCopperSkimitar - -- type: CP14Recipe - id: CP14ModularBladeMithrilSkimitar - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14ModularBladeMithrilSkimitar - diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml deleted file mode 100644 index 313c647f38..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml +++ /dev/null @@ -1,162 +0,0 @@ - -# Cuirass - -- type: CP14Recipe - id: CP14ArmorIronCuirass - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 5 - result: CP14ArmorIronCuirass - -- type: CP14Recipe - id: CP14ArmorGoldCuirass - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 5 - result: CP14ArmorGoldCuirass - -- type: CP14Recipe - id: CP14ArmorCopperCuirass - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 5 - result: CP14ArmorCopperCuirass - -- type: CP14Recipe - id: CP14ArmorMithrilCuirass - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 5 - result: CP14ArmorMithrilCuirass - -# Infantry cuirass - -- type: CP14Recipe - id: CP14ArmorIronInfantryCuirass - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 6 - result: CP14ArmorIronInfantryCuirass - -- type: CP14Recipe - id: CP14ArmorGoldInfantryCuirass - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 6 - result: CP14ArmorGoldInfantryCuirass - -- type: CP14Recipe - id: CP14ArmorCopperInfantryCuirass - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 6 - result: CP14ArmorCopperInfantryCuirass - -- type: CP14Recipe - id: CP14ArmorMithrilInfantryCuirass - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 6 - result: CP14ArmorMithrilInfantryCuirass - -# Chainmail - -- type: CP14Recipe - id: CP14ArmorIronChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 4 - result: CP14ArmorIronChainmail - -- type: CP14Recipe - id: CP14ArmorGoldChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 4 - result: CP14ArmorGoldChainmail - -- type: CP14Recipe - id: CP14ArmorCopperChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 4 - result: CP14ArmorCopperChainmail - -- type: CP14Recipe - id: CP14ArmorMithrilChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 4 - result: CP14ArmorMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml deleted file mode 100644 index d64eb1e8e6..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml +++ /dev/null @@ -1,108 +0,0 @@ - -# Cuirass - -- type: CP14Recipe - id: CP14ModularCuissesIronPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14ModularCuissesIronPlate - -- type: CP14Recipe - id: CP14ModularCuissesGoldPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14ModularCuissesGoldPlate - -- type: CP14Recipe - id: CP14ModularCuissesCopperPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14ModularCuissesCopperPlate - -- type: CP14Recipe - id: CP14ModularCuissesMithrilPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14ModularCuissesMithrilPlate - -# Chainmail - -- type: CP14Recipe - id: CP14ModularCuissesIronChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularCuissesIronChainmail - -- type: CP14Recipe - id: CP14ModularCuissesGoldChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularCuissesGoldChainmail - -- type: CP14Recipe - id: CP14ModularCuissesCopperChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularCuissesCopperChainmail - -- type: CP14Recipe - id: CP14ModularCuissesMithrilChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularCuissesMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_garde.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_garde.yml deleted file mode 100644 index a9d48a93cc..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_garde.yml +++ /dev/null @@ -1,108 +0,0 @@ -# Sharp garde - -- type: CP14Recipe - id: CP14ModularGardeSharpCopper - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularGardeSharpCopper - -- type: CP14Recipe - id: CP14ModularGardeSharpIron - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularGardeSharpIron - -- type: CP14Recipe - id: CP14ModularGardeSharpGold - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularGardeSharpGold - -- type: CP14Recipe - id: CP14ModularGardeSharpMithril - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularGardeSharpMithril - -# Sturdy garde - -- type: CP14Recipe - id: CP14ModularGardeSturdyCopper - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularGardeSturdyCopper - -- type: CP14Recipe - id: CP14ModularGardeSturdyIron - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularGardeSturdyIron - -- type: CP14Recipe - id: CP14ModularGardeSturdyGold - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularGardeSturdyGold - -- type: CP14Recipe - id: CP14ModularGardeSturdyMithril - tag: CP14RecipeAnvil - category: Weapon - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularGardeSturdyMithril - diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml deleted file mode 100644 index 035f24c6aa..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml +++ /dev/null @@ -1,108 +0,0 @@ - -# Cuirass - -- type: CP14Recipe - id: CP14ModularGreaveIronPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14ModularGreaveIronPlate - -- type: CP14Recipe - id: CP14ModularGreaveGoldPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14ModularGreaveGoldPlate - -- type: CP14Recipe - id: CP14ModularGreaveCopperPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14ModularGreaveCopperPlate - -- type: CP14Recipe - id: CP14ModularGreaveMithrilPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14ModularGreaveMithrilPlate - -# Chainmail - -- type: CP14Recipe - id: CP14ModularGreaveIronChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularGreaveIronChainmail - -- type: CP14Recipe - id: CP14ModularGreaveGoldChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularGreaveGoldChainmail - -- type: CP14Recipe - id: CP14ModularGreaveCopperChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularGreaveCopperChainmail - -- type: CP14Recipe - id: CP14ModularGreaveMithrilChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularGreaveMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_helmet.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_helmet.yml deleted file mode 100644 index e4d42f6621..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_helmet.yml +++ /dev/null @@ -1,108 +0,0 @@ - -# Capellina - -- type: CP14Recipe - id: CP14HelmetIronCapellina - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14HelmetIronCapellina - -- type: CP14Recipe - id: CP14HelmetGoldCapellina - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14HelmetGoldCapellina - -- type: CP14Recipe - id: CP14HelmetCopperCapellina - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14HelmetCopperCapellina - -- type: CP14Recipe - id: CP14HelmetMithrilCapellina - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14HelmetMithrilCapellina - -# Palm Helmet - -- type: CP14Recipe - id: CP14HelmetIronPalmHelmet - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 2 - result: CP14HelmetIronPalmHelmet - -- type: CP14Recipe - id: CP14HelmetGoldPalmHelmet - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 2 - result: CP14HelmetGoldPalmHelmet - -- type: CP14Recipe - id: CP14HelmetCopperPalmHelmet - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 2 - result: CP14HelmetCopperPalmHelmet - -- type: CP14Recipe - id: CP14HelmetMithrilPalmHelmet - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 2 - result: CP14HelmetMithrilPalmHelmet diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml deleted file mode 100644 index d068a48f0b..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml +++ /dev/null @@ -1,58 +0,0 @@ - -# Tip - -- type: CP14Recipe - id: CP14ModularTipCopperArrow - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularTipCopperArrow - resultCount: 5 - -- type: CP14Recipe - id: CP14ModularTipIronArrow - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularTipIronArrow - resultCount: 5 - -- type: CP14Recipe - id: CP14ModularTipGoldArrow - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularTipGoldArrow - resultCount: 5 - -- type: CP14Recipe - id: CP14ModularTipMithrilArrow - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularTipMithrilArrow - resultCount: 5 diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_visor.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_visor.yml deleted file mode 100644 index eac135e93f..0000000000 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_visor.yml +++ /dev/null @@ -1,108 +0,0 @@ - -# Plate - -- type: CP14Recipe - id: CP14ModularVisorIronPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularVisorIronPlate - -- type: CP14Recipe - id: CP14ModularVisorGoldPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularVisorGoldPlate - -- type: CP14Recipe - id: CP14ModularVisorCopperPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularVisorCopperPlate - -- type: CP14Recipe - id: CP14ModularVisorMithrilPlate - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularVisorMithrilPlate - -# Chainmail - -- type: CP14Recipe - id: CP14ModularVisorIronChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - IronMelting - requirements: - - !type:StackResource - stack: CP14IronBar - count: 1 - result: CP14ModularVisorIronChainmail - -- type: CP14Recipe - id: CP14ModularVisorGoldChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - GoldMelting - requirements: - - !type:StackResource - stack: CP14GoldBar - count: 1 - result: CP14ModularVisorGoldChainmail - -- type: CP14Recipe - id: CP14ModularVisorCopperChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - CopperMelting - requirements: - - !type:StackResource - stack: CP14CopperBar - count: 1 - result: CP14ModularVisorCopperChainmail - -- type: CP14Recipe - id: CP14ModularVisorMithrilChainmail - tag: CP14RecipeAnvil - category: Armor - craftTime: 1 - requiredSkills: - - MithrilMelting - requirements: - - !type:StackResource - stack: CP14MithrilBar - count: 1 - result: CP14ModularVisorMithrilChainmail diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml index f11e95a07c..4972b67b4d 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml @@ -89,34 +89,6 @@ count: 2 result: CP14BowlWooden -- type: CP14Recipe - id: CP14ModularBladeWoodMop - tag: CP14RecipeWorkbench - category: Tools - craftTime: 2 - requirements: - - !type:StackGroupResource - group: WoodenPlanks - count: 1 - - !type:StackResource - stack: CP14Cloth - count: 1 - result: CP14ModularBladeWoodMop - -- type: CP14Recipe - id: CP14ModularBladeLucensMop - tag: CP14RecipeWorkbench - category: Tools - craftTime: 2 - requirements: - - !type:StackResource - stack: CP14LucensWoodenPlanks - count: 1 - - !type:StackResource - stack: CP14Cloth - count: 1 - result: CP14ModularBladeLucensMop - - type: CP14Recipe id: CP14Lighter tag: CP14RecipeWorkbench @@ -131,72 +103,6 @@ count: 1 result: CP14Lighter -- type: CP14Recipe - id: CP14ModularGripWooden - tag: CP14RecipeWorkbench - category: Tools - craftTime: 2 - requirements: - - !type:StackResource - stack: CP14WoodenPlanks - count: 2 - result: CP14ModularGripWooden - -- type: CP14Recipe - id: CP14ModularGripBirchShort - tag: CP14RecipeWorkbench - category: Tools - craftTime: 2 - requirements: - - !type:StackResource - stack: CP14BirchWoodenPlanks - count: 2 - result: CP14ModularGripBirch - -- type: CP14Recipe - id: CP14ModularGripWoodenLong - tag: CP14RecipeWorkbench - category: Tools - craftTime: 2 - requirements: - - !type:StackResource - stack: CP14WoodenPlanks - count: 4 - result: CP14ModularGripWoodenLong - -- type: CP14Recipe - id: CP14ModularGripBirchLong - tag: CP14RecipeWorkbench - category: Tools - craftTime: 2 - requirements: - - !type:StackResource - stack: CP14BirchWoodenPlanks - count: 4 - result: CP14ModularGripBirchLong - -- type: CP14Recipe - id: CP14ModularGripLucens - tag: CP14RecipeWorkbench - category: Tools - craftTime: 2 - requirements: - - !type:StackResource - stack: CP14LucensWoodenPlanks - count: 2 - result: CP14ModularGripLucens - -- type: CP14Recipe - id: CP14ModularGripLucensLong - tag: CP14RecipeWorkbench - category: Tools - craftTime: 2 - requirements: - - !type:StackResource - stack: CP14LucensWoodenPlanks - count: 4 - result: CP14ModularGripLucensLong - - type: CP14Recipe id: CP14Bow tag: CP14RecipeWorkbench @@ -211,30 +117,6 @@ count: 1 result: CP14BowCombat -- type: CP14Recipe - id: CP14ModularRodWooden - tag: CP14RecipeWorkbench - category: Tools - craftTime: 3 - requirements: - - !type:StackResource - stack: CP14WoodenPlanks - count: 1 - result: CP14ModularRodWooden - resultCount: 5 - -- type: CP14Recipe - id: CP14ModularRodLucens - tag: CP14RecipeWorkbench - category: Tools - craftTime: 3 - requirements: - - !type:StackResource - stack: CP14LucensWoodenPlanks - count: 1 - result: CP14ModularRodLucens - resultCount: 5 - - type: CP14Recipe id: CP14CrayonWhite tag: CP14RecipeWorkbench @@ -307,8 +189,9 @@ category: Tools craftTime: 1 requirements: - - !type:ProtoIdResource - protoId: CP14ModularGripWooden + - !type:StackGroupResource + group: WoodenPlanks + count: 1 - !type:ProtoIdResource protoId: CP14CrossboltIron result: CP14Screwdriver @@ -318,9 +201,9 @@ tag: CP14RecipeWorkbench craftTime: 2 requirements: - - !type:ProtoIdResource - protoId: CP14ModularGripWooden - count: 2 + - !type:StackGroupResource + group: WoodenPlanks + count: 1 result: CP14FluteInstrument - type: CP14Recipe @@ -367,64 +250,4 @@ - !type:StackResource stack: CP14Cloth count: 2 - result: CP14Rope - -- type: CP14Recipe - id: CP14ModularBladeWoodenAxe - tag: CP14RecipeWorkbench - craftTime: 2 - requirements: - - !type:StackGroupResource - group: WoodenPlanks - count: 2 - result: CP14ModularBladeWoodenAxe - -- type: CP14Recipe - id: CP14ModularBladeWoodenRapier - tag: CP14RecipeWorkbench - craftTime: 2 - requirements: - - !type:StackGroupResource - group: WoodenPlanks - count: 1 - result: CP14ModularBladeWoodenRapier - -- type: CP14Recipe - id: CP14ModularBladeWoodenSpear - tag: CP14RecipeWorkbench - craftTime: 2 - requirements: - - !type:StackGroupResource - group: WoodenPlanks - count: 1 - result: CP14ModularBladeWoodenSpear - -- type: CP14Recipe - id: CP14ModularBladeWoodenSword - tag: CP14RecipeWorkbench - craftTime: 2 - requirements: - - !type:StackGroupResource - group: WoodenPlanks - count: 2 - result: CP14ModularBladeWoodenSword - -- type: CP14Recipe - id: CP14ModularGardeSharpWooden - tag: CP14RecipeWorkbench - craftTime: 2 - requirements: - - !type:StackGroupResource - group: WoodenPlanks - count: 1 - result: CP14ModularGardeSharpWooden - -- type: CP14Recipe - id: CP14ModularGardeSturdyWooden - tag: CP14RecipeWorkbench - craftTime: 2 - requirements: - - !type:StackGroupResource - group: WoodenPlanks - count: 1 - result: CP14ModularGardeSturdyWooden + result: CP14Rope \ 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 9b9de1a534..814b7dea3f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml @@ -3,8 +3,6 @@ tag: CP14RecipeMeltingFurnace craftTime: 1 category: Materials - requiredSkills: - - CopperMelting requirements: - !type:MaterialResource material: CP14Copper @@ -16,8 +14,6 @@ tag: CP14RecipeMeltingFurnace craftTime: 1 category: Materials - requiredSkills: - - IronMelting requirements: - !type:MaterialResource material: CP14Iron @@ -29,8 +25,6 @@ tag: CP14RecipeMeltingFurnace craftTime: 1 category: Materials - requiredSkills: - - GoldMelting requirements: - !type:MaterialResource material: CP14Gold @@ -42,8 +36,6 @@ tag: CP14RecipeMeltingFurnace craftTime: 1 category: Materials - requiredSkills: - - MithrilMelting requirements: - !type:MaterialResource material: CP14Mithril @@ -55,8 +47,6 @@ tag: CP14RecipeMeltingFurnace craftTime: 1 category: Materials - requiredSkills: - - GlassMelting requirements: - !type:ProtoIdResource protoId: CP14CrystalShardQuartz @@ -68,8 +58,6 @@ tag: CP14RecipeMeltingFurnace craftTime: 1 category: Materials - requiredSkills: - - GlassMelting requirements: - !type:ProtoIdResource protoId: CP14GlassShard @@ -80,8 +68,6 @@ id: CP14VialTiny tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14GlassSheet @@ -92,8 +78,6 @@ id: CP14VialTinyReinforced tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -107,8 +91,6 @@ id: CP14VialSmall tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14GlassSheet @@ -119,8 +101,6 @@ id: CP14VialSmallReinforced tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -134,8 +114,6 @@ id: CP14VialMedium tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14GlassSheet @@ -146,8 +124,6 @@ id: CP14VialMediumReinforced tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -161,8 +137,6 @@ id: CP14VialStar tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14GlassSheet @@ -173,8 +147,6 @@ id: CP14VialStarReinforced tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14CopperBar @@ -188,8 +160,6 @@ id: CP14BaseAlchemyBomb tag: CP14RecipeMeltingFurnace craftTime: 1 - requiredSkills: - - GlassMelting requirements: - !type:StackResource stack: CP14GlassSheet diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml index 1acdd40e8d..997edef0b0 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml @@ -17,7 +17,7 @@ - Dairy - !type:CP14LearnSkillsSpecial skills: - - CopperMelting + #- CopperMelting - AlchemyVision - type: startingGear diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml index 60805cda28..7251b07822 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml @@ -6,6 +6,7 @@ startingGear: CP14BlacksmithGear icon: "CP14JobIconBlacksmith" supervisors: cp14-job-supervisors-command + setPreference: false canBeAntag: false special: - !type:CP14AddTradingReputationSpecial @@ -17,11 +18,11 @@ - Tailors - !type:CP14LearnSkillsSpecial skills: - - CopperMelting - - IronMelting - - GoldMelting - - GlassMelting - - MithrilMelting + #- CopperMelting + #- IronMelting + #- GoldMelting + #- GlassMelting + #- MithrilMelting - TraderWit # Craftsmen have always taken this perk. The main purpose of craftsmen is trade. requirements: - !type:DepartmentTimeRequirement diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml index de3de8fa41..2e5ed439af 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Fun/misc_startinggear.yml @@ -5,7 +5,4 @@ shirt: CP14ClothingShirtCottonBlack pants: CP14ClothingPantsLoincloth shoes: CP14ClothingShoesSandals - inhand: - - CP14ModularIronDagger - - CP14ModularIronDagger diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml index 8ae6350c75..d938e6c8fb 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml @@ -9,9 +9,9 @@ supervisors: cp14-job-supervisors-guard-commander canBeAntag: false special: - - !type:CP14LearnSkillsSpecial - skills: - - SwordMastery + #- !type:CP14LearnSkillsSpecial + # skills: + # - SwordMastery - !type:AddComponentSpecial components: - type: CP14SalaryCounter diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml index 1e6ca65be6..d95e9ae634 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml @@ -16,9 +16,9 @@ department: CP14Guard time: 10980 # 3 hours special: - - !type:CP14LearnSkillsSpecial - skills: - - SwordMastery + #- !type:CP14LearnSkillsSpecial + # skills: + # - SwordMastery - !type:AddComponentSpecial components: - type: CP14SalaryCounter diff --git a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml index 5800f6f78f..eebe96bc7b 100644 --- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml +++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml @@ -34,5 +34,4 @@ equipment: belt: CP14WalletFilledTest keys: CP14KeyRingGuildmaster - belt2: CP14ModularGuildmasterRapier diff --git a/Resources/Prototypes/_CP14/Skill/Basic/athletic.yml b/Resources/Prototypes/_CP14/Skill/Basic/athletic.yml index 2a732ee713..a52d5e62d1 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/athletic.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/athletic.yml @@ -41,6 +41,20 @@ - !type:NeedPrerequisite prerequisite: AthleticT1 +- type: cp14Skill + id: CP14ActionToggleKeenEye + skillUiPosition: 0, 4 + tree: Athletic + icon: + sprite: _CP14/Actions/Spells/physical.rsi + state: keen_eye + effects: + - !type:AddAction + action: CP14ActionToggleKeenEye + restrictions: + - !type:NeedPrerequisite + prerequisite: AthleticT1 + # T2 - type: cp14Skill diff --git a/Resources/Prototypes/_CP14/Skill/Basic/craftsmanship.yml b/Resources/Prototypes/_CP14/Skill/Basic/craftsmanship.yml index 1319dd4bc1..dfc470e485 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/craftsmanship.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/craftsmanship.yml @@ -13,74 +13,74 @@ components: - type: CP14PriceScanner -- type: cp14Skill - id: CopperMelting - skillUiPosition: 4, 0 - tree: Craftsmanship - name: cp14-skill-copper-melt-name - learnCost: 0.5 - icon: - sprite: _CP14/Objects/Materials/copper_ore.rsi - state: ore3 - effects: - - !type:UnlockRecipes - -- type: cp14Skill - id: IronMelting - skillUiPosition: 4, 2 - tree: Craftsmanship - name: cp14-skill-iron-melt-name - learnCost: 0.5 - icon: - sprite: _CP14/Objects/Materials/iron_ore.rsi - state: ore3 - effects: - - !type:UnlockRecipes - restrictions: - - !type:NeedPrerequisite - prerequisite: CopperMelting - -- type: cp14Skill - id: GoldMelting - skillUiPosition: 3, 4 - tree: Craftsmanship - name: cp14-skill-gold-melt-name - learnCost: 0.5 - icon: - sprite: _CP14/Objects/Materials/gold_ore.rsi - state: ore3 - effects: - - !type:UnlockRecipes - restrictions: - - !type:NeedPrerequisite - prerequisite: IronMelting - -- type: cp14Skill - id: MithrilMelting - skillUiPosition: 5, 4 - tree: Craftsmanship - name: cp14-skill-mithril-melt-name - learnCost: 0.5 - icon: - sprite: _CP14/Objects/Materials/mithril_ore.rsi - state: ore3 - effects: - - !type:UnlockRecipes - restrictions: - - !type:NeedPrerequisite - prerequisite: IronMelting - -- type: cp14Skill - id: GlassMelting - skillUiPosition: 6, 0 - tree: Craftsmanship - name: cp14-skill-glass-melt-name - learnCost: 0.5 - icon: - sprite: _CP14/Objects/Materials/glass.rsi - state: glass_3 - effects: - - !type:UnlockRecipes +#- type: cp14Skill +# id: CopperMelting +# skillUiPosition: 4, 0 +# tree: Craftsmanship +# name: cp14-skill-copper-melt-name +# learnCost: 0.5 +# icon: +# sprite: _CP14/Objects/Materials/copper_ore.rsi +# state: ore3 +# effects: +# - !type:UnlockRecipes +# +#- type: cp14Skill +# id: IronMelting +# skillUiPosition: 4, 2 +# tree: Craftsmanship +# name: cp14-skill-iron-melt-name +# learnCost: 0.5 +# icon: +# sprite: _CP14/Objects/Materials/iron_ore.rsi +# state: ore3 +# effects: +# - !type:UnlockRecipes +# restrictions: +# - !type:NeedPrerequisite +# prerequisite: CopperMelting +# +#- type: cp14Skill +# id: GoldMelting +# skillUiPosition: 3, 4 +# tree: Craftsmanship +# name: cp14-skill-gold-melt-name +# learnCost: 0.5 +# icon: +# sprite: _CP14/Objects/Materials/gold_ore.rsi +# state: ore3 +# effects: +# - !type:UnlockRecipes +# restrictions: +# - !type:NeedPrerequisite +# prerequisite: IronMelting +# +#- type: cp14Skill +# id: MithrilMelting +# skillUiPosition: 5, 4 +# tree: Craftsmanship +# name: cp14-skill-mithril-melt-name +# learnCost: 0.5 +# icon: +# sprite: _CP14/Objects/Materials/mithril_ore.rsi +# state: ore3 +# effects: +# - !type:UnlockRecipes +# restrictions: +# - !type:NeedPrerequisite +# prerequisite: IronMelting +# +#- type: cp14Skill +# id: GlassMelting +# skillUiPosition: 6, 0 +# tree: Craftsmanship +# name: cp14-skill-glass-melt-name +# learnCost: 0.5 +# icon: +# sprite: _CP14/Objects/Materials/glass.rsi +# state: glass_3 +# effects: +# - !type:UnlockRecipes - type: cp14Skill id: AlchemyVision diff --git a/Resources/Prototypes/_CP14/Skill/Basic/martial_arts.yml b/Resources/Prototypes/_CP14/Skill/Basic/martial_arts.yml index c474dcd195..b733f36111 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/martial_arts.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/martial_arts.yml @@ -1,33 +1,33 @@ -- type: cp14Skill - id: SwordMastery - skillUiPosition: 0, 0 - name: cp14-skill-sword-mastery-name - desc: cp14-skill-mastery-desc - learnCost: 0.5 - tree: MartialArts - icon: - sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi - state: preview - -- type: cp14Skill - id: RapierMastery - skillUiPosition: 2, 0 - name: cp14-skill-parier-mastery-name - desc: cp14-skill-mastery-desc - learnCost: 0.5 - tree: MartialArts - icon: - sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi - state: preview - -- type: cp14Skill - id: SkimitarMastery - skillUiPosition: 4, 0 - name: cp14-skill-skimitar-mastery-name - desc: cp14-skill-mastery-desc - learnCost: 0.5 - tree: MartialArts - icon: - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi - state: preview +#- type: cp14Skill +# id: SwordMastery +# skillUiPosition: 0, 0 +# name: cp14-skill-sword-mastery-name +# desc: cp14-skill-mastery-desc +# learnCost: 0.5 +# tree: MartialArts +# icon: +# sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi +# state: preview +# +#- type: cp14Skill +# id: RapierMastery +# skillUiPosition: 2, 0 +# name: cp14-skill-parier-mastery-name +# desc: cp14-skill-mastery-desc +# learnCost: 0.5 +# tree: MartialArts +# icon: +# sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi +# state: preview +# +#- type: cp14Skill +# id: SkimitarMastery +# skillUiPosition: 4, 0 +# name: cp14-skill-skimitar-mastery-name +# desc: cp14-skill-mastery-desc +# learnCost: 0.5 +# tree: MartialArts +# icon: +# sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi +# state: preview diff --git a/Resources/Prototypes/_CP14/Skill/Basic/trees.yml b/Resources/Prototypes/_CP14/Skill/Basic/trees.yml index 7c2b14adaf..f42377d1ae 100644 --- a/Resources/Prototypes/_CP14/Skill/Basic/trees.yml +++ b/Resources/Prototypes/_CP14/Skill/Basic/trees.yml @@ -38,7 +38,7 @@ name: cp14-skill-tree-athletic-name desc: cp14-skill-tree-athletic-desc skillType: Memory - color: "#b32e37" + color: "#8bdb7f" #- type: cp14SkillTree # id: Dimension diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml index f473161276..3520c4e524 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/dwarf_mining.yml @@ -22,26 +22,6 @@ service: !type:CP14BuyItemsService product: CP14CrystalShardQuartz -- type: cp14TradingPosition - id: CP14ModularIronPickaxe - faction: DwarfMining - uiPosition: 3 - icon: - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi - state: tool - service: !type:CP14BuyItemsService - product: CP14ModularIronPickaxe - -- type: cp14TradingPosition - id: CP14ModularIronShovel - faction: DwarfMining - uiPosition: 4 - icon: - sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi - state: tool - service: !type:CP14BuyItemsService - product: CP14ModularIronShovel - - type: cp14TradingPosition id: CP14BaseSharpeningStone faction: DwarfMining diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/guards.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/guards.yml index 5b598ac690..d83fab0f84 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/guards.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/guards.yml @@ -10,27 +10,6 @@ service: !type:CP14BuyItemsService product: CP14TradeContractGuards -- type: cp14TradingPosition - id: CP14BaseCrossbow - faction: Guards - uiPosition: 1 - icon: - sprite: _CP14/Objects/Weapons/Ranged/crossbow.rsi - state: unwielded - service: !type:CP14BuyItemsService - product: CP14BaseCrossbow - -- type: cp14TradingPosition - id: CP14BigCrossboltIron - faction: Guards - uiPosition: 2 - icon: - sprite: _CP14/Objects/Weapons/Ranged/Projectiles/crossbolt.rsi - state: big_rod - service: !type:CP14BuyItemsService - product: CP14BigCrossboltIron - count: 5 - - type: cp14TradingPosition id: Bola faction: Guards @@ -63,26 +42,4 @@ state: icon service: !type:CP14BuyItemsService product: CP14MagicGuardElectroStaff - count: 1 - -- type: cp14TradingPosition - id: CP14ModularGripIronGuard - faction: Guards - uiPosition: 6 - icon: - sprite: _CP14/Objects/ModularTools/Grip/iron_guard_grip.rsi - state: icon - service: !type:CP14BuyItemsService - product: CP14ModularGripIronGuard - count: 1 - -- type: cp14TradingPosition - id: CP14ModularGripIronLongGuard - faction: Guards - uiPosition: 7 - icon: - sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long_guard.rsi - state: icon - service: !type:CP14BuyItemsService - product: CP14ModularGripIronLongGuard - count: 1 + count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/helmir_child.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/helmir_child.yml new file mode 100644 index 0000000000..1a328b7d72 --- /dev/null +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/helmir_child.yml @@ -0,0 +1,167 @@ +# Reputation Level 0 + +- type: cp14TradingPosition + id: CP14WeaponHammerIron + faction: HelmirChild + uiPosition: 0 + icon: + sprite: _CP14/Objects/Weapons/Melee/Hammer/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponHammerIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponPickaxeIronHelmir + faction: HelmirChild + uiPosition: 1 + icon: + sprite: _CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponPickaxeIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponShovelIron + faction: HelmirChild + uiPosition: 2 + icon: + sprite: _CP14/Objects/Weapons/Melee/Shovel/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponShovelIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponDaggerIron + faction: HelmirChild + uiPosition: 4 + icon: + sprite: _CP14/Objects/Weapons/Melee/Dagger/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponDaggerIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponShieldWooden + faction: HelmirChild + uiPosition: 5 + icon: + sprite: _CP14/Objects/Weapons/Melee/Shield/shield.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponShieldWooden + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponShieldBuckler + faction: HelmirChild + uiPosition: 6 + icon: + sprite: _CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponShieldBuckler + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponSkimitarIron + faction: HelmirChild + uiPosition: 7 + icon: + sprite: _CP14/Objects/Weapons/Melee/Skimitar/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponSkimitarIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponSpearIron + faction: HelmirChild + uiPosition: 8 + icon: + sprite: _CP14/Objects/Weapons/Melee/Spear/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponSpearIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponSwordIron + faction: HelmirChild + uiPosition: 9 + icon: + sprite: _CP14/Objects/Weapons/Melee/Sword/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponSwordIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponTowerShieldWooden + faction: HelmirChild + uiPosition: 10 + icon: + sprite: _CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponTowerShieldWooden + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponTwoHandedSwordIron + faction: HelmirChild + uiPosition: 11 + icon: + sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponTwoHandedSwordIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponWarAxeIron + faction: HelmirChild + uiPosition: 12 + icon: + sprite: _CP14/Objects/Weapons/Melee/WarAxe/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponWarAxeIron + count: 1 + +- type: cp14TradingPosition + id: CP14WeaponWarHammerIron + faction: HelmirChild + uiPosition: 13 + icon: + sprite: _CP14/Objects/Weapons/Melee/WarHammer/iron.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponWarHammerIron + count: 1 + +- type: cp14TradingPosition + id: CP14Arrow + faction: HelmirChild + uiPosition: 14 + icon: + sprite: _CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi + state: rod + service: !type:CP14BuyItemsService + product: CP14Arrow + count: 4 + +- type: cp14TradingPosition + id: CP14BowCombat + faction: HelmirChild + uiPosition: 15 + icon: + sprite: _CP14/Objects/Weapons/Ranged/bow.rsi + state: unwielded + service: !type:CP14BuyItemsService + product: CP14BowCombat + count: 1 + priceMarkup: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/horticulture.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/horticulture.yml index cda234f97f..7c878e91ec 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/horticulture.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/horticulture.yml @@ -32,17 +32,6 @@ product: CP14VialYellowDayflinPulp count: 1 -- type: cp14TradingPosition - id: CP14ModularIronHoe - faction: Horticulture - uiPosition: 4 - icon: - sprite: _CP14/Objects/ModularTools/Blade/Hoe/metall_hoe.rsi - state: icon - service: !type:CP14BuyItemsService - product: CP14ModularIronHoe - count: 1 - - type: cp14TradingPosition id: CP14CrystalLampBlueEmpty faction: Horticulture @@ -124,18 +113,6 @@ product: CP14VialAgaricMushroom count: 1 -- type: cp14TradingPosition - id: CP14ModularIronSickle - faction: Horticulture - reputationLevel: 1 - uiPosition: 4 - icon: - sprite: _CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi - state: icon - service: !type:CP14BuyItemsService - product: CP14ModularIronSickle - count: 1 - - type: cp14TradingPosition id: CP14CrystalLampOrangeEmpty faction: Horticulture diff --git a/Resources/Prototypes/_CP14/Trading/BuyPositions/victoria_gardens.yml b/Resources/Prototypes/_CP14/Trading/BuyPositions/victoria_gardens.yml index 7ebaf31212..dba003b907 100644 --- a/Resources/Prototypes/_CP14/Trading/BuyPositions/victoria_gardens.yml +++ b/Resources/Prototypes/_CP14/Trading/BuyPositions/victoria_gardens.yml @@ -77,6 +77,17 @@ product: CP14Wheat count: 3 +- type: cp14TradingPosition + id: CP14WeaponDaggerHatchet + faction: VictoriaGardens + uiPosition: 7 + icon: + sprite: _CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi + state: icon + service: !type:CP14BuyItemsService + product: CP14WeaponDaggerHatchet + count: 3 + - type: cp14TradingPosition id: CP14FloorTileGrassBag diff --git a/Resources/Prototypes/_CP14/Trading/contracts.yml b/Resources/Prototypes/_CP14/Trading/contracts.yml index 8014c27ce6..c7c1f04c1a 100644 --- a/Resources/Prototypes/_CP14/Trading/contracts.yml +++ b/Resources/Prototypes/_CP14/Trading/contracts.yml @@ -95,4 +95,15 @@ state: tailors service: !type:CP14BuyItemsService product: CP14TradeContractTailors + count: 1 + +- type: cp14TradingPosition + id: CP14TradeContractHelmirChild + faction: ContractGuild + uiPosition: 9 + icon: + sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi + state: helmir_child + service: !type:CP14BuyItemsService + product: CP14TradeContractHelmirChild count: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Trading/factions.yml b/Resources/Prototypes/_CP14/Trading/factions.yml index 78952f47e6..4ac83d798d 100644 --- a/Resources/Prototypes/_CP14/Trading/factions.yml +++ b/Resources/Prototypes/_CP14/Trading/factions.yml @@ -53,6 +53,11 @@ color: "#385573" name: cp14-trade-faction-guard +- type: cp14TradingFaction + id: HelmirChild + color: "#cc0707" + name: cp14-trade-faction-helmir-child + - type: cp14TradingFaction id: VampireMarket color: "#6b1934" diff --git a/Resources/Prototypes/_CP14/tools.yml b/Resources/Prototypes/_CP14/tools.yml index 6b47286f8a..34b4ffb77f 100644 --- a/Resources/Prototypes/_CP14/tools.yml +++ b/Resources/Prototypes/_CP14/tools.yml @@ -2,13 +2,12 @@ id: CP14Digging name: cp14-tool-quality-digging-name toolName: cp14-tool-quality-digging-tool-name - spawn: CP14ModularIronShovel - icon: { sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi, state: tool} + spawn: CP14WeaponShovelIron + icon: { sprite: _CP14/Objects/Weapons/Melee/Shovel/iron.rsi, state: icon} -- type: tool +- type: tool id: CP14Hammering name: cp14-tool-quality-hammering-name toolName: cp14-tool-quality-hammering-tool-name - spawn: CP14ModularIronHammer - icon: { sprite: _CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi, state: tool} - + spawn: CP14WeaponHammerIron + icon: { sprite: _CP14/Objects/Weapons/Melee/Hammer/iron.rsi, state: icon} diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/InnkeeperTabs/Cooking.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/InnkeeperTabs/Cooking.xml index a3267d00fb..2fbb2f3e9c 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/InnkeeperTabs/Cooking.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/InnkeeperTabs/Cooking.xml @@ -13,7 +13,7 @@ - + And of course, don't forget about frying pan and a cooking pot. It is in them that all the dishes that you will serve are prepared! diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml index 92f79faed5..f02e6c1342 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Innkeepers.xml @@ -61,7 +61,6 @@ In the event your delightful cooking or your generous portions of ale makes a customer vomit, a mop can be found near the stairs to the cellar. Dip the mop inside one of your water barrels and wipe up the mess. Be careful to avoid serving water from your mopping barrel - customers generally don't enjoy the taste of vomit. - diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/InnkeeperTabs/Cooking.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/InnkeeperTabs/Cooking.xml index acc8030b24..c417bd6ef3 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/InnkeeperTabs/Cooking.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/InnkeeperTabs/Cooking.xml @@ -14,7 +14,7 @@ - + И конечно же, как же можно забыть - сковорода и кастрюля. Именно в них готовятся все блюда, которые вы будете подавать! diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml index 92f79faed5..f02e6c1342 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Innkeepers.xml @@ -61,7 +61,6 @@ In the event your delightful cooking or your generous portions of ale makes a customer vomit, a mop can be found near the stairs to the cellar. Dip the mop inside one of your water barrels and wipe up the mess. Be careful to avoid serving water from your mopping barrel - customers generally don't enjoy the taste of vomit. - diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/dash.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/dash.png index 759abad7a2..f22eb813e1 100644 Binary files a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/dash.png and b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/dash.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/keen_eye.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/keen_eye.png new file mode 100644 index 0000000000..aba5d78277 Binary files /dev/null and b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/keen_eye.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick.png index cadbc3025e..7a15bf92c2 100644 Binary files a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick.png and b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/kick.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json index ab0b61f088..c2a062fdcc 100644 --- a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json +++ b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/meta.json @@ -18,6 +18,9 @@ }, { "name": "sprint" + }, + { + "name": "keen_eye" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/second_wind.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/second_wind.png index 1094a3a5cb..6ef3c43770 100644 Binary files a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/second_wind.png and b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/second_wind.png differ diff --git a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint.png b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint.png index b6fa964256..7af17dafe6 100644 Binary files a/Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint.png and b/Resources/Textures/_CP14/Actions/Spells/physical.rsi/sprint.png differ diff --git a/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic.png b/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic.png index 08d392968f..25a4d9fb6f 100644 Binary files a/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic.png and b/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic.png differ diff --git a/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic2.png b/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic2.png index 63a5060763..368d1b5bf2 100644 Binary files a/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic2.png and b/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic2.png differ diff --git a/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic3.png b/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic3.png index 383a902979..6f0e1d6a50 100644 Binary files a/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic3.png and b/Resources/Textures/_CP14/Actions/skill_tree.rsi/athletic3.png differ diff --git a/Resources/Textures/_CP14/Effects/sparks.rsi/1.png b/Resources/Textures/_CP14/Effects/sparks.rsi/1.png new file mode 100644 index 0000000000..d22f461f10 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/sparks.rsi/1.png differ diff --git a/Resources/Textures/_CP14/Effects/sparks.rsi/2.png b/Resources/Textures/_CP14/Effects/sparks.rsi/2.png new file mode 100644 index 0000000000..5a5bd97d36 Binary files /dev/null and b/Resources/Textures/_CP14/Effects/sparks.rsi/2.png differ diff --git a/Resources/Textures/_CP14/Effects/sparks.rsi/meta.json b/Resources/Textures/_CP14/Effects/sparks.rsi/meta.json new file mode 100644 index 0000000000..5a201d5bff --- /dev/null +++ b/Resources/Textures/_CP14/Effects/sparks.rsi/meta.json @@ -0,0 +1,89 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd", + "size": { + "x": 17, + "y": 17 + }, + "states": [ + { + "name": "1", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "2", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + } + ] +} diff --git a/Resources/Textures/_CP14/Mobs/Species/Carcat/displacement48.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Carcat/displacement48.rsi/meta.json index 37a039174a..27a6e91997 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Carcat/displacement48.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Carcat/displacement48.rsi/meta.json @@ -13,6 +13,10 @@ { "name": "head", "directions": 4 + }, + { + "name": "neck", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Mobs/Species/Carcat/displacement48.rsi/neck.png b/Resources/Textures/_CP14/Mobs/Species/Carcat/displacement48.rsi/neck.png new file mode 100644 index 0000000000..eb4f3cc04f Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Carcat/displacement48.rsi/neck.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/full.png b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/full.png index d486797953..68d8116cb7 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/full.png and b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/meta.json index e7ac49d80a..77c11e7cae 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Dwarf/parts.rsi/meta.json @@ -8,7 +8,8 @@ }, "states": [ { - "name": "full" + "name": "full", + "directions": 4 }, { "name": "head_f", diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/hands.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/hands.png index bb21f1063c..173c4b5ade 100644 Binary files a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/hands.png and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/hands.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/meta.json index 8c328d7445..8a3dc139fe 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/meta.json @@ -42,6 +42,10 @@ "name": "mask", "directions": 4 }, + { + "name": "neck", + "directions": 4 + }, { "name": "pants", "directions": 4 diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/neck.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/neck.png new file mode 100644 index 0000000000..2cfc58f225 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement.rsi/neck.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json index 66a64ab75e..350a3f9339 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/meta.json @@ -17,6 +17,10 @@ { "name": "hair", "directions": 4 + }, + { + "name": "neck", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/neck.png b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/neck.png new file mode 100644 index 0000000000..d11f15c3ea Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Goblin/displacement48.rsi/neck.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_neck.png b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_neck.png new file mode 100644 index 0000000000..b62b48403d Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/female_neck.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/male_neck.png b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/male_neck.png new file mode 100644 index 0000000000..3cc454ae8a Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/male_neck.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/meta.json index 90fab72ceb..2b142ab234 100644 --- a/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/meta.json +++ b/Resources/Textures/_CP14/Mobs/Species/Human/displacement.rsi/meta.json @@ -14,6 +14,10 @@ "name": "female_cloak", "directions": 4 }, + { + "name": "female_neck", + "directions": 4 + }, { "name": "female_pants", "directions": 4 @@ -21,6 +25,10 @@ { "name": "female_shirt", "directions": 4 + }, + { + "name": "male_neck", + "directions": 4 } ] } diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/female_neck.png b/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/female_neck.png new file mode 100644 index 0000000000..2b570453c7 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/female_neck.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/male_neck.png b/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/male_neck.png new file mode 100644 index 0000000000..7d2e309fd6 Binary files /dev/null and b/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/male_neck.png differ diff --git a/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/meta.json b/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/meta.json new file mode 100644 index 0000000000..01d70becef --- /dev/null +++ b/Resources/Textures/_CP14/Mobs/Species/Human/displacement48.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 48, + "y": 48 + }, + "load": { + "srgb": false + }, + "states": [ + { + "name": "female_neck", + "directions": 4 + }, + { + "name": "male_neck", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT.png deleted file mode 100644 index 8b20687d50..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT2.png deleted file mode 100644 index 54d14ef3b7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-NECK.png deleted file mode 100644 index 218946af4c..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/icon.png deleted file mode 100644 index c2763f1e75..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-left.png deleted file mode 100644 index 5b66e61bf3..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-right.png deleted file mode 100644 index 4bc6c8be39..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-left.png deleted file mode 100644 index 764bb24d8e..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-right.png deleted file mode 100644 index 18ac0acecf..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT.png deleted file mode 100644 index 703e776142..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT2.png deleted file mode 100644 index 99ffe592bb..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-NECK.png deleted file mode 100644 index 7bd49923a7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/icon.png deleted file mode 100644 index 631220fd68..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/inhand-left.png deleted file mode 100644 index 51a1a66009..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/inhand-right.png deleted file mode 100644 index 56f45d5e04..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json deleted file mode 100644 index 52baa4ce56..0000000000 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/meta.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", - "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "tool" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/tool.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/tool.png deleted file mode 100644 index 537d7a5c4c..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/tool.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/wielded-inhand-left.png deleted file mode 100644 index 62f81fdcbe..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/wielded-inhand-right.png deleted file mode 100644 index cf47206f2e..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Hammer/metall_hammer.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT.png deleted file mode 100644 index c4c5169aa0..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT2.png deleted file mode 100644 index 2c3cde0147..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-NECK.png deleted file mode 100644 index c3264c2b4d..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/icon.png deleted file mode 100644 index 4b39398ecb..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-left.png deleted file mode 100644 index 672e2e2870..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-right.png deleted file mode 100644 index 610360d1a5..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-left.png deleted file mode 100644 index 7e8a549f32..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-right.png deleted file mode 100644 index a3e18c375b..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT.png deleted file mode 100644 index 950cd509a9..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT2.png deleted file mode 100644 index 51f6f42c97..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-NECK.png deleted file mode 100644 index 02f0411e32..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/icon.png deleted file mode 100644 index ba7a88d0e2..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-left.png deleted file mode 100644 index fe32b3e474..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-right.png deleted file mode 100644 index 388deddbaf..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json deleted file mode 100644 index 52baa4ce56..0000000000 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/meta.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", - "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "tool" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/tool.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/tool.png deleted file mode 100644 index bf76eeb893..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/tool.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-left.png deleted file mode 100644 index 3210135eb1..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-right.png deleted file mode 100644 index 3042cff758..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT.png deleted file mode 100644 index cda538ccd4..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png deleted file mode 100644 index caa9f978d7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-NECK.png deleted file mode 100644 index 9aba9d63d6..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/icon.png deleted file mode 100644 index f9097040ac..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-left.png deleted file mode 100644 index 659ce09ab6..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-right.png deleted file mode 100644 index 331892bd4b..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/preview.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/preview.png deleted file mode 100644 index b51cba529e..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/preview.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-left.png deleted file mode 100644 index 800b94d684..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-right.png deleted file mode 100644 index bc381580bc..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-BELT1.png deleted file mode 100644 index b084eae783..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-BELT1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-BELT2.png deleted file mode 100644 index 6896f8cd71..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-NECK.png deleted file mode 100644 index cb25f14318..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/icon.png deleted file mode 100644 index 3fffc881b0..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/inhand-left.png deleted file mode 100644 index a37661ed01..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/inhand-right.png deleted file mode 100644 index dd3c76e83b..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/wielded-inhand-left.png deleted file mode 100644 index 2640f45379..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/wielded-inhand-right.png deleted file mode 100644 index 5c58607dd7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT.png deleted file mode 100644 index b67b3f3fc6..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT2.png deleted file mode 100644 index 2b95da714a..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-NECK.png deleted file mode 100644 index 520813e750..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/icon.png deleted file mode 100644 index be90409ffc..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-left.png deleted file mode 100644 index a94a1fd069..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-right.png deleted file mode 100644 index 77e3f89991..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json deleted file mode 100644 index 52baa4ce56..0000000000 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/meta.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", - "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "tool" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/tool.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/tool.png deleted file mode 100644 index 39ec6840b8..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/tool.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-left.png deleted file mode 100644 index f150ab9f19..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-right.png deleted file mode 100644 index 4f8def30ad..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT.png deleted file mode 100644 index 20b23da66a..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT2.png deleted file mode 100644 index 6981924047..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-NECK.png deleted file mode 100644 index e3c685c425..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/icon.png deleted file mode 100644 index 8fcbfc40f7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-left.png deleted file mode 100644 index 9a354e7b99..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-right.png deleted file mode 100644 index 1b7ee17278..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-left.png deleted file mode 100644 index 01e18a7282..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-right.png deleted file mode 100644 index 46e3206fdb..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT.png deleted file mode 100644 index ed5a92db6d..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT2.png deleted file mode 100644 index 5eb7b68b61..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-NECK.png deleted file mode 100644 index aa515db0d5..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/icon.png deleted file mode 100644 index bd25ad4a35..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/inhand-left.png deleted file mode 100644 index 7fdf1b11ca..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/inhand-right.png deleted file mode 100644 index 3c55843bd1..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json deleted file mode 100644 index 56da788355..0000000000 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/meta.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": 1, - "size": { - "x": 48, - "y": 48 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by iwordoloni (Discord) ", - "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "preview" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/preview.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/preview.png deleted file mode 100644 index ada7e2858d..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/preview.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/wielded-inhand-left.png deleted file mode 100644 index 15f6491603..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/wielded-inhand-right.png deleted file mode 100644 index 730b1e8bc2..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT.png deleted file mode 100644 index 0fe7a31ce9..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT2.png deleted file mode 100644 index 169595725d..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-NECK.png deleted file mode 100644 index d183a3f26b..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/icon.png deleted file mode 100644 index e36dcbe02e..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-left.png deleted file mode 100644 index 2a11fe88cc..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-right.png deleted file mode 100644 index ae3f668d79..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-left.png deleted file mode 100644 index d1ba530ab7..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-right.png deleted file mode 100644 index 4c3dee15b4..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-BELT1.png deleted file mode 100644 index db95259339..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-BELT1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-BELT2.png deleted file mode 100644 index cc85654750..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-NECK.png deleted file mode 100644 index 9fba91a9b9..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/icon.png deleted file mode 100644 index 37b8bd90c0..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/inhand-left.png deleted file mode 100644 index e77f4e486d..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/inhand-right.png deleted file mode 100644 index 4877898b70..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/meta.json deleted file mode 100644 index 432e587362..0000000000 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/meta.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by Vojner (Discord) Original by TheShuEd (Github) ", - "states": [ - { - "name": "equipped-BELT1", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/wielded-inhand-left.png deleted file mode 100644 index 4b444ee342..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/wielded-inhand-right.png deleted file mode 100644 index 05cfac4f96..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/wooden_spear.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT.png deleted file mode 100644 index 52ae822e3a..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT2.png deleted file mode 100644 index 7c33175e6a..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-NECK.png deleted file mode 100644 index 904a2efe88..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/icon.png deleted file mode 100644 index bcad46d2a6..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/inhand-left.png deleted file mode 100644 index f67d361d43..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/inhand-right.png deleted file mode 100644 index 8066b11638..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/wielded-inhand-left.png deleted file mode 100644 index 41f6cd7729..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/wielded-inhand-right.png deleted file mode 100644 index cd045770c0..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT.png deleted file mode 100644 index 45295ecbef..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT2.png deleted file mode 100644 index 0e3c59b367..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-NECK.png deleted file mode 100644 index df63ea0e41..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/icon.png deleted file mode 100644 index f3c84ec4c8..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-left.png deleted file mode 100644 index fcdef88115..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-right.png deleted file mode 100644 index 49b83fe949..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/preview.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/preview.png deleted file mode 100644 index 1c2d968844..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/preview.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-left.png deleted file mode 100644 index f16af60f91..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-right.png deleted file mode 100644 index d52b19b18b..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-BELT1.png deleted file mode 100644 index 1e30be4c4f..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-BELT1.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-BELT2.png deleted file mode 100644 index df2325559c..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-BELT2.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-NECK.png deleted file mode 100644 index 32aed9d6da..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/icon.png deleted file mode 100644 index 845a7495cf..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/inhand-left.png deleted file mode 100644 index 9d4b6c9519..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/inhand-right.png deleted file mode 100644 index a78e633433..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/wielded-inhand-left.png deleted file mode 100644 index 82cb8b5dfc..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/wielded-inhand-right.png deleted file mode 100644 index ff7cda0a85..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/wielded-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/helmir_child.png b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/helmir_child.png new file mode 100644 index 0000000000..044a49f9ec Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/helmir_child.png differ diff --git a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json index 835c5e06df..48efa9494c 100644 --- a/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Specific/Economy/trade_contracts.rsi/meta.json @@ -22,6 +22,9 @@ { "name": "guard" }, + { + "name": "helmir_child" + }, { "name": "magic" }, diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/equipped-BELT.png new file mode 100644 index 0000000000..d514e9ad5c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..f4c61f7e7b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/icon.png new file mode 100644 index 0000000000..eec5441802 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/inhand-left.png new file mode 100644 index 0000000000..88c4c9c9f4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/inhand-right.png new file mode 100644 index 0000000000..1dc71b4df4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/meta.json similarity index 68% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/meta.json index 93aff700bd..9da2a51d82 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/hatchet.rsi/meta.json @@ -15,10 +15,6 @@ "name": "equipped-BELT2", "directions": 4 }, - { - "name": "equipped-NECK", - "directions": 4 - }, { "name": "icon" }, @@ -29,14 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/equipped-BELT.png diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/equipped-BELT2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-BELT2.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/equipped-BELT2.png diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/equipped-NECK.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/equipped-NECK.png diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/icon.png new file mode 100644 index 0000000000..095480c1ec Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/equipped-BELT.png new file mode 100644 index 0000000000..eb90ab8767 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..eeeea862d6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/icon.png new file mode 100644 index 0000000000..79470068b1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..e50b1c25e2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..33d6295229 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/meta.json similarity index 68% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/meta.json index 93aff700bd..9da2a51d82 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Spear/metall_spear.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/iron.rsi/meta.json @@ -15,10 +15,6 @@ "name": "equipped-BELT2", "directions": 4 }, - { - "name": "equipped-NECK", - "directions": 4 - }, { "name": "icon" }, @@ -29,14 +25,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/equipped-BELT.png new file mode 100644 index 0000000000..8e4efa1d01 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..a6a61046ce Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/icon.png new file mode 100644 index 0000000000..4886e733b2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/inhand-left.png new file mode 100644 index 0000000000..47c127473d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/inhand-right.png new file mode 100644 index 0000000000..008760e05d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/meta.json new file mode 100644 index 0000000000..9da2a51d82 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/sickle.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/equipped-NECK.png new file mode 100644 index 0000000000..b17a5ea61b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/icon.png new file mode 100644 index 0000000000..37b65673ac Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/inhand-left.png new file mode 100644 index 0000000000..e0e1f341cc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/inhand-right.png new file mode 100644 index 0000000000..409d24e5cf Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/meta.json similarity index 72% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/meta.json index a85319c765..91e4c5fb6b 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/bone_sword.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/meta.json @@ -1,24 +1,12 @@ { "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", "size": { "x": 48, "y": 48 }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, { "name": "icon" }, @@ -26,6 +14,10 @@ "name": "inhand-left", "directions": 4 }, + { + "name": "equipped-NECK", + "directions": 4 + }, { "name": "inhand-right", "directions": 4 @@ -39,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..39623481a6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..20aa311b4b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Fork/fork.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/equipped-BELT.png new file mode 100644 index 0000000000..49abef536b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..28052a73c9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/icon.png new file mode 100644 index 0000000000..8184ab7607 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..e39aff7e27 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..e5f80cba17 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/meta.json new file mode 100644 index 0000000000..9da2a51d82 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hammer/iron.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/equipped-NECK.png new file mode 100644 index 0000000000..18b6e1a956 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/icon.png new file mode 100644 index 0000000000..206ba2bd41 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/inhand-left.png new file mode 100644 index 0000000000..d5cb9118de Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/inhand-right.png new file mode 100644 index 0000000000..07b3c9bd56 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/meta.json similarity index 69% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/meta.json index 5180040901..91e4c5fb6b 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/wooden_sword.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/meta.json @@ -1,24 +1,12 @@ { "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", "size": { "x": 48, "y": 48 }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by Vojner (Discord) Original by TheShuEd (Github) ", "states": [ - { - "name": "equipped-BELT1", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, { "name": "icon" }, @@ -26,6 +14,10 @@ "name": "inhand-left", "directions": 4 }, + { + "name": "equipped-NECK", + "directions": 4 + }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..5ea5dbb5b8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..525d3a7c77 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Mop/mop.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..44c410203f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/icon.png new file mode 100644 index 0000000000..c61f2f527b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..6e18a6d7dd Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..d845d3e2d7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/meta.json similarity index 69% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/meta.json index 5180040901..91e4c5fb6b 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/wooden_rapier.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/meta.json @@ -1,24 +1,12 @@ { "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", "size": { "x": 48, "y": 48 }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by Vojner (Discord) Original by TheShuEd (Github) ", "states": [ - { - "name": "equipped-BELT1", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, { "name": "icon" }, @@ -26,6 +14,10 @@ "name": "inhand-left", "directions": 4 }, + { + "name": "equipped-NECK", + "directions": 4 + }, { "name": "inhand-right", "directions": 4 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..a0df817fe9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..a0df817fe9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/iron.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/equipped-BELT.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/equipped-BELT.png new file mode 100644 index 0000000000..1859bc93f3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..c370b91e33 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/icon.png new file mode 100644 index 0000000000..81b65af134 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..347a5007b6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..2cad9cf8b6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/meta.json similarity index 57% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/meta.json index 55c514f983..200de0ed46 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Rapier/iron.rsi/meta.json @@ -1,12 +1,19 @@ { "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", "size": { "x": 48, "y": 48 }, - "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, { "name": "equipped-BELT", "directions": 4 @@ -15,31 +22,9 @@ "name": "equipped-BELT2", "directions": 4 }, - { - "name": "equipped-NECK", - "directions": 4 - }, - { - "name": "icon" - }, - { - "name": "preview" - }, - { - "name": "inhand-left", - "directions": 4 - }, { "name": "inhand-right", "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/equipped-NECK.png index 187be1a65d..ebd252a300 100644 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/equipped-NECK.png and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/icon.png index 3b4762897a..8c4a632c56 100644 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/icon.png and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-left.png index b0193a2e1a..b20ebd1229 100644 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-left.png and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-right.png index 8a3e36bd65..0349a52a0e 100644 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-right.png and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shield/shield.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..71f670ef95 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/icon.png new file mode 100644 index 0000000000..3193b75438 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..0a9e6b82c3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..7f5764cdf4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/meta.json new file mode 100644 index 0000000000..bea18fa819 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/ShieldBuckler/iron.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..c34d8fc315 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/icon.png new file mode 100644 index 0000000000..ac809c0845 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..0fe1e50b8a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..2fb284eb25 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/meta.json similarity index 68% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/meta.json index 93aff700bd..91e4c5fb6b 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Mace/metall_mace.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/meta.json @@ -1,24 +1,12 @@ { "version": 1, - "size": { - "x": 32, - "y": 32 - }, "license": "CC-BY-SA-4.0", - "copyright": "Created by TheShuEd (Github) ", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 48, + "y": 48 + }, "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, - { - "name": "equipped-NECK", - "directions": 4 - }, { "name": "icon" }, @@ -26,6 +14,10 @@ "name": "inhand-left", "directions": 4 }, + { + "name": "equipped-NECK", + "directions": 4 + }, { "name": "inhand-right", "directions": 4 @@ -39,4 +31,4 @@ "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..ebae2e6d33 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..ebae2e6d33 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Shovel/iron.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..290d06490f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/icon.png new file mode 100644 index 0000000000..755826698e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..aa6c23a55e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..db3f134030 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/meta.json new file mode 100644 index 0000000000..3c81299c4f --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Skimitar/iron.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..63f5208b54 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/icon.png new file mode 100644 index 0000000000..d38dacc6b1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..ad4e92b68c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..b52bbc5205 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/meta.json new file mode 100644 index 0000000000..91e4c5fb6b --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..7bcff14d56 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..7bcff14d56 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Spear/iron.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..ed761812ed Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/icon.png new file mode 100644 index 0000000000..0630e29758 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..3c0b30b326 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..69fecffb92 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/meta.json new file mode 100644 index 0000000000..3c81299c4f --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/Sword/iron.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/equipped-NECK.png new file mode 100644 index 0000000000..ed87711b6f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/icon.png new file mode 100644 index 0000000000..4c7b91327f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/inhand-left.png new file mode 100644 index 0000000000..98ae6f4ee9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/inhand-right.png new file mode 100644 index 0000000000..8dbc124986 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/meta.json similarity index 54% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/meta.json index 55c514f983..8ea3ca2f29 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/TowerShield/wooden.rsi/meta.json @@ -7,14 +7,6 @@ "license": "CC-BY-SA-4.0", "copyright": "Created by TheShuEd (Github) ", "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, { "name": "equipped-NECK", "directions": 4 @@ -22,9 +14,6 @@ { "name": "icon" }, - { - "name": "preview" - }, { "name": "inhand-left", "directions": 4 @@ -32,14 +21,6 @@ { "name": "inhand-right", "directions": 4 - }, - { - "name": "wielded-inhand-left", - "directions": 4 - }, - { - "name": "wielded-inhand-right", - "directions": 4 } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..f972758185 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/icon.png new file mode 100644 index 0000000000..2b9d84e62d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..21a7b50263 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..73cd5f4026 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/meta.json new file mode 100644 index 0000000000..91e4c5fb6b --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..7224c16be4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..7224c16be4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/iron.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..d5146fa781 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/icon.png new file mode 100644 index 0000000000..cdea029069 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..badf5e1ae8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..32b2d8621a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/meta.json new file mode 100644 index 0000000000..91e4c5fb6b --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd (Github)", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..636a2aa00c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..d5219d9be3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarAxe/iron.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/equipped-NECK.png new file mode 100644 index 0000000000..fd171b0b58 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/icon.png new file mode 100644 index 0000000000..29cc2a5ae1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/inhand-left.png new file mode 100644 index 0000000000..208e2beb3f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/inhand-right.png new file mode 100644 index 0000000000..bd3008624f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/meta.json similarity index 79% rename from Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/meta.json index 93aff700bd..3d7dd534b1 100644 --- a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Sickle/metall_sickle.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/meta.json @@ -7,14 +7,6 @@ "license": "CC-BY-SA-4.0", "copyright": "Created by TheShuEd (Github) ", "states": [ - { - "name": "equipped-BELT", - "directions": 4 - }, - { - "name": "equipped-BELT2", - "directions": 4 - }, { "name": "equipped-NECK", "directions": 4 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..553075d320 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..9b95a85565 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Melee/WarHammer/iron.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/icon.png deleted file mode 100644 index 6b6a70700d..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Melee/ice_dagger.rsi/icon.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/meta.json index 2a98eafa31..a8b819af73 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/meta.json @@ -7,15 +7,9 @@ "y": 32 }, "states": [ - { - "name": "tail" - }, { "name": "rod" }, - { - "name": "tip" - }, { "name": "solution1" }, diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/rod.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/rod.png index 1b934c3201..97e5421cfe 100644 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/rod.png and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/rod.png differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tail.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tail.png deleted file mode 100644 index 96195c746f..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tail.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tip.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tip.png deleted file mode 100644 index bf5ae60899..0000000000 Binary files a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/arrows.rsi/tip.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi/meta.json index 7832ce87a7..dd23bc959c 100644 --- a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "solution1" + }, { "name": "inhand-left", "directions": 4 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi/solution1.png b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi/solution1.png new file mode 100644 index 0000000000..20e77e7f1f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi/solution1.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 52f1e55e5d..6c1d50dd5a 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -73,15 +73,6 @@ CP14ClothingCloakSimpleDarkBlue: null CP14ClothingCloakArmoredRed: CP14ClothingCloakGuardCommander CP14SpawnPointCaptain: null -#2024-27-11 -CP14BaseDagger: CP14ModularIronDagger -CP14BaseMace: CP14ModularIronMace -CP14BaseSickle: CP14ModularIronSickle -CP14BaseThrowableSpear: CP14ModularIronSpear -CP14BaseSword: CP14ModularIronSword -CP14BaseShovel: CP14ModularIronShovel -CP14BasePickaxe: CP14ModularIronPickaxe - #2024-02-12 CP14WoodenDoorTavernAlchemy: CP14WoodenDoorAlchemy1 CP14WoodenDoorTavernAlchemyMirrored: CP14WoodenDoorAlchemyMirrored1 @@ -95,9 +86,6 @@ CP14FenceIronGrilleCorner: null CP14ClothingShirtGuardsChainmailShirtWB: CP14ClothingShirtGuardsChainmailShirtB CP14KeyRingGuardCommandant: CP14KeyRingGuardCommander -#2024-08-12 -CP14BaseHandheldAxe: CP14ModularGripWoodenLong - #2024-12-12 CP14FloraTree01: CP14FloraTreeGreen CP14FloraTree02: CP14FloraTreeGreen @@ -132,10 +120,6 @@ CP14TwoHandedSwordScythe: null #2025-17-01 CP14ClothingCloakBrassArmor: null -CP14ClothingCloakCuirass: CP14ArmorIronCuirass -CP14ClothingCloakInfantryCuirass: CP14ArmorIronCuirass -CP14ClothingCloakCuirassLoincloth: CP14ArmorIronCuirass -CP14ClothingCloakCuirassLeg: CP14ArmorIronCuirass #2025-21-01 CP14PlateWooden: CP14PlateWooden @@ -143,10 +127,6 @@ CP14PlateWooden2: CP14PlateWooden CP14PlateCeramic: CP14PlateWooden CP14PlateIron: CP14PlateIron -#2025-22-01 -CP14BaseLightHammer: CP14ModularIronHammer -CP14BaseBattleHammer: CP14ModularIronHammer - #2025-30-01 CP14OreCopper: CP14OreCopper1 CP14OreIron: CP14OreIron1 @@ -167,8 +147,8 @@ C14IronCabinet: CP14IronCabinet C14IronCabinetCargo: CP14IronCabinet #2025-16-02 -CP14Arrow: CP14ModularIronArrow -CP14ClothingBeltQuiverArrow: CP14ClothingBeltQuiverIronArrow +CP14Arrow: null +CP14ClothingBeltQuiverArrow: CP14ClothingBeltQuiverArrows #2025-17-02 CP14Crossbolt: CP14CrossboltIron @@ -219,12 +199,6 @@ CP14IronDoorBankVault: null CP14BankStorageMarker: null CP14SpawnPointCommandant: null -#2025-07-03 -CP14ClothingOuterClothingCuirass: CP14ArmorIronCuirass -CP14ClothingOuterClothingInfantryCuirass: CP14ArmorIronCuirass -CP14ClothingOuterClothingCuirassLoincloth: CP14ArmorIronCuirass -CP14ClothingOuterClothingCuirassLeg: CP14ArmorIronCuirass - #2025-11-03 CP14BrassChest: CP14WoodenChest CP14BrassChestFilledEnergyCrystals: null @@ -252,7 +226,6 @@ CP14PlantPotatoDeath: CP14PlantPotato CP14PlantPumpkinDeath: CP14PlantPumpkin CP14PlantTomatoesDeath: CP14PlantTomatoes CP14PlantWheatDeath: CP14PlantWheat -CP14BaseHoe: CP14ModularIronHoe CP14PlantOnion: null #2025-14-04 @@ -277,7 +250,6 @@ CP14WallStonebrickCrushedMedium: CP14WallFrameStonebrick CP14WallStonebrickCrushedLow: CP14WallFrameStonebrick CP14WallCyan: CP14WallStonebrick CP14FrameWooden: CP14WallFrameWooden -CP14BaseCrowbar: CP14ModularIronPickaxe #2025-26-04 CP14WallSkulls: CP14WallStonebrickOld @@ -344,7 +316,6 @@ CP14ClothingRingFlashLight: null CP14ClothingRingIceShards: null # 2025-04-06 -CP14BaseMop: CP14ModularWoodMop CP14CarpetPink: CP14CarpetPurple #2025-15-06 @@ -441,6 +412,62 @@ CP14DemiplaneCore: null CP14SpawnerLocationConnection: null CP14LocationPassway: null +#2025-08-27 +CP14ModularBladeBoneSword: CP14CopperCoin1 +CP14ModularBladeCopperSickle: CP14CopperCoin1 +CP14ModularBladeIronAxe: CP14CopperCoin1 +CP14ModularBladeIronMace: CP14CopperCoin1 +CP14ModularBladeIronRapier: CP14CopperCoin1 +CP14ModularBladeIronSickle: CP14CopperCoin1 +CP14ModularBladeIronShovel: CP14CopperCoin1 +CP14ModularBladeIronPickaxe: CP14CopperCoin1 +CP14ModularBladeMithrilDagger: CP14CopperCoin1 +CP14ModularGardeSharpCopper: CP14CopperCoin1 +CP14ModularGardeSharpIron: CP14CopperCoin1 +CP14ModularGardeSharpMithril: CP14CopperCoin1 +CP14ModularGardeSturdyGold: CP14CopperCoin1 +CP14ModularGripCopper: CP14CopperCoin1 +CP14ModularGripIron: CP14CopperCoin1 +CP14ModularGripIronLong: CP14CopperCoin1 +CP14ModularGripIronLongGuard: CP14CopperCoin1 +CP14ModularGripMithril: CP14CopperCoin1 +CP14ModularGripWoodenLong: CP14CopperCoin1 +CP14ModularGuardHalberd: CP14CopperCoin1 +CP14ModularInlayQuartzDarkness: CP14CopperCoin1 +CP14ModularInlayQuartzElectric: CP14CopperCoin1 +CP14ModularInlayQuartzFire: CP14CopperCoin1 +CP14ModularInlayQuartzHealing: CP14CopperCoin1 +CP14ModularInlayQuartzLight: CP14CopperCoin1 +CP14ModularInlayQuartzWater: CP14CopperCoin1 +CP14ModularTipGoldArrow: CP14CopperCoin1 +CP14ModularTipIronArrow: CP14CopperCoin1 +CP14ModularRodLucens: CP14CopperCoin1 +CP14ModularRodWooden: CP14CopperCoin1 + +CP14ModularIronAxe: CP14WeaponWarAxeIron +CP14ModularIronDagger: CP14WeaponDaggerIron +CP14ModularIronHammer: CP14WeaponHammerIron +CP14ModularIronKunai: CP14WeaponDaggerHatchet +CP14ModularIronMace: CP14CopperCoin1 +CP14ModularIronPickaxe: CP14WeaponPickaxeIron +CP14ModularIronShovel: CP14WeaponShovelIron +CP14ModularIronSickle: CP14WeaponDaggerSickle +CP14ModularIronSpear: CP14WeaponSpearIron +CP14ModularIronSword: CP14WeaponSwordIron +CP14ModularSkeletonHalberd: CP14WeaponTwoHandedSwordIron +CP14ModularWoodMop: CP14Mop +CP14ModularIronHoe: CP14WeaponFork +CP14ModularIronArrow: CP14Arrow +CP14ModularCopperArrow: CP14Arrow +CP14ModularCopperSkimitar: CP14WeaponSkimitarIron +CP14BaseShield: CP14WeaponShieldWooden + + +CP14ClothingBeltQuiverMithrilArrow: CP14ClothingBeltQuiverArrows +CP14ClothingBeltQuiverCopperArrow: CP14ClothingBeltQuiverArrows +CP14ClothingBeltQuiverIronArrow: CP14ClothingBeltQuiverArrows +CP14ArmorIronCuirass: null + # <---> CrystallEdge migration zone end