From c6ac192dfb24f2d38b6c3a28aebaf3f5f12121a4 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Sun, 1 Dec 2024 20:11:59 +0300 Subject: [PATCH] Gold & Copper modular parts 1 (#621) * gold & copper daggers * copper and gold short grip * gold & copper grips * golden pickaxe * copper pickaxe * Update anvil.yml --- .../Modifiers/EditDamageableModifier.cs | 3 +- .../ModularCraft/Modifiers/EditSharpened.cs | 18 ++ .../Components/CP14SharpenedComponent.cs | 2 +- .../Entities/Objects/ModularTools/blade.yml | 38 ---- .../Entities/Objects/ModularTools/dagger.yml | 48 ++++ .../Entities/Objects/ModularTools/grips.yml | 210 +++++++++++++----- .../Entities/Objects/ModularTools/pickaxe.yml | 51 +++++ .../Weapons/ModularPresets/daggers.yml | 2 +- .../Weapons/ModularPresets/pickaxe.yml | 2 +- .../_CP14/ModularCraft/Blade/blade.yml | 55 ----- .../_CP14/ModularCraft/Blade/dagger.yml | 63 ++++++ .../_CP14/ModularCraft/Blade/pickaxe.yml | 51 +++++ .../ModularCraft/baseModularModifier.yml | 26 ++- .../_CP14/Recipes/Workbench/anvil.yml | 66 +++++- .../copper_dagger.rsi/equipped-BELT1.png | Bin 0 -> 262 bytes .../copper_dagger.rsi/equipped-BELT2.png | Bin 0 -> 263 bytes .../copper_dagger.rsi/equipped-NECK.png | Bin 0 -> 236 bytes .../Dagger/copper_dagger.rsi/icon.png | Bin 0 -> 327 bytes .../Dagger/copper_dagger.rsi/inhand-left.png | Bin 0 -> 469 bytes .../Dagger/copper_dagger.rsi/inhand-right.png | Bin 0 -> 469 bytes .../copper_dagger.rsi}/meta.json | 0 .../copper_dagger.rsi/wielded-inhand-left.png | Bin 0 -> 411 bytes .../wielded-inhand-right.png | Bin 0 -> 411 bytes .../Dagger/gold_dagger.rsi/equipped-BELT1.png | Bin 0 -> 252 bytes .../Dagger/gold_dagger.rsi/equipped-BELT2.png | Bin 0 -> 251 bytes .../Dagger/gold_dagger.rsi/equipped-NECK.png | Bin 0 -> 228 bytes .../Dagger/gold_dagger.rsi/icon.png | Bin 0 -> 326 bytes .../Dagger/gold_dagger.rsi/inhand-left.png | Bin 0 -> 446 bytes .../Dagger/gold_dagger.rsi/inhand-right.png | Bin 0 -> 450 bytes .../gold_dagger.rsi}/meta.json | 0 .../gold_dagger.rsi/wielded-inhand-left.png | Bin 0 -> 390 bytes .../gold_dagger.rsi/wielded-inhand-right.png | Bin 0 -> 415 bytes .../iron_dagger.rsi/equipped-BELT1.png | Bin .../iron_dagger.rsi/equipped-BELT2.png | Bin .../iron_dagger.rsi/equipped-NECK.png | Bin .../{ => Dagger}/iron_dagger.rsi/icon.png | Bin .../iron_dagger.rsi/inhand-left.png | Bin .../iron_dagger.rsi/inhand-right.png | Bin .../Dagger/iron_dagger.rsi/meta.json | 42 ++++ .../iron_dagger.rsi/wielded-inhand-left.png | Bin .../iron_dagger.rsi/wielded-inhand-right.png | Bin .../Grip/copper_grip.rsi/equipped-BELT1.png | Bin 0 -> 183 bytes .../Grip/copper_grip.rsi/equipped-BELT2.png | Bin 0 -> 178 bytes .../Grip/copper_grip.rsi/icon.png | Bin 0 -> 233 bytes .../Grip/copper_grip.rsi/inhand-left.png | Bin 0 -> 204 bytes .../Grip/copper_grip.rsi/inhand-right.png | Bin 0 -> 232 bytes .../copper_grip.rsi}/meta.json | 0 .../Grip/gold_grip.rsi/equipped-BELT1.png | Bin 0 -> 183 bytes .../Grip/gold_grip.rsi/equipped-BELT2.png | Bin 0 -> 178 bytes .../ModularTools/Grip/gold_grip.rsi/icon.png | Bin 0 -> 241 bytes .../Grip/gold_grip.rsi/inhand-left.png | Bin 0 -> 207 bytes .../Grip/gold_grip.rsi/inhand-right.png | Bin 0 -> 219 bytes .../gold_grip.rsi}/meta.json | 0 .../iron_grip.rsi/equipped-BELT1.png | Bin .../iron_grip.rsi/equipped-BELT2.png | Bin .../{ => Grip}/iron_grip.rsi/icon.png | Bin .../{ => Grip}/iron_grip.rsi/inhand-left.png | Bin .../{ => Grip}/iron_grip.rsi/inhand-right.png | Bin .../ModularTools/Grip/iron_grip.rsi/meta.json | 30 +++ .../wooden_grip.rsi/equipped-BELT1.png | Bin .../wooden_grip.rsi/equipped-BELT2.png | Bin .../{ => Grip}/wooden_grip.rsi/icon.png | Bin .../wooden_grip.rsi/inhand-left.png | Bin .../wooden_grip.rsi/inhand-right.png | Bin .../Grip/wooden_grip.rsi/meta.json | 30 +++ .../copper_grip_long.rsi/equipped-NECK.png | Bin 0 -> 352 bytes .../GripLong/copper_grip_long.rsi/icon.png | Bin 0 -> 361 bytes .../copper_grip_long.rsi/inhand-left.png | Bin 0 -> 456 bytes .../copper_grip_long.rsi/inhand-right.png | Bin 0 -> 433 bytes .../copper_grip_long.rsi}/meta.json | 0 .../wielded-inhand-left.png | Bin 0 -> 391 bytes .../wielded-inhand-right.png | Bin 0 -> 389 bytes .../gold_grip_long.rsi/equipped-NECK.png | Bin 0 -> 355 bytes .../GripLong/gold_grip_long.rsi/icon.png | Bin 0 -> 353 bytes .../gold_grip_long.rsi/inhand-left.png | Bin 0 -> 443 bytes .../gold_grip_long.rsi/inhand-right.png | Bin 0 -> 422 bytes .../gold_grip_long.rsi}/meta.json | 0 .../wielded-inhand-left.png | Bin 0 -> 400 bytes .../wielded-inhand-right.png | Bin 0 -> 389 bytes .../iron_grip_long.rsi/equipped-NECK.png | Bin .../iron_grip_long.rsi/icon.png | Bin .../iron_grip_long.rsi/inhand-left.png | Bin .../iron_grip_long.rsi/inhand-right.png | Bin .../GripLong/iron_grip_long.rsi/meta.json | 34 +++ .../wielded-inhand-left.png | Bin .../wielded-inhand-right.png | Bin .../wooden_grip_long.rsi/equipped-NECK.png | Bin .../wooden_grip_long.rsi/helper32.png | Bin .../wooden_grip_long.rsi/icon.png | Bin .../wooden_grip_long.rsi/inhand-left.png | Bin .../wooden_grip_long.rsi/inhand-right.png | Bin .../GripLong/wooden_grip_long.rsi/meta.json | 34 +++ .../wooden_grip_long.rsi/wielded-helper32.png | Bin .../wielded-inhand-left.png | Bin .../wielded-inhand-right.png | Bin .../copper_pickaxe.rsi/equipped-BELT1.png | Bin 0 -> 259 bytes .../copper_pickaxe.rsi/equipped-BELT2.png | Bin 0 -> 260 bytes .../copper_pickaxe.rsi/equipped-NECK.png | Bin 0 -> 238 bytes .../Pickaxe/copper_pickaxe.rsi/icon.png | Bin 0 -> 235 bytes .../copper_pickaxe.rsi/inhand-left.png | Bin 0 -> 445 bytes .../copper_pickaxe.rsi/inhand-right.png | Bin 0 -> 456 bytes .../Pickaxe/copper_pickaxe.rsi/meta.json | 42 ++++ .../wielded-inhand-left.png | Bin 0 -> 451 bytes .../wielded-inhand-right.png | Bin 0 -> 439 bytes .../gold_pickaxe.rsi/equipped-BELT1.png | Bin 0 -> 240 bytes .../gold_pickaxe.rsi/equipped-BELT2.png | Bin 0 -> 244 bytes .../gold_pickaxe.rsi/equipped-NECK.png | Bin 0 -> 244 bytes .../Pickaxe/gold_pickaxe.rsi/icon.png | Bin 0 -> 220 bytes .../Pickaxe/gold_pickaxe.rsi/inhand-left.png | Bin 0 -> 413 bytes .../Pickaxe/gold_pickaxe.rsi/inhand-right.png | Bin 0 -> 426 bytes .../Pickaxe/gold_pickaxe.rsi/meta.json | 42 ++++ .../gold_pickaxe.rsi/wielded-inhand-left.png | Bin 0 -> 430 bytes .../gold_pickaxe.rsi/wielded-inhand-right.png | Bin 0 -> 418 bytes .../iron_pickaxe.rsi/equipped-BELT1.png | Bin .../iron_pickaxe.rsi/equipped-BELT2.png | Bin .../iron_pickaxe.rsi/equipped-NECK.png | Bin 0 -> 230 bytes .../{ => Pickaxe}/iron_pickaxe.rsi/icon.png | Bin .../Pickaxe/iron_pickaxe.rsi/inhand-left.png | Bin 0 -> 463 bytes .../Pickaxe/iron_pickaxe.rsi/inhand-right.png | Bin 0 -> 479 bytes .../Pickaxe/iron_pickaxe.rsi/meta.json | 42 ++++ .../iron_pickaxe.rsi/wielded-inhand-left.png | Bin 0 -> 451 bytes .../iron_pickaxe.rsi/wielded-inhand-right.png | Bin 0 -> 451 bytes .../iron_pickaxe.rsi/equipped-NECK.png | Bin 225 -> 0 bytes .../iron_pickaxe.rsi/inhand-left.png | Bin 430 -> 0 bytes .../iron_pickaxe.rsi/inhand-right.png | Bin 436 -> 0 bytes .../iron_pickaxe.rsi/wielded-inhand-left.png | Bin 429 -> 0 bytes .../iron_pickaxe.rsi/wielded-inhand-right.png | Bin 416 -> 0 bytes 127 files changed, 780 insertions(+), 151 deletions(-) create mode 100644 Content.Server/_CP14/ModularCraft/Modifiers/EditSharpened.cs create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/ModularTools/dagger.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/ModularTools/pickaxe.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml create mode 100644 Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{iron_dagger.rsi => Dagger/copper_dagger.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/copper_dagger.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{iron_pickaxe.rsi => Dagger/gold_dagger.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/gold_dagger.rsi/wielded-inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{ => Dagger}/iron_dagger.rsi/equipped-BELT1.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Dagger}/iron_dagger.rsi/equipped-BELT2.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Dagger}/iron_dagger.rsi/equipped-NECK.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Dagger}/iron_dagger.rsi/icon.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Dagger}/iron_dagger.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Dagger}/iron_dagger.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Dagger/iron_dagger.rsi/meta.json rename Resources/Textures/_CP14/Objects/ModularTools/{ => Dagger}/iron_dagger.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Dagger}/iron_dagger.rsi/wielded-inhand-right.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/copper_grip.rsi/inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{iron_grip.rsi => Grip/copper_grip.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/gold_grip.rsi/inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_grip.rsi => Grip/gold_grip.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/iron_grip.rsi/equipped-BELT1.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/iron_grip.rsi/equipped-BELT2.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/iron_grip.rsi/icon.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/iron_grip.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/iron_grip.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/iron_grip.rsi/meta.json rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/wooden_grip.rsi/equipped-BELT1.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/wooden_grip.rsi/equipped-BELT2.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/wooden_grip.rsi/icon.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/wooden_grip.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Grip}/wooden_grip.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Grip/wooden_grip.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{iron_grip_long.rsi => GripLong/copper_grip_long.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/copper_grip_long.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{wooden_grip_long.rsi => GripLong/gold_grip_long.rsi}/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/gold_grip_long.rsi/wielded-inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/iron_grip_long.rsi/equipped-NECK.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/iron_grip_long.rsi/icon.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/iron_grip_long.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/iron_grip_long.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/iron_grip_long.rsi/meta.json rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/iron_grip_long.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/iron_grip_long.rsi/wielded-inhand-right.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/wooden_grip_long.rsi/equipped-NECK.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/wooden_grip_long.rsi/helper32.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/wooden_grip_long.rsi/icon.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/wooden_grip_long.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/wooden_grip_long.rsi/inhand-right.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/GripLong/wooden_grip_long.rsi/meta.json rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/wooden_grip_long.rsi/wielded-helper32.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/wooden_grip_long.rsi/wielded-inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => GripLong}/wooden_grip_long.rsi/wielded-inhand-right.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/copper_pickaxe.rsi/wielded-inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/equipped-BELT1.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/equipped-BELT2.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/gold_pickaxe.rsi/wielded-inhand-right.png rename Resources/Textures/_CP14/Objects/ModularTools/{ => Pickaxe}/iron_pickaxe.rsi/equipped-BELT1.png (100%) rename Resources/Textures/_CP14/Objects/ModularTools/{ => Pickaxe}/iron_pickaxe.rsi/equipped-BELT2.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/equipped-NECK.png rename Resources/Textures/_CP14/Objects/ModularTools/{ => Pickaxe}/iron_pickaxe.rsi/icon.png (100%) create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/ModularTools/Pickaxe/iron_pickaxe.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/equipped-NECK.png delete mode 100644 Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/ModularTools/iron_pickaxe.rsi/wielded-inhand-right.png 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 0000000000000000000000000000000000000000..d7a8e5508a1856c50fb25a39c2d825ca3151fc19 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|4tTmahE&XX zdut;nlcPZE!{rK#W{S(q>P+Cj-l8jUt1<|@!1N|NOWQB3 yO?K`elIg<*aSpBn&hZU(4kwIi8GkV`e7J3w-lKi}`XT2jAYGoWelF{r5}E+0{$u|D literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9eb3f4af3a2f2575ef78e8e1caf8e57682922e6d GIT binary patch literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|4tlychE&XX zdut=-p#X^^AG;M6#Rjpwbtzzi_hkT41gLNkP33lJO6;WyP^TU7X z2Ng1VURiSjjR1lJ_9tZ&Z)aV*n!B>H?rK)~mXu|eidpC8)%vpaYU@dQGnPhsP3ro1 zS8)22r448QP4EmVmb7{_X;W?EiX2uScmKKat=f9az7}2l`->N1B9Q!{a7Fk3-0aB$ zzbszeP-)RUu+@_zx&g@F#xVT?>jqDO*(?k{PH{JAYG0RCo9yJ(W literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c6baa10f5c3c907719268eb3e73fc853063e8279 GIT binary patch literal 327 zcmV-N0l5B&P)Px$0ZBwbR9J=Wlrd|Lz=1*|!)Up4df5D~T zrnpoD$Bv?lOK1?Pn<5V9lpCYQP?ztS?)dJ5hxfZX5Cq}Q3LUeLllVPYe0H90mbmy<2fn9YoDhIf=uj&iQROwuZIzF~ zEcNTSsxk0AT`L^{7%u;4tBR?mmAJYo@I4K%2qOU6s&Z2Tsi?b3*IkwQpCAZ=APB-; ZH~~f-Nb2;DUuysW002ovPDHLkV1nJPk{kd4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..991c8844508cae4758819acfa1bcc9cedfed01fd GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z`#oJ8Ln`LH zy|vf-u!98K2ltI4Mn}1XP6{zi)Vt){b!p|5waM3W3d>%;c=FLQN$IgirYU>?s z5>eFP+qHEH&-!2uzPcxmFNw^*KSgn8_4{{wSw6`*xWGW=i}Kk)%gXj`Uc2hy%{@(S zcPAdW9L%fmp(OK)?98*;mF?e-_N{8u)n)QwHhpY)^|NVmqj5UF!<764*H`7UFJ*5R zN_Twl5=gt0{$l3Zeqh;+pu3LyZ%+Z5)hGGr&$E};|J7WdmY8wql2QzN`Kia+D$F{% zH|_kY>cvi_OGMP3nsax%{N@AYxijnDFgqx&_J=vlWy;L=w^p7`d_Cd!{OdqxIbS|- z^rS7rgD+W;ulDcW$$mY1`;kjZM_hfc*Bv;$>D%%}C#*EMwbrp75x!{X%%E}CMI=b7 zdwr;gHIx5z9m%j&S3Mqm+oZ){AR+tMu;yrmk*}#(>T~9hkFn8wtKLiW^f9bCr`V%@ zIpl4w58ID*x(o(9z6`6GvaaQBH56u8Q9oZmQ1IgaPn-$<)xVyYT#N?B6N9I#pUXO@ GgeCwcX3~cM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b55867e14ebd5318ec8643b2ec267c68a27cc5fc GIT binary patch literal 469 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z`#oJ8Ln`LH zy|vN%u!9KO2mg&CMn}1XP6{z;#(G^}RH7woTy|D0eR`i?pWfWZ&-PE)xY_m25my}# z!KOzG{H9KN7-O?$o2F@8_M-dwXC|ILy}MlU9jk&86fE+T-L6+>-DV=zTWy=E@TD|x zwMCMJ){5?|*0#k=S)%SO`|QjGr9GKdAB(15ZdiKs)#7MI@9sp)Xbs8o`}-}wlwQm; zbBQ}0|7r(_^(@Tsk=PIYYy09jY@)v?2~QJyY+*BB>iq1!Xz{~=jJn2${=IyA<@cF2 z4SU}GR{4DId9WMPd9mi_xePyqSL>h5pSk&`#b&M!I51NGQYu)n?US2tQnrrvIlgWt zhFyQP@)of_{hV&b*qGiu_mMDApyB)G+RF!?esy?RY*g;1cY2TbOa{AIQm0=9FPRsz zZbJ2^MK&8wE_<^{+GM5r`cRobGhUfDaSROK`i{+9z07q9->$nk9NyiE^$R|{(Z18~ zy))bPuSG=UIwL_{W2S~XDo&9TR^Qp~0t8xn82KYBW=?rh%L9xj22WQ%mvv4FO#m$8 B$;SWy literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..494ca627e4d9db1eb2579d7a4f02a6fafeba8955 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zLp@y_Ln`LH zy}94}u!9Kuhx|1{XRe6pOyp^EauPeKrdN3Kj$!t8zjJxt^k2MLG<$Wj*};_}UER&y z5(45IMRMozNsP z*j`usS)n9#Jt4I1Mu>ZG@$&N97Q0_~b-ukX&ROGs$ByUH^S^WT85~U3Elmzfm%rTlX4^~Y(k43oE2$XV@Qx<7vA{J3b* z)$ix;sJeCP=(DAq(WwuurWMF~r~Flp5Yb%zz-rnCUfE@0`qxkXpR#?jx{{LCjwK(s zqMx4e|Il@&A!ReK?DLDpe7mJzY`r?uQ==wS?8iI?hT!gv%kM8J{A9HC`5|?N86gY5 zug_-quv$j{i>OD*p?yhNhCaG+B^oX+Q?&1|dYQN==||yIU}!UVy85}Sb4q9e06N96 A)Bpeg literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..224c484cf4d4345eca8c2cfe7dd5942fe3892af5 GIT binary patch literal 411 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zLp@y_Ln`LH zy|vNXDNyA2$M>sUih>jaV^k_03FSR}^yJNpTWQ{#qyMp<`^&tpH=jF7$nn-9)fxr8 zNgOxRT8`v)sAo#?el@xOe)C=K{_=B;-0ju;9Z=x0A!2LM!5bR|SALjL@rkwJW5N8i z_Z_ESPuu$JN1gA|5EJ$G@5PpO`;OUjF(e#!V~Dx)?wsAJWs{==TfA0g>}r0PQ(N|j zt>O2a156*fHmrD9@~`&Oyj07);5sEZu-_!OebK$!EC(_-KhO5DuKSlWwe9l8JI`5w zc9z-h`O;-4koC0b3)9+u;x^(t6Kg2X3$<1HgxZ->uh-9*P!@7v; n!v^sLd4b}Ydl{-38GhvFZ!FNWKDT~iAV`O&tDnm{r-UW|A4^-# literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1eda61e148751b2ea55aca3838a4ee13e5fbd7c1 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|wtBiahE&XX zd&`jPkb_9e!_K*`Z*sP7^pO>?X{pVdQhnpOKvO33G_xqyHzHeN&I`zd$^W^}*p`}b zGs&F^s2>O#I*)Dhiw$17aqZ>x=Z&tO5iQwcV;Zj?TX-{q>qYx?mCTK?mX9`V64_us zhugDiPF~-RH96r5TG5QVeOG?}`mU>cW%jCq^$@c_bP0l+XkK?^|4j literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7dbae56a6793b5c88360bdb5c1f8fce79601e8b1 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|=6Sj}hE&XX zdv!18p#%}u3;x!v5p2?;im3Sc42bXP>gTe~DWM4fSk_X{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4b1c4fcab8ea7c17d2b84bdd14c86d9b5927dcdf GIT binary patch literal 326 zcmV-M0lEH(P)Px$07*naR9J=Wl(A|8K@>&LS_)dO-424KVCSmXSO+AKLL^_1ej9&5w$B%cSO_LR zV4=iV22$GWrcqNxLCdiSPPyv3X!A}r!;iG68=cSpINj_Qxdl!7s~h`D%%?Z?)$t?LFoGrG_i&g$$Kan$NEtkG=2M zuj8Ud&sDl!$NF>ouE}WRz)nN7TDV{_x+zoTzY z**-oXYF@scq2clB-$6;rN-%IrmG91(#~Vs-=v5v3{E*ovneAhV8pDD#UhTiTqJJ>X zXk$Bn(eOnNkv6!3wYx<$;hOEK|Txak7ePcLpu`*Lb=C-e9%b1>&{QOkK_8_}q*7vB~ lGmH$cesc;63jWp4-!4+GC-pezF)%_HJYD@<);T3K0RZ&5$qWDh literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b2d44e8eb40ab4c7b95909fdcce56952d1a6f1bf GIT binary patch literal 450 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zYdl>XLn`LH zy|vNnaDWKggZ+)sZ&CINY&_5TZA+`N=M zYtr>k;cR!?zRY@dN2_CPL%nvv+O0o+b**YTur;kOJ&pBA>D}Wq&F49NQ7X{gS^tNL zK_=c_G|g_J^Qu|=-?nck|F^;HG0Z(mi%i9;%HCZ2W@J{%e#JNLJPX6Gxr+Df)NVaa zFJof5K55a;=DKu_gk9U;GauM|?|VvKf6UaMPv2TM%wKkF)i06G=2iMz-rmXd*SR$< zy0lrXumI?ZqZ*GMJhPTn#Qg0U*mnDbI7u1yPytd%(XJDi-c)I$ztaD0e0s#Jx&A0#n literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c3a6d03f0674140ba057ca9b841ff7a0341dcb05 GIT binary patch literal 390 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z9XwqeLn`LH zy}8lraDd3MkLxX#2FyJZmb@T&;p~+cj_y>*ldNg-Yf33C5*D0O!_=Oqx358DP4dFU z&1<_?ccgF*03lN-`-qfoS_+aMZ!>hu!o2z){ zZ+G@(*MId*ZPoRzqCH<--uzgz{_^g|spY>vgOnYAp82Qd-mNJrrPY%w*2ZajP2$s& zd$e`a>j=%Jsao-G!_O}Iy7zQlVq}dRGsFUhKT5C7*ZZqSyUmL2UjFb|`O!2Z=28t!4lK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4c60365412104b4d269fd044aef4ccca2afdcc3c GIT binary patch literal 415 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zBRyRlLn`LH zy=Cw16ew~0j41ZA2eqf`xKuT^~ za>A>$%enzkR=h>3zKa*Gd-k_>Tk(T}dCwb}+l%D{1R-Ez!p2ocmz-R3sO62u>)p2* z_T1TKX_;M6b$wHs%>DJ6%X5osX2_h}c)vSOa8dPL0yVooa^5GoDF9eSH~wueJb9Z`Dtof z=<4qrHv@fkn|$oF69BqF^GNbCfqu#BCw~TY?6hE-AKL9%{P~C1^4rHV%bx4m#rynT zDI_TPvGetlo^r#Pr8@PQsh5^yPCxVSo~S{_}HTEPgg&ebxsLQ0M!^iG5`Po literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3ec10fc7c85065c5a5859f80166e920b8587e09a GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}i#=T&Ln2y} z6C_v{Cy4Yk1sZU<9SmSwcy8N&=efE6gOk{Vx5_xJi*xhRy?#C5@B3w1XAS_tg}pyn zPCg5iVG_^3lXj={w{G*Q2ik2x@!VaDnw1u;U-+xOc-4XbLGj)He@U%!v2J;!;lQ?Z zpV(uz+}@ak}R)G8nqt_Ua2xzKdI8B{n9dSPrdpldl~KC@vZx{j1#D<;rZ55 z$@_E4--^gac*{ks$Oc7^}2t44p$=2-nsdiW9Ka;gp zy+F+j4=(2IUDclVVv+az9cR-tS0@>s|Nlrp?DHPK$g95u)O@*v!dwIAJuc93fB(Gp z-rmjko@`zi4ARKJ&>;SH`{{e^TY4`)j4#^d)9$CBlo$T-zMZel=S#vGr;3-Xd9|Ar aXhZfozf2{;c0T=lkSO5WjT-G@yGywov`a+}t literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9fac684816d5db78aeaf4a7b653aa4f0d34b2964 GIT binary patch literal 178 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ay(reLn`LH zy|t0^fPx51fai3jwXs}^$tnEb=N~yE@K@tdHM307wEsa&K*cXYyz{m`+4f7eUUp() zxt;RkWgNN>YS*3Ep?Qew#>elBKqWx1O<xrh6+%8uieTX V4(|Eqgi1iFJYD@<);T3K0RU0TJ!Jp@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1da61e978cb828b595d1f60bb11accd0e91da208 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}t36#DLn2y} z6C_v{Cy4Yk1sZU<9SmT5*p>AEu;|f$!AWewOZz5>K2FgvoUVRbuxE;uLQLSB{c9xD znSsFh{KHkGcY_msm*ahKA8{bYz9wPKbLh*2~7Z>LtD%M literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1c96a63d17c885bf1035078e4265e8f6573db349 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|Iz3$+Ln`LH zy}6h7kbwYOK(}3P)agm5zhrJ|?_M+Upb<;*23F=7)A$&V&#%aD@Gn=7{koI|sPDk% zZI<8j&+RVj;LAyU<1Krr?cTFH)2)_-9h)wz7^9th|GH+%gW9>j{B`+(s)3+hX_auz z^bch}Dy-by5AoifBfswP;rIu_)2u3N85kbuiT`*dm;0jjvoT1qr>mdKI;Vst0QHnk A$p8QV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..54a9ca89fc666da700b061c981662918c16abebd GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|rh2+KhE&XX zdut=_Ap-%{3&ORxwrET`{l(;_vg@@3^;%jkFCF21x6 zsF&fv#j?%kywhhSdEL8eeRNld>-{UPF;4fd?DW1`<15{6HofS_?0qXgTWoPn1=$Y- z@AhqcU%gZIpZf2|l`lD5j(pXe_AT?#%zn3oatqh#t9EV%s`+z<)%=s3;mzXy-5@QV Lu6{1-oD!M<0zg(= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bee4790f83daca1cf68fc225b9cb629c64b6a5e3 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zr9536Ln`LH zy`%4U#6g7pL2C*x-)1)FSq1I0R;gN)Cw!w^DrXB0DoH)F1oHbbQ zx&J-G-06FM?)~SvY&I{@*w+`XUA=Pc>XvU(dCKDI9`~m_w9dZ<6f#eZ&{gELkl8MH zdfwJ8RsXI|D*LZv#ClWsL&^V%)hF#Evtm!Wp1Xbji?8IQrZt>5%8zcjQdw=0cYSix z(p%-O-$W|-eHp8< h0oTf7{0LnWE^z)_7<|cJZAlbJ(9_k=Wt~$(698nPx$BS}O-RA_Ha3Qiq6c6BRATry|OBjgb}Iyw3Xd4w)P<}NLQ zqobo^rjSXI4(AXKp`g_ymz?nX%;7HI{7Eh#A|fIpA|fIpzR8lz`#GP$X1fnw-_E(2zc`(Qb6FCbGLOvT?Zu!G&L?1P zw)1INldGMDpr0Iu&odhb8l1gx}Zg1QQUHm2`-qffxHlc=kZv}iit z$LJHV(xM3-p09v@lb9?3+H+x7Edl=bCw85#OqoZfOT=XFz_G3;wl@LLEyAk+_<|{Ln`LH zy<_cn*g=5d!ozR}cjw7$iiPba>()%syj#>gr%C#Npho5d0a2kxd?qHDmo8jXFmUCF zXmEKnVe8~Qjel=kI+p`zG(&@$Xl0mKWtg7Txo3-*bygqVJ6)wv<$?I*Q~P)9 zycZX+=W|sysyvwOxPSJVU&<;E+8_T7w6T#j`78B0^TPXS>FVy>_CG^r zGK#L+@8}y+-y-?pWktQn^}~Ljc0`|4-WD)1{ps!3d2{0Ls#=1S8UB0aTly})6=>WO z`_o1lDQs&(w{8txwZAvFp1m66E(F*xCvD%X_`TO=u3C9fYxUfQtl-_ppUa+Hk-5(C z_q?9Vr>i}G800?Q|F*IzME>5F-p|`+l*)v>vDf^xX3iRx%{nKG&o)>EeS6}Q2z2M; zuyp;c-wr+Dj1ZmN*e_9jYgKfBc3`V!EpN?{!P}%ANWjz8&t;ucLK6V^jK>)O literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..39c17f9058a774f8429d0dfb7c75ae86d28f766b GIT binary patch literal 433 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zvproLLn`LH zy`va(*g=Htfvz(zS7%Cq=~vU0o$J=DeavCYx_yOfSn`1fhAaG1`~#Xfnoe%%QY+c6 zdGfn#!sk!-{%rP4+oT9ImVseQ?!5G;Hs?=GxxT||XNCBk`!%Yu_ZjLw{`q9a@lc&} z<+?-$cahzR5jHhjV%_$ymCrx@G-r|ut5Cq<*JUEh%ID`!znH%=NP*GR^B}9oL?+IR zgsqa^j<=_6_Pnw^nKNU>4c^K7WzCJwZ%#RXqEitHNO5|615E9XqWstNYrT!;WjrlB->OFV0TcyicIk?hGfyK@Xg2m{(2i;Fz>? Q4-ZJh)78&qol`;+05hJoU;qFB literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fb229d7e971fe4751904bcd208945682622756ef GIT binary patch literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%z9X(wfLn`LH zy|dQuaDWKI1Ls3Ld1=eoHkZ#>nKfbZR*!oL{s*NMHhQQyCRVTu85tWl&vq1XK6$N$ zW!LR>&F_tGPkJ|Rzu9anL7>49pi+A2TX*Wj@Z0mxpTDQ9lw=k6KBm0%_bsbqh8o>_ zc2(D8#Xinlj)pz~lCo{>A$FpBKUfCIU-@bfa`f|os$J||P)@(Xxwr{1*r&mhRt}Z2Z9e#ZG z@@nGCgT#NWP=481d(X1=)hAECq6-1_F~P4Fom--P`d`-L?9y82-_pDg#~l93$QaQ# Th3O-g14zKr)z4*}Q$iB}fmNgO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..26e00fd2449eaf1565cfb74a60e3d1e973ad3275 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%z?LA!_Ln`LH zy|d8oaDWKIh21TZcX-m;CcKe12;~)u?0&-kgXhbt*J1k!6K2i?N-yFF3Yz9? za4-9`h5J_D-|uR_?_CyZ&IB|X3>ucWS+einX|eM5bNzgGK|#a#-u-vWzyFwG+V8t+ z(~936yWb^TXJ5T(g?X&KT}}R6-R)wv@qfw`%i|ihm0e7q{Pgl})XvX%fHb3}3DhqAZ`mu7K`rdUXm-l~Toy)f7)S|p!UT4A|AN-R2!g#$O zQ|#RN*EXL_e?CP~v@UkDfbY8N-_PItd`4=4W{t~{!%0>*4y|8(YLVS+Jtd`0`YzKN zZ@0eBQh$2ksLdq48&A)@3_53SdD6l8?~Y~DlINYQbN;^bLvLE0^Y30zXfiM~Jp9G5 WT&-Jtt{eAe5Z}|)&t;ucLK6U_OsMw& literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3cfcdfd47746e02d9cab01d88b5eaea332f0f6e4 GIT binary patch literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zWj$RSLn`LH zy|Xd%u!9I&f@%KR$tx=f*x>0KEAO7DMO>uO_Tp49!GTzI!-i9#mRvwg8eck|6}*IH_xxO!*% z$>0YvAC4xPdpd5}nLqj8QqKeC?RP_L?eDs858O6Ib3%hK-)_xFU1p1iAK(66w#v@` z#PxNl4CzaL@ktzzTp5%AbQl5z%<;A>ebyCZ!2E;V{3UbjuTou3jx>h)FQ0a4y`H%L i&Y9ZTPbX(1so%rjQJWN=(YkFCNYK;O&t;ucLK6Ug@r?oi literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6804bc00940697df129392601a8b06dbed86b093 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^T<(w;7kAsLNt zuWigdMet896Iisfaajb#iqD#BseA z(GF6usC%YVyZ_d%%g?{xyW7|S1xM7ph37Br+iGW2H2qljKPHpovzV5ZPTRhl??0Hldsuba z>zi5r!bOjGLP9&Em>IUDuYdPv8~cMTv;N$l$?^Hab%Cwt4wNUVDXjOIX_^I8_^#%y z-fm@wm&)H3igGxq>g|4fcY3S{pF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e90b8fec8138fc436bdbd233333e40da4b917fbb GIT binary patch literal 443 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zOFdm2Ln`LH zy|dBpP=E--h1G=z?;h!u&p6~3GuOAL`v2kn2lf(or0N@{?wI(4ImdTKOv)POYYnp) zT%)qi-<03G^ZmW=akD=t0nKG#m^Edo=ftI+g>RnEk^jw@TWY)`$ExMssY^>vxF22| zUf;s^NIFFX8VS&fO#y?O7lR{rCV{ouU5Ui9?OMK29@t$g>Y{{o|QNPY9H z6(E_V*Y|gw{JaMwbFTP*xs^g#{@%G(-=8l|)V&{hYr#am7a?2cuG+QFY+e=5H?Sk% z#Dcl!zR7O*xBXoE$Jh5B-z*6%eQ@@H(Wis2>RMmExtkJF5^(8Mo<_dJp1K-C&iSYA zVhcXAw&Y#fTD)+_bK4q@`-d0K{=u~Fk=hTYyr$sk7R!P&%qCYQ zU%KlDSlh3nk^MBfNqxNo;L$Z7=mF`q40`~v&a z>!HtAC$F7n*RHS52Xxl-aIrsMQ@_r>thFqIW3+-tt9munVzU zBC~S>>ydS3!rhKQ7d@%krSkabKJn%Z?T1^-UC)FcKUlF*UgY-TSurmqns+a+jXU=# zsW*JS&_|7fvqI&Lloc1bhluR))O+36Q8`l>;vfh2KMX+v6Bo6r`E!CqJYD@<);T3K F0RUSwwL1U+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5499ec31bed12f0030f66572d90d7e1451e4f99a GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%zy*ynULn`LH zy<_ips6d3_f%~JTZsAU8@r*}qF>`%+W;?%ssJMf@IXd~#8?QSaI~b%nCv*3e8n~{w zc;wc!Mfc4`gX-SLbNc8r0SyL&hN!Qr>I}Rm*L?r_^k}Aw%a``%y}!@p$!j0CV2hmf zV?2EF9H zwf|Qq%FNc|5rml!wPjmM=A`N6et(w#5Hx+)^`p~SJT~k}amQBXwQOfDspyMUo_RL= z+?z;?l(@AlQNC`K^%fo1pY96o)z@YVd{R~S{Z7TaUN#LWdBKlgHoVDse0r0~$@O_{ zf`YyLizYUgOW(gX`AUn~s})}ln9ZMKX8O~2-O~l@{_VK7w$my*Hu77zbi9PW_}&?1 g@AFL{4l21W?eTl!qnPWfH-H2@UHx3vIVCg!0F7#?y#N3J literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0e35b0d20dda63402320bbeea7814c03a6731973 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D%z?LA!_Ln`LH zy|d8oaDWKIh21R1JXxH1_7_;(H)IGIwZEwUAo%Av%Q{8JWbr$b{vMDyDUvqXb!y3J zHHq3>$>%G!W!~TWe&6*iuiStpL%@X$sik zys5EA?v|FlX$G=>ue%>JH-E0Y)~}U6-a5(cWhni+i2wNF_m8{Vub(Twp;&w4FU&|N z{l^rjtvyQaPx}u+-mO|cR<2XuyZY4f?r*GX*>pawS@X;5%(K_`zGS~JS|7$#YZE*D z@J9`^)1m9R_OFiW(7Jy5`1dE3YP#j xsX)?UWy-IIx=Ha0#TOQRWv%1$jt5Eo{Kg<{p=fS?83{1OSSfX|(_V literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..43071b4e963a6b3846737e0ac7547ac4e88b9cf5 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_IbKEhE&XX zduu({p#YhqACn~>O_FlCEy3Zod&Zfjqq~;rKZ-t+W;#pv7lU1cLib?i@+fSLHu2s4yJEfj>hy=~>=09d yWP_LHRsDDRR-8+@9DdcQFDzkP@SCh+ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fda4f663d46893c61199bed014c382fe097c9a98 GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|R(QHNhE&XX zdvzn{p#Txq3(GlHZuN>fc+E=T1xw^XU8Bb67fHtibzHPJPKe;##@Q)gyL|ura(Vtb z7NBOHsK_U!m(T3zcWir-F1F$Rx!0vtIdgt@vQBZ0o4+c3^_vxsBloS-`BY_S>pm@J zkwuL3cgZiTdrkx8&RnWqZO&H7IRB{m>1ZHlO<8|ftXeGp_2uXD^}O{a>Mp)|lNo3Q b1bpC+E2&rGtQ9wC1qpb%`njxgN@xNAh!9!( literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f681612262084b16f7a76050b21c55f7cc56db2a GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}OFdm2Ln2z= zPEq7LWFX-tpHgA8(dRu|Oh%vgTP_KqFK2cfuwiRI;uzpML5;iV!`k}h2lcz&R{xzX zB6Ga(-`v)#jRQEyZBKv>X7F_Nb6Mw<&;$TMf?xXp literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8c07451a20c26e60a37754c57b06538a74c4942e GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z%ROBjLn`LH zy=9o)93a5{A$ws)UVUUoZ^b-+FgbSqV>U)Gy9WA}tqO zwIsI$tCm#E>3?b0_b)58D%@Fsc7TA)p#$M_ewPPx$f=NU{RCt{2+A&MRKoke?rx;2*#SA5-OF0l++ykPEIA(OcEq;THo%|MY>sQF= zCin?lghI(uS~{do38BMtigYkXo967L{C{I}T;9FDWch~(000000001ph$1QY*flgs zb)NJ8EW|{AHek?6DfGRQn1ayvc+g2JuUAe$l3A^P6e1}&$t>lXv#JYmVDtO(nyxNa z^gNkWt}|661y9#~x_7_GfBmkkzj6W`H>V`CXu9sVZW7AFCz(Z#n=98U|Jjdmhtp-3 zCbJtF^)|*&!}h_Y_$0^8>Gq{i*1OYT;=pDiqDA5S{$^4mwkNcF;i<+R0000000000 z0L-T=sJYOwY187s=0&m6vUh8;!MFMF*d-iC9N4Tgr!;;7%7jXnMjFtz=xm$u6QJ9{ z4Tz*r=I^FEr~#1_to!YpF1s}9ZM5E_mPiT?eUHoFRHrzw`RU-aulr_GSR0{{R3oS+}%z>j$y{6j_n0000Px$eMv+?RCt{2+A(W`Koke?XCX+OQU|fP1fkzSTGAzCbj<3Oy^CX}jQIxX$8gLX z2wl4rT(U?)2kjIQhwBuuP^^k~yc9*}A0t=5=!PKWb=(~15-=zDCp)Eia7ZmF}-_k@%` zk$?&yqSkj)AWe8k<7GFnuEzT^OIZ5Neh>}9zV_gO$A_y6ct)sm*a}p6- z$xY literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aa92d531ff5b6642826ca05a985ad8e5308d21c5 GIT binary patch literal 439 zcmV;o0Z9IdP)Px$aY;l$RCt{2+P!LnP!tF7(?Sq4sY9{2gn;1EwRFi896M&sX5XNr@6b78UcoV& zU|*sTvPdruc8in@x6{p1zXE!d>;E?j7tT5NaQ!$E0RR9100017y}!Qjp=0PmQy%wa z7o))7u9@`{kz}r!Q4|=JMJO$RWfycvo&KVd=#V;O*+u&WNvQGNcBw@B3%l)-C!toF zQ)vgNvim|^KBWbil79urnNGfw4iQUld?%%x>FpOpfx$QHl@jN`X1(G!-vwgkDboeM zlTysQ+ZRsdK?nc<00000005@uZs-7-h!2|Izt;8I+y2;D+@mc(5^6kWI_-~7w3uJW zHM33=7e-ltB-HrF=X0-#3!|J2e@G{nT9Wy@6!5rb=H#7)eF~kUHSLsSk=z% zo6pRZl=ihp_SCx--g&n;cwOGVkEhcF6*2UngExuWv2iD literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..f8df5c1c00865a1fac760d707f33b380e81ad1f3 GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_J-(hE&XX zdrPs)DNuy%L9)q;ldrVhJ_|dB8ze3|n7f1hVeSFb8!iUXEar)YmsVSG@0iTy*!>}7 z-iO++1^mzNRQ=-s8pH5FFm>YcuQ?N*9oD&f4M?m_Zw?Xr8M`)5DpYQ|>%3W!=4G>k z-}LVn6f}Id{ZX}H=jn&)R+n>^{(Jvn3gh|J>#xXtUFTbU`j$Q)$TXmfWA`de{!p0y mCOuuq?j7^LlPU}h0cYj4!)@kfFzM!klz6)OxvX!i>5^>|{+0ycR4u73^ fMG|Z}g4i&Hky}Gs;Z~DK4@l6{)z4*}Q$iB}=~iGG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aba4c44c3f24bd3d09a320b5509358e67bc9847f GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>z@qLn2y} z6C_v{Cy4YkP2`hUnR=mHZ}Wd1AW+w4%P)Px$S4l)cRCt{2+ObN*a1h7w)2)JaDmpcbW56x7;2UIgaL5yMFFr)@MKTCke1m|+ zt$P+TMVw-wj^`i|!Kumr{xtIajHS7MdcAb$??eCq0001hg*uJY^8G^``#R`QnKvL$ zLY)M&y{?%AGs%2lty#&kKCqHJZe-Hm4wx^I2G2(-y!)oL~9#~A)m~$!6B)TPos^;U8O{$ZGbDIZGfvC0<#9(T%O9ub7fUtL=Jd|pi76X z&vCIsU@`&g+jEPue;nivLAN8|>%5^m1pg*uXNLd)0ANpFeYd2HMt`6;00000NkvXX Hu0mjfpklTF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ebd37833cdfe09b6a16c2d730af29d4a0d1758b4 GIT binary patch literal 426 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zQ#@T9Ln`LH zy|vM=IY5N%!QyD&HNlI6BV|1A} zlD^|FrPv+4b{6D+u2<%5Km72(r|BF(<3XUKV~dbY8GmiouKAZ0r3)|4XP&`g?6vrV z#x{jsr+F-!Z{5!}S2(TxKAv?gOM2ziw@-{F&T&)xZN;*dWqII+d$aEb@zt zyO_57bDr=Pp*=U>X`I%crT6?Ucj3lIMiXW9ne?|EwE0>gSTNJ$S<=`1{pz_~vrT_h z{r+KD_VvfDS9cWu)EPW$F8}!9jZZzqRX}oseY9h*_{E5s9{cuMZVtNL%_tyfyY~L^ zyhItbg_}a}|Kv5`oT|H*=fKw^D>^?*C)_^Be8J1)+52_Y84OXJ+y0jRtI>S%?$@1H zrdFA=_kTaAa>XpG{8q!gPv32ie4pMNvpjJ6pS}9q{>{IjPx$Xh}ptRCt{2+P`bUKoke?m(ry|?Ns7qmW~0psL=nwF++#^1@6H=;_x4F5Q5Oz zMXA22IU3*;Tl*Yd083{`J0asZC(thB^GML6bEf+hZHp|7% zoh)ejMhE}^00000003@{cgfDq3mOl>GZ7Izy}e&_jH{qk#90z@@kO|7RmeH#foN(F z?rnD7nQXk`wJ2K{agtUMS1FK45GjpyCL8bd;U)%N)L#K`J_E8O za)HRm7|9sqSgiqu7M~xAZ!h0a``;@%cro?aBBLwX0U;4C2H|4X0250Dwxq Y0dQoNSm=R>DF6Tf07*qoM6N<$f*X*y`v3p{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c3e23e4977d5903a5a204f9dd100bb913d74e7f9 GIT binary patch literal 418 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zV?13PLn`LH zy}2=~*+GK+!}_~gM|5v^PVZsd?xL9g;KdB}g6VcHC%P?IoZ=L`4_sPXEtc=~Vo77! z9zSs|+uns=r|kZpZ)5S}-RJX_RW3l&K_LA0(<$F$57+P5+UI^VVWz9ihqZZHK{_9F zwKlKV#(9bD#zODcXLs&iB@&f?E~P#1H|HGHKU-#H3f4c|GOO^M(92m%I4?YX$?f}k zqS*nJ{Zau>doJC0xp>;SB^#YX&)xFZ*xa$a*uT40VQ%%GciRutg=b7|GAYa0ul;U* z#wkY*h#MFfd_G?&XWZT)KP&#|@zOUxpXPoj{V$o$DPF&P`{|Ws+e3RTyr<~aOfUzU znPDgy_#is%$X|8A>d=YuDNJIMCsz8$1?;_fRqeov*zjXh*siEOI4Lb%xc=G>PPsnu z3ZHvl(N~eP6fg)Wy=x5)N@wVt;3;UDdO@bNc*K*PCm@XK%QjfB18u z^j!5z*}2{-tE``(XV={HAi|@&fU|39 z#?qzP>hTXtf?6&qUZ2yg`QN_;&fOdd@!ojkbX*K`t`h0XtRvck|QOf+y z#{9D3yyrpdr6pc6U1Z2Po;p=6>i8-X!y@e|OSo?LoxbYT>*pu^rJ#Ox(B1UM6R1}uGA6xyLDFq_v;&Hq-g;$$vsx%1gEVK*2) z1p)CbX9Y2b<;9MlZ-%V05uAD3c|zpg#EqTt4F+91uk%*S7jUs!5Mwt@<9GK;Tb7wO z`cA9;=juP!by(wB)!|F8+UkvykIOLuUD41}$8alhfPx$nMp)JRCt{2*-c8rKoke?r$^|@ZD|)RVn~ocNd%XIker}}bfNn~L64AJA#Qqx z77ASoQ3@fnRHU^iZe8^X&sC%gGe+B~lk)#9lVLvIynHZ^2mk;800000h=?rP;s2h) zHi_1AxXX#C=-U9eu0yS6XD_m#)$FkAI+^z~Gayc)!aoX@?Qon#!Zrt4H~b*v=chTn zy}#1q!yvPrsw~^#O1VnMCw02Lxz3z_W(H`wL2(jMrCcpsCZvmxlZZ6k5VjTW>~IwG zY&xM{?~csVGv%{kec_&WMVfBV<%KDnZ?47oLC8cz{r=$Vno5CK&(QRRCrWz&00000 z00000P@mWCN;#P>L}|@{66o5SS_f5^F6KXWhrH=6@mhEt>+2OQsDw7|C zT&tVv{0RM~{=O}x($P-F5lVNxRyWxXLLQFdoxT0Nc9&&*ZF2owp#Ba3006LuJ^>^9 VjZYt>?4bYv002ovPDHLkV1ly8*+BpR literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..e6ea2ad66aed485ebe8e5099ef053958d5133cfb GIT binary patch literal 451 zcmV;!0X+VRP)Px$eMv+?RCt{2+A(XwKoke?m(ov=DQjtmgwkM;EQx!eaDIXWT-rU8{RsLM{2GGb zt}a0oMO+kDr+kI$Bv>eE5^}HU`Txy#xy!o;dB+P800000002Pk;wX`v^UAtYy}SYGQkvyIbsC@yqeU<<;8A||6)1u9KRcP#Hy&}`J6z_9#=3|3MNWa}F+!)bP5DHnPLBfHhHMW?K4Zq#t zSgP4L+ulXpM0dD}foGK$0PQm%juLq(%6_7C0D@4+bUDi%qiuC|sYah)oZNC;%M7?K t#ee%lO{)y3atF~O0RQn83IG7m0AJM#fH^Ey=!pOT002ovPDHLkV1oMs#Tftq literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..55b9e408488ab6ccfe93063ec93a90b91c1d7843 GIT binary patch literal 451 zcmV;!0X+VRP)Px$eMv+?RCt{2+P!XqP!tF7)7mZ_nOvK8fI%ZMEb1%Z6X-+u1|8uQ=;AYILc(sl z+!&06us~d$c!k>uhn6oJKy&Z^Hc z9?chafN0+cTuqh&6n4OTZb~s%D?J3+ekXh|~-|yt2bwlk$+Wu7r0001;`vI)Bl>6?~czyr?002ovPDHLkV1l1O$u9r^ literal 0 HcmV?d00001 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 fa185773b34e133ac7d4e0853c995131269b4acc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_!9ghE&XX zdvzo4Ap-%{fWr=gA|~G$JUq_vm~3F`VbC^EoEmNrx@1dd!-dT1o z+3C0T=07D5?=a(r8AWe@+w9B}W$w_t9(2$9c!ZnJ&SO(vKmIxE&p+pkKWseS>!*~z zDEl3mp0jV(3;$!i^UqJe@b=ro5}Pxxmab&%*}pUK;obb}%c_7TL&1Z1yYgT1*4KjS P>Odl%u6{1-oD!MKe?J&f1EGMh#k}8CP2; z2&a4!J(DuU^j-Bb$N%PGC%ZqtN;&br184yVI5b^4<|$X-vpGWCD)bR=z^xrN=5x=T zEEdic?=W-7e7q*N>D<n<)E0JU7?ba~A7W zk4rs&-c8Io)UY|?_p$Cr(ow6IZET6DhO^!2RBuC4zS z{~xNZ*^wN*qP{0=_1E|LcX}c20g?>`N6*&g?|a@|Bewo^KG#|1B;ibl45=^TE>Z!t zx$L2#-;=~UQk!R=tuD|K3C@39xNgUq?Ys{z-DWE|E6`z@V6}JA;X3uuc^!TgZ3#7& zob$L}G$pq=q_F?ch?Y9e!&rS}&6dK&7g?w3`v*RHot)0`&-YlLBooNyzB-1DuAM(_ STw~P$Imgr0&t;ucLK6TY+_Yo> 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 522951558949a78c90e1d1605693295b11dc0222..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 436 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^E_P~Ln`LH zy=jTv+Y&3bo zGP8)aylCn|L(hT(ZttZz4foI2aj0YvgaF0{`Ibj_j9)Cdb^fa+yWz$Cj4pu{hRYA| zI|;fbKK^=4I3RTCSH&NW8mm^lDKDOsc8K38F`J|4o66ZKpUvkn9RI3td9yByWq#LNCxZi($dUM9l4j5RmyTVHP$;mCES0g5+EzR_7-=~$`=2e^g z+tGgU^lg84^LftdyuEv)Wqr%8FYkAqsEXU}w|{NzukzSOFMULg##QUy&ocb>-USH6 bUx+Jcwf%T9?ekP%G%$F&`njxgN@xNA<1NDe 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 9044415f83a964386eeb409f23777cda6a94b4a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 429 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z(>+}rLn`LH zy=9np$Uubc!F0KU!F>~S0*z8O@&~M(WXU)+;?%vBwoEaN*$Rq<3=t9z3P+fd&OXte zp(!+VmC)rMrl$YRlav10oYdbVzz8%Q2)4Z2`ajR|`p&9PwT+j5dMy5U7SnzEEV3jj?9f`)6~uk*)SwOR5!{iwNHLS3`o=6#mZr8ghxPrj zjIUOyOtJDlvWRCX-^$fRf0`^jcfS7Vc85LY{PW54nXaEcJ40{56~*hPbALHS^EpA> zz`&3&yMHOOgpysxJiq7PZry)hxot;ybc2q5MeNik6*gPsGoJg@Tm@RZ?)hhho+V?#Wb(@$qO5fbBbo`#NZ!@#cZ}$YFXs!!48GqNNxC&O~H}#l? zi7X7Bvm}a7+56SohU@!}`sf~du=&~-