Skip to content
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

Unlock paid items with progression enabled #726

Merged
merged 11 commits into from
Oct 11, 2023
Merged

Unlock paid items with progression enabled #726

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
341f3ac
Keep store items unlocked with progression enabled
Zanieon Sep 29, 2023
a1ea16b
Add Aegis Rank reset functionality
Zanieon Sep 29, 2023
824d914
Revert "Add Aegis Rank reset functionality"
Zanieon Sep 29, 2023
643d7d6
Space'y
Zanieon Sep 29, 2023
1bc8e0d
Trigger workflows
ASpoonPlaysGames Oct 1, 2023
db4204b
Merge branch 'R2Northstar:main' into progression_improvements
Zanieon Oct 3, 2023
4d69f31
Merge branch 'main' into progression_improvements
uniboi Oct 6, 2023
d900813
Merge branch 'main' into progression_improvements
Zanieon Oct 7, 2023
f1b8c82
Merge branch 'R2Northstar:main' into progression_improvements
Zanieon Oct 9, 2023
ba4be96
Merge branch 'R2Northstar:main' into progression_improvements
Zanieon Oct 10, 2023
6ddce42
Merge branch 'main' into progression_improvements
Zanieon Oct 10, 2023
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
13 changes: 12 additions & 1 deletion Northstar.CustomServers/mod/scripts/vscripts/_items.nut
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5700,6 +5700,12 @@ bool function IsSubItemLocked( entity player, string ref, string parentRef )
{
if ( DevEverythingUnlocked( player ) )
return false

if ( IsItemPurchasableEntitlement( ref, parentRef ) )
return false

if ( GetItemType( ref ) == eItemTypes.PRIME_TITAN || GetSubitemType( parentRef, ref ) == eItemTypes.PRIME_TITAN )
ASpoonPlaysGames marked this conversation as resolved.
Show resolved Hide resolved
return false

if ( IsItemInEntitlementUnlock( ref, parentRef ) )
{
Expand All @@ -5724,7 +5730,6 @@ bool function IsSubItemLocked( entity player, string ref, string parentRef )

if ( IsItemLocked( player, parentRef ) )
return true
ASpoonPlaysGames marked this conversation as resolved.
Show resolved Hide resolved

if ( GetSubItemUnlockType( ref, parentRef ) == eUnlockType.STAT )
{
if ( !IsSubItemLockedForStat( player, ref, parentRef) )
Expand Down Expand Up @@ -5819,6 +5824,12 @@ bool function IsItemLocked( entity player, string ref )
{
if ( DevEverythingUnlocked( player ) )
return false

if ( IsItemPurchasableEntitlement( ref ) )
return false

if ( GetItemType( ref ) == eItemTypes.PRIME_TITAN )
return false

if ( IsItemInEntitlementUnlock( ref ) )
{
Expand Down