diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl index 129e461a60..9fc350bb50 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl @@ -1,6 +1,7 @@ cp14-modifier-iron-ore = iron ore cp14-modifier-copper-ore = copper ore cp14-modifier-mithril-ore = mithril ore +cp14-modifier-coal-ore = hard coal cp14-modifier-dayflin = dayflins cp14-modifier-fly-agaric = fly agaric cp14-modifier-blue-amanita = azure amanita diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index 93678d4941..cbf1977e65 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -9,6 +9,7 @@ cp14-material-iron = iron cp14-material-brass = brass cp14-material-gold = gold cp14-material-mithril = mithril +cp14-material-coal = hard coal cp14-material-lucens-planks = lucens planks cp14-material-flora = flora material cp14-material-ash = ash diff --git a/Resources/Locale/en-US/_CP14/stack/materials.ftl b/Resources/Locale/en-US/_CP14/stack/materials.ftl index 317dd61775..1edbb8659d 100644 --- a/Resources/Locale/en-US/_CP14/stack/materials.ftl +++ b/Resources/Locale/en-US/_CP14/stack/materials.ftl @@ -13,6 +13,7 @@ cp14-stack-brass-bars = brass bars cp14-stack-gold-bars = gold bars cp14-stack-mithril-bars = mithril bars +cp14-stack-coal-ore = hard coal cp14-stack-copper-ore = copper ore cp14-stack-iron-ore = iron ore cp14-stack-gold-ore = gold ore diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl index 532e6a1c76..45e1629648 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl @@ -1,6 +1,7 @@ cp14-modifier-iron-ore = железная руда cp14-modifier-copper-ore = медная руда cp14-modifier-mithril-ore = мифриловая руда +cp14-modifier-coal-ore = каменный уголь cp14-modifier-dayflin = днецветы cp14-modifier-fly-agaric = мухоморы cp14-modifier-blue-amanita = лазурная аманита diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index d5880829de..53b46f5efd 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -9,6 +9,7 @@ cp14-material-iron = железо cp14-material-brass = латунь cp14-material-gold = золото cp14-material-mithril = мифрил +cp14-material-coal = каменный уголь cp14-material-lucens-planks = люценсовые доски cp14-material-flora = растительный материал cp14-material-ash = пепел diff --git a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl index 021e81565b..67114fc5c8 100644 --- a/Resources/Locale/ru-RU/_CP14/stack/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/stack/materials.ftl @@ -13,6 +13,7 @@ cp14-stack-brass-bars = латунные слитки cp14-stack-gold-bars = золотые слитки cp14-stack-mithril-bars = мифриловые слитки +cp14-stack-coal-ore = каменный уголь cp14-stack-copper-ore = медная руда cp14-stack-iron-ore = железная руда cp14-stack-gold-ore = золотая руда diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml index e18a8c2b45..31644aed6a 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/ores.yml @@ -184,3 +184,58 @@ - type: Stack count: 10 +- type: entity + id: CP14OreCoal1 + parent: BaseItem + name: coal + description: This is coal! It burns very well! + categories: [ ForkFiltered ] + components: + - type: Item + size: Normal + - type: Sprite + sprite: _CP14/Objects/Materials/coal_ore.rsi + layers: + - state: ore1 + map: ["base"] + - type: Tag + tags: + - CP14FireplaceFuel + - type: Flammable + fireSpread: false + canResistFire: false + alwaysCombustible: true + canExtinguish: true + cP14FireplaceFuel: 30 + damage: + types: + Heat: 2 + - type: Appearance + - type: Stack + stackType: CP14OreCoal + count: 1 + baseLayer: base + layerStates: + - ore1 + - ore2 + - ore3 + - type: Material + - type: PhysicalComposition + materialComposition: + CP14OreCoal: 2 + +- type: entity + id: CP14OreCoal5 + parent: CP14OreCoal1 + suffix: 5 + components: + - type: Stack + count: 5 + +- type: entity + id: CP14OreCoal10 + parent: CP14OreCoal1 + suffix: 10 + components: + - type: Stack + count: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml index b667819b98..610e946aca 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/wood.yml @@ -29,7 +29,7 @@ canResistFire: false alwaysCombustible: true canExtinguish: true - cP14FireplaceFuel: 30 + cP14FireplaceFuel: 10 damage: types: Heat: 1 @@ -79,7 +79,7 @@ canResistFire: false alwaysCombustible: true canExtinguish: true - cP14FireplaceFuel: 12 + cP14FireplaceFuel: 8 damage: types: Heat: 1 diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml index 6fc3d93ddc..0a6715603e 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/ore_veins.yml @@ -147,3 +147,39 @@ - type: IconSmooth base: wall +- type: entity + id: CP14WallStoneCoalOre + suffix: coal ore + parent: CP14WallStone + description: A solid stone natural wall. You see the tantalizing particles of coal in it. + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/cave_stone_coal.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/cave_stone_coal.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: + CP14OreCoal1: + min: 3 + max: 5 + - !type:DoActsBehavior + acts: ["Destruction"] + - type: IconSmooth + base: wall diff --git a/Resources/Prototypes/_CP14/Materials/simple.yml b/Resources/Prototypes/_CP14/Materials/simple.yml index 123ad1a160..7f296203d2 100644 --- a/Resources/Prototypes/_CP14/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Materials/simple.yml @@ -105,6 +105,14 @@ color: "#006c83" price: 5 +- type: material + id: CP14OreCoal + stackEntity: CP14OreCoal1 + name: cp14-material-coal + icon: { sprite: _CP14/Objects/Materials/coal_ore.rsi, state: ore2 } + color: "#232526" + price: 0.8 + - type: material id: CP14FloraMaterial stackEntity: CP14FloraMaterial1 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml index c806743503..ea3c3e6637 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml @@ -84,6 +84,48 @@ minGroupSize: 4 maxGroupSize: 6 +- type: cp14DemiplaneModifier + id: CoalOre + levels: + min: 1 + max: 8 + name: cp14-modifier-coal-ore + unique: false + categories: + Ore: 0.25 + requiredTags: + - CP14DemiplaneOres + - CP14DemiplaneOpenSky + layers: + - !type:CP14OreDunGen + entityMask: + - CP14WallStone + entity: CP14WallStoneCoalOre + count: 20 + minGroupSize: 4 + maxGroupSize: 6 + +- type: cp14DemiplaneModifier + id: CoalOreUnderground + levels: + min: 1 + max: 8 + name: cp14-modifier-copper-ore + unique: false + categories: + Ore: 0.25 + requiredTags: + - CP14DemiplaneOres + - CP14DemiplaneUnderground + layers: + - !type:CP14OreDunGen + entityMask: + - CP14WallStone + entity: CP14WallStoneCoalOre + count: 15 + minGroupSize: 6 + maxGroupSize: 8 + # TIER 2 - type: cp14DemiplaneModifier diff --git a/Resources/Prototypes/_CP14/Stacks/ores.yml b/Resources/Prototypes/_CP14/Stacks/ores.yml index 7a27379fc1..a7a0da5386 100644 --- a/Resources/Prototypes/_CP14/Stacks/ores.yml +++ b/Resources/Prototypes/_CP14/Stacks/ores.yml @@ -26,3 +26,9 @@ icon: { sprite: _CP14/Objects/Materials/mithril_ore.rsi, state: ore3 } maxCount: 10 +- type: stack + id: CP14OreCoal + name: cp14-stack-coal-ore + spawn: CP14OreCoal1 + icon: { sprite: _CP14/Objects/Materials/coal_ore.rsi, state: ore3 } + maxCount: 10 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/meta.json b/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/meta.json new file mode 100644 index 0000000000..0eb0b11c37 --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by prazat911", + "states": [ + { + "name": "ore1" + }, + { + "name": "ore2" + }, + { + "name": "ore3" + } + ] +} diff --git a/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore1.png b/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore1.png new file mode 100644 index 0000000000..f7de3560c4 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore1.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore2.png b/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore2.png new file mode 100644 index 0000000000..2a8fe9302c Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore2.png differ diff --git a/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore3.png b/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore3.png new file mode 100644 index 0000000000..80578759d9 Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Materials/coal_ore.rsi/ore3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/full.png new file mode 100644 index 0000000000..391a480074 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/meta.json new file mode 100644 index 0000000000..34ea64767b --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/meta.json @@ -0,0 +1,47 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "by vladimir.s and TheShuEd", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "full" + }, + { + "name": "wall0", + "directions": 4 + }, + { + "name": "wall1", + "directions": 4 + }, + { + "name": "wall2", + "directions": 4 + }, + { + "name": "wall3", + "directions": 4 + }, + { + "name": "wall4", + "directions": 4 + }, + { + "name": "wall5", + "directions": 4 + }, + { + "name": "wall6", + "directions": 4 + }, + { + "name": "wall7", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall0.png new file mode 100644 index 0000000000..9e6a70f917 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall1.png new file mode 100644 index 0000000000..3ba7878ff9 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall2.png new file mode 100644 index 0000000000..cb7a8dda0f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall3.png new file mode 100644 index 0000000000..fa405eb0c0 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall4.png new file mode 100644 index 0000000000..856f7bac8e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall5.png new file mode 100644 index 0000000000..34e284e4c4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall6.png new file mode 100644 index 0000000000..126b3fdbbe Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall7.png new file mode 100644 index 0000000000..d451a620e7 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/cave_stone_coal.rsi/wall7.png differ