diff --git a/Bytes/Alchemists.bytes b/Bytes/Alchemists.bytes index 75378ad..0709484 100644 Binary files a/Bytes/Alchemists.bytes and b/Bytes/Alchemists.bytes differ diff --git a/Bytes/Druids.bytes b/Bytes/Druids.bytes index 24f22be..9aa1459 100644 Binary files a/Bytes/Druids.bytes and b/Bytes/Druids.bytes differ diff --git a/Bytes/EngineerMonkeys.bytes b/Bytes/EngineerMonkeys.bytes index 85e1a6f..adb560d 100644 Binary files a/Bytes/EngineerMonkeys.bytes and b/Bytes/EngineerMonkeys.bytes differ diff --git a/Bytes/IceMonkeys.bytes b/Bytes/IceMonkeys.bytes index 25212f0..416716c 100644 Binary files a/Bytes/IceMonkeys.bytes and b/Bytes/IceMonkeys.bytes differ diff --git a/Bytes/MonkeySubs.bytes b/Bytes/MonkeySubs.bytes index 13ff722..13973d4 100644 Binary files a/Bytes/MonkeySubs.bytes and b/Bytes/MonkeySubs.bytes differ diff --git a/Bytes/MortarMonkeys.bytes b/Bytes/MortarMonkeys.bytes index f44ed45..01a0ab3 100644 Binary files a/Bytes/MortarMonkeys.bytes and b/Bytes/MortarMonkeys.bytes differ diff --git a/Bytes/NinjaMonkeys.bytes b/Bytes/NinjaMonkeys.bytes index 14cac57..0e6f8d0 100644 Binary files a/Bytes/NinjaMonkeys.bytes and b/Bytes/NinjaMonkeys.bytes differ diff --git a/Bytes/WizardMonkeys.bytes b/Bytes/WizardMonkeys.bytes index 49a2539..f29c564 100644 Binary files a/Bytes/WizardMonkeys.bytes and b/Bytes/WizardMonkeys.bytes differ diff --git a/LATEST.md b/LATEST.md index ba35a6b..1485896 100644 --- a/LATEST.md +++ b/LATEST.md @@ -1,3 +1,3 @@ ## See the [BTD Mod Helper Install Guide](https://gurrenm3.github.io/BTD-Mod-Helper/wiki/Install-Guide) if this is your first time downloading, and the [Common Issues](https://github.com/doombubbles/ultimate-crosspathing/blob/1.4.5/HELP.md#common-issues) page for help -- Updated for BTD6 v42.0 \ No newline at end of file +- Updated for BTD6 v42.1 \ No newline at end of file diff --git a/Loaders/AlchemistLoader.cs b/Loaders/AlchemistLoader.cs index 0e455ec..8cd7dfb 100644 --- a/Loaders/AlchemistLoader.cs +++ b/Loaders/AlchemistLoader.cs @@ -130,18 +130,6 @@ private void Read_a_AreaType_Array() { m[mIndex++] = arr; } } - private void Read_l_String_List() { - var arrSetCount = br.ReadInt32(); - var count = arrSetCount; - for (var i = 0; i < count; i++) { - var arrCount = br.ReadInt32(); - var arr = new List(arrCount); - for (var j = 0; j < arrCount; j++) { - arr.Add( br.ReadBoolean() ? null : br.ReadString() ); - } - m[mIndex++] = arr; - } - } private void Read_String_v_Single_Dictionary() { var arrSetCount = br.ReadInt32(); var count = arrSetCount; @@ -698,7 +686,8 @@ private void Set_v_RemoveBloonModifiersModel_Fields(int start, int count) { v.cleanseLead = br.ReadBoolean(); v.cleanseFortified = br.ReadBoolean(); v.cleanseOnlyIfDamaged = br.ReadBoolean(); - v.bloonTagExcludeList = (List) m[br.ReadInt32()]; + v.bloonTagExcludeList = (Il2CppStringArray) m[br.ReadInt32()]; + v.bloonTagExplicitList = (Il2CppStringArray) m[br.ReadInt32()]; } } @@ -1344,7 +1333,6 @@ protected override Il2CppAssets.Scripts.Models.Towers.TowerModel Load(byte[] byt CreateArraySet(); CreateArraySet(); CreateListSet(); - Read_l_String_List(); Read_String_v_Single_Dictionary(); //## Step 2: create empty objects diff --git a/Loaders/DruidLoader.cs b/Loaders/DruidLoader.cs index 425a9c8..a36d097 100644 --- a/Loaders/DruidLoader.cs +++ b/Loaders/DruidLoader.cs @@ -142,18 +142,6 @@ private void Read_a_AreaType_Array() { m[mIndex++] = arr; } } - private void Read_l_String_List() { - var arrSetCount = br.ReadInt32(); - var count = arrSetCount; - for (var i = 0; i < count; i++) { - var arrCount = br.ReadInt32(); - var arr = new List(arrCount); - for (var j = 0; j < arrCount; j++) { - arr.Add( br.ReadBoolean() ? null : br.ReadString() ); - } - m[mIndex++] = arr; - } - } #endregion #region Read object records @@ -540,7 +528,8 @@ private void Set_v_RemoveBloonModifiersModel_Fields(int start, int count) { v.cleanseLead = br.ReadBoolean(); v.cleanseFortified = br.ReadBoolean(); v.cleanseOnlyIfDamaged = br.ReadBoolean(); - v.bloonTagExcludeList = (List) m[br.ReadInt32()]; + v.bloonTagExcludeList = (Il2CppStringArray) m[br.ReadInt32()]; + v.bloonTagExplicitList = (Il2CppStringArray) m[br.ReadInt32()]; } } @@ -1349,15 +1338,14 @@ protected override Il2CppAssets.Scripts.Models.Towers.TowerModel Load(byte[] byt CreateArraySet(); CreateArraySet(); CreateArraySet(); - CreateArraySet(); Read_a_String_Array(); + CreateArraySet(); CreateArraySet(); Read_a_TargetType_Array(); Read_a_PrefabReference_Array(); CreateArraySet(); Read_a_Single_Array(); CreateListSet(); - Read_l_String_List(); //## Step 2: create empty objects Create_Records(); diff --git a/Loaders/EngineerMonkeyLoader.cs b/Loaders/EngineerMonkeyLoader.cs index 5b17eb4..50af5eb 100644 --- a/Loaders/EngineerMonkeyLoader.cs +++ b/Loaders/EngineerMonkeyLoader.cs @@ -130,18 +130,6 @@ private void Read_a_AreaType_Array() { m[mIndex++] = arr; } } - private void Read_l_String_List() { - var arrSetCount = br.ReadInt32(); - var count = arrSetCount; - for (var i = 0; i < count; i++) { - var arrCount = br.ReadInt32(); - var arr = new List(arrCount); - for (var j = 0; j < arrCount; j++) { - arr.Add( br.ReadBoolean() ? null : br.ReadString() ); - } - m[mIndex++] = arr; - } - } #endregion #region Read object records @@ -685,7 +673,8 @@ private void Set_v_RemoveBloonModifiersModel_Fields(int start, int count) { v.cleanseLead = br.ReadBoolean(); v.cleanseFortified = br.ReadBoolean(); v.cleanseOnlyIfDamaged = br.ReadBoolean(); - v.bloonTagExcludeList = (List) m[br.ReadInt32()]; + v.bloonTagExcludeList = (Il2CppStringArray) m[br.ReadInt32()]; + v.bloonTagExplicitList = (Il2CppStringArray) m[br.ReadInt32()]; } } @@ -1414,7 +1403,6 @@ protected override Il2CppAssets.Scripts.Models.Towers.TowerModel Load(byte[] byt CreateArraySet(); Read_a_TargetType_Array(); CreateListSet(); - Read_l_String_List(); //## Step 2: create empty objects Create_Records(); diff --git a/Loaders/IceMonkeyLoader.cs b/Loaders/IceMonkeyLoader.cs index 3a7fec8..b14d7b9 100644 --- a/Loaders/IceMonkeyLoader.cs +++ b/Loaders/IceMonkeyLoader.cs @@ -118,18 +118,6 @@ private void Read_a_AreaType_Array() { m[mIndex++] = arr; } } - private void Read_l_String_List() { - var arrSetCount = br.ReadInt32(); - var count = arrSetCount; - for (var i = 0; i < count; i++) { - var arrCount = br.ReadInt32(); - var arr = new List(arrCount); - for (var j = 0; j < arrCount; j++) { - arr.Add( br.ReadBoolean() ? null : br.ReadString() ); - } - m[mIndex++] = arr; - } - } #endregion #region Read object records @@ -1162,7 +1150,8 @@ private void Set_v_RemoveBloonModifiersModel_Fields(int start, int count) { v.cleanseLead = br.ReadBoolean(); v.cleanseFortified = br.ReadBoolean(); v.cleanseOnlyIfDamaged = br.ReadBoolean(); - v.bloonTagExcludeList = (List) m[br.ReadInt32()]; + v.bloonTagExcludeList = (Il2CppStringArray) m[br.ReadInt32()]; + v.bloonTagExplicitList = (Il2CppStringArray) m[br.ReadInt32()]; } } @@ -1219,7 +1208,6 @@ protected override Il2CppAssets.Scripts.Models.Towers.TowerModel Load(byte[] byt CreateArraySet(); CreateArraySet(); CreateListSet(); - Read_l_String_List(); //## Step 2: create empty objects Create_Records(); diff --git a/Loaders/MonkeySubLoader.cs b/Loaders/MonkeySubLoader.cs index ce14ca6..110056e 100644 --- a/Loaders/MonkeySubLoader.cs +++ b/Loaders/MonkeySubLoader.cs @@ -118,18 +118,6 @@ private void Read_a_AreaType_Array() { m[mIndex++] = arr; } } - private void Read_l_String_List() { - var arrSetCount = br.ReadInt32(); - var count = arrSetCount; - for (var i = 0; i < count; i++) { - var arrCount = br.ReadInt32(); - var arr = new List(arrCount); - for (var j = 0; j < arrCount; j++) { - arr.Add( br.ReadBoolean() ? null : br.ReadString() ); - } - m[mIndex++] = arr; - } - } #endregion #region Read object records @@ -1066,7 +1054,8 @@ private void Set_v_RemoveBloonModifiersModel_Fields(int start, int count) { v.cleanseLead = br.ReadBoolean(); v.cleanseFortified = br.ReadBoolean(); v.cleanseOnlyIfDamaged = br.ReadBoolean(); - v.bloonTagExcludeList = (List) m[br.ReadInt32()]; + v.bloonTagExcludeList = (Il2CppStringArray) m[br.ReadInt32()]; + v.bloonTagExplicitList = (Il2CppStringArray) m[br.ReadInt32()]; } } @@ -1180,7 +1169,6 @@ protected override Il2CppAssets.Scripts.Models.Towers.TowerModel Load(byte[] byt CreateArraySet(); CreateArraySet(); CreateListSet(); - Read_l_String_List(); //## Step 2: create empty objects Create_Records(); diff --git a/Loaders/MortarMonkeyLoader.cs b/Loaders/MortarMonkeyLoader.cs index 10e8ac9..fce5a7d 100644 --- a/Loaders/MortarMonkeyLoader.cs +++ b/Loaders/MortarMonkeyLoader.cs @@ -118,18 +118,6 @@ private void Read_a_AreaType_Array() { m[mIndex++] = arr; } } - private void Read_l_String_List() { - var arrSetCount = br.ReadInt32(); - var count = arrSetCount; - for (var i = 0; i < count; i++) { - var arrCount = br.ReadInt32(); - var arr = new List(arrCount); - for (var j = 0; j < arrCount; j++) { - arr.Add( br.ReadBoolean() ? null : br.ReadString() ); - } - m[mIndex++] = arr; - } - } #endregion #region Read object records @@ -505,7 +493,8 @@ private void Set_v_RemoveBloonModifiersModel_Fields(int start, int count) { v.cleanseLead = br.ReadBoolean(); v.cleanseFortified = br.ReadBoolean(); v.cleanseOnlyIfDamaged = br.ReadBoolean(); - v.bloonTagExcludeList = (List) m[br.ReadInt32()]; + v.bloonTagExcludeList = (Il2CppStringArray) m[br.ReadInt32()]; + v.bloonTagExplicitList = (Il2CppStringArray) m[br.ReadInt32()]; } } @@ -1154,7 +1143,6 @@ protected override Il2CppAssets.Scripts.Models.Towers.TowerModel Load(byte[] byt CreateArraySet(); CreateArraySet(); CreateListSet(); - Read_l_String_List(); //## Step 2: create empty objects Create_Records(); diff --git a/Loaders/NinjaMonkeyLoader.cs b/Loaders/NinjaMonkeyLoader.cs index d6aafce..5bb056c 100644 --- a/Loaders/NinjaMonkeyLoader.cs +++ b/Loaders/NinjaMonkeyLoader.cs @@ -130,18 +130,6 @@ private void Read_a_AreaType_Array() { m[mIndex++] = arr; } } - private void Read_l_String_List() { - var arrSetCount = br.ReadInt32(); - var count = arrSetCount; - for (var i = 0; i < count; i++) { - var arrCount = br.ReadInt32(); - var arr = new List(arrCount); - for (var j = 0; j < arrCount; j++) { - arr.Add( br.ReadBoolean() ? null : br.ReadString() ); - } - m[mIndex++] = arr; - } - } #endregion #region Read object records @@ -533,7 +521,8 @@ private void Set_v_RemoveBloonModifiersModel_Fields(int start, int count) { v.cleanseLead = br.ReadBoolean(); v.cleanseFortified = br.ReadBoolean(); v.cleanseOnlyIfDamaged = br.ReadBoolean(); - v.bloonTagExcludeList = (List) m[br.ReadInt32()]; + v.bloonTagExcludeList = (Il2CppStringArray) m[br.ReadInt32()]; + v.bloonTagExplicitList = (Il2CppStringArray) m[br.ReadInt32()]; } } @@ -1246,7 +1235,6 @@ protected override Il2CppAssets.Scripts.Models.Towers.TowerModel Load(byte[] byt CreateArraySet(); CreateArraySet(); CreateListSet(); - Read_l_String_List(); //## Step 2: create empty objects Create_Records(); diff --git a/Loaders/WizardMonkeyLoader.cs b/Loaders/WizardMonkeyLoader.cs index 65dc674..65a37de 100644 --- a/Loaders/WizardMonkeyLoader.cs +++ b/Loaders/WizardMonkeyLoader.cs @@ -118,18 +118,6 @@ private void Read_a_AreaType_Array() { m[mIndex++] = arr; } } - private void Read_l_String_List() { - var arrSetCount = br.ReadInt32(); - var count = arrSetCount; - for (var i = 0; i < count; i++) { - var arrCount = br.ReadInt32(); - var arr = new List(arrCount); - for (var j = 0; j < arrCount; j++) { - arr.Add( br.ReadBoolean() ? null : br.ReadString() ); - } - m[mIndex++] = arr; - } - } #endregion #region Read object records @@ -633,7 +621,8 @@ private void Set_v_RemoveBloonModifiersModel_Fields(int start, int count) { v.cleanseLead = br.ReadBoolean(); v.cleanseFortified = br.ReadBoolean(); v.cleanseOnlyIfDamaged = br.ReadBoolean(); - v.bloonTagExcludeList = (List) m[br.ReadInt32()]; + v.bloonTagExcludeList = (Il2CppStringArray) m[br.ReadInt32()]; + v.bloonTagExplicitList = (Il2CppStringArray) m[br.ReadInt32()]; } } @@ -1279,14 +1268,13 @@ protected override Il2CppAssets.Scripts.Models.Towers.TowerModel Load(byte[] byt CreateArraySet(); CreateArraySet(); CreateArraySet(); + Read_a_String_Array(); CreateArraySet(); CreateArraySet(); - Read_a_String_Array(); CreateArraySet(); Read_a_TargetType_Array(); CreateArraySet(); CreateListSet(); - Read_l_String_List(); //## Step 2: create empty objects Create_Records(); diff --git a/ModHelperData.cs b/ModHelperData.cs index 54acb94..a95d658 100644 --- a/ModHelperData.cs +++ b/ModHelperData.cs @@ -2,8 +2,8 @@ { public static class ModHelperData { - public const string WorksOnVersion = "42.0"; - public const string Version = "1.4.8"; + public const string WorksOnVersion = "42.1"; + public const string Version = "1.4.9"; public const string Name = "Ultimate Crosspathing"; public const string Description =