Merge pull request #1613 from long-war-2/revert-1612-class-plus-chosen

Revert "Merge 1.1.0 changes into main repo"

.gitignore

@@ -1,9 +1,5 @@
 /*.code-workspace
 BuildCache/
 PublishedFileID.Id
-git-sizer.exe
-/LongWarOfTheChosen/Content/
-/LongWarOfTheChosen/ContentForCook/
 *.upk
-*.bik
 *.umap

LongWarOfTheChosen/Config/XComAI.ini

@@ -88,9 +88,6 @@
 ;Scamper root used by purifier
 +NewBehaviors=(BehaviorName=ScamperRoot_Purifier, NodeType=Selector, Child[0]=CounterBeaglerushManeuver, Child[1]=SniperDefense, Child[2]=MoveAggressiveUnsafe, Child[3]=HuntEnemyWithCover, Child[4]=SkipMove)
 
-; "ScamperRoot_Warlock" - used by the chosen warlock
-+NewBehaviors=(BehaviorName=ScamperRoot_ChosenWarlock, NodeType=Selector, Child[0]=CounterBeaglerushManeuver, Child[1]=TryChosenSummon, Child[2]=TryShieldAlly, Child[3]=MoveStandardWithLoSUnsafe, Child[4]=MoveStandardUnsafe, Child[5]=MoveStandardWithLoSUnsafeIgnoreHazards, Child[6]=MoveStandardUnsafeIgnoreHazards, Child[7]=SkipMove)
-
 ; "AvoidBoundAndPanickedTargets" - Add a uniform score bonus to all non-last-resort units (+25)
 +BehaviorRemovals="AvoidBoundAndPanickedTargets"
 +NewBehaviors=(BehaviorName=AvoidBoundAndPanickedTargets, NodeType=Selector, Child[0]=ScoreIfTargetBoundOrPanicked, Child[1]=AddToTargetScore_25)
@@ -395,25 +392,8 @@ Child[4]=HuntEnemyWithCover)
 DistributionPercentToXCom=60
 
 [XComGame.XComGameState_AIGroup]
-+FallbackExclusionList=HiveQueen
-+FallbackExclusionList=ChryssalidSoldier
-;Removing chosen from this is useful for debugging
-+FallbackExclusionList=ChosenSniperM1
-+FallbackExclusionList=ChosenSniperM2
-+FallbackExclusionList=ChosenSniperM3
-+FallbackExclusionList=ChosenSniperM4
-+FallbackExclusionList=ChosenSniperM5
-+FallbackExclusionList=ChosenWarlockM1
-+FallbackExclusionList=ChosenWarlockM2
-+FallbackExclusionList=ChosenWarlockM3
-+FallbackExclusionList=ChosenWarlockM4
-+FallbackExclusionList=ChosenWarlockM5
-+FallbackExclusionList=ChosenAssassinM1
-+FallbackExclusionList=ChosenAssassinM2
-+FallbackExclusionList=ChosenAssassinM3
-+FallbackExclusionList=ChosenAssassinM4
-+FallbackExclusionList=ChosenAssassinM5
-
++FallbackExclusionList="HiveQueen"
++FallbackExclusionList="ChryssalidSoldier"
 
 [XComGame.XComGameState_AIPlayerData]
 DownThrottleUnitCount = 999 ; Number of enemies engaged to activate Down Throttling. DISABLED
@@ -1303,7 +1283,7 @@ MAX_SURPRISED_SCAMPER_PATH_LENGTH=7		; Scamper paths longer than this number of
 +Behaviors=(BehaviorName=TryOverwatchLastAction, NodeType=Sequence, Child[0]=IsLastActionPoint, Child[1]=AvoidDoubleMove, Child[2]=TryOverwatch)
 
 ;ChosenWarlock
-+EquivalentAbilities=( KeyName=ShieldAlly, EquivalentAbilityName[0]=ShieldAllyM1, EquivalentAbilityName[1]=ShieldAllyM2, EquivalentAbilityName[2]=ShieldAllyM3, EquivalentAbilityName[3]=ShieldAllyM4, EquivalentAbilityName[4]=ShieldAllyM5)
++EquivalentAbilities=( KeyName=ShieldAlly, EquivalentAbilityName[0]=ShieldAllyM1, EquivalentAbilityName[1]=ShieldAllyM2, EquivalentAbilityName[2]=ShieldAllyM3, EquivalentAbilityName[3]=ShieldAllyM4)
 
 -Behaviors=(BehaviorName="ChosenWarlock::CharacterRoot", NodeType=Selector, Child[0]=ChosenUnactivated, Child[1]=ChosenActivated, Child[2]=ChosenEngaged, Child[3]=SkipMove)
 -Behaviors=(BehaviorName="ChosenWarlock::ChosenEngaged", NodeType=Selector,      Child[0]=TryEndSpectralArmy,      Child[1]=TryChosenSummon,      Child[2]=OverwatchHandlerShootOverwatcherOption,      Child[3]=WarlockMoveIfNecessary,      Child[4]=TryWarlockCombatAbilities,      Child[5]=OverwatchHandlerBackupOption,      Child[6]=TryShootOrReloadOrOverwatch,      Child[7]=HuntEnemyWithCover)
@@ -1530,36 +1510,35 @@ MAX_SURPRISED_SCAMPER_PATH_LENGTH=7		; Scamper paths longer than this number of
 +Behaviors=(BehaviorName="ChosenSniper::ChosenEngaged", NodeType=Selector, Child[0]=TryLWChosenkidnap, Child[1]=ChosenSniperFirstAction, Child[2]=ChosenSniperLastAction)
 
 +Behaviors=(BehaviorName="ChosenSniperFirstActionSelector", NodeType=Selector, \\
-			Child[0]=TryTrackingShotMark,\\
-			Child[1]=TryGrenade,\\
+			Child[0]=TryGrenade,\\
+            Child[1]=ShootWhenKillShot_Pistol,\\
             Child[2]=TryLightningHands, \\
-            Child[3]=ShootWhenFlanking_Pistol, \\
-            Child[4]=TryGrappleForOffense,\\
-            Child[5]=DoIfFlankedFallback, \\
-			Child[6]=TryTrackingShot,\\
-            Child[7]=TryFaceoff, \\
-            Child[8]=TakePriorityshotsChosen_Pistol, \\
-            Child[9]=TakePriorityshotsChosen, \\
-            Child[10]=MoveChosenStayBack, \\
+            Child[3]=TryFanFire, \\
+            Child[4]=ShootWhenFlanking_Pistol, \\
+            Child[5]=TryGrappleForOffense,\\
+            Child[6]=DoIfFlankedFallback, \\
+            Child[7]=TakePriorityshotsChosen_Pistol, \\
+            Child[8]=TakePriorityshotsChosen, \\
+            Child[9]=MoveChosenStayBack, \\
+            Child[10]=TryFaceoff, \\
             Child[11]=TryShootOrReloadOrOverwatch,\\
             Child[12]=HuntEnemyWithCover, \\
             Child[13]=TryCombatReadiness)
 
 +Behaviors=(BehaviorName="ChosenSniperLastActionSelector", NodeType=Selector, \\
-			Child[0]=TryTrackingShotMark,\\
-			Child[1]=TryGrenade,\\
-			Child[2]=TryTrackingShot,\\
-            Child[3]=TryLightningHands, \\
-            Child[4]=TryFanFire, \\
-            Child[5]=TryGrappleForOffense,\\
-            Child[6]=TakePriorityshotsChosen, \\
-            Child[7]=ShootWhenKillShot_Pistol, \\
-            Child[8]=ShootWhenFlanking_Pistol, \\
-            Child[9]=DoIfFlankedFallback, \\
-            Child[10]=TryShootOrReloadOrOverwatch,\\
-            Child[11]=MoveChosenStayBack, \\
-            Child[12]=HuntEnemyWithCover, \\
-            Child[13]=TryCombatReadiness)
+			Child[0]=TryGrenade,\\
+            Child[1]=TryLightningHands, \\
+            Child[2]=TryFanFire, \\
+            Child[3]=TryGrappleForOffense,\\
+            Child[4]=TryFaceoff, \\
+            Child[5]=TakePriorityshotsChosen, \\
+            Child[6]=ShootWhenKillShot_Pistol, \\
+            Child[7]=ShootWhenFlanking_Pistol, \\
+            Child[8]=DoIfFlankedFallback, \\
+            Child[9]=TryShootOrReloadOrOverwatch,\\
+            Child[10]=MoveChosenStayBack, \\
+            Child[11]=HuntEnemyWithCover, \\
+            Child[12]=TryCombatReadiness)
 
 +Behaviors=(BehaviorName=HunterReaction, NodeType=Selector, Child[0]=DoIfFlankedPrimeFallback, Child[1]=NeedsReload, Child[2]=TryCombatReadinessIfMobDebuffed, Child[3]=TryTriggerDamagedTeleportIfFlanked, Child[4]=TryCombatReadiness)
 

LongWarOfTheChosen/Config/XComAcademyUnlocks.ini

@@ -1,4 +1,4 @@
-; Config file for the changed Parkour GTS ability
-[LW_FactionBalance.X2StrategyElement_AcademyUnlocks_GrappleParkour]
-PARKOUR_RANK=5 ; Rank of Skirmisher required to buy the perk, 1 is Squaddie, 5 is Captain, 7 is Colonel, etc
+; Config file for the changed Parkour GTS ability
+[LW_FactionBalance.X2StrategyElement_AcademyUnlocks_GrappleParkour]
+PARKOUR_RANK=5 ; Rank of Skirmisher required to buy the perk, 1 is Squaddie, 5 is Captain, 7 is Colonel, etc
 PARKOUR_COST=75 ; Amount of Supplies required to buy the perk

LongWarOfTheChosen/Config/XComCamera.ini

@@ -1,10 +1,3 @@
-[XComGame.X2Camera_Cinescript]
-+AbilityCameras=(AbilityCameraType="IRI_SoulShot", \\
-	ShooterTeam=CinescriptShooterTeam_XCom, ExtraAbilityEndDelay=0, \\
-	CameraCuts[0]=(CutAnimNotify="CameraStart", NewCameraType=CinescriptCameraType_Matinee, MatineeCommentPrefix="CIN_Quick_Wide"), \\
-	CameraCuts[1]=(CutAnimNotify="CameraEnd", NewCameraType=CinescriptCameraType_Exit), \\
-	CameraCuts[2]=(CutAfterPrevious=True, NewCameraType=CinescriptCameraType_Exit))
-
 [XComGame.X2Action_ApplyWeaponDamageToTerrain]
 
 CameraShakeIntensity_Large=0.00