From 0b209b8a605d52f5942cddb927c191b7aecb33ab Mon Sep 17 00:00:00 2001 From: doombubbles Date: Tue, 6 Feb 2024 17:35:11 -0800 Subject: [PATCH] Initial fixes for v41.0 --- BloonsTD6 Mod Helper/Api/Enums/UpgradeType.cs | 2 + .../Api/Enums/VanillaSprites.cs | 260 +++++++++++++++++- BloonsTD6 Mod Helper/Api/UI/ModGameMenu.cs | 11 +- BloonsTD6 Mod Helper/BloonsTD6Mod.cs | 52 ++-- .../ModelExtensions/BloonModelExt.cs | 11 +- .../ModelExtensions/TowerDetailsModelExt.cs | 1 + .../ModelExtensions/TowerModelExt.cs | 2 +- .../StandardTowerPurchaseButtonExt.cs | 6 +- BloonsTD6 Mod Helper/LATEST.md | 5 +- BloonsTD6 Mod Helper/ModHelper.cs | 2 +- .../Patches/InGame/Hotkeys_Setup.cs | 2 +- .../Patches/UI/ShopMenu_CreateTowerButton.cs | 3 +- ...tches.cs => TowerPurchaseButtonPatches.cs} | 12 +- Documentation/BTD_Mod_Helper.BloonsTD6Mod.md | 16 +- ...tensions.StandardTowerPurchaseButtonExt.md | 41 +-- ..._Helper.Extensions.TowerDetailsModelExt.md | 4 +- ...BTD_Mod_Helper.Extensions.TowerModelExt.md | 4 +- 17 files changed, 338 insertions(+), 96 deletions(-) rename BloonsTD6 Mod Helper/Patches/UI/{StandardTowerPurchaseButtonPatches.cs => TowerPurchaseButtonPatches.cs} (58%) diff --git a/BloonsTD6 Mod Helper/Api/Enums/UpgradeType.cs b/BloonsTD6 Mod Helper/Api/Enums/UpgradeType.cs index 674409098..a1c8d6f68 100644 --- a/BloonsTD6 Mod Helper/Api/Enums/UpgradeType.cs +++ b/BloonsTD6 Mod Helper/Api/Enums/UpgradeType.cs @@ -126,6 +126,7 @@ public static class UpgradeType public const string TripleGuns = "Triple Guns"; public const string ArmorPiercingDarts = "Armor Piercing Darts"; public const string SubCommander = "Sub Commander"; + public const string MonkeysubParagon = "MonkeySub Paragon"; public const string FasterShootingBuccaneer = "Buccaneer-Faster Shooting"; public const string DoubleShotBuccaneer = "Buccaneer-Double Shot"; public const string Destroyer = "Buccaneer-Destroyer"; @@ -765,6 +766,7 @@ public static class UpgradeType { "TripleGuns", TripleGuns }, { "ArmorPiercingDarts", ArmorPiercingDarts }, { "SubCommander", SubCommander }, + { "MonkeysubParagon", MonkeysubParagon }, { "FasterShootingBuccaneer", FasterShootingBuccaneer }, { "DoubleShotBuccaneer", DoubleShotBuccaneer }, { "Destroyer", Destroyer }, diff --git a/BloonsTD6 Mod Helper/Api/Enums/VanillaSprites.cs b/BloonsTD6 Mod Helper/Api/Enums/VanillaSprites.cs index 4d8141fc1..b6950369c 100644 --- a/BloonsTD6 Mod Helper/Api/Enums/VanillaSprites.cs +++ b/BloonsTD6 Mod Helper/Api/Enums/VanillaSprites.cs @@ -825,6 +825,7 @@ public static class VanillaSprites public const string AllRegenIcon = "ChallengeRulesIcons[AllRegenIcon]"; public const string AlternateBloonsBtn = "6f3dad688cf41764f97f8bd217e1802b"; public const string AlternateBloonsIcon = "f1872f17471224f6b90ed6c63c4e1a83"; + public const string AmbientFxButterfliesIcon = "ebd73451b77c8ad4e8c5cafbbda14773"; public const string AmbientFxDust2Icon = "aad8571e241c8944e9eced2abe414846"; public const string AmbientFxDustIcon = "213504308e3ec8245a66d748fbe6f195"; public const string AmbientFxFlowersYellowIcon = "0f679ab1ec18ae849b4bf51b95c5adaf"; @@ -904,8 +905,8 @@ public static class VanillaSprites public const string BadBloonIcon = "d0df65b56631b40daab49cdf46e305ad"; public const string BadConnectionBtn = "e3bb574d4e78a4945adcec0e41a2f898"; public const string BadFortifiedIcon = "UiBloonIcons[BadFortifiedIcon]"; - public const string BadIcon = "UiBloonIcons[BadIcon]"; public const string BADIcon = "782649f94b71c4e1e906572a88ed6809"; + public const string BadIcon = "UiBloonIcons[BadIcon]"; public const string BadMaimMoabParticle = "Bloons[BadMaimMoabParticle]"; public const string BalanceHedge = "b86fd6591121dd942b5ff4cab5dd3d90"; public const string BallisticMissileUpgradeIcon = "eb4cd4ae94d648b42b233139d0019869"; @@ -975,6 +976,7 @@ public static class VanillaSprites public const string BenjaminHeroBundlePackShop = "c9e66f8bdb2ab49fea345d43f63a6aca"; public const string BenjaminIcon = "MonkeyIcons[BenjaminIcon]"; public const string BenjaminMatrixPlacementIcon = "3f5b06699342a46498a873362b0aa85a"; + public const string BenjaminMousePetIcon = "1b6c52490be03bf4cbca5e7dbd4501f4"; public const string BenjaminPortrait = "b382beb4f44ae5d46b5e2f98fde91283"; public const string BenjaminPortraitLvl10 = "85c3550f23951408e856335e9f4b6b63"; public const string BenjaminPortraitLvl20 = "1cc4a53fcb16346a8b75cb08b8032a2e"; @@ -1295,6 +1297,7 @@ public static class VanillaSprites public const string BuffIconHotSauce = "UiBuffIcons[BuffIconHotSauce]"; public const string BuffIconIcex5x = "UiBuffIcons[BuffIconIcex5x]"; public const string BuffIconJarOfPickles = "UiBuffIcons[BuffIconJarOfPickles]"; + public const string BuffIconMonkeySubParagon = "UiBuffIcons[BuffIconMonkeySubParagon]"; public const string BuffIconNavalTactics = "UiBuffIcons[BuffIconNavalTactics]"; public const string BuffIconNinjax3x = "UiBuffIcons[BuffIconNinjax3x]"; public const string BuffIconObyn = "UiBuffIcons[BuffIconObyn]"; @@ -1340,6 +1343,12 @@ public static class VanillaSprites public const string BurnyStuffUpgradeIcon = "f7ea628a926024e1c84b401a0ddcccd3"; public const string BushesRow = "a60db9685ca49de4ca720511181c2de5"; public const string ButterfliesUpgradeFxIcon = "8ca0f964d1143ab4c90be147bc9c6c1b"; + public const string ButterflyBlack = "09bdd0836cc4d964ca3b0e2c3907f4f0"; + public const string ButterflyBlue = "599e5fd8ec8286b46a20685f0d892d22"; + public const string ButterflyGreen = "4de69ce6cc6156f41bd13e321e7d5a5d"; + public const string ButterflyPurple = "2ccdbca5d6eed0048b4f7b9a76d87e4f"; + public const string ButterflyRed = "f75f05e8971975a458cddba32eede15e"; + public const string ButterflyYellow = "2f63a5bd6b0211940800dc8ebd4aa754"; public const string CabinBridge = "1f9d341720bfc3a4d92406e1c454b1d7"; public const string CabinBridgeMini = "718eec15842ebf441a1c4c3a97e76f05"; public const string CactusFlower = "45dfef02c4aaca245a7feaad88b986b7"; @@ -1361,8 +1370,23 @@ public static class VanillaSprites public const string CampfirePropIcon = "9f6f412ef284fff46a5a9207300cd299"; public const string CandleGlow = "62538125318edd64d92e0f34adfdee33"; public const string Candles = "e87ad11db87fdab4ea4e0c4535347944"; + public const string CandyBlue = "9749184db833fdf459926ea9b9143f86"; public const string CandyCane = "cb750d54daf4d7d4ab8a2b911e61980f"; public const string CandyCorn = "26a18d5c966cbb04a9ccdfa2124af25e"; + public const string CandyFlossTreeBlue = "1737076d88249824184756e4a392cb6c"; + public const string CandyFlossTreeGreen = "9842be16594c9054c97b7cc308123506"; + public const string CandyFlossTreeOrange = "3fa1d22a619302641b6f4775bd65f3d7"; + public const string CandyFlossTreePink = "e288973eaac67e54d987e7cf0b64544d"; + public const string CandyFlossTreePurple = "432f5ca8aaa6b8b4aa91c6e30018a846"; + public const string CandyGreen = "5cb9318fd5d09614b986fbbd55395f52"; + public const string CandyOrange = "4cf7e04bdb1dc724b849cc799b964697"; + public const string CandyPink = "1087c3954e33b664cab11f84b0210290"; + public const string CandyPurple = "fe1435dc0bf0262438659e198090ecfb"; + public const string CandyRed = "d8908f1e2cdae8747bbe217f0bbdbca2"; + public const string CandySwirlBlue = "be3b5f5243750dc4dbbaf6713ac7c010"; + public const string CandySwirlPink = "d50fbf415a4e64b438d487e297c919a4"; + public const string CandySwirlRed = "788d35532ab383e4dbf3ec5be1aad05a"; + public const string CandySwirlYellow = "94bc2912c7a9fc0499f055cf19c920f4"; public const string CannonBall = "803e377c8c8523e479744132a9c20353"; public const string CannonShipUpgradeIcon = "40577fc673f02d0469cf38e005092009"; public const string CaptainChurchillIcon = "MonkeyIcons[CaptainChurchillIcon]"; @@ -1471,7 +1495,21 @@ public static class VanillaSprites public const string ChestIconPip = "b7ff48f931489c845ba363d5b41f72e1"; public const string CHIMPSIcon = "3f868bbf2f43344a78ddff2450dfa493"; public const string ChocolateBfbIcon = "45fa5bfa9e6c2484386df50aca83eb6a"; + public const string ChocolateBlue = "a67a494f678a85f43a99ff389f4d298a"; + public const string ChocolateBrown = "615dc0cbb4b07fd48a1c01dfd756f5d7"; + public const string ChocolateChocolate = "ab70a7b5697ef464bb36c996553bbb2d"; + public const string ChocolateCube = "76a4a9f09dbb3544fb14768590c56b57"; + public const string ChocolateDarkBlue = "61f8f4ce0f5736a498bb6c0186874fbd"; + public const string ChocolateGreen = "2f43504bdf3ac6349ba6baff9ac1104d"; public const string ChocolateMoabIcon = "a13d5e8bc31767046b0ebd31b5d5d18b"; + public const string ChocolateOrange = "4687837fbe45fd5448a77409fa16cfe2"; + public const string ChocolatePink = "2b2007f842152cd4aa66e296a564cdaa"; + public const string ChocolatePink1 = "9fe1d40bfa3cee846b60265d2c4d1e98"; + public const string ChocolatePontoonIcon = "a218cd61bfb32104fa0bb8db0c74fad3"; + public const string ChocolatePurple = "424218bf70f5b4646ad09b38218b94d3"; + public const string ChocolateRed = "010f16ee08b503345a0fae7743f0f5f9"; + public const string ChocolateRock = "a84174d72394a384693d2090302cd97c"; + public const string ChocolateYellow = "23df956185780d84e972df90d25904fb"; public const string ChristmasEventMonkey = "UiEventsCollection[ChristmasEventMonkey]"; public const string ChristmasLight = "61de5bc38f5b1b4418cfa040125b9371"; public const string ChristmasTree = "0fb22995f4ac40645b5f7d7aa41d6acf"; @@ -1486,6 +1524,7 @@ public static class VanillaSprites public const string Circle = "67a408adadcbaeb469cf6161f058748d"; public const string CircleInsert = "Ui[CircleInsert]"; public const string CircleRing = "Ui[CircleRing]"; + public const string CircleRingThick = "Ui[CircleRingThick]"; public const string CircleUi = "f9037ab81e979504f8ed345e77671a80"; public const string CircusGwendolinIcon = "MonkeyIcons[CircusGwendolinIcon]"; public const string CircusGwendolinPortrait = "61d8f2bcc14f97c4a81029c6fd3fe2fb"; @@ -1562,6 +1601,10 @@ public static class VanillaSprites public const string Coop3PlayersIcon = "54d1ee7a661774e44b53ef63aa4bebb1"; public const string Coop4PlayerIcon = "MainMenuUiAtlas[Coop4PlayerIcon]"; public const string Coop4PlayersICon = "91dcc7476701444488ea4a46d65f5f8d"; + public const string CoopBest1Player = "a872f89d303031f4c8cbe9adac01e702"; + public const string CoopBest2Player = "a6d4e798ce878a0469e4e734b2bbf169"; + public const string CoopBest3Player = "92f5037c55b5a6e459d61261cf1b60d1"; + public const string CoopBest4Player = "8dd96b816afb58a43af37794196e9e64"; public const string CoOpIcon = "5e5b59044b7b0e64abdb35ee2aa51d6c"; public const string CoOpIconSmall = "IngameUi[CoOpIconSmall]"; public const string CoopLongMatchBtn = "MainMenuUiAtlas[CoopLongMatchBtn]"; @@ -1735,8 +1778,8 @@ public static class VanillaSprites public const string DataTransferIcon = "Ui[DataTransferIcon]"; public const string DavidsVsGoliathIcon = "878f2e36487cd5f41b82744d013fb3ae"; public const string DdtFortifiedIcon = "UiBloonIcons[DdtFortifiedIcon]"; - public const string DdtIcon = "UiBloonIcons[DdtIcon]"; public const string DDTIcon = "4ee11d36d07674b47ad08c324e41b953"; + public const string DdtIcon = "UiBloonIcons[DdtIcon]"; public const string DeadlyPrecisionUpgradeIcon = "c3c966d80ff3a4d81840a44a41ea9654"; public const string DeadlySpike = "deda083609dc50245a986e7778fba574"; public const string DeadlySpikesUpgradeIcon = "be982e61bc37b41508560c441818276a"; @@ -1827,6 +1870,8 @@ public static class VanillaSprites public const string EasterEggBuckshot = "1cd06d195f926ae448165177610e67dc"; public const string EasterEggBuckshotStronger = "3862a6ca648a3fc48a04ea013f6bb59c"; public const string EasterEventMonkey = "UiEventsCollection[EasterEventMonkey]"; + public const string EasterLeaf = "e1a05018f679a79419d4e818ff580775"; + public const string EasterNest = "981d072b777e5ed46899e77bd95beeb7"; public const string Echo = "aa14109a9edd88445995dca56d1c6ca8"; public const string EdgeDetectCorner = "3bbd8feb72826c94e9a531948105a555"; public const string EditBtn = "MainMenuUiAtlas[EditBtn]"; @@ -2103,6 +2148,7 @@ public static class VanillaSprites public const string Fern3 = "d7833abb5adafaf48bc280a700a9f035"; public const string Fertilizer = "b699a031e3d62ce42ae9fc7524505e65"; public const string FighterPlaneUpgradeIcon = "b7dac6f61de58144c93e7a3e0e088c3d"; + public const string FinalStrikeIconAA = "2d1bab2254b903140a10baf0b269b81d"; public const string FingerSnap = "db5b1cce88caf463dbcaac8bfcfc1847"; public const string Fire001 = "Bloons[Fire001]"; public const string Fire002 = "Bloons[Fire002]"; @@ -2147,6 +2193,7 @@ public static class VanillaSprites public const string FlowerPink = "UiEmoteIcons[FlowerPink]"; public const string FlowerPowder = "UiEmoteIcons[FlowerPowder]"; public const string FlowerPurple = "UiEmoteIcons[FlowerPurple]"; + public const string FlowerRing = "d5b8a03c96b91c94493afd6d980afd3e"; public const string FlowerSpike01 = "40a7c456fa0b2fd48ad3645ca4d15b34"; public const string FlowerSpike02 = "ad09bcc9d6a91b14eb7eb080badc1713"; public const string FlowerSpike03 = "ce0311a49a7918e40b3e48df1a88a17f"; @@ -2215,6 +2262,7 @@ public static class VanillaSprites public const string FustyTheSnowmanPortraitLvl3 = "1cac6c280e5097e409f0c4e9dc803ede"; public const string FustyTheSnowmanPortraitLvl5 = "ff84991b9071aae41ac413b72bb0f403"; public const string FWheel = "60357ceaadbc1c64592adb200e732e0e"; + public const string FxChocolateRipple = "1c31fc567213db94a8efd780d6d5fc9c"; public const string FxCrystalGlowIcon = "b65a21f9b13f1e3489131dff573be446"; public const string FxFirefliesIcon = "ec3b67c6a9001d94086acdc06ea71682"; public const string FXFirePit = "b4182fece8b0f794b8f779f755afc5ad"; @@ -2521,6 +2569,7 @@ public static class VanillaSprites public const string HedgeRectanglularIcon = "68cc64946abd2624d8d1291b97f5cf8a"; public const string HedgeRow = "e77a08d0b2f55944d816705a4286e202"; public const string HedgeSnowy = "ff8138423cde8c04b931cc31a79b411b"; + public const string HedgeStatue = "845781d66dbcf7141afe417fd926fd73"; public const string HedgeTreeLeaf = "45c78d58cebbd51489db4db51aa5d1d0"; public const string Helipilot = "TitleScreenBg[Helipilot]"; public const string HeliPilotIcon = "MonkeyIcons[HeliPilotIcon]"; @@ -2782,6 +2831,17 @@ public static class VanillaSprites public const string JackOLanternIcon = "7c90515f8dd7acd4f9058cde485e1513"; public const string JackOLanternZomgIcon = "e63e814f585705d4e9ebaf3e89cac846"; public const string JarOfPickles = "b3dfbf93382b60b448e3b38966a4a811"; + public const string JellyBeanBlue = "311e374e3168391448216d72d1ce018f"; + public const string JellyBeanBrown = "d3c7114548356e64c89e65348c9cf36c"; + public const string JellyBeanChocolate = "d83cceeb7542c534880e9d2f430cdcfb"; + public const string JellyBeanGreen = "060ba4e15c1b85748a2045fdf86c5853"; + public const string JellyBeanLavender = "e8d7725b4412fd64aa06344b148b8d2f"; + public const string JellyBeanLightPink = "c2cf815c417c6254ca44ca3b4275a8fd"; + public const string JellyBeanOrange = "2499902ee35f8db429a7ec694e65cbb1"; + public const string JellyBeanPink = "1d11511fc1ff0844a893aaed29b7ba0b"; + public const string JellyBeanPurple = "87b73996bc98485478acbd4aea0423e5"; + public const string JellyBeanRed = "6dfeb162b1b4cda45a08ffe3926f10e8"; + public const string JellyBeanYellow = "33c7652ed1592074b9821c71279633cd"; public const string Jetti = "0bd7df12f6f17754893e9acb11d6ee3d"; public const string JiangshiSaudaPortrait = "ad5ffb247f735da49b89510a4f13ef43"; public const string JiangshiSaudaPortraitLvl10 = "9ada2609ca499ee4aad250024acf9dcd"; @@ -2835,8 +2895,12 @@ public static class VanillaSprites public const string KylieBoomerangUpgradeIcon = "a684579e567e0c14da3c34eb034da833"; public const string KylieGlaiveRang = "45b94f1adda9c23419e57aa07a83375a"; public const string KylieGlaiveRangMoabDom = "c07c012cb9f8a1a4093f94c7022b407a"; + public const string LadyBug1 = "3ae19a7450916d242be8f5bde02a25a0"; + public const string LadyBug2 = "1c91fc3bb138bf340921a54a850bfe9c"; public const string LandEdge1 = "30dd28a072a3835429277c431cfc6529"; public const string LandEdge10 = "754fdb2fd2625d4408ecee810f3dbf05"; + public const string LandEdge11 = "2c295277577b11148bfa2d8684164671"; + public const string LandEdge12 = "9dc737d38dc64bc4281df3a1c92950c2"; public const string LandEdge1Corner1 = "c89667704db77f146acb85c56dcc1b90"; public const string LandEdge1Corner2 = "dd6094d094882d541bbfac16ede3e454"; public const string LandEdge1Corner3 = "d0de6ad1b09a7b540929c9f2775b43a6"; @@ -2854,6 +2918,8 @@ public static class VanillaSprites public const string LandEdge8 = "b86260e26b90dce4dbad010b545017f4"; public const string LandEdge9 = "9571adad529934c48a5363f0236c8f2e"; public const string LandTile10Icon = "17f2ead696edd6147bd97a7c04c2fdb0"; + public const string LandTile11Icon = "58f0db28159b35f458b007beadd8c686"; + public const string LandTile12Icon = "339702c16c85ecc4a9337946a42ebbed"; public const string LandTile1Icon = "329d6621d7cec7a45902e7b8e016ddad"; public const string LandTile2Icon = "8bc1abbc741f30f4bb9ee3728f3faf83"; public const string LandTile3Icon = "e6559c78eeebad5418b8184176ea7c18"; @@ -3003,6 +3069,10 @@ public static class VanillaSprites public const string LogoShatterB = "3f0d46be0751cba4f94d6a85170d1768"; public const string LogTwoKnobsIcon = "f909fb2cffce1f246af0e487bdcdd25d"; public const string LogWithKnobIcon = "a11922f0aa2222140bc5e3586b8f648a"; + public const string LollypopBlue = "ecac21c0e154e624f8f916a85a7307c3"; + public const string LollypopOrange = "b010f2ad780bed64c9d429b8f4955e73"; + public const string LollypopPurple = "e3191548ed1297540b1fb614996c0918"; + public const string LollypopRed = "b8556eff89a82cb48aa830809b344658"; public const string LongCalibreUpgradeIcon = "1332e0c07130f407f87aa85b86b5c515"; public const string LongerBoostsIcon = "MonkeyKnowledgeUi[LongerBoostsIcon]"; public const string LongerDartTimeIcon = "MonkeyKnowledgeUi[LongerDartTimeIcon]"; @@ -3092,12 +3162,13 @@ public static class VanillaSprites public const string MapCoopP4Icon = "MainMenuUiAtlas[MapCoopP4Icon]"; public const string MapEditBtnIcon = "4f374cbd4aeba254a8e81a8b121651fc"; public const string MapEditorBtn = "d0c35b0628af0fc42b658061fb736bf4"; + public const string MapEditorCandyfallsProps = "38db6a12f0b1d5e4f9fdf37f1ff9354a"; + public const string MapEditorCandyfallsPropsShop = "6fa44ffedb093724096dd0cce6fad9f8"; public const string MapEditorHolidayProps = "615b9fef738e4304ea5271dd7755d5f6"; public const string MapEditorHolidayPropsShop = "f91bd9ba486950b4eaae98dc28f26db5"; public const string MapEditorMonkeyPortrait = "1451826bec329b04c9b2d8d52fa0f821"; public const string MapEditorShop = "9dfcfbd21fec5d74bbd0aefea87d4e1c"; public const string MapExpertBtn = "MainMenuUiAtlas[MapExpertBtn]"; - public const string MapExtremeBtn = "MainMenuUiAtlas[MapExtremeBtn]"; public const string MapFrameWoodEdge = "db3cd05b04f50ea40938ffbd4cafa2b1"; public const string MapFrameWoodTile = "be59ae8c63de7d54fb26d6b3fab53ae2"; public const string MapFrameWoodTileGradient = "cc2309c21a26269468c6b55c81d2de5b"; @@ -3168,6 +3239,7 @@ public static class VanillaSprites public const string MapSelectSpillwayButton = "MapImages[MapSelectSpillwayButton]"; public const string MapSelectSpringSpringButton = "MapImages[MapSelectSpringSpringButton]"; public const string MapSelectStreambedButton = "MapImages[MapSelectStreambedButton]"; + public const string MapSelectSulfurSpringsButton = "MapImages[MapSelectSulfurSpringsButton]"; public const string MapSelectSunkenColumnsMapButton = "MapImages[MapSelectSunkenColumnsMapButton]"; public const string MapSelectTheCabinMapButton = "MapImages[MapSelectTheCabinMapButton]"; public const string MapSelectTownCentreButton = "MapImages[MapSelectTownCentreButton]"; @@ -3285,6 +3357,7 @@ public static class VanillaSprites public const string Moab2 = "UiEmoteIcons[Moab]"; public const string MoabAssassinUpgradeIcon = "db3ab4b8bea9d474293a9398eb7e9340"; public const string MOABBarrageAA = "f8bc1b342fd72410197b2e7cc14fe8a8"; + public const string MoabBeeIcon = "863fe1532b7d1764384f9be43cc199f8"; public const string MoabBloonIcon = "83516403369244b1bbaaa32b646b2c03"; public const string MoabBoostIcon = "ChallengeRulesIcons[MoabBoostIcon]"; public const string MoabClash = "7a9825fd3ffd036469853eb958339180"; @@ -3570,6 +3643,7 @@ public static class VanillaSprites public const string ParagonApexPlasmaMaster = "3906afef12a8fab4db780428c3b8a50b"; public const string ParagonAscendedShadow = "307ac0b2ec4846a4ebafe6826707a519"; public const string ParagonGoliathDoomship = "06d38d6a9470dbb468b3d7fcdb13a95f"; + public const string ParagonNauticSeigeCore = "d9bfba35e997eb64cbba5f82065c053c"; public const string ParagonNavarchOfTheSeas = "0ba5e41f3fc13cc47be8565794c159e9"; public const string ParagonArrowBtn = "Ui[ParagonArrowBtn]"; public const string ParagonBlop = "21f1624acc4acf54c9bab80cd3bf9f09"; @@ -3631,8 +3705,14 @@ public static class VanillaSprites public const string PathTile16Icon = "78264e40b3e10194bb546f11c58d5484"; public const string PathTile17 = "e8b25c7da59bf044c8fbe98f7183e9a4"; public const string PathTile17Icon = "83d868afdaadb304c8d180a9fa51946c"; + public const string PathTile18 = "649887a4e812ff54a9c13bd308f504bf"; + public const string PathTile18Icon = "615e53fadd641af4280b7743ead0a0e6"; + public const string PathTile19 = "811491dc28aea624084f389ab30931ad"; + public const string PathTile19Icon = "9a3e93eab26260449b3f24c34e500ef5"; public const string PathTile1Icon = "5aab4c570f898a74f809ef3a6cf2834f"; public const string PathTile2 = "6e1fa693564580b48ac9efcedd615439"; + public const string PathTile20 = "d5629a35cc1533a43b5b53de32a48dc6"; + public const string PathTile20Icon = "00fe99f1f9a92054ebe02a3b31e71571"; public const string PathTile2Icon = "72b0059343eb0ce47ae25873382b0404"; public const string PathTile3 = "bad7b0cea2b9a64428280955c3403ffe"; public const string PathTile3Icon = "bb909e0bad93f3c47af54b714823a22f"; @@ -3743,6 +3823,7 @@ public static class VanillaSprites public const string PlayerXPIcon = "c96f3aeb0a8a3430aac61b8b6cf84434"; public const string Plus = "Ui[Plus]"; public const string PlusWhite = "adcafc462836ea848a0ed651ff66389a"; + public const string PontoonChocolatePortrait = "a6a5de8fe4cf1be429b2a31218a3845e"; public const string PontoonIcebergPortrait = "56b158ab0559d7443ab17ad51a6677af"; public const string PontoonIcon = "PowerIcons[PontoonIcon]"; public const string PontoonPortrait = "8be040ba9a5e57845b7c932297cd53ef"; @@ -3892,6 +3973,8 @@ public static class VanillaSprites public const string ProfileAvatar86 = "c01108141d643924ba679219531afca8"; public const string ProfileAvatar87 = "521199764147e9e4ba82857209f334ae"; public const string ProfileAvatar88 = "e901ac7f292e1604f823b983d7f4e5a8"; + public const string ProfileAvatar89 = "acdd5b931accc144ea405e2d4d36ddd9"; + public const string ProfileAvatar90 = "d32c9aafb090dd14ab823efba51d3dc2"; public const string ProfileBanner1 = "1e5c72175c3c90d44984c3fe6bcee633"; public const string ProfileBanner10 = "21db6e2b1b2e92a43b802e809a13f4e7"; public const string ProfileBanner10Icon = "8eb61fd2c8a4b6d499032db0cb804bbd"; @@ -3977,6 +4060,9 @@ public static class VanillaSprites public const string ProfileBanner35 = "552522ca5ba3f664a8ac43131e5b944b"; public const string ProfileBanner35Icon = "1ff82de5d6b83074486fffda71c49cd8"; public const string ProfileBanner35Small = "4cfce5a5baff8484798d5d0a776e1623"; + public const string ProfileBanner36 = "9271e1290e8d90a418fd7f9888057962"; + public const string ProfileBanner36Icon = "1c1b563f323f82041985459937a51e0f"; + public const string ProfileBanner36Small = "e7fade10ce1e2364b95c730b7e70e9c4"; public const string ProfileBanner3Icon = "86f9e51d2d0358a40bf9b5b29f22c534"; public const string ProfileBanner3Small = "4452cc65d32bdc147adf3ff714170cf2"; public const string ProfileBanner4 = "7ad6b31a524e3c341829221aeb80a84a"; @@ -4000,6 +4086,10 @@ public static class VanillaSprites public const string ProfileBannerTint = "Ui[ProfileBannerTint]"; public const string ProfileBtn = "MainMenuUiAtlas[ProfileBtn]"; public const string ProfileBtnTitle = "TitleScreenUi[ProfileBtnTitle]"; + public const string PropEgg0 = "ba961ae84fca6fa4b830afab5261eb2e"; + public const string PropEgg1 = "c7bcff3b5b599dc42aa3a857fe1cd146"; + public const string PropEgg2 = "36115194e3e43fc4487c93f0faa8792a"; + public const string PropEgg3 = "6659b02ef597c7e40a589fd66ff08d32"; public const string PropSelectTarget = "69dba94cee0444348a1913e735ada4ce"; public const string ProviderApple = "e5b7a862480c33a439d8c69f67fba1ad"; public const string ProviderEmail = "f10f8842f6c6a274bbd335a051533678"; @@ -4108,7 +4198,10 @@ public static class VanillaSprites public const string QuestIconGalaxiliLeastTiers = "b474eb7b154a34906bfc1f6f721f0cf5"; public const string QuestIconGwendolin = "8a9828fd9b5caa34da30aebb6f4c04d1"; public const string QuestIconLogsChimps = "73bc37e6a232ab040af7790edb02536e"; + public const string QuestIconMoabMadness = "e18948f4b4948e94b8924493d8b0a447"; public const string QuestIconObynsGardeningSchool = "04507191f84ae4f9c9bdc7c5600b30a6"; + public const string QuestIconPatFusty = "e633b691eaf86034e8555a8f607ef7b7"; + public const string QuestIconPsi = "0a5097e0e1f1e5249907c1db32b2d534"; public const string QuestIconQuincyTestOfQuincy = "35b3cd339c3edac47b90d3b3d678933c"; public const string QuestIconScoopsTale1 = "70645e54a63417e4fbaad7bac8529112"; public const string QuestIconStrikenBad = "8d73dcfe83969914595717c7bb0e895f"; @@ -4166,6 +4259,8 @@ public static class VanillaSprites public const string RainbowRegrow = "Bloons[RainbowRegrow]"; public const string RainbowRegrowCamo = "Bloons[RainbowRegrowCamo]"; public const string RainbowYellowBand = "UiEmoteIcons[RainbowYellowBand]"; + public const string Rake = "967eb2ce8fe26354f9fee952777a4d4f"; + public const string RakeRock = "6d802ce1fc949a24b9b7ea62ba4ce672"; public const string RallyingRoarAA = "d9d5fbf324f8f433993d6b98dbbd2485"; public const string RandomIcon = "MainMenuUiAtlas[RandomIcon]"; public const string RapidFireUpgradeIcon = "5c0cd0eb38124464a907f7c0d4984286"; @@ -4588,7 +4683,9 @@ public static class VanillaSprites public const string SpikePile_8 = "5f0f24b297141954aa7fa2a9433fdb07"; public const string SpikePile_9 = "6dc4ba21643d3ed498918434041ae588"; public const string SpikeStormUpgradeIcon = "4f77b816539d5445a853457ec1b9a70c"; + public const string SpiritHand = "b0cdda5946eb04a90b0563aefca14477"; public const string SpiritoftheForestUpgradeIcon = "f5d46db55cd59c446930fc55df8456eb"; + public const string SpiritParticles = "598aab430d9294375a717c8fd88b413c"; public const string SpiritSpear = "88415229a4759ec4b917c9847898109d"; public const string SpiritWalkAA = "8d2331e732ca9c84ca78673782d6ac22"; public const string SpookyBananaFarmerPortrait = "3b694bfa7ae6ee047a56523ae7077745"; @@ -4673,7 +4770,11 @@ public static class VanillaSprites public const string Stamp64 = "3f31579e73f2e4e4e9f11f9c93294983"; public const string Stamp65 = "34330e9822e66674b82b0a5c445e3287"; public const string Stamp66 = "99ec4c897422570429fce22649dc9e72"; + public const string Stamp67 = "8c5ad04cc7f9bc445b84492f3f6e20f5"; + public const string Stamp68 = "c4965c9411991c347acd2a14d886a8d2"; + public const string Stamp69 = "026562a4370a23e4db3d918b8da12951"; public const string Stamp7 = "043af99d9aa19104a911e39fc591b77b"; + public const string Stamp70 = "1e4e51074987f0d46aa507d670a6e6b0"; public const string Stamp8 = "dfb49f621c867664fa8455ad18ac51ba"; public const string Stamp9 = "025047cd53b4313408e5dfe8d24f3145"; public const string Star = "Ui[Star]"; @@ -4745,6 +4846,8 @@ public static class VanillaSprites public const string SubmergeandSupportUpgradeIcon = "4b38aa320b98aee4b94a05d2ed4c7b30"; public const string SubmergedPlank = "5fa0f4d4b5c5ee74688405f77629d33c"; public const string SubmergedPlank2 = "fc4d26c7df14cdf42a1ab107d1252150"; + public const string SubmergeIcon = "IngameUi[SubmergeIcon]"; + public const string SubParagonProjectile = "af899225d4a7bf04299b9e5aea23e87c"; public const string SubRibbonOdyssey = "0388c130e7f9a4a2796e6387902c173a"; public const string SubTitleBanner = "e40190c2ad561484e8c27eb194f4a77d"; public const string SugarBoostIcon = "4f1bf21845aab5d4a955ceb04e327ef6"; @@ -4857,6 +4960,8 @@ public static class VanillaSprites public const string TeamFrame2 = "4a7103a6b46da7143b24badfcf38c02f"; public const string TeamFrame20 = "89e4bb6f219c94c15afaff8a5720a800"; public const string TeamFrame21 = "9a679415dce3a4265bfeabc13163a04f"; + public const string TeamFrame22 = "91dcb1405129bff46a0251568ea68e22"; + public const string TeamFrame23 = "8f37583553424804280e657f1d04777a"; public const string TeamFrame3 = "3bcda7f6980deb246b060f59069f1a78"; public const string TeamFrame4 = "4ccc84e911700ec4f8419c1a93e28197"; public const string TeamFrame5 = "6c693f2e66b33c342b5f3bb9e3ca7027"; @@ -4882,6 +4987,8 @@ public static class VanillaSprites public const string TeamIcon23 = "e02e864121c674a4da9987ed354cb851"; public const string TeamIcon24 = "8d1e77f9c1ce0451788a7cc2385064ac"; public const string TeamIcon25 = "33634fb64a2d14ccf815732f03cbcb4f"; + public const string TeamIcon26 = "d205d07e7ef81ff41bff6f435ccd5fa4"; + public const string TeamIcon27 = "f60038c8552dd0b4197e04f5e5af4728"; public const string TeamIcon3 = "b88473e5ea524e04ebe84db0ad570e07"; public const string TeamIcon4 = "b8b82ad80db896e4b94884d9e0d55b90"; public const string TeamIcon5 = "5ae0f5c70713f6b46a88dc17c1fac675"; @@ -4902,6 +5009,9 @@ public static class VanillaSprites public const string TeamsBanner13 = "c51aacb07d8b80f45adbc593f2599f3b"; public const string TeamsBanner13Icon = "56bfcf031d626cc4a9681aa6ae00a19f"; public const string TeamsBanner13Small = "9bd603fd4e1869343a09a9b6f680383c"; + public const string TeamsBanner14 = "046d2bd2d5a1b4041a3b83efec8b6bc6"; + public const string TeamsBanner14Icon = "ae4361bf56814024a95120b2fa775aee"; + public const string TeamsBanner14Small = "977638bc2dbae754a81f1bbc3cecdc4b"; public const string TeamsBanner1Icon = "9c7fee36ca5361249b72df7174d0d060"; public const string TeamsBanner1Small = "10dcc6a30b2fc1541a321ed0e83c5221"; public const string TeamsBanner2 = "8be2052c6a517134596b815e4917366a"; @@ -4958,6 +5068,8 @@ public static class VanillaSprites public const string TelescopePropIcon = "18258b255118c384da681f9e09c27778"; public const string Temple = "TitleScreenBg[Temple]"; public const string Terrain10Icon = "f9469272e7275cd429967ba1d61ed4d0"; + public const string Terrain11Icon = "eb35e102e7dbf3b4ebb230967917e683"; + public const string Terrain12Icon = "ddc97d5d53bd2194fb57659cd103b00d"; public const string Terrain1Icon = "4787f340a1cea374d9c3255bd17fb8ac"; public const string Terrain2Icon = "5a81a551fbe26374fb3d2288f9359dc2"; public const string Terrain3Icon = "7766e3bc65c7dbb4d99c50f001ecfaa4"; @@ -5154,6 +5266,7 @@ public static class VanillaSprites public const string UnpoppedArmyZombie = "Bloons[UnpoppedArmyZombie]"; public const string UnpoppedArmyZombiePhoenix = "Bloons[UnpoppedArmyZombiePhoenix]"; public const string UnstableConcoctionUpgradeIcon = "910f86fb0a8dc3d4db2d1b6d222008ba"; + public const string UnSubmergeIcon = "IngameUi[UnSubmergeIcon]"; public const string UpArrowOutline = "4339b3c295d4cc94987f27180ef0e0e7"; public const string UpdateAnnouncementImage = "813a94dfd10f2264ab811c40281e9012"; public const string UpgradeArrow = "MainMenuUiAtlas[UpgradeArrow]"; @@ -5185,6 +5298,7 @@ public static class VanillaSprites public const string VampireCapeRegrow = "Bloons[VampireCapeRegrow]"; public const string VampireCapesBloonsIcon = "6f51d33dd9415a145a71c17f479ecbdc"; public const string VampireStormMonkey = "2ff7e78ef33ff2f41b0a6d0ce70021f4"; + public const string VariantsIcon = "1173cefe7825dae43bb1e24d2f69f1b7"; public const string VaultOMonkeyMoneyShop = "c1a29cb6c9e27de47b4e65230ce1cb92"; public const string VelociraptorUpgradeIcon = "323b642f02948c14598de13523917b03"; public const string VengefulAdoraIcon = "226a74f481cba4fc9b1263c9545660cc"; @@ -5246,6 +5360,9 @@ public static class VanillaSprites public const string VortexTitle = "a1bcdb25211743640be73175347708eb"; public const string VRKeyboard = "95368618ae92d5b4ea58e749e55145dd"; public const string VRScreen = "b98619573e9a60b49a04338476ddf9a6"; + public const string WaferStick = "379321a235c5aac4caa6400163b98903"; + public const string WaffleHouse = "69b495d5d6608a747bc784f7bc42ada9"; + public const string WaffleHouseStep = "cc2e1a93ef93c3f4a8a0f1e79a99813a"; public const string WallOfFireUpgradeIcon = "387db174c97954e9eb6a332dfe650c86"; public const string WallOfTreesAA = "ee76b1ffe6ae5d44a9cc30dda7e6640a"; public const string WarmOakIcon = "MonkeyKnowledgeUi[WarmOakIcon]"; @@ -5262,12 +5379,16 @@ public static class VanillaSprites public const string WaterEdge1 = "a9b635db23239bb4f8dcba11145fc91a"; public const string WaterEdge2 = "fb0116c741d3f654f919e726fc492482"; public const string WaterEdge3 = "b3ab6eb5b9c216641ad80f94f46cf235"; + public const string WaterEdge4 = "5cb3931e64d77af4f81cf75e33af4846"; + public const string WaterEdge5 = "3219154a1f470e84b95bd568bfd06b1b"; public const string WaterIcon = "0ea1cc80660b50c4692267b7dd599295"; public const string WatermelonZomgIcon = "4d0bb959a33e02a4c835347930cecef7"; public const string WaterTank = "77232b683c0390545857e7d3529d6739"; public const string WaterTile1Icon = "d029cd89baf306d4cb9eecdc551e69e9"; public const string WaterTile2Icon = "167cea1c430995245b53f3d3c23f4d03"; public const string WaterTile3Icon = "a6073ee19bdb27943a6c92eda593a404"; + public const string WaterTile4Icon = "f86f04875a6835e418b18b8e31ea84c0"; + public const string WaterTile5Icon = "837510e1c1aa46f4da47729ca484b5e7"; public const string WeakPointIcon = "MonkeyKnowledgeUi[WeakPointIcon]"; public const string WesternBarrel = "71385e073788ff94488da9ad3bf0495c"; public const string WesternPoleFence = "32fa32a2a52a28d4087ddec3e869baaa"; @@ -5287,8 +5408,7 @@ public static class VanillaSprites public const string WhiteGlueStronger = "Bloons[WhiteGlueStronger]"; public const string WhiteHotSpikesUpgradeIcon = "6444a0be496d24f8ba915b257cc763ad"; public const string WhiteIce = "Bloons[WhiteIce]"; - public const string WhitePixel = "IngameUi[WhitePixel]"; - public const string WhitePixel2 = "Ui[WhitePixel]"; + public const string WhitePixel = "Ui[WhitePixel]"; public const string WhiteRegrow = "Bloons[WhiteRegrow]"; public const string WhiteRegrowAcidBasic = "Bloons[WhiteRegrowAcidBasic]"; public const string WhiteRegrowAcidLonger = "Bloons[WhiteRegrowAcidLonger]"; @@ -5311,6 +5431,7 @@ public static class VanillaSprites public const string WinningTrophy = "UiEmoteIcons[WinningTrophy]"; public const string WisteriaFlower = "07fbab0f217625c4b94bd800961f4856"; public const string Wizard = "TitleScreenBg[Wizard]"; + public const string WizardApprenticePropIcon = "06e3f34801f2b2040ae9a7342a06aaf7"; public const string WizardFireworksProjectile = "37dae3475aa0f344c85501079a440b9b"; public const string WizardIcon = "MonkeyIcons[WizardIcon]"; public const string WizardLordPhoenixUpgradeIcon = "bd17a13d8a30a40c3b7922621ba2c002"; @@ -6199,6 +6320,7 @@ static VanillaSprites() ["AllRegenIcon"] = AllRegenIcon, ["AlternateBloonsBtn"] = AlternateBloonsBtn, ["AlternateBloonsIcon"] = AlternateBloonsIcon, + ["AmbientFxButterfliesIcon"] = AmbientFxButterfliesIcon, ["AmbientFxDust2Icon"] = AmbientFxDust2Icon, ["AmbientFxDustIcon"] = AmbientFxDustIcon, ["AmbientFxFlowersYellowIcon"] = AmbientFxFlowersYellowIcon, @@ -6278,8 +6400,8 @@ static VanillaSprites() ["BadBloonIcon"] = BadBloonIcon, ["BadConnectionBtn"] = BadConnectionBtn, ["BadFortifiedIcon"] = BadFortifiedIcon, - ["BadIcon"] = BadIcon, ["BADIcon"] = BADIcon, + ["BadIcon"] = BadIcon, ["BadMaimMoabParticle"] = BadMaimMoabParticle, ["BalanceHedge"] = BalanceHedge, ["BallisticMissileUpgradeIcon"] = BallisticMissileUpgradeIcon, @@ -6349,6 +6471,7 @@ static VanillaSprites() ["BenjaminHeroBundlePackShop"] = BenjaminHeroBundlePackShop, ["BenjaminIcon"] = BenjaminIcon, ["BenjaminMatrixPlacementIcon"] = BenjaminMatrixPlacementIcon, + ["BenjaminMousePetIcon"] = BenjaminMousePetIcon, ["BenjaminPortrait"] = BenjaminPortrait, ["BenjaminPortraitLvl10"] = BenjaminPortraitLvl10, ["BenjaminPortraitLvl20"] = BenjaminPortraitLvl20, @@ -6669,6 +6792,7 @@ static VanillaSprites() ["BuffIconHotSauce"] = BuffIconHotSauce, ["BuffIconIcex5x"] = BuffIconIcex5x, ["BuffIconJarOfPickles"] = BuffIconJarOfPickles, + ["BuffIconMonkeySubParagon"] = BuffIconMonkeySubParagon, ["BuffIconNavalTactics"] = BuffIconNavalTactics, ["BuffIconNinjax3x"] = BuffIconNinjax3x, ["BuffIconObyn"] = BuffIconObyn, @@ -6714,6 +6838,12 @@ static VanillaSprites() ["BurnyStuffUpgradeIcon"] = BurnyStuffUpgradeIcon, ["BushesRow"] = BushesRow, ["ButterfliesUpgradeFxIcon"] = ButterfliesUpgradeFxIcon, + ["ButterflyBlack"] = ButterflyBlack, + ["ButterflyBlue"] = ButterflyBlue, + ["ButterflyGreen"] = ButterflyGreen, + ["ButterflyPurple"] = ButterflyPurple, + ["ButterflyRed"] = ButterflyRed, + ["ButterflyYellow"] = ButterflyYellow, ["CabinBridge"] = CabinBridge, ["CabinBridgeMini"] = CabinBridgeMini, ["CactusFlower"] = CactusFlower, @@ -6735,8 +6865,23 @@ static VanillaSprites() ["CampfirePropIcon"] = CampfirePropIcon, ["CandleGlow"] = CandleGlow, ["Candles"] = Candles, + ["CandyBlue"] = CandyBlue, ["CandyCane"] = CandyCane, ["CandyCorn"] = CandyCorn, + ["CandyFlossTreeBlue"] = CandyFlossTreeBlue, + ["CandyFlossTreeGreen"] = CandyFlossTreeGreen, + ["CandyFlossTreeOrange"] = CandyFlossTreeOrange, + ["CandyFlossTreePink"] = CandyFlossTreePink, + ["CandyFlossTreePurple"] = CandyFlossTreePurple, + ["CandyGreen"] = CandyGreen, + ["CandyOrange"] = CandyOrange, + ["CandyPink"] = CandyPink, + ["CandyPurple"] = CandyPurple, + ["CandyRed"] = CandyRed, + ["CandySwirlBlue"] = CandySwirlBlue, + ["CandySwirlPink"] = CandySwirlPink, + ["CandySwirlRed"] = CandySwirlRed, + ["CandySwirlYellow"] = CandySwirlYellow, ["CannonBall"] = CannonBall, ["CannonShipUpgradeIcon"] = CannonShipUpgradeIcon, ["CaptainChurchillIcon"] = CaptainChurchillIcon, @@ -6845,7 +6990,21 @@ static VanillaSprites() ["ChestIconPip"] = ChestIconPip, ["CHIMPSIcon"] = CHIMPSIcon, ["ChocolateBfbIcon"] = ChocolateBfbIcon, + ["ChocolateBlue"] = ChocolateBlue, + ["ChocolateBrown"] = ChocolateBrown, + ["ChocolateChocolate"] = ChocolateChocolate, + ["ChocolateCube"] = ChocolateCube, + ["ChocolateDarkBlue"] = ChocolateDarkBlue, + ["ChocolateGreen"] = ChocolateGreen, ["ChocolateMoabIcon"] = ChocolateMoabIcon, + ["ChocolateOrange"] = ChocolateOrange, + ["ChocolatePink"] = ChocolatePink, + ["ChocolatePink1"] = ChocolatePink1, + ["ChocolatePontoonIcon"] = ChocolatePontoonIcon, + ["ChocolatePurple"] = ChocolatePurple, + ["ChocolateRed"] = ChocolateRed, + ["ChocolateRock"] = ChocolateRock, + ["ChocolateYellow"] = ChocolateYellow, ["ChristmasEventMonkey"] = ChristmasEventMonkey, ["ChristmasLight"] = ChristmasLight, ["ChristmasTree"] = ChristmasTree, @@ -6860,6 +7019,7 @@ static VanillaSprites() ["Circle"] = Circle, ["CircleInsert"] = CircleInsert, ["CircleRing"] = CircleRing, + ["CircleRingThick"] = CircleRingThick, ["CircleUi"] = CircleUi, ["CircusGwendolinIcon"] = CircusGwendolinIcon, ["CircusGwendolinPortrait"] = CircusGwendolinPortrait, @@ -6936,6 +7096,10 @@ static VanillaSprites() ["Coop3PlayersIcon"] = Coop3PlayersIcon, ["Coop4PlayerIcon"] = Coop4PlayerIcon, ["Coop4PlayersICon"] = Coop4PlayersICon, + ["CoopBest1Player"] = CoopBest1Player, + ["CoopBest2Player"] = CoopBest2Player, + ["CoopBest3Player"] = CoopBest3Player, + ["CoopBest4Player"] = CoopBest4Player, ["CoOpIcon"] = CoOpIcon, ["CoOpIconSmall"] = CoOpIconSmall, ["CoopLongMatchBtn"] = CoopLongMatchBtn, @@ -7109,8 +7273,8 @@ static VanillaSprites() ["DataTransferIcon"] = DataTransferIcon, ["DavidsVsGoliathIcon"] = DavidsVsGoliathIcon, ["DdtFortifiedIcon"] = DdtFortifiedIcon, - ["DdtIcon"] = DdtIcon, ["DDTIcon"] = DDTIcon, + ["DdtIcon"] = DdtIcon, ["DeadlyPrecisionUpgradeIcon"] = DeadlyPrecisionUpgradeIcon, ["DeadlySpike"] = DeadlySpike, ["DeadlySpikesUpgradeIcon"] = DeadlySpikesUpgradeIcon, @@ -7201,6 +7365,8 @@ static VanillaSprites() ["EasterEggBuckshot"] = EasterEggBuckshot, ["EasterEggBuckshotStronger"] = EasterEggBuckshotStronger, ["EasterEventMonkey"] = EasterEventMonkey, + ["EasterLeaf"] = EasterLeaf, + ["EasterNest"] = EasterNest, ["Echo"] = Echo, ["EdgeDetectCorner"] = EdgeDetectCorner, ["EditBtn"] = EditBtn, @@ -7477,6 +7643,7 @@ static VanillaSprites() ["Fern3"] = Fern3, ["Fertilizer"] = Fertilizer, ["FighterPlaneUpgradeIcon"] = FighterPlaneUpgradeIcon, + ["FinalStrikeIconAA"] = FinalStrikeIconAA, ["FingerSnap"] = FingerSnap, ["Fire001"] = Fire001, ["Fire002"] = Fire002, @@ -7521,6 +7688,7 @@ static VanillaSprites() ["FlowerPink"] = FlowerPink, ["FlowerPowder"] = FlowerPowder, ["FlowerPurple"] = FlowerPurple, + ["FlowerRing"] = FlowerRing, ["FlowerSpike01"] = FlowerSpike01, ["FlowerSpike02"] = FlowerSpike02, ["FlowerSpike03"] = FlowerSpike03, @@ -7589,6 +7757,7 @@ static VanillaSprites() ["FustyTheSnowmanPortraitLvl3"] = FustyTheSnowmanPortraitLvl3, ["FustyTheSnowmanPortraitLvl5"] = FustyTheSnowmanPortraitLvl5, ["FWheel"] = FWheel, + ["FxChocolateRipple"] = FxChocolateRipple, ["FxCrystalGlowIcon"] = FxCrystalGlowIcon, ["FxFirefliesIcon"] = FxFirefliesIcon, ["FXFirePit"] = FXFirePit, @@ -7895,6 +8064,7 @@ static VanillaSprites() ["HedgeRectanglularIcon"] = HedgeRectanglularIcon, ["HedgeRow"] = HedgeRow, ["HedgeSnowy"] = HedgeSnowy, + ["HedgeStatue"] = HedgeStatue, ["HedgeTreeLeaf"] = HedgeTreeLeaf, ["Helipilot"] = Helipilot, ["HeliPilotIcon"] = HeliPilotIcon, @@ -8156,6 +8326,17 @@ static VanillaSprites() ["JackOLanternIcon"] = JackOLanternIcon, ["JackOLanternZomgIcon"] = JackOLanternZomgIcon, ["JarOfPickles"] = JarOfPickles, + ["JellyBeanBlue"] = JellyBeanBlue, + ["JellyBeanBrown"] = JellyBeanBrown, + ["JellyBeanChocolate"] = JellyBeanChocolate, + ["JellyBeanGreen"] = JellyBeanGreen, + ["JellyBeanLavender"] = JellyBeanLavender, + ["JellyBeanLightPink"] = JellyBeanLightPink, + ["JellyBeanOrange"] = JellyBeanOrange, + ["JellyBeanPink"] = JellyBeanPink, + ["JellyBeanPurple"] = JellyBeanPurple, + ["JellyBeanRed"] = JellyBeanRed, + ["JellyBeanYellow"] = JellyBeanYellow, ["Jetti"] = Jetti, ["JiangshiSaudaPortrait"] = JiangshiSaudaPortrait, ["JiangshiSaudaPortraitLvl10"] = JiangshiSaudaPortraitLvl10, @@ -8209,8 +8390,12 @@ static VanillaSprites() ["KylieBoomerangUpgradeIcon"] = KylieBoomerangUpgradeIcon, ["KylieGlaiveRang"] = KylieGlaiveRang, ["KylieGlaiveRangMoabDom"] = KylieGlaiveRangMoabDom, + ["LadyBug1"] = LadyBug1, + ["LadyBug2"] = LadyBug2, ["LandEdge1"] = LandEdge1, ["LandEdge10"] = LandEdge10, + ["LandEdge11"] = LandEdge11, + ["LandEdge12"] = LandEdge12, ["LandEdge1Corner1"] = LandEdge1Corner1, ["LandEdge1Corner2"] = LandEdge1Corner2, ["LandEdge1Corner3"] = LandEdge1Corner3, @@ -8228,6 +8413,8 @@ static VanillaSprites() ["LandEdge8"] = LandEdge8, ["LandEdge9"] = LandEdge9, ["LandTile10Icon"] = LandTile10Icon, + ["LandTile11Icon"] = LandTile11Icon, + ["LandTile12Icon"] = LandTile12Icon, ["LandTile1Icon"] = LandTile1Icon, ["LandTile2Icon"] = LandTile2Icon, ["LandTile3Icon"] = LandTile3Icon, @@ -8377,6 +8564,10 @@ static VanillaSprites() ["LogoShatterB"] = LogoShatterB, ["LogTwoKnobsIcon"] = LogTwoKnobsIcon, ["LogWithKnobIcon"] = LogWithKnobIcon, + ["LollypopBlue"] = LollypopBlue, + ["LollypopOrange"] = LollypopOrange, + ["LollypopPurple"] = LollypopPurple, + ["LollypopRed"] = LollypopRed, ["LongCalibreUpgradeIcon"] = LongCalibreUpgradeIcon, ["LongerBoostsIcon"] = LongerBoostsIcon, ["LongerDartTimeIcon"] = LongerDartTimeIcon, @@ -8466,12 +8657,13 @@ static VanillaSprites() ["MapCoopP4Icon"] = MapCoopP4Icon, ["MapEditBtnIcon"] = MapEditBtnIcon, ["MapEditorBtn"] = MapEditorBtn, + ["MapEditorCandyfallsProps"] = MapEditorCandyfallsProps, + ["MapEditorCandyfallsPropsShop"] = MapEditorCandyfallsPropsShop, ["MapEditorHolidayProps"] = MapEditorHolidayProps, ["MapEditorHolidayPropsShop"] = MapEditorHolidayPropsShop, ["MapEditorMonkeyPortrait"] = MapEditorMonkeyPortrait, ["MapEditorShop"] = MapEditorShop, ["MapExpertBtn"] = MapExpertBtn, - ["MapExtremeBtn"] = MapExtremeBtn, ["MapFrameWoodEdge"] = MapFrameWoodEdge, ["MapFrameWoodTile"] = MapFrameWoodTile, ["MapFrameWoodTileGradient"] = MapFrameWoodTileGradient, @@ -8542,6 +8734,7 @@ static VanillaSprites() ["MapSelectSpillwayButton"] = MapSelectSpillwayButton, ["MapSelectSpringSpringButton"] = MapSelectSpringSpringButton, ["MapSelectStreambedButton"] = MapSelectStreambedButton, + ["MapSelectSulfurSpringsButton"] = MapSelectSulfurSpringsButton, ["MapSelectSunkenColumnsMapButton"] = MapSelectSunkenColumnsMapButton, ["MapSelectTheCabinMapButton"] = MapSelectTheCabinMapButton, ["MapSelectTownCentreButton"] = MapSelectTownCentreButton, @@ -8659,6 +8852,7 @@ static VanillaSprites() ["Moab2"] = Moab2, ["MoabAssassinUpgradeIcon"] = MoabAssassinUpgradeIcon, ["MOABBarrageAA"] = MOABBarrageAA, + ["MoabBeeIcon"] = MoabBeeIcon, ["MoabBloonIcon"] = MoabBloonIcon, ["MoabBoostIcon"] = MoabBoostIcon, ["MoabClash"] = MoabClash, @@ -8944,6 +9138,7 @@ static VanillaSprites() ["ParagonApexPlasmaMaster"] = ParagonApexPlasmaMaster, ["ParagonAscendedShadow"] = ParagonAscendedShadow, ["ParagonGoliathDoomship"] = ParagonGoliathDoomship, + ["ParagonNauticSeigeCore"] = ParagonNauticSeigeCore, ["ParagonNavarchOfTheSeas"] = ParagonNavarchOfTheSeas, ["ParagonArrowBtn"] = ParagonArrowBtn, ["ParagonBlop"] = ParagonBlop, @@ -9005,8 +9200,14 @@ static VanillaSprites() ["PathTile16Icon"] = PathTile16Icon, ["PathTile17"] = PathTile17, ["PathTile17Icon"] = PathTile17Icon, + ["PathTile18"] = PathTile18, + ["PathTile18Icon"] = PathTile18Icon, + ["PathTile19"] = PathTile19, + ["PathTile19Icon"] = PathTile19Icon, ["PathTile1Icon"] = PathTile1Icon, ["PathTile2"] = PathTile2, + ["PathTile20"] = PathTile20, + ["PathTile20Icon"] = PathTile20Icon, ["PathTile2Icon"] = PathTile2Icon, ["PathTile3"] = PathTile3, ["PathTile3Icon"] = PathTile3Icon, @@ -9117,6 +9318,7 @@ static VanillaSprites() ["PlayerXPIcon"] = PlayerXPIcon, ["Plus"] = Plus, ["PlusWhite"] = PlusWhite, + ["PontoonChocolatePortrait"] = PontoonChocolatePortrait, ["PontoonIcebergPortrait"] = PontoonIcebergPortrait, ["PontoonIcon"] = PontoonIcon, ["PontoonPortrait"] = PontoonPortrait, @@ -9266,6 +9468,8 @@ static VanillaSprites() ["ProfileAvatar86"] = ProfileAvatar86, ["ProfileAvatar87"] = ProfileAvatar87, ["ProfileAvatar88"] = ProfileAvatar88, + ["ProfileAvatar89"] = ProfileAvatar89, + ["ProfileAvatar90"] = ProfileAvatar90, ["ProfileBanner1"] = ProfileBanner1, ["ProfileBanner10"] = ProfileBanner10, ["ProfileBanner10Icon"] = ProfileBanner10Icon, @@ -9351,6 +9555,9 @@ static VanillaSprites() ["ProfileBanner35"] = ProfileBanner35, ["ProfileBanner35Icon"] = ProfileBanner35Icon, ["ProfileBanner35Small"] = ProfileBanner35Small, + ["ProfileBanner36"] = ProfileBanner36, + ["ProfileBanner36Icon"] = ProfileBanner36Icon, + ["ProfileBanner36Small"] = ProfileBanner36Small, ["ProfileBanner3Icon"] = ProfileBanner3Icon, ["ProfileBanner3Small"] = ProfileBanner3Small, ["ProfileBanner4"] = ProfileBanner4, @@ -9374,6 +9581,10 @@ static VanillaSprites() ["ProfileBannerTint"] = ProfileBannerTint, ["ProfileBtn"] = ProfileBtn, ["ProfileBtnTitle"] = ProfileBtnTitle, + ["PropEgg0"] = PropEgg0, + ["PropEgg1"] = PropEgg1, + ["PropEgg2"] = PropEgg2, + ["PropEgg3"] = PropEgg3, ["PropSelectTarget"] = PropSelectTarget, ["ProviderApple"] = ProviderApple, ["ProviderEmail"] = ProviderEmail, @@ -9482,7 +9693,10 @@ static VanillaSprites() ["QuestIconGalaxiliLeastTiers"] = QuestIconGalaxiliLeastTiers, ["QuestIconGwendolin"] = QuestIconGwendolin, ["QuestIconLogsChimps"] = QuestIconLogsChimps, + ["QuestIconMoabMadness"] = QuestIconMoabMadness, ["QuestIconObynsGardeningSchool"] = QuestIconObynsGardeningSchool, + ["QuestIconPatFusty"] = QuestIconPatFusty, + ["QuestIconPsi"] = QuestIconPsi, ["QuestIconQuincyTestOfQuincy"] = QuestIconQuincyTestOfQuincy, ["QuestIconScoopsTale1"] = QuestIconScoopsTale1, ["QuestIconStrikenBad"] = QuestIconStrikenBad, @@ -9540,6 +9754,8 @@ static VanillaSprites() ["RainbowRegrow"] = RainbowRegrow, ["RainbowRegrowCamo"] = RainbowRegrowCamo, ["RainbowYellowBand"] = RainbowYellowBand, + ["Rake"] = Rake, + ["RakeRock"] = RakeRock, ["RallyingRoarAA"] = RallyingRoarAA, ["RandomIcon"] = RandomIcon, ["RapidFireUpgradeIcon"] = RapidFireUpgradeIcon, @@ -9962,7 +10178,9 @@ static VanillaSprites() ["SpikePile_8"] = SpikePile_8, ["SpikePile_9"] = SpikePile_9, ["SpikeStormUpgradeIcon"] = SpikeStormUpgradeIcon, + ["SpiritHand"] = SpiritHand, ["SpiritoftheForestUpgradeIcon"] = SpiritoftheForestUpgradeIcon, + ["SpiritParticles"] = SpiritParticles, ["SpiritSpear"] = SpiritSpear, ["SpiritWalkAA"] = SpiritWalkAA, ["SpookyBananaFarmerPortrait"] = SpookyBananaFarmerPortrait, @@ -10047,7 +10265,11 @@ static VanillaSprites() ["Stamp64"] = Stamp64, ["Stamp65"] = Stamp65, ["Stamp66"] = Stamp66, + ["Stamp67"] = Stamp67, + ["Stamp68"] = Stamp68, + ["Stamp69"] = Stamp69, ["Stamp7"] = Stamp7, + ["Stamp70"] = Stamp70, ["Stamp8"] = Stamp8, ["Stamp9"] = Stamp9, ["Star"] = Star, @@ -10119,6 +10341,8 @@ static VanillaSprites() ["SubmergeandSupportUpgradeIcon"] = SubmergeandSupportUpgradeIcon, ["SubmergedPlank"] = SubmergedPlank, ["SubmergedPlank2"] = SubmergedPlank2, + ["SubmergeIcon"] = SubmergeIcon, + ["SubParagonProjectile"] = SubParagonProjectile, ["SubRibbonOdyssey"] = SubRibbonOdyssey, ["SubTitleBanner"] = SubTitleBanner, ["SugarBoostIcon"] = SugarBoostIcon, @@ -10231,6 +10455,8 @@ static VanillaSprites() ["TeamFrame2"] = TeamFrame2, ["TeamFrame20"] = TeamFrame20, ["TeamFrame21"] = TeamFrame21, + ["TeamFrame22"] = TeamFrame22, + ["TeamFrame23"] = TeamFrame23, ["TeamFrame3"] = TeamFrame3, ["TeamFrame4"] = TeamFrame4, ["TeamFrame5"] = TeamFrame5, @@ -10256,6 +10482,8 @@ static VanillaSprites() ["TeamIcon23"] = TeamIcon23, ["TeamIcon24"] = TeamIcon24, ["TeamIcon25"] = TeamIcon25, + ["TeamIcon26"] = TeamIcon26, + ["TeamIcon27"] = TeamIcon27, ["TeamIcon3"] = TeamIcon3, ["TeamIcon4"] = TeamIcon4, ["TeamIcon5"] = TeamIcon5, @@ -10276,6 +10504,9 @@ static VanillaSprites() ["TeamsBanner13"] = TeamsBanner13, ["TeamsBanner13Icon"] = TeamsBanner13Icon, ["TeamsBanner13Small"] = TeamsBanner13Small, + ["TeamsBanner14"] = TeamsBanner14, + ["TeamsBanner14Icon"] = TeamsBanner14Icon, + ["TeamsBanner14Small"] = TeamsBanner14Small, ["TeamsBanner1Icon"] = TeamsBanner1Icon, ["TeamsBanner1Small"] = TeamsBanner1Small, ["TeamsBanner2"] = TeamsBanner2, @@ -10332,6 +10563,8 @@ static VanillaSprites() ["TelescopePropIcon"] = TelescopePropIcon, ["Temple"] = Temple, ["Terrain10Icon"] = Terrain10Icon, + ["Terrain11Icon"] = Terrain11Icon, + ["Terrain12Icon"] = Terrain12Icon, ["Terrain1Icon"] = Terrain1Icon, ["Terrain2Icon"] = Terrain2Icon, ["Terrain3Icon"] = Terrain3Icon, @@ -10528,6 +10761,7 @@ static VanillaSprites() ["UnpoppedArmyZombie"] = UnpoppedArmyZombie, ["UnpoppedArmyZombiePhoenix"] = UnpoppedArmyZombiePhoenix, ["UnstableConcoctionUpgradeIcon"] = UnstableConcoctionUpgradeIcon, + ["UnSubmergeIcon"] = UnSubmergeIcon, ["UpArrowOutline"] = UpArrowOutline, ["UpdateAnnouncementImage"] = UpdateAnnouncementImage, ["UpgradeArrow"] = UpgradeArrow, @@ -10559,6 +10793,7 @@ static VanillaSprites() ["VampireCapeRegrow"] = VampireCapeRegrow, ["VampireCapesBloonsIcon"] = VampireCapesBloonsIcon, ["VampireStormMonkey"] = VampireStormMonkey, + ["VariantsIcon"] = VariantsIcon, ["VaultOMonkeyMoneyShop"] = VaultOMonkeyMoneyShop, ["VelociraptorUpgradeIcon"] = VelociraptorUpgradeIcon, ["VengefulAdoraIcon"] = VengefulAdoraIcon, @@ -10620,6 +10855,9 @@ static VanillaSprites() ["VortexTitle"] = VortexTitle, ["VRKeyboard"] = VRKeyboard, ["VRScreen"] = VRScreen, + ["WaferStick"] = WaferStick, + ["WaffleHouse"] = WaffleHouse, + ["WaffleHouseStep"] = WaffleHouseStep, ["WallOfFireUpgradeIcon"] = WallOfFireUpgradeIcon, ["WallOfTreesAA"] = WallOfTreesAA, ["WarmOakIcon"] = WarmOakIcon, @@ -10636,12 +10874,16 @@ static VanillaSprites() ["WaterEdge1"] = WaterEdge1, ["WaterEdge2"] = WaterEdge2, ["WaterEdge3"] = WaterEdge3, + ["WaterEdge4"] = WaterEdge4, + ["WaterEdge5"] = WaterEdge5, ["WaterIcon"] = WaterIcon, ["WatermelonZomgIcon"] = WatermelonZomgIcon, ["WaterTank"] = WaterTank, ["WaterTile1Icon"] = WaterTile1Icon, ["WaterTile2Icon"] = WaterTile2Icon, ["WaterTile3Icon"] = WaterTile3Icon, + ["WaterTile4Icon"] = WaterTile4Icon, + ["WaterTile5Icon"] = WaterTile5Icon, ["WeakPointIcon"] = WeakPointIcon, ["WesternBarrel"] = WesternBarrel, ["WesternPoleFence"] = WesternPoleFence, @@ -10662,7 +10904,6 @@ static VanillaSprites() ["WhiteHotSpikesUpgradeIcon"] = WhiteHotSpikesUpgradeIcon, ["WhiteIce"] = WhiteIce, ["WhitePixel"] = WhitePixel, - ["WhitePixel2"] = WhitePixel2, ["WhiteRegrow"] = WhiteRegrow, ["WhiteRegrowAcidBasic"] = WhiteRegrowAcidBasic, ["WhiteRegrowAcidLonger"] = WhiteRegrowAcidLonger, @@ -10685,6 +10926,7 @@ static VanillaSprites() ["WinningTrophy"] = WinningTrophy, ["WisteriaFlower"] = WisteriaFlower, ["Wizard"] = Wizard, + ["WizardApprenticePropIcon"] = WizardApprenticePropIcon, ["WizardFireworksProjectile"] = WizardFireworksProjectile, ["WizardIcon"] = WizardIcon, ["WizardLordPhoenixUpgradeIcon"] = WizardLordPhoenixUpgradeIcon, diff --git a/BloonsTD6 Mod Helper/Api/UI/ModGameMenu.cs b/BloonsTD6 Mod Helper/Api/UI/ModGameMenu.cs index 5ad101165..f1305dbdf 100644 --- a/BloonsTD6 Mod Helper/Api/UI/ModGameMenu.cs +++ b/BloonsTD6 Mod Helper/Api/UI/ModGameMenu.cs @@ -155,7 +155,16 @@ internal static void PatchAllTheOpens(HarmonyLib.Harmony harmony) { foreach (var type in Types.Keys) { - if (MelonUtils.IsUnderWineOrSteamProton() && type == typeof(AchievementsScreen)) continue; + if (MelonUtils.IsUnderWineOrSteamProton() && + (type == typeof(AchievementsScreen) || + type == typeof(GameEventsScreen) || + type == typeof(CollectionEventUI) || + type == typeof(PlaySocialScreen) || + type == typeof(HeroInGameScreen) || + type == typeof(LevelUpScreen))) + { + continue; + } var data = DataNames.GetValueOrDefault(type, "data"); try diff --git a/BloonsTD6 Mod Helper/BloonsTD6Mod.cs b/BloonsTD6 Mod Helper/BloonsTD6Mod.cs index 3066065a1..cdb39b07a 100644 --- a/BloonsTD6 Mod Helper/BloonsTD6Mod.cs +++ b/BloonsTD6 Mod Helper/BloonsTD6Mod.cs @@ -172,8 +172,11 @@ public virtual void OnNewGameModel(GameModel result) /// /// [Obsolete("No longer implemented.")] - public virtual void OnTowerInventoryInitialized(TowerInventory towerInventory, - List allTowersInTheGame) + public virtual void OnTowerInventoryInitialized + ( + TowerInventory towerInventory, + List allTowersInTheGame + ) { } @@ -417,10 +420,13 @@ public virtual void OnBloonPopped(Bloon bloon) /// Equivalent to a HarmonyPostFix on Bloon.Damaged /// [Obsolete("No longer implemented")] - public virtual void PostBloonDamaged(Bloon bloon, float totalAmount, Projectile projectile, + public virtual void PostBloonDamaged + ( + Bloon bloon, float totalAmount, Projectile projectile, bool distributeToChildren, bool overrideDistributeBlocker, bool createEffect, [Optional] Tower tower, [Optional] BloonProperties immuneBloonProperties, bool canDestroyProjectile = true, - bool ignoreNonTargetable = false, bool blockSpawnChildren = false) + bool ignoreNonTargetable = false, bool blockSpawnChildren = false + ) { } @@ -433,8 +439,11 @@ public virtual void PostBloonDamaged(Bloon bloon, float totalAmount, Projectile /// /// /// - public virtual void OnBloonEmissionsAdded(Spawner spawner, Il2CppReferenceArray newEmissions, - int round, int index = 0) + public virtual void OnBloonEmissionsAdded + ( + Spawner spawner, Il2CppReferenceArray newEmissions, + int round, int index = 0 + ) { } @@ -449,8 +458,11 @@ public virtual void OnBloonEmissionsAdded(Spawner spawner, Il2CppReferenceArray< /// /// /// - public virtual void OnBloonEmitted(Spawner spawner, BloonModel bloonModel, int round, int index, float startingDist, - ref Bloon bloon) + public virtual void OnBloonEmitted + ( + Spawner spawner, BloonModel bloonModel, int round, int index, float startingDist, + ref Bloon bloon + ) { } @@ -560,8 +572,11 @@ public virtual void OnTowerLoaded(Tower tower, TowerSaveDataModel saveData) ///
/// Equivalent to a HarmonyPostFix on Simulation.AddCash /// - public virtual void OnCashAdded(double amount, Simulation.CashType from, - int cashIndex, Simulation.CashSource source, Tower tower) + public virtual void OnCashAdded + ( + double amount, Simulation.CashType from, + int cashIndex, Simulation.CashSource source, Tower tower + ) { } @@ -570,8 +585,11 @@ public virtual void OnCashAdded(double amount, Simulation.CashType from, ///
/// Equivalent to a HarmonyPostFix on Simulation.RemoveCash /// - public virtual void OnCashRemoved(double amount, Simulation.CashType from, int cashIndex, - Simulation.CashSource source) + public virtual void OnCashRemoved + ( + double amount, Simulation.CashType from, int cashIndex, + Simulation.CashSource source + ) { } @@ -715,8 +733,7 @@ public virtual void OnGameObjectsReset() /// /// /// - public virtual void OnTowerButtonCreated(TowerModel tower, int index, bool showAmount, - ref TowerPurchaseButton button) + public virtual void OnTowerButtonCreated(TowerModel tower, int index, bool showAmount, ref ITowerPurchaseButton button) { } @@ -728,8 +745,11 @@ public virtual void OnTowerButtonCreated(TowerModel tower, int index, bool showA /// /// /// - public virtual void PreTowerInventoryInit(TowerInventory towerInventory, - ref IEnumerable baseTowers) + public virtual void PreTowerInventoryInit + ( + TowerInventory towerInventory, + ref IEnumerable baseTowers + ) { } diff --git a/BloonsTD6 Mod Helper/Extensions/ModelExtensions/BloonModelExt.cs b/BloonsTD6 Mod Helper/Extensions/ModelExtensions/BloonModelExt.cs index 5567b9e66..f28b93d0f 100644 --- a/BloonsTD6 Mod Helper/Extensions/ModelExtensions/BloonModelExt.cs +++ b/BloonsTD6 Mod Helper/Extensions/ModelExtensions/BloonModelExt.cs @@ -80,8 +80,11 @@ public static void SpawnBloonModel(this BloonModel bloonModel) /// /// Number of bloons in this emission model /// Space between each bloon in this emission model - public static Il2CppReferenceArray CreateBloonEmissionModel(this BloonModel bloonModel, - int count, int spacing) => Game.instance.model.CreateBloonEmissions(bloonModel, count, spacing); + public static Il2CppReferenceArray CreateBloonEmissionModel + ( + this BloonModel bloonModel, + int count, int spacing + ) => Game.instance.model.CreateBloonEmissions(bloonModel, count, spacing); /// /// Return all BloonToSimulations with this BloonModel @@ -101,9 +104,9 @@ public static List GetAllBloonToSim(this BloonModel bloonMode var bloonSims = InGame.instance.GetUnityToSimulation()?.GetAllBloons(); if (bloonSims is null || !bloonSims.Any()) - return Array.Empty().ToList(); + return new List(); - var results = bloonSims.Where(b => b.GetBaseModel().IsEqual(bloonModel)).ToList(); + var results = bloonSims.ToList().Where(b => b.GetBaseModel().IsEqual(bloonModel)).ToList(); return results; } diff --git a/BloonsTD6 Mod Helper/Extensions/ModelExtensions/TowerDetailsModelExt.cs b/BloonsTD6 Mod Helper/Extensions/ModelExtensions/TowerDetailsModelExt.cs index 1cb3f39b6..fa08ebfed 100644 --- a/BloonsTD6 Mod Helper/Extensions/ModelExtensions/TowerDetailsModelExt.cs +++ b/BloonsTD6 Mod Helper/Extensions/ModelExtensions/TowerDetailsModelExt.cs @@ -2,6 +2,7 @@ using Il2CppAssets.Scripts.Models.TowerSets; using Il2CppAssets.Scripts.Unity; using Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu; +using UnityEngine; namespace BTD_Mod_Helper.Extensions; /// diff --git a/BloonsTD6 Mod Helper/Extensions/ModelExtensions/TowerModelExt.cs b/BloonsTD6 Mod Helper/Extensions/ModelExtensions/TowerModelExt.cs index da7b4b2f6..f1b42ff07 100644 --- a/BloonsTD6 Mod Helper/Extensions/ModelExtensions/TowerModelExt.cs +++ b/BloonsTD6 Mod Helper/Extensions/ModelExtensions/TowerModelExt.cs @@ -218,7 +218,7 @@ public static TowerDetailsModel GetTowerDetailsModel(this TowerModel towerModel) /// Return the TowerPurchaseButton for this TowerModel. /// public static TowerPurchaseButton GetTowerPurchaseButton(this TowerModel towerModel) => - ShopMenu.instance.GetTowerButtonFromBaseId(towerModel.GetBaseId()); + ShopMenu.instance.GetTowerButtonFromBaseId(towerModel.GetBaseId()).GetComponent(); /// /// Return the number position of this TowerModel in the list of all tower models diff --git a/BloonsTD6 Mod Helper/Extensions/StandardTowerPurchaseButtonExt.cs b/BloonsTD6 Mod Helper/Extensions/StandardTowerPurchaseButtonExt.cs index 0ed26affc..96ad80d25 100644 --- a/BloonsTD6 Mod Helper/Extensions/StandardTowerPurchaseButtonExt.cs +++ b/BloonsTD6 Mod Helper/Extensions/StandardTowerPurchaseButtonExt.cs @@ -8,12 +8,13 @@ namespace BTD_Mod_Helper.Extensions; /// public static class StandardTowerPurchaseButtonExt { + /* /// /// Set the background image of this button /// /// /// - public static void SetBackground(this StandardTowerPurchaseButton button, Texture2D texture2D) + public static void SetBackground(this TowerPurchaseButton button, Texture2D texture2D) { button.bg = button.gameObject.GetComponent(); var sprite = Sprite.Create(texture2D, new Rect(0, 0, texture2D.width, texture2D.height), @@ -28,10 +29,11 @@ public static void SetBackground(this StandardTowerPurchaseButton button, Textur /// /// /// - public static void SetBackground(this StandardTowerPurchaseButton button, Sprite sprite) + public static void SetBackground(this TowerPurchaseButton button, Sprite sprite) { button.bg = button.gameObject.GetComponent(); button.bg.overrideSprite = sprite; button.bg.sprite = sprite; } + */ } \ No newline at end of file diff --git a/BloonsTD6 Mod Helper/LATEST.md b/BloonsTD6 Mod Helper/LATEST.md index 875efad07..585eed331 100644 --- a/BloonsTD6 Mod Helper/LATEST.md +++ b/BloonsTD6 Mod Helper/LATEST.md @@ -1 +1,4 @@ -- Fixed hints for custom round sets \ No newline at end of file +- Fixes for BTD6 v41.0 +- Updated VanillaSprites and UpgradeTypes for v41.0 +- Fixed hints for custom round sets +- Fixed some more crashes for Linux / Wine / Proton users \ No newline at end of file diff --git a/BloonsTD6 Mod Helper/ModHelper.cs b/BloonsTD6 Mod Helper/ModHelper.cs index 6945d7dd7..35b0c3bc1 100644 --- a/BloonsTD6 Mod Helper/ModHelper.cs +++ b/BloonsTD6 Mod Helper/ModHelper.cs @@ -16,7 +16,7 @@ namespace BTD_Mod_Helper; public static class ModHelper { internal const string Name = "BloonsTD6 Mod Helper"; - internal const string Version = "3.1.16"; + internal const string Version = "3.1.17"; internal const string RepoOwner = "gurrenm3"; internal const string RepoName = "BTD-Mod-Helper"; internal const string Description = diff --git a/BloonsTD6 Mod Helper/Patches/InGame/Hotkeys_Setup.cs b/BloonsTD6 Mod Helper/Patches/InGame/Hotkeys_Setup.cs index 2d91d73ee..cbd57e444 100644 --- a/BloonsTD6 Mod Helper/Patches/InGame/Hotkeys_Setup.cs +++ b/BloonsTD6 Mod Helper/Patches/InGame/Hotkeys_Setup.cs @@ -12,7 +12,7 @@ private static void Postfix(Hotkeys __instance) { foreach (var towerPurchaseButton in ShopMenu.instance.ActiveTowerButtons) { - var towerBaseId = towerPurchaseButton.towerModel.baseId; + var towerBaseId = towerPurchaseButton.TowerModel.baseId; if (!ModTowerHelper.ModTowerCache.TryGetValue(towerBaseId, out var modTower) || modTower.Hotkey == null) continue; diff --git a/BloonsTD6 Mod Helper/Patches/UI/ShopMenu_CreateTowerButton.cs b/BloonsTD6 Mod Helper/Patches/UI/ShopMenu_CreateTowerButton.cs index 76c89a0e9..a270e3234 100644 --- a/BloonsTD6 Mod Helper/Patches/UI/ShopMenu_CreateTowerButton.cs +++ b/BloonsTD6 Mod Helper/Patches/UI/ShopMenu_CreateTowerButton.cs @@ -8,8 +8,7 @@ internal static class ShopMenu_CreateTowerButton { [HarmonyPostfix] - private static void Postfix(TowerModel model, int buttonIndex, bool showCounts, - ref TowerPurchaseButton __result) + private static void Postfix(TowerModel model, int buttonIndex, bool showCounts, ref ITowerPurchaseButton __result) { var unref__result = __result; ModHelper.PerformHook(mod => diff --git a/BloonsTD6 Mod Helper/Patches/UI/StandardTowerPurchaseButtonPatches.cs b/BloonsTD6 Mod Helper/Patches/UI/TowerPurchaseButtonPatches.cs similarity index 58% rename from BloonsTD6 Mod Helper/Patches/UI/StandardTowerPurchaseButtonPatches.cs rename to BloonsTD6 Mod Helper/Patches/UI/TowerPurchaseButtonPatches.cs index 4bbe4198d..eaa4e8c62 100644 --- a/BloonsTD6 Mod Helper/Patches/UI/StandardTowerPurchaseButtonPatches.cs +++ b/BloonsTD6 Mod Helper/Patches/UI/TowerPurchaseButtonPatches.cs @@ -4,11 +4,11 @@ using UnityEngine.UI; namespace BTD_Mod_Helper.Patches.UI; -[HarmonyPatch(typeof(StandardTowerPurchaseButton), nameof(StandardTowerPurchaseButton.DetermineBackgroundSprite))] -internal class StandardTowerPurchaseButton_DetermineBackgroundSprite +[HarmonyPatch(typeof(TowerPurchaseButton2D), nameof(TowerPurchaseButton2D.DetermineBackgroundSprite))] +internal class TowerPurchaseButton2D_DetermineBackgroundSprite { [HarmonyPrefix] - internal static bool Prefix(StandardTowerPurchaseButton __instance, ref SpriteReference __result) + internal static bool Prefix(TowerPurchaseButton2D __instance, ref SpriteReference __result) { if (__instance.towerModel.GetModTower()?.ModTowerSet is ModTowerSet modTowerSet) { @@ -20,11 +20,11 @@ internal static bool Prefix(StandardTowerPurchaseButton __instance, ref SpriteRe } } -[HarmonyPatch(typeof(StandardTowerPurchaseButton), nameof(StandardTowerPurchaseButton.UpdateDisplay))] -internal class StandardTowerPurchaseButton_UpdateTowerDisplay +[HarmonyPatch(typeof(TowerPurchaseButton2D), nameof(TowerPurchaseButton2D.UpdateDisplay))] +internal class TowerPurchaseButton2D_UpdateTowerDisplay { [HarmonyPostfix] - internal static void Postfix(StandardTowerPurchaseButton __instance) + internal static void Postfix(TowerPurchaseButton2D __instance) { if (__instance.towerModel.GetModTower()?.ModTowerSet is ModTowerSet modTowerSet) { diff --git a/Documentation/BTD_Mod_Helper.BloonsTD6Mod.md b/Documentation/BTD_Mod_Helper.BloonsTD6Mod.md index 3fb03264e..170b49f05 100644 --- a/Documentation/BTD_Mod_Helper.BloonsTD6Mod.md +++ b/Documentation/BTD_Mod_Helper.BloonsTD6Mod.md @@ -898,34 +898,34 @@ Equivalent to a HarmonyPostFix on TitleScreen.Start public virtual void OnTitleScreen(); ``` - + -## BloonsTD6Mod.OnTowerButtonCreated(TowerModel, int, bool, TowerPurchaseButton) Method +## BloonsTD6Mod.OnTowerButtonCreated(TowerModel, int, bool, ITowerPurchaseButton) Method Called after a TowerPurchaseButton is created
Equivalent to a HarmonyPostfix on ShopMenu.CreateTowerButton ```csharp -public virtual void OnTowerButtonCreated(TowerModel tower, int index, bool showAmount, ref TowerPurchaseButton button); +public virtual void OnTowerButtonCreated(TowerModel tower, int index, bool showAmount, ref ITowerPurchaseButton button); ``` #### Parameters - + `tower` [Il2CppAssets.Scripts.Models.Towers.TowerModel](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Models.Towers.TowerModel 'Il2CppAssets.Scripts.Models.Towers.TowerModel') - + `index` [System.Int32](https://docs.microsoft.com/en-us/dotnet/api/System.Int32 'System.Int32') - + `showAmount` [System.Boolean](https://docs.microsoft.com/en-us/dotnet/api/System.Boolean 'System.Boolean') - + -`button` [Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton 'Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton') +`button` [Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.ITowerPurchaseButton](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.ITowerPurchaseButton 'Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.ITowerPurchaseButton') diff --git a/Documentation/BTD_Mod_Helper.Extensions.StandardTowerPurchaseButtonExt.md b/Documentation/BTD_Mod_Helper.Extensions.StandardTowerPurchaseButtonExt.md index e84e7adf0..59be82f18 100644 --- a/Documentation/BTD_Mod_Helper.Extensions.StandardTowerPurchaseButtonExt.md +++ b/Documentation/BTD_Mod_Helper.Extensions.StandardTowerPurchaseButtonExt.md @@ -9,43 +9,4 @@ Extensions for StandardTowerPurchaseButtons public static class StandardTowerPurchaseButtonExt ``` -Inheritance [System.Object](https://docs.microsoft.com/en-us/dotnet/api/System.Object 'System.Object') 🡒 StandardTowerPurchaseButtonExt -### Methods - - - -## StandardTowerPurchaseButtonExt.SetBackground(this StandardTowerPurchaseButton, Sprite) Method - -Set the background image of this button - -```csharp -public static void SetBackground(this StandardTowerPurchaseButton button, Sprite sprite); -``` -#### Parameters - - - -`button` [Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.StandardTowerPurchaseButton](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.StandardTowerPurchaseButton 'Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.StandardTowerPurchaseButton') - - - -`sprite` [UnityEngine.Sprite](https://docs.microsoft.com/en-us/dotnet/api/UnityEngine.Sprite 'UnityEngine.Sprite') - - - -## StandardTowerPurchaseButtonExt.SetBackground(this StandardTowerPurchaseButton, Texture2D) Method - -Set the background image of this button - -```csharp -public static void SetBackground(this StandardTowerPurchaseButton button, Texture2D texture2D); -``` -#### Parameters - - - -`button` [Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.StandardTowerPurchaseButton](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.StandardTowerPurchaseButton 'Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.StandardTowerPurchaseButton') - - - -`texture2D` [UnityEngine.Texture2D](https://docs.microsoft.com/en-us/dotnet/api/UnityEngine.Texture2D 'UnityEngine.Texture2D') \ No newline at end of file +Inheritance [System.Object](https://docs.microsoft.com/en-us/dotnet/api/System.Object 'System.Object') 🡒 StandardTowerPurchaseButtonExt \ No newline at end of file diff --git a/Documentation/BTD_Mod_Helper.Extensions.TowerDetailsModelExt.md b/Documentation/BTD_Mod_Helper.Extensions.TowerDetailsModelExt.md index ebcb781bb..b5f2ba395 100644 --- a/Documentation/BTD_Mod_Helper.Extensions.TowerDetailsModelExt.md +++ b/Documentation/BTD_Mod_Helper.Extensions.TowerDetailsModelExt.md @@ -73,7 +73,7 @@ public static TowerModel GetTower(this TowerDetailsModel towerDetailsModel); Get the TowerPurchaseButton that is used to buy this specific TowerDetailModel ```csharp -public static TowerPurchaseButton GetTowerPurchaseButton(this TowerDetailsModel towerDetailsModel); +public static Transform GetTowerPurchaseButton(this TowerDetailsModel towerDetailsModel); ``` #### Parameters @@ -82,7 +82,7 @@ public static TowerPurchaseButton GetTowerPurchaseButton(this TowerDetailsModel `towerDetailsModel` [Il2CppAssets.Scripts.Models.TowerSets.TowerDetailsModel](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Models.TowerSets.TowerDetailsModel 'Il2CppAssets.Scripts.Models.TowerSets.TowerDetailsModel') #### Returns -[Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton 'Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton') +[UnityEngine.Transform](https://docs.microsoft.com/en-us/dotnet/api/UnityEngine.Transform 'UnityEngine.Transform') diff --git a/Documentation/BTD_Mod_Helper.Extensions.TowerModelExt.md b/Documentation/BTD_Mod_Helper.Extensions.TowerModelExt.md index 47b242ba9..20d084260 100644 --- a/Documentation/BTD_Mod_Helper.Extensions.TowerModelExt.md +++ b/Documentation/BTD_Mod_Helper.Extensions.TowerModelExt.md @@ -402,7 +402,7 @@ public static string GetTowerId(this TowerModel towerModel); Return the TowerPurchaseButton for this TowerModel. ```csharp -public static TowerPurchaseButton GetTowerPurchaseButton(this TowerModel towerModel); +public static Transform GetTowerPurchaseButton(this TowerModel towerModel); ``` #### Parameters @@ -411,7 +411,7 @@ public static TowerPurchaseButton GetTowerPurchaseButton(this TowerModel towerMo `towerModel` [Il2CppAssets.Scripts.Models.Towers.TowerModel](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Models.Towers.TowerModel 'Il2CppAssets.Scripts.Models.Towers.TowerModel') #### Returns -[Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton](https://docs.microsoft.com/en-us/dotnet/api/Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton 'Il2CppAssets.Scripts.Unity.UI_New.InGame.StoreMenu.TowerPurchaseButton') +[UnityEngine.Transform](https://docs.microsoft.com/en-us/dotnet/api/UnityEngine.Transform 'UnityEngine.Transform')