From a81465f0d97db5d02e9ae6bd00b00f14cf2762b9 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Mon, 22 Jul 2024 18:46:26 +0300 Subject: [PATCH] Rock and stone mini update (#344) * ore resprite * tools restruct, ore repath, add pickaxr * fixes * localizattion sync * fixes * Update migration.yml --- .../ru-RU/_CP14/_PROTO/entities/entities.ftl | 52 +++++++++----- .../Spawners/Constrained/test_xeno.yml | 2 + .../Spawners/Random/battle_royale_temp.yml | 10 ++- .../Entities/Objects/Tools/gardening.yml | 53 -------------- .../Objects/Weapons/Melee/Tools/hoe.yml | 27 +++++++ .../Objects/Weapons/Melee/Tools/pickaxe.yml | 43 ++++++++++++ .../Objects/Weapons/Melee/Tools/shovel.yml | 32 +++++++++ .../_CP14/Entities/Objects/ores.yml | 25 ++----- .../Entities/Structures/Walls/natural.yml | 66 +++++++++--------- .../_CP14/Objectives/steal_target_groups.yml | 2 +- .../_CP14/Procedural/biome_template.yml | 11 --- Resources/Prototypes/_CP14/tools.yml | 4 +- .../ore_copper.rsi}/meta.json | 3 - .../Objects/Materials/ore_copper.rsi/ore1.png | Bin 0 -> 368 bytes .../Objects/Materials/ore_copper.rsi/ore2.png | Bin 0 -> 442 bytes .../Objects/Materials/ore_copper.rsi/ore3.png | Bin 0 -> 440 bytes .../ore_gold.rsi}/meta.json | 3 - .../Objects/Materials/ore_gold.rsi/ore1.png | Bin 0 -> 416 bytes .../Objects/Materials/ore_gold.rsi/ore2.png | Bin 0 -> 410 bytes .../Objects/Materials/ore_gold.rsi/ore3.png | Bin 0 -> 390 bytes .../ore_iron.rsi/meta.json | 3 - .../Objects/Materials/ore_iron.rsi/ore1.png | Bin 0 -> 386 bytes .../Objects/Materials/ore_iron.rsi/ore2.png | Bin 0 -> 432 bytes .../Objects/Materials/ore_iron.rsi/ore3.png | Bin 0 -> 446 bytes .../Objects/Ores/ore_copper.rsi/ore1.png | Bin 285 -> 0 bytes .../Objects/Ores/ore_copper.rsi/ore2.png | Bin 302 -> 0 bytes .../Objects/Ores/ore_copper.rsi/ore3.png | Bin 279 -> 0 bytes .../Objects/Ores/ore_copper.rsi/ore4.png | Bin 276 -> 0 bytes .../_CP14/Objects/Ores/ore_gold.rsi/ore1.png | Bin 315 -> 0 bytes .../_CP14/Objects/Ores/ore_gold.rsi/ore2.png | Bin 302 -> 0 bytes .../_CP14/Objects/Ores/ore_gold.rsi/ore3.png | Bin 280 -> 0 bytes .../_CP14/Objects/Ores/ore_gold.rsi/ore4.png | Bin 274 -> 0 bytes .../_CP14/Objects/Ores/ore_iron.rsi/ore1.png | Bin 279 -> 0 bytes .../_CP14/Objects/Ores/ore_iron.rsi/ore2.png | Bin 260 -> 0 bytes .../_CP14/Objects/Ores/ore_iron.rsi/ore3.png | Bin 273 -> 0 bytes .../_CP14/Objects/Ores/ore_iron.rsi/ore4.png | Bin 272 -> 0 bytes .../Objects/Ores/ore_silver.rsi/meta.json | 23 ------ .../Objects/Ores/ore_silver.rsi/ore1.png | Bin 305 -> 0 bytes .../Objects/Ores/ore_silver.rsi/ore2.png | Bin 245 -> 0 bytes .../Objects/Ores/ore_silver.rsi/ore3.png | Bin 263 -> 0 bytes .../Objects/Ores/ore_silver.rsi/ore4.png | Bin 270 -> 0 bytes .../Melee/Hoe}/hoe.rsi/icon.png | Bin .../Melee/Hoe}/hoe.rsi/inhand-left.png | Bin .../Melee/Hoe}/hoe.rsi/inhand-right.png | Bin .../Melee/Hoe}/hoe.rsi/meta.json | 0 .../Melee/Pickaxe/pickaxe.rsi/icon.png | Bin 0 -> 284 bytes .../Melee/Pickaxe/pickaxe.rsi/inhand-left.png | Bin 0 -> 597 bytes .../Pickaxe/pickaxe.rsi/inhand-right.png | Bin 0 -> 593 bytes .../Melee/Pickaxe/pickaxe.rsi/meta.json | 30 ++++++++ .../pickaxe.rsi/wielded-inhand-left.png | Bin 0 -> 663 bytes .../pickaxe.rsi/wielded-inhand-right.png | Bin 0 -> 681 bytes .../Melee/Shovel}/shovel.rsi/icon.png | Bin .../Melee/Shovel}/shovel.rsi/inhand-left.png | Bin .../Melee/Shovel}/shovel.rsi/inhand-right.png | Bin .../Melee/Shovel}/shovel.rsi/meta.json | 0 Resources/migration.yml | 5 +- 56 files changed, 223 insertions(+), 171 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Tools/gardening.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml create mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml rename Resources/Textures/_CP14/Objects/{Ores/ore_gold.rsi => Materials/ore_copper.rsi}/meta.json (90%) create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore1.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore2.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore3.png rename Resources/Textures/_CP14/Objects/{Ores/ore_copper.rsi => Materials/ore_gold.rsi}/meta.json (90%) create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore1.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore2.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore3.png rename Resources/Textures/_CP14/Objects/{Ores => Materials}/ore_iron.rsi/meta.json (90%) create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore1.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore2.png create mode 100644 Resources/Textures/_CP14/Objects/Materials/ore_iron.rsi/ore3.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore3.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore4.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore1.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore2.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore3.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore4.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore1.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore2.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore3.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore4.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png delete mode 100644 Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png rename Resources/Textures/_CP14/Objects/{Tools => Weapons/Melee/Hoe}/hoe.rsi/icon.png (100%) rename Resources/Textures/_CP14/Objects/{Tools => Weapons/Melee/Hoe}/hoe.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/{Tools => Weapons/Melee/Hoe}/hoe.rsi/inhand-right.png (100%) rename Resources/Textures/_CP14/Objects/{Tools => Weapons/Melee/Hoe}/hoe.rsi/meta.json (100%) create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/icon.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-right.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/wielded-inhand-left.png create mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/wielded-inhand-right.png rename Resources/Textures/_CP14/Objects/{Tools => Weapons/Melee/Shovel}/shovel.rsi/icon.png (100%) rename Resources/Textures/_CP14/Objects/{Tools => Weapons/Melee/Shovel}/shovel.rsi/inhand-left.png (100%) rename Resources/Textures/_CP14/Objects/{Tools => Weapons/Melee/Shovel}/shovel.rsi/inhand-right.png (100%) rename Resources/Textures/_CP14/Objects/{Tools => Weapons/Melee/Shovel}/shovel.rsi/meta.json (100%) diff --git a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl index e398d4b786..7dc463dd37 100644 --- a/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl +++ b/Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl @@ -150,6 +150,20 @@ ent-CP14SpawnPointAdventurer = авантюрист ent-CP14SpawnPointAlchemist = алхимик +ent-CP14ConstrainedSpawnerBase = None + .desc = lol + +ent-CP14ConstrainedSpawnerXeno = xeno constrained spawner + .desc = { ent-CP14ConstrainedSpawnerBase.desc } + +ent-CP14RandomSpawnerBattleRoyaleLootWeapon = Loot + .desc = lol + .suffix = Weapon + +ent-CP14RandomSpawnerBattleRoyaleLootTools = Loot + .desc = lol + .suffix = Tools + ent-CP14RandomSpawnerGatherAgaricShroom = спавнер мухоморов ent-CP14RandomDirtLootSpawner = спавнер земли @@ -189,16 +203,13 @@ ent-CP14BaseMobHuman = Мистер Человек ent-CP14BaseMobTiefling = Мистер Тифлинг -ent-CP14OreCopper = медь +ent-CP14OreCopper = медная руда .desc = Кусочек бледной, тяжелой меди. -ent-CP14OreIron = железо +ent-CP14OreIron = железная руда .desc = Кусочек холодного, тяжелого железа. -ent-CP14OreSilver = серебро - .desc = Кусочек блестящего, теплого серебра. - -ent-CP14OreGold = золото +ent-CP14OreGold = золотая руда .desc = Кусочек мягкого, чистого золота. ent-CP14CopperCoin = медная корона @@ -381,12 +392,6 @@ ent-CP14Bucket = ведро ent-CP14OldLantern = Старая Лампа .desc = Пережиток прошлого техномагии. Большой, тяжелый, непрактичный. Таким приятно разве что бить по голове. -ent-CP14Shovel = лопата - .desc = Орудие для вскапывания земли, рытья грядок или могил. - -ent-CP14Hoe = мотыга - .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков. - ent-CP14Rope = веревка .desc = Многофункциональная веревка. Ей можно связать что-нить. Или кого-нибудь. @@ -429,6 +434,15 @@ ent-CP14BaseTwoHandedSword = двуручный меч ent-CP14TwoHandedSwordScythe = коса .desc = Большая двуручная коса. Что вы будете косить ею? Пшено, или головы своих врагов? +ent-CP14BaseHoe = мотыга + .desc = Фермерский инструмент для подготовки почвы под посадки, либо очистки от сорняков. + +ent-CP14BasePickaxe = кирка + .desc = Идеально заточена, и готова вгрызаться в земную твердь. + +ent-CP14BaseShovel = лопата + .desc = Орудие для вскапывания земли, рытья грядок или могил. + ent-CP14WeaponRevolverNavy = револьвер "Марин" .desc = Увесистый капсюльный револьвер серии "Марин". В настоящее время револьверы серии "Марин" стоят баснословные деньги, и их могут позволить себе исключительно преуспевающие моряки и торговцы. @@ -721,6 +735,9 @@ ent-CP14WallmountBarShelfB = { ent-CP14WallmountBarShelfA } .desc = { ent-CP14WallmountBarShelfA.desc } .suffix = 2 +ent-CP14Workbench = верстак + .desc = Стол для создания различного базового инструментария. + ent-CP14FrameWooden = каркас деревянной стены .desc = Деревянный каркас для деревянных стен любых видов. @@ -831,10 +848,6 @@ ent-CP14WallStone = камень ent-CP14WallDirt = земляной холм .desc = bruh -ent-CP14WallStoneSilverOre = { ent-CP14WallStone } - .desc = A solid stone natural wall. You see the tantalizing particles of silver in it. - .suffix = silver ore - ent-CP14WallStoneGoldOre = { ent-CP14WallStone } .desc = A solid stone natural wall. You see the tantalizing particles of gold in it. .suffix = gold ore @@ -901,6 +914,13 @@ ent-CP14WindowStoneBrick = окно в стене из каменного кир ent-CP14WindowWooden = wooden window .desc = A wooden wall with a glass window in it. +ent-CP14OreSilver = серебро + .desc = Кусочек блестящего, теплого серебра. + +ent-CP14WallStoneSilverOre = { ent-CP14WallStone } + .desc = A solid stone natural wall. You see the tantalizing particles of silver in it. + .suffix = silver ore + ent-CP14ClothingHeadWhiteBeret = белый берет .desc = Это берет. diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml index 28907bf8fb..cde8e0b2c1 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Constrained/test_xeno.yml @@ -2,6 +2,7 @@ id: CP14ConstrainedSpawnerBase abstract: true parent: MarkerBase + description: lol components: - type: Sprite layers: @@ -27,6 +28,7 @@ - type: entity parent: CP14ConstrainedSpawnerBase id: CP14ConstrainedSpawnerXeno + name: xeno constrained spawner components: - type: TriggerOnCollide fixtureID: spawn diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml index e838548ff0..920d1e297f 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/battle_royale_temp.yml @@ -1,7 +1,8 @@ - type: entity id: CP14RandomSpawnerBattleRoyaleLootWeapon - name: Лут + name: Loot suffix: Weapon + description: lol parent: MarkerBase categories: - Spawner @@ -31,7 +32,9 @@ - CP14Crossbolt - CP14BaseSharpeningStone - CP14BaseSharpeningStone - - CP14Shovel + - CP14BaseShovel + - CP14BaseHoe + - CP14BasePickaxe - CP14OldLantern - ClothingBackpackCargo - ClothingBackpackCargo @@ -53,8 +56,9 @@ - type: entity id: CP14RandomSpawnerBattleRoyaleLootTools - name: Лут + name: Loot suffix: Tools + description: lol parent: MarkerBase categories: - Spawner diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/gardening.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/gardening.yml deleted file mode 100644 index f3d98a8f72..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/gardening.yml +++ /dev/null @@ -1,53 +0,0 @@ -- type: entity - id: CP14Shovel - parent: BaseItem - name: shovel - description: An implement for digging up earth, digging beds or graves. - components: - - type: Sprite - sprite: _CP14/Objects/Tools/shovel.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: 65 - damage: - types: - Blunt: 5 - Slash: 2 - soundHit: - collection: MetalThud - - type: Item - size: Normal - sprite: _CP14/Objects/Tools/shovel.rsi - - type: ToolTileCompatible - - type: Tool - qualities: - - CP14Digging - useSound: - collection: CP14Digging - params: - variation: 0.03 - volume: 2 - -- type: entity - id: CP14Hoe - parent: BaseItem - name: hoe - description: A gardening tool to prepare the soil for planting, or to clear weeds - components: - - type: Sprite - sprite: _CP14/Objects/Tools/hoe.rsi - state: icon - - type: MeleeWeapon - wideAnimationRotation: 65 - damage: - types: - Piercing: 5 - Slash: 2 - soundHit: - collection: MetalThud - - type: Item - size: Normal - sprite: _CP14/Objects/Tools/hoe.rsi - - type: CP14SpawnOnTileTool - spawns: - CP14FloorDirt: CP14PloughedGround diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml new file mode 100644 index 0000000000..64d082fd4f --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/hoe.yml @@ -0,0 +1,27 @@ +- type: entity + id: CP14BaseHoe + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponLight + name: hoe + description: A gardening tool to prepare the soil for planting, or to clear weeds + components: + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Hoe/hoe.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 65 + damage: + types: + Piercing: 2 + Slash: 2 + soundHit: + collection: MetalThud + - type: Item + size: Normal + sprite: _CP14/Objects/Weapons/Melee/Hoe/hoe.rsi + - type: CP14SpawnOnTileTool + spawns: + CP14FloorDirt: CP14PloughedGround \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml new file mode 100644 index 0000000000..1748ae043e --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/pickaxe.yml @@ -0,0 +1,43 @@ +- type: entity + id: CP14BasePickaxe + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + - CP14BaseWeaponChemical + name: pickaxe + description: Notched to perfection, for jamming it into rocks + components: + - type: Item + size: Normal + shape: + - 0,0,2,0 + - 1,1,1,2 + sprite: _CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 300 + damage: + types: + Piercing: 5 + soundHit: + collection: MetalThud + - type: IncreaseDamageOnWield + damage: + groups: + Brute: 5 + types: + Structural: 10 + - type: Wieldable + - type: ToolTileCompatible + - type: Tool + qualities: + - CP14Digging + useSound: + collection: CP14Digging + params: + variation: 0.03 + volume: 2 + - type: UseDelay \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml new file mode 100644 index 0000000000..1fe9f7b878 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/Tools/shovel.yml @@ -0,0 +1,32 @@ +- type: entity + id: CP14BaseShovel + parent: + - BaseItem + - CP14BaseWeaponDestructible + - CP14BaseWeaponSelfDamage + name: shovel + description: An implement for digging up earth, digging beds or graves. + components: + - type: Item + size: Normal + sprite: _CP14/Objects/Weapons/Melee/Shovel/shovel.rsi + - type: Sprite + sprite: _CP14/Objects/Weapons/Melee/Shovel/shovel.rsi + state: icon + - type: MeleeWeapon + wideAnimationRotation: 65 + damage: + types: + Blunt: 5 + Slash: 2 + soundHit: + collection: MetalThud + - type: ToolTileCompatible + - type: Tool + qualities: + - CP14Digging + useSound: + collection: CP14Digging + params: + variation: 0.03 + volume: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml index 5e63f234a6..545059eef4 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/ores.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/ores.yml @@ -11,16 +11,15 @@ ore1: "" ore2: "" ore3: "" - ore4: "" - type: entity id: CP14OreCopper parent: CP14BaseOre - name: copper piece + name: copper ore description: A piece of pale, heavy copper. components: - type: Sprite - sprite: _CP14/Objects/Ores/ore_copper.rsi + sprite: _CP14/Objects/Materials/ore_copper.rsi layers: - state: ore1 map: ["random"] @@ -28,23 +27,11 @@ - type: entity id: CP14OreIron parent: CP14BaseOre - name: iron piece + name: iron ore description: A piece of cold, heavy iron. components: - type: Sprite - sprite: _CP14/Objects/Ores/ore_iron.rsi - layers: - - state: ore1 - map: ["random"] - -- type: entity - id: CP14OreSilver - parent: CP14BaseOre - name: silver piece - description: A piece of shiny, warm silver. - components: - - type: Sprite - sprite: _CP14/Objects/Ores/ore_silver.rsi + sprite: _CP14/Objects/Materials/ore_iron.rsi layers: - state: ore1 map: ["random"] @@ -52,11 +39,11 @@ - type: entity id: CP14OreGold parent: CP14BaseOre - name: gold piece + name: gold ore description: A piece of soft, pure gold. components: - type: Sprite - sprite: _CP14/Objects/Ores/ore_gold.rsi + sprite: _CP14/Objects/Materials/ore_gold.rsi layers: - state: ore1 map: ["random"] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 75cbb30c66..6062add2eb 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -127,39 +127,39 @@ # min: 1 # max: 5 # -- type: entity - id: CP14WallStoneSilverOre - suffix: silver ore - parent: CP14WallStone - description: A solid stone natural wall. You see the tantalizing particles of silver in it. - components: - - type: Sprite - sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi - - type: Icon - sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreSilver: - min: 1 - max: 5 - CP14StoneBlock1: - min: 2 - max: 3 - - type: IconSmooth - base: wall +#- type: entity +# id: CP14WallStoneSilverOre +# suffix: silver ore +# parent: CP14WallStone +# description: A solid stone natural wall. You see the tantalizing particles of silver in it. +# components: +# - type: Sprite +# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi +# - type: Icon +# sprite: _CP14/Structures/Walls/Natural/cave_stone_silver.rsi +# - type: Destructible +# thresholds: +# - trigger: +# !type:DamageTrigger +# damage: 100 +# behaviors: +# - !type:DoActsBehavior +# acts: ["Destruction"] +# - !type:PlaySoundBehavior +# sound: +# path: /Audio/Effects/break_stone.ogg +# params: +# volume: -6 +# - !type:SpawnEntitiesBehavior +# spawn: +# CP14OreSilver: +# min: 1 +# max: 5 +# CP14StoneBlock1: +# min: 2 +# max: 3 +# - type: IconSmooth +# base: wall - type: entity id: CP14WallStoneGoldOre diff --git a/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml b/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml index 8f98b2b895..cbf81f9fe5 100644 --- a/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml +++ b/Resources/Prototypes/_CP14/Objectives/steal_target_groups.yml @@ -2,5 +2,5 @@ id: CP14Gold name: gold ore sprite: - sprite: _CP14/Objects/Ores/ore_gold.rsi + sprite: _CP14/Objects/Materials/ore_gold.rsi state: ore1 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template.yml b/Resources/Prototypes/_CP14/Procedural/biome_template.yml index b057eda164..3f2a9eaea9 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template.yml @@ -117,17 +117,6 @@ entities: - CP14WallStone #Ores - - !type:BiomeEntityLayer - threshold: 0.6 - noise: - seed: 0 - noiseType: OpenSimplex2 - fractalType: FBm - frequency: 3 - allowedTiles: - - CP14FloorBase - entities: - - CP14WallStoneSilverOre - !type:BiomeEntityLayer threshold: 0.6 noise: diff --git a/Resources/Prototypes/_CP14/tools.yml b/Resources/Prototypes/_CP14/tools.yml index 1c5d47e8b1..5db184019f 100644 --- a/Resources/Prototypes/_CP14/tools.yml +++ b/Resources/Prototypes/_CP14/tools.yml @@ -2,8 +2,8 @@ id: CP14Digging name: cp14-tool-quality-digging-name toolName: cp14-tool-quality-digging-tool-name - spawn: CP14Shovel - icon: { sprite: _CP14/Objects/Tools/shovel.rsi, state: icon} + spawn: CP14BaseShovel + icon: { sprite: _CP14/Objects/Weapons/Melee/Shovel/shovel.rsi, state: icon} - type: tool id: CP14Hammering diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/meta.json similarity index 90% rename from Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/meta.json index 112f49c67d..bde7103551 100644 --- a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/meta.json +++ b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/meta.json @@ -15,9 +15,6 @@ }, { "name": "ore3" - }, - { - "name": "ore4" } ] } \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Materials/ore_copper.rsi/ore1.png new file mode 100644 index 0000000000000000000000000000000000000000..4dbc9dad07a6dc4eb1b794e3d4c42b8168c4ba2d GIT binary patch literal 368 zcmV-$0gwKPP)Px$DoI2^R9J=WlRrztKp2Og2ti7~p*^G$3R3I8Nf0NYgOori6kQ5V{S4xV@XK@& z92}%5)JcR;BUq|Jhekv$6(TfaoEoY)lJvhHP!Drjkf~U8R-HIJ1yL z2tmD8W$3@)cJDY|z9O5CIPa}9{4j6_V*t9n$5geI-fLQ7f|L>=1X4->JokF`Gce(B z+vH^DJ_(x+kHSDXTv_1EivZX!gD(P%W9Kf@>Wy=sl*2gxu1 O0000Px$bV)=(R9J=Wl}$@RK@^6cD_V%KC+W)1plf zL=fSkRY-`5sHKnjXEVdhIdk4~<_rT0g+if_AQ6w5;mM%+ zn`hc(g0GKeIq?hwLDMrdjjnqE*xBCHIu#(~n25(rm!rW_Uz7gsd$t}{KiSl3b&`j> z(n5qCtkPSVhgvC$_Q-pqyK{Dqj-^D{L=7{A3+>tIV=g=kK+zsy#gQb`N&&FA5W(eW zkch|3L_8+kC&FrH=Ax#q>i}&L0E2-60QU9|SnEII%IM*ysgb^XBvZKf_IzOh<6~2% z)9q#6*QD|^@}Nwrr_Fh&n=v#z)pj6IlMxzeU z4!*H`i?wErvPe~+RL*PgdL1rD3xH^_i}YocQdvHGkf^{%Ark>V9>39v`_BbfPx$a!Eu%R9J=Wld($zVHk%WC5fvp%8n>cqXy}QQiLEV96}r#f)scN*;icrN(6o`3&n>IOaeBwq z%s+=4D>1+cA_O5KQx!aaS{#?MaEHc?k0AkUIBMj;R0QL?Jo$PLYkoh46v+5x>*$0G0 zs}gNj^z+Nkl?9rn0kAl9hgtP-|1s566u@ggIcFVjAZmogwEu+(<(2W?GX61}@}t7W z`3#z-Ir6%+j$J8{FSM36(l!(|!s2U<5L5+b)x*V;`YUHwN&w^w*WLdMqDHvs8fx#~ ii*qZKNF)-;zvB~r!GE-{P5Tr80000Px$T1iAfR9J=WlQBp_K^TC)N{1k#=s~15JaovxqNx^xh9Htk2or}SFxr}09b21% zrUHkiS|o4^O3IRebdkVclUpH{~ah43WdS~3BN8A zeqH`q@k$g~O=(?`=(V!Q7S@pI8UUe4Ook#c%OX9UE|^~kN=+O2F(%@d#mn*X+hIh889vrcD7hrm75|`6K$tas- z#+^<8vblVB1QLE-2J|9O@A+JO0!`DJ`Q@d>W?VALWOI1{gb)<6neN>{Bi?_lpYW^1 z=~$BW$6&MY?tr;Hn>WRlB5j*`++Nu~XnuSR86gDMd-n|aLcA2t0Fdb#=eMqw5*_~n zkJ~E&zRO(tGW3nw`FMH9gVh literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/ore_gold.rsi/ore2.png new file mode 100644 index 0000000000000000000000000000000000000000..d48cf306b5010e1efbc4ef5bb6629ff5a673846b GIT binary patch literal 410 zcmV;L0cHM)P)Px$R7pfZR9J=Wlff%QQ5431k5Q7M=0?nvH%p75Sv;jiq12ScpsdFq;195nNhxb9 zD`hhaDJhXsOw7(=;w{+CsIgFIidZP4YxO2m7VnDP{Vl)lJ>PfFxd$v3i^XF3L-L-h z^Pa0s?nHiLG&M7)m5L%#=i=#7r`R;WV(yAufwa2%g*Y9e)l zFy}i1$m%x7l>|#yl~A?YOw6+@ujC3DW^3n7U8yJlsnHPt+WR}GyoaAc=l}qXJ>l8k zCs)X{=;LD^<(peZvOZhI7-8EFh9k&(uAc7_Vnc6i_N@_*4FYgBXr4%B<<;Fd__`>JY2i$>gP|xTOd=KH5 zOHT0W-sB?AWDfv|PP3*OkKiZro~r}nuPx$KuJVFR9J=Wld($!F&su;rHaFWO5>t}-XBm)hYCUuEZC`oMbNo}i-UuR;Narw z=+gBZ#ZeGJ5X3IxP}&q(0UK?IkAN*v0ah=|Q$6(Mg6A;0hCBLRcKVEFI2j;&nB zR=*yc%NLdF*y>@kU#Z*G$P#@~!-YryFtWD7qjwl(3;^*chl23^!4!q)5K$JPX&eGa0J2IuI=! zG#YRnTPWTq6?onR>?LI|Xkyxu>Px$JV``BR9J=W)W1r@P!z}UZxt0gbZJ0oEGb3`3My%7>ClP}I{N1cd;-CD2n9h0 zK_|gC5Gn{obZ{5CI9MpHOFX1Nq|C0ASuuf4l$E=>pJryo;1Qrdr&}*tl*rEHq5SUAY3Ug+PoBAyx!sJB!_ZtW-JLS*eGY}CB!wC08gud_5?ldFkj`S5Q z*o%YdMDj}$JKK9?vrDvE&m11?N6u9m!a%#zjP-pF5djE`1Du~8DP@iP9~c(Q$Gg{6 gI(|*lH0@9L0Fyjp*>=`Px$YDq*vR9J=Wls!vAQ5b+9qopMfg(z_;yn|p6f<&d%kVMdzkPzaMlRv_-siuYs zq7NDy`T<1|(FYhJ>ENJ3K_AP#2rd^Qx((&!1`Wrn5y5$u^TB)0`*6;A4@e{uiKLCh z;%OroiW<$V>1-w8;!?^0P*n}5vzJJC7$vn#CWDd79y@+bU}AFKaJyaR__P0tqWA$w zCKG^|gpj3`U?^(z4|u=LjgCaPy1p<^0^sOyQ)q8tfyUh?lL_A6bZ)Y@jE+Q56hC|W zTL5@H9!^frDCRGP_Z13^#nVP4JPd%M_*q?BVP<*?fXAn2GcJEu06fRsus~ri@Px$cu7P-R9J=WlD$hpQ5eR5Wi>Pe;ep6&6a)?pMF`?z)R1EzLP3a7*^pxq6h!?U zLG%IA9t06J1iDBNQ9?mxOCJ*4i{#=Yry;y(V%-}J4d*wVkLSG4!}}gkC=?3C9}t?3 z$>{O7ON~YdC(A3F((4Oa{u8!F(4}br?Co#ia8#eWH5bn>uUuW< z5Q&5t4)_@g_+>nPz~#kh-L6;;pzAtU*EawR4)mLbZp{V2(ea6?-Pzs7XZ}Bva(`xvHQ5EzPaw*>@fIHh|X`l#xgnkEag+S4SJK zZv|G@mJmYF-rh+*pEFI%6bl9q**i<0@kf!@7nGlEgrR_+L^4GtldjPf3kHB?W6J@` oAu9Lp#*?|WYp75t6pDYx2RPS&T8!5JH2?qr07*qoM6N<$f=eI5sQ>@~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore1.png deleted file mode 100644 index 0a2c9c737252f29cc78fc62cc50e93930fd641fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmV+&0pk9NP)Px#*GWV{R9J=W&@l@EVI0Tt?-c{O(oKpYb-9vcGTkJD!D#hryc;jTAd|96Qe;6y zltPi|Fl00000NkvXXu0mjfhzoo3 diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_copper.rsi/ore2.png deleted file mode 100644 index d1dbc770d61ffb89390b3cc8cff09abeac4a1f54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmV+}0nz@6P)Px#=t)FDR9J=Wl09p}P!vFqph#j9B!fiyK^DQKh?5{V$07T-7pqjrqvXS}VhiL)!#X^lhfYDLs_GyHe|TcPx#(Md!>R9J=W(7y`-VI0Tt_lb0z#UMIix!fXIl}QGJ(VuDZhe%Q`%Q=+kij!x2 z47yU5`(gaPwx_<&^Z9%q5JCtc{$M$s=;d^xv)nEGBYb9Gsg@pODUrJXK%gwfjVRMy zBWq~9ZNGkJ?t1J`Hi5EO?-bj^G4Z>_w1Kf|=|Q`unY$k0%_LA3m&jn$s{oEpS|ZWV z&~@};VA3(4w8|m%rXswVtj=9F{_AHx%?~6V9J-GFYzOU{<`Nlf{8y^5Tm|A1-{-vH dLI@!Qz#HlwM6}dtZJHrId+oJ%*O>w(PW&w4XRwIXT_e1DN~Th1 zwjvkv%UR_G(-KWQ7#NgN4XSsZT9YK6e(|cA?tX2uH`-XzC4c2IGUy8_rQW!^ zV_HX8>b~bIq-XTbtXeOmCG}I~;)@AgW()_+=J}mYjyom$=ybkx#qp5SXIIB Y?z02Ok*cDrK%X&qy85}Sb4q9e06^PnX#fBK diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore1.png deleted file mode 100644 index ca62cc342b674d4c7518975dcb4dc15337a67594..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)Px#^+`lQR9J=W(!XlLU=)V&C)F%PD1|_W6ihB6W5BU%Za_P9>Cn+Rcnw`00>z=Y z72FFhQbz|z|A2!i#zKZdTaHUBQabdDkS^zU0q1===YUd5DRrbI^d$*>`L}SH-%8qZ za+f&C8y*LqG&)yoM_oQ1*G%3DTtX81vZ^DSrY);F5(i#!>2cu6rfEysbN1{1E|TXA zmT7o&y2h<$lrC(n+8Ofv%K6<50O@_3r@I+5r-gW7l5R5qJOq N002ovPDHLkV1h9(htdE5 diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_gold.rsi/ore2.png deleted file mode 100644 index 503e979a33b1784526e74d65000508914d80fc8c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmV+}0nz@6P)Px#=t)FDR9J=W(xD2%P!tB>U(q5Ogf)ZPLtL;7j3&VsmjSE^v0D#?HI$w?@R63hw@(qwB)Fj=}wXdd;iKAK^IYP)Px#%t=H+R9J=W(jg1NKor37zhGQY@B^G5z_=(H?IN~WEP~<}5XL^ms(ryER=Y)5 zFggW;D7Y1|J(B}%JJIxha2$7V@4b6>pp;TdS(rEL@|s`cugNbSGH=%9wyep;BVXIZ zD_b4v*BCT90Hj37I%B`HYeL}y_79=b=#j<|0J6@gPKJ!nAz&ofB&DAg5NwhX-IYw+ z835JEkTi}s9h{<}?D(z`IgZ}mf7^1zcg_F)z;zaKIyfxuCf_UC`mgw|vA(fVN-6c} Y2^3#d9}A)|EdT%j07*qoM6N<$f@vCbIsgCw diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore1.png deleted file mode 100644 index b90f34917090351ceedf67be0ca3a036d12b34e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmV+y0qFjTP)Px#(Md!>R9J=W)4dJ>Q4ogV*Uudg*}?^|Rw64B5)=wVt3&0&lsXqcDNz!|hF*lV zIa?@Dt_F#64^hZG{mgeJGY5naLi~efYZ&O(M!pejm=^BFVKyCw?ic+e+%PQ~gC4zp zN4Jgs17_1v#N9ZYb}sAf9>cV>RuR_;e+K314SeO{D-Qsr&Y^q7!WP)YZcu7>$k!@V z%NY*GGq>vnXTD&yoc!hneC1KdrdePx#zDYzuR9J=W(z^};K@`UEzpT(uxjYDOu*Gho)vc}eNo?mSG!h+JL?qNMmC$UX zaS1AyLSj@l+8KrB{QC2qZ!!mj5JHF_Ic}gFH&B0D-k)t$qct)vkuY5hVEY~bhwUDK z)pX2o(A3J*F5tL+ZJr?thcAlj>5Jk)Ivc1)_g&dFj4X;+=`h1Z{ zrLmrw`fj%lb@GzB1%S^>6+qi0;ET}>d@Gf!@$s2_fe=Cn@po@%7(W94Vz_1i0000< KMNUMnLSTYmzip5J diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_iron.rsi/ore3.png deleted file mode 100644 index 5116db395c087f5742a7a92bd24ead411d7aa06f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmV+s0q*{ZP)Px#%Sl8*R9J=W(!UCUQ5eVZul&nIktC&TUXotB!N3LBWO4}xv&C(=1I%ocktDH8 zAr=GgLdQZeab%#L&-gp%JkN7Z2ZRtph<}qWR8+oDQSaujICPtbj3kDc0#Lnf({|6R zjT)21>M8&F004%WA{~!Fxdfm964@M+#ftfO%6@;)s%O{P?DfU!HkX@=(?dEQ!4r;R zofX#U$Zox5HW)GLLqx#M zx`1uA{?6(?PZ`#UuTtnM(3u=}pF!hw#+;6CqAJUcD`zG0v^~jmW4cl25P0WG;{HDt zEny8uYg~6(_>s{TIE?J@s|#*1zmd9E$&*@d>PR U6jk+^3GzFGr>mdKI;Vst0Fo$gegFUf diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json deleted file mode 100644 index 112f49c67d..0000000000 --- a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/meta.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "All rights reserved for the CrystallPunk14 project only", - "copyright": "Created by TheShuEd (Github) for CrystallPunk14", - "states": [ - { - "name": "ore1" - }, - { - "name": "ore2" - }, - { - "name": "ore3" - }, - { - "name": "ore4" - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore1.png deleted file mode 100644 index c6d14dcfdf0b92d8d3718085c97df35e6989f809..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 305 zcmV-10nYx3P)Px#>q$gGR9J=W(miU!KoExE*CE%~Zdj-HAEYqk1`_IQt8<-J$z9yZ$teN`7lHis z%CemfvMG#2oF<--G+`bPLL!|qX&+dI>I+_o(-21Gnrku#c(8Hz*1QI*!J%)yjPV_9Tb8I00000NkvXXu0mjf DK#z&l diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore2.png deleted file mode 100644 index ed988b27a0aaec7033cc9877acba5c8ccfdc2773..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}>pfi@Ln2z= zUfj!j$Uva&q4*K0cREH4EhRG*1Fa6kx-H_4HCy<2J^Sgqyh*D9E?P`m@lI3s_WkA7 z0bZI*jV!MppY#3noeyX8W``zC6}ID1clsca%%F6@VxD-troqNCUWdzDJ2)JCG!3&^ z&wbtaGK#_J1B1x54|{AYD(8O*|HN`?RiE$mpa^Gx2lWJ@cLslUwGY=ATP!m2HR%WeVPmQtOh!r!PC{xWt~$(696gQU>pDd diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore3.png deleted file mode 100644 index fe9e1cc29e77c3aad159657e8ac8b8ea7ed24a54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 263 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}2R&UJLn2y} z6C_v{Cy4Yk1sZU%Nf=C8rD$gM)V^nL#YdS*Ul%ir6`7o!XWRPl+}vm$Ao#CY$`Q%8 zqxiX4b61y?b7iI6;j`BLk`fXU|0ciYNDDIEQ2fc{!v{_Sjt|9#D^{#9G%);=_~YYm z{lmA*=S$7At-ax~s#2x>z{|<)5Bj?3+!2GGR~Q49>gTe~ HDWM4f9AaiH diff --git a/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png b/Resources/Textures/_CP14/Objects/Ores/ore_silver.rsi/ore4.png deleted file mode 100644 index 0ec07b2c7db1b2d36e99cfe1072c3fb6103ad8c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 zcmV+p0rCEcP)Px#$Vo&&R9J=WlRat!K@3KpL$0At>>j{B0T+Ql4v^q(f4Uqions%woyi5f!*n{x zrpYXJIl~%U=#_%e`;bQ9IF92uGtl>6W9i$cIpoXDsyM`RsT5$p|6TyRzikl_fHBqX z5+I3}o7E)z*nOf}<+LdakVY*c)GDY})GEc|>;V6xz1g#BMT~(M14A?}A>1!O3ULWx zY`X?CV~9qr!VnEJ%a#LVeVD}h<#hyTyJo5#evbT}Pucy7uHZ^keE*K)IL^cH2ca`U UAg@!l)&Kwi07*qoM6N<$f~lx-VgLXD diff --git a/Resources/Textures/_CP14/Objects/Tools/hoe.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/icon.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Tools/hoe.rsi/icon.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/icon.png diff --git a/Resources/Textures/_CP14/Objects/Tools/hoe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Tools/hoe.rsi/inhand-left.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-left.png diff --git a/Resources/Textures/_CP14/Objects/Tools/hoe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_CP14/Objects/Tools/hoe.rsi/inhand-right.png rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/inhand-right.png diff --git a/Resources/Textures/_CP14/Objects/Tools/hoe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Objects/Tools/hoe.rsi/meta.json rename to Resources/Textures/_CP14/Objects/Weapons/Melee/Hoe/hoe.rsi/meta.json diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..51246cba69df5c7bf5a3663876d2003d7b267f72 GIT binary patch literal 284 zcmV+%0ptFOP)Px#)=5M`R9J;$U>F6XU=)mkQ7{UK0C5He|Kkh{{u5F+Ve&$PYR~}_u?l7RIT_|h zIQ-w6?T^zEH8m}g9l=P7Vpu3RY6vjM3G*{JPu+;2f7{N}|GnHzi8hxc2N2_s3m0zw zfA;bd1F?=^A;$rWE?j^bZt!20|0l!z2#5d34!L#f8qsEvop91T~E$4UiJ| i!^`qfFbYP&kOly+x>4adV_KE~0000IqP)Px%4@pEpRCt{2+CNAeaTEveuSJk7-XItZq?2R_4z~zqXcO9@&?Vp?nIeu71ozDD zfl#`%4e3-m6uJa5#I`ypWVs=TijzVlf?%?U({l=9$)ARMFUisGXH3YuAMbweE_d$% zL_|bHL_|bnE$h0HbzK?u*|@yW2vR7Phc3RBOG_z}lBg5v`F+$0p_EBUEtei^B4+#s zC=|;Qi^cK&-D=NRwOm>*Z`-)Ie!x}x9$!7L?=iEkD^Vwe<)t~iTyXIA!%yGqGgqnB z2cEHfGBNV@&bqGTlZlCx#7HXDx_I8%vxRoIy5?~#OJmm0kI&Cf5DBjVc-rdwjT>CG z?^PDp_3QKwQRhK5W|yx706??VK`E1x{l*OdVDHb7dfg7XZcNnr#ucdt#51xb_b|o5{QV1h=_>(cYHF$zjceIfl6zv zpCIf6vjoIqalC%DW)(gdD%HA7dnuUhfP69`k?_1#cr_*o$R`uByflYqt78#)H#hC=Ni=ZXW jBp?`%+UA%9BJ%4IYxM!dW!|Cs00000NkvXXu0mjfq-z$F literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Pickaxe/pickaxe.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..13b955f535cda7e94b2309db421ccaf83c716dee GIT binary patch literal 593 zcmV-X0Px%3rR#lRCt{2+P_NzQ5*p9?@1so-Vh`THi<(t+?Yct^#=$J;$%3A1ntgEErLX& z=oAh@i{PMT4GJ!A5Xr+SK~V^@C7fQ#TA9d6@^;84>K$tt4(|0l^u|ag=jSu)(u1^n-?xv)l`_~Vj=349doZsvrpoR zLcOvBd~Q4J@5*p?b3gaKrd(-JRqep##re|rc~VV<>Fe7Bdc!I7C!bItM1Rk5MWN|n z;McQUuC#>6f^;yjd3i4@4MMt<#~^5_zUum&RTe$Gyn|PsLM|4fv!$V`optxgOszeJ z{^WDz^?#~itt@z#=o}1xm$R z2>|%I5-boRUDX>>Z#acodknc)h_dV!mx{L%*Ueaw=LHP85W;x@f#(Gb$pD-e5U}Px%QAtEWRCt{2+P`btP!I?3Z%QF#v4;*Ofn*9AJZUM|gJVI5LKj1aqRFLWF@=)V z|AfJmE=h$mg${u%1`ke3vIM+n2q7_<5^!)J5PJ!pu0wHu%GP_5POhB$EMD|}o$jG$ zod6+(5JCtcSiFAoo@UYZzf!9=v=q>-l1Z^#8`e{fPTQ3d0l?MW0GBr-tS>L3*B>gk@AZdp zY>VFQep}#}-|s>Pz-zGwr?&ur>%qg%-_1-4TiYkT{T&^jz$)ahdww5wYD%;Mpt{%{ z*Zt?tZ30^R+N%!^T7y)Jc>;bd7EqsPv(=$jFP}$#Z6Y*V9nw7q#Q7v(7vx~`sE@%> zv=u@KA%qY@2qAe*j5O{y02Px%V@X6oRCt{2nm>rzP#njD)3EosX6uJa5*rPg}kR?MY_PFT;4+{l#kxZ|{@odi|8ZW*WKQ)DG)*3dSZa@HH+L{8(w$FApn zR|WvUscpN2RTPB*+h@wDZKqBE-*L?qtYKR0<%=hQL~v68AS>+w0N#E-kCg$yYMM|g zR}(c87^cNmUfU#TF|^am;Us7v2!bF8f*=TjAP9mWc9taVQ?882y**cLFm8zM`Pdtf zv~vAQL{YAfeFlgw*9$SAqA2YDx?vc2x&F CrystallPunk migration zone end