git.smokeofanarchy.ru Git - space-station-14.git/commit

]> git.smokeofanarchy.ru Git - space-station-14.git/commit

projects / space-station-14.git / commit

author	metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
	Thu, 3 Jul 2025 04:36:06 +0000 (14:36 +1000)
committer	GitHub <noreply@github.com>
	Thu, 3 Jul 2025 04:36:06 +0000 (00:36 -0400)
commit	fe7b96147c05afc160c33f033deca384e2886755
tree	67993092c1ee04fcf2c2deeefc3fdf559316c0ed	tree \| snapshot
parent	fdf3d6715e99037a8ff3a9ee6d48ac846aaa129a	commit \| diff

Biome rework (#37735)

* DungeonData rework

Back to fields, serializes better, just make new layers dumby.

* wawawewa

* Fix this

* Fixes

* Port the work over

* wawawewa

* zoom

* Kinda workin

* Adjust wawa

* Unloading work

* Ore + entitytable fixes

Iterate every dungeon not just last.

* Big shot

* wawawewa

* Fixes

* true

* Fixes

# Conflicts:
# Content.Server/Procedural/DungeonJob/DungeonJob.cs

* wawawewa

* Fixes

* Fix

* Lot of work

* wawawewa

* Fixing

* eh?

* a

* Fix a heap of stuff

* Better ignored check

* Reserve tile changes

* biome

* changes

* wawawewa

* Fixes & snow

* Shadow fixes

* wawawewa

* smol

* Add layer API

* More work

* wawawewa

* Preloads and running again

* wawawewa

* Modified

* Replacements and command

* Runtime support

* werk

* Fix expeds + dungeon alltiles

* reh

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

116 files changed:

Content.Client/Parallax/BiomeDebugOverlay.cs	[deleted file]	blob \| history
Content.Client/Parallax/BiomeSystem.cs	[deleted file]	blob \| history
Content.Client/Parallax/Commands/ShowBiomeCommand.cs	[deleted file]	blob \| history
Content.Client/Parallax/ParallaxOverlay.cs		diff \| blob \| history
Content.Client/Salvage/UI/OfferingWindowOption.xaml.cs		diff \| blob \| history
Content.Server/Gateway/Components/GatewayGeneratorComponent.cs		diff \| blob \| history
Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs		diff \| blob \| history
Content.Server/Maps/PlanetCommand.cs		diff \| blob \| history
Content.Server/NPC/Pathfinding/PathfindingSystem.Simple.cs		diff \| blob \| history
Content.Server/Parallax/BiomeSystem.Commands.cs	[deleted file]	blob \| history
Content.Server/Parallax/BiomeSystem.cs	[deleted file]	blob \| history
Content.Server/Procedural/BiomeSystem.Commands.cs	[new file with mode: 0644]	blob
Content.Server/Procedural/BiomeSystem.Planet.cs	[new file with mode: 0644]	blob
Content.Server/Procedural/BiomeSystem.cs	[new file with mode: 0644]	blob
Content.Server/Procedural/DungeonJob/DungeonJob.AutoCabling.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Biome.cs	[deleted file]	blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.BiomeMarkerLayer.cs	[deleted file]	blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.BoundaryWall.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Chunk.cs	[new file with mode: 0644]	blob
Content.Server/Procedural/DungeonJob/DungeonJob.Corridor.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.CorridorClutter.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.CorridorDecalSkirting.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.DunGenNoiseDistance.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.DunGenPrefab.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.DunGenReplaceTile.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.DungeonEntrance.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.EntityTableDunGen.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.EntranceFlank.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Exterior.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.ExternalWindow.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Fill.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Helpers.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.InternalWindow.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Junction.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.MiddleConnection.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Mobs.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Noise.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Ore.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.Roof.cs	[new file with mode: 0644]	blob
Content.Server/Procedural/DungeonJob/DungeonJob.RoomEntrance.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.SampleDecal.cs	[new file with mode: 0644]	blob
Content.Server/Procedural/DungeonJob/DungeonJob.SampleEntity.cs	[new file with mode: 0644]	blob
Content.Server/Procedural/DungeonJob/DungeonJob.SampleTile.cs	[new file with mode: 0644]	blob
Content.Server/Procedural/DungeonJob/DungeonJob.SplineDungeonConnector.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.WallMount.cs		diff \| blob \| history
Content.Server/Procedural/DungeonJob/DungeonJob.cs		diff \| blob \| history
Content.Server/Procedural/DungeonSystem.Rooms.cs		diff \| blob \| history
Content.Server/Procedural/DungeonSystem.cs		diff \| blob \| history
Content.Server/Salvage/SpawnSalvageMissionJob.cs		diff \| blob \| history
Content.Server/Shuttles/Systems/ArrivalsSystem.cs		diff \| blob \| history
Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs		diff \| blob \| history
Content.Server/Shuttles/Systems/ShuttleSystem.cs		diff \| blob \| history
Content.Server/Station/Components/StationBiomeComponent.cs		diff \| blob \| history
Content.Server/Station/Systems/StationBiomeSystem.cs		diff \| blob \| history
Content.Server/Tabletop/TabletopSystem.cs		diff \| blob \| history
Content.Shared/CCVar/CCVars.Biome.cs	[new file with mode: 0644]	blob
Content.Shared/Parallax/Biomes/BiomeComponent.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/BiomeTemplatePrototype.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/Layers/BiomeDecalLayer.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/Layers/BiomeDummyLayer.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/Layers/BiomeEntityLayer.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/Layers/BiomeMetaLayer.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/Layers/IBiomeLayer.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/Layers/IBiomeWorldLayer.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/Markers/BiomeMarkerLayerPrototype.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/Markers/IBiomeMarkerLayer.cs	[deleted file]	blob \| history
Content.Shared/Parallax/Biomes/SharedBiomeSystem.cs	[deleted file]	blob \| history
Content.Shared/Procedural/Components/BiomeComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/Components/BiomeForceUnloadComponent.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/Distance/DunGenDistanceSquared.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/DungeonConfig.cs		diff \| blob \| history
Content.Shared/Procedural/DungeonData.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/DungeonGenerators/ChunkDunGen.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/DungeonGenerators/ExteriorDunGen.cs		diff \| blob \| history
Content.Shared/Procedural/DungeonGenerators/PrototypeDunGen.cs		diff \| blob \| history
Content.Shared/Procedural/DungeonLayers/AutoCablingDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/AutoCablingDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/BoundaryWallDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/BoundaryWallDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/CornerClutterDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/CornerClutterDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/CorridorClutterDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/CorridorClutterDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/CorridorDecalSkirtingDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/CorridorDecalSkirtingDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/CorridorDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/CorridorDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/DungeonEntranceDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/DungeonEntranceDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/EntranceFlankDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/EntranceFlankDunGen.cs with 93% similarity]	diff \| blob \| history
Content.Shared/Procedural/DungeonLayers/ExternalWindowDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/ExternalWindowDunGen.cs with 94% similarity]	diff \| blob \| history
Content.Shared/Procedural/DungeonLayers/FillGridDunGen.cs		diff \| blob \| history
Content.Shared/Procedural/DungeonLayers/InternalWindowDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/InternalWindowDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/JunctionDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/JunctionDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/MiddleConnectionDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/MiddleConnectionDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/MobsDunGen.cs		diff \| blob \| history
Content.Shared/Procedural/DungeonLayers/RoofDunGen.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/DungeonLayers/RoomEntranceDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/RoomEntranceDunGen.cs with 93% similarity]	diff \| blob \| history
Content.Shared/Procedural/DungeonLayers/SampleDecalDunGen.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/DungeonLayers/SampleEntityDunGen.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/DungeonLayers/SampleTileDunGen.cs	[moved from Content.Shared/Parallax/Biomes/Layers/BiomeTileLayer.cs with 66% similarity]	diff \| blob \| history
Content.Shared/Procedural/DungeonLayers/SplineDungeonConnectorDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/SplineDungeonConnectorDunGen.cs with 83% similarity]	diff \| blob \| history
Content.Shared/Procedural/DungeonLayers/WallMountDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/WallMountDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/DungeonLayers/WormCorridorDunGen.cs	[moved from Content.Shared/Procedural/PostGeneration/WormCorridorDunGen.cs with 100% similarity]	blob \| history
Content.Shared/Procedural/Loot/BiomeLoot.cs	[new file with mode: 0644]	blob
Content.Shared/Procedural/Loot/BiomeMarkerLoot.cs	[deleted file]	blob \| history
Content.Shared/Procedural/Loot/BiomeTemplateLoot.cs	[deleted file]	blob \| history
Content.Shared/Procedural/PostGeneration/BiomeDunGen.cs	[deleted file]	blob \| history
Content.Shared/Procedural/PostGeneration/BiomeMarkerLayerDunGen.cs	[deleted file]	blob \| history
Content.Shared/Salvage/Expeditions/Modifiers/SalvageBiomeModPrototype.cs		diff \| blob \| history
Resources/Locale/en-US/procedural/biome.ftl		diff \| blob \| history
Resources/Prototypes/Entities/Tiles/water.yml		diff \| blob \| history
Resources/Prototypes/Procedural/Magnet/asteroid.yml		diff \| blob \| history
Resources/Prototypes/Procedural/Magnet/space_debris.yml		diff \| blob \| history
Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml		diff \| blob \| history
Resources/Prototypes/Procedural/biome_markers.yml		diff \| blob \| history
Resources/Prototypes/Procedural/biome_ore_templates.yml		diff \| blob \| history
Resources/Prototypes/Procedural/biome_ore_templates_low.yml		diff \| blob \| history
Resources/Prototypes/Procedural/biome_templates.yml		diff \| blob \| history
Resources/Prototypes/Procedural/dungeon_configs.yml		diff \| blob \| history
Resources/Prototypes/Procedural/salvage_loot.yml		diff \| blob \| history
Resources/Prototypes/Procedural/salvage_mods.yml		diff \| blob \| history
Resources/Prototypes/Procedural/vgroid.yml		diff \| blob \| history

Форк Space Station 14 с переводами на русский

RSS Atom