]> git.smokeofanarchy.ru Git - space-station-14.git/commit
Procgen biomes (#13487)
authormetalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Sun, 12 Feb 2023 02:15:09 +0000 (13:15 +1100)
committerGitHub <noreply@github.com>
Sun, 12 Feb 2023 02:15:09 +0000 (02:15 +0000)
commit37f432ca58db3d220b6b0fd46fd7a16f61e97f82
tree0f8063752152f3f7279ffbd5345475c36dac7ef9
parente0dd65983eda9a32226e73e450f8b9a00d7c5b12
Procgen biomes (#13487)

* Planetmap tiles

Biomes etc etc

* a

* oop

* Chunk-based rendering

* funny

* Less allocations

* Fix overdraw

* Content tile edge support

Also updated grass to use it as a POC.

* Kindly revert

* Update for variant edges

* fixes

* Use fastnoise

* Remove redundant group

* a

* refactor a fair bit

* Prototype data instead

* tweaks

* a

* fix maths

* working

* a

* Slightly better empty support

* a

* flowers

* sounds

* lewd

* Networking

* more fixes

* better

* colours

* Some chunk loading

* Proper loading and unloading

* Better loading

* Fix parallax and movement sounds

* Anchoring support + decal setup

* Most of the way to load and unload

* Decal loading kinda werkin

* large trees

* started diffing

* a

* Variant support and deserts

* a

* snow

* agony, even

* working again

* todo

* a

* laba tiles

* aeiou

* a

# Conflicts:
# Resources/Prototypes/Entities/Tiles/planet.yml
# Resources/Prototypes/Tiles/planet.yml
# Resources/Textures/Tiles/Planet/Lava/lava.rsi/meta.json

* laba

* Add lava

* Initial ignition

* triggers

* a

* a

* y

* Add basalt tiles

Did some unconventional things for the animation + rocks.

* fixies

* mergies

* promotion

* lava biome

* Lava planet start

* cleanup and more lava

* laba

* maccas

* biome stuf

* weh

* bongflicts

* aeaeae

* More fixes

* a

* these too
57 files changed:
Content.Client/IconSmoothing/IconSmoothComponent.cs
Content.Client/Parallax/BiomeSystem.cs [new file with mode: 0644]
Content.Client/Parallax/ParallaxOverlay.cs
Content.MapRenderer/Painters/TilePainter.cs
Content.Server/Maps/PlanetCommand.cs
Content.Server/Parallax/BiomeSystem.cs [new file with mode: 0644]
Content.Shared/Maps/ContentTileDefinition.cs
Content.Shared/Movement/Systems/SharedMoverController.cs
Content.Shared/Parallax/Biomes/BiomeComponent.cs [new file with mode: 0644]
Content.Shared/Parallax/Biomes/BiomePrototype.cs [new file with mode: 0644]
Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs [new file with mode: 0644]
Resources/Locale/en-US/maps/planet.ftl
Resources/Locale/en-US/tiles/tiles.ftl
Resources/Prototypes/Decals/planet.yml [new file with mode: 0644]
Resources/Prototypes/Entities/Tiles/basalt.yml [moved from Resources/Prototypes/Entities/Tile/basalt.yml with 100% similarity]
Resources/Prototypes/Parallaxes/default.yml
Resources/Prototypes/Parallaxes/planet.yml
Resources/Prototypes/Tiles/floors.yml
Resources/Prototypes/Tiles/planet.yml [new file with mode: 0644]
Resources/Prototypes/biomes.yml [new file with mode: 0644]
Resources/Textures/Tiles/Asteroid/asteroid_dug.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Desert/desert.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Desert/desert_dug.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Desert/low_desert.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Desert/low_desert_dug.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Desert/meta.json [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Grass/attributions.yml [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Grass/double_edge.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Grass/grass.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Grass/single_edge.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Grass/triple_edge.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/edge0.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/edge1.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/edge2.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/gravsnow.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/gravsnow_corner.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/gravsnow_surround.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/ice.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/meta.json [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/permafrost.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/plating.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/platingdrift.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/snow.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/snow_corner.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/snow_piss.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/snow_surround.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/snowplating.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/Snow/snowwhite.png [new file with mode: 0644]
Resources/Textures/Tiles/Planet/grass.rsi/grass0.png [deleted file]
Resources/Textures/Tiles/Planet/grass.rsi/grass1.png [deleted file]
Resources/Textures/Tiles/Planet/grass.rsi/grass2.png [deleted file]
Resources/Textures/Tiles/Planet/grass.rsi/grass3.png [deleted file]
Resources/Textures/Tiles/Planet/grass.rsi/grass_corners.png [deleted file]
Resources/Textures/Tiles/Planet/grass.rsi/grass_edge_corner.png [deleted file]
Resources/Textures/Tiles/Planet/grass.rsi/grass_edges.png [deleted file]
Resources/Textures/Tiles/Planet/grass.rsi/grass_edges_old.png [deleted file]
Resources/Textures/Tiles/Planet/grass.rsi/meta.json [deleted file]