0.38

interface/CustomScoreboard.StormInterface/enus.StormData/LocalizedData/GameStrings.txt

@@ -1,4 +1,4 @@
-UI/Spazzo/UIVersion=v0.37
+UI/Spazzo/UIVersion=v0.38
 UI/Spazzo/UIWARNING=WARNING
 UI/Spazzo/UIWARNINGTOOLTIP=Game is detected as having ended, statistics may be incorrect, please rewind to after the core is destroyed, but before these images become visible!
 
@@ -1944,12 +1944,12 @@ UI/SpazzoDamage/Medivh/ScoreTwelve=Unused
 UI/SpazzoAccuracy/Medivh/ScoreOne=Arcane Rift Casts
 UI/SpazzoAccuracy/Medivh/ScoreTwo=Force of Will Casts
 UI/SpazzoAccuracy/Medivh/ScoreThree=Portal Casts
-UI/SpazzoAccuracy/Medivh/ScoreFour=Dust of Appearance Casts, Raven Familiar Attacks
+UI/SpazzoAccuracy/Medivh/ScoreFour=Dust of Appearance Casts, Raven Familiar Attacks(From Medivh)
 UI/SpazzoAccuracy/Medivh/ScoreFive=Force of Magic Activation Count
 UI/SpazzoAccuracy/Medivh/ScoreSix=Ley Line Seal, Poly Bomb Casts
 UI/SpazzoAccuracy/Medivh/ScoreSeven=Enduring Will Activation Count
 UI/SpazzoAccuracy/Medivh/ScoreEight=Force of Will Casts after selecting Enduring Will
-UI/SpazzoAccuracy/Medivh/ScoreNine=Medivh Cheats, Arcane Brilliance, Dust of Disappearance Casts, Minions Killed with Guardain of Tirisfal
+UI/SpazzoAccuracy/Medivh/ScoreNine=Medivh Cheats, Arcane Brilliance, Dust of Disappearance Casts, Minions Killed with Guardian of Tirisfal
 UI/SpazzoAccuracy/Medivh/ScoreTen=Unused
 UI/SpazzoAccuracy/Medivh/ScoreEleven=Unused
 UI/SpazzoAccuracy/Medivh/ScoreTwelve=Unused

maps/Heroes/CustomReplayMaps/CustomLogicFolder/Base.StormData/LibHAUR.galaxy

@@ -1545,7 +1545,7 @@ bool libHAUR_gt_HeroAurielResurrectRevivePlayer_Func (bool testConds, bool runAc
         }
     }
     UnitBehaviorRemove(libGame_gv_players[lv_targetPlayer].lv_heroUnit, "AurielResurrectPendingResurrect", 1);
-    if ((PlayerHasTalent(lv_aurielPlayer, "AurielLightSpeedResurrectTalent") == true)) {
+    if (((PlayerHasTalent(lv_aurielPlayer, "AurielLightSpeedResurrectTalent") == true) && (UnitHasBehavior2(lv_targetHero, "LeoricUndying") == false))) {
         UnitCreateEffectUnit(lv_auriel, "AurielResurrectLightSpeedApplyControllerBehavior", lv_targetHero);
         UnitCreateEffectUnit(lv_auriel, "AurielResurrectLightSpeedApplySpeedBehavior", lv_targetHero);
     }
@@ -1570,6 +1570,10 @@ bool libHAUR_gt_HeroAurielResurrectRevivePlayer_Func (bool testConds, bool runAc
         UnitBehaviorRemove(lv_targetHero, "LeoricUndying", 1);
         UnitSetPropertyFixed(lv_targetHero, c_unitPropLifePercent, libHAUR_gv_heroAurielResurrectVitalScale);
         UnitSetPropertyFixed(lv_targetHero, c_unitPropEnergyPercent, libHAUR_gv_heroAurielResurrectEnergyPercentage);
+        if ((PlayerHasTalent(lv_aurielPlayer, "AurielLightSpeedResurrectTalent") == true)) {
+            UnitCreateEffectUnit(lv_auriel, "AurielResurrectLightSpeedApplyControllerBehavior", lv_targetHero);
+            UnitCreateEffectUnit(lv_auriel, "AurielResurrectLightSpeedApplySpeedBehavior", lv_targetHero);
+        }
     }
 
     libHAUR_gv_heroAurielResurrectTotalActiveResurrectActions -= 1;

maps/Heroes/CustomReplayMaps/CustomLogicFolder/Base.StormData/LibHMDV.galaxy

@@ -1,6 +1,7 @@
 include "TriggerLibs/NativeLib"
 include "TriggerLibs/HeroesLib"
 include "TriggerLibs/GameLib"
+include "TriggerLibs/MapMechanicsLib"
 include "TriggerLibs/AILib"
 include "TriggerLibs/UILib"
 
@@ -14,6 +15,7 @@ void libHMDV_InitLibraries () {
     libNtve_InitVariables();
     libCore_InitVariables();
     libGame_InitVariables();
+    libMapM_InitVariables();
     libAIAI_InitVariables();
     libUIUI_InitVariables();
 }
@@ -61,7 +63,6 @@ void libHMDV_gf_HeroMedivhIncrementHeroCountFunction () {
         TriggerEnable(libHMDV_gt_HeroMedivhRavenFamiliarSpawn, true);
         TriggerEnable(libHMDV_gt_HeroMedivhRavenFamiliarPostSpawnCloak, true);
         TriggerEnable(libHMDV_gt_HeroMedivhLeyLineSealOverlayOff, true);
-        TriggerEnable(libHMDV_gt_HeroMedivhPortalTeleport, true);
         TriggerEnable(libHMDV_gt_HeroMedivhPortalCameraPan, false);
         TriggerEnable(libHMDV_gt_HeroMedivhPortalPortalMasterySelectionClamping, true);
         TriggerEnable(libHMDV_gt_HeroMedivhPortalPortalMasteryMorphBackToMedivh, true);
@@ -74,7 +75,6 @@ void libHMDV_gf_HeroMedivhIncrementHeroCountFunction () {
         TriggerEnable(libHMDV_gt_HeroAIMedivhHasCastRavenForm, true);
         TriggerEnable(libHMDV_gt_HeroAIMedivhHasLanded, true);
         TriggerEnable(libHMDV_gt_HeroAIAIMedivhUnregisterPortal, true);
-        TriggerEnable(libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow, true);
         TriggerEnable(libHMDV_gt_HeroMedivhPortalMasteryCDR, true);
     }
 
@@ -93,7 +93,6 @@ void libHMDV_gf_HeroMedivhDecrementHeroCountFunction () {
         TriggerEnable(libHMDV_gt_HeroMedivhRavenFamiliarSpawn, false);
         TriggerEnable(libHMDV_gt_HeroMedivhRavenFamiliarPostSpawnCloak, false);
         TriggerEnable(libHMDV_gt_HeroMedivhLeyLineSealOverlayOff, false);
-        TriggerEnable(libHMDV_gt_HeroMedivhPortalTeleport, false);
         TriggerEnable(libHMDV_gt_HeroMedivhPortalCameraPan, false);
         TriggerEnable(libHMDV_gt_HeroMedivhPortalPortalMasterySelectionClamping, false);
         TriggerEnable(libHMDV_gt_HeroMedivhPortalPortalMasteryMorphBackToMedivh, false);
@@ -106,7 +105,6 @@ void libHMDV_gf_HeroMedivhDecrementHeroCountFunction () {
         TriggerEnable(libHMDV_gt_HeroAIMedivhHasCastRavenForm, false);
         TriggerEnable(libHMDV_gt_HeroAIMedivhHasLanded, false);
         TriggerEnable(libHMDV_gt_HeroAIAIMedivhUnregisterPortal, false);
-        TriggerEnable(libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow, false);
         TriggerEnable(libHMDV_gt_HeroMedivhPortalMasteryCDR, false);
     }
 
@@ -182,7 +180,7 @@ bool libHMDV_gt_HeroMedivhRavenFamiliarSpawn_Func (bool testConds, bool runActio
 void libHMDV_gt_HeroMedivhRavenFamiliarSpawn_Init () {
     libHMDV_gt_HeroMedivhRavenFamiliarSpawn = TriggerCreate("libHMDV_gt_HeroMedivhRavenFamiliarSpawn_Func");
     TriggerEnable(libHMDV_gt_HeroMedivhRavenFamiliarSpawn, false);
-    TriggerAddEventPlayerEffectUsed(libHMDV_gt_HeroMedivhRavenFamiliarSpawn, c_playerAny, "MedivhPortalRavenFamiliarCreateUnit");
+    TriggerAddEventPlayerEffectUsed(libHMDV_gt_HeroMedivhRavenFamiliarSpawn, c_playerAny, "MedivhPortalRavenFamiliarCreateUnitPortalAsTarget");
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -334,6 +332,11 @@ bool libHMDV_gt_HeroAIAIMedivhRegisterPortalCast_Func (bool testConds, bool runA
         TriggerDebugOutput(1, StringToText(""), true);
         AIAddPortal(libGame_gf_ComputerPlayerInFaction(libGame_gv_players[lv_player].lv_faction), lv_portalUnit, UnitGroupUnit(lv_portals, 1), 0.5, lv_duration, "SmartCommandUnitInteraction", null);
     }
+
+    if (((libNtve_gf_UnitInRegion(lv_portalUnit, libMapM_gv_mMSafeRegions[libGame_gv_players[lv_player].lv_faction]) == true) && (libMapM_gv_mMSafeRegions[libGame_gv_players[lv_player].lv_faction] != null))) {
+        UnitBehaviorAdd(lv_portalUnit, "MedivhPortalNotInHallOfStorms", lv_portalUnit, 1);
+    }
+
     return true;
 }
 
@@ -440,87 +443,6 @@ void libHMDV_gt_HeroMedivhLeyLineSealOverlayOff_Init () {
     TriggerAddEventUnitBehaviorChange(libHMDV_gt_HeroMedivhLeyLineSealOverlayOff, null, "MedivhLeyLineSealStasis", c_unitBehaviorChangeDestroy);
 }
 
-//--------------------------------------------------------------------------------------------------
-// Trigger: Hero - Medivh - Portal Teleport
-//--------------------------------------------------------------------------------------------------
-bool libHMDV_gt_HeroMedivhPortalTeleport_Func (bool testConds, bool runActions) {
-    // Variable Declarations
-    unit lv_itUnit;
-    int lv_portalOwner;
-    unit lv_portalClicked;
-    unit lv_casterUnit;
-    unit lv_medivhUnit;
-
-    // Automatic Variable Declarations
-    unitgroup auto43A3FC99_g;
-    int auto43A3FC99_u;
-
-    // Variable Initialization
-    lv_casterUnit = EventPlayerEffectUsedUnit(c_effectUnitCaster);
-
-    // Conditions
-    if (testConds) {
-        if (!((UnitHasBehaviorWithCategoryFlag(lv_casterUnit, c_behaviorCategoryStun) == false))) {
-            return false;
-        }
-
-        if (!((UnitHasBehaviorWithCategoryFlag(lv_casterUnit, c_behaviorCategorySleeping) == false))) {
-            return false;
-        }
-
-        if (!((UnitHasBehaviorWithCategoryFlag(lv_casterUnit, c_behaviorCategoryDebuffRoot) == false))) {
-            return false;
-        }
-
-        if (!((UnitHasBehaviorWithCategoryFlag(lv_casterUnit, c_behaviorCategoryDebuffStasis) == false))) {
-            return false;
-        }
-
-        if (!((UnitHasBehaviorWithCategoryFlag(lv_casterUnit, c_behaviorCategoryTimeStop) == false))) {
-            return false;
-        }
-
-        if (!((UnitHasBehaviorWithCategoryFlag(lv_casterUnit, c_behaviorCategoryPushOrPull) == false))) {
-            return false;
-        }
-    }
-
-    // Actions
-    if (!runActions) {
-        return true;
-    }
-
-    lv_portalOwner = UnitGetOwner(EventPlayerEffectUsedUnit(c_effectUnitTarget));
-    lv_portalClicked = EventPlayerEffectUsedUnit(c_effectUnitTarget);
-    if ((UnitGetType(libGame_gv_players[lv_portalOwner].lv_heroUnit) == "HeroAbathur")) {
-        lv_medivhUnit = libGame_gv_players[lv_portalOwner].lv_activeVehicle;
-    }
-    else {
-        lv_medivhUnit = libGame_gv_players[lv_portalOwner].lv_heroUnit;
-    }
-    auto43A3FC99_g = libNtve_gf_UnitsInRegionWithAllianceToPlayerMatchingCondition("MedivhPortal", "", "", lv_portalOwner, c_unitAllianceAlly, RegionEntireMap(), UnitFilter(0, 0, (1 << c_targetFilterSelf) | (1 << c_targetFilterNeutral) | (1 << c_targetFilterEnemy) | (1 << c_targetFilterMissile), (1 << (c_targetFilterDead - 32)) | (1 << (c_targetFilterHidden - 32))), 0);
-    auto43A3FC99_u = UnitGroupCount(auto43A3FC99_g, c_unitCountAll);
-    for (;; auto43A3FC99_u -= 1) {
-        lv_itUnit = UnitGroupUnitFromEnd(auto43A3FC99_g, auto43A3FC99_u);
-        if (lv_itUnit == null) { break; }
-        if ((lv_itUnit != lv_portalClicked) && (UnitGetOwner(lv_itUnit) == lv_portalOwner)) {
-            UnitCreateEffectUnit(lv_itUnit, "MedivhPortalTeleport", lv_casterUnit);
-            UnitCreateEffectUnit(lv_medivhUnit, "MedivhPortalTeleportSet", lv_casterUnit);
-            UnitCreateEffectUnit(lv_itUnit, "MedivhPortalTeleportSetFromPortal", lv_casterUnit);
-            break;
-        }
-
-    }
-    return true;
-}
-
-//--------------------------------------------------------------------------------------------------
-void libHMDV_gt_HeroMedivhPortalTeleport_Init () {
-    libHMDV_gt_HeroMedivhPortalTeleport = TriggerCreate("libHMDV_gt_HeroMedivhPortalTeleport_Func");
-    TriggerEnable(libHMDV_gt_HeroMedivhPortalTeleport, false);
-    TriggerAddEventPlayerEffectUsed(libHMDV_gt_HeroMedivhPortalTeleport, c_playerAny, "MedivhPortalSmartCommandDummy");
-}
-
 //--------------------------------------------------------------------------------------------------
 // Trigger: Hero - Medivh - Portal Camera Pan
 //--------------------------------------------------------------------------------------------------
@@ -530,7 +452,7 @@ bool libHMDV_gt_HeroMedivhPortalCameraPan_Func (bool testConds, bool runActions)
 
     // Automatic Variable Declarations
     // Variable Initialization
-    lv_teleportTarget = EventPlayerEffectUsedUnit(c_effectUnitTarget);
+    lv_teleportTarget = EventPlayerEffectUsedUnit(c_effectUnitCaster);
 
     // Actions
     if (!runActions) {
@@ -545,7 +467,7 @@ bool libHMDV_gt_HeroMedivhPortalCameraPan_Func (bool testConds, bool runActions)
 void libHMDV_gt_HeroMedivhPortalCameraPan_Init () {
     libHMDV_gt_HeroMedivhPortalCameraPan = TriggerCreate("libHMDV_gt_HeroMedivhPortalCameraPan_Func");
     TriggerEnable(libHMDV_gt_HeroMedivhPortalCameraPan, false);
-    TriggerAddEventPlayerEffectUsed(libHMDV_gt_HeroMedivhPortalCameraPan, c_playerAny, "MedivhPortalTeleport");
+    TriggerAddEventPlayerEffectUsed(libHMDV_gt_HeroMedivhPortalCameraPan, c_playerAny, "MedivhPortalTeleportToPortal");
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -621,35 +543,6 @@ void libHMDV_gt_HeroMedivhPortalPortalMasteryMorphBackToMedivh_Init () {
     TriggerAddEventUnitAbility(libHMDV_gt_HeroMedivhPortalPortalMasteryMorphBackToMedivh, null, AbilityCommand("MedivhPortal2", 0), c_abilEffectStageCast, false);
 }
 
-//--------------------------------------------------------------------------------------------------
-// Trigger: Hero - Medivh - Portal Raven Familiar Talent Apply Slow
-//--------------------------------------------------------------------------------------------------
-bool libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow_Func (bool testConds, bool runActions) {
-    // Variable Declarations
-    unit lv_unit;
-    int lv_ravenOwner;
-
-    // Automatic Variable Declarations
-    // Variable Initialization
-    lv_unit = EventUnit();
-    lv_ravenOwner = UnitGetOwner(EventUnitDamageSourceUnit());
-
-    // Actions
-    if (!runActions) {
-        return true;
-    }
-
-    UnitCreateEffectUnit(libGame_gv_players[lv_ravenOwner].lv_heroUnit, "MedivhPortalApplyRavenFamiliarTalentSlow", lv_unit);
-    return true;
-}
-
-//--------------------------------------------------------------------------------------------------
-void libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow_Init () {
-    libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow = TriggerCreate("libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow_Func");
-    TriggerEnable(libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow, false);
-    TriggerAddEventUnitDamaged(libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow, null, c_unitDamageTypeAbility, c_unitDamageNonFatal, "MedivhPortalRavenFamiliarImpactDamage");
-}
-
 //--------------------------------------------------------------------------------------------------
 // Trigger: Hero - Medivh - Force of Will Behavior Responses
 //--------------------------------------------------------------------------------------------------
@@ -966,11 +859,9 @@ void libHMDV_InitTriggers () {
     libHMDV_gt_HeroAIAIMedivhUnregisterPortal_Init();
     libHMDV_gt_HeroMedivhLeyLineSealOverlayOn_Init();
     libHMDV_gt_HeroMedivhLeyLineSealOverlayOff_Init();
-    libHMDV_gt_HeroMedivhPortalTeleport_Init();
     libHMDV_gt_HeroMedivhPortalCameraPan_Init();
     libHMDV_gt_HeroMedivhPortalPortalMasterySelectionClamping_Init();
     libHMDV_gt_HeroMedivhPortalPortalMasteryMorphBackToMedivh_Init();
-    libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow_Init();
     libHMDV_gt_HeroMedivhForceofWillBehaviorResponses_Init();
     libHMDV_gt_HeroMedivhForceofWillRemoveEarly_Init();
     libHMDV_gt_HeroMedivhTransformRavenAfterPortToTown_Init();

maps/Heroes/CustomReplayMaps/CustomLogicFolder/Base.StormData/LibHMDV_h.galaxy

@@ -26,11 +26,9 @@ trigger libHMDV_gt_HeroAIAIMedivhRegisterPortalCast;
 trigger libHMDV_gt_HeroAIAIMedivhUnregisterPortal;
 trigger libHMDV_gt_HeroMedivhLeyLineSealOverlayOn;
 trigger libHMDV_gt_HeroMedivhLeyLineSealOverlayOff;
-trigger libHMDV_gt_HeroMedivhPortalTeleport;
 trigger libHMDV_gt_HeroMedivhPortalCameraPan;
 trigger libHMDV_gt_HeroMedivhPortalPortalMasterySelectionClamping;
 trigger libHMDV_gt_HeroMedivhPortalPortalMasteryMorphBackToMedivh;
-trigger libHMDV_gt_HeroMedivhPortalRavenFamiliarTalentApplySlow;
 trigger libHMDV_gt_HeroMedivhForceofWillBehaviorResponses;
 trigger libHMDV_gt_HeroMedivhForceofWillRemoveEarly;
 trigger libHMDV_gt_HeroMedivhTransformRavenAfterPortToTown;

maps/Heroes/CustomReplayMaps/CustomLogicFolder/Base.StormData/LibTrac.galaxy

@@ -628,10 +628,10 @@ bool libTrac_gt_HeroTracerFocusFireSetTarget_Func (bool testConds, bool runActio
     }
     if ((libTrac_gv_heroTracerFocusFireTargetInteger[lv_ownerOfCaster] == 10)) {
         if ((UnitFilterMatch(lv_target, lv_ownerOfCaster, UnitFilter((1 << c_targetFilterHeroic), 0, (1 << c_targetFilterPlayer) | (1 << c_targetFilterAlly), 0)) == true)) {
-            UnitCreateEffectUnitWithSource(lv_caster, "TracerHeroWeaponFocusFireMasteryDamageHero", lv_target, c_gameCatalogBehavior, "TracerFocusFireFinalShot");
+            UnitCreateEffectUnitWithSource(lv_caster, "TracerFocusFireHeroImpactSet", lv_target, c_gameCatalogBehavior, "TracerFocusFireFinalShot");
         }
         else {
-            UnitCreateEffectUnitWithSource(lv_caster, "TracerHeroWeaponFocusFireMasteryDamage", lv_target, c_gameCatalogBehavior, "TracerFocusFireFinalShot");
+            UnitCreateEffectUnitWithSource(lv_caster, "TracerFocusFireNonHeroImpactSet", lv_target, c_gameCatalogBehavior, "TracerFocusFireFinalShot");
         }
         libTrac_gv_heroTracerFocusFireTargetInteger[lv_ownerOfCaster] = 0;
     }