WIP keep upgrades

OfficerSpy · Dec 6, 2024 · dfc0d19 · dfc0d19
1 parent 8dfbd02
commit dfc0d19
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/source/redbots3/events.sp b/source/redbots3/events.sp
@@ -256,6 +256,11 @@ static Action Timer_WaveFailure(Handle timer)
 	if (GameRules_GetRoundState() != RoundState_BetweenRounds)
 		return Plugin_Stop;
 
+	//Don't refund if we wanna keep them
+	//TODO: how we gonna do this for custom loadouts?
+	if (redbots_manager_keep_bot_upgrades.BoolValue)
+		return Plugin_Stop;
+
 	for (int i = 1; i <= MaxClients; i++)
 	{
 		if (IsClientInGame(i) && g_bIsDefenderBot[i])

diff --git a/source/redbots3/nextbot_actions.sp b/source/redbots3/nextbot_actions.sp
@@ -5249,9 +5249,6 @@ void UtilizeCompressionBlast(int client, INextBot bot, const CKnownEntity threat
 	if (redbots_manager_bot_reflect_skill.IntValue < 1)
 		return;
 
-	if (redbots_manager_bot_reflect_chance.FloatValue < 100.0 && TransientlyConsistentRandomValue(client, 1.0) > redbots_manager_bot_reflect_chance.FloatValue / 100.0)
-		return;
-
 	int iThreat = threat.GetEntity();
 
 	if (BaseEntity_IsPlayer(iThreat))
@@ -5290,6 +5287,9 @@ void UtilizeCompressionBlast(int client, INextBot bot, const CKnownEntity threat
 	if (redbots_manager_bot_reflect_skill.IntValue < 2)
 		return;
 
+	if (redbots_manager_bot_reflect_chance.FloatValue < 100.0 && TransientlyConsistentRandomValue(client, 1.0) > redbots_manager_bot_reflect_chance.FloatValue / 100.0)
+		return;
+
 	//Enhanced projectile airblast
 	int myTeam = GetClientTeam(client);
 	float myEyePos[3]; GetClientEyePosition(client, myEyePos);

diff --git a/source/tf2_defenderbots.sp b/source/tf2_defenderbots.sp
@@ -97,6 +97,7 @@ ConVar redbots_manager_kick_bots;
 ConVar redbots_manager_min_players;
 ConVar redbots_manager_defender_team_size;
 ConVar redbots_manager_ready_cooldown;
+ConVar redbots_manager_keep_bot_upgrades;
 ConVar redbots_manager_bot_upgrade_interval;
 ConVar redbots_manager_bot_use_upgrades;
 ConVar redbots_manager_bot_buyback_chance;
@@ -145,7 +146,7 @@ public Plugin myinfo =
 	name = "[TF2] TFBots (MVM) with Manager",
 	author = "Officer Spy",
 	description = "Bot Management",
-	version = "1.4.4",
+	version = "1.4.5",
 	url = "https://github.com/OfficerSpy/TF2-MvM-Defender-TFBots"
 };
 
@@ -166,13 +167,14 @@ public void OnPluginStart()
 	redbots_manager_min_players = CreateConVar("sm_redbots_manager_min_players", "3", "Minimum players for normal missions. Other difficulties are adjusted based on this value. Set to -1 to disable entirely.", FCVAR_NOTIFY, true, -1.0, true, float(MAXPLAYERS));
 	redbots_manager_defender_team_size = CreateConVar("sm_redbots_manager_defender_team_size", "6", _, FCVAR_NOTIFY);
 	redbots_manager_ready_cooldown = CreateConVar("sm_redbots_manager_ready_cooldown", "30.0", _, FCVAR_NOTIFY, true, 0.0);
+	redbots_manager_keep_bot_upgrades = CreateConVar("sm_redbots_manager_keep_bot_upgrades", "0", _, FCVAR_NOTIFY);
 	redbots_manager_bot_upgrade_interval = CreateConVar("sm_redbots_manager_bot_upgrade_interval", "-1", _, FCVAR_NOTIFY);
 	redbots_manager_bot_use_upgrades = CreateConVar("sm_redbots_manager_bot_use_upgrades", "1", "Enable bots to buy upgrades.", FCVAR_NOTIFY);
 	redbots_manager_bot_buyback_chance = CreateConVar("sm_redbots_manager_bot_buyback_chance", "5", "Chance for bots to buyback into the game.", FCVAR_NOTIFY);
 	redbots_manager_bot_buy_upgrades_chance = CreateConVar("sm_redbots_manager_bot_buy_upgrades_chance", "50", "Chance for bots to buy upgrades in the middle of a game.", FCVAR_NOTIFY);
 	redbots_manager_bot_max_tank_attackers = CreateConVar("sm_redbots_manager_bot_max_tank_attackers", "3", _, FCVAR_NOTIFY);
-	redbots_manager_bot_aim_skill = CreateConVar("sm_redbots_manager_bot_aim_skill", "2", _, FCVAR_NOTIFY);
-	redbots_manager_bot_reflect_skill = CreateConVar("sm_redbots_manager_bot_reflect_skill", "2", _, FCVAR_NOTIFY);
+	redbots_manager_bot_aim_skill = CreateConVar("sm_redbots_manager_bot_aim_skill", "0", _, FCVAR_NOTIFY);
+	redbots_manager_bot_reflect_skill = CreateConVar("sm_redbots_manager_bot_reflect_skill", "1", _, FCVAR_NOTIFY);
 	redbots_manager_bot_reflect_chance = CreateConVar("redbots_manager_bot_reflect_chance", "100.0", _, FCVAR_NOTIFY);
 	redbots_manager_bot_hear_spy_range = CreateConVar("sm_redbots_manager_bot_hear_spy_range", "3000.0", _, FCVAR_NOTIFY);
 	redbots_manager_extra_bots = CreateConVar("sm_redbots_manager_extra_bots", "1", "How many more bots we are allowed to request beyond the team size", FCVAR_NOTIFY);