Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix salvage dungeon spawn offset + remove mining (#16379)

Browse Source
This commit is contained in:
metalgearsloth
2023-05-14 01:42:37 +10:00
committed by GitHub
parent 962a7736d6
commit 8d03d25f27
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/Salvage/SalvageSystem.Expeditions.cs
View File

@@ -232,6 +232,9 @@ public sealed partial class SalvageSystem
if (configs.Count == 0) if (configs.Count == 0)
return; return;
// Temporarily removed coz it SUCKS
configs.Remove(SalvageMissionType.Mining);
for (var i = 0; i < MissionLimit; i++) for (var i = 0; i < MissionLimit; i++)
{ {
_random.Shuffle(configs); _random.Shuffle(configs);

17
Content.Server/Salvage/SpawnSalvageMissionJob.cs
View File

@@ -139,26 +139,19 @@ public sealed class SpawnSalvageMissionJob : Job<bool>
_entManager.InitializeAndStartEntity(ftlUid); _entManager.InitializeAndStartEntity(ftlUid);
var landingPadRadius = 24; var landingPadRadius = 24;
var minDungeonOffset = landingPadRadius + 12; var minDungeonOffset = landingPadRadius + 4;
// We'll use the dungeon rotation as the spawn angle
var dungeonRotation = _dungeon.GetDungeonRotation(_missionParams.Seed); var dungeonRotation = _dungeon.GetDungeonRotation(_missionParams.Seed);
var dungeonSpawnRotation = new Angle(random.NextDouble() * Math.Tau);
// If the dungeon were to spawn facing the landing pad then bump the offset a bit
// This isn't robust but fine for now.
if (Math.Abs((dungeonRotation - dungeonSpawnRotation).Theta) < Math.PI / 2)
{
minDungeonOffset += 16;
}
Dungeon dungeon = default!; Dungeon dungeon = default!;
if (config != SalvageMissionType.Mining) if (config != SalvageMissionType.Mining)
{ {
var maxDungeonOffset = minDungeonOffset + 24; var maxDungeonOffset = minDungeonOffset + 12;
var dungeonOffsetDistance = minDungeonOffset + (maxDungeonOffset - minDungeonOffset) * random.NextFloat(); var dungeonOffsetDistance = minDungeonOffset + (maxDungeonOffset - minDungeonOffset) * random.NextFloat();
var dungeonOffset = new Vector2(dungeonOffsetDistance, 0f); var dungeonOffset = new Vector2(0f, dungeonOffsetDistance);
dungeonOffset = dungeonSpawnRotation.RotateVec(dungeonOffset); dungeonOffset = dungeonRotation.RotateVec(dungeonOffset);
var dungeonMod = _prototypeManager.Index<SalvageDungeonMod>(mission.Dungeon); var dungeonMod = _prototypeManager.Index<SalvageDungeonMod>(mission.Dungeon);
var dungeonConfig = _prototypeManager.Index<DungeonConfigPrototype>(dungeonMod.Proto); var dungeonConfig = _prototypeManager.Index<DungeonConfigPrototype>(dungeonMod.Proto);
dungeon = dungeon =