HRiggs/Performance-Fish
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rare TryFindBestBetterStoreCellFor errors, added better exception handling for drawing errors thrown by other mods

Browse Source 
Those log messages now include things and the position where drawing fails
Plant printing was slightly improved further too, correctly handling theoretical hydroponics of sizes above 20 now
This commit is contained in:
bbradson
2024-04-30 20:37:18 +02:00
parent 1ca55fc7b8
commit 79e8b5f70d
16 changed files with 183 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/PerformanceFish/Rendering/PrintImprovements.cs
+18 -13
View File
@@ -13,6 +13,11 @@ namespace PerformanceFish.Rendering;
public sealed class PrintImprovements : ClassWithFishPrepatches
{
public const float
X_ADJUSTMENT = 0.0005f,
Y_ADJUSTMENT = 0.0045f,
COMBINED_ADJUSTMENT = X_ADJUSTMENT + Y_ADJUSTMENT;
public sealed class PrintPlanePatch : FishPrepatch
{
public override string? Description { get; }
@@ -57,19 +62,19 @@ public sealed class PrintImprovements : ClassWithFishPrepatches
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static float TopLeftAdjustment(in Vector2 size)
=> (size.y * 0.0048f) + (size.x * 0.0002f);
=> (size.y * Y_ADJUSTMENT) + (size.x * X_ADJUSTMENT);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static float TopRightAdjustment(in Vector2 size)
=> (size.y * 0.0048f) - (size.x * 0.0002f);
=> (size.y * Y_ADJUSTMENT) - (size.x * X_ADJUSTMENT);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static float BottomLeftAdjustment(in Vector2 size)
=> (size.y * -0.0048f) + (size.x * 0.0002f);
=> (size.y * -Y_ADJUSTMENT) + (size.x * X_ADJUSTMENT);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static float BottomRightAdjustment(in Vector2 size)
=> (size.y * -0.0048f) - (size.x * 0.0002f);
=> (size.y * -Y_ADJUSTMENT) - (size.x * X_ADJUSTMENT);
}
public sealed class PlantPatch : FishPrepatch
@@ -113,22 +118,22 @@ public sealed class PrintImprovements : ClassWithFishPrepatches
public static Vector3 AdjustCenter(Vector3 center, Plant plant)
{
if (Math.Abs(center.y - LowPlantAltitude) > 0.001f)
var plantAltitude = plant.def.altitudeLayer;
if (Math.Abs(center.y - plantAltitude.AltitudeFor()) >= COMBINED_ADJUSTMENT)
return center;
var plantPosition = plant.PositionHeld;
var map = plant.MapHeld;
if (map.edificeGrid[plantPosition.CellToIndex(map)] is
if (map.edificeGrid[plant.PositionHeld.CellToIndex(map)] is { } building
&& building.def.altitudeLayer == plantAltitude)
{
def.altitudeLayer: AltitudeLayer.LowPlant
} building)
{
center.y += ((plantPosition.z - building.OccupiedRect().minZ) * 0.01f) + 0.005f;
var buildingDrawPos = building.DrawPos;
var buildingSize = building.GetRotatedDrawSize();
center.y += ((buildingSize.y - (buildingDrawPos.z - center.z)) * Y_ADJUSTMENT)
+ ((buildingSize.x - (buildingDrawPos.x - center.x)) * X_ADJUSTMENT);
}
return center;
}
public static readonly float LowPlantAltitude = AltitudeLayer.LowPlant.AltitudeFor();
}
}