From 4d0e5b107f963f91ef787d067a870c44161a7e6b Mon Sep 17 00:00:00 2001 From: Jamie Phan <9488815+jamiephan@users.noreply.github.com> Date: Mon, 1 Jul 2024 02:41:14 +0800 Subject: [PATCH] Updated Mimics to game version 2.55.5.92264 --- .../Mods/GameData/HeroesMod/AbilityMimic.xml | 17 +- .../Mods/GameData/HeroesMod/BehaviorMimic.xml | 511 ++++++++++++++++-- .../Mods/GameData/HeroesMod/ModelMimic.xml | 20 + .../MimicGameDataHelperLib.galaxy | 300 ++++------ .../MimicGameDataHelperLib_h.galaxy | 5 +- .../InternalMimics/MimicGameLib.galaxy | 19 +- .../InternalMimics/MimicGameLib_h.galaxy | 1 + .../InternalMimics/MimicHeroesLib.galaxy | 1 + .../InternalMimics/MimicUILib.galaxy | 57 +- .../InternalMimics/MimicUILib_h.galaxy | 2 + 10 files changed, 665 insertions(+), 268 deletions(-) diff --git a/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/AbilityMimic.xml b/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/AbilityMimic.xml index bee1f6b..396559a 100644 --- a/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/AbilityMimic.xml +++ b/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/AbilityMimic.xml @@ -1011,6 +1011,9 @@ + + + @@ -1145,6 +1148,9 @@ + + + @@ -2099,7 +2105,6 @@ - @@ -2118,7 +2123,6 @@ - @@ -4090,6 +4094,9 @@ + + + @@ -4669,6 +4676,9 @@ + + + @@ -5405,6 +5415,9 @@ + + + diff --git a/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/BehaviorMimic.xml b/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/BehaviorMimic.xml index 3b1e4e9..3590df9 100644 --- a/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/BehaviorMimic.xml +++ b/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/BehaviorMimic.xml @@ -2559,6 +2559,10 @@ + + + + @@ -2699,10 +2703,18 @@ + + + + + + + + @@ -3171,6 +3183,10 @@ + + + + @@ -3871,13 +3887,9 @@ - - - - - - - + + + @@ -4471,6 +4483,10 @@ + + + + @@ -5267,6 +5283,10 @@ + + + + @@ -5503,6 +5523,10 @@ + + + + @@ -6199,6 +6223,10 @@ + + + + @@ -7623,6 +7651,10 @@ + + + + @@ -7891,6 +7923,10 @@ + + + + @@ -8075,10 +8111,18 @@ + + + + + + + + @@ -9919,6 +9963,10 @@ + + + + @@ -16143,6 +16191,14 @@ + + + + + + + + @@ -16399,6 +16455,10 @@ + + + + @@ -16823,6 +16883,10 @@ + + + + @@ -17367,6 +17431,10 @@ + + + + @@ -17487,6 +17555,10 @@ + + + + @@ -17919,6 +17991,10 @@ + + + + @@ -18183,6 +18259,10 @@ + + + + @@ -19379,10 +19459,6 @@ - - - - @@ -20007,6 +20083,10 @@ + + + + @@ -20547,6 +20627,10 @@ + + + + @@ -20647,6 +20731,10 @@ + + + + @@ -20771,6 +20859,10 @@ + + + + @@ -22383,6 +22475,10 @@ + + + + @@ -23015,6 +23111,10 @@ + + + + @@ -27865,6 +27965,12 @@ + + + + + + @@ -28075,12 +28181,24 @@ + + + + + + + + + + + + @@ -28783,6 +28901,12 @@ + + + + + + @@ -29833,16 +29957,10 @@ - + - - - - - - - + @@ -30733,6 +30851,12 @@ + + + + + + @@ -31927,6 +32051,12 @@ + + + + + + @@ -32281,6 +32411,12 @@ + + + + + + @@ -33325,6 +33461,12 @@ + + + + + + @@ -35461,6 +35603,12 @@ + + + + + + @@ -35863,6 +36011,12 @@ + + + + + + @@ -36139,12 +36293,24 @@ + + + + + + + + + + + + @@ -38905,6 +39071,12 @@ + + + + + + @@ -48241,6 +48413,18 @@ + + + + + + + + + + + + @@ -48625,6 +48809,12 @@ + + + + + + @@ -49261,6 +49451,12 @@ + + + + + + @@ -50077,6 +50273,12 @@ + + + + + + @@ -50257,6 +50459,12 @@ + + + + + + @@ -50905,6 +51113,12 @@ + + + + + + @@ -51301,6 +51515,12 @@ + + + + + + @@ -53095,12 +53315,6 @@ - - - - - - @@ -54037,6 +54251,12 @@ + + + + + + @@ -54847,6 +55067,12 @@ + + + + + + @@ -54997,6 +55223,12 @@ + + + + + + @@ -55183,6 +55415,12 @@ + + + + + + @@ -57601,6 +57839,12 @@ + + + + + + @@ -58549,6 +58793,12 @@ + + + + + + @@ -64550,6 +64800,13 @@ + + + + + + + @@ -64795,6 +65052,13 @@ + + + + + + + @@ -64802,6 +65066,13 @@ + + + + + + + @@ -65621,6 +65892,13 @@ + + + + + + + @@ -66846,19 +67124,12 @@ - - - - - - - - + - - - + + + @@ -67896,6 +68167,13 @@ + + + + + + + @@ -69289,6 +69567,13 @@ + + + + + + + @@ -69702,6 +69987,13 @@ + + + + + + + @@ -70920,6 +71212,13 @@ + + + + + + + @@ -73412,6 +73711,13 @@ + + + + + + + @@ -73881,6 +74187,13 @@ + + + + + + + @@ -74203,6 +74516,13 @@ + + + + + + + @@ -74210,6 +74530,13 @@ + + + + + + + @@ -77430,6 +77757,13 @@ + + + + + + + @@ -88322,6 +88656,20 @@ + + + + + + + + + + + + + + @@ -88770,6 +89118,13 @@ + + + + + + + @@ -89512,6 +89867,13 @@ + + + + + + + @@ -90464,6 +90826,13 @@ + + + + + + + @@ -90674,6 +91043,13 @@ + + + + + + + @@ -91430,6 +91806,13 @@ + + + + + + + @@ -91892,6 +92275,13 @@ + + + + + + + @@ -93985,13 +94375,6 @@ - - - - - - - @@ -95084,6 +95467,13 @@ + + + + + + + @@ -96029,6 +96419,13 @@ + + + + + + + @@ -96204,6 +96601,13 @@ + + + + + + + @@ -96421,6 +96825,13 @@ + + + + + + + @@ -99242,6 +99653,13 @@ + + + + + + + @@ -100348,6 +100766,13 @@ + + + + + + + diff --git a/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/ModelMimic.xml b/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/ModelMimic.xml index adcff95..c7750fb 100644 --- a/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/ModelMimic.xml +++ b/(10)trymemode.stormmap/base.stormdata/Mods/GameData/HeroesMod/ModelMimic.xml @@ -2280,6 +2280,7 @@ + @@ -6362,6 +6363,7 @@ + @@ -8056,6 +8058,7 @@ + @@ -17565,6 +17568,7 @@ + @@ -18335,6 +18339,7 @@ + @@ -26025,6 +26030,9 @@ + + + @@ -38271,6 +38279,9 @@ + + + @@ -43353,6 +43364,9 @@ + + + @@ -71880,6 +71894,9 @@ + + + @@ -74190,6 +74207,9 @@ + + + diff --git a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameDataHelperLib.galaxy b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameDataHelperLib.galaxy index 9898195..4aa6ea3 100644 --- a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameDataHelperLib.galaxy +++ b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameDataHelperLib.galaxy @@ -932,7 +932,6 @@ void MimicGameDataHelperLib_gf_HeroButcherIncrementHeroCountFunction () { // Implementation MimicGameDataHelperLib_gv_heroButcherTriggerRegistrationVariable += 1; if ((MimicGameDataHelperLib_gv_heroButcherTriggerRegistrationVariable == 1)) { - TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtTargetAudioTelegraph, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtTravelValidation, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtCast, true); @@ -954,7 +953,6 @@ void MimicGameDataHelperLib_gf_HeroButcherDecrementHeroCountFunction () { } if ((MimicGameDataHelperLib_gv_heroButcherTriggerRegistrationVariable == 0)) { - TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtTargetAudioTelegraph, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtTravelValidation, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtCast, false); @@ -1176,6 +1174,8 @@ void MimicGameDataHelperLib_gf_HeroDryadIncrementHeroCountFunction () { TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadDeactivateCameraSettings, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadActivateCameraforSymbiote, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadLossofControlCamera, true); + TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicBehaviorActivate, true); + TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicBehaviorDeactivate, true); } } @@ -1199,6 +1199,8 @@ void MimicGameDataHelperLib_gf_HeroDryadDecrementHeroCountFunction () { TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadDeactivateCameraSettings, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadActivateCameraforSymbiote, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadLossofControlCamera, false); + TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicBehaviorActivate, false); + TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicBehaviorDeactivate, false); } } @@ -1580,7 +1582,6 @@ void MimicGameDataHelperLib_gf_HeroLiLiIncrementHeroCountFunction () { // Implementation MimicGameDataHelperLib_gv_heroLiLiTriggerRegistrationVariable += 1; if ((MimicGameDataHelperLib_gv_heroLiLiTriggerRegistrationVariable == 1)) { - TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentTurretSerpentSummonandSimplifiedAI, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentSummonandSimplifiedAI, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentAttackMimic, true); @@ -1597,7 +1598,6 @@ void MimicGameDataHelperLib_gf_HeroLiLiDecrementHeroCountFunction () { } if ((MimicGameDataHelperLib_gv_heroLiLiTriggerRegistrationVariable == 0)) { - TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentTurretSerpentSummonandSimplifiedAI, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentSummonandSimplifiedAI, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentAttackMimic, false); @@ -2967,6 +2967,7 @@ void MimicGameDataHelperLib_gf_HeroRaynorIncrementHeroCountFunction () { TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorBansheeTeleport, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorRemoveBansheeOnEnterVehicle, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderDeathTimerMod, true); + TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate, true); } } @@ -2988,6 +2989,7 @@ void MimicGameDataHelperLib_gf_HeroRaynorDecrementHeroCountFunction () { TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorBansheeTeleport, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorRemoveBansheeOnEnterVehicle, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderDeathTimerMod, false); + TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate, false); } } @@ -3659,6 +3661,7 @@ void MimicGameDataHelperLib_gf_HeroSgtHammerIncrementHeroCountFunction () { TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunPrepStart, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunTargetCalculation, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunTargetCalculationViaEffect, true); + TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunCheckForLocation, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerConcussiveBlastCancel, true); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerConcussiveBlastForcedDestruction, true); @@ -3682,6 +3685,7 @@ void MimicGameDataHelperLib_gf_HeroSgtHammerDecrementHeroCountFunction () { TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunPrepStart, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunTargetCalculation, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunTargetCalculationViaEffect, false); + TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunCheckForLocation, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerConcussiveBlastCancel, false); TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerConcussiveBlastForcedDestruction, false); @@ -7852,39 +7856,6 @@ void MimicGameDataHelperLib_gt_HeroBarbarianLeapArreatCraterForcedDestruction_In TriggerAddEventPlayerEffectUsed(MimicGameDataHelperLib_gt_HeroBarbarianLeapArreatCraterForcedDestruction, c_playerAny, "DestroyPathingBlockerDummy"); } -//-------------------------------------------------------------------------------------------------- -// Trigger: Hero - Butcher - Butcher's Brand Duration Refresh -//-------------------------------------------------------------------------------------------------- -bool MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh_Func (bool testConds, bool runActions) { - // Variable Declarations - fixed lv_increaseAmount; - unit lv_target; - unit lv_butcher; - fixed lv_currentAmount; - - // Automatic Variable Declarations - // Variable Initialization - lv_increaseAmount = 0.5; - lv_target = EventPlayerEffectUsedUnit(c_effectUnitTarget); - lv_butcher = EventPlayerEffectUsedUnit(c_effectUnitCaster); - lv_currentAmount = UnitBehaviorDuration(lv_target, "ButchersBrand"); - - // Actions - if (!runActions) { - return true; - } - - UnitBehaviorSetDuration(lv_target, "ButchersBrand", (lv_currentAmount + lv_increaseAmount)); - return true; -} - -//-------------------------------------------------------------------------------------------------- -void MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh_Init () { - MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh = TriggerCreate("MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh_Func"); - TriggerEnable(MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh, false); - TriggerAddEventPlayerEffectUsed(MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh, c_playerAny, "ButcherButchersBrandDurationIncreaseDummy"); -} - //-------------------------------------------------------------------------------------------------- // Trigger: Hero - Butcher - Ruthless Onslaught - Target Audio Telegraph //-------------------------------------------------------------------------------------------------- @@ -8204,13 +8175,8 @@ bool MimicGameDataHelperLib_gt_HeroChenWanderingKegActivate_Func (bool testConds // Variable Declarations unit lv_chen; int lv_player; - int lv_itPlayer; - bool lv_pandamoniumMoveEnable; // Automatic Variable Declarations - const int auto9AF15E39_ae = libCore_gv_bALMaxPlayers; - const int auto9AF15E39_ai = 1; - // Variable Initialization // Actions @@ -8220,47 +8186,10 @@ bool MimicGameDataHelperLib_gt_HeroChenWanderingKegActivate_Func (bool testConds lv_chen = EventPlayerEffectUsedUnit(c_effectUnitCaster); lv_player = UnitGetOwner(lv_chen); - MimicGameDataHelperLib_gv_heroChenWanderingKegActive[lv_player] = true; - MimicGameDataHelperLib_gv_heroChenWanderingKegHealthStore[lv_player] = UnitGetPropertyFixed(lv_chen, c_unitPropLife, c_unitPropCurrent); - if ((MimicGameDataHelperLib_gv_heroChenWanderingKegEventAdded[lv_player] == false)) { - TriggerAddEventMouseMoved(MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker, EventPlayer()); - } - - MimicGameDataHelperLib_gv_heroChenWanderingKegEventAdded[lv_player] = true; - MimicGameDataHelperLib_gv_heroChenWanderingKegAngleMoveTo[lv_player] = UnitGetFacing(lv_chen); - TriggerEnable(MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker, true); - MimicGameDataHelperLib_gv_heroChenWanderingKegActive[lv_player] = true; if ((libAIAI_gf_HeroAIIsAIEnabledForPlayer(lv_player) == false)) { UnitBehaviorAdd(lv_chen, "ChenWanderingKegMovementDisabler", lv_chen, 1); } - while ((UnitIsAlive(lv_chen) == true) && (UnitHasBehavior2(lv_chen, "ChenWanderingKegCasterBuff") == true)) { - UnitIssueOrder(lv_chen, OrderTargetingPoint(AbilityCommand("ChenWanderingKegMoveDummy", 0), PointWithOffsetPolar(UnitGetPosition(lv_chen), 4.0, MimicGameDataHelperLib_gv_heroChenWanderingKegAngleMoveTo[lv_player])), c_orderQueueReplace); - if ((libAIAI_gf_HeroAIIsAIEnabledForPlayer(lv_player) == false)) { - Wait(0.1, c_timeGame); - } - else { - Wait(0.25, c_timeGame); - } - } - lv_itPlayer = 1; - for ( ; ( (auto9AF15E39_ai >= 0 && lv_itPlayer <= auto9AF15E39_ae) || (auto9AF15E39_ai < 0 && lv_itPlayer >= auto9AF15E39_ae) ) ; lv_itPlayer += auto9AF15E39_ai ) { - if ((MimicGameDataHelperLib_gv_heroChenWanderingKegActive[lv_itPlayer] == true)) { - lv_pandamoniumMoveEnable = true; - break; - } - - } - if ((lv_pandamoniumMoveEnable == false)) { - TriggerEnable(MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker, false); - } - - MimicGameDataHelperLib_gv_heroChenWanderingKegActive[lv_player] = false; - if ((MimicGameDataHelperLib_gv_heroChenWanderingKegEventAdded[lv_player] == true)) { - MimicGameDataHelperLib_gv_heroChenWanderingKegEventAdded[lv_player] = false; - TriggerRemoveEventMouseMoved(MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker, EventPlayer()); - } - return true; } @@ -8271,48 +8200,6 @@ void MimicGameDataHelperLib_gt_HeroChenWanderingKegActivate_Init () { TriggerAddEventPlayerEffectUsed(MimicGameDataHelperLib_gt_HeroChenWanderingKegActivate, c_playerAny, "ChenWanderingKegInitialSet"); } -//-------------------------------------------------------------------------------------------------- -// Trigger: Hero - Chen - Wandering Keg Move Tracker -//-------------------------------------------------------------------------------------------------- -bool MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker_Func (bool testConds, bool runActions) { - // Variable Declarations - int lv_player; - - // Automatic Variable Declarations - // Variable Initialization - lv_player = EventPlayer(); - - // Conditions - if (testConds) { - if (!((MimicGameDataHelperLib_gv_heroChenWanderingKegActive[lv_player] == true))) { - return false; - } - } - - // Actions - if (!runActions) { - return true; - } - - if ((UnitGetType(libGame_gv_players[lv_player].lv_activeVehicle) == "HeroChen")) { - MimicGameDataHelperLib_gv_heroChenWanderingKegMoveTo[lv_player] = Point(EventMouseMovedPosXWorld(), EventMouseMovedPosYWorld()); - MimicGameDataHelperLib_gv_heroChenWanderingKegAngleMoveTo[lv_player] = AngleBetweenPoints(UnitGetPosition(libGame_gv_players[lv_player].lv_activeVehicle), Point(EventMouseMovedPosXWorld(), EventMouseMovedPosYWorld())); - } - - if ((UnitGetType(libGame_gv_players[lv_player].lv_heroUnit) == "HeroChen")) { - MimicGameDataHelperLib_gv_heroChenWanderingKegMoveTo[lv_player] = Point(EventMouseMovedPosXWorld(), EventMouseMovedPosYWorld()); - MimicGameDataHelperLib_gv_heroChenWanderingKegAngleMoveTo[lv_player] = AngleBetweenPoints(UnitGetPosition(libGame_gv_players[lv_player].lv_heroUnit), Point(EventMouseMovedPosXWorld(), EventMouseMovedPosYWorld())); - } - - return true; -} - -//-------------------------------------------------------------------------------------------------- -void MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker_Init () { - MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker = TriggerCreate("MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker_Func"); - TriggerEnable(MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker, false); -} - //-------------------------------------------------------------------------------------------------- // Trigger: Hero - Chen - Wandering Keg Deactivate //-------------------------------------------------------------------------------------------------- @@ -9905,16 +9792,8 @@ bool MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition_Func (bool tes void MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition_Init () { MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition = TriggerCreate("MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition_Func"); TriggerEnable(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, false); - TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategoryDebuffRoot, c_unitBehaviorChangeCreate); - TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategoryDebuffRoot, c_unitBehaviorChangeRefresh); - TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategoryStun, c_unitBehaviorChangeCreate); - TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategoryStun, c_unitBehaviorChangeRefresh); TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategoryDebuffSilence, c_unitBehaviorChangeCreate); TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategoryDebuffSilence, c_unitBehaviorChangeRefresh); - TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategorySlow, c_unitBehaviorChangeCreate); - TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategorySlow, c_unitBehaviorChangeRefresh); - TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategoryFear, c_unitBehaviorChangeCreate); - TriggerAddEventUnitBehaviorChangeFromCategory(MimicGameDataHelperLib_gt_HeroDryadAbolishMagicCCRecognition, null, c_behaviorCategoryFear, c_unitBehaviorChangeRefresh); } //-------------------------------------------------------------------------------------------------- @@ -11928,60 +11807,6 @@ void MimicGameDataHelperLib_gt_HeroL90ETCMoshPitOn_Init () { TriggerAddEventUnitBehaviorChange(MimicGameDataHelperLib_gt_HeroL90ETCMoshPitOn, null, "L90ETCMoshPitStun", c_unitBehaviorChangeRefresh); } -//-------------------------------------------------------------------------------------------------- -// Trigger: Hero - Li Li - Cloud Serpent Stat Tracking -//-------------------------------------------------------------------------------------------------- -bool MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking_Func (bool testConds, bool runActions) { - // Variable Declarations - int lv_itPlayer; - fixed lv_healingAmount; - int lv_hostPlayer; - int lv_liLiPlayer; - fixed lv_vertOffset; - fixed lv_horizOffset; - - // Automatic Variable Declarations - playergroup auto8915D851_g; - - // Variable Initialization - - // Actions - if (!runActions) { - return true; - } - - lv_hostPlayer = EventPlayerEffectUsedUnitOwner(c_effectPlayerCaster); - lv_healingAmount = EventPlayerEffectUsedAmountFixed(c_effectAmountHealed, false); - lv_vertOffset = 2.0; - lv_horizOffset = RandomFixed(-0.4, -0.6); - auto8915D851_g = libGame_gf_PlayersOnTeamHeroes(libGame_gf_TeamNumberOfPlayer(lv_hostPlayer), false); - lv_itPlayer = -1; - while (true) { - lv_itPlayer = PlayerGroupNextPlayer(auto8915D851_g, lv_itPlayer); - if (lv_itPlayer<0) { break; } - if ((libGame_gv_players[lv_itPlayer].lv_heroIndex == libCore_gf_GetHeroIndexForUnitType("HeroLiLi"))) { - lv_liLiPlayer = lv_itPlayer; - break; - } - - } - libGame_gf_ScoreValuesReportRealValueAndLog(lv_liLiPlayer, "Healing", (PlayerScoreValueGetAsFixed(lv_liLiPlayer, "Healing") + lv_healingAmount)); - if ((lv_hostPlayer != lv_liLiPlayer)) { - FloatingCombatElementCreateTextAtUnit(PlayerGroupSingle(lv_liLiPlayer), "FloatingCombatElements/FloatingCombatNormalAmountReceived", "HealState", EventPlayerEffectUsedUnit(c_effectUnitTarget), FixedToText(lv_healingAmount, 0), libNtve_gv_FloatingCombatTextAutoRandomSeed); - } - - return true; -} - -//-------------------------------------------------------------------------------------------------- -void MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking_Init () { - MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking = TriggerCreate("MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking_Func"); - TriggerEnable(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking, false); - TriggerAddEventPlayerEffectUsed(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking, c_playerAny, "LiLiCloudSerpentCreateHealer"); - TriggerAddEventPlayerEffectUsed(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking, c_playerAny, "LiLiCloudSerpentBlessingsOfYulonTalentCreateHealer"); - TriggerAddEventPlayerEffectUsed(MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking, c_playerAny, "LiLiCloudSerpentLightningSerpentCreateHealer"); -} - //-------------------------------------------------------------------------------------------------- // Trigger: Hero - Li Li - Cloud Serpent Turret Serpent Summon and Simplified AI //-------------------------------------------------------------------------------------------------- @@ -13713,6 +13538,7 @@ bool MimicGameDataHelperLib_gt_HeroLostVikingsVikingDies_Func (bool testConds, b UnitBehaviorSetDuration(lv_deadUnit, "Dead", TimerGetRemaining(lv_vikingDeathTimer)); } else { + UnitSetPropertyFixed(lv_deadUnit, c_unitPropLifePercent, 100.0); UnitBehaviorSetDuration(lv_deadUnit, "Dead", 0.0); } auto973DB6EB_g = libGame_gv_players[lv_lVPlayer].lv_heroUnitGroup; @@ -15522,22 +15348,6 @@ bool MimicGameDataHelperLib_gt_HeroLostVikingsAbathurClone_Func (bool testConds, } UnitBehaviorAdd(EventUnit(), "LostVikings1VikingAlive", EventUnit(), 1); UnitBehaviorAdd(EventUnit(), "UltimateEvolutionAlternateHero", EventUnit(), 1); - if ((PlayerHasTalent(lv_lVPlayer, "LostVikingsMasteryJump") == true)) { - UnitBehaviorAdd(EventUnit(), "LostVikingsJumpEnabled", EventUnit(), 1); - } - - if ((PlayerHasTalent(lv_lVPlayer, "LostVikingsMasterySpinToWin") == true)) { - UnitBehaviorAdd(EventUnit(), "LostVikingsSpinToWinCarry", EventUnit(), 1); - } - - if ((PlayerHasTalent(lv_lVPlayer, "LostVikingsMasteryNordicAttackSquad") == true)) { - UnitBehaviorAdd(EventUnit(), "LostVikingsNordicAttackSquadCarry", EventUnit(), 1); - } - - if ((PlayerHasTalent(lv_lVPlayer, "LostVikingsMasteryNorseForce") == true)) { - UnitBehaviorAdd(EventUnit(), "LostVikingsNorseForceEnabled", EventUnit(), 1); - } - PlayerAddCooldown(UnitGetOwner(EventUnit()), CatalogFieldValueGet(c_gameCatalogAbil, "LostVikingsLongboatRaidNewer", "Cost[" + IntToString(0) + "].Cooldown.Link", UnitGetOwner(EventUnit())), 15.0); PlayerAddCooldown(UnitGetOwner(EventUnit()), CatalogFieldValueGet(c_gameCatalogAbil, "LostVikingsPlayAgain", "Cost[" + IntToString(0) + "].Cooldown.Link", UnitGetOwner(EventUnit())), 15.0); return true; @@ -16639,7 +16449,7 @@ bool MimicGameDataHelperLib_gt_HeroMedicMedivacDropshipOverlay_Func (bool testCo if (((PlayerSkin(lv_ownerOfTransport) == "MedicSkinLove") || (PlayerSkin(lv_ownerOfTransport) == "MedicSkinLoveVar1") || (PlayerSkin(lv_ownerOfTransport) == "MedicSkinLoveVar2"))) { libUIUI_gf_FullscreenOverlayAddItemForPlayer(lv_player, libUIUI_ge_FullscreenOverlayPriorities_Stasis, "Cutscenes\\GameUI_MedivacLoveOverlay.StormCutscene", lv_triggeringBehavior); } - else if (((PlayerSkin(lv_ownerOfTransport) == "MedicEnforcer") || (PlayerSkin(lv_ownerOfTransport) == "MedicEnforcerVar3") || (PlayerSkin(lv_ownerOfTransport) == "MedicEnforcerVar1"))) { + else if (((PlayerSkin(lv_ownerOfTransport) == "MedicEnforcerVar4") || (PlayerSkin(lv_ownerOfTransport) == "MedicEnforcer") || (PlayerSkin(lv_ownerOfTransport) == "MedicEnforcerVar3") || (PlayerSkin(lv_ownerOfTransport) == "MedicEnforcerVar1"))) { libUIUI_gf_FullscreenOverlayAddItemForPlayer(lv_player, libUIUI_ge_FullscreenOverlayPriorities_Stasis, "Cutscenes\\GameUI_MedivacEnforcerOverlay.StormCutscene", lv_triggeringBehavior); } else if (true) { @@ -17343,6 +17153,10 @@ bool MimicGameDataHelperLib_gt_HeroMuradinHaymakerGrandSlamTalentProc_Func (bool // Conditions if (testConds) { + if (!((PlayerHasTalent(lv_killingPlayer, "MuradinMasteryHaymakerGrandSlam") == true))) { + return false; + } + if (!((UnitHasBehavior2(lv_killedUnit, "MuradinHaymakerGrandSlamTalentDeathMarker") == true))) { return false; } @@ -19066,6 +18880,35 @@ void MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderDeathTimerMod_Init () { libGame_gf_HeroKilled(MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderDeathTimerMod); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Hero - Raynor - Execute Order - Hyperion Activate +//-------------------------------------------------------------------------------------------------- +bool MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_raynor; + point lv_targetPoint; + + // Automatic Variable Declarations + // Variable Initialization + lv_raynor = EventPlayerEffectUsedUnit(c_effectUnitCaster); + lv_targetPoint = EventPlayerEffectUsedPoint(c_effectLocationTargetPoint); + + // Actions + if (!runActions) { + return true; + } + + UnitCreateEffectPointWithSource(lv_raynor, "HyperionInitialCreatePersistent", lv_targetPoint, c_gameCatalogAbil, "RaynorHyperionExecuteOrders"); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate_Init () { + MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate = TriggerCreate("MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate_Func"); + TriggerEnable(MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate, false); + TriggerAddEventPlayerEffectUsed(MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate, c_playerAny, "RaynorExecuteOrdersDummyEffect"); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Hero - Rehgar - Tidal Waves Modify Cooldown //-------------------------------------------------------------------------------------------------- @@ -19909,6 +19752,10 @@ bool MimicGameDataHelperLib_gt_HeroRexxarMishaSpawn_Func (bool testConds, bool r UnitCreateEffectUnit(lv_rexxar, "RexxarAnimalHusbandryDynamicModifyTokenCounter", lv_misha); } + if ((PlayerHasTalent(lv_rexxarPlayer, "RexxarSpiritBondPrimalIntimidation") == true)) { + UnitBehaviorAdd(lv_misha, "TalentImposingPresenceCarry", lv_misha, 1); + } + if ((PlayerHasTalent(lv_rexxarPlayer, "RexxarDireBeast") == true)) { UnitBehaviorAdd(lv_misha, "RexxarDireBeastTokenCounter", lv_misha, 1); } @@ -21971,6 +21818,40 @@ void MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunCheckForLocation_Init ( TriggerAddEventUnitBehaviorChange(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunCheckForLocation, null, "BluntForceGunMissileScan", c_unitBehaviorChangeCreate); } +//-------------------------------------------------------------------------------------------------- +// Trigger: Hero - SgtHammer - Blunt Force Gun Apply Orbital Scan +//-------------------------------------------------------------------------------------------------- +bool MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan_Func (bool testConds, bool runActions) { + // Variable Declarations + unit lv_sourceUnit; + + // Automatic Variable Declarations + // Variable Initialization + lv_sourceUnit = EventPlayerEffectUsedUnit(c_effectUnitSource); + + // Conditions + if (testConds) { + if (!((UnitGetType(lv_sourceUnit) == "SgtHammerBluntForceGunMissileOrbital"))) { + return false; + } + } + + // Actions + if (!runActions) { + return true; + } + + UnitCreateEffectUnitWithSource(libGame_gv_players[UnitGetOwner(lv_sourceUnit)].lv_heroUnit, "BluntForceGunApplyMissileScanOrbital", lv_sourceUnit, c_gameCatalogAbil, "SgtHammerOrbitalBFGBluntForceGun"); + return true; +} + +//-------------------------------------------------------------------------------------------------- +void MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan_Init () { + MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan = TriggerCreate("MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan_Func"); + TriggerEnable(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan, false); + TriggerAddEventPlayerEffectUsed(MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan, c_playerAny, "BluntForceGunApplyMissileScanDelay"); +} + //-------------------------------------------------------------------------------------------------- // Trigger: Hero - SgtHammer - Concussive Blast - Cancel //-------------------------------------------------------------------------------------------------- @@ -23161,7 +23042,10 @@ bool MimicGameDataHelperLib_gt_HeroSylvanasPossessionRewire_Func (bool testConds libNtve_gf_CreateUnitsWithDefaultFacing(1, "RegenGlobe", c_unitCreateIgnorePlacement, lv_regenGlobeOwner, UnitGetPosition(lv_bribedUnit), null); } else { - UnitCreateEffectUnit(lv_bribedUnit, "ExperienceGlobeDummyImpactSetLastHit", lv_greedUnit); + if ((UnitHasBehavior2(lv_bribedUnit, "IsCatapultMinionOrCatapultReplacement") == false)) { + UnitCreateEffectUnit(lv_bribedUnit, "ExperienceGlobeDummyImpactSetLastHit", lv_greedUnit); + } + } } libGame_gf_SendEventHeroMindControlsNPC(lv_bribedUnit, UnitGetOwner(lv_bribedUnit)); @@ -23952,7 +23836,7 @@ bool MimicGameDataHelperLib_gt_HeroTychusThatsTheStuffOff_Func (bool testConds, CatalogFieldValueSetFixed(c_gameCatalogEffect, "TychusMinigunThatsTheStuffTalentCreateHealer", "RechargeVitalRate", lv_itPlayer, lv_healAmount); CatalogFieldValueSet(c_gameCatalogEffect, "TychusMinigunThatsTheStuffTalentDummyHealer", "RechargeVitalRate", lv_itPlayer, "0"); - UnitCreateEffectUnit(lv_itUnit, "TychusMinigunThatsTheStuffTalentCreateHealer", lv_itUnit); + UnitCreateEffectUnitWithSource(lv_itUnit, "TychusMinigunThatsTheStuffTalentCreateHealer", lv_itUnit, c_gameCatalogAbil, "TychusMinigunActive"); MimicGameDataHelperLib_gv_heroTychusThatsTheStuffCombinedHeal[lv_itPlayer] = 0.0; MimicGameDataHelperLib_gv_heroTychusThatsTheStuffHealPreviewCombinedDamage[lv_itPlayer] = 0.0; return true; @@ -24310,7 +24194,7 @@ bool MimicGameDataHelperLib_gt_HeroTyrandeElunesChosenDamageProc_Func (bool test // Automatic Variable Declarations // Variable Initialization - lv_damageDealt = EventUnitDamageAttempted(); + lv_damageDealt = (EventUnitDamageAmount()+EventUnitDamageBehaviorShield()); lv_damageScale = 1.75; lv_tyrande = EventUnitDamageSourceUnit(); lv_tyrandePlayer = UnitGetOwner(lv_tyrande); @@ -24608,6 +24492,10 @@ bool MimicGameDataHelperLib_gt_HeroWitchDoctorPassiveTarget_Func (bool testConds if (!(((UnitBehaviorCount(lv_killedUnit, "WitchDoctorVoodooRitualDoT") == 1) || (UnitBehaviorCount(lv_killedUnit, "WitchDoctorVoodooRitualDeathRitualTalentDoT") == 1)))) { return false; } + + if (!((UnitBehaviorCount(lv_killedUnit, "SylvanasPossessionTarget") == 0))) { + return false; + } } // Actions @@ -25647,6 +25535,7 @@ bool MimicGameDataHelperLib_gt_HeroZagaraBanelingBarrage_Func (bool testConds, b libNtve_gf_UnitCreateFacingPoint(1, "ZagaraBaneling", c_unitCreateIgnorePlacement, lv_triggeringPlayer, libNtve_gf_PointOffsetTowardsPoint(UnitGetPosition(lv_zagara), 0.75, lv_targetPoint), lv_targetPoint, lv_zagara); lv_baneling = UnitLastCreated(); + UnitBehaviorAdd(lv_baneling, "ZagaraBanelingExplode", lv_zagara, 1); SoundPlayOnUnit(SoundLink("Zagara_BanelingEgg_Explode", -1), PlayerGroupAll(), lv_baneling, 0.0, 100.0, 0.0); lv_forwardPoint = libNtve_gf_PointOffsetTowardsPoint(UnitGetPosition(lv_baneling), lv_movementIncrement, lv_targetPoint); UnitIssueOrder(lv_baneling, OrderTargetingPoint(AbilityCommand("move", 0), lv_forwardPoint), c_orderQueueReplace); @@ -26651,7 +26540,6 @@ void MimicGameDataHelperLib_InitTriggers () { MimicGameDataHelperLib_gt_HeroBarbarianLeap_Init(); MimicGameDataHelperLib_gt_HeroBarbarianLeapRefactor_Init(); MimicGameDataHelperLib_gt_HeroBarbarianLeapArreatCraterForcedDestruction_Init(); - MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh_Init(); MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtTargetAudioTelegraph_Init(); MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtTravelValidation_Init(); MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtCast_Init(); @@ -26661,7 +26549,6 @@ void MimicGameDataHelperLib_InitTriggers () { MimicGameDataHelperLib_gt_HeroButcherFreshMeatVehicleOccupy_Init(); MimicGameDataHelperLib_gt_HeroButcherFreshMeatUpdateStackCounter_Init(); MimicGameDataHelperLib_gt_HeroChenWanderingKegActivate_Init(); - MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker_Init(); MimicGameDataHelperLib_gt_HeroChenWanderingKegDeactivate_Init(); MimicGameDataHelperLib_gt_HeroChenStormEarthFireTimedLifeIncrease_Init(); MimicGameDataHelperLib_gt_HeroChenStormEarthAndFireStasis_Init(); @@ -26748,7 +26635,6 @@ void MimicGameDataHelperLib_InitTriggers () { MimicGameDataHelperLib_gt_HeroL90ETCStageDiveTeleportUnit_Init(); MimicGameDataHelperLib_gt_HeroL90ETCStageDiveFinalSet_Init(); MimicGameDataHelperLib_gt_HeroL90ETCMoshPitOn_Init(); - MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking_Init(); MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentTurretSerpentSummonandSimplifiedAI_Init(); MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentSummonandSimplifiedAI_Init(); MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentAttackMimic_Init(); @@ -26878,6 +26764,7 @@ void MimicGameDataHelperLib_InitTriggers () { MimicGameDataHelperLib_gt_HeroRaynorACardToPlayTalentGained_Init(); MimicGameDataHelperLib_gt_HeroRaynorACardToPlayHeroTakedown_Init(); MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderDeathTimerMod_Init(); + MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate_Init(); MimicGameDataHelperLib_gt_HeroRehgarTidalWavesModifyCooldown_Init(); MimicGameDataHelperLib_gt_HeroRehgarEarthlivingEnchantHotApply_Init(); MimicGameDataHelperLib_gt_HeroRehgarTotemicProjectionTalentSaveTotem_Init(); @@ -26935,6 +26822,7 @@ void MimicGameDataHelperLib_InitTriggers () { MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunTargetCalculation_Init(); MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunTargetCalculationViaEffect_Init(); MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunCheckForLocation_Init(); + MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan_Init(); MimicGameDataHelperLib_gt_HeroSgtHammerConcussiveBlastCancel_Init(); MimicGameDataHelperLib_gt_HeroSgtHammerConcussiveBlastForcedDestruction_Init(); MimicGameDataHelperLib_gt_HeroSgtHammerMaelstromRoundsAddCharge_Init(); diff --git a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameDataHelperLib_h.galaxy b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameDataHelperLib_h.galaxy index cea6bdd..e65069b 100644 --- a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameDataHelperLib_h.galaxy +++ b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameDataHelperLib_h.galaxy @@ -649,7 +649,6 @@ trigger MimicGameDataHelperLib_gt_HeroBarbarianAncientSpearLaunchBarbarianUsed; trigger MimicGameDataHelperLib_gt_HeroBarbarianLeap; trigger MimicGameDataHelperLib_gt_HeroBarbarianLeapRefactor; trigger MimicGameDataHelperLib_gt_HeroBarbarianLeapArreatCraterForcedDestruction; -trigger MimicGameDataHelperLib_gt_HeroButcherButchersBrandDurationRefresh; trigger MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtTargetAudioTelegraph; trigger MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtTravelValidation; trigger MimicGameDataHelperLib_gt_HeroButcherRuthlessOnslaughtCast; @@ -659,7 +658,6 @@ trigger MimicGameDataHelperLib_gt_HeroButcherFreshMeatVehiclePickup; trigger MimicGameDataHelperLib_gt_HeroButcherFreshMeatVehicleOccupy; trigger MimicGameDataHelperLib_gt_HeroButcherFreshMeatUpdateStackCounter; trigger MimicGameDataHelperLib_gt_HeroChenWanderingKegActivate; -trigger MimicGameDataHelperLib_gt_HeroChenWanderingKegMoveTracker; trigger MimicGameDataHelperLib_gt_HeroChenWanderingKegDeactivate; trigger MimicGameDataHelperLib_gt_HeroChenStormEarthFireTimedLifeIncrease; trigger MimicGameDataHelperLib_gt_HeroChenStormEarthAndFireStasis; @@ -746,7 +744,6 @@ trigger MimicGameDataHelperLib_gt_HeroL90ETCPowerslideTargetCheck; trigger MimicGameDataHelperLib_gt_HeroL90ETCStageDiveTeleportUnit; trigger MimicGameDataHelperLib_gt_HeroL90ETCStageDiveFinalSet; trigger MimicGameDataHelperLib_gt_HeroL90ETCMoshPitOn; -trigger MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentStatTracking; trigger MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentTurretSerpentSummonandSimplifiedAI; trigger MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentSummonandSimplifiedAI; trigger MimicGameDataHelperLib_gt_HeroLiLiCloudSerpentAttackMimic; @@ -876,6 +873,7 @@ trigger MimicGameDataHelperLib_gt_HeroRaynorRemoveBansheeOnEnterVehicle; trigger MimicGameDataHelperLib_gt_HeroRaynorACardToPlayTalentGained; trigger MimicGameDataHelperLib_gt_HeroRaynorACardToPlayHeroTakedown; trigger MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderDeathTimerMod; +trigger MimicGameDataHelperLib_gt_HeroRaynorExecuteOrderHyperionActivate; trigger MimicGameDataHelperLib_gt_HeroRehgarTidalWavesModifyCooldown; trigger MimicGameDataHelperLib_gt_HeroRehgarEarthlivingEnchantHotApply; trigger MimicGameDataHelperLib_gt_HeroRehgarTotemicProjectionTalentSaveTotem; @@ -933,6 +931,7 @@ trigger MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunPrepStart; trigger MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunTargetCalculation; trigger MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunTargetCalculationViaEffect; trigger MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunCheckForLocation; +trigger MimicGameDataHelperLib_gt_HeroSgtHammerBluntForceGunApplyOrbitalScan; trigger MimicGameDataHelperLib_gt_HeroSgtHammerConcussiveBlastCancel; trigger MimicGameDataHelperLib_gt_HeroSgtHammerConcussiveBlastForcedDestruction; trigger MimicGameDataHelperLib_gt_HeroSgtHammerMaelstromRoundsAddCharge; diff --git a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameLib.galaxy b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameLib.galaxy index 6f15142..5e9f175 100644 --- a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameLib.galaxy +++ b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameLib.galaxy @@ -1703,6 +1703,7 @@ void MimicGameLib_gf_DeathRecapAddEffectInstanceForPlayer (int lp_deadPlayer, st MimicGameLib_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectEventCount += 1; if ((MimicGameLib_gf_DeathRecapCheckforCombineEvent(lp_deadPlayer, MimicGameLib_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBarCount, lp_effectTime, lv_effectingPlayer, lp_effectingUnitType, lp_sourceButton, lv_nPCPlayer, lv_structureSource) == true)) { lv_effectEventTimeIndex = MimicGameLib_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBarCount; + MimicGameLib_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBars[lv_effectEventTimeIndex].lv_amountShielded += lp_effectAmountShielded; MimicGameLib_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBars[lv_effectEventTimeIndex].lv_amount += lp_effectAmount; MimicGameLib_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBars[lv_effectEventTimeIndex].lv_postEffectHealth = 0; } @@ -6515,6 +6516,8 @@ bool auto_MimicGameLib_gf_HeroDeathAwardXP_TriggerFunc (bool testConds, bool run } libUIUI_gf_UIFloatingCombatTextH16MidXP(lv_itPlayer, lp_deadHero, libCore_ge_FloatingTextType_XPLarge, FixedToInt(lv_xPGranted)); } + libUIUI_gf_UIFloatingCombatTextH16MidXP(lv_deadPlayer, lp_deadHero, libCore_ge_FloatingTextType_XPSelf, FixedToInt(lv_xPGranted)); + libUIUI_gf_DeathRecapPopulateXPValue(lv_deadPlayer, FixedToInt(lv_xPGranted), lp_deadHero); return true; } @@ -15231,7 +15234,7 @@ bool MimicGameLib_gt_AddCombatMedicHealing_Func (bool testConds, bool runActions //-------------------------------------------------------------------------------------------------- void MimicGameLib_gt_AddCombatMedicHealing_Init () { MimicGameLib_gt_AddCombatMedicHealing = TriggerCreate("MimicGameLib_gt_AddCombatMedicHealing_Func"); - TriggerAddEventUnitHealed(MimicGameLib_gt_AddCombatMedicHealing, null, c_unitVitalAny, null); + TriggerAddEventUnitHealed(MimicGameLib_gt_AddCombatMedicHealing, null, c_unitVitalLife, null); } //-------------------------------------------------------------------------------------------------- @@ -15342,7 +15345,7 @@ bool MimicGameLib_gt_ProtectorDataCollection_Func (bool testConds, bool runActio // Conditions if (testConds) { - if (!((UnitBehaviorHasCategoryFlag(EventUnitBehavior(), c_behaviorCategoryBuffTempMaxHealth) == true))) { + if (!(((UnitBehaviorHasCategoryFlag(EventUnitBehavior(), c_behaviorCategoryBuffTempMaxHealth) == true) || (UnitBehaviorHasCategoryFlag(EventUnitBehavior(), c_behaviorCategoryProtected) == true)))) { return false; } @@ -15525,7 +15528,7 @@ bool MimicGameLib_gt_ClutchHealerIncrement_Func (bool testConds, bool runActions //-------------------------------------------------------------------------------------------------- void MimicGameLib_gt_ClutchHealerIncrement_Init () { MimicGameLib_gt_ClutchHealerIncrement = TriggerCreate("MimicGameLib_gt_ClutchHealerIncrement_Func"); - TriggerAddEventUnitHealed(MimicGameLib_gt_ClutchHealerIncrement, null, c_unitVitalAny, null); + TriggerAddEventUnitHealed(MimicGameLib_gt_ClutchHealerIncrement, null, c_unitVitalLife, null); } //-------------------------------------------------------------------------------------------------- @@ -15758,7 +15761,7 @@ bool MimicGameLib_gt_ExperienceGlobeGrantXP_Func (bool testConds, bool runAction } MimicGameLib_gf_ScoreValuesRecordXPContributionForPlayer(lv_targetPlayer, lv_xPAmount, true); if ((EventPlayerEffectUsed() == "ExperienceGlobeDummyImpactSetLastHit")) { - libUIUI_gf_UIFloatingCombatTextH16MidXP(lv_targetPlayer, EventPlayerEffectUsedUnit(c_effectUnitSource), libCore_ge_FloatingTextType_XPSelf, FixedToInt(lv_xPAmount)); + libUIUI_gf_UIFloatingCombatTextH16MidXP(lv_targetPlayer, EventPlayerEffectUsedUnit(c_effectUnitSource), libCore_ge_FloatingTextType_XPSmall, FixedToInt(lv_xPAmount)); } else { libUIUI_gf_UIFloatingCombatTextH16MidXP(lv_targetPlayer, EventPlayerEffectUsedUnit(c_effectUnitSource), libCore_ge_FloatingTextType_XPSmall, FixedToInt(lv_xPAmount)); @@ -17538,7 +17541,7 @@ bool MimicGameLib_gt_HeroDeathDiabloDiabloDies_Func (bool testConds, bool runAct lv_respawnDuration = FixedToInt(libCore_gf_HeroDeathTime(lv_deadPlayer, UnitLevel(lv_deadUnit))); if ((PlayerHasTalent(lv_deadPlayer, "DiabloMasteryDyingBreathApocalypse") == true)) { - UnitCreateEffectUnit(lv_deadUnit, "DiabloApocalypseEnumerateTrackedUnits", lv_deadUnit); + UnitCreateEffectUnitWithSource(lv_deadUnit, "DiabloApocalypseEnumerateTrackedUnits", lv_deadUnit, c_gameCatalogAbil, "DiabloApocalypse"); } MimicGameLib_gv_players[lv_deadPlayer].lv_isDead = true; @@ -19346,6 +19349,10 @@ bool MimicGameLib_gt_MountCaboose_Func (bool testConds, bool runActions) { ActorSend(lv_heroActor, (("AnimGroupApply " + lv_poseAnimGroup + " {} {} Instant"))); ActorSend(lv_heroActor, libNtve_gf_RefSet("::Host", lv_actorNameForMount)); ActorSend(lv_heroActor, libNtve_gf_HostSiteOpsSet("::Host", "SOpAttachMount", 0, 0)); + if ((MimicGameLib_gv_players[lv_mountingPlayer].lv_mountData.lv_mountID == "MechaTassadarMorphForm")) { + ActorSend(lv_mountActor, libNtve_gf_HostSiteOpsSet("::Host", "SOpBasicScopeFollow", 0, 0)); + } + ActorSend(lv_heroActor, libNtve_gf_RefSet("::HostForProps", "PropsHost")); ActorSend(lv_mountActor, libNtve_gf_RefSet("::HostForProps", (lv_mountingUnitType))); } @@ -19867,6 +19874,8 @@ bool MimicGameLib_gt_CoreDiesGameOver_Func (bool testConds, bool runActions) { libNtve_gf_ChangeUnitDamage(lv_itHeroUnit, libNtve_ge_UnitDamageTakenDealt_Damage_Deal, libNtve_ge_UnitDamageChangeOption_No); libNtve_gf_ChangeUnitDamage(lv_itHeroUnit, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No); } + PlayerPauseAllCooldowns(lv_itPlayer, true); + PlayerPauseAllCharges(lv_itPlayer, true); } libNtve_gf_ChangeUnitDamage(MimicGameLib_gv_teams[MimicGameLib_gv_teamOrderIndex_C].lv_core, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No); libNtve_gf_ChangeUnitDamage(MimicGameLib_gv_teams[MimicGameLib_gv_teamChaosIndex_C].lv_core, libNtve_ge_UnitDamageTakenDealt_Damage_Take, libNtve_ge_UnitDamageChangeOption_No); diff --git a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameLib_h.galaxy b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameLib_h.galaxy index fb9b6f5..6346d88 100644 --- a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameLib_h.galaxy +++ b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicGameLib_h.galaxy @@ -1058,6 +1058,7 @@ int MimicGameLib_gv_onFireWindowStage; bool MimicGameLib_gv_onFireEnabled; bool MimicGameLib_gv_onFirePrintingEnabled; bool MimicGameLib_gv_onFireUpdating; +int[libCore_gv_bALMaxEnginePlayerCount + 1] MimicGameLib_gv_playerLeaveCheck; MimicGameLib_gs_Player[libCore_gv_bALMaxEnginePlayerCount + 1] MimicGameLib_gv_players; unitgroup MimicGameLib_gv_heroes; unitgroup[libCore_gv_bALMaxTeams + 1] MimicGameLib_gv_players_Heroes_AllTrackedHeroesForTeam; diff --git a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicHeroesLib.galaxy b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicHeroesLib.galaxy index 9cba558..0a705bf 100644 --- a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicHeroesLib.galaxy +++ b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicHeroesLib.galaxy @@ -393,6 +393,7 @@ void MimicHeroesLib_gf_UpdateTassadarAbilityStats (unit lp_tassadar) { CatalogFieldValueSetFixed(c_gameCatalogEffect, "TassadarResonanceBeamCreatePersistent", "PeriodicPeriodArray[" + IntToString(0) + "]", lv_player, lv_finalPeriod); CatalogFieldValueSetFixed(c_gameCatalogEffect, "TassadarResonanceBeamKhaydarinAmuletTalentSearch1CreatePersistent", "PeriodicPeriodArray[" + IntToString(0) + "]", lv_player, lv_finalPeriod); CatalogFieldValueSetFixed(c_gameCatalogEffect, "TassadarResonanceBeamKhaydarinAmuletTalentSearch2CreatePersistent", "PeriodicPeriodArray[" + IntToString(0) + "]", lv_player, lv_finalPeriod); + CatalogFieldValueSetFixed(c_gameCatalogEffect, "TassadarResonanceBeamKhaydarinAmuletRevealTarget", "Duration", lv_player, (lv_finalPeriod + 0.0625)); } } diff --git a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicUILib.galaxy b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicUILib.galaxy index f29cdbd..8035c6c 100644 --- a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicUILib.galaxy +++ b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicUILib.galaxy @@ -100,6 +100,7 @@ void MimicUILib_InitVariables () { MimicUILib_gv_deathRecap_Panel.lv_tabScreenButton = c_invalidDialogControlId; MimicUILib_gv_deathRecap_Panel.lv_openDeathRecapButton = c_invalidDialogControlId; MimicUILib_gv_deathRecap_Panel.lv_mainGraphLabel = c_invalidDialogControlId; + MimicUILib_gv_deathRecap_Panel.lv_xpValueLabel = c_invalidDialogControlId; MimicUILib_gv_deathRecap_Panel.lv_highestDamagersPanel = c_invalidDialogControlId; for (init_i1 = 0; init_i1 <= libGame_gv_deathRecap_MaxMaxDamagersSort_C; init_i1 += 1) { MimicUILib_gv_deathRecap_Panel.lv_highestDamagersImages[init_i1] = c_invalidDialogControlId; @@ -1552,6 +1553,7 @@ void MimicUILib_gf_DeathRecapPopulateEffectInstancesForAbilitiesPanel (int lp_de TextExpressionSetToken("Param/Expression/lib_UIUI_C622E95B", "A", IntToText(lv_totalDamage)); TextExpressionSetToken("Param/Expression/lib_UIUI_C622E95B", "B", FixedToText(libGame_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBars[libGame_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBarCount].lv_time, 1)); libNtve_gf_SetDialogItemText(MimicUILib_gv_deathRecap_Panel.lv_mainGraphLabel, TextExpressionAssemble("Param/Expression/lib_UIUI_C622E95B"), libCore_gv_playerGroupFromPlayer[lp_deadPlayer]); + libNtve_gf_SetDialogItemText(MimicUILib_gv_deathRecap_Panel.lv_xpValueLabel, StringToText(""), libCore_gv_playerGroupFromPlayer[lp_deadPlayer]); lv_itEffect = (libGame_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBarCount + 1); for ( ; ( (auto1087E968_ai >= 0 && lv_itEffect <= auto1087E968_ae) || (auto1087E968_ai < 0 && lv_itEffect >= auto1087E968_ae) ) ; lv_itEffect += auto1087E968_ai ) { DialogControlSetAnimationState(MimicUILib_gv_deathRecap_Panel.lv_abilitiesPanelTimeZone[lv_itEffect], libCore_gv_playerGroupFromPlayer[lp_deadPlayer], "DamageHealState", "NoData"); @@ -1597,7 +1599,7 @@ void MimicUILib_gf_DeathRecapPopulateAbilityandHeroDataForAbilitiesPanel (int lp } if ((libGame_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBars[lv_itEffect].lv_combinedNumOfEvents > 1)) { TextExpressionSetToken("Param/Expression/lib_UIUI_95C9FD85", "A", IntToText(libGame_gv_deathRecap_DeathData[lp_deadPlayer].lv_effectBars[lv_itEffect].lv_combinedNumOfEvents)); - libNtve_gf_SetDialogItemText(MimicUILib_gv_deathRecap_Panel.lv_abilitiesPanelEventCountLabels[lv_itEffect], TextExpressionAssemble("Param/Expression/lib_UIUI_95C9FD85"), PlayerGroupAll()); + libNtve_gf_SetDialogItemText(MimicUILib_gv_deathRecap_Panel.lv_abilitiesPanelEventCountLabels[lv_itEffect], TextExpressionAssemble("Param/Expression/lib_UIUI_95C9FD85"), libCore_gv_playerGroupFromPlayer[lp_deadPlayer]); DialogControlSetVisible(MimicUILib_gv_deathRecap_Panel.lv_abilitiesPanelEventCountLabels[lv_itEffect], libCore_gv_playerGroupFromPlayer[lp_deadPlayer], true); } else { @@ -1708,6 +1710,22 @@ void MimicUILib_gf_DeathRecapPopulateHighestDamagersAbilities (int lp_deadPlayer DialogControlSetVisible(MimicUILib_gv_deathRecap_Panel.lv_highestDamagersAbilityFrame[lp_highestDamager][lp_highestDamagerAbilities], libCore_gv_playerGroupFromPlayer[lp_deadPlayer], true); } +void MimicUILib_gf_DeathRecapPopulateXPValue (int lp_deadPlayer, int lp_xpValue, unit lp_deadHero) { + // Variable Declarations + text lv_text; + + // Automatic Variable Declarations + // Variable Initialization + + // Implementation + TextExpressionSetToken("UI/HeroLeaderPanel/DeathRecap/XPValue", "A", FormatNumber(lp_xpValue)); + lv_text = TextExpressionAssemble("UI/HeroLeaderPanel/DeathRecap/XPValue"); + if ((UnitGetType(lp_deadHero) != "RexxarMisha")) { + libNtve_gf_SetDialogItemText(MimicUILib_gv_deathRecap_Panel.lv_xpValueLabel, lv_text, libCore_gv_playerGroupFromPlayer[lp_deadPlayer]); + } + +} + void MimicUILib_gf_DeathTimerPanelShowHideTeamsPanelForPlayer (bool lp_showHide, int lp_team, int lp_player) { // Automatic Variable Declarations } @@ -4244,7 +4262,7 @@ void MimicUILib_gf_HeroConsoleUnitStatusBarsUpdateStunDeathBar (string lp_newBeh return ; } - if ((lp_newBehavior == ("OverwatchBossBeingImprisonedBehavior"))) { + if (((lp_newBehavior == ("OverwatchBossBeingImprisonedBehavior")) || (lp_newBehavior == ("MaievContainmentDiscStoppedSilence")))) { return ; } @@ -5730,7 +5748,7 @@ void MimicUILib_gf_KillLogAnnounceQuestCompletion (int lp_player, string lp_ques DialogControlSendAnimationEvent(DialogControlLastCreated(), PlayerGroupAll(), "FadeIn"); SoundPlayForPlayer(SoundLink("TalentQuestLogCompleteAlly", -1), c_maxPlayers, PlayerGroupMath(PlayerGroupAlliance(c_playerGroupAlly, lp_player), PlayerGroupSingle(lp_player), libNtve_ge_PlayerGroupOperation_Subtract), 100.0, 0.0); SoundPlayForPlayer(SoundLink("TalentQuestLogCompleteEnemy", -1), c_maxPlayers, PlayerGroupAlliance(c_playerGroupEnemy, lp_player), 100.0, 0.0); - lv_questName = StringExternal(("Button/Name/" + CatalogFieldValueGet(c_gameCatalogBehavior, lp_questToken, "Face", c_playerAny))); + lv_questName = StringExternal(CatalogFieldValueGet(c_gameCatalogButton, CatalogFieldValueGet(c_gameCatalogBehavior, lp_questToken, "Face", c_playerAny), "Name", c_playerAny)); libGame_gf_AnnouncementAddItemForPlayerGroup(libCore_gv_playerGroupFromPlayer[lp_player], libGame_ge_AnnouncementPriorities_Normal, libCore_ge_AnnouncerVOEvents_Null, "ShowQuestNotification", StringExternal("Param/Value/lib_UIUI_607B6246"), lv_questName, null, null, (lv_icon), libGame_gv_announcement_LongAnnouncementDuration_C, false); } @@ -6614,9 +6632,11 @@ void MimicUILib_gf_UIPartyFrameSetDVaFrame (int lp_playerID, bool lp_inMech) { // Implementation lv_rosterSlot = libGame_gv_players[lp_playerID].lv_rosterSlot; if ((lp_inMech == true)) { + libNtve_gf_SetDialogItemUnit(MimicUILib_gv_uIObserverUI.lv_heroStatusBars[lv_rosterSlot], UnitTransport(libGame_gv_players[lp_playerID].lv_heroUnit), libCore_gv_playerGroupFromPlayer[libCore_gv_oBSERVER_ObserverUIPlayer]); libNtve_gf_SetDialogItemImage(MimicUILib_gv_uIPartyFrame.lv_heroPortraitImages[lv_rosterSlot][MimicUILib_gv_uIPartyFrameHeroSlot_C], "Assets\\Textures\\storm_ui_ingame_partyframe_dva_mech.dds", PlayerGroupActive()); } else { + libNtve_gf_SetDialogItemUnit(MimicUILib_gv_uIObserverUI.lv_heroStatusBars[lv_rosterSlot], libGame_gv_players[lp_playerID].lv_heroUnit, libCore_gv_playerGroupFromPlayer[libCore_gv_oBSERVER_ObserverUIPlayer]); libNtve_gf_SetDialogItemImage(MimicUILib_gv_uIPartyFrame.lv_heroPortraitImages[lv_rosterSlot][MimicUILib_gv_uIPartyFrameHeroSlot_C], "Assets\\Textures\\storm_ui_ingame_partyframe_dva.dds", PlayerGroupActive()); } } @@ -7265,7 +7285,7 @@ void MimicUILib_gf_PartyFrameEnemyPing (int lp_pingingPlayer, unit lp_targetUnit lv_foundVisibleUnit = true; } - if ((lv_activeVehicleUnit == null) && ((UnitFilterMatch(lv_targetUnit, lp_pingingPlayer, UnitFilter(0, (1 << (c_targetFilterAITargetableStructure - 32)), 0, 0)) == true) || ((libNtve_gf_UnitIsVisibleToPlayer(lv_targetUnit, lp_pingingPlayer) == true) && (UnitHasBehavior2(lv_targetUnit, "ZagaraInsideNydusWorm") == false)))) { + if ((lv_activeVehicleUnit == null) && ((UnitFilterMatch(lv_targetUnit, lp_pingingPlayer, UnitFilter(0, (1 << (c_targetFilterAITargetableStructure - 32)), 0, 0)) == true) || ((libNtve_gf_UnitIsVisibleToPlayer(lv_targetUnit, lp_pingingPlayer) == true) && (UnitHasBehavior2(lv_targetUnit, "ZagaraInsideNydusWorm") == false) && (UnitHasBehavior2(lv_targetUnit, "DeathwingDragonflightBuff") == false)))) { UnitCreateEffectUnit(libGame_gv_players[lp_pingingPlayer].lv_heroUnit, "AttackPing", lv_targetUnit); libNtve_gf_CreatePingFacingAngleWithType(lv_pingPlayerGroup, "StormGeneralPing", UnitGetPosition(lv_targetUnit), Color(100.00, 100.00, 100.00), 3.0, 270.0, -1, lp_pingingPlayer); lv_foundVisibleUnit = true; @@ -9384,6 +9404,8 @@ bool MimicUILib_gt_DeathRecapPanelInitialize_Func (bool testConds, bool runActio } DialogControlHookup(lv_panels[lv_currentPanelLayer], c_triggerControlTypeLabel, "GraphTopLabel"); MimicUILib_gv_deathRecap_Panel.lv_abilitiesPanelStartingHealthLabels = DialogControlLastCreated(); + DialogControlHookup(lv_panels[lv_currentPanelLayer], c_triggerControlTypeLabel, "XPValueLabel"); + MimicUILib_gv_deathRecap_Panel.lv_xpValueLabel = DialogControlLastCreated(); lv_currentPanelLayer -= 1; return true; } @@ -12057,12 +12079,21 @@ bool MimicUILib_gt_UIFloatingCombatTextQuestProgressViaTokens_Func (bool testCon return true; } + if ((UnitHasBehavior2(EventUnit(), "AbathurUltimateEvolutionControlBehavior") == true)) { + return true; + } + lv_impactUnit = EventUnitTokenContextUnit(); lv_launchUnit = EventUnit(); lv_launchPlayer = UnitGetOwner(lv_launchUnit); lv_questIdentifier = EventUnitTokenBehavior(); if ((lv_launchPlayer <= libCore_gv_bALMaxPlayers) && (lv_launchPlayer > 0)) { - FloatingCombatElementCreateTextAtPointWithId(libCore_gv_playerGroupFromPlayer[lv_launchPlayer], "FloatingCombatElements/FloatingCombatQuestProgress", "", UnitGetPosition(lv_impactUnit), null, libNtve_gv_FloatingCombatTextAutoRandomSeed, (lv_questIdentifier)); + if ((libNtve_gf_UnitIsVisibleToPlayer(lv_impactUnit, lv_launchPlayer) == true)) { + FloatingCombatElementCreateTextAtPointWithId(libCore_gv_playerGroupFromPlayer[lv_launchPlayer], "FloatingCombatElements/FloatingCombatQuestProgress", "", UnitGetPosition(lv_impactUnit), null, libNtve_gv_FloatingCombatTextAutoRandomSeed, (lv_questIdentifier)); + } + else { + FloatingCombatElementCreateTextAtPointWithId(libCore_gv_playerGroupFromPlayer[lv_launchPlayer], "FloatingCombatElements/FloatingCombatQuestProgress", "", UnitGetPosition(lv_launchUnit), null, libNtve_gv_FloatingCombatTextAutoRandomSeed, (lv_questIdentifier)); + } } return true; @@ -12096,7 +12127,12 @@ bool MimicUILib_gt_UIFloatingCombatTextQuestProgressViaEffect_Func (bool testCon lv_launchUnit = EventPlayerEffectUsedUnit(c_effectUnitCaster); lv_launchPlayer = UnitGetOwner(lv_launchUnit); if ((lv_launchPlayer <= libCore_gv_bALMaxPlayers) && (lv_launchPlayer > 0)) { - FloatingCombatElementCreateTextAtPointWithId(libCore_gv_playerGroupFromPlayer[lv_launchPlayer], "FloatingCombatElements/FloatingCombatQuestProgress", "", UnitGetPosition(lv_impactUnit), null, libNtve_gv_FloatingCombatTextAutoRandomSeed, ""); + if ((libNtve_gf_UnitIsVisibleToPlayer(lv_impactUnit, lv_launchPlayer) == true)) { + FloatingCombatElementCreateTextAtPointWithId(libCore_gv_playerGroupFromPlayer[lv_launchPlayer], "FloatingCombatElements/FloatingCombatQuestProgress", "", UnitGetPosition(lv_impactUnit), null, libNtve_gv_FloatingCombatTextAutoRandomSeed, ""); + } + else { + FloatingCombatElementCreateTextAtPointWithId(libCore_gv_playerGroupFromPlayer[lv_launchPlayer], "FloatingCombatElements/FloatingCombatQuestProgress", "", UnitGetPosition(lv_launchUnit), null, libNtve_gv_FloatingCombatTextAutoRandomSeed, ""); + } } return true; @@ -14809,7 +14845,10 @@ bool MimicUILib_gt_UIObserverUIHeroDies_Func (bool testConds, bool runActions) { libNtve_gf_SetDialogItemColor(MimicUILib_gv_uIObserverUI.lv_heroPortraitImages[lv_rosterSlot], Color(29.41, 29.41, 29.41), libCore_gv_playerGroupFromPlayer[libCore_gv_oBSERVER_ObserverUIPlayer]); libNtve_gf_SetDialogItemText(MimicUILib_gv_uIObserverUI.lv_heroDeathTimeLabels[lv_rosterSlot], StringToText(""), libCore_gv_playerGroupFromPlayer[libCore_gv_oBSERVER_ObserverUIPlayer]); DialogControlSetVisible(MimicUILib_gv_uIObserverUI.lv_heroDeathTimeLabels[lv_rosterSlot], libCore_gv_playerGroupFromPlayer[libCore_gv_oBSERVER_ObserverUIPlayer], true); - DialogControlSetVisible(MimicUILib_gv_uIObserverUI.lv_heroStatusBars[lv_rosterSlot], libCore_gv_playerGroupFromPlayer[libCore_gv_oBSERVER_ObserverUIPlayer], false); + if ((UnitGetType(libGame_gv_players[libGame_gf_HeroKilledPlayer()].lv_heroUnit) != "HeroLostVikingsController")) { + DialogControlSetVisible(MimicUILib_gv_uIObserverUI.lv_heroStatusBars[lv_rosterSlot], libCore_gv_playerGroupFromPlayer[libCore_gv_oBSERVER_ObserverUIPlayer], false); + } + return true; } @@ -15750,7 +15789,7 @@ bool MimicUILib_gt_UIPartyFrameUnitClicked_Func (bool testConds, bool runActions // Conditions if (testConds) { - if (!(((EventKeyAlt() == true) && ((EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[10]))))) { + if (!((((EventKeyAlt() == true) || (EventKeyControl() == true) || (EventKeyShift() == true)) && ((EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[1]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[2]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[3]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[4]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[5]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[6]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[7]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[8]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[9]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButton[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPetowner[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonPet[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonA[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonB[10]) || (EventDialogControl() == MimicUILib_gv_uIPartyFrame.lv_heroPartyButtonC[10]))))) { return false; } } @@ -15845,7 +15884,7 @@ bool MimicUILib_gt_UIPartyFrameTeamXPClicked_Func (bool testConds, bool runActio // Conditions if (testConds) { - if (!((EventKeyAlt() == true))) { + if (!(((EventKeyControl() == true) || (EventKeyShift() == true) || (EventKeyAlt() == true)))) { return false; } diff --git a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicUILib_h.galaxy b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicUILib_h.galaxy index 52a54db..cfaeed6 100644 --- a/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicUILib_h.galaxy +++ b/(10)trymemode.stormmap/base.stormdata/ModuleMimicLibs/InternalMimics/MimicUILib_h.galaxy @@ -141,6 +141,7 @@ struct MimicUILib_gs_DeathRecapPanel { int lv_tabScreenButton; int lv_openDeathRecapButton; int lv_mainGraphLabel; + int lv_xpValueLabel; int lv_highestDamagersPanel; int[libGame_gv_deathRecap_MaxMaxDamagersSort_C + 1] lv_highestDamagersImages; int[libGame_gv_deathRecap_MaxMaxDamagersSort_C + 1] lv_highestDamagersAmountLabels; @@ -878,6 +879,7 @@ void MimicUILib_gf_DeathRecapPopulateEffectInstancesForAbilitiesPanel (int lp_de void MimicUILib_gf_DeathRecapPopulateAbilityandHeroDataForAbilitiesPanel (int lp_deadPlayer); void MimicUILib_gf_DeathRecapPopulateHighestDamagersForPlayer (int lp_deadPlayer); void MimicUILib_gf_DeathRecapPopulateHighestDamagersAbilities (int lp_deadPlayer, int lp_highestDamager, int lp_highestDamagerAbilities); +void MimicUILib_gf_DeathRecapPopulateXPValue (int lp_deadPlayer, int lp_xpValue, unit lp_deadHero); void MimicUILib_gf_DeathTimerPanelShowHideTeamsPanelForPlayer (bool lp_showHide, int lp_team, int lp_player); void MimicUILib_gf_DeathAnnouncementPanelRegisterDeath (int lp_player, int lp_killingPlayer, string lp_portraitImage, unit lp_deadUnit, text lp_deadUnitName, timer lp_deathTimer); void MimicUILib_gf_DeathAnnouncementPanelTransitionFrameOut (int lp_team);