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/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/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/dagger.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/dagger.yml new file mode 100644 index 0000000000..ed75c28b20 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/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/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/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/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/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/ModularTools/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/pickaxe.yml new file mode 100644 index 0000000000..46ef2744b7 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/ModularTools/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/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/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/Pickaxe/copper_pickaxe.rsi + state: icon + - type: CP14ModularCraftPart + possibleParts: + - BladeCopperPickaxe \ 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..dc20b105df 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/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..5d3862f639 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/Pickaxe/iron_pickaxe.rsi state: icon - type: CP14ModularCraftAutoAssemble details: diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/blade.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/blade.yml index 0d3f0cc642..e0cfba3d4a 100644 --- a/Resources/Prototypes/_CP14/ModularCraft/Blade/blade.yml +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/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 @@ -192,26 +159,4 @@ - !type:EditItem 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 diff --git a/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml new file mode 100644 index 0000000000..fc064a186d --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml @@ -0,0 +1,63 @@ +#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: modularPart + id: BladeIronDagger + targetSlot: Blade + sourcePart: CP14ModularBladeIronDagger + rsiPath: _CP14/Objects/ModularTools/Dagger/iron_dagger.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeDagger + - BaseWeaponIron + +- type: modularPart + id: BladeGoldDagger + targetSlot: Blade + sourcePart: CP14ModularBladeGoldDagger + rsiPath: _CP14/Objects/ModularTools/Dagger/gold_dagger.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladeDagger + - BaseWeaponGold + +- type: modularPart + id: BladeCopperDagger + targetSlot: Blade + sourcePart: CP14ModularBladeCopperDagger + rsiPath: _CP14/Objects/ModularTools/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..8ab1fc76d2 --- /dev/null +++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml @@ -0,0 +1,51 @@ +- 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: modularPart + id: BladeIronPickaxe + targetSlot: Blade + sourcePart: CP14ModularBladeIronPickaxe + rsiPath: _CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladePickaxe + - BaseWeaponIron + +- type: modularPart + id: BladeGoldPickaxe + targetSlot: Blade + sourcePart: CP14ModularBladeGoldPickaxe + rsiPath: _CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladePickaxe + - BaseWeaponGold + +- type: modularPart + id: BladeCopperPickaxe + targetSlot: Blade + sourcePart: CP14ModularBladeCopperPickaxe + rsiPath: _CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi + modifiers: + - !type:Inherit + copyFrom: + - BaseBladePickaxe + - 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..fb041d0493 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: 3 + - !type:EditSharpened + sharpnessDamageMultiplier: 3 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml index 3f56541f59..4f934f5e2f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml @@ -175,4 +175,68 @@ 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 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/copper_dagger.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/copper_dagger.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/copper_dagger.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/icon.png new file mode 100644 index 0000000000..c6baa10f5c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/copper_dagger.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/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/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/Dagger/copper_dagger.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/copper_dagger.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/copper_dagger.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/gold_dagger.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/gold_dagger.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/gold_dagger.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/icon.png new file mode 100644 index 0000000000..4b1c4fcab8 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/gold_dagger.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/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/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/Dagger/gold_dagger.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Dagger/gold_dagger.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/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/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/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/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/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/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/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/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/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/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/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/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/Dagger/iron_dagger.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Dagger/iron_dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Dagger/iron_dagger.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/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/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/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/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/Dagger/iron_dagger.rsi/wielded-inhand-right.png 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/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/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/helper32.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/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/wooden_grip_long.rsi/helper32.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-helper32.png b/Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/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/wooden_grip_long.rsi/wielded-helper32.png 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/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/icon.png new file mode 100644 index 0000000000..f681612262 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/copper_pickaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/copper_pickaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/icon.png new file mode 100644 index 0000000000..aba4c44c3f Binary files /dev/null and b/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/gold_pickaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/gold_pickaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/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/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/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/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/Pickaxe/iron_pickaxe.rsi/equipped-BELT2.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/ModularTools/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/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/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/Pickaxe/iron_pickaxe.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/iron_pickaxe.rsi/inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/iron_pickaxe.rsi/inhand-right.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/meta.json new file mode 100644 index 0000000000..3767fb75aa --- /dev/null +++ b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/iron_pickaxe.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/iron_pickaxe.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/ModularTools/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/Pickaxe/iron_pickaxe.rsi/wielded-inhand-right.png differ 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