Fix Some Custom Attributes

Batfoxkid · Jan 25, 2025 · fd21622 · fd21622
1 parent 78ae6c0
commit fd21622
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/addons/sourcemod/configs/freak_fortress_2/non-default/graymann.cfg b/addons/sourcemod/configs/freak_fortress_2/non-default/graymann.cfg
@@ -2740,7 +2740,6 @@
 		"models/freak_fortress_2/graymann/graymann"	"mdl"
 		"materials/freak_fortress_2/graymann/graymann_lifepack"	"mat"
 		"materials/freak_fortress_2/graymann/hands"	"mat"
-		"materials/freak_fortress_2/graymann/intro"	"mat"
 		"materials/freak_fortress_2/graymann/eyeball_l.vmt"	""
 		"materials/freak_fortress_2/graymann/eyeball_r.vmt"	""
 		"materials/freak_fortress_2/graymann/graymann.vmt"	""

diff --git a/addons/sourcemod/scripting/freak_fortress_2/customattrib.sp b/addons/sourcemod/scripting/freak_fortress_2/customattrib.sp
@@ -712,7 +712,7 @@ void CustomAttrib_OnHitBossPre(int attacker, int victim, float &damage, int &dam
 
 void CustomAttrib_OnHitBossPost(int attacker, int newPlayerDamage, int lastPlayerDamage)
 {
-	float value = CustomAttrib_FindOnPlayer(attacker, "primary ammo from damage", true);
+	float value = CustomAttrib_FindOnPlayer(attacker, "primary ammo from damage");
 	if(value)
 	{
 		int ammo = DamageGoal(RoundFloat(value), newPlayerDamage, lastPlayerDamage);
@@ -729,7 +729,7 @@ void CustomAttrib_OnHitBossPost(int attacker, int newPlayerDamage, int lastPlaye
 		}
 	}
 
-	value = CustomAttrib_FindOnPlayer(attacker, "secondary ammo from damage", true);
+	value = CustomAttrib_FindOnPlayer(attacker, "secondary ammo from damage");
 	if(value)
 	{
 		int ammo = DamageGoal(RoundFloat(value), newPlayerDamage, lastPlayerDamage);
@@ -909,7 +909,7 @@ static void ApplyRage(int victim, int attacker, float amount)
 			Client(victim).SetCharge(0, rage);
 
 			rage = amount / 100.0 * Client(victim).RageDamage;
-			Client(attacker).Assist += GetClientTeam(victim) == GetClientTeam(attacker) ? rage : -rage;
+			Client(attacker).Assist += RoundFloat(GetClientTeam(victim) == GetClientTeam(attacker) ? rage : -rage);
 		}
 	}
 }