Skip to content

Preserve floor color on ship move #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bqr1s wants to merge 1 commit into
base: unstable
Choose a base branch
from
Open

Preserve floor color on ship move #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Source/1.5/ShipInteriorMod2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1950,7 +1950,7 @@ public static void MoveShip(Building core, Map targetMap, IntVec3 adjustment, Fa
List<Room> roomsToTemp = new List<Room>();
List<IntVec3> fogToCopy = new List<IntVec3>();
List<Tuple<IntVec3, float>> posTemp = new List<Tuple<IntVec3, float>>();
List<Tuple<IntVec3, TerrainDef>> terrainToCopy = new List<Tuple<IntVec3, TerrainDef>>();
List<Tuple<IntVec3, TerrainDef, ColorDef>> terrainToCopy = new List<Tuple<IntVec3, TerrainDef, ColorDef>>();
List<Tuple<IntVec3, RoofDef>> roofToCopy = new List<Tuple<IntVec3, RoofDef>>();
List<IntVec3> fireExplosions = new List<IntVec3>();
List<CompEngineTrail> nukeExplosions = new List<CompEngineTrail>();
Expand Down Expand Up @@ -2119,14 +2119,16 @@ public static void MoveShip(Building core, Map targetMap, IntVec3 adjustment, Fa
}
//store terrain
var sourceTerrain = sourceMap.terrainGrid.TerrainAt(pos);
ColorDef sourceColor = sourceMap.terrainGrid.ColorAt(pos);
if (sourceTerrain.layerable)
{
terrainToCopy.Add(new Tuple<IntVec3, TerrainDef>(adjustedPos, sourceTerrain));
terrainToCopy.Add(new Tuple<IntVec3, TerrainDef, ColorDef>(adjustedPos, sourceTerrain, sourceColor));

sourceMap.terrainGrid.RemoveTopLayer(pos, false);
}
else if (includeRock && IsRock(sourceTerrain))
{
terrainToCopy.Add(new Tuple<IntVec3, TerrainDef>(adjustedPos, sourceTerrain));
terrainToCopy.Add(new Tuple<IntVec3, TerrainDef, ColorDef>(adjustedPos, sourceTerrain, sourceColor));
sourceMap.terrainGrid.SetTerrain(pos, ResourceBank.TerrainDefOf.EmptySpace);
}
if (pos.Fogged(sourceMap))
Expand Down Expand Up @@ -2450,12 +2452,13 @@ public static void MoveShip(Building core, Map targetMap, IntVec3 adjustment, Fa
//move terrain
try
{
foreach (Tuple<IntVec3, TerrainDef> tup in terrainToCopy)
foreach (Tuple<IntVec3, TerrainDef, ColorDef> tup in terrainToCopy)
{
var targetTile = targetMap.terrainGrid.TerrainAt(tup.Item1);
if (!targetTile.layerable || IsHull(targetTile))
{
targetMap.terrainGrid.SetTerrain(tup.Item1, tup.Item2);
targetMap.terrainGrid.SetTerrainColor(tup.Item1, tup.Item3);
}
}
if (includeRock)
Expand Down