Skip to content

Loader patch loading refactor + Custom weapons and sprites for them #94

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

Merged
johnklipi merged 2 commits into from
Jun 22, 2025
Merged

Loader patch loading refactor + Custom weapons and sprites for them #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b4915a
Refactored patch loading and added support for custom weapons creatio…
johnklipi Jun 21, 2025
0bc566f
Fix warnings
johnklipi Jun 21, 2025
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
205 changes: 120 additions & 85 deletions src/Loader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,109 @@ public static class Loader
{ "tribeAbility", typeof(TribeAbility.Type) },
{ "unitAbility", typeof(UnitAbility.Type) },
{ "improvementAbility", typeof(ImprovementAbility.Type) },
{ "playerAbility", typeof(PlayerAbility.Type) }
{ "playerAbility", typeof(PlayerAbility.Type) },
{ "weaponData", typeof(UnitData.WeaponEnum) }
};
internal static List<GameModeButtonsInformation> gamemodes = new();
private static readonly Dictionary<Type, Action<JObject, bool>> typeHandlers = new()
{
[typeof(TribeData.Type)] = new((token, duringEnumCacheCreation) =>
{
if (duringEnumCacheCreation)
{
Registry.customTribes.Add((TribeData.Type)Registry.autoidx);
token["style"] = Registry.climateAutoidx;
token["climate"] = Registry.climateAutoidx;
Registry.climateAutoidx++;
}
else
{
if (token["preview"] != null)
{
Visual.PreviewTile[] preview = JsonSerializer.Deserialize<Visual.PreviewTile[]>(token["preview"].ToString())!;
Registry.tribePreviews[Util.GetJTokenName(token)] = preview;
}
}
}),

[typeof(UnitData.Type)] = new((token, duringEnumCacheCreation) =>
{
if (duringEnumCacheCreation)
{
UnitData.Type unitPrefabType = UnitData.Type.Scout;
if (token["prefab"] != null)
{
string prefabId = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(token["prefab"]!.ToString());
if (Enum.TryParse(prefabId, out UnitData.Type parsedType))
unitPrefabType = parsedType;
}
PrefabManager.units.TryAdd((int)(UnitData.Type)Registry.autoidx, PrefabManager.units[(int)unitPrefabType]);
}
else
{
if (token["embarksTo"] != null)
{
string unitId = Util.GetJTokenName(token);
string embarkUnitId = token["embarksTo"].ToString();
Main.embarkNames[unitId] = embarkUnitId;
}
if (token["weapon"] != null)
{
string weaponString = token["weapon"].ToString();
if (EnumCache<UnitData.WeaponEnum>.TryGetType(weaponString, out UnitData.WeaponEnum type))
{
token["weapon"] = (int)type;
}
}
}
}),

[typeof(ImprovementData.Type)] = new((token, duringEnumCacheCreation) =>
{
if (duringEnumCacheCreation)
{
ImprovementData.Type improvementPrefabType = ImprovementData.Type.CustomsHouse;
if (token["prefab"] != null)
{
string prefabId = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(token["prefab"]!.ToString());
if (Enum.TryParse(prefabId, out ImprovementData.Type parsedType))
improvementPrefabType = parsedType;
}
PrefabManager.improvements.TryAdd((ImprovementData.Type)Registry.autoidx, PrefabManager.improvements[improvementPrefabType]);
}
else
{
if (token["attractsResource"] != null)
{
string improvementId = Util.GetJTokenName(token);
string attractsId = token["attractsResource"].ToString();
Main.attractsResourceNames[improvementId] = attractsId;
}
if (token["attractsToTerrain"] != null)
{
string improvementId = Util.GetJTokenName(token);
string attractsId = token["attractsToTerrain"].ToString();
Main.attractsTerrainNames[improvementId] = attractsId;
}
}
}),

[typeof(ResourceData.Type)] = new((token, duringEnumCacheCreation) =>
{
if (duringEnumCacheCreation)
{
ResourceData.Type resourcePrefabType = ResourceData.Type.Game;
if (token["prefab"] != null)
{
string prefabId = CultureInfo.CurrentCulture.TextInfo.ToTitleCase(token["prefab"]!.ToString());
if (Enum.TryParse(prefabId, out ResourceData.Type parsedType))
resourcePrefabType = parsedType;
}
PrefabManager.resources.TryAdd((ResourceData.Type)Registry.autoidx, PrefabManager.resources[resourcePrefabType]);
}
})
};

public record GameModeButtonsInformation(int gameModeIndex, UIButtonBase.ButtonAction action, int? buttonIndex, Sprite? sprite);

public static void AddGameModeButton(string id, UIButtonBase.ButtonAction action, Sprite? sprite)
Expand Down Expand Up @@ -368,66 +468,22 @@ public static void LoadGameLogicDataPatch(Mod mod, JObject gld, JObject patch)
JObject? token = jtoken.TryCast<JObject>();
if (token != null)
{
if (token["idx"] != null && (int)token["idx"] == -1)
string dataType = Util.GetJTokenName(token, 2);
if (typeMappings.TryGetValue(dataType, out Type? targetType))
{
string id = Util.GetJTokenName(token);
string dataType = Util.GetJTokenName(token, 2);
token["idx"] = Registry.autoidx;
if (typeMappings.TryGetValue(dataType, out Type? targetType))
if (token["idx"] != null && (int)token["idx"] == -1)
{
string id = Util.GetJTokenName(token);
token["idx"] = Registry.autoidx;
MethodInfo? methodInfo = typeof(EnumCache<>).MakeGenericType(targetType).GetMethod("AddMapping");
if (methodInfo != null)
{
methodInfo.Invoke(null, new object[] { id, Registry.autoidx });
methodInfo.Invoke(null, new object[] { id, Registry.autoidx });
if (targetType == typeof(TribeData.Type))
{
Registry.customTribes.Add((TribeData.Type)Registry.autoidx);
token["style"] = Registry.climateAutoidx;
token["climate"] = Registry.climateAutoidx;
Registry.climateAutoidx++;
}
else if (targetType == typeof(UnitData.Type))
{
UnitData.Type unitPrefabType = UnitData.Type.Scout;
if (token["prefab"] != null)
{
TextInfo textInfo = CultureInfo.CurrentCulture.TextInfo;
string prefabId = textInfo.ToTitleCase(token["prefab"].ToString());
if (Enum.TryParse(prefabId, out UnitData.Type parsedType))
{
unitPrefabType = parsedType;
}
}
PrefabManager.units.TryAdd((int)(UnitData.Type)Registry.autoidx, PrefabManager.units[(int)unitPrefabType]);
}
else if (targetType == typeof(ImprovementData.Type))
{
ImprovementData.Type improvementPrefabType = ImprovementData.Type.CustomsHouse;
if (token["prefab"] != null)
{
TextInfo textInfo = CultureInfo.CurrentCulture.TextInfo;
string prefabId = textInfo.ToTitleCase(token["prefab"].ToString());
if (Enum.TryParse(prefabId, out ImprovementData.Type parsedType))
{
improvementPrefabType = parsedType;
}
}
PrefabManager.improvements.TryAdd((ImprovementData.Type)Registry.autoidx, PrefabManager.improvements[improvementPrefabType]);
}
else if (targetType == typeof(ResourceData.Type))

if (typeHandlers.TryGetValue(targetType, out var handler))
{
ResourceData.Type resourcePrefabType = ResourceData.Type.Game;
if (token["prefab"] != null)
{
TextInfo textInfo = CultureInfo.CurrentCulture.TextInfo;
string prefabId = textInfo.ToTitleCase(token["prefab"].ToString());
if (Enum.TryParse(prefabId, out ResourceData.Type parsedType))
{
resourcePrefabType = parsedType;
}
}
PrefabManager.resources.TryAdd((ResourceData.Type)Registry.autoidx, PrefabManager.resources[resourcePrefabType]);
handler(token, true);
}
Plugin.logger.LogInfo("Created mapping for " + targetType.ToString() + " with id " + id + " and index " + Registry.autoidx);
Registry.autoidx++;
Expand All @@ -436,40 +492,19 @@ public static void LoadGameLogicDataPatch(Mod mod, JObject gld, JObject patch)
}
}
}
foreach (JToken jtoken in patch.SelectTokens("$.tribeData.*").ToArray())
{
JObject token = jtoken.Cast<JObject>();

if (token["preview"] != null)
{
Visual.PreviewTile[] preview = JsonSerializer.Deserialize<Visual.PreviewTile[]>(token["preview"].ToString())!;
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;
}
}
foreach (JToken jtoken in patch.SelectTokens("$.improvementData.*").ToArray())
foreach (JToken jtoken in patch.SelectTokens("$.*.*").ToArray())
{
JObject token = jtoken.Cast<JObject>();
if (token["attractsResource"] != null)
{
string improvementId = Util.GetJTokenName(token);
string attractsId = token["attractsResource"].ToString();
Main.attractsResourceNames[improvementId] = attractsId;
}
if (token["attractsToTerrain"] != null)
JObject? token = jtoken.TryCast<JObject>();
if (token != null)
{
string improvementId = Util.GetJTokenName(token);
string attractsId = token["attractsToTerrain"].ToString();
Main.attractsTerrainNames[improvementId] = attractsId;
string dataType = Util.GetJTokenName(token, 2);
if (typeMappings.TryGetValue(dataType, out Type? targetType))
{
if (typeHandlers.TryGetValue(targetType, out var handler))
{
handler(token, false);
}
}
}
}
gld.Merge(patch, new() { MergeArrayHandling = MergeArrayHandling.Replace, MergeNullValueHandling = MergeNullValueHandling.Merge });
Expand Down
29 changes: 28 additions & 1 deletion src/Managers/Visual.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public record SkinInfo(int idx, string id, SkinData? skinData);
public static Dictionary<int, int> basicPopupWidths = new();
private static bool firstTimeOpeningPreview = true;
private static UnitData.Type currentUnitTypeUI = UnitData.Type.None;
private static TribeData.Type attackerTribe = TribeData.Type.None;

#region General

Expand Down Expand Up @@ -487,10 +488,36 @@ private static void PlayerInfoIcon_SetData(PlayerInfoIcon __instance, TribeData.
private static void BasicPopup_Update(BasicPopup __instance)
{
int id = __instance.GetInstanceID();
if (Visual.basicPopupWidths.ContainsKey(id))
if (basicPopupWidths.ContainsKey(id))
__instance.rectTransform.SetWidth(basicPopupWidths[id]);
}

[HarmonyPrefix]
[HarmonyPatch(typeof(Unit), nameof(Unit.Attack))]
private static bool Unit_Attack(Unit __instance, WorldCoordinates target, bool moveToTarget, Il2CppSystem.Action onComplete)
{
if (__instance.Owner != null)
{
attackerTribe = __instance.Owner.tribe;
}
return true;
}

[HarmonyPostfix]
[HarmonyPatch(typeof(WeaponGFX), nameof(WeaponGFX.SetSkin))]
private static void WeaponGFX_SetSkin(WeaponGFX __instance, SkinType skinType)
{
if (attackerTribe != TribeData.Type.None)
{
Sprite? sprite = Registry.GetSprite(__instance.defaultSprite.name, Util.GetStyle(attackerTribe, skinType));
if (sprite != null)
{
__instance.spriteRenderer.sprite = sprite;
}
attackerTribe = TribeData.Type.None;
}
}

[HarmonyPostfix]
[HarmonyPatch(typeof(PopupBase), nameof(PopupBase.Hide))]
private static void PopupBase_Hide(PopupBase __instance)
Expand Down
Loading