diff --git a/Resources/Locale/en-US/_CP14/materials/materials.ftl b/Resources/Locale/en-US/_CP14/materials/materials.ftl index 5a229ecc88..13c75f1fe4 100644 --- a/Resources/Locale/en-US/_CP14/materials/materials.ftl +++ b/Resources/Locale/en-US/_CP14/materials/materials.ftl @@ -1 +1,2 @@ -cp14-material-wooden-planks = wooden planks \ No newline at end of file +cp14-material-wooden-planks = wooden planks +cp14-material-dirt-block = dirt \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl index 00dc67d512..ed2ae631a4 100644 --- a/Resources/Locale/ru-RU/_CP14/materials/materials.ftl +++ b/Resources/Locale/ru-RU/_CP14/materials/materials.ftl @@ -1 +1,2 @@ -cp14-material-wooden-planks = деревянные доски \ No newline at end of file +cp14-material-wooden-planks = деревянные доски +cp14-material-dirt-block = земля \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml index a1e67ff069..daac092484 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Materials/simple.yml @@ -29,7 +29,10 @@ - dirt - dirt_2 - dirt_3 - # TODO material + - type: Material + - type: PhysicalComposition # точно ли это нужно? + materialComposition: + CP14Dirt: 100 - type: entity id: CP14DirtBlock10 @@ -123,7 +126,7 @@ layerStates: - planks - planks_2 - - planks_3 + - planks_3 - type: Material - type: PhysicalComposition # точно ли это нужно? materialComposition: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml b/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml index 573b2183c3..ca1cbc71f3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/GirderFrame/frame.yml @@ -33,5 +33,5 @@ - GlassAirlockLayer - type: InteractionOutline - type: Construction - graph: CP14Wall + graph: CP14WallWood node: FrameWooden \ 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 f70ae753bf..0b52eac772 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml @@ -1,5 +1,5 @@ - type: entity - id: CP14CaveStoneWall + id: CP14WallStone name: rock parent: CP14BaseWall description: A solid stone natural wall. It has a cave-like coldness to it. @@ -27,10 +27,47 @@ params: volume: -6 +- type: entity + id: CP14WallDirt + name: earth cliffs + parent: CP14BaseWall + description: bruh #TODO + components: + - type: Sprite + sprite: _CP14/Structures/Walls/Natural/dirt_wall.rsi + - type: Icon + sprite: _CP14/Structures/Walls/Natural/dirt_wall.rsi + - type: IconSmooth + base: wall + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Rock + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/break_stone.ogg #TODO + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + CP14DirtBlock1: + min: 2 + max: 3 + - type: Construction + graph: CP14WallDirt + node: WallDirt + #- type: entity -# id: CP14CaveStoneWallCopperOre +# id: CP14WallStoneCopperOre # suffix: copper ore -# parent: CP14CaveStoneWall +# parent: CP14WallStone # description: A solid stone natural wall. You can see the sharp flecks of copper in it. # components: # - type: Sprite @@ -57,9 +94,9 @@ # max: 5 # #- type: entity -# id: CP14CaveStoneWallIronOre +# id: CP14WallStoneIronOre # suffix: iron ore -# parent: CP14CaveStoneWall +# parent: CP14WallStone # description: A solid stone natural wall. You can see the sharp flecks of iron in it. # components: # - type: Sprite @@ -86,9 +123,9 @@ # max: 5 # - type: entity - id: CP14CaveStoneWallSilverOre + id: CP14WallStoneSilverOre suffix: silver ore - parent: CP14CaveStoneWall + parent: CP14WallStone description: A solid stone natural wall. You see the tantalizing particles of silver in it. components: - type: Sprite @@ -117,9 +154,9 @@ base: wall - type: entity - id: CP14CaveStoneWallGoldOre + id: CP14WallStoneGoldOre suffix: gold ore - parent: CP14CaveStoneWall + parent: CP14WallStone description: A solid stone natural wall. You see the tantalizing particles of gold in it. components: - type: Sprite diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml index 6323dd948a..ca73f852e7 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/walls.yml @@ -85,5 +85,5 @@ - type: Icon sprite: _CP14/Structures/Walls/cardboard_wall.rsi - type: Construction - graph: CP14Wall + graph: CP14WallWood node: WallCardboard \ 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 a91010445d..fc4baf2d2e 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template.yml @@ -9,7 +9,7 @@ allowedTiles: - CP14FloorBase entities: - - CP14CaveStoneWall + - CP14WallStone - type: biomeTemplate id: CP14CavesGeneric @@ -17,7 +17,7 @@ - !type:BiomeTileLayer threshold: -1.0 tile: CP14FloorBase - #Entity + #Entityx - !type:BiomeEntityLayer threshold: 0.4 noise: @@ -84,7 +84,7 @@ allowedTiles: - CP14FloorBase entities: - - CP14CaveStoneWall + - CP14WallStone #Ores - !type:BiomeEntityLayer threshold: 0.6 @@ -96,7 +96,7 @@ allowedTiles: - CP14FloorBase entities: - - CP14CaveStoneWallSilverOre + - CP14WallStoneSilverOre - !type:BiomeEntityLayer threshold: 0.6 noise: @@ -107,4 +107,4 @@ allowedTiles: - CP14FloorBase entities: - - CP14CaveStoneWallGoldOre \ No newline at end of file + - CP14WallStoneGoldOre \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml index 5c5ef5e684..d06b846b81 100644 --- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml @@ -196,7 +196,7 @@ - CP14FloorBase threshold: -1.0 entities: - - CP14CaveStoneWall + - CP14WallDirt - type: biomeTemplate id: CP14GrasslandTestResult diff --git a/Resources/Prototypes/_CP14/Reagents/Materials/simple.yml b/Resources/Prototypes/_CP14/Reagents/Materials/simple.yml index 2765e54d21..1b7f5b500d 100644 --- a/Resources/Prototypes/_CP14/Reagents/Materials/simple.yml +++ b/Resources/Prototypes/_CP14/Reagents/Materials/simple.yml @@ -5,4 +5,13 @@ unit: materials-unit-plank icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 } color: "#874d3a" + price: 0 #? + +- type: material + id: CP14Dirt + stackEntity: CP14DirtBlock1 + name: cp14-material-dirt-block + unit: materials-unit-chunk + icon: { sprite: _CP14/Objects/Materials/dirt_block.rsi, state: dirt_2 } + color: "#5e3f31" price: 0 #? \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallDirt.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallDirt.yml new file mode 100644 index 0000000000..e49ee3e9de --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallDirt.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: CP14WallDirt + start: start + graph: + - node: start + edges: + - to: WallDirt + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: CP14Dirt + amount: 3 + doAfter: 2 + - node: WallDirt + entity: CP14WallDirt \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/wall.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallWood.yml similarity index 98% rename from Resources/Prototypes/_CP14/Recipes/Construction/Graphs/wall.yml rename to Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallWood.yml index 672388edcb..27f0864ab2 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/wall.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallWood.yml @@ -1,5 +1,5 @@ - type: constructionGraph - id: CP14Wall + id: CP14WallWood start: start graph: - node: start diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml index f662e51ad6..580c729e1c 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/walls.yml @@ -3,7 +3,7 @@ name: Cardboard wall description: A thin, flimsy wall made of paper and cardboard. Popular in warm countries. id: CP14CardboardWall - graph: CP14Wall + graph: CP14WallWood startNode: start targetNode: WallCardboard category: construction-category-structures @@ -13,5 +13,23 @@ objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Earth cliffs + description: bruh #TODO + id: CP14WallDirt + graph: CP14WallDirt + startNode: start + targetNode: WallDirt + category: construction-category-structures + icon: + sprite: _CP14/Structures/Walls/Natural/dirt_wall.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false conditions: - !type:TileNotBlocked \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/full.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/full.png new file mode 100644 index 0000000000..0dd6bf621b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/full.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/meta.json b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/meta.json new file mode 100644 index 0000000000..63e831061e --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 64 + }, + "license": "All rights reserved for the CrystallPunk14 project only", + "copyright": "Created by TheShuEd (Discord) for CrystallPunk14", + "states": [ + { + "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 + }, + { + "name": "full" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall0.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall0.png new file mode 100644 index 0000000000..fba88670bc Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall0.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall1.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall1.png new file mode 100644 index 0000000000..6125dc4d7a Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall1.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall2.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall2.png new file mode 100644 index 0000000000..3641a69a41 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall2.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall3.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall3.png new file mode 100644 index 0000000000..811658153f Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall3.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall4.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall4.png new file mode 100644 index 0000000000..1c6caca80e Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall4.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall5.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall5.png new file mode 100644 index 0000000000..7fd112c6ab Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall5.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall6.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall6.png new file mode 100644 index 0000000000..9074a1375c Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall6.png differ diff --git a/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall7.png b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall7.png new file mode 100644 index 0000000000..d5cbf40e2b Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall7.png differ diff --git a/Resources/migration.yml b/Resources/migration.yml index 33761b6bac..07180c32c8 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -11,6 +11,11 @@ CP14FloorBricksCarvedSquare: null # 2024-05-24 CP14CardboardWall: CP14WallCardboard +# 2024-06-06 +CP14CaveStoneWall: CP14WallStone +CP14CaveStoneWallSilverOre: CP14WallStoneSilverOre +CP14CaveStoneWallGoldOre: CP14WallStoneGoldOre + # <---> CrystallPunk migration zone end