diff --git a/Content.Server/_CP14/ModularCraft/CP14ModularCraftSystem.cs b/Content.Server/_CP14/ModularCraft/CP14ModularCraftSystem.cs index 4e70f7c696..40535fe8c4 100644 --- a/Content.Server/_CP14/ModularCraft/CP14ModularCraftSystem.cs +++ b/Content.Server/_CP14/ModularCraft/CP14ModularCraftSystem.cs @@ -126,7 +126,6 @@ public sealed class CP14ModularCraftSystem : CP14SharedModularCraftSystem start.Comp.InstalledParts.Add(partProto); var indexedPart = _proto.Index(partProto); - start.Comp.FreeSlots.AddRange(indexedPart.AddSlots); foreach (var modifier in indexedPart.Modifiers) { diff --git a/Content.Server/_CP14/ModularCraft/Modifiers/EditDamageableModifier.cs b/Content.Server/_CP14/ModularCraft/Modifiers/EditDamageableModifier.cs index ef9590df54..6005d83688 100644 --- a/Content.Server/_CP14/ModularCraft/Modifiers/EditDamageableModifier.cs +++ b/Content.Server/_CP14/ModularCraft/Modifiers/EditDamageableModifier.cs @@ -11,8 +11,7 @@ public sealed partial class EditDamageableModifier : CP14ModularCraftModifier public override void Effect(EntityManager entManager, Entity start, Entity? part) { - if (!entManager.TryGetComponent(start, out var damageable)) - return; + var damageable = entManager.EnsureComponent(start); damageable.Modifier *= Multiplier; entManager.Dirty(start); diff --git a/Content.Server/_CP14/ModularCraft/Modifiers/EditModularSlots.cs b/Content.Server/_CP14/ModularCraft/Modifiers/EditModularSlots.cs new file mode 100644 index 0000000000..4f88a9322b --- /dev/null +++ b/Content.Server/_CP14/ModularCraft/Modifiers/EditModularSlots.cs @@ -0,0 +1,25 @@ +using Content.Shared._CP14.ModularCraft; +using Content.Shared._CP14.ModularCraft.Components; +using Content.Shared._CP14.ModularCraft.Prototypes; +using Robust.Shared.Prototypes; + +namespace Content.Server._CP14.ModularCraft.Modifiers; + +public sealed partial class EditModularSlots : CP14ModularCraftModifier +{ + [DataField] + public HashSet> AddSlots = new(); + + [DataField] + public HashSet> RemoveSlots = new(); + + public override void Effect(EntityManager entManager, Entity start, Entity? part) + { + start.Comp.FreeSlots.AddRange(AddSlots); + foreach (var slot in RemoveSlots) + { + if (start.Comp.FreeSlots.Contains(slot)) + start.Comp.FreeSlots.Remove(slot); + } + } +} diff --git a/Content.Server/_CP14/ModularCraft/Modifiers/EditSharpened.cs b/Content.Server/_CP14/ModularCraft/Modifiers/EditSharpened.cs new file mode 100644 index 0000000000..0061f39f3d --- /dev/null +++ b/Content.Server/_CP14/ModularCraft/Modifiers/EditSharpened.cs @@ -0,0 +1,18 @@ +using Content.Shared._CP14.MeleeWeapon.Components; +using Content.Shared._CP14.ModularCraft; +using Content.Shared._CP14.ModularCraft.Components; + +namespace Content.Server._CP14.ModularCraft.Modifiers; + +public sealed partial class EditSharpened : CP14ModularCraftModifier +{ + [DataField] + public float SharpnessDamageMultiplier = 1f; + public override void Effect(EntityManager entManager, Entity start, Entity? part) + { + if (!entManager.TryGetComponent(start, out var sharpened)) + return; + + sharpened.SharpnessDamageBy1Damage *= SharpnessDamageMultiplier; + } +} diff --git a/Content.Shared/_CP14/MeleeWeapon/Components/CP14SharpenedComponent.cs b/Content.Shared/_CP14/MeleeWeapon/Components/CP14SharpenedComponent.cs index 70ef3ce9ad..29f896e615 100644 --- a/Content.Shared/_CP14/MeleeWeapon/Components/CP14SharpenedComponent.cs +++ b/Content.Shared/_CP14/MeleeWeapon/Components/CP14SharpenedComponent.cs @@ -6,7 +6,7 @@ namespace Content.Shared._CP14.MeleeWeapon.Components; /// /// allows the object to become blunt with use /// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(CP14SharpeningSystem))] +[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] public sealed partial class CP14SharpenedComponent : Component { [DataField, AutoNetworkedField] diff --git a/Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs b/Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs index 1123bdd0d3..d9c2b51f10 100644 --- a/Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs +++ b/Content.Shared/_CP14/ModularCraft/Prototypes/CP14ModularCraftPartPrototype.cs @@ -25,9 +25,6 @@ public sealed partial class CP14ModularCraftPartPrototype : IPrototype [DataField(serverOnly: true)] public List Modifiers = new(); - [DataField] - public HashSet> AddSlots = new(); - [DataField] public string? RsiPath; diff --git a/Resources/Locale/en-US/_CP14/modularCraft/modularCraft.ftl b/Resources/Locale/en-US/_CP14/modularCraft/modularCraft.ftl new file mode 100644 index 0000000000..34578a7b89 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/modularCraft/modularCraft.ftl @@ -0,0 +1,3 @@ +verb-categories-modular-craft = Forging + +cp14-modular-craft-add-part-verb-text = Attach as {$slot} \ No newline at end of file diff --git a/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl b/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl new file mode 100644 index 0000000000..abd18efdc1 --- /dev/null +++ b/Resources/Locale/en-US/_CP14/modularCraft/slots.ftl @@ -0,0 +1,2 @@ +cp14-modular-slot-blade = blade +cp14-modular-slot-garde = garde \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl b/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl index eee470e3d1..d8e8c73994 100644 --- a/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl +++ b/Resources/Locale/ru-RU/_CP14/modularCraft/slots.ftl @@ -2,3 +2,4 @@ cp14-modular-slot-blade = лезвие cp14-modular-slot-jewerly1 = украшение (1) cp14-modular-slot-magic-crystal = магический кристалл cp14-modular-slot-magic-crystal-holder = держатель магических кристаллов +cp14-modular-slot-garde = гарда diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml new file mode 100644 index 0000000000..3a6705ea82 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml @@ -0,0 +1,48 @@ +- 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/iron_dagger.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeIronDagger + +- type: entity + parent: CP14ModularBladeDaggerBase + id: CP14ModularBladeGoldDagger + name: golden dagger blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeGoldDagger + +- type: entity + parent: CP14ModularBladeDaggerBase + id: CP14ModularBladeCopperDagger + name: copper dagger blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeCopperDagger \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml new file mode 100644 index 0000000000..1bdad0a78c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml @@ -0,0 +1,51 @@ +- 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 + categories: [ ForkFiltered ] + name: iron pickaxe head + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeIronPickaxe + +- type: entity + parent: CP14ModularBladePickaxeBase + id: CP14ModularBladeGoldPickaxe + categories: [ ForkFiltered ] + name: golden pickaxe head + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeGoldPickaxe + +- type: entity + parent: CP14ModularBladePickaxeBase + id: CP14ModularBladeCopperPickaxe + categories: [ ForkFiltered ] + name: copper pickaxe head + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeCopperPickaxe \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml new file mode 100644 index 0000000000..769bb3250f --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml @@ -0,0 +1,51 @@ +- 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 + categories: [ ForkFiltered ] + name: iron rapier blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeIronRapier + +- type: entity + parent: CP14ModularBladeRapierBase + id: CP14ModularBladeGoldRapier + categories: [ ForkFiltered ] + name: golden rapier blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeGoldRapier + +- type: entity + parent: CP14ModularBladeRapierBase + id: CP14ModularBladeCopperRapier + categories: [ ForkFiltered ] + name: copper rapier blade + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeCopperRapier \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml new file mode 100644 index 0000000000..2395258865 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml @@ -0,0 +1,51 @@ +- 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 + +- type: entity + parent: CP14ModularGardeBase + id: CP14ModularGardeSharpGold + categories: [ ForkFiltered ] + name: sharp gold garde + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Garde/gold_sharp.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - GardeSharpGold + +- type: entity + parent: CP14ModularGardeBase + id: CP14ModularGardeSharpIron + categories: [ ForkFiltered ] + name: sharp iron garde + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - GardeSharpIron + +- type: entity + parent: CP14ModularGardeBase + id: CP14ModularGardeSharpCopper + categories: [ ForkFiltered ] + name: sharp copper garde + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Garde/copper_sharp.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - GardeSharpCopper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/blade.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/blade.yml index 29a0c05ebf..34485484f4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/blade.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/blade.yml @@ -1,22 +1,3 @@ -- type: entity - parent: BaseItem - id: CP14ModularBladeIronDagger - categories: [ ForkFiltered ] - name: iron dagger blade - 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: Sprite - sprite: _CP14/Objects/ModularTools/iron_dagger.rsi - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronDagger - - type: entity parent: BaseItem id: CP14ModularBladeIronSpear @@ -112,25 +93,6 @@ possibleParts: - BladeIronShovel -- type: entity - parent: BaseItem - id: CP14ModularBladeIronPickaxe - categories: [ ForkFiltered ] - name: iron pickaxe head - 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: Sprite - sprite: _CP14/Objects/ModularTools/iron_pickaxe.rsi - state: icon - - type: CP14ModularCraftPart - possibleParts: - - BladeIronPickaxe - #- type: entity # parent: BaseItem # id: CP14ModularBladeIronSwordTwoHanded diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml index b8aee82926..b2f9fba430 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml @@ -34,33 +34,17 @@ - type: entity parent: CP14ModularGripBase - id: CP14ModularGripWooden - name: wooden grip - description: A short wooden handle for a weapon or tool. The cheapest and most unstable material. + id: CP14ModularGripShort + abstract: true + description: A short handle for a weapon or tool. components: + - type: CP14ModularCraftStartPoint + startSlots: + - Blade - type: Item shape: - 0,0,0,0 storedOffset: 0, -5 - - type: Sprite - sprite: _CP14/Objects/ModularTools/wooden_grip.rsi - state: icon - - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripWooden - startSlots: - - Blade - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 50 - behaviors: - - !type:PlaySoundBehavior - sound: - collection: MetalBreak - - !type:CP14ModularDisassembleBehavior - - !type:DoActsBehavior - acts: ["Destruction"] - type: MeleeWeapon resetOnHandSelected: false #Fast swap range: 1.0 # 1.5 standart @@ -72,21 +56,42 @@ - type: entity parent: CP14ModularGripBase - id: CP14ModularGripWoodenLong - name: long wooden grip - description: long, two-handed wooden handle for heavy weapons or large tools. + id: CP14ModularGripLong + abstract: true + description: long, two-handed handle for heavy weapons or large tools. 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/wooden_grip_long.rsi + sprite: _CP14/Objects/ModularTools/Grip/wooden_grip.rsi state: icon - type: CP14ModularCraftStartPoint - startProtoPart: CP14ModularGripWoodenLong - startSlots: - - Blade + startProtoPart: CP14ModularGripWooden - type: Destructible thresholds: - trigger: @@ -99,28 +104,15 @@ - !type:CP14ModularDisassembleBehavior - !type:DoActsBehavior acts: ["Destruction"] - - type: MeleeWeapon - resetOnHandSelected: true - range: 1.5 # 1.5 standart - attackRate: 0.7 # 1 standart - cPAnimationOffset: -1 - - type: Wieldable - - type: IncreaseDamageOnWield - damage: - types: - Blunt: 0 - - type: Clothing - slots: - - neck - + - type: entity - parent: CP14ModularGripWooden + parent: CP14ModularGripShort id: CP14ModularGripIron name: iron grip - description: A short iron handle for a weapon or tool. components: - type: Sprite - sprite: _CP14/Objects/ModularTools/iron_grip.rsi + sprite: _CP14/Objects/ModularTools/Grip/iron_grip.rsi + state: icon - type: CP14ModularCraftStartPoint startProtoPart: CP14ModularGripIron - type: Destructible @@ -137,13 +129,83 @@ acts: ["Destruction"] - type: entity - parent: CP14ModularGripWoodenLong - id: CP14ModularGripIronLong - name: long iron grip - description: long, two-handed iron handle for heavy weapons or large tools. + parent: CP14ModularGripShort + id: CP14ModularGripGolden + name: golden grip components: - type: Sprite - sprite: _CP14/Objects/ModularTools/iron_grip_long.rsi + sprite: _CP14/Objects/ModularTools/Grip/gold_grip.rsi + state: icon + - 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: entity + parent: CP14ModularGripShort + id: CP14ModularGripCopper + name: copper grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/Grip/copper_grip.rsi + state: icon + - 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"] + +# 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: entity + parent: CP14ModularGripLong + id: CP14ModularGripIronLong + name: long iron grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi + state: icon - type: CP14ModularCraftStartPoint startProtoPart: CP14ModularGripIronLong - type: Destructible @@ -156,5 +218,51 @@ sound: collection: MetalBreak - !type:CP14ModularDisassembleBehavior + - !type:DoActsBehavior + acts: ["Destruction"] + +- type: entity + parent: CP14ModularGripLong + id: CP14ModularGripGoldLong + name: long golden grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi + state: icon + - 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: entity + parent: CP14ModularGripLong + id: CP14ModularGripCopperLong + name: long copper grip + components: + - type: Sprite + sprite: _CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi + state: icon + - 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"] \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml index f0fa1aee29..ec28d6b8b2 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml @@ -7,7 +7,7 @@ - type: Sprite layers: - state: icon - - sprite: _CP14/Objects/ModularTools/iron_dagger.rsi + - sprite: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi state: icon - type: CP14ModularCraftAutoAssemble details: diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml index b8fbd0decc..7e5fb71ea2 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/pickaxe.yml @@ -7,7 +7,7 @@ - type: Sprite layers: - state: icon - - sprite: _CP14/Objects/ModularTools/iron_pickaxe.rsi + - sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi state: icon - type: CP14ModularCraftAutoAssemble details: diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml new file mode 100644 index 0000000000..35e7e900b0 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml @@ -0,0 +1,66 @@ +#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.4 + bonusDamage: + types: + Slash: 3 + Piercing: 3 + - !type:EditItem + newSize: Normal + adjustShape: 0, 1 + storedOffsetBonus: 0, 5 + - !type:EditModularSlots + addSlots: + - Garde + +- type: modularPart + id: BladeIronDagger + targetSlot: Blade + sourcePart: CP14ModularBladeIronDagger + rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeDagger + - BaseWeaponIron + +- type: modularPart + id: BladeGoldDagger + targetSlot: Blade + sourcePart: CP14ModularBladeGoldDagger + rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeDagger + - BaseWeaponGold + +- type: modularPart + id: BladeCopperDagger + targetSlot: Blade + sourcePart: CP14ModularBladeCopperDagger + rsiPath: _CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeDagger + - BaseWeaponCopper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml new file mode 100644 index 0000000000..24dca189ad --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml @@ -0,0 +1,54 @@ +- type: modularPart + id: BaseBladePickaxe + modifiers: + - !type:EditMeleeWeapon + attackRateMultiplier: 0.75 + angleMultiplier: 1.2 + bonusDamage: + types: + Piercing: 9 + - !type:EditIncreaseDamageOnWield + bonusDamage: + types: + Piercing: 4 + Structural: 10 + - !type:EditItem + newSize: Normal + adjustShape: 1, 1 + storedOffsetBonus: 0, 5 + - !type:EditModularSlots + addSlots: + - Garde + +- type: modularPart + id: BladeIronPickaxe + targetSlot: Blade + sourcePart: CP14ModularBladeIronPickaxe + rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladePickaxe + - BaseWeaponIron + +- type: modularPart + id: BladeGoldPickaxe + targetSlot: Blade + sourcePart: CP14ModularBladeGoldPickaxe + rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladePickaxe + - BaseWeaponGold + +- type: modularPart + id: BladeCopperPickaxe + targetSlot: Blade + sourcePart: CP14ModularBladeCopperPickaxe + rsiPath: _CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladePickaxe + - BaseWeaponCopper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml new file mode 100644 index 0000000000..6e33ce80fb --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml @@ -0,0 +1,69 @@ +#Concept: +# + Additional range +# + High Damage! And speed +# - Required Warcraft skill + +- type: modularPart + id: BaseBladeRapier + modifiers: + - !type:Inherit + copyFrom: + - BaseWeaponChemical + - BaseWeaponSharp + - !type:AddComponents + components: + - type: CP14SkillRequirement + fuckupChance: 0.5 + requiredSkills: + - Warcraft + - !type:EditMeleeWeapon + newWideAnimation: CP14WeaponArcThrust + resetOnHandSelected: true # Disable fast swap + bonusRange: 0.2 + angleMultiplier: 0 + attackRateMultiplier: 1.5 + bonusDamage: + types: + Piercing: 14 + - !type:EditItem + newSize: Large + adjustShape: 0, 2 + storedOffsetBonus: 0, 10 + - !type:EditModularSlots + addSlots: + - Garde + - !type:EditDamageableModifier # Only 1 ingot t craft, so less health + multiplier: 2 + +- type: modularPart + id: BladeIronRapier + targetSlot: Blade + sourcePart: CP14ModularBladeIronRapier + rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeRapier + - BaseWeaponIron + +- type: modularPart + id: BladeGoldRapier + targetSlot: Blade + sourcePart: CP14ModularBladeGoldRapier + rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeRapier + - BaseWeaponGold + +- type: modularPart + id: BladeCopperRapier + targetSlot: Blade + sourcePart: CP14ModularBladeCopperRapier + rsiPath: _CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeRapier + - BaseWeaponCopper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml b/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml new file mode 100644 index 0000000000..1c10aed0e5 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml @@ -0,0 +1,43 @@ +# Concept +# + Damage + +- type: modularPart + id: BaseGardeSharp + modifiers: + - !type:EditMeleeWeapon + bonusDamage: + types: + Piercing: 3 + +- type: modularPart + id: GardeSharpGold + targetSlot: Garde + sourcePart: CP14ModularGardeSharpGold + rsiPath: _CP14/Objects/ModularTools/Garde/gold_sharp.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseGardeSharp + - BaseWeaponGold + +- type: modularPart + id: GardeSharpIron + targetSlot: Garde + sourcePart: CP14ModularGardeSharpIron + rsiPath: _CP14/Objects/ModularTools/Garde/iron_sharp.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseGardeSharp + - BaseWeaponIron + +- type: modularPart + id: GardeSharpCopper + targetSlot: Garde + sourcePart: CP14ModularGardeSharpCopper + rsiPath: _CP14/Objects/ModularTools/Garde/copper_sharp.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseGardeSharp + - BaseWeaponCopper \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml index 08b08f9bc6..da8ffe6c2e 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/baseModularModifier.yml @@ -65,4 +65,28 @@ - type: Utensil types: - Knife - - type: CP14WallpaperRemover \ No newline at end of file + - type: CP14WallpaperRemover + +- type: modularPart + id: BaseWeaponIron + modifiers: + - !type:EditDamageableModifier + multiplier: 1 + - !type:EditSharpened + sharpnessDamageMultiplier: 1 + +- type: modularPart + id: BaseWeaponCopper + modifiers: + - !type:EditDamageableModifier + multiplier: 1.5 + - !type:EditSharpened + sharpnessDamageMultiplier: 1.5 + +- type: modularPart + id: BaseWeaponGold + modifiers: + - !type:EditDamageableModifier + multiplier: 2 + - !type:EditSharpened + sharpnessDamageMultiplier: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/blade.yml b/Resources/Prototypes/_CP14/ModularCraft/blade.yml similarity index 74% rename from Resources/Prototypes/_CP14/ModularCraft/Blade/blade.yml rename to Resources/Prototypes/_CP14/ModularCraft/blade.yml index 0d3f0cc642..cd705881e0 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/blade.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/blade.yml @@ -1,36 +1,3 @@ -#Concept: -# + Fast attackRate -# fast swing -# - Low damage -- type: modularPart - id: BladeIronDagger - targetSlot: Blade - sourcePart: CP14ModularBladeIronDagger - rsiPath: _CP14/Objects/ModularTools/iron_dagger.rsi - 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.4 - bonusDamage: - types: - Slash: 3 - Piercing: 3 - - !type:EditItem - newSize: Normal - adjustShape: 0, 1 - storedOffsetBonus: 0, 5 - #Concept: # Copy of dagger with lesser damage # But can gather grass from world @@ -55,6 +22,9 @@ newSize: Normal adjustShape: 0, 1 storedOffsetBonus: 0, 5 + - !type:EditModularSlots + addSlots: + - Garde #Concept: # + High Throwable damage @@ -93,6 +63,9 @@ newSize: Normal adjustShape: 0, 1 storedOffsetBonus: 0, 5 + - !type:EditModularSlots + addSlots: + - Garde #Concept: # + High Wielded damage @@ -160,6 +133,9 @@ newSize: Large adjustShape: 0, 2 storedOffsetBonus: 0, 10 + - !type:EditModularSlots + addSlots: + - Garde - type: modularPart id: BladeIronShovel @@ -193,25 +169,6 @@ newSize: Normal adjustShape: 0, 1 storedOffsetBonus: 0, 5 - -- type: modularPart - id: BladeIronPickaxe - targetSlot: Blade - sourcePart: CP14ModularBladeIronPickaxe - rsiPath: _CP14/Objects/ModularTools/iron_pickaxe.rsi - modifiers: - - !type:EditMeleeWeapon - attackRateMultiplier: 0.75 - angleMultiplier: 1.2 - bonusDamage: - types: - Piercing: 9 - - !type:EditIncreaseDamageOnWield - bonusDamage: - types: - Piercing: 4 - Structural: 10 - - !type:EditItem - newSize: Normal - adjustShape: 1, 1 - storedOffsetBonus: 0, 5 \ No newline at end of file + - !type:EditModularSlots + addSlots: + - Garde \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/ModularCraft/slots.yml b/Resources/Prototypes/_CP14/ModularCraft/slots.yml index 73b333ad86..245af5caed 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/slots.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/slots.yml @@ -21,3 +21,7 @@ - type: modularSlot id: MagicCrystalHolder name: cp14-modular-slot-magic-crystal-holder + +- type: modularSlot + id: Garde + name: cp14-modular-slot-garde diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml index 3f56541f59..f5d1a462cf 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml @@ -175,4 +175,116 @@ craftTime: 4 stacks: CP14IronBar: 2 - result: CP14ModularGripIronLong \ No newline at end of file + result: CP14ModularGripIronLong + +- type: CP14Recipe + id: CP14ModularGripCopperLong + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 2 + result: CP14ModularGripCopperLong + +- type: CP14Recipe + id: CP14ModularGripGoldLong + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 2 + result: CP14ModularGripGoldLong + +- type: CP14Recipe + id: CP14ModularGripCopper + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 1 + result: CP14ModularGripCopper + +- type: CP14Recipe + id: CP14ModularGripGolden + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 1 + result: CP14ModularGripGolden + +- type: CP14Recipe + id: CP14ModularBladeGoldPickaxe + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 2 + result: CP14ModularBladeGoldPickaxe + +- type: CP14Recipe + id: CP14ModularBladeCopperPickaxe + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 2 + result: CP14ModularBladeCopperPickaxe + +- type: CP14Recipe + id: CP14ModularBladeGoldDagger + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 1 + result: CP14ModularBladeGoldDagger + +- type: CP14Recipe + id: CP14ModularBladeCopperDagger + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 1 + result: CP14ModularBladeCopperDagger + +- type: CP14Recipe + id: CP14ModularGardeSharpCopper + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 1 + result: CP14ModularGardeSharpCopper + +- type: CP14Recipe + id: CP14ModularGardeSharpIron + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 1 + result: CP14ModularGardeSharpIron + +- type: CP14Recipe + id: CP14ModularGardeSharpGold + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 1 + result: CP14ModularGardeSharpGold + +- type: CP14Recipe + id: CP14ModularBladeIronRapier + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14IronBar: 1 + result: CP14ModularBladeIronRapier + +- type: CP14Recipe + id: CP14ModularBladeGoldRapier + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14GoldBar: 1 + result: CP14ModularBladeGoldRapier + +- type: CP14Recipe + id: CP14ModularBladeCopperRapier + tag: CP14RecipeAnvil + craftTime: 4 + stacks: + CP14CopperBar: 1 + result: CP14ModularBladeCopperRapier \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..d7a8e5508a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..9eb3f4af3a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-NECK.png new file mode 100644 index 0000000000..6c1f65555b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/icon.png new file mode 100644 index 0000000000..c6baa10f5c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-left.png new file mode 100644 index 0000000000..991c884450 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-right.png new file mode 100644 index 0000000000..b55867e14e Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/meta.json rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..494ca627e4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..224c484cf4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/copper_dagger.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..e79cccfa37 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..1eda61e148 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-NECK.png new file mode 100644 index 0000000000..7dbae56a67 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/icon.png new file mode 100644 index 0000000000..4b1c4fcab8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-left.png new file mode 100644 index 0000000000..3b454b9f17 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-right.png new file mode 100644 index 0000000000..b2d44e8eb4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/meta.json rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..c3a6d03f06 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..4c60365412 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/gold_dagger.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-BELT1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-BELT1.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-BELT2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/equipped-BELT2.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-BELT2.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/equipped-NECK.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/equipped-NECK.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/icon.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/wielded-inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_dagger.rsi/wielded-inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Dagger/iron_dagger.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..6d4aad2ff4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..43071b4e96 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png new file mode 100644 index 0000000000..fda4f663d4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/icon.png new file mode 100644 index 0000000000..f681612262 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-left.png new file mode 100644 index 0000000000..8c07451a20 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-right.png new file mode 100644 index 0000000000..1cf9b14165 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..22662bbf16 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..aa92d531ff Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..91e7155fa4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..f8df5c1c00 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png new file mode 100644 index 0000000000..93730177b4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/icon.png new file mode 100644 index 0000000000..aba4c44c3f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-left.png new file mode 100644 index 0000000000..62f97c4c3b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-right.png new file mode 100644 index 0000000000..ebd37833cd Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..1f618ad3af Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..c3e23e4977 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/gold_pickaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-BELT1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-BELT1.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-BELT2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/equipped-BELT2.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-BELT2.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-NECK.png new file mode 100644 index 0000000000..a159ea4ecc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/icon.png rename to Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-left.png new file mode 100644 index 0000000000..18bfda397b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-right.png new file mode 100644 index 0000000000..02156901a1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..e6ea2ad66a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..55b9e40848 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Pickaxe/iron_pickaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..5878fe0bbf Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..cd0fc8b365 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-NECK.png new file mode 100644 index 0000000000..a7af00d29d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/icon.png new file mode 100644 index 0000000000..3dc7ab1929 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-left.png new file mode 100644 index 0000000000..2cf15ddcc7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-right.png new file mode 100644 index 0000000000..0e444d5105 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/meta.json new file mode 100644 index 0000000000..06a73b7b49 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..0e22400ae9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..9b68669981 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/copper_rapier.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..ece1896153 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..4f831e1a3b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-NECK.png new file mode 100644 index 0000000000..d324423bb0 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/icon.png new file mode 100644 index 0000000000..f05013e9e4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-left.png new file mode 100644 index 0000000000..ac9a07aff5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-right.png new file mode 100644 index 0000000000..4f38f27dd8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/meta.json new file mode 100644 index 0000000000..06a73b7b49 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..f4d3844f0d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..c2413df0c3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/gold_rapier.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..9008c58a6a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..f54e664fe5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-NECK.png new file mode 100644 index 0000000000..9aba9d63d6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/icon.png new file mode 100644 index 0000000000..f9097040ac Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-left.png new file mode 100644 index 0000000000..659ce09ab6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-right.png new file mode 100644 index 0000000000..331892bd4b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/meta.json new file mode 100644 index 0000000000..06a73b7b49 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..800b94d684 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..bc381580bc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Blade/Rapier/iron_rapier.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..dfb0d060e7 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..ffac36f0ad Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-NECK.png new file mode 100644 index 0000000000..08e45051ee Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/icon.png new file mode 100644 index 0000000000..93d9a55e86 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-left.png new file mode 100644 index 0000000000..0d4be970e5 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-right.png new file mode 100644 index 0000000000..5e8b20d091 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..5f95d41e76 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..b34143dc28 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/copper_sharp.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..0a0e7574b1 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..e14a793a1f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-NECK.png new file mode 100644 index 0000000000..832e3e4ada Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/icon.png new file mode 100644 index 0000000000..4556367129 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-left.png new file mode 100644 index 0000000000..40eaba46b3 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-right.png new file mode 100644 index 0000000000..1c79acafa6 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..f0961714fe Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..30e8dc6fab Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/gold_sharp.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..f026c33594 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..ac451a7599 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-NECK.png new file mode 100644 index 0000000000..261e443649 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/icon.png new file mode 100644 index 0000000000..6fe27053c2 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-left.png new file mode 100644 index 0000000000..9fb180da48 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-right.png new file mode 100644 index 0000000000..b2ddcaa524 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CLA", + "copyright": "Created 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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..bb01002975 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..01ecd3e68f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Garde/iron_sharp.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..0054c1f1ae Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..51c23da3ae Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/icon.png new file mode 100644 index 0000000000..3ec10fc7c8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-left.png new file mode 100644 index 0000000000..4b39bc0a08 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-right.png new file mode 100644 index 0000000000..971547768a Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/meta.json rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT1.png new file mode 100644 index 0000000000..7ae74e5815 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT2.png new file mode 100644 index 0000000000..9fac684816 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/icon.png new file mode 100644 index 0000000000..1da61e978c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-left.png new file mode 100644 index 0000000000..1c96a63d17 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-right.png new file mode 100644 index 0000000000..54a9ca89fc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/meta.json rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/equipped-BELT1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/equipped-BELT1.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/equipped-BELT2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/equipped-BELT2.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/equipped-BELT2.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/icon.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/meta.json new file mode 100644 index 0000000000..0f12276b8c --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CLA", + "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-BELT1", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT1.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/equipped-BELT1.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT1.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT2.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/equipped-BELT2.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/equipped-BELT2.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/icon.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json new file mode 100644 index 0000000000..0f12276b8c --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CLA", + "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-BELT1", + "directions": 4 + }, + { + "name": "equipped-BELT2", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/equipped-NECK.png new file mode 100644 index 0000000000..bee4790f83 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/icon.png new file mode 100644 index 0000000000..0afa357610 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-left.png new file mode 100644 index 0000000000..9699a5ec6f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-right.png new file mode 100644 index 0000000000..39c17f9058 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/meta.json rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..fb229d7e97 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..26e00fd244 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/equipped-NECK.png new file mode 100644 index 0000000000..3cfcdfd477 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/icon.png new file mode 100644 index 0000000000..6804bc0094 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-left.png new file mode 100644 index 0000000000..e90b8fec81 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-right.png new file mode 100644 index 0000000000..e64cab70dc Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/meta.json rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-left.png new file mode 100644 index 0000000000..5499ec31be Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-right.png new file mode 100644 index 0000000000..0e35b0d20d Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/helper32.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/helper32.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/helper32.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/helper32.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/equipped-NECK.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/equipped-NECK.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/icon.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/meta.json new file mode 100644 index 0000000000..4b7b3f4c43 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CLA", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/wielded-inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/iron_grip_long.rsi/wielded-inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/wielded-helper32.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wielded-helper32.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/wielded-helper32.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/wielded-helper32.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/equipped-NECK.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/equipped-NECK.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/icon.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/meta.json new file mode 100644 index 0000000000..4b7b3f4c43 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "size": { + "x": 48, + "y": 48 + }, + "license": "CLA", + "copyright": "Created by TheShuEd (Github) ", + "states": [ + { + "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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/wielded-inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/wielded-inhand-left.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/wielded-inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/wielded-inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/ModularTools/wooden_grip_long.rsi/wielded-inhand-right.png rename to Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/wielded-inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/equipped-NECK.png deleted file mode 100644 index fa185773b3..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/equipped-NECK.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/inhand-left.png deleted file mode 100644 index 3ac4cf8936..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/inhand-right.png deleted file mode 100644 index 5229515589..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/inhand-right.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/wielded-inhand-left.png deleted file mode 100644 index 9044415f83..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/wielded-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/wielded-inhand-right.png deleted file mode 100644 index cdc249a321..0000000000 Binary files a/Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/wielded-inhand-right.png and /dev/null differ