Rewrote MRB's custom embark gld setting

Author: johnklipi

src/Loader.cs

@@ -441,6 +441,16 @@ public static void LoadGameLogicDataPatch(Mod mod, JObject gld, JObject patch)
 					Registry.tribePreviews[Util.GetJTokenName(token)] = preview;
 				}
 			}
+			foreach (JToken jtoken in patch.SelectTokens("$.unitData.*").ToArray())
+			{
+				JObject token = jtoken.Cast<JObject>();
+				if (token["embarksTo"] != null)
+				{
+					string unitId = Util.GetJTokenName(token);
+					string embarkUnitId = token["embarksTo"].ToString();
+					Main.embarkNames[unitId] = embarkUnitId;
+				}
+			}
 			gld.Merge(patch, new() { MergeArrayHandling = MergeArrayHandling.Replace, MergeNullValueHandling = MergeNullValueHandling.Merge });
 			Plugin.logger.LogInfo($"Registried patch from {mod.id} mod");
 		}

src/Managers/Main.cs

@@ -16,6 +16,9 @@ public static class Main
 	internal static readonly Stopwatch stopwatch = new();
 	internal static bool fullyInitialized;
 	internal static bool dependencyCycle;
+	internal static Dictionary<string, string> embarkNames = new();
+	internal static Dictionary<UnitData.Type, UnitData.Type> embarkOverrides = new();
+	internal static bool currentlyEmbarking = false;
 
 
 	[HarmonyPrefix]
@@ -30,6 +33,20 @@ private static void GameLogicData_Parse(GameLogicData __instance, JObject rootOb
 				if (skin.skinData != null)
 					__instance.skinData[(SkinType)skin.idx] = skin.skinData;
 			}
+			foreach (KeyValuePair<string, string> entry in embarkNames)
+			{
+				try
+				{
+					UnitData.Type unit = EnumCache<UnitData.Type>.GetType(entry.Key);
+					UnitData.Type newUnit = EnumCache<UnitData.Type>.GetType(entry.Value);
+					embarkOverrides[unit] = newUnit;
+					Plugin.logger.LogInfo($"Embark unit type for {entry.Key} is now {entry.Value}");
+				}
+				catch
+				{
+					Plugin.logger.LogError($"Embark unit type for {entry.Key} is not valid: {entry.Value}");
+				}
+			}
 			fullyInitialized = true;
 		}
 	}
@@ -131,7 +148,7 @@ private static void GameModeScreen_Init(GameModeScreen __instance)
 
 	[HarmonyPrefix]
 	[HarmonyPatch(typeof(TechView), nameof(TechView.CreateNode))]
-	public static bool TechView_CreateNode(TechView __instance, TechData data, TechItem parentItem, float angle) {
+	private static bool TechView_CreateNode(TechView __instance, TechData data, TechItem parentItem, float angle) {
 		float baseAngle = 360 / GameManager.GameState.GameLogicData.GetTechData(TechData.Type.Basic).techUnlocks.Count;
 		float childAngle = 0f;
 		if (parentItem != null)
@@ -163,6 +180,37 @@ public static bool TechView_CreateNode(TechView __instance, TechData data, TechI
 		return false;
 	}
 
+	[HarmonyPrefix]
+	[HarmonyPatch(typeof(EmbarkAction), nameof(EmbarkAction.Execute))]
+	private static bool EmbarkAction_Execute_Prefix(EmbarkAction __instance, GameState gameState)
+	{
+		currentlyEmbarking = true;
+		return true;
+	}
+
+	[HarmonyPrefix]
+	[HarmonyPatch(typeof(ActionUtils), nameof(ActionUtils.TrainUnit))]
+	private static bool ActionUtils_TrainUnit(ref UnitState __result, GameState gameState, PlayerState playerState, TileData tile, ref UnitData unitData)
+	{
+		if (tile == null)
+		{
+			return true;
+		}
+		if (tile.unit == null)
+		{
+			return true;
+		}
+		if (currentlyEmbarking)
+		{
+			if (embarkOverrides.TryGetValue(tile.unit.type, out UnitData.Type newType))
+			{
+				gameState.GameLogicData.TryGetData(newType, out unitData);
+			}
+			currentlyEmbarking = false;
+		}
+		return true;
+	}
+
 	internal static void Init()
 	{
 		stopwatch.Start();