Skip to content

POC: Make the first three pistol perks (Magnum, Clutch Shot, and Quickdraw) purchasable without TC #1911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaloLorn wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −3
Open

POC: Make the first three pistol perks (Magnum, Clutch Shot, and Quickdraw) purchasable without TC #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions LongWarOfTheChosen/Config/XComLW_Overhaul.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2634,6 +2634,13 @@ FACTION_ABILITY_COSTS[7]=30
; Example:
; +CLASSES_IGNORE_CUSTOM_COSTS=YourClassName

; Perks which, if appearing in an XCOM or pistol row, do not require a Training Center
; to learn. Note that classes specified in CLASSES_IGNORE_CUSTOM_COSTS will also ignore
; this list, unless their name is also specified in CLASSES_ALLOW_NO_TRAINING_CENTER.
+IGNORE_NO_TRAINING_CENTER=Magnum_LW
+IGNORE_NO_TRAINING_CENTER=Quickdraw
+IGNORE_NO_TRAINING_CENTER=ClutchShot

; Cost multiplier for the first purchased class ability
BASE_ABILITY_COST_MODIFIER=0.2

Expand Down
21 changes: 18 additions & 3 deletions LongWarOfTheChosen/Src/LW_Overhaul/Classes/X2EventListener_Soldiers.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ var config array<CustomAbilityCost> CUSTOM_ABILITY_COSTS;
var config array<int> FACTION_ABILITY_COSTS;
var config float BASE_ABILITY_COST_MODIFIER;
var config array<name>CLASSES_IGNORE_CUSTOM_COSTS;
var config array<name> IGNORE_NO_TRAINING_CENTER;
var config array<name> CLASSES_ALLOW_NO_TRAINING_CENTER;

var config array<name> SPARKUnitValues, SPARKCharacterTemplates, SPARKSoldierClasses, SPARKAbilities;

Expand Down Expand Up @@ -520,6 +522,7 @@ static function EventListenerReturn OverrideCanPurchaseAbility(
{
local XComGameState_Unit UnitState;
local XComLWTuple Tuple;
local name AbilityName, ClassName;
local int Rank, Branch;
local int ClassAbilityRankCount; //Rank is 0 indexed but AbilityRanks is not. This means a >= comparison requires no further adjustments

Expand All @@ -531,6 +534,8 @@ static function EventListenerReturn OverrideCanPurchaseAbility(
if (UnitState == none)
return ELR_NoInterrupt;

AbilityName = Tuple.Data[0].n;
ClassName = UnitState.GetSoldierClassTemplateName();
Rank = Tuple.Data[1].i;
Branch = Tuple.Data[2].i;
ClassAbilityRankCount = Tuple.Data[11].i;
Expand All @@ -542,7 +547,7 @@ static function EventListenerReturn OverrideCanPurchaseAbility(
Tuple.Data[13].b = false; // CanPurchaseAbility
Tuple.Data[15].s = default.ReasonClassAbilityPickedAtRank; // LocReasonLocked

if (UnitState.GetSoldierClassTemplateName() != 'PsiOperative') { return ELR_NoInterrupt; }
if (ClassName != 'PsiOperative') { return ELR_NoInterrupt; }

if (Branch < ClassAbilityRankCount) //row 0, row 1
{
Expand All @@ -555,7 +560,17 @@ static function EventListenerReturn OverrideCanPurchaseAbility(
// training center has been built.
if (Branch >= ClassAbilityRankCount)
{
if (`XCOMHQ.HasFacilityByName('RecoveryCenter'))
if (
`XCOMHQ.HasFacilityByName('RecoveryCenter') ||
(
// Some abilities might also be available before the training center has been built.
(
default.CLASSES_ALLOW_NO_TRAINING_CENTER.Find(ClassName) != INDEX_NONE
|| default.CLASSES_IGNORE_CUSTOM_COSTS.Find(ClassName) == INDEX_NONE
)
&& default.IGNORE_NO_TRAINING_CENTER.Find(AbilityName) != INDEX_NONE
)
)
{
if (Tuple.Data[12].b)
{
Expand All @@ -574,7 +589,7 @@ static function EventListenerReturn OverrideCanPurchaseAbility(
}
}

if (UnitState.GetSoldierClassTemplateName() != 'PsiOperative') { return ELR_NoInterrupt; }
if (ClassName != 'PsiOperative') { return ELR_NoInterrupt; }

if (Branch< ClassAbilityRankCount) //row 0, row 1
{
Expand Down