Skip to content

Commit

Permalink
Fix for v45
Browse files Browse the repository at this point in the history
  • Loading branch information
doombubbles committed Oct 9, 2024
1 parent a1b8168 commit b257704
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 14 deletions.
4 changes: 3 additions & 1 deletion Displays/CardMonkeyBaseDisplay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ public override void ModifyDisplayNode(UnityDisplayNode node)
#endif

// Set our custom texture
SetMeshTexture(node, Name);
// SetMeshTexture(node, Name);
SetMeshOutlineColor(node, new Color(73f / 255, 175f / 255, 52f / 255));

node.GetRenderer("FlatSkin").AdjustHSV(56, .3f, .9f, new Color(255 / 255f, 244 / 255f, 0 / 255f), .4f);

// Make it not hold the Boomerang
node.RemoveBone("SuperMonkeyRig:Dart");
}
Expand Down
4 changes: 3 additions & 1 deletion Displays/CardMonkeyMultiDisplay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,9 @@ public override void ModifyDisplayNode(UnityDisplayNode node)
#endif

// Always set the MeshTexture to the same one, since all the cross-paths use the same original sprite atlas
SetMeshTexture(node, nameof(CardMonkeyBaseDisplay));
// SetMeshTexture(node, nameof(CardMonkeyBaseDisplay));

node.GetRenderer("FlatSkin").AdjustHSV(56, .3f, .9f, new Color(255 / 255f, 244 / 255f, 0 / 255f), .4f);

SetMeshOutlineColor(node, new Color(73f / 255, 175f / 255, 52f / 255));

Expand Down
5 changes: 2 additions & 3 deletions Displays/CardMonkeyParagonDisplay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@ public CardMonkeyParagonDisplay(int i)

public override float Scale => .75f + ParagonDisplayIndex * .025f;

public override string BaseDisplay =>
Game.instance.model.GetTower(TowerType.SuperMonkey, 5).GetAttackModel().GetBehavior<DisplayModel>().display
.GUID;
public override string BaseDisplay => Game.instance.model.GetTower(TowerType.SuperMonkey, 5).GetAttackModel()
.GetBehavior<DisplayModel>().display.AssetGUID;

public override int ParagonDisplayIndex { get; }

Expand Down
Binary file modified Displays/Tier5/TFDisplay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Displays/Tier5/TFDisplay_35.png
Binary file not shown.
Binary file added Displays/Tier5/TFDisplay_44.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion LATEST.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- Fixed displays for BTD6 v44
- Fixed for BTD6 v45
4 changes: 2 additions & 2 deletions ModHelperData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
public static class ModHelperData
{
public const string WorksOnVersion = "44.0";
public const string Version = "1.2.11";
public const string WorksOnVersion = "45.0";
public const string Version = "1.2.12";
public const string Name = "Card Monkey";
public const string Description =
"Adds in a new custom tower themed around playing cards.";
Expand Down
5 changes: 3 additions & 2 deletions Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
"BloonsTD6": {
"commandName": "Executable",
"executablePath": "$(BloonsTD6)/BloonsTD6.exe",
"workingDirectory": "$(BloonsTD6)"
"workingDirectory": "$(BloonsTD6)",
"commandLineArgs": "moddingDev"
},
"BloonsTD6 (ML Debug)": {
"commandName": "Executable",
"executablePath": "$(BloonsTD6)/BloonsTD6.exe",
"workingDirectory": "$(BloonsTD6)",
"commandLineArgs": "--melonloader.debug"
"commandLineArgs": "moddingDev --melonloader.debug"
}
}
}
7 changes: 3 additions & 4 deletions Upgrades/MiddlePath/AcesWild.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Linq;
using BTD_Mod_Helper.Api.Enums;
using Il2CppAssets.Scripts.Models.Towers;
using Il2CppAssets.Scripts.Models.Towers.Projectiles.Behaviors;
using BTD_Mod_Helper.Api.Towers;
Expand All @@ -25,10 +26,8 @@ public override void ApplyUpgrade(TowerModel tower)
foreach (var projectile in tower.GetWeapons().Select(weaponModel => weaponModel.projectile))
{
projectile.GetDamageModel().damage++;
projectile.AddBehavior(new DamageModifierForTagModel("DamageModifierForTagModel_Ceramic", "Ceramic",
1, 3, false, false));
projectile.AddBehavior(new DamageModifierForTagModel("DamageModifierForTagModel_Fortified", "Fortified",
1, 3, false, false));
projectile.AddBehavior(new DamageModifierForTagModel("", "Ceramic", 1, 3, false, false));
projectile.AddBehavior(new DamageModifierForTagModel("", "Fortified", 1, 3, false, false));
projectile.ApplyDisplay<WildAceCardDisplay>();
projectile.hasDamageModifiers = true;
}
Expand Down

0 comments on commit b257704

Please sign in to comment.