From ad9813cace2d2149869d3970efa7ba641070ebc4 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Wed, 29 Jan 2025 00:48:11 +0300 Subject: [PATCH] ice caves demiplane (#817) * ice caves demiplane * more things can spawn on snow * Update base.yml * fix guidebook quartz * ice island demiplane * xeno turret demiplane mobs --- .../en-US/_CP14/demiplane/locations.ftl | 4 +- .../ru-RU/_CP14/demiplane/locations.ftl | 4 +- .../Spawners/Random/Biome/biomeSpawner.yml | 29 ++++++- .../_CP14/Entities/Mobs/NPC/test_turret.yml | 29 +++++++ .../Structures/Flora/Crystal/base.yml | 12 +-- .../Structures/Flora/Crystal/elemental.yml | 10 --- .../Demiplane/Locations/t1_ice_caves.yml | 33 ++++++++ .../Demiplane/Locations/t1_snow_island.yml | 60 ++++++++++++++ .../Demiplane/Modifiers/Danger/misc.yml | 3 + .../Demiplane/Modifiers/Danger/mobs.yml | 31 ++++++- .../Demiplane/Modifiers/MapLight/mapLight.yml | 2 +- .../Demiplane/Modifiers/Reward/crystals.yml | 32 ++++++- .../Demiplane/Modifiers/Reward/herbals.yml | 3 + .../Demiplane/Modifiers/Weather/weather.yml | 61 ++++++++++++++ .../_CP14/Procedural/Demiplane/tags.yml | 3 + .../Procedural/biome_template_ice_caves.yml | 78 ++++++++++++++++++ .../_CP14/Procedural/biome_template_snow.yml | 36 +++++++- .../_CP14/Procedural/biome_template_swamp.yml | 1 + Resources/Prototypes/_CP14/Tiles/natural.yml | 19 +++++ .../ServerInfo/_CP14/Guidebook_EN/Alchemy.xml | 2 +- .../ServerInfo/_CP14/Guidebook_RU/Alchemy.xml | 2 +- .../Textures/_CP14/Tiles/attributions.yml | 7 +- Resources/Textures/_CP14/Tiles/ice.png | Bin 0 -> 1370 bytes 23 files changed, 426 insertions(+), 35 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Mobs/NPC/test_turret.yml create mode 100644 Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_ice_caves.yml create mode 100644 Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_snow_island.yml create mode 100644 Resources/Prototypes/_CP14/Procedural/biome_template_ice_caves.yml create mode 100644 Resources/Textures/_CP14/Tiles/ice.png diff --git a/Resources/Locale/en-US/_CP14/demiplane/locations.ftl b/Resources/Locale/en-US/_CP14/demiplane/locations.ftl index d010ca38f9..2e9df055be 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/locations.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/locations.ftl @@ -1,3 +1,5 @@ cp14-demiplane-location-cave = Dark caves cp14-demiplane-location-cave-grass = Overgrown caves -cp14-demiplane-location-grassland-island = Green Island \ No newline at end of file +cp14-demiplane-location-grassland-island = Green Island +cp14-demiplane-location-ice-cave = Ice caves +cp14-demiplane-location-snow-island = Snowy island \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl index 20f8324013..29be4d5846 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/locations.ftl @@ -1,3 +1,5 @@ cp14-demiplane-location-cave = Темные пещеры cp14-demiplane-location-cave-grass = Заросшие пещеры -cp14-demiplane-location-grassland-island = Зеленый остров \ No newline at end of file +cp14-demiplane-location-grassland-island = Зеленый остров +cp14-demiplane-location-ice-cave = Ледяные пещеры +cp14-demiplane-location-snow-island = Заснеженный остров \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml index eb0de679e3..7c6301ec33 100644 --- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml +++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Biome/biomeSpawner.yml @@ -96,4 +96,31 @@ state: full - state: frame - type: CP14BiomeSpawner - biome: CP14SwampFill \ No newline at end of file + biome: CP14SwampFill + +- type: entity + id: CP14BiomeSpawnerFrozenSwamp + parent: CP14BaseBiomeSpawner + suffix: Frozen swamp + components: + - type: Sprite + layers: + - state: snow + - sprite: _CP14/Tiles/Water/water.rsi + state: full + - state: frame + - type: CP14BiomeSpawner + biome: CP14SnowlandSwamp + +- type: entity + id: CP14BiomeSpawnerFrozenCave + parent: CP14BaseBiomeSpawner + suffix: Frozen cave + components: + - type: Sprite + layers: + - state: snow + color: blue + - state: frame + - type: CP14BiomeSpawner + biome: CP14IceCavesGeneric \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/test_turret.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/test_turret.yml new file mode 100644 index 0000000000..59e43f47d3 --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/test_turret.yml @@ -0,0 +1,29 @@ +- type: entity + id: CP14XenoTurret + parent: WeaponTurretXeno + categories: [ ForkFiltered ] + components: + - type: NpcFactionMember + factions: + - CP14Monster + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/gib1.ogg + - !type:SpawnEntitiesBehavior + spawn: + CP14FoodEgg: + min: 1 + max: 2 + - !type:SpawnEntitiesBehavior + spawn: + CP14String: + min: 1 + max: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml index 08d19b81be..0a08759c72 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/base.yml @@ -59,8 +59,8 @@ pitch: 0.5 variation: 0.03 - type: PointLight - radius: 2 - energy: 2.5 + radius: 4 + energy: 1.5 - type: RandomSprite available: - random: @@ -86,8 +86,8 @@ pitch: 1 variation: 0.03 - type: PointLight - radius: 1.5 - energy: 2 + radius: 2.5 + energy: 1 - type: RandomSprite available: - random: @@ -115,8 +115,8 @@ pitch: 1.5 variation: 0.03 - type: PointLight - radius: 1.1 - energy: 2 + radius: 1.5 + energy: 0.5 - type: RandomSprite available: - random: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml index 0673f2a9cc..0afd27abc7 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Crystal/elemental.yml @@ -655,11 +655,6 @@ - CP14CrystalSmallBase - CP14CrystalDarknessBase components: - - type: Sprite - sprite: _CP14/Structures/Flora/Crystal/crystal_small.rsi - layers: - - state: small1 - map: ["random"] - type: Destructible thresholds: - trigger: @@ -695,11 +690,6 @@ - CP14CrystalMediumBase - CP14CrystalDarknessBase components: - - type: Sprite - sprite: _CP14/Structures/Flora/Crystal/crystal_medium.rsi - layers: - - state: medium4 - map: ["random"] - type: Destructible thresholds: - trigger: diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_ice_caves.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_ice_caves.yml new file mode 100644 index 0000000000..3899a856f8 --- /dev/null +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_ice_caves.yml @@ -0,0 +1,33 @@ +- type: cp14DemiplaneLocation + id: T1IceCaves + tier: 1 + locationConfig: CP14DemiplaneIceCaves + name: cp14-demiplane-location-ice-cave + tags: + - CP14DemiplaneOres + - CP14DemiplaneUnderground + - CP14DemiplaneCold + +- type: dungeonConfig + id: CP14DemiplaneIceCaves + layers: + # Masks + - !type:PrototypeDunGen + proto: CP14DemiplanePlatingMaskBorder + - !type:PrototypeDunGen + proto: CP14DemiplaneCavesFloorMaskStone + - !type:PrototypeDunGen + proto: CP14DemiplaneCavesFloorMaskAir + # Biomes + - !type:BiomeDunGen + biomeTemplate: CP14CavesIndestructibleFill + tileMask: + - Plating + - !type:BiomeDunGen + biomeTemplate: CP14IceCavesGeneric + tileMask: + - CP14FloorSand + - !type:BiomeDunGen + biomeTemplate: CP14IceCavesFloor + tileMask: + - CP14FloorGrass \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_snow_island.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_snow_island.yml new file mode 100644 index 0000000000..02d1e7205b --- /dev/null +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_snow_island.yml @@ -0,0 +1,60 @@ +- type: cp14DemiplaneLocation + id: T1SnowIsland + tier: 1 + locationConfig: CP14DemiplaneSnowIsland + name: cp14-demiplane-location-snow-island + tags: + - CP14DemiplaneOres + - CP14DemiplaneOpenSky + - CP14DemiplanePeacefulAnimals + - CP14DemiplaneCold + components: + - type: MapLight + ambientLightColor: "#BFEEFFFF" + - type: CP14MapFloorOccluder + - type: CP14MapDamage + - type: Parallax + parallax: CP14Ocean + - type: CP14CloudShadows + +- type: dungeonConfig + id: CP14DemiplaneSnowIsland + layers: + # Masks + - !type:PrototypeDunGen + proto: CP14DemiplaneIslandFloorMaskSnow + - !type:PrototypeDunGen + proto: CP14DemiplaneGrasslandIslandFloorMaskGrass + - !type:PrototypeDunGen + proto: CP14DemiplaneGrasslandIslandFloorMaskStone + # Biomes + - !type:BiomeDunGen + biomeTemplate: CP14SnowlandSwamp + tileMask: + - CP14FloorSand + - !type:BiomeDunGen + biomeTemplate: CP14IceCavesGeneric + tileMask: + - CP14FloorBase + - !type:BiomeDunGen + biomeTemplate: CP14SnowlandTestResult + tileMask: + - CP14FloorGrass + +- type: dungeonConfig + id: CP14DemiplaneIslandFloorMaskSnow + layers: + - !type:NoiseDistanceDunGen + size: 160, 160 + distanceConfig: !type:DunGenEuclideanSquaredDistance + blendWeight: 0.7 + layers: + - tile: CP14FloorSand + threshold: 0.50 + noise: + frequency: 0.010 + noiseType: OpenSimplex2 + fractalType: FBm + octaves: 5 + lacunarity: 2 + gain: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml index fa51e7f9cf..cb84e0ebef 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml @@ -15,6 +15,9 @@ entity: CP14Chasm tileMask: - CP14FloorBase + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep count: 5 minGroupSize: 2 maxGroupSize: 5 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml index 15f13fc963..fc1ef2980a 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml @@ -66,6 +66,19 @@ minGroupSize: 2 maxGroupSize: 3 +- type: cp14DemiplaneModifier + id: XenoTurret + tiers: + - 1 + categories: + Danger: 0.3 + layers: + - !type:OreDunGen + entity: CP14XenoTurret + count: 6 + minGroupSize: 1 + maxGroupSize: 1 + # TIER 2 - type: cp14DemiplaneModifier @@ -94,9 +107,23 @@ - CP14DemiplaneUnderground layers: - !type:OreDunGen - tileMask: - - CP14FloorBase entity: CP14MobMonsterMole count: 6 minGroupSize: 1 + maxGroupSize: 2 + +- type: cp14DemiplaneModifier + id: EnemyIceSpectre + tiers: + - 2 + name: cp14-modifier-zombie + categories: + Danger: 0.4 + requiredTags: + - CP14DemiplaneCold + layers: + - !type:OreDunGen + entity: CP14MobIceSpectre + count: 6 + minGroupSize: 1 maxGroupSize: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/MapLight/mapLight.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/MapLight/mapLight.yml index d2b6a49b12..3767a42659 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/MapLight/mapLight.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/MapLight/mapLight.yml @@ -40,7 +40,7 @@ MapLight: 1 components: - type: MapLight - ambientLightColor: "#031f04" + ambientLightColor: "#000502" - type: cp14DemiplaneModifier id: MapLightDarkNight diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml index 873f115e5a..b0717bd134 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml @@ -11,6 +11,8 @@ requiredTags: #TODO: Hot places - CP14DemiplaneOres - CP14DemiplaneUnderground + blacklistTags: + - CP14DemiplaneCold layers: - !type:OreDunGen tileMask: @@ -48,6 +50,9 @@ tileMask: - CP14FloorBase - CP14FloorSand + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalElectricSmall count: 30 minGroupSize: 1 @@ -56,6 +61,9 @@ tileMask: - CP14FloorBase - CP14FloorSand + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalElectricMedium count: 20 minGroupSize: 1 @@ -64,6 +72,9 @@ tileMask: - CP14FloorBase - CP14FloorSand + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalElectricBig count: 10 minGroupSize: 1 @@ -86,6 +97,9 @@ - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalElectricSmall count: 30 minGroupSize: 1 @@ -95,6 +109,9 @@ - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalElectricMedium count: 20 minGroupSize: 1 @@ -104,6 +121,9 @@ - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalElectricBig count: 10 minGroupSize: 1 @@ -119,14 +139,16 @@ categories: Reward: 0.1 requiredTags: - - CP14DemiplaneWater - #TODO Cold places filter + - CP14DemiplaneCold layers: - !type:OreDunGen tileMask: - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalWaterSmall count: 30 minGroupSize: 1 @@ -136,6 +158,9 @@ - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalWaterMedium count: 20 minGroupSize: 1 @@ -145,6 +170,9 @@ - CP14FloorGrass - CP14FloorGrassLight - CP14FloorGrassTall + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14CrystalElementalWaterBig count: 10 minGroupSize: 1 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml index 03e1577f82..0a1646da18 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml @@ -147,6 +147,9 @@ - CP14FloorGrassLight - CP14FloorGrassTall - CP14FloorBase + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep entity: CP14GatherableLumiMushroom count: 10 minGroupSize: 3 diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml index c3ffac7d47..152491eeb8 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml @@ -63,6 +63,67 @@ max: 0 entries: - visuals: CP14Storm + duration: + min: 10000 + max: 10000 + +- type: cp14DemiplaneModifier + id: WeatherSnowLight + tiers: + - 1 + - 2 + categories: + Weather: 1 + requiredTags: + - CP14DemiplaneCold + components: + - type: CP14WeatherController + clearDuration: + min: 0 + max: 0 + entries: + - visuals: CP14SnowLight + duration: + min: 10000 + max: 10000 + +- type: cp14DemiplaneModifier + id: WeatherSnowMedium + tiers: + - 1 + - 2 + - 3 + categories: + Weather: 1 + requiredTags: + - CP14DemiplaneCold + components: + - type: CP14WeatherController + clearDuration: + min: 0 + max: 0 + entries: + - visuals: CP14SnowMedium + duration: + min: 10000 + max: 10000 + +- type: cp14DemiplaneModifier + id: WeatherSnowHeavy + tiers: + - 2 + - 3 + categories: + Weather: 1 + requiredTags: + - CP14DemiplaneCold + components: + - type: CP14WeatherController + clearDuration: + min: 0 + max: 0 + entries: + - visuals: CP14SnowHeavy duration: min: 10000 max: 10000 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/tags.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/tags.yml index c41824c4d6..eb09e59e51 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/tags.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/tags.yml @@ -20,6 +20,9 @@ - type: Tag id: CP14DemiplaneWater + +- type: Tag + id: CP14DemiplaneCold #Cold diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_ice_caves.yml b/Resources/Prototypes/_CP14/Procedural/biome_template_ice_caves.yml new file mode 100644 index 0000000000..51b2a62aca --- /dev/null +++ b/Resources/Prototypes/_CP14/Procedural/biome_template_ice_caves.yml @@ -0,0 +1,78 @@ +- type: biomeTemplate + id: CP14IceCavesFloor + layers: + - !type:BiomeMetaLayer + template: CP14Snowland + - !type:BiomeTileLayer + tile: CP14FloorIce + threshold: 0.0 + noise: + seed: 14 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 0.1 + #Entity + - !type:BiomeEntityLayer + threshold: 0.4 + noise: + seed: 1 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 2 + allowedTiles: + - CP14FloorSnowDeepDeep + entities: + - CP14Snowdrift + +- type: biomeTemplate + id: CP14IceCavesGeneric + layers: + - !type:BiomeMetaLayer + template: CP14IceCavesFloor + #Walls + - !type:BiomeEntityLayer + threshold: -0.5 + invert: true + noise: + seed: 0 + noiseType: Perlin + fractalType: Ridged + octaves: 1 + frequency: 0.1 + gain: 0.5 + allowedTiles: + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep + entities: + - CP14WallSnow + - !type:BiomeEntityLayer + threshold: -0.2 + invert: true + noise: + seed: 156 + noiseType: Perlin + fractalType: Ridged + octaves: 1 + frequency: 0.1 + gain: 0.5 + allowedTiles: + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep + entities: + - CP14WallStone + - !type:BiomeEntityLayer + threshold: -0.5 + invert: true + noise: + seed: 0 + noiseType: Perlin + fractalType: Ridged + octaves: 1 + frequency: 0.1 + gain: 0.5 + allowedTiles: + - CP14FloorIce + entities: + - CP14WindowIceBlock \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml b/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml index e92629a6b0..2cb194bbdd 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template_snow.yml @@ -69,9 +69,9 @@ - CP14FloraTreeSnow #- CP14FloraTreeGreenLarge -# Подбиомы +# Subbiomes -# Лес +# Forest - type: biomeTemplate id: CP14SnowlandForest @@ -93,7 +93,7 @@ - CP14FloraTreeSnow #- CP14FloraTreeGreenLarge -# Холмы +# Hills - type: biomeTemplate id: CP14SnowlandHills # Холмы @@ -123,6 +123,36 @@ entities: - CP14WallSnow +# Frozen swamp + +- type: biomeTemplate + id: CP14SnowlandSwamp + layers: + - !type:BiomeMetaLayer + template: CP14Snowland + - !type:BiomeTileLayer + tile: CP14FloorIce + threshold: 0.0 + noise: + seed: 14 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 0.1 + - !type:BiomeEntityLayer # More Trees + threshold: 0.2 + noise: + seed: 4 + noiseType: OpenSimplex2 + fractalType: FBm + frequency: 2 + allowedTiles: + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep + entities: + - CP14FloraTreeSnow + #- CP14FloraTreeGreenLarge + - type: biomeTemplate id: CP14SnowlandTestResult layers: diff --git a/Resources/Prototypes/_CP14/Procedural/biome_template_swamp.yml b/Resources/Prototypes/_CP14/Procedural/biome_template_swamp.yml index f443750178..00ddc56e0f 100644 --- a/Resources/Prototypes/_CP14/Procedural/biome_template_swamp.yml +++ b/Resources/Prototypes/_CP14/Procedural/biome_template_swamp.yml @@ -59,6 +59,7 @@ frequency: 0.02 entities: - CP14FloorWater + #Lakes end - !type:BiomeTileLayer tile: CP14FloorGrassLight diff --git a/Resources/Prototypes/_CP14/Tiles/natural.yml b/Resources/Prototypes/_CP14/Tiles/natural.yml index 1d10f72e7e..216b82d48c 100644 --- a/Resources/Prototypes/_CP14/Tiles/natural.yml +++ b/Resources/Prototypes/_CP14/Tiles/natural.yml @@ -261,4 +261,23 @@ footstepSounds: collection: FootstepSnow heatCapacity: 10000 + weather: true + +- type: tile + id: CP14FloorIce + editorHidden: false + name: tiles-ice + sprite: /Textures/_CP14/Tiles/ice.png + variants: 4 + placementVariants: + - 1.0 + - 1.0 + - 1.0 + - 1.0 + baseTurf: CP14FloorBase + isSubfloor: false + heatCapacity: 10000 + mobFriction: 0.5 + mobFrictionNoInput: 0.05 + mobAcceleration: 2 weather: true \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml index 31080b5faf..77cfcb1a3d 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/Alchemy.xml @@ -18,7 +18,7 @@ A large number of “raw” substances can be found in the world. The juices of - + diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml index cd134e8a46..133c3e5dd2 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/Alchemy.xml @@ -18,7 +18,7 @@ - + diff --git a/Resources/Textures/_CP14/Tiles/attributions.yml b/Resources/Textures/_CP14/Tiles/attributions.yml index 37ad5d8e09..8898069bbe 100644 --- a/Resources/Textures/_CP14/Tiles/attributions.yml +++ b/Resources/Textures/_CP14/Tiles/attributions.yml @@ -1,16 +1,11 @@ # Attempted to keep the files in alphabetical order so its easier to audit. # Finding individual authors is an unfeasible task. If you can reference the author please do so. -- files: ["cave.png"] +- files: ["cave.png", "foundation.png", "ice.png"] license: "CC-BY-SA-3.0" copyright: "Space Station 14, recolored by TheShuEd" source: "https://github.com/crystallpunk-14/crystall-punk-14/" -- files: ["foundation.png"] - license: "CC-BY-SA-3.0" - copyright: "by TheShuEd" - source: "https://github.com/crystallpunk-14/crystall-punk-14/" - - files: ["stonebricks.png", "stonebricks_small_carved_1.png", "stonebricks_small_carved_2.png", "stonebricks_square_carved.png"] license: "All right reserved" copyright: "Created by Jaraten" diff --git a/Resources/Textures/_CP14/Tiles/ice.png b/Resources/Textures/_CP14/Tiles/ice.png new file mode 100644 index 0000000000000000000000000000000000000000..6fd1d15136e46662aee965f18ec86601d3dc1e3e GIT binary patch literal 1370 zcmV-g1*Q6lP)Px)6iGxuRA_47@q3?xSsG`WB z9=qI2AEGf$CYj9MUg?M6-rQ^^^G%XTX71Ie&tFoT;2Fa>Kp3x&4guii`ZoKK@Sn?n zSU%#%u3ykcE@y&#e1!|NJm?a@DU%#@vyQfBr-qfb1$o{xmYbin7gh{Jgg@}C3 zK4%92+P&Qw*+=2QSvR5|_c)?{0?76^VSik${nv&3EM;B4(CkOn>|yy><+~&~IAzqf z5lz;RRXk3P%fj1g2Nf;LyZe*VW1&yPCXoI3(D1BzTwzkF(M<$LoE7w;6}0affv6SCZNi7D(Tl)(rxx0z{lX!|a$nxw^^2}w`0NkkfCCj(Dmr&`0gxJ; z+u6l=?Jx)=`sDPOv(I78C+=RTp{V{5R=Cis;zSkXVaBZ@v;Z>}v?r&>wHu?)elaeg zMT=^HfMJBIB-G>b$@a0^EQGvdK~@jWe%CMFynFlo>$iw#43xZu*w=-qC4}1=hA$pf zNq&(FYv0Nq*N|AvJ}uZR?58#rvLIeJA{RmSHHgY8_K^{>mGKIhS6G%A{rd4cd(uGV zh&Z<7;3Z3HQzYl9LIbuP>8ibIcrJ}HJl?2D8CUE6V4vpf6hycN;w%2KgQw_UWFK1` z_UU2vQ^jE%8trBHEQ+^C!kZ1&B%fZlOrEpPRVS;IIKvpW6| ztSyV;fz8?Xr!|T zUm@;;@l!2vQDr5F+csf=3G9ph<^r5uoL~LC#OJPGAi11tLLG#j|*_ovKuirtQBacC4yP&|qGdWk0*9 zy4nyb{S|_ceQ`dnk)2Z2Mc}j)+rR0}hMlT`ioc$N=g5;4o;_Q%RHeTi-rKq@p^nMUWM#-t-(pJ zwSAFUSh+x4euRCXJ)n5F7GYoHl)gJh2ogU7;Os}jMU{Lyn8TJ1^5-IP$t0EsMM~;nE6aWAK07*qoM6N<$g0J7L#Q*>R literal 0 HcmV?d00001