Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions ModHelperData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ public static class ModHelperData
{
public const string Name = "OmegaCrosspathing";
public const string Description = "Allows you to merge towers together, should be fully compatible with ultimate crosspathing, custom towers, custom heroes, and custom towersets.";
public const string Version = "0.0.6";
public const string Version = "0.0.7";
public const string RepoOwner = "GrahamKracker";
public const string RepoName = "OmegaCrosspathing";
public const string WorksOnVersion = "45";
public const string WorksOnVersion = "47";
}
4 changes: 1 addition & 3 deletions Patches.cs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
{
for (var index = 0; index < Pathsliders.Length; index++)
{
Pathsliders[index] = null;

Check warning on line 96 in Patches.cs

View workflow job for this annotation

GitHub Actions / build

Cannot convert null literal to non-nullable reference type.
}

Pathsplusplussliders.Clear();
Expand Down Expand Up @@ -160,7 +160,7 @@
if (TowerSelectionMenu.instance.selectedTower.tower.mutators != null)
TowerSelectionMenu.instance.selectedTower.tower.RemoveMutatorsById("OC");

var savedata = selectedtower.GetBaseId() + ":" + selectedtower.tiers[0] + "-" + selectedtower.tiers[1] +

Check warning on line 163 in Patches.cs

View workflow job for this annotation

GitHub Actions / build

Dereference of a possibly null reference.
"-" +
selectedtower.tiers[2];

Expand Down Expand Up @@ -197,9 +197,7 @@
else
owner--;

InGame.instance.GetCashManager(owner).cash.Value -= totalcost;
InGame.instance.CashChanged();

InGame.instance.AddCash(-totalcost);
TowerSelectionMenu.instance.selectedTower.tower.worth += totalcost;


Expand Down
1 change: 1 addition & 0 deletions UI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Il2CppAssets.Scripts.Unity;
using Il2CppAssets.Scripts.Unity.UI_New.InGame;
using Il2CppAssets.Scripts.Utils;
using Il2CppNinjaKiwi.Common.ResourceUtils;
using PathsPlusPlus;
using UnityEngine;
using UnityEngine.UI;
Expand All @@ -28,9 +29,9 @@
{ TowerSet.Hero, GameData._instance.towerBackgroundSprites.heroSprite.guidRef },
};

public static ModHelperPanel _mainpanel;

Check warning on line 32 in UI.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field '_mainpanel' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the field as nullable.
public static ModHelperScrollPanel towersetselect;

Check warning on line 33 in UI.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field 'towersetselect' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the field as nullable.
public static ModHelperScrollPanel pathselect;

Check warning on line 34 in UI.cs

View workflow job for this annotation

GitHub Actions / build

Non-nullable field 'pathselect' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the field as nullable.
public static ModHelperPanel finalselect;
public static ModHelperImage towerportrait;
public static ModHelperText cost;
Expand Down
Loading