Add support for FD branch

Dinorush · Apr 6, 2023 · d339153 · d339153
1 parent 15a6c35
commit d339153
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 5 deletions.
diff --git a/mod.json b/mod.json
@@ -3,7 +3,7 @@
 	"Description": "Implements the Brute4 titan based on cut content.\nCredits: GalacticMoblin & Hurb - Custom UI Elements",
 	"LoadPriority": 1,
 	"RequiredOnClient": true,
-	"Version": "1.8.3",
+	"Version": "1.8.4",
 
 	"ConVars": [
 		{

diff --git a/mod/scripts/vscripts/TitanFrameworkInitBrute.nut b/mod/scripts/vscripts/TitanFrameworkInitBrute.nut
@@ -97,6 +97,55 @@ void function Brute4_UIInit()
 		ExplosiveReserves.customIcon = true
 		Brute.passive2Array.append(ExplosiveReserves)
 
+		ModdedPassiveData AgileFrame
+		AgileFrame.Name = "#FD_UPGRADE_BRUTE4_UTILITY_TIER_1"
+		AgileFrame.description = "#FD_UPGRADE_BRUTE4_UTILITY_TIER_1_DESC"
+		AgileFrame.image = $"ui/temp"
+		AgileFrame.customIcon = false
+		Brute.passiveFDArray.append(AgileFrame)
+
+		ModdedPassiveData Chassis
+		Chassis.Name = "#FD_UPGRADE_BRUTE4_DEFENSE_TIER_1"
+		Chassis.description = "#FD_UPGRADE_BRUTE4_DEFENSE_TIER_1_DESC"
+		Chassis.image = $"rui/menu/fd_menu/upgrade_northstar_chassis"
+		Chassis.customIcon = false
+		Brute.passiveFDArray.append(Chassis)
+
+		ModdedPassiveData RocketStream
+		RocketStream.Name = "#FD_UPGRADE_BRUTE4_WEAPON_TIER_1"
+		RocketStream.description = "#FD_UPGRADE_BRUTE4_WEAPON_TIER_1_DESC"
+		RocketStream.image = $"ui/temp"
+		RocketStream.customIcon = false
+		Brute.passiveFDArray.append(RocketStream)
+
+		ModdedPassiveData Gliders
+		Gliders.Name = "#FD_UPGRADE_BRUTE4_UTILITY_TIER_2"
+		Gliders.description = "#FD_UPGRADE_BRUTE4_UTILITY_TIER_2_DESC"
+		Gliders.image = $"ui/temp"
+		Gliders.customIcon = false
+		Brute.passiveFDArray.append(Gliders)
+
+		ModdedPassiveData Shields
+		Shields.Name = "#FD_UPGRADE_BRUTE4_DEFENSE_TIER_2"
+		Shields.description = "#FD_UPGRADE_BRUTE4_DEFENSE_TIER_2_DESC"
+		Shields.image = $"rui/menu/fd_menu/upgrade_northstar_shield"
+		Shields.customIcon = false
+		Brute.passiveFDArray.append(Shields)
+
+		ModdedPassiveData GrenadeSwarm
+		GrenadeSwarm.Name = "#FD_UPGRADE_BRUTE4_WEAPON_TIER_2"
+		GrenadeSwarm.description = "#FD_UPGRADE_BRUTE4_WEAPON_TIER_2_DESC"
+		GrenadeSwarm.image = $"ui/temp"
+		GrenadeSwarm.customIcon = false
+		Brute.passiveFDArray.append(GrenadeSwarm)
+
+		ModdedPassiveData Pyrotechnics
+		Pyrotechnics.Name = "#FD_UPGRADE_BRUTE4_ULTIMATE"
+		Pyrotechnics.description = "#FD_UPGRADE_BRUTE4_ULTIMATE_DESC"
+		Pyrotechnics.image = $"ui/temp"
+		Pyrotechnics.customIcon = false
+		Brute.passiveFDArray.append(Pyrotechnics)
+
 		CreateModdedTitanSimple(Brute)
 	#endif
 }
diff --git a/mod/scripts/vscripts/sh_brute4util.nut b/mod/scripts/vscripts/sh_brute4util.nut
@@ -65,24 +65,23 @@ void function Brute4_HandlePassives( entity titan, TitanLoadoutDef loadout  )
 	if ( GetCurrentPlaylistVarInt( "aegis_upgrades", 0 ) == 1 )
 	{
 		entity weapon = titan.GetMainWeapons()[0]
-		// Rank 1: Agile Frame - Allow sprinting
+		// Rank 1: Agile Frame - allow sprinting
 		weapon.AddMod( "agile_frame" )
 		titan.GetOffhandWeapon( OFFHAND_EQUIPMENT ).AddMod( "agile_frame" )
 		titan.GetOffhandWeapon( OFFHAND_SPECIAL ).AddMod( "agile_frame" )
 
 		// Rank 2: Health
 		loadout.setFileMods.append( "fd_health_upgrade" )
 
-		// Rank 3: Rocket Stream - + Fire rate and ammo
+		// Rank 3: Rocket Stream - more fire rate and ammo
 		weapon.AddMod( "rocket_stream" )
 		weapon.SetWeaponPrimaryClipCount( weapon.GetWeaponPrimaryClipCountMax() )
 
 		// Rank 4: Gliders - faster barrage core rockets + less drop
 		titan.GetOffhandWeapon( OFFHAND_EQUIPMENT ).AddMod( "gliders" )
 
 		// Rank 5: Shields
-		float shieldHealth = GetTitanSoulShieldHealth( soul )
-		soul.SetShieldHealthMax( int( shieldHealth * 1.5 ) )
+		soul.SetShieldHealthMax( int( GetTitanSoulShieldHealth( soul ) * 1.5 ) )
 
 		// Rank 6: Grenade Swarm - more grenades fired
 		titan.GetOffhandWeapon( OFFHAND_RIGHT ).AddMod( "grenade_swarm" )