diff --git a/Content.Shared/Decals/DecalPrototype.cs b/Content.Shared/Decals/DecalPrototype.cs index 2721f5d2d2..f92ae12a74 100644 --- a/Content.Shared/Decals/DecalPrototype.cs +++ b/Content.Shared/Decals/DecalPrototype.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Decals [IdDataField] public string ID { get; } = null!; [DataField("sprite")] public SpriteSpecifier Sprite { get; private set; } = SpriteSpecifier.Invalid; [DataField("tags")] public List Tags = new(); - [DataField("showMenu")] public bool ShowMenu = true; + [DataField("showMenu")] public bool ShowMenu = false; //CrystallPunk decal filter /// /// If the decal is rotated compared to our eye should we snap it to south. diff --git a/Resources/Prototypes/Maps/debug.yml b/Resources/Prototypes/Maps/debug.yml index d2bb42125f..59d1fe0410 100644 --- a/Resources/Prototypes/Maps/debug.yml +++ b/Resources/Prototypes/Maps/debug.yml @@ -28,7 +28,7 @@ enableStationRotation: false maxStationOffset: null - type: StationBiome - biome: Snow + biome: CP14GrasslandTestResult - type: StationNameSetup mapNameTemplate: "Dev" - type: StationJobs diff --git a/Resources/Prototypes/_CP14/Decal/nature.yml b/Resources/Prototypes/_CP14/Decal/nature.yml new file mode 100644 index 0000000000..ea9b22a6e1 --- /dev/null +++ b/Resources/Prototypes/_CP14/Decal/nature.yml @@ -0,0 +1,221 @@ +# Bushes + +- type: decal + id: CP14FloraBushA1 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: busha1 + +- type: decal + id: CP14FloraBushA2 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: busha2 + +- type: decal + id: CP14FloraBushA3 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: busha3 + +- type: decal + id: CP14FloraBushB1 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: bushb1 + +- type: decal + id: CP14FloraBushB2 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: bushb2 + +- type: decal + id: CP14FloraBushB3 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: bushb3 + +- type: decal + id: CP14FloraBushC1 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: bushc1 + +- type: decal + id: CP14FloraBushC2 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: bushc2 + +- type: decal + id: CP14FloraBushC3 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_bushes.rsi + state: bushc3 + +# Grass + +- type: decal + id: CP14FloraGrassA1 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassa1 + +- type: decal + id: CP14FloraGrassA2 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassa2 + +- type: decal + id: CP14FloraGrassA3 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassa3 + +- type: decal + id: CP14FloraGrassA4 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassa4 + +- type: decal + id: CP14FloraGrassA5 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassa5 + +- type: decal + id: CP14FloraGrassB1 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassb1 + +- type: decal + id: CP14FloraGrassB2 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassb2 + +- type: decal + id: CP14FloraGrassB3 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassb3 + +- type: decal + id: CP14FloraGrassB4 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassb4 + +- type: decal + id: CP14FloraGrassB5 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_grass.rsi + state: grassb5 + +# Rocks + +- type: decal + id: CP14FloraRock01 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_rocks.rsi + state: rock01 + +- type: decal + id: CP14FloraRock02 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_rocks.rsi + state: rock02 + +- type: decal + id: CP14FloraRock03 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_rocks.rsi + state: rock03 + +- type: decal + id: CP14FloraRock04 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_rocks.rsi + state: rock04 + +- type: decal + id: CP14FloraRock05 + snapCardinals: true + defaultSnap: true + showMenu: true + sprite: + sprite: /Textures/Decals/Flora/flora_rocks.rsi + state: rock05 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml index b10b589327..31505ab4b3 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml @@ -46,6 +46,7 @@ suffix: Gatherable components: - type: Sprite + snapCardinals: true drawdepth: FloorTiles sprite: _CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi state: grass1 diff --git a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml new file mode 100644 index 0000000000..795ca7b5a3 --- /dev/null +++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml @@ -0,0 +1,205 @@ +# Use https://auburn.github.io/FastNoiseLite/ to Preview +# Базовый биом лугов. + +- type: biomeTemplate + id: CP14Grassland + layers: + - !type:BiomeTileLayer + threshold: -1.0 + tile: CP14FloorGrass + - !type:BiomeDecalLayer #Grass decal + allowedTiles: + - CP14FloorGrass + threshold: 0 + divisions: 1 + noise: + seed: 0 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.05 + octaves: 3 + lacunarity: 1.8 + 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 + noise: + seed: 0 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.05 + octaves: 3 + lacunarity: 1.8 + 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: + seed: 0 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 2 + allowedTiles: + - CP14FloorGrass + entities: #TODO - own CP14 trees + - FloraTree01 + - FloraTree02 + - FloraTree03 + - FloraTree04 + - FloraTree05 + - FloraTree06 + - FloraTreeLarge01 + - FloraTreeLarge02 + - FloraTreeLarge03 + - FloraTreeLarge04 + - FloraTreeLarge05 + - FloraTreeLarge06 + - FloraTreeStump + - FloraTreeStump + - !type:BiomeEntityLayer # Rare Bloodgrass + threshold: 0.8 + noise: + seed: 3 + noiseType: OpenSimplex2 + fractalType: Ridged + frequency: 0.015 + octaves: 3 + lacunarity: 1.8 + gain: 0.7 + domainWarpType: OpenSimplex2 + domainWarpAmp: 120 + allowedTiles: + - CP14FloorGrass + entities: + - CP14GatherableBloodgrass + - CP14GatherableBloodgrass2 + - CP14GatherableBloodgrass3 + - CP14GatherableBloodgrass4 + - CP14GatherableBloodgrass5 + +# Подбиомы лугов + +- type: biomeTemplate + id: CP14GrasslandForest # Лес + layers: + - !type:BiomeMetaLayer + template: CP14Grassland + - !type:BiomeEntityLayer # More Trees + threshold: 0.5 + noise: + seed: 4 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 2 + allowedTiles: + - CP14FloorGrass + entities: #TODO - own CP14 trees + - FloraTree01 + - FloraTree02 + - FloraTree03 + - FloraTree04 + - FloraTree05 + - FloraTree06 + - FloraTreeLarge01 + - FloraTreeLarge02 + - FloraTreeLarge03 + - FloraTreeLarge04 + - FloraTreeLarge05 + - FloraTreeLarge06 + - FloraTreeStump + - FloraTreeStump + +- type: biomeTemplate + id: CP14GrasslandHills # Холмы + layers: + - !type:BiomeMetaLayer + template: CP14GrasslandForest + - !type:BiomeTileLayer + tile: CP14FloorBase + invert: true + threshold: 0.5 + noise: + seed: 6 + noiseType: OpenSimplex2 + frequency: 0.03 + lacunarity: 2 + fractalType: Ridged + octaves: 1 + cellularDistanceFunction: Euclidean + cellularReturnType: Distance + cellularJitterModifier: 0.7 + domainWarpType: OpenSimplex2Reduced + domainWarpAmp: 285 + - !type:BiomeEntityLayer # Walls + allowedTiles: + - CP14FloorBase + threshold: -1.0 + entities: + - CP14CaveStoneWall + +- type: biomeTemplate + id: CP14GrasslandTestResult + layers: + - !type:BiomeMetaLayer + template: CP14Grassland + - !type:BiomeMetaLayer + template: CP14GrasslandForest + threshold: 0.2 + noise: + seed: 18 + frequency: 0.02 + fractalType: None + - !type:BiomeMetaLayer + template: CP14GrasslandHills + threshold: 0.4 + noise: + seed: 14 + frequency: 0.02 + fractalType: None \ No newline at end of file