align with HL 1.28.1

rohan

Jul 27, 2024, 10:59 AM

VONRGIFXJZBRS3UOW7Y6RJT6F6N42AGHO76N3YLNJ36WLWOLMH4AC

Dependencies

• [2] WWMGBP4L merge with Highlander 1.24.0
• [3] 3RXFMSZA merge with Highlander 1.25
• [4] MNK5JUZU fix up build
• [5] JSCVVDFD remove commented code and excess tabs
• [6] ZJUAVDF3 readme
• [7] UA2L2WYU use correct config file
• [8] GO25CRKM allow overwatch shots to ignore cover
• [9] X4IR7ZAH baseline from krumiro's [WotC] RW Realistic Aiming Angles

Change contents

• replacement in RWRealisticAimingAnglesHL.XCOM_sln at line 1
  [4.1]→[3.0:1063](∅→∅)
  − 

  − Microsoft Visual Studio Solution File, Format Version 12.00

  − # XCOM ModBuddy Solution File, Format Version 11.00

  − VisualStudioVersion = 12.0.21005.1

  − MinimumVisualStudioVersion = 10.0.40219.1

  − Project("{5DAE07AF-E217-45C1-8DE7-FF99D6011E8A}") = "RWRealisticAimingAnglesHL", "RWRealisticAimingAnglesHL\RWRealisticAimingAnglesHL.x2proj", "{76D0189F-8B56-4AA6-8F58-03BA78547981}"

  − EndProject

  − Global

  − GlobalSection(SolutionConfigurationPlatforms) = preSolution

  − Debug|XCOM 2 = Debug|XCOM 2

  − Default|XCOM 2 = Default|XCOM 2

  − EndGlobalSection

  − GlobalSection(ProjectConfigurationPlatforms) = postSolution

  − {76D0189F-8B56-4AA6-8F58-03BA78547981}.Debug|XCOM 2.ActiveCfg = Debug|XCOM 2

  − {76D0189F-8B56-4AA6-8F58-03BA78547981}.Debug|XCOM 2.Build.0 = Debug|XCOM 2

  − {76D0189F-8B56-4AA6-8F58-03BA78547981}.Default|XCOM 2.ActiveCfg = Default|XCOM 2

  − {76D0189F-8B56-4AA6-8F58-03BA78547981}.Default|XCOM 2.Build.0 = Default|XCOM 2

  − EndGlobalSection

  − GlobalSection(SolutionProperties) = preSolution

  − HideSolutionNode = FALSE

  − EndGlobalSection

  − EndGlobal
  [4.1]
  + 

  + Microsoft Visual Studio Solution File, Format Version 12.00

  + # XCOM ModBuddy Solution File, Format Version 11.00

  + VisualStudioVersion = 12.0.21005.1

  + MinimumVisualStudioVersion = 10.0.40219.1

  + Project("{5DAE07AF-E217-45C1-8DE7-FF99D6011E8A}") = "RWRealisticAimingAnglesHL", "RWRealisticAimingAnglesHL\RWRealisticAimingAnglesHL.x2proj", "{21EA31C0-1B9A-4041-BBC2-F25711E99502}"

  + EndProject

  + Global

  + GlobalSection(SolutionConfigurationPlatforms) = preSolution

  + Debug|XCOM 2 = Debug|XCOM 2

  + Default|XCOM 2 = Default|XCOM 2

  + EndGlobalSection

  + GlobalSection(ProjectConfigurationPlatforms) = postSolution

  + {21EA31C0-1B9A-4041-BBC2-F25711E99502}.Debug|XCOM 2.ActiveCfg = Debug|XCOM 2

  + {21EA31C0-1B9A-4041-BBC2-F25711E99502}.Debug|XCOM 2.Build.0 = Debug|XCOM 2

  + {21EA31C0-1B9A-4041-BBC2-F25711E99502}.Default|XCOM 2.ActiveCfg = Default|XCOM 2

  + {21EA31C0-1B9A-4041-BBC2-F25711E99502}.Default|XCOM 2.Build.0 = Default|XCOM 2

  + EndGlobalSection

  + GlobalSection(SolutionProperties) = preSolution

  + HideSolutionNode = FALSE

  + EndGlobalSection

  + EndGlobal
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 316
  [2.4]→[4.34927:34996](∅→∅),[4.34927]→[4.34927:34996](∅→∅)
  − if (HitsAreCrits && Result == eHit_Success)

  − Result = eHit_Crit;
  [2.4]

  [4.34996]
  + // Start Issue #1300

  + /// HL-Docs: ref:Bugfixes; issue:1300

  + /// Code block moved to be right after aim assist logic, so that if a miss is converted to a hit by aim assist, the ability will still crit if it is set up to always crit on hit.

  + //if (HitsAreCrits && Result == eHit_Success)

  + // Result = eHit_Crit;

  + // End Issue #1300
• edit in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 436
  [4.41929]

  [4.41929]
  +

  + // Start Issue #1300

  + // Code block moved from earlier.

  + if (HitsAreCrits && Result == eHit_Success)

  + Result = eHit_Crit;

  + // End Issue #1300
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 625
  [4.48588]→[3.1064:1286](∅→∅)
  − // Issue #346: AddModifier(BuiltIn...Mod) block moved later in method.

  − /// HL-Docs: ref:Bugfixes; issue:346

  − /// Prevent `X2AbilityToHitCalc_StandardAim` from applying BuiltInHitMod and BuiltInCritMod against non-units.
  [4.48588]

  [4.48796]
  + // Start Issue #1298

  + /// HL-Docs: ref:Bugfixes; issue:1298

  + /// Add 100 crit chance to guaranteed crit abilities for the purposes of UI.

  + if (bHitsAreCrits)

  + {

  + // call the super version to bypass our check to ignore crit chance mods for guaranteed crits

  + super.AddModifier(100, AbilityTemplate.LocFriendlyName, m_ShotBreakdown, eHit_Crit, bDebugLog);

  + }

  + // End Issue #1298

  +

  + // Issue #346: AddModifier(BuiltIn...Mod) block moved later in method.

  + /// HL-Docs: ref:Bugfixes; issue:346

  + /// Prevent `X2AbilityToHitCalc_StandardAim` from applying BuiltInHitMod and BuiltInCritMod against non-units.
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 648
  [4.50386]→[3.1287:1565](∅→∅)
  − // Start Issue #346: Block moved from earlier.

  − AddModifier(BuiltInHitMod, AbilityTemplate.LocFriendlyName, m_ShotBreakdown, eHit_Success, bDebugLog);

  − AddModifier(BuiltInCritMod, AbilityTemplate.LocFriendlyName, m_ShotBreakdown, eHit_Crit, bDebugLog);

  − // End Issue #346

  −
  [4.50386]

  [4.50386]
  + // Start Issue #346: Block moved from earlier.

  + AddModifier(BuiltInHitMod, AbilityTemplate.LocFriendlyName, m_ShotBreakdown, eHit_Success, bDebugLog);

  + AddModifier(BuiltInCritMod, AbilityTemplate.LocFriendlyName, m_ShotBreakdown, eHit_Crit, bDebugLog);

  + // End Issue #346

  +
• replacement in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 708
  [4.53233]→[4.53233:53380](∅→∅)
  − AddModifier(-TargetState.GetCurrentStat(eStat_Defense), class'XLocalizedData'.default.DefenseStat, m_ShotBreakdown, eHit_Success, bDebugLog);
  [4.53233]

  [4.53380]
  + // Start Issue #1295

  + // Add separate entries for different sources of Defense on the target unit rather than one entry with all sources of Defense rolled into it.

  + //AddModifier(-TargetState.GetCurrentStat(eStat_Defense), class'XLocalizedData'.default.DefenseStat, m_ShotBreakdown, eHit_Success, bDebugLog);

  + AddModifier(-TargetState.GetBaseStat(eStat_Defense), class'XLocalizedData'.default.DefenseStat, m_ShotBreakdown, eHit_Success, bDebugLog);

  +

  + /// HL-Docs: ref:GetStatModifiersFixed

  + TargetState.GetStatModifiersFixed(eStat_Defense, StatMods, StatModValues);

  + for (i = 0; i < StatMods.Length; ++i)

  + {

  + AddModifier(-int(StatModValues[i]), StatMods[i].GetX2Effect().FriendlyName, m_ShotBreakdown, eHit_Success, bDebugLog);

  + }

  + // End Issue #1295
• edit in RWRealisticAimingAnglesHL/Src/RWRealisticAimingAnglesHL/Classes/Override_X2AbilityToHitCalc_StandardAim.uc at line 1071
  [4.85789]

  [4.85789]
  + // Start Issue #1271

  + /// HL-Docs: feature:GetAdditionalHitModifiers; issue:1271; tags:tactical

  + /// This feature adds a method that can be used by subclasses to apply

  + /// additional hit modifiers without having to override and copy paste

  + /// the entire `GetHitChance()` function.

  + GetAdditionalHitModifiers_CH(kAbility, kTarget, m_ShotBreakdown, bDebugLog);

  + // End Issue #1271

  +
• replacement in RWRealisticAimingAnglesHL/RWRealisticAimingAnglesHL.x2proj at line 1
  [4.92571]→[4.1077:3333](∅→∅)
  − <?xml version="1.0" encoding="utf-8"?>

  − <Project ToolsVersion="12.0" DefaultTargets="Default" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  − <PropertyGroup>

  − <Guid>77b6db48-e453-45b7-a9af-fd61825b87ef</Guid>

  − <Name>[WotC] RW Realistic Aiming Angles - Highlander compatible</Name>

  − <Description>This is an unofficial update to krumiro's [WotC] RW Realistic Aiming Angle to make it compatible with X2WOTCCommunityHighlander v1.24.0</Description>

  − <SteamPublishID>0</SteamPublishID>

  − <AssemblyName>RWRealisticAimingAnglesHL</AssemblyName>

  − <RootNamespace>RWRealisticAimingAnglesHL</RootNamespace>

  − </PropertyGroup>

  − <ItemGroup>

  − <Folder Include="Config\" />

  − <Folder Include="Config\Base\" />

  − <Folder Include="Src\" />

  − <Folder Include="Src\RWRealisticAimingAnglesHL" />

  − <Folder Include="Src\RWRealisticAimingAnglesHL\Classes" />

  − </ItemGroup>

  − <ItemGroup>

  − <Content Include="Config\XComRWRealisticAimingAngles.ini">

  − <SubType>Content</SubType>

  − </Content>

  − <Content Include="ReadMe.txt" />

  − <Content Include="ModPreview.jpg" />

  − <Content Include="ContentOptions.json" />

  − <Content Include="Config\Base\XComEditor.ini" />

  − <Content Include="Config\Base\XComEngine.ini" />

  − <Content Include="Config\Base\XComGame.ini" />

  − <Content Include="Src\RWRealisticAimingAnglesHL\Classes\Override_X2AbilityToHitCalc_StandardAim.uc" />

  − <Content Include="Src\RWRealisticAimingAnglesHL\Classes\PerfectInformation_Notification.uc" />

  − <Content Include="Src\RWRealisticAimingAnglesHL\Classes\PerfectInformation_Observer.uc" />

  − <Content Include="Src\RWRealisticAimingAnglesHL\Classes\PerfectInformation_TacticalVisualizationManager.uc" />

  − <Content Include="Src\RWRealisticAimingAnglesHL\Classes\PerfectInformation_X2Action_Fire.uc" />

  − <Content Include="Src\RWRealisticAimingAnglesHL\Classes\RWRealisticAimingAngles.uc" />

  − </ItemGroup>

  − <PropertyGroup>

  − <SolutionRoot>$(MSBuildProjectDirectory)\..\</SolutionRoot>

  − <ScriptsDir>$(SolutionRoot).scripts\\</ScriptsDir>

  − <BuildCommonRoot>$(ScriptsDir)X2ModBuildCommon\</BuildCommonRoot>

  − </PropertyGroup>

  − <Import Project="$(BuildCommonRoot)XCOM2.targets" />

  − </Project>
  [4.92571]
  + <?xml version="1.0" encoding="utf-8"?>

  + <Project ToolsVersion="12.0" DefaultTargets="Default" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  + <PropertyGroup>

  + <Guid>77b6db48-e453-45b7-a9af-fd61825b87ef</Guid>

  + <Name>[WotC] RW Realistic Aiming Angles - Highlander compatible</Name>

  + <Description>This is an unofficial update to krumiro's [WotC] RW Realistic Aiming Angle to make it compatible with X2WOTCCommunityHighlander v1.24.0</Description>

  + <SteamPublishID>0</SteamPublishID>

  + <AssemblyName>RWRealisticAimingAnglesHL</AssemblyName>

  + <RootNamespace>RWRealisticAimingAnglesHL</RootNamespace>

  + </PropertyGroup>

  + <ItemGroup>

  + <Folder Include="Config\" />

  + <Folder Include="Config\Base\" />

  + <Folder Include="Src\" />

  + <Folder Include="Src\RWRealisticAimingAnglesHL" />

  + <Folder Include="Src\RWRealisticAimingAnglesHL\Classes" />

  + </ItemGroup>

  + <ItemGroup>

  + <Content Include="Config\XComRWRealisticAimingAngles.ini">

  + <SubType>Content</SubType>

  + </Content>

  + <Content Include="ReadMe.txt" />

  + <Content Include="ModPreview.jpg" />

  + <Content Include="ContentOptions.json" />

  + <Content Include="Config\Base\XComEditor.ini" />

  + <Content Include="Config\Base\XComEngine.ini" />

  + <Content Include="Config\Base\XComGame.ini" />

  + <Content Include="Src\RWRealisticAimingAnglesHL\Classes\Override_X2AbilityToHitCalc_StandardAim.uc" />

  + <Content Include="Src\RWRealisticAimingAnglesHL\Classes\RWRealisticAimingAngles.uc" />

  + </ItemGroup>

  + <PropertyGroup>

  + <SolutionRoot>$(MSBuildProjectDirectory)\..\</SolutionRoot>

  + <ScriptsDir>$(SolutionRoot).scripts\\</ScriptsDir>

  + <BuildCommonRoot>$(ScriptsDir)X2ModBuildCommon\</BuildCommonRoot>

  + </PropertyGroup>

  + <Import Project="$(BuildCommonRoot)XCOM2.targets" />

  + </Project>