diff --git a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl index 8bfa01495b..09369ec48c 100644 --- a/Resources/Locale/en-US/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/en-US/_CP14/tiles/tiles.ftl @@ -3,6 +3,8 @@ cp14-tiles-base = rock strata # Natural cp14-tiles-grass = meadow grass +cp14-tiles-grass-light = light grass +cp14-tiles-grass-tall = tall grass cp14-tiles-dirt = soil cp14-tiles-sand = sand diff --git a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl index ff60e53ae3..16ccedcdd3 100644 --- a/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl +++ b/Resources/Locale/ru-RU/_CP14/tiles/tiles.ftl @@ -3,6 +3,8 @@ cp14-tiles-base = каменная толща # Natural cp14-tiles-grass = луговая трава +cp14-tiles-grass-light = светлая трава +cp14-tiles-grass-tall = высокая трава cp14-tiles-dirt = почва cp14-tiles-sand = песок diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml index 95452727b7..36563da58a 100644 --- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml +++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml @@ -7,11 +7,9 @@ - !type:BiomeTileLayer threshold: -1.0 tile: CP14FloorGrass - - !type:BiomeDecalLayer #Grass decal - allowedTiles: - - CP14FloorGrass + - !type:BiomeTileLayer + tile: CP14FloorGrassLight threshold: 0 - divisions: 1 noise: seed: 0 noiseType: OpenSimplex2 @@ -22,22 +20,9 @@ gain: 0.7 domainWarpType: OpenSimplex2 domainWarpAmp: 120 - decals: - - CP14FloraGrassA1 - - CP14FloraGrassA2 - - CP14FloraGrassA3 - - CP14FloraGrassA4 - - CP14FloraGrassA5 - - CP14FloraGrassB1 - - CP14FloraGrassB2 - - CP14FloraGrassB3 - - CP14FloraGrassB4 - - CP14FloraGrassB5 - - !type:BiomeDecalLayer #Bush decal - allowedTiles: - - CP14FloorGrass - threshold: 0.35 - divisions: 1 + - !type:BiomeTileLayer + tile: CP14FloorGrassTall + threshold: 0.45 noise: seed: 0 noiseType: OpenSimplex2 @@ -48,37 +33,6 @@ gain: 0.7 domainWarpType: OpenSimplex2 domainWarpAmp: 120 - decals: - - CP14FloraBushA1 - - CP14FloraBushA2 - - CP14FloraBushA3 - - CP14FloraBushB1 - - CP14FloraBushB2 - - CP14FloraBushB3 - - CP14FloraBushC1 - - CP14FloraBushC2 - - CP14FloraBushC3 - - !type:BiomeDecalLayer #Stone decal - allowedTiles: - - CP14FloorGrass - threshold: 0.55 - divisions: 1 - noise: - seed: 1 - noiseType: OpenSimplex2 - fractalType: Ridged - frequency: 0.1 - octaves: 3 - lacunarity: 1.8 - gain: 0.7 - domainWarpType: OpenSimplex2 - domainWarpAmp: 120 - decals: - - CP14FloraRock01 - - CP14FloraRock02 - - CP14FloraRock03 - - CP14FloraRock04 - - CP14FloraRock05 - !type:BiomeEntityLayer # Rare Trees threshold: 0.8 noise: @@ -289,4 +243,4 @@ domainWarpAmp: 150 entities: - CP14FloorWater - # Lakes end \ No newline at end of file + # Lakes end diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index e8ff90df99..98babd3698 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -76,22 +76,88 @@ editorHidden: false name: cp14-tiles-grass sprite: /Textures/_CP14/Tiles/Grass/grass.png - variants: 4 + variants: 6 placementVariants: - 1.0 - 1.0 - 1.0 - 1.0 + - 1.0 + - 1.0 edgeSpritePriority: 3 edgeSprites: - SouthEast: /Textures/_CP14/Tiles/Grass/single_edge.png - NorthEast: /Textures/_CP14/Tiles/Grass/single_edge.png - NorthWest: /Textures/_CP14/Tiles/Grass/single_edge.png - SouthWest: /Textures/_CP14/Tiles/Grass/single_edge.png - South: /Textures/_CP14/Tiles/Grass/double_edge.png - East: /Textures/_CP14/Tiles/Grass/double_edge.png - North: /Textures/_CP14/Tiles/Grass/double_edge.png - West: /Textures/_CP14/Tiles/Grass/double_edge.png + SouthEast: /Textures/_CP14/Tiles/Grass/single_edge_SE.png + NorthEast: /Textures/_CP14/Tiles/Grass/single_edge_NE.png + NorthWest: /Textures/_CP14/Tiles/Grass/single_edge_NW.png + SouthWest: /Textures/_CP14/Tiles/Grass/single_edge_SW.png + South: /Textures/_CP14/Tiles/Grass/double_edge_S.png + East: /Textures/_CP14/Tiles/Grass/double_edge_E.png + North: /Textures/_CP14/Tiles/Grass/double_edge_N.png + West: /Textures/_CP14/Tiles/Grass/double_edge_W.png + baseTurf: CP14FloorDirt + deconstructTools: [ CP14Digging ] + itemDrop: CP14DirtEffect + isSubfloor: false + footstepSounds: + collection: FootstepGrass + heatCapacity: 10000 + weather: true + +- type: tile + id: CP14FloorGrassLight + editorHidden: false + name: cp14-tiles-grass-light + sprite: /Textures/_CP14/Tiles/GrassLight/grass.png + variants: 6 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + edgeSpritePriority: 4 + edgeSprites: + SouthEast: /Textures/_CP14/Tiles/GrassLight/single_edge_SE.png + NorthEast: /Textures/_CP14/Tiles/GrassLight/single_edge_NE.png + NorthWest: /Textures/_CP14/Tiles/GrassLight/single_edge_NW.png + SouthWest: /Textures/_CP14/Tiles/GrassLight/single_edge_SW.png + South: /Textures/_CP14/Tiles/GrassLight/double_edge_S.png + East: /Textures/_CP14/Tiles/GrassLight/double_edge_E.png + North: /Textures/_CP14/Tiles/GrassLight/double_edge_N.png + West: /Textures/_CP14/Tiles/GrassLight/double_edge_W.png + baseTurf: CP14FloorDirt + deconstructTools: [ CP14Digging ] + itemDrop: CP14DirtEffect + isSubfloor: false + footstepSounds: + collection: FootstepGrass + heatCapacity: 10000 + weather: true + +- type: tile + id: CP14FloorGrassTall + editorHidden: false + name: cp14-tiles-grass-tall + sprite: /Textures/_CP14/Tiles/GrassTall/grass.png + variants: 6 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + edgeSpritePriority: 5 + edgeSprites: + SouthEast: /Textures/_CP14/Tiles/GrassTall/single_edge_SE.png + NorthEast: /Textures/_CP14/Tiles/GrassTall/single_edge_NE.png + NorthWest: /Textures/_CP14/Tiles/GrassTall/single_edge_NW.png + SouthWest: /Textures/_CP14/Tiles/GrassTall/single_edge_SW.png + South: /Textures/_CP14/Tiles/GrassTall/double_edge_S.png + East: /Textures/_CP14/Tiles/GrassTall/double_edge_E.png + North: /Textures/_CP14/Tiles/GrassTall/double_edge_N.png + West: /Textures/_CP14/Tiles/GrassTall/double_edge_W.png baseTurf: CP14FloorDirt deconstructTools: [ CP14Digging ] itemDrop: CP14DirtEffect diff --git a/Resources/Textures/_CP14/Tiles/Grass/attribution.yml b/Resources/Textures/_CP14/Tiles/Grass/attribution.yml index 3cb803a9ab..130713f3a1 100644 --- a/Resources/Textures/_CP14/Tiles/Grass/attribution.yml +++ b/Resources/Textures/_CP14/Tiles/Grass/attribution.yml @@ -1,7 +1,13 @@ - files: - grass.png - - double_edge.png - - single_edge.png - license: "CC-BY-SA-3.0" - copyright: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82" - source: "https://github.com/discordia-space/CEV-Eris/commit/026ee3250ac1de938b503e3eb46ad73dd9c3ca82" \ No newline at end of file + - double_edge_E.png + - double_edge_N.png + - double_edge_S.png + - double_edge_W.png + - single_edge_NE.png + - single_edge_NW.png + - single_edge_SE.png + - single_edge_SW.png + license: "All rights reserved for the CrystallPunk14 project only" + copyright: "Created by TheShuEd" + source: "https://github.com/crystallpunk-14/crystall-punk-14/" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Tiles/Grass/double_edge.png b/Resources/Textures/_CP14/Tiles/Grass/double_edge.png deleted file mode 100644 index b41e55af7c..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Grass/double_edge.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/double_edge_E.png b/Resources/Textures/_CP14/Tiles/Grass/double_edge_E.png new file mode 100644 index 0000000000..6ea9602ad5 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Grass/double_edge_E.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/double_edge_N.png b/Resources/Textures/_CP14/Tiles/Grass/double_edge_N.png new file mode 100644 index 0000000000..6988af7483 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Grass/double_edge_N.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/double_edge_S.png b/Resources/Textures/_CP14/Tiles/Grass/double_edge_S.png new file mode 100644 index 0000000000..58ea8fcc54 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Grass/double_edge_S.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/double_edge_W.png b/Resources/Textures/_CP14/Tiles/Grass/double_edge_W.png new file mode 100644 index 0000000000..9e7dafbecf Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Grass/double_edge_W.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/grass.png b/Resources/Textures/_CP14/Tiles/Grass/grass.png index 006a76e64e..c975957e21 100644 Binary files a/Resources/Textures/_CP14/Tiles/Grass/grass.png and b/Resources/Textures/_CP14/Tiles/Grass/grass.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/single_edge.png b/Resources/Textures/_CP14/Tiles/Grass/single_edge.png deleted file mode 100644 index 437c090770..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Grass/single_edge.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/single_edge_NE.png b/Resources/Textures/_CP14/Tiles/Grass/single_edge_NE.png new file mode 100644 index 0000000000..09b71665ac Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Grass/single_edge_NE.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/single_edge_NW.png b/Resources/Textures/_CP14/Tiles/Grass/single_edge_NW.png new file mode 100644 index 0000000000..c4af7d5cba Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Grass/single_edge_NW.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/single_edge_SE.png b/Resources/Textures/_CP14/Tiles/Grass/single_edge_SE.png new file mode 100644 index 0000000000..e3b585222a Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Grass/single_edge_SE.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/single_edge_SW.png b/Resources/Textures/_CP14/Tiles/Grass/single_edge_SW.png new file mode 100644 index 0000000000..86354167d5 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/Grass/single_edge_SW.png differ diff --git a/Resources/Textures/_CP14/Tiles/Grass/triple_edge.png b/Resources/Textures/_CP14/Tiles/Grass/triple_edge.png deleted file mode 100644 index 3fd2a39a8f..0000000000 Binary files a/Resources/Textures/_CP14/Tiles/Grass/triple_edge.png and /dev/null differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/attribution.yml b/Resources/Textures/_CP14/Tiles/GrassLight/attribution.yml new file mode 100644 index 0000000000..130713f3a1 --- /dev/null +++ b/Resources/Textures/_CP14/Tiles/GrassLight/attribution.yml @@ -0,0 +1,13 @@ +- files: + - grass.png + - double_edge_E.png + - double_edge_N.png + - double_edge_S.png + - double_edge_W.png + - single_edge_NE.png + - single_edge_NW.png + - single_edge_SE.png + - single_edge_SW.png + license: "All rights reserved for the CrystallPunk14 project only" + copyright: "Created by TheShuEd" + source: "https://github.com/crystallpunk-14/crystall-punk-14/" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_E.png b/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_E.png new file mode 100644 index 0000000000..bbe1accc54 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_E.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_N.png b/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_N.png new file mode 100644 index 0000000000..e2ae4f0777 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_N.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_S.png b/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_S.png new file mode 100644 index 0000000000..6e798dc0a4 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_S.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_W.png b/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_W.png new file mode 100644 index 0000000000..cb159edf88 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/double_edge_W.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/grass.png b/Resources/Textures/_CP14/Tiles/GrassLight/grass.png new file mode 100644 index 0000000000..dfa70e121a Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/grass.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_NE.png b/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_NE.png new file mode 100644 index 0000000000..4ac778a31b Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_NE.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_NW.png b/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_NW.png new file mode 100644 index 0000000000..1fbdfadd31 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_NW.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_SE.png b/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_SE.png new file mode 100644 index 0000000000..8b016d8e52 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_SE.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_SW.png b/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_SW.png new file mode 100644 index 0000000000..b2b2bcdaee Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassLight/single_edge_SW.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/attribution.yml b/Resources/Textures/_CP14/Tiles/GrassTall/attribution.yml new file mode 100644 index 0000000000..130713f3a1 --- /dev/null +++ b/Resources/Textures/_CP14/Tiles/GrassTall/attribution.yml @@ -0,0 +1,13 @@ +- files: + - grass.png + - double_edge_E.png + - double_edge_N.png + - double_edge_S.png + - double_edge_W.png + - single_edge_NE.png + - single_edge_NW.png + - single_edge_SE.png + - single_edge_SW.png + license: "All rights reserved for the CrystallPunk14 project only" + copyright: "Created by TheShuEd" + source: "https://github.com/crystallpunk-14/crystall-punk-14/" \ No newline at end of file diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_E.png b/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_E.png new file mode 100644 index 0000000000..fbf36e39b4 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_E.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_N.png b/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_N.png new file mode 100644 index 0000000000..d27fda8b06 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_N.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_S.png b/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_S.png new file mode 100644 index 0000000000..b835ceb965 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_S.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_W.png b/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_W.png new file mode 100644 index 0000000000..5cd95b766f Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/double_edge_W.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/grass.png b/Resources/Textures/_CP14/Tiles/GrassTall/grass.png new file mode 100644 index 0000000000..31501e8cfb Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/grass.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_NE.png b/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_NE.png new file mode 100644 index 0000000000..e5b4ef781b Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_NE.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_NW.png b/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_NW.png new file mode 100644 index 0000000000..141b946396 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_NW.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_SE.png b/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_SE.png new file mode 100644 index 0000000000..7b710f5b9a Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_SE.png differ diff --git a/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_SW.png b/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_SW.png new file mode 100644 index 0000000000..fbbbc5a331 Binary files /dev/null and b/Resources/Textures/_CP14/Tiles/GrassTall/single_edge_SW.png differ