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 8f7fd68ca7..a42841c0a8 100644 Binary files a/Resources/Textures/_CP14/Objects/Materials/copper_ore.rsi/ore2.png and b/Resources/Textures/_CP14/Objects/Materials/copper_ore.rsi/ore2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/copper_ore.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Materials/copper_ore.rsi/ore3.png index 6d47f0c704..07c5e9c97f 100644 Binary files a/Resources/Textures/_CP14/Objects/Materials/copper_ore.rsi/ore3.png and b/Resources/Textures/_CP14/Objects/Materials/copper_ore.rsi/ore3.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore2.png index c71d3cb5f2..e32e65a5f8 100644 Binary files a/Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore2.png and b/Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore3.png index 3777c0eb25..ff3dc0a62b 100644 Binary files a/Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore3.png and b/Resources/Textures/_CP14/Objects/Materials/gold_ore.rsi/ore3.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/iron_ore.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/iron_ore.rsi/ore2.png index e46f90f02b..044f5b382e 100644 Binary files a/Resources/Textures/_CP14/Objects/Materials/iron_ore.rsi/ore2.png and b/Resources/Textures/_CP14/Objects/Materials/iron_ore.rsi/ore2.png differ 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 98e9eb4d0b..86d1624bd3 100644 Binary files a/Resources/Textures/_CP14/Objects/Materials/iron_ore.rsi/ore3.png and b/Resources/Textures/_CP14/Objects/Materials/iron_ore.rsi/ore3.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/mithril_ore.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/mithril_ore.rsi/ore2.png index b73e1eb4a7..bf6513d681 100644 Binary files a/Resources/Textures/_CP14/Objects/Materials/mithril_ore.rsi/ore2.png and b/Resources/Textures/_CP14/Objects/Materials/mithril_ore.rsi/ore2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/mithril_ore.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Materials/mithril_ore.rsi/ore3.png index 0b1a00aea5..10eacc81ca 100644 Binary files a/Resources/Textures/_CP14/Objects/Materials/mithril_ore.rsi/ore3.png and b/Resources/Textures/_CP14/Objects/Materials/mithril_ore.rsi/ore3.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 7990532420..6d2d5fedfc 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -1,9 +1,5 @@ # <---> 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