Skip to content

Commit

Permalink
fix: Restore removed comment
Browse files Browse the repository at this point in the history
  • Loading branch information
GeckoEidechse committed Jan 26, 2024
1 parent 30b91f9 commit dfb5d95
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions Northstar.CustomServers/mod/scripts/vscripts/sh_progression.nut
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ bool function ProgressionEnabledForPlayer( entity player )
#if SERVER
if ( player in file.progressionEnabled )
return file.progressionEnabled[player]

return false
#else // CLIENT || UI
return GetConVarBool( "ns_progression_enabled" )
Expand All @@ -76,7 +76,7 @@ bool function ClientCommand_SetProgression( entity player, array<string> args )
return false
if ( args[0] != "0" && args[0] != "1" )
return false

file.progressionEnabled[player] <- args[0] == "1"

// loadout validation when progression is turned on
Expand All @@ -96,20 +96,21 @@ bool function ClientCommand_ResetTitanAegis( entity player, array<string> args )
{
if ( !args.len() )
return false

string titanRef = args[0].tolower()
if( !PersistenceEnumValueIsValid( "titanClasses", titanRef ) )
return false

int suitIndex = PersistenceGetEnumIndexForItemName( "titanClasses", titanRef )

player.SetPersistentVar( "titanFDUnlockPoints[" + suitIndex + "]", 0 )
player.SetPersistentVar( "previousFDUnlockPoints[" + suitIndex + "]", 0 )
player.SetPersistentVar( "fdTitanXP[" + suitIndex + "]", 0 )
player.SetPersistentVar( "fdPreviousTitanXP[" + suitIndex + "]", 0 )


// Refresh Highest Aegis Titan since we might get all of them back to 1 if players wants
RecalculateHighestTitanFDLevel( player )

return true
}
#endif
Expand Down Expand Up @@ -213,7 +214,7 @@ void function ValidateEquippedItems( entity player )
printt( "- FACTION IS LOCKED, RESETTING" )
player.SetPersistentVar( "factionChoice", "faction_marauder" ) // im so sorry that i am setting you to use sarah, you don't deserve this
}

// boost
BurnReward reward = BurnReward_GetById( player.GetPersistentVarAsInt( "burnmeterSlot" ) )
if ( IsItemLocked( player, reward.ref ) )
Expand Down Expand Up @@ -372,13 +373,13 @@ void function ValidateEquippedItems( entity player )
}
else if ( loadout.primarySkinIndex == 0 && loadout.primaryCamoIndex != 0 )
{
// titan weapons do not have skins, if we ever do add them lots of stuff will
// titan weapons do not have skins, if we ever do add them lots of stuff will
//need a refactor outside of here so with that being said, i cannot be bothered
printt( " - INVALID WEAPON CAMO/SKIN, RESETTING" )
player.SetPersistentVar( "titanLoadouts[" + titanLoadoutIndex + "].primarySkinIndex", defaultLoadout.primarySkinIndex )
player.SetPersistentVar( "titanLoadouts[" + titanLoadoutIndex + "].primaryCamoIndex", defaultLoadout.primaryCamoIndex )
}


// isPrime
if ( loadout.isPrime == "titan_is_prime" && IsItemLocked( player, loadout.primeTitanRef ) )
Expand Down Expand Up @@ -476,7 +477,7 @@ void function ValidateEquippedItems( entity player )
player.SetPersistentVar( "pilotLoadouts[" + pilotLoadoutIndex + "].suit", defaultLoadout.suit )
}
}

// ordnance
{
if ( !IsRefValid( loadout.ordnance ) )
Expand Down Expand Up @@ -1000,7 +1001,7 @@ void function ValidateEquippedItems( entity player )
player.SetPersistentVar( "pilotLoadouts[" + pilotLoadoutIndex + "].execution", "execution_neck_snap" )
}
}

// equipped pilot loadout
{
if ( isSelected && IsItemLocked( player, "pilot_loadout_" + ( pilotLoadoutIndex + 1 ) ) )
Expand Down

0 comments on commit dfb5d95

Please sign in to comment.