From 8c42cdbbdf1a0fdc3d889e4ae04be6884fc7e120 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:48:42 +0300 Subject: [PATCH] Stackable ore (#820) * ore stacks * Update ores.yml --- .../Locale/en-US/_CP14/stack/materials.ftl | 5 + .../Locale/ru-RU/_CP14/stack/materials.ftl | 5 + .../_CP14/Entities/Objects/Materials/ores.yml | 159 ++++++++++++--- .../Entities/Structures/Walls/natural.yml | 183 +----------------- .../Entities/Structures/Walls/ore_veins.yml | 144 ++++++++++++++ .../_CP14/Recipes/Workbench/furnace.yml | 8 +- Resources/Prototypes/_CP14/Stacks/ores.yml | 27 +++ .../Objects/Materials/copper_ore.rsi/ore2.png | Bin 442 -> 596 bytes .../Objects/Materials/copper_ore.rsi/ore3.png | Bin 440 -> 762 bytes .../Objects/Materials/gold_ore.rsi/ore2.png | Bin 389 -> 657 bytes .../Objects/Materials/gold_ore.rsi/ore3.png | Bin 398 -> 803 bytes .../Objects/Materials/iron_ore.rsi/ore2.png | Bin 432 -> 644 bytes .../Objects/Materials/iron_ore.rsi/ore3.png | Bin 446 -> 852 bytes .../Materials/mithril_ore.rsi/ore2.png | Bin 744 -> 982 bytes .../Materials/mithril_ore.rsi/ore3.png | Bin 374 -> 778 bytes Resources/migration.yml | 10 +- 16 files changed, 325 insertions(+), 216 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml create mode 100644 Resources/Prototypes/_CP14/Stacks/ores.yml diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index a8e209c672..b2cc65dd07 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -10,6 +10,11 @@ cp14-stack-iron-bars = iron bars cp14-stack-gold-bars = gold bars cp14-stack-mithril-bars = mithril bars +cp14-stack-copper-ore = copper ore +cp14-stack-iron-ore = iron ore +cp14-stack-gold-ore = gold ore +cp14-stack-mithril-ore = mithril ore + cp14-stack-wallpaper = rolls of wallpaper cp14-stack-glass-sheet = glass diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index 4cfdc0be53..460438ea48 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -10,6 +10,11 @@ cp14-stack-iron-bars = железные слитки cp14-stack-gold-bars = золотые слитки cp14-stack-mithril-bars = мифриловые слитки +cp14-stack-copper-ore = медная руда +cp14-stack-iron-ore = железная руда +cp14-stack-gold-ore = золотая руда +cp14-stack-mithril-ore = мифриловая руда + cp14-stack-wallpaper = рулон обоев cp14-stack-glass-sheet = стекло diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml index b8d6de53cd..7bc1a15854 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml @@ -1,62 +1,169 @@ - type: entity - id: CP14BaseOre + id: CP14OreCopper1 parent: BaseItem - abstract: true + name: copper ore + description: A piece of pale, heavy copper. categories: [ ForkFiltered ] components: - type: Item - size: Tiny - - type: RandomSprite - available: - - random: - ore1: "" - ore2: "" - ore3: "" - -- type: entity - id: CP14OreCopper - parent: CP14BaseOre - name: copper ore - description: A piece of pale, heavy copper. - components: + size: Normal - type: Sprite sprite: _CP14/Objects/Materials/copper_ore.rsi layers: - state: ore1 - map: ["random"] + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14OreCopper + count: 1 + baseLayer: base + layerStates: + - ore1 + - ore2 + - ore3 + - type: Material - type: entity - id: CP14OreIron - parent: CP14BaseOre + id: CP14OreCopper5 + parent: CP14OreCopper1 + suffix: 5 + components: + - type: Stack + count: 5 + +- type: entity + id: CP14OreCopper10 + parent: CP14OreCopper1 + suffix: 10 + components: + - type: Stack + count: 10 + + + +- type: entity + id: CP14OreIron1 + parent: BaseItem name: iron ore description: A piece of cold, heavy iron. + categories: [ ForkFiltered ] components: + - type: Item + size: Normal - type: Sprite sprite: _CP14/Objects/Materials/iron_ore.rsi layers: - state: ore1 - map: ["random"] + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14OreIron + count: 1 + baseLayer: base + layerStates: + - ore1 + - ore2 + - ore3 + - type: Material - type: entity - id: CP14OreGold - parent: CP14BaseOre + id: CP14OreIron5 + parent: CP14OreIron1 + suffix: 5 + components: + - type: Stack + count: 5 + +- type: entity + id: CP14OreIron10 + parent: CP14OreIron1 + suffix: 10 + components: + - type: Stack + count: 10 + + + +- type: entity + id: CP14OreGold1 + parent: BaseItem name: gold ore description: A piece of soft, pure gold. + categories: [ ForkFiltered ] components: + - type: Item + size: Normal - type: Sprite sprite: _CP14/Objects/Materials/gold_ore.rsi layers: - state: ore1 - map: ["random"] + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14OreGold + count: 1 + baseLayer: base + layerStates: + - ore1 + - ore2 + - ore3 + - type: Material - type: entity - id: CP14OreMithril - parent: CP14BaseOre + id: CP14OreGold5 + parent: CP14OreGold1 + suffix: 5 + components: + - type: Stack + count: 5 + +- type: entity + id: CP14OreGold10 + parent: CP14OreGold1 + suffix: 10 + components: + - type: Stack + count: 10 + + + +- type: entity + id: CP14OreMithril1 + parent: BaseItem name: mithril ore description: A piece of enchanted, pure mithril. + categories: [ ForkFiltered ] components: + - type: Item + size: Normal - type: Sprite sprite: _CP14/Objects/Materials/mithril_ore.rsi layers: - state: ore1 - map: ["random"] + map: ["base"] + - type: Appearance + - type: Stack + stackType: CP14OreMithril + count: 1 + baseLayer: base + layerStates: + - ore1 + - ore2 + - ore3 + - type: Material + +- type: entity + id: CP14OreMithril5 + parent: CP14OreMithril1 + suffix: 5 + components: + - type: Stack + count: 5 + +- type: entity + id: CP14OreMithril10 + parent: CP14OreMithril1 + suffix: 10 + components: + - type: Stack + count: 10 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml index 0c5073041b..6d6c560cba 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -140,185 +140,4 @@ min: 2 max: 3 - !type:DoActsBehavior - acts: ["Destruction"] - -- type: entity - id: CP14WallStoneCopperOre - suffix: copper ore - parent: CP14WallStone - description: A solid stone natural wall. You can see the sharp flecks of copper in it. - components: - - type: Sprite - sprite: _CP14/Structures/Walls/Natural/cave_stone_copper.rsi - - type: Icon - sprite: _CP14/Structures/Walls/Natural/cave_stone_copper.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 250 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreCopper: - min: 1 - max: 3 - - !type:DoActsBehavior - acts: ["Destruction"] - -- type: entity - id: CP14WallStoneIronOre - suffix: iron ore - parent: CP14WallStone - description: A solid stone natural wall. You can see the sharp flecks of iron in it. - components: - - type: Sprite - sprite: _CP14/Structures/Walls/Natural/cave_stone_iron.rsi - - type: Icon - sprite: _CP14/Structures/Walls/Natural/cave_stone_iron.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreIron: - min: 1 - max: 3 - - !type:DoActsBehavior - acts: ["Destruction"] - -- type: entity - id: CP14WallStoneGoldOre - suffix: gold ore - parent: CP14WallStone - description: A solid stone natural wall. You see the tantalizing particles of gold in it. - components: - - type: Sprite - sprite: _CP14/Structures/Walls/Natural/cave_stone_gold.rsi - - type: Icon - sprite: _CP14/Structures/Walls/Natural/cave_stone_gold.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreGold: - min: 1 - max: 3 - - !type:DoActsBehavior - acts: ["Destruction"] - - type: IconSmooth - base: wall - -- type: entity - id: CP14WallStoneMithrilOre - suffix: mithril ore - parent: CP14WallStone - description: A solid stone natural wall. You see the tantalizing particles of mithril in it. - components: - - type: Sprite - sprite: _CP14/Structures/Walls/Natural/cave_stone_mithril.rsi - - type: Icon - sprite: _CP14/Structures/Walls/Natural/cave_stone_mithril.rsi - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 300 - behaviors: - - !type:DoActsBehavior - acts: ["Destruction"] - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:PlaySoundBehavior - sound: - path: /Audio/Effects/break_stone.ogg - params: - volume: -6 - - !type:SpawnEntitiesBehavior - spawn: - CP14OreMithril: - min: 1 - max: 3 - - !type:DoActsBehavior - acts: ["Destruction"] - - type: IconSmooth - base: wall - - -# We dont have silver now - -#- 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 + acts: ["Destruction"] \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml new file mode 100644 index 0000000000..d98295ec78 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml @@ -0,0 +1,144 @@ + +- type: entity + id: CP14WallStoneCopperOre + suffix: copper ore + parent: CP14WallStone + description: A solid stone natural wall. You can see the sharp flecks of copper in it. + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/cave_stone_copper.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cave_stone_copper.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 250 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14OreCopper1: + min: 1 + max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] + +- type: entity + id: CP14WallStoneIronOre + suffix: iron ore + parent: CP14WallStone + description: A solid stone natural wall. You can see the sharp flecks of iron in it. + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/cave_stone_iron.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cave_stone_iron.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14OreIron1: + min: 1 + max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] + +- type: entity + id: CP14WallStoneGoldOre + suffix: gold ore + parent: CP14WallStone + description: A solid stone natural wall. You see the tantalizing particles of gold in it. + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/cave_stone_gold.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cave_stone_gold.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14OreGold1: + min: 1 + max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: IconSmooth + base: wall + +- type: entity + id: CP14WallStoneMithrilOre + suffix: mithril ore + parent: CP14WallStone + description: A solid stone natural wall. You see the tantalizing particles of mithril in it. + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/cave_stone_mithril.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cave_stone_mithril.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14OreMithril1: + min: 1 + max: 3 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: IconSmooth + base: wall \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml index 79680065e4..87302492e1 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml +++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml @@ -2,7 +2,7 @@ id: CP14CopperBar1 tag: CP14RecipeMeltingFurnace craftTime: 4 - entities: + stacks: CP14OreCopper: 4 result: CP14CopperBar1 knowledgeRequired: MetallMelting @@ -11,7 +11,7 @@ id: CP14IronBar1 tag: CP14RecipeMeltingFurnace craftTime: 4 - entities: + stacks: CP14OreIron: 4 result: CP14IronBar1 knowledgeRequired: MetallMelting @@ -20,7 +20,7 @@ id: CP14GoldBar1 tag: CP14RecipeMeltingFurnace craftTime: 4 - entities: + stacks: CP14OreGold: 4 result: CP14GoldBar1 knowledgeRequired: MetallMelting @@ -29,7 +29,7 @@ id: CP14MithrilBar1 tag: CP14RecipeMeltingFurnace craftTime: 4 - entities: + stacks: CP14OreMithril: 4 result: CP14MithrilBar1 knowledgeRequired: MetallMelting diff --git a/Resources/Prototypes/_CP14/Stacks/ores.yml b/Resources/Prototypes/_CP14/Stacks/ores.yml new file mode 100644 index 0000000000..ca06939177 --- /dev/null +++ b/Resources/Prototypes/_CP14/Stacks/ores.yml @@ -0,0 +1,27 @@ +- type: stack + id: CP14OreCopper + name: cp14-stack-copper-ore + spawn: CP14OreCopper1 + icon: { sprite: _CP14/Objects/Materials/copper_ore.rsi, state: ore3 } + maxCount: 10 + +- type: stack + id: CP14OreIron + name: cp14-stack-iron-ore + spawn: CP14OreIron1 + icon: { sprite: _CP14/Objects/Materials/iron_ore.rsi, state: ore3 } + maxCount: 10 + +- type: stack + id: CP14OreGold + name: cp14-stack-gold-ore + spawn: CP14OreGold1 + icon: { sprite: _CP14/Objects/Materials/gold_ore.rsi, state: ore3 } + maxCount: 10 + +- type: stack + id: CP14OreMithril + name: cp14-stack-mithril-ore + spawn: CP14OreMithril1 + icon: { sprite: _CP14/Objects/Materials/mithril_ore.rsi, state: ore3 } + maxCount: 10 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Materials/copper_ore.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/copper_ore.rsi/ore2.png index 8f7fd68ca7fa68dac9c0bf80200d157ff148ed5a..a42841c0a8a0f80271ba107b4b8bee25772d5f44 100644 GIT binary patch delta 559 zcmV+~0?_@s1JneNFnL^!P6JT)XUGTUNp}_jxO6^4D4l^+i4p?I+x-kHX=e}^~B}m~>bggAa8-RU- z#6tm%+ZQW5X~+bF!QBO04T{MsW5EuO)>6brf~e{yD}T+p?UU_01*N$KUwL&K^{d3p z^b`qM1|T8JguX3NOje1+bmGG*d3l3SK(niBG0>?QI3WZx(^IT(e5PDk=I-HFL}EJ6 zYH2I!&_8gl4E$-rL{Suk5GaZQz>vP_SR8EL1vk$GxG?gTdrK!RQS+&5E#7}vaW&3h x^G`Ti)hGeDmeQ;p?}fM{_TuXG@bK{H#ZP(gyw!FJlOzBD002ovPDHLkV1nyP2(kbG delta 404 zcmV;F0c-x$1iAx|FnG)5aFU#NQjB3rH~bbp)EAJ8|$`+D}6yTR(n5qCtkPSVhgvC$_Q-pqyK{Dqj-^D{L=7{A3+>tIV=g=kK+zsy z#gQb`N&&FA5W(eWkch|3L_8+kC&FrH=Ax#q>i}&L0E2-60QU9|SnEII%IM*ysgb^X zBvZKf_IzOh<9}mQrqk_Z-q)n^H1eg*{dKNA7YPm$ufXE8+KbJ|@$B?rH0n6r-u7Nr zFz8!^d!SU#Yeu6E&5|Kv^JZ zLP&@thD0{qxOAmU{}1EJjT;v%G{N|Y!5T3pDyD&IfZ~HkOMpzrqy=WdV_c99ebUmd zO!_V7o_l`hoO|v)17*sT`Cl37?^Q?od(~3?R1_=jwMQ`OV}FzyL{-6}qjxl+P~ZbD za}7P#I1j&Um!gj@pFy8@SQSM}&UHzOBJM{CMb?;}TgdA#og*udEbi6&`Lt2X)`^QL zHsXF1pCia;a|_^9&CO>?>=}FdIB!5l8uWRGRgb$1fR#ujWv$t6XC>grsE^TOjbp2p zd9ryc!-phA@qfR4o>S+@06IO_RZ$cH@VL8ZvNsZrtkPs}1YrE-Yvh$503TsN_hKkXjSs+{VXdr%vW`D^-?!8 zZyvF=V*1e%SJ)PZPBLslY z5#-)G8-Ieyf)b1J^Ve)noyy~g8}%{nUYX`a$d18a$Po8Af>;f^JX>zZR%bw#*O^_I zKQhUJXTjLSq%N?yjl3o>G&n%B-3}bQ2gbis_#8pZ4GOkunZ%qZgkv2+`>8XkV6q^J zB13}%gd?j2rf0a{`W|zG!mBx#*6EPha3u$j9#2F9Ns6GviK{Nkjwnx~2I+=Ugdiv!LL3@` z7Ki5ki~f)Hw$`GEKq6>ph(fF(DGh=%Do!EIZix6A!b=OW6NiTH8Nd78`}}ynJCH~u z5=j?GCE_BLh>K3%^>#y^)Qj}{Ds)n!rz7dwx+A*DoG|SlV1Hq>%I4Xd>scN*;icrN z(6o`3&n>IOaeBwq%s+=4D>1 z+cA_O5KQx!aaS{#?MaEHc?k0AkUIBMj;R0QL?Jo$PLY zkoh46v+5x>*?$LwMXM5RSM>AC&Xon4rU9@xbcb2>aQ`vYR20B#KRIU|Zy;)f#kBv0 z3FVdX-ZK6%oART=#`z4IraAJuw2oaVkuS8CHqtf}HNxU+jSy4?X4S*Rllm)XS4sfn w3)kKM3!+B2=^AS9--~lAlt?5J$-mkx?eux(?FbpqO{azY+1a0 zHXiPd7=}1w)Ho6ItCKffc&3AtmU6_?TLgv%>G5`RpcE-63eV~x*ag|^Z35`Y&yvn ze~u?#`kTi0Jf)WY`^gU{dKn(U^IunxF1it-%;CrPIGk>R)jU&?E&!I(-@w^0e|o#h z@Z1=i3mX8)&Q8Fuo&=!_pxy6vS0n9>)L%xD+~kDBqkp*zY%XlzbJ_B#Q;+YOI`JmRUg|CgUx|T!;LDXL0arU#Re~NC?e5hB|=DhfGoE~pC0IO?B zpfPhmH)ZXn0RXNBMpdBY>S^Xtdx2CCkrVnGRAr9{^~E&5TSxM)RRw)kw-MS+ZnFPrm_X^WV$%>U}Q&00008YX{D4D{a0?%HFAEOOsu8VPg@|AXf`TVIQ8V-GQ9~8 wK{L)cFay9^JdrU0Lkcu`{rY*!vc$vL zG9s(HDQjo-g&_sB?lripD(PPUEFgp+=yRzKDHp|QB8V$3U!1By(C1Pc<8Sr*`q~;o z3yVOqxCX^(!hdebV=bPbt*cvY>*_Y7#)(XWK9|~l-HNT#!-HTEB}y@)W8*2s1GXq5 zI~7M%(jY{P*OM>)TIWOpy>+E(LwNy;)5P7E7Gzo0*Y00fW-YeOmn&U_BaxK%?wDp# zoF*Qx)SODDTL#jTEmeg{F_KWyr0ENoe_>NZ0|8Wf{+A z2!Mw20{Xv|>xBchXv$uP6JjWa2icE!{i<9hAw-O=&mYORNO(3wba)E^7@qv0$Mf0E zO{#mEnSa|GTy{$y9Ez#oNvI8(DXX;CwFF#7mL=we%#)sr%ni)ou$q~OCKD1_-NimM zuMe$vvG~~(I2cEIUNL38c7Q~3Fu`{&ZGT`mUd+~J(sa|yznEVBiNk6Jj>-=PJrMM{ z)cWdt?3O%iogUgB?SBL6Yik%C8%GF1i#fcP9C+g}{BUnwsj8jx;BP-AN-@BZ!Spw` zXG{S0({M0)TJaWhn2CfvZ32e>2VlQDty>`kgWe6^G|$rEEu_U9PG`IH31}piLen`~ x*S1a%i6S?EZnkug(eD%_y>XJuv&iDV#~*o9DISs2k?H^d002ovPDHLkV1kRLa|Qqa delta 359 zcmV-t0hs=y295)eFn<9^Nkl3rMk7wrVPr|%MrE^t@|0wAT- zZKs!j=Q=9UyzH&x%S)8Xw}6>AXe8jdj@nue65d|q$s1=fGQsIt{)_ldxIuPM2CB_A z*X36ttpev40bqm>y}kX}7gnQVKoD@W#<6b$2gPR}Oe-D%0!S$lLLj9ivf`)KdZS+H zXitOI$1xvU`|*`;jMP3E9guq2IHq%k3J=X{&F%(>kEKWEOl112UWCMGoy3`N9=Qx`=oXMfb!A|8u%qpFhtVt)P` zlC%kcXHOnjDm|yJTJg5FGXS{VUaZz-Lmc4b>8RM(daR<#RP6Lm^wR5@@7cYV+{_FB=g(b0RVPV~j<74Vle+o_dV3!Olr&PY0llQZ zmRi&D0Qh%oH-FwW%XR<;;)7hh(y8|dBk$hx^6C8|y|M;^p@;z3ra0D&XEQkfY#TQe z#Tpwo8|$^i%NhuVB4W!{g^p-DU0t0;CNwS2?OQjwexrx!uNfBdIT~y~E0j(p$|hKH z3iL7Sh_+*IvJs1Qv%0z-hb#l&kYx@ZI>_u?!4SW5?|%_Xg&&_qf0n~qDqxqDYs15D z$$pte06wpR%kAYw-*Z}AE}CUK1Mxxn`}?q3*U{n)5D55DTrDgvu8>T;uBg9CUPOA= zF0X{e)Kr>R{e5Vfh9pU(#wSRPPoQZUONBh?Ou_;YVQ;dbsud+(-hfUzm9RJ!kI(=~ zk_;0^k60YX?e?OolU%-Z7J%8gLdkBg8K>eAK7UyF{9(~^_o0Xnjfwcsm~bi{aSlX(Jel8qKWfY$f61Qpx~ORSl=Jmq>URC4aR{CWDd79y@+bU}AFK zaJyaR__P0tqWA$wCKG^|gpj3`U?^(z4|u=LjgCaPy1p<^0^sOyQ)q8tfyUh?lL_A6 zbZ)Y@jE+Q56hC|WTL5@H9!^frDCRGP_Z13^#nVP4JPd%M_*q?BVP<*?fXAn2GcJEu z06<;R%0*#&lXx6$hwm1?QI0#*V;W2TH=*XZhY;qwJ3my70{ zs6dAu0llu7?fS+6dR?=X9Bh_hrCM@W-^E~XoI>ursl*Lzoq(0To^BrQtG1Fu3qRpk oog0nM=g+WKheRTg{7XInF?oXaeg2NZ00000NkvXXt^-0~f=Cj#)Bpeg diff --git a/Resources/Textures/_CP14/Objects/Materials/iron_ore.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Materials/iron_ore.rsi/ore3.png index 98e9eb4d0b737070a32a2ecfea190a653dbc1cfa..86d1624bd36b6d5030332c64645c5ef0e17ab07b 100644 GIT binary patch delta 817 zcmV-11J3-u1JnkPFn&uqOuI^3lcV!k;Kr!g0qe(OG7wA96^xC+l8Hz z^JAOZ<^DJ4<$WIB|Ns3z&-)z6AcG8+fP;tY#KFULVku`VTYn09ZB4blUhFx`7m|GF zNR3W3peV?4nA)0Z8XFrH%THE1N!u&;3rSitZ(LPlbbff5)>$)=vINt~PaHqV3vF9QVLL2m49GgKLE~+8+5{avk8FKCofpL&H})_`**R~?D+hFzk42$O2oXunN~(3 zAtXrxVBg*Y`1}Ee1{J*CCS*B`&mUlH><3!829#)84$PV0a(hHo)lqCVI{>C!BO{}6 z&R;l#BuV7tb=BFkaAdwgtmZ(`Z|#{rzJq^1#RTc6rrjyu3x*#=vvxJI~vmQDn7}Z#MC|<1Ov&ZGRXHD=4y;P*UQ=VlCq5&k4G_-Yjhr zYF+z#qD(|0Azrn&p{gp9BoXZEC)n4Is;c~o#|SB1S>O?-TqCla^5W?U&=3lCWffYA zg$hWLq>I?M_W(AV9a#=@`qVK1Mn>avcKd%pp`} v>nihNp?||gtJI$6cr2<9r3^C2U@`auw+liOFSXu600000NkvXXu0mjf%Y%U{ delta 408 zcmV;J0cZZy2EGH3FnF2;ySYkYgW0 zL5NV^a0Wy1Q9g^x=0XFLP2Ir9}?V)>{O7ON~YdC(A3F((4Oa{u8!F(4}br?Co#i za8#eWH5bn>uUuW<5Q&5t4)_@g_+>nPz~#kh-L6;;pzAtU*EawR4)mLbZp{V2(ea6? z-Pzs7uW1BnKVKO0LI5ANhDL`^SP>^04>d}=Gk{0_%?vo z7nG4m7>}n909QvFuWtob*Om}M(B9rjKA$s9%M=R+57|3QpYcbL*B6wZZG@qKpF}c6 zCX=qw6$=J{Wn;?$${{NE@5Yn4wri+RC=`l+#|JpqfDu}Z*8epC0000GsVT7K+G~U<09Un z(@Zp}x|?Tp=iHC?opaB*;Njun;qjkQqA5#>rmTMRBmYV$HMf6YX<85=Op5u8Pl~ta zXSzmmSnX=jcXD4(U|9UOpIHD)0n?5NVIs|pyt+$%t%kqWqVwTpkDh;6F)1j&7am?< zb~VoXA3=Margg`O>9`#`v%BSf<}l)&h)O4-a@@pvwt-r2GP@dgtiN_ONojkB@AuxK zJ_6cfpGQESr1wol6r!2rj=^p_pv| zP{|egO1K)3#nlRrq1Ky}Ugt?n#|i5p>c$}lhQYGA2f%-MUAMDPE^Ydz5;v_%OJO`b z#$vi#BS*0$REw?#dfVbxu}P*reRQPuPI}%R*NsC;+dKB(A5XIqO<6~=B!FxC^)(<( z$hMhK+W-y|#n=^6yPs|0FQMy>{l60&$iQ);mnN;zfV23d86gDa8@HHy5Fx)-1G-(3 zd9y#Ti9bEIVfEWrpELq68VDkUaI8`5O?y0yIQ+#^EDi1Z#sL`QzCAoVJlyyRl4#gR TFvA~a00000NkvXXu0mjfPyrBT delta 341 zcmV-b0jmDi2j~T`odJIU32;bRa{vGf5&!@T5&_cPe*6Fc0U$|4K~z}7V_+BsqhJ(_ zf>AIEs0dh99RGtbDSBAQvB=Ri;J=87FvFWSZyEOQ-oOa6{I`b_#34Hv{{OzSpOF}| z7)i01$-4~fyI{Vza50c0V2)ww4Pn?l>plb1{m%^lwssL^HWPm-mIq|ZGdQ>FF|7S0 z3>ODk4g!YydT=r3o2QBQ6e%IFZreKs-X|Zyjz9*MW~L11FJ5AJ5kCVM{QDS)4StfN z06CtEIDRw8NK1j)o44(NM#md4efj(m+Bg6NbPa9(LxNreMI2=LjnAwM8oa+rasU&l z4uBaB^DT%LEObp}xNPmt016$DBS=cv(4U$3_)H(V7b5QrX-ogNUZ`0 nW-+nZZxoDzQ7{Td0So{DWHxK`YEPx%#7RU!R9J=WmeEU7Q5?rVo6Z!vO6`KO zO>DHBJ~)$@pan5yB#vNM2K@uR7!f`A97G5~^wf)wJ@gWZAjx8|Vaz9yVWK%%Ow$R~ znPGctxZA_J*UfEqw_XbNeH!QNobTs;&+m8cg_>&mpJnt-DSt-al=4@5RI|wA^(#i- zl#;be3{SiG8;FVlJYK&d%Vq$)6LzG%!)m<&sIPQ^YJUCa7Qq<_08?z4Y?S~NCE)S; zwWwv;j3>5Ia;_3plz{s5s``3eu(|^F7K9Mh`0G!==$lgB{5S>}=ywxc{Qz*Pxyj*C zOb$=kbPRgU{eP1kq-`zqyxhWOwJ^UBC@`008CfkKOOYe|nS({sI=mg+ab4nW%BBjC9Kf6tECV?@LCj0hjk)N(3$i%}2Qy_#fk!Ia8 zs6F*!Lnr>p4u+>)sTs zk>zr$5$jk7jgjr+zxTUYj4bi>)qB2gd@dP3RB;cCjh<)zeuyr&lP*%s1(um*2sq%O z)r!q(0nlm$pi9cIR%Sn4H2{S-;7JLQLI_b%8@X}8X4;ekh(@YN;ND}!m`L-WyOG^w zvS8}9`F{cc1ec!NCA@F|z-Ay+)}kape%ncVheV$T>Faf2vs&0o?z5Xr zGM?H7pxtWKQdo;d3_X3Hd_m0qcFR0z>(7p@o-6i;%r30ZO)CSpXG6ZJRDB15f}Fc5GhJ-UC7i)-8ht>rXS(1&}Yt#crjk zxv={or=+sIP1x1i30WnMP zN4U7>F9_}~j_!&emWo4{I!P&21Y2AL#~^4o3waJ95kWEUEh4;cz3-lT?%_T#7z~F0 zj^&5a@& zasaT0H^drR$_cn$kVP#-33u50ww4#=1k&wOnhOmW^q^WKiXv4xwFE3blqYYW23D4r z=nrlIw1$I10+t`jU~i6brO52@h{{Zv^H%%I@cZ&A^t(z13V9#e^RAq1Z2(ZezC;L- z)jG9BcDAPhI8{4*BEC4tt(!Z6$z!Krw@Hr7NwyY3B-_{EwDpo0Rs0RPodVRGYd>E3 u!`RM@s%R=b{>{W)zpJcgFc=JmKj#CTu3RwjHp<=r0000 CrystallEdge migration zone -# 2024-08-22 -CP14PloughedGround: CP14SeedbedWooden -CP14SeedbedDefault: CP14SeedbedWooden - # 2024-08-24 CP14DungeonEntrance: CP14LaddersDownStoneAutoLink CP14DungeonExit: CP14LaddersUpStoneAutoLink @@ -238,6 +234,12 @@ CP14CrystalDiamondsBig: CP14CrystalElementalLightBig CP14QuartzCrystal: null CP14QuartzShard: null +#2025-30-01 +CP14OreCopper: CP14OreCopper1 +CP14OreIron: CP14OreIron1 +CP14OreGold: CP14OreGold1 +CP14OreMithril: CP14OreMithril1 + # <---> CrystallEdge migration zone end