Skip to content

rework modtowerhelper.finalizehero skins, add gamemodel.getherowithnameandlevel patch #310

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
Onixiya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

rework modtowerhelper.finalizehero skins, add gamemodel.getherowithnameandlevel patch #310

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion BloonsTD6 Mod Helper/Api/Internal/VanillaSpriteGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ private static string FixName(string name)
{
if (Regex.Match(name, @"^\d\d\d-").Success)
{
name = string.Concat(name.Split('-').Reverse());
name = string.Concat(name.Split('-').AsEnumerable().Reverse());
}

if (name.Contains('#'))
Expand Down
10 changes: 5 additions & 5 deletions BloonsTD6 Mod Helper/Api/Towers/ModHero.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,8 @@ public virtual Color GetBackgroundColor(Dictionary<string, SkinData> skinsByName
/// <summary>
/// Creates the SkinData for the default tower
/// </summary>
/// <param name="skinsByName">Existing hero skins by their skin/tower name</param>
public virtual SkinData CreateDefaultSkin(Dictionary<string, SkinData> skinsByName)
/// <param name="skins">Existing hero skins</param>
public virtual SkinData CreateDefaultSkin(SkinData[]skins)
{
var skinData = ScriptableObject.CreateInstance<SkinData>();
skinData.name = skinData.baseTowerName = Id;
Expand All @@ -297,9 +297,9 @@ public virtual SkinData CreateDefaultSkin(Dictionary<string, SkinData> skinsByNa
};

skinData.textMaterialId = NameStyle;
skinData.fontMaterial = GetFontMaterial(skinsByName);
skinData.backgroundBanner = GetBackgroundBanner(skinsByName);
skinData.backgroundColourTintOverride = GetBackgroundColor(skinsByName);
skinData.fontMaterial=skins.First(skin=>skin.name==NameStyle).fontMaterial;
skinData.backgroundBanner = skins.First(skin=>skin.name==BackgroundStyle).backgroundBanner;
skinData.backgroundColourTintOverride = skins.First(skin=>skin.name==GlowStyle).backgroundColourTintOverride;

skinData.StorePortraitsContainer = new PortraitContainer
{
Expand Down
3 changes: 1 addition & 2 deletions BloonsTD6 Mod Helper/Api/Towers/ModTowerHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ internal static void FinalizeHero(ModHero modHero)
Game.instance.model.AddHeroDetails(heroDetailsModel, index);

var skinsData = GameData.Instance.skinsData;
var skinsByName = skinsData.SkinList.items.ToDictionary(data => data.name, data => data);
var skinData = modHero.CreateDefaultSkin(skinsByName);
var skinData = modHero.CreateDefaultSkin(skinsData.SkinList.items);
skinsData.AddSkins(new[] {skinData});
}
}
Expand Down
21 changes: 21 additions & 0 deletions BloonsTD6 Mod Helper/Patches/Model/GameModel_CreateModded.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,27 @@ internal static void Postfix(MapModel map, GameModel __result)
}
}

[HarmonyPatch(typeof(GameModel),nameof(GameModel.GetHeroWithNameAndLevel))]
internal static class GameModel_GetHeroWithNameAndLevel{
public static bool Prefix(GameModel __instance, string name, int tier, ref TowerModel __result){
if(ModTowerHelper.TowerCache.ContainsKey(name))
{
if(tier == 1)
{
__result = __instance.GetTowerFromId(name);
}
else
{
__result=__instance.GetTowerFromId(name+" "+tier);
}

return false;
}

return true;
}
}

[HarmonyPatch(typeof(GameModel), nameof(GameModel.CreateModded), typeof(GameModel), typeof(List<ModModel>),
typeof(List<RelicKnowledgeItemBase>))]
internal static class GameModel_CreateModded
Expand Down