Progression system (#655)

This also can't hurt right?

---------

Co-authored-by: uniboi <64006268+uniboi@users.noreply.github.com>

1 files changed, 16 insertions, 23 deletions

diff --git a/Northstar.CustomServers/mod/scripts/vscripts/_xp.gnut b/Northstar.CustomServers/mod/scripts/vscripts/_xp.gnut
index 6f044b7a..2b95d1a8 100644
--- a/Northstar.CustomServers/mod/scripts/vscripts/_xp.gnut
+++ b/Northstar.CustomServers/mod/scripts/vscripts/_xp.gnut
@@ -1,6 +1,7 @@
 global function SvXP_Init
 global function PlayerProgressionAllowed
 global function HandleXPGainForScoreEvent
+global function AddXP
 
 void function SvXP_Init()
 {
@@ -29,46 +30,38 @@ bool function PlayerProgressionAllowed( entity player )
 void function HandleXPGainForScoreEvent( entity player, ScoreEvent event )
 {
 	// note: obviously all xp stuff can be cheated in if people want to on customs, this is mainly just here for fun for those who want it and feature completeness
-	// most score events don't have this, so we'll set this to the xp value of other categories later if needed
+
 	int xpValue = ScoreEvent_GetXPValue( event )
 	int weaponXp = ScoreEvent_GetXPValueWeapon( event )
 	int titanXp = ScoreEvent_GetXPValueTitan( event )
-
-	if ( xpValue < weaponXp )
-		xpValue = weaponXp
-	else if ( xpValue < titanXp )
-		xpValue = titanXp
+	int factionXp = ScoreEvent_GetXPValueFaction( event )
 
 	entity weapon = player.GetActiveWeapon()
-	if ( IsValid( weapon ) && ShouldTrackXPForWeapon( weapon.GetWeaponClassName() ) )
-		AddWeaponXP( player, xpValue )
+	if ( IsValid( weapon ) && ShouldTrackXPForWeapon( weapon.GetWeaponClassName() ) && weaponXp != 0 )
+		AddWeaponXP( player, weaponXp )
 
 	// if we specifically gain titan xp, then give titan xp no matter what, otherwise only give it when we're in a titan
-	if ( titanXp != 0 || player.IsTitan() )
-		AddTitanXP( player, xpValue )
-
-	// most events don't have faction xp but almost everything should give it
-	int factionXp = ScoreEvent_GetXPValueFaction( event )
-	if ( xpValue > factionXp )
-		factionXp = xpValue
-	else if ( xpValue < factionXp )
-		xpValue = factionXp
+	if ( titanXp != 0 )
+		AddTitanXP( player, titanXp )
 
 	if ( factionXp != 0 )
 		AddFactionXP( player, factionXp )
 
-	if ( xpValue == 0 )
-		return
-
 	// global xp
+	if ( xpValue != 0 )
+		AddXP( player, xpValue )
+}
+
+void function AddXP( entity player, int amount )
+{
 	int oldXp = player.GetPersistentVarAsInt( "xp" )
-	if(oldXp<0) oldXp = 0
+	if( oldXp < 0 ) oldXp = 0
 	int oldLevel = GetLevelForXP( oldXp )
-	player.SetPersistentVar( "xp", min( oldXp + xpValue, PlayerGetMaxXPPerGen() ) )
+	player.SetPersistentVar( "xp", min( oldXp + amount, PlayerGetMaxXPPerGen() ) )
 	player.XPChanged() // network xp change to client, gen can't change here
 
 	int newXp = player.GetPersistentVarAsInt( "xp" )
 	int newLevel = GetLevelForXP( newXp )
 	if ( newLevel != oldLevel )
 		Remote_CallFunction_NonReplay( player, "ServerCallback_PlayerLeveledUp", player.GetPersistentVarAsInt( "gen" ), newLevel )
-}
\ No newline at end of file
+}