Some fixes for item usage

Mikusch · Feb 27, 2025 · c91ef85 · c91ef85
1 parent d365113
commit c91ef85
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/addons/sourcemod/scripting/mitm/behavior/scenario/capture_the_flag/tf_bot_deliver_flag.sp b/addons/sourcemod/scripting/mitm/behavior/scenario/capture_the_flag/tf_bot_deliver_flag.sp
@@ -163,6 +163,16 @@ static int Update(CTFBotDeliverFlag action, int actor, float interval)
 		return action.Done("I'm no longer carrying the flag");
 	}
 
+	if (IsMannVsMachineMode())
+	{
+		// let the bomb carrier use it's buff banners/etc
+		NextBotAction result = CTFPlayer(actor).OpportunisticallyUseWeaponAbilities();
+		if (result)
+		{
+			return action.SuspendFor(result, "Opportunistically using buff item");
+		}
+	}
+
 	if (UpgradeOverTime(action, actor) && mitm_bot_taunt_on_upgrade.BoolValue)
 	{
 		return action.SuspendFor(CTFBotTaunt(), "Taunting for our new upgrade");

diff --git a/addons/sourcemod/scripting/mitm/behavior/tf_bot_use_item.sp b/addons/sourcemod/scripting/mitm/behavior/tf_bot_use_item.sp
@@ -94,9 +94,12 @@ static int Update(CTFBotUseItem action, CTFPlayer actor, float interval)
 	{
 		if (action.m_cooldownTimer.IsElapsed())
 		{
-			// use it
-			actor.PressFireButton();
-			action.m_cooldownTimer.Invalidate();
+			if (actor.GetPropFloat(Prop_Data, "m_flNextAttack") <= GetGameTime())
+			{
+				// use it
+				actor.PressFireButton();
+				action.m_cooldownTimer.Invalidate();
+			}
 		}
 	}
 	else // used