fix some problem

fantasylidong · May 4, 2024 · 692cbf2 · 692cbf2
1 parent 718376c
commit 692cbf2
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 3 deletions.
diff --git a/addons/sourcemod/plugins/extend/join.smx b/addons/sourcemod/plugins/extend/join.smx
diff --git a/addons/sourcemod/plugins/extend/rygive.smx b/addons/sourcemod/plugins/extend/rygive.smx
diff --git a/addons/sourcemod/plugins/optional/AnneHappy/infected_control.smx b/addons/sourcemod/plugins/optional/AnneHappy/infected_control.smx
diff --git a/addons/sourcemod/scripting/AnneHappy/infected_control.sp b/addons/sourcemod/scripting/AnneHappy/infected_control.sp
@@ -257,6 +257,7 @@ public void OnPluginStart()
     g_hEnableSIoption.AddChangeHook(ConVarChanged_Cvars);
     g_hAllChargerMode.AddChangeHook(ConVarChanged_Cvars);
     g_hAllHunterMode.AddChangeHook(ConVarChanged_Cvars);
+    g_hAntiBaitMode.AddChangeHook(ConVarChanged_Cvars);
     g_hAutoSpawnTimeControl.AddChangeHook(ConVarChanged_Cvars);
     g_hAddDamageToSmoker.AddChangeHook(ConVarChanged_Cvars);
     g_hSiLimit.AddChangeHook(MaxPlayerZombiesChanged_Cvars);

diff --git a/addons/sourcemod/scripting/AnneHappy/join.sp b/addons/sourcemod/scripting/AnneHappy/join.sp
@@ -327,7 +327,7 @@ public void OnClientPutInServer(int client)
 	}
 
 	if(g_bGroupSystemAvailable){
-		if(!Veterans_Get(client, view_as<TARGET_OPTION_INDEX>(GOURP_MEMBER))){
+		if(!Veterans_Get(client, view_as<TARGET_OPTION_INDEX>(GOURP_MEMBER)) || !(CheckCommandAccess(client, "", ADMFLAG_SLAY))){
 			ShowMotdToPlayer(client);
 		}
 	}else{

diff --git a/addons/sourcemod/scripting/extend/rygive.sp b/addons/sourcemod/scripting/extend/rygive.sp
@@ -1812,10 +1812,20 @@ int SwitchPlayerTeam_MenuHandler(Menu menu, MenuAction action, int client, int p
 						}
 
 						case 2:
-							ChangeTeamToSurvivor(target, team);
+							{
+								if(IsSuivivorTeamFull())
+									PrintToChat(client, "生还已满");
+								else
+									ChangeTeamToSurvivor(target, team);
+							}
 
 						case 3:
-							ChangeClientTeam(target, targetTeam);
+							{
+								if(IsInfectTeamFull())
+									PrintToChat(client, "感染者已满");
+								else
+									ChangeClientTeam(target, targetTeam);
+							}
 					}
 				}
 				else
@@ -1839,6 +1849,39 @@ int SwitchPlayerTeam_MenuHandler(Menu menu, MenuAction action, int client, int p
 	return 0;
 }
 
+//判断生还是否已经满人
+stock bool IsSuivivorTeamFull() 
+{
+	for (int i = 1; i <= MaxClients; i++)
+	{
+		if (IsClientInGame(i) && GetClientTeam(i) == 2 && IsPlayerAlive(i) && IsFakeClient(i))
+		{
+			return false;
+		}
+	}
+	return true;
+}
+
+//判断特感是否已经满人
+stock bool IsInfectTeamFull() 
+{
+	int count = 0;
+	for (int i = 1; i <= MaxClients; i++)
+	{
+		if (IsClientInGame(i) && GetClientTeam(i) == 3)
+		{
+			count ++;
+		}
+	}
+	if(count >= FindConVar("z_max_player_zombies").IntValue){
+		return true;
+	}		
+	else
+	{
+		return false;
+	}
+}
+
 void ChangeTeamToSurvivor(int client, int team) {
 	if (GetEntProp(client, Prop_Send, "m_isGhost"))
 		SetEntProp(client, Prop_Send, "m_isGhost", 0);