feat: More mappings

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/AbilityResultContext.java

@@ -6,6 +6,7 @@ public class AbilityResultContext {
 
 	public List<EffectRedirect> EffectRedirects;
 	public EAbilityHitResult HitResult;
+	public int InterruptionStep;
 	public List<ArmorMitigationResults> MultiTargetArmorMitigation;
 	public List<EffectResults> MultiTargetEffectResults;
 	public List<OverriddenEffectsByType> MultiTargetEffectsOverrides;

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/EffectRedirect.java

@@ -1,5 +1,15 @@
 package com.github.rcd47.x2data.lib.unreal.mappings.base;
 
-public class EffectRedirect {
+import com.github.rcd47.x2data.lib.unreal.mapper.ref.IXComStateObjectReference;
+import com.github.rcd47.x2data.lib.unreal.mappings.UnrealName;
 
+public class EffectRedirect {
+
+	// the target refs can definitely be Units
+	// theoretically, I think they could be other things too, like an InteractiveObject
+	public IXComStateObjectReference<XComGameState_BaseObject> OriginalTargetRef;
+	public IXComStateObjectReference<XComGameState_BaseObject> RedirectedToTargetRef;
+	public UnrealName RedirectReason;
+	public EffectResults RedirectResults;
+
 }

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/PathingInputData.java

@@ -2,12 +2,15 @@
 
 import java.util.List;
 
+import com.github.rcd47.x2data.lib.unreal.mapper.ref.IXComStateObjectReference;
+
 public class PathingInputData {
 
 	public List<Integer> CostIncreases;
 	public List<Integer> Destructibles;
 	public List<PathPoint> MovementData;
 	public List<TTile> MovementTiles;
+	public IXComStateObjectReference<XComGameState_Unit> MovingUnitRef;
 	public List<TTile> WaypointTiles;
 
 }

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/SoldierClassAbilityType.java

@@ -1,9 +1,9 @@
 package com.github.rcd47.x2data.lib.unreal.mappings.base;
 
-import com.github.rcd47.x2data.lib.unreal.mappings.UnrealName;
+import com.github.rcd47.x2data.lib.unreal.mapper.ref.IXComNameObjectReference;
 
 public class SoldierClassAbilityType {
 
-	public UnrealName AbilityName;
+	public IXComNameObjectReference<X2AbilityTemplate> AbilityName;
 
 }

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2AbilityTemplate.java

@@ -7,6 +7,7 @@ public class X2AbilityTemplate extends X2DataTemplate {
 	public IXComNameObjectReference<Void> AbilityTargetStyle;
 	public IXComNameObjectReference<Void> AbilityToHitCalc;
 	public EAbilityHostility Hostility;
+	public String IconImage;
 	public String LocFriendlyName;
 
 }

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2CharacterTemplate.java

@@ -2,8 +2,11 @@
 
 public class X2CharacterTemplate extends X2DataTemplate {
 
-	public boolean bIsScientist;
+	public boolean bIsCivilian;
+	public boolean bIsCosmetic;
 	public boolean bIsEngineer;
+	public boolean bIsScientist;
 	public String strCharacterName;
+	public String strTargetIconImage;
 
 }

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2EffectTemplateRef.java

@@ -1,5 +1,12 @@
 package com.github.rcd47.x2data.lib.unreal.mappings.base;
 
-public class X2EffectTemplateRef {
+import com.github.rcd47.x2data.lib.unreal.mappings.UnrealName;
 
+public class X2EffectTemplateRef {
+
+	public int ApplyOnTickIndex;
+	public EffectTemplateLookupType LookupType;
+	public UnrealName SourceTemplateName;
+	public int TemplateEffectLookupArrayIndex;
+
 }

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2SoldierClassTemplate.java

@@ -4,6 +4,7 @@
 
 public class X2SoldierClassTemplate extends X2DataTemplate {
 
+	public List<String> AbilityTreeTitles;
 	public String DisplayName;
 	public String IconImage;
 	public List<String> RankIcons;

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext.java

@@ -8,6 +8,8 @@
 public class XComGameStateContext {
 
 	public EInterruptionStatus InterruptionStatus;
+	public int InterruptionHistoryIndex; // If this game state is resuming from an interruption, this index points back to the game state that are resuming from
+	public int ResumeHistoryIndex; // If this game state has been interrupted, this index points forward to the game state that will resume
 	public List<@UnrealDataTypeHint(UnrealDataType.delegateproperty) Integer> PostBuildVisualizationFn;
 	public List<@UnrealDataTypeHint(UnrealDataType.delegateproperty) Integer> PreBuildVisualizationFn;
 

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ApplyWorldEffects.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_ApplyWorldEffects extends XComGameStateContext {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_AreaDamage.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_AreaDamage extends XComGameStateContext {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ChangeContainer.java

@@ -1,5 +1,7 @@
 package com.github.rcd47.x2data.lib.unreal.mappings.base;
 
 public class XComGameStateContext_ChangeContainer extends XComGameStateContext {
-
+
+	public String ChangeInfo;
+
 }

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_CinematicSpawn.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_CinematicSpawn extends XComGameStateContext {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_Falling.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_Falling extends XComGameStateContext {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_TutorialBox.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_TutorialBox extends XComGameStateContext {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_AIReinforcementSpawner.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_AIReinforcementSpawner extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Ability_CH.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Ability_CH extends XComGameState_Ability {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_BlackMarket.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_BlackMarket extends XComGameState_ScanningSite {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Cheats.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Cheats extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ChosenAction.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_ChosenAction extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_City.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_City extends XComGameState_GeoscapeEntity {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DLC_Day60AchievementData.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_DLC_Day60AchievementData extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DLC_Day90AchievementData.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_DLC_Day90AchievementData extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DarkEvent.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_DarkEvent extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Effect_PaleHorse.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Effect_PaleHorse extends XComGameState_Effect {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_EvacZone.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_EvacZone extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_FacilityUpgrade.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_FacilityUpgrade extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Falling.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Falling extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_GameTime.java

@@ -0,0 +1,7 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_GameTime extends XComGameState_BaseObject {
+
+	public TDateTime CurrentTime;
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Haven.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Haven extends XComGameState_ScanningSite {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProject.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProject extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectBondSoldiers.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectBondSoldiers extends XComGameState_HeadquartersProject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectBuildFacility.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectBuildFacility extends XComGameState_HeadquartersProject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectClearRoom.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectClearRoom extends XComGameState_HeadquartersProject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectHealSoldier.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectHealSoldier extends XComGameState_HeadquartersProject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectHealSpark.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectHealSpark extends XComGameState_HeadquartersProjectHealSoldier {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectProvingGround.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectProvingGround extends XComGameState_HeadquartersProjectResearch {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectRecoverWill.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectRecoverWill extends XComGameState_HeadquartersProject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectRemoveTraits.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectRemoveTraits extends XComGameState_HeadquartersProject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectResearch.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectResearch extends XComGameState_HeadquartersProject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectTrainRookie.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectTrainRookie extends XComGameState_HeadquartersProject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersXCom.java

@@ -13,6 +13,7 @@ public class XComGameState_HeadquartersXCom extends XComGameState_Airship {
 	public List<GeneratedMissionData> arrGeneratedMissionData;
 	public List<IXComStateObjectReference<XComGameState_Unit>> Crew;
 	public List<HQOrder> CurrentOrders;
+	public List<IXComStateObjectReference<XComGameState_Unit>> DeadCrew;
 	public List<Integer> EverAcquiredInventoryCounts;
 	public List<UnrealName> EverAcquiredInventoryTypes;
 	public List<UnrealName> ExtraUpgradeWeaponCats;

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HuntersLodgeManager.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HuntersLodgeManager extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_IndicatorArrow.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_IndicatorArrow extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_LineOfPlayAnchor.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_LineOfPlayAnchor extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MaterialSwaps.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MaterialSwaps extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAlienNest.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteAlienNest extends XComGameState_MissionSiteOutsideRegions {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAvengerAttack.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteAvengerAttack extends XComGameState_MissionSite {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAvengerDefense.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteAvengerDefense extends XComGameState_MissionSiteAvengerAttack {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteChosenAmbush.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteChosenAmbush extends XComGameState_MissionSite {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteLostTowers.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteLostTowers extends XComGameState_MissionSiteOutsideRegions {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ObjectiveInfo.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_ObjectiveInfo extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ResourceCache.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_ResourceCache extends XComGameState_ScanningSite {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Reward.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Reward extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SparkManager.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_SparkManager extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SquadViewer.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_SquadViewer extends XComGameState_BaseObject {
+
+}

x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SquadVisiblePoint.java

@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_SquadVisiblePoint extends XComGameState_BaseObject {
+
+}