From df695cc39b7ab64358a443fc2df0b6d9556159f1 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Thu, 6 Jun 2024 21:06:32 +0300 Subject: [PATCH] Dirt wall (#223) * add dirt wall sprites * added dirt wall proto * add dirt material, dirt wall crafting and dirt drop from wall --- .../en-US/_CP14/materials/materials.ftl | 3 +- .../ru-RU/_CP14/materials/materials.ftl | 3 +- .../Entities/Objects/Materials/simple.yml | 7 ++- .../Entities/Structures/GirderFrame/frame.yml | 2 +- .../Entities/Structures/Walls/natural.yml | 55 +++++++++++++++--- .../_CP14/Entities/Structures/Walls/walls.yml | 2 +- .../_CP14/Procedural/biome_template.yml | 10 ++-- .../Procedural/biomes_template_grasslands.yml | 2 +- .../_CP14/Reagents/Materials/simple.yml | 9 +++ .../Construction/Graphs/Walls/WallDirt.yml | 16 +++++ .../Graphs/{wall.yml => Walls/WallWood.yml} | 2 +- .../_CP14/Recipes/Construction/walls.yml | 20 ++++++- .../Walls/Natural/dirt_wall.rsi/full.png | Bin 0 -> 1478 bytes .../Walls/Natural/dirt_wall.rsi/meta.json | 46 +++++++++++++++ .../Walls/Natural/dirt_wall.rsi/wall0.png | Bin 0 -> 1938 bytes .../Walls/Natural/dirt_wall.rsi/wall1.png | Bin 0 -> 1425 bytes .../Walls/Natural/dirt_wall.rsi/wall2.png | Bin 0 -> 1935 bytes .../Walls/Natural/dirt_wall.rsi/wall3.png | Bin 0 -> 1425 bytes .../Walls/Natural/dirt_wall.rsi/wall4.png | Bin 0 -> 1390 bytes .../Walls/Natural/dirt_wall.rsi/wall5.png | Bin 0 -> 855 bytes .../Walls/Natural/dirt_wall.rsi/wall6.png | Bin 0 -> 1397 bytes .../Walls/Natural/dirt_wall.rsi/wall7.png | Bin 0 -> 267 bytes Resources/migration.yml | 5 ++ 23 files changed, 159 insertions(+), 23 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Walls/WallDirt.yml rename Resources/Prototypes/_CP14/Recipes/Construction/Graphs/{wall.yml => Walls/WallWood.yml} (98%) create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/full.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall0.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall1.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall2.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall3.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall4.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall5.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall6.png create mode 100644 Resources/Textures/_CP14/Structures/Walls/Natural/dirt_wall.rsi/wall7.png 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 0000000000000000000000000000000000000000..0dd6bf621b5156385718a4b3f3e9af259fed3a9a GIT binary patch literal 1478 zcmV;%1v&bOP)Px)fJsC_RA_adlCs;w|v1Xu(i!d1i{m<&{H zh1)-ROb`G*pZ&t`XNzDjsoRHsp$H&l++Vlt5;@^MBU#8I=}rBe2CBAV-15`{5{e@@7S)#t>N(>6?o)4tD@xW!cJt zqb&GAnE0?+$=_m0)HL?p572vl1rSGu6k)gHZc;k{Ak(kj-0X&ZAQF#*7gTM9s;xL& zkAOHds!fnfM=LB@5%l-^l{vIh8CJ!n?c zhoiv+X`Dnz*^ph(Zq_p^m?Q#xJQ`>`t#;^*F`CTcIkxHfr*6mHbbq@_7+*zetk!ER zqqQ-a*vBOV+hVlOxOH5@5rBz5$NJB|;7xr5%M}1ojtQnx{3Foa)q8$TWmtkS3JA1% z8IJFMI>bKWn#m%7+pMEjQQUt3h%@2P8?&D#+exS>>A67uuZuG)6-(GES=KoW8l4s9&lTASjVM* zZ1hKor3ertiL717+WtKFLC8^7wH5cEnNdK!fr&)TR++7q2{Z>4A-7d$u_qc5c^)X2 ziYS*Ho@BWv@#vuLSb~e(Jb)jByF@hf#%MR|sM-o&zkN>_q%K*u<;!TzlleiIDB<*s zjLUattvdhSx?__H!(T7Y*+1bbN(qx9g-|XzsWIhJ5#H2?qbwe)S3`=3lm=#t0PSX- ze+#w%b|MW|5th-KGn)=Fo^@`d#8=dd(PFDskuDjMNS<+9Su8T$pj@bN2c+SlH%<{D z66I1cvxHY|g#pHVB%3XQ)VRB+!A^wKl+te!BCxFutt7$0+nCd}Jogc(+4%bHd!o4^ zx5$X%`vE#EP&=mQZQ4@Pgc8eWjlMVLC~$@Hi9E0qYT|-|KxaiAx?gqUKwSI3T%IS4 z68QKh7E|bU+>MM?KM0Mt9&~thl$8*loYWL@av_xD=%iG$RV>1@Rvn8VOstT4x5N$@ z1V==|RfOL2E3QsY*r>c^kvl~0VG)idGiKf2CLuaH<&h|tifn|0MF!;e@~%OzBSjhj z#7Tw*$PWnAQc2LtYqr9d%X8jExy|Ha5~K?j=Ef*OX`C*w2>SMtaebUT+>owh%C?n- zyQje}5y^1DTk?O>hpF&fot~ig{0e7oC45dhC3PhUlEw=1iiSXWUakPxRW|7cB1T=W z1VzO%TJtUtde5)8ACA%@BqFq0xoSQ9Ci4KbN_?z$=J8nR3hFOpZ$V@Tg>J{)m=rI4 zn+H?Lme2|7w{XSDB1nbYGFlsrOCMXurBo%UW7d6$r~(~;egNwjhfJ$fkN6#(G6-N?Oi|F3XA9OYi+A8^0{ g2OMy~0sjyD4Z!rTw?`tk$p8QV07*qoM6N<$f~HZyZ2$lO literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fba88670bc9e50ede79863dd70136c41dd2f8eac GIT binary patch literal 1938 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 Vy^BnwsImY6002ovPDHLkV1myRb}j$_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..811658153fd298ee6cc2b155f8cfd0f931c8d778 GIT binary patch literal 1425 zcmV;C1#bF@P)Px)OG!jQRCt{2oZnB|ND#-roC>v#lMqZxLsSs0`a<9MukWuo=^pN>;+~3hI?;-r zAQvt_Fc=&NQtrW-Wn(*`u)E$B%tt~bwnLb&XJ%*DySoI(+23tX^2ZLopDgM6`>%BU zp{J5Jkc^|_pWe4-uCE0?089?PpDgX~wkN7$SQmf{tOY)P`}3Ie~}c< zsbXD#c}5*|2LOPNo9p5jU2~pfzt=)v`TMnH)2H%rbGAQY9OH zQTebb$k1ptyTeD_L8sy8nJCe!Z>7|I z2Z8kj^{P8Kk3p*k%p0K4F>qlDZ34J#20!#!n*ee#ZpL>r=UgxzFr5RYmEY)gJR?NIp^8vhfMDwO*HU83 z6tTYEsLfnAh%W)$C&TqdO*|U6iLwA6-o3%MfBzHjskke1_aq%5zE07On&|X~=wPV& z^~z{z2KTnN3dc`+MdQd@l5~Wq9*RffHZj%=etO@+Aifkvwl|t+BdZlodP66S2Q&yU zx*Zqd9mryy!XT=L2z*Z@J}R2ZyrgQB1<2n?Irb^$qk4!zd|436g=$b)fYA4Z(aD^q z?Ph$3*UPU&OCTS&jg}lB8(!!W^ys`Nnn)lsex6`eqAUQpIgmApa;yWHAcsFrr|&%R z89?uBucxA=5TbrP%ka{_71aNZEuufKnJx$6a7cs#C6fc$(vngmJ1 z;dx_gfscc~zUlhICV80A-w1 zG+^SC0F?Z`EEp@)z1GC zNy_g*QZ~q<1M31zH%1n_QN>qjApx$1{>#`>^JfN3b%%p>56IJ4^+h6-7g?CXDG$i^ z0p!IPrYb_~0_^X$C+&@Px)C`m*?RCt{2ozHXHI26af=`5+`ngD_PD${0~onCtE|9{?Nk3F>0cG4Y|O%?+N z2Rk@3*#k((!gdIjk%qj_ss0uGzIxJoww~1k80Pbb?&HUI7i;@xQ49e1`uiUMz&MOj z$Nf98eNg82UzNF77j>5z`)w-(P~n1X(E6qML)%}{05|-`ABlac@w%}>fE#~=vvw(Tb$yOiV?a<~U=_v#mI!dsX%!x?%6Pz%E|A4I zjD+FsH;ch>Z@WO4{x3D#(OJr2zc_E}f2{8<&)|ABNQQ8CAM_$Uv z>;5hLNr+&!Du=tgI89wMo!L_=S6Tpn62hN^XdijG=Un%1Q`@Q_CMhjIP|%uL$J$4p z5X7H^Wq-ajr3Dy=5t<&$G?rJ2=Y2X;B;KyrNvW*OnzC9@37GupQA2ef&Byx;-w zbm^=uB4{g>RX>&4?Vrx76nVl@0HdjJryv zx&uJpyrOXdzAgU`0RSlxf?0&C^OLoiWo~%UZ1i(5E&z~TZH`ZvHe8l!`0K(9&yyVVcCBiV6?$02|UD-LT;p+S(*TuV?7P@Gm zHyCLh1dV5c{v;IP&N-~53|GUT%N%i>M~$)=_W%_x0yj=}^mwV zvtbmYedGzR03f1(jHh8aF5?1xdjA%^!3bd#i$n;(+87{50iDHF#svUY@xHh80(sk? zgz%Vy*R{p1>S%Qt;{v$M5rZGFFpxj($wJ8QL}WqAVq5?o+T?WjK6yx`x^h?q7Gs32 w8Y|-h@bs5sL-8a*5ClOG1VIo4K@j`R|6$M~Sr)j?761SM07*qoM6N<$f|PNBC;$Ke literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7fd112c6ab3977a2a0fefbe5884baa20ba4f99dd GIT binary patch literal 855 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?oFfa>xx;TbZ z%y~QKY~C#gk=FcGO%lz_hq5l~tn%tywa?*NZSTI)X?I-$ue#|jnxrY9-gnD&SH>|( z|D1x4XYOB)i{aKxi=B(xWyZ)ZPUng?=w2uC^%d?Yy zFYx`Tf2-yO`?3n*;62_)Bm~^M@;>jrv~lN~*;CO)e_|yL-D5Rb#%Y(et1s-bhx?sy*)>KB z(|9tLI<8^-@3{RPs}nQxj(P@jy<-g5?CwlUzt5Dwkp56n-KKQI85UKJ>nx@ZzGOt* z;xF94pLaQ1&Z?UyJ^a?rwvc8n%e*G!Q~52NQ9bs+x>`=t+ak|(6XqWgHY{(PY`)&2 zTV2ULR$=c+P03YmTlF2ccy6d{5VMm#zOXB&<+5IY`NoM_^E3`fZ1Aj+d3(Kq6Bs*a zpyBV4$UO}^L;Ti@TKz8g^yJCWSGyu~3JXmaf7ZXhTTuUk$|~bNk)^MD#8zi3DOLUd zb|dtowQ$PJ7@3tyUVAcE%UCv^GrQxoxUV=q2;*Ix1Gwk$sTt?S-y`Z4#zCZD{S zPfa9OF4{Kvu%O`7&rBW%cQTe~8yvlLTd3!Q8QY9(Hs6gxO)5Tn_?mz*$$9PeB%cpL z<~K|#9zDEtv$wLLbA5}tT|%^;{!x{Dwj3c1R~x~kc0m(XaA2NLytL^N6%k*1f!Fr2xbom+cZZkSo9HAl ew4erYPdw6}y@0c>WcI8TAg-sYpUXO@geCwotadQ~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9074a1375c7da52f5b19355131e6dc403436a8a5 GIT binary patch literal 1397 zcmV-*1&aEKP)Px)FG)l}RCt{2oLz6*HWY^64s|A~a{QSzsnG__(3@TsyWZdEKi*|73k*YBbc2_r zvtr9uB*hBQUD%{4T2gF_G70BAK!E5g(Rq2ub3`5S84UCBw_ktc?T_LF0PyLre*gfJ zFwPwJ@5J`AD*ykdDi=mB# z?fQFWTNT74l?4b&S~Krh@7P-t#3Ypkn1nIf9?LbBSBmfJGuU0&OR22QnzCG!j{ zGTOH92ef&Byx;-wcRX>&4?Vrx7lzGBZ0HdjJ?E-LQA(WPX z8UoaO4?APc=kum`@&XwDY72(D(3AH762SBg)VV&$CKwlhvx^8igtJBfU^|0!d5u*9 zn85f#N-Dp+?5^$md~=)G);VTa;{k22cmcIMQFLL20Gmvi)fFv_3$X2c;lZsZczJfR z({&f8U0j@2?;6Gh02U&Y387A(=`fsQO%!mB8f$9}B=dCb9F?l?7L9vA*$Y(Xs3CrU zg&?XZRWU9ACz+>knNzr~fGR}Ux!Yj83-I+s<#&v-S47e>TrP8v%v1Q&P}~1EE&w;m zV-CVNSu;)+gV!AZ&?bU$0pu0tWD$ZW#^u>b#%N$=c-hz#zhrH>EYr$C z6pNK+-@QIx6J}S83lPQ$2K^3_d5SOp{s#cU(1E<<&S)jVZ7|!Y{ALr33&363IcnhY z?4;1e2mKBP=wLV+YaIlQhe3ZDig4x}H8O^)Va{caIL@O+Rg8Op3KxMJr$&MM^Z`J5 zWy&^KApq~wQJf%|r?^iaat*vsAH;ykpB>c6l5H_A05`PTYG%^hmQ-%X&*S?%<_J%y zig5veg>iB|5XOnf2t_71T6cTz5K`gyZ(d=OQ|9gx00000NkvXXu0mjf DlCOm} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d5cbf40e2b7603a2b75b09b44791d8765e9fc319 GIT binary patch literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^4nW+%!3HFEH|A#nDaPU;cPEB*=VV?2IY&KR978JR zyuD+{)nFjP>iGEY`!&7hKUzZPyln12s@A%0aXIh#^(P+||M+lTc!691E-Za_sr<{@ zx>w)x8yLPe%)*X=_JKje-5UJ>yFa`vE7-5#!k2dcIQ*Z*o9PO377h$Et!y`At|v>a SwhxaiNXXOG&t;ucLK6VY`d-Qa literal 0 HcmV?d00001 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