diff --git a/addons/sourcemod/configs/annehappy.txt b/addons/sourcemod/configs/annehappy.txt index 813966fa7..09e837504 100644 --- a/addons/sourcemod/configs/annehappy.txt +++ b/addons/sourcemod/configs/annehappy.txt @@ -17,6 +17,10 @@ { "message" "最新版本" } + "exec vote/Anne/Anne23-1.cfg" + { + "message" "23-1月版本" + } "exec vote/Anne/Anne22-12.cfg" { "message" "22-12月版本" diff --git a/addons/sourcemod/configs/annehappy_hardcore.txt b/addons/sourcemod/configs/annehappy_hardcore.txt index 87ca7dd20..b246f72f2 100644 --- a/addons/sourcemod/configs/annehappy_hardcore.txt +++ b/addons/sourcemod/configs/annehappy_hardcore.txt @@ -11,6 +11,17 @@ "message" "服务器端重启" } } + "Anne版本选择" + { + "sm_fm AnneHappy" + { + "message" "最新版本" + } + "exec vote/Anne/Anne23-1.cfg" + { + "message" "23-1月版本" + } + } "特感数量" { "exec vote/normal/AnneHappy1.cfg" diff --git a/addons/sourcemod/configs/multiplayermode.txt b/addons/sourcemod/configs/multiplayermode.txt index d62bbebfb..bc389a5e1 100644 --- a/addons/sourcemod/configs/multiplayermode.txt +++ b/addons/sourcemod/configs/multiplayermode.txt @@ -11,6 +11,17 @@ "message" "服务器端重启" } } + "Anne版本选择" + { + "sm_fm AnneHappy" + { + "message" "最新版本" + } + "exec vote/Anne/Anne23-1.cfg" + { + "message" "23-1月版本" + } + } "多人运动" { "exec sourcemod/duoren_off.cfg" diff --git a/addons/sourcemod/plugins/optional/AnneHappy/infected_control.smx b/addons/sourcemod/plugins/optional/AnneHappy/infected_control.smx index 3f8343864..a6bfc976d 100644 Binary files a/addons/sourcemod/plugins/optional/AnneHappy/infected_control.smx and b/addons/sourcemod/plugins/optional/AnneHappy/infected_control.smx differ diff --git a/addons/sourcemod/plugins/optional/AnneHappy/infected_control23-1.smx b/addons/sourcemod/plugins/optional/AnneHappy/infected_control23-1.smx new file mode 100644 index 000000000..eff5533c3 Binary files /dev/null and b/addons/sourcemod/plugins/optional/AnneHappy/infected_control23-1.smx differ diff --git a/addons/sourcemod/scripting/AnneHappy/infected_control.sp b/addons/sourcemod/scripting/AnneHappy/infected_control.sp index bce9f4bbc..9b4ccabf8 100644 --- a/addons/sourcemod/scripting/AnneHappy/infected_control.sp +++ b/addons/sourcemod/scripting/AnneHappy/infected_control.sp @@ -219,7 +219,7 @@ public void OnPluginStart() g_hEnableSIoption = CreateConVar("inf_EnableSIoption", "63", "启用生成的特感类型，1 smoker 2 boomer 4 hunter 8 spitter 16 jockey 32 charger,把你想要生成的特感值加起来", CVAR_FLAG, true, 0.0, true, 63.0); g_hAllChargerMode = CreateConVar("inf_AllChargerMode", "0", "是否是全牛模式", CVAR_FLAG, true, 0.0, true, 1.0); g_hAllHunterMode = CreateConVar("inf_AllHunterMode", "0", "是否是全猎人模式", CVAR_FLAG, true, 0.0, true, 1.0); - g_hAntiBaitMode = CreateConVar("inf_AntiBaitMode", "1", "是否开启诱饵模式", CVAR_FLAG, true, 0.0, true, 1.0); + g_hAntiBaitMode = CreateConVar("inf_AntiBaitMode", "0", "是否开启诱饵模式", CVAR_FLAG, true, 0.0, true, 1.0); g_hBaitFlow = CreateConVar("inf_BaitFlow", "3.0", "一个刷特回合推进进度如果小于这个数值会被判定为消极定点对抗(无tank)情况，可设置值为(1-10)", CVAR_FLAG, true, 0.0, true, 10.0); //g_hSIAttackIntent = CreateConVar("inf_SIAttackIntent", "0.48", "如果生还者紧张度低于这个值，没有特殊情况下会提前刷新特感", CVAR_FLAG, true, 0.0, true, 10.0); g_hAutoSpawnTimeControl = CreateConVar("inf_EnableAutoSpawnTime", "1", "是否开启自动设置增加时间", CVAR_FLAG, true, 0.0, true, 1.0); @@ -1127,10 +1127,10 @@ Action CheckShouldSpawnOrNot(Handle timer) } else SpawnCommonInfect(20); - UnPauseTimer(g_fSiInterval / 2); + UnPauseTimer(RoundToFloor(g_fSiInterval / 3) + 2.0); g_iLadderBaitTimeCheckTime = -1; #if TESTBUG - Debug_Print("靠近梯子Bait检测，刷尸潮,%d秒后刷特", RoundToFloor(g_fSiInterval / 2)); + Debug_Print("靠近梯子Bait检测，刷尸潮,%d秒后刷特", RoundToFloor((g_fSiInterval / 3) + 2)); #endif } } @@ -1141,16 +1141,16 @@ Action CheckShouldSpawnOrNot(Handle timer) #if TESTBUG Debug_Print("停刷，但是开始偷偷刷小僵尸,当前是第%d次检测", g_iBaitTimeCheckTime); #endif - if(g_iBaitTimeCheckTime < RoundToFloor(g_fSiInterval / 3) + 2) + if(g_iBaitTimeCheckTime < RoundToFloor(g_fSiInterval / 2) + 2) { if(g_hSpawnProcess != INVALID_HANDLE) PauseTimer(); - SpawnCommonInfect(3); + SpawnCommonInfect(2); } else { - UnPauseTimer(g_fSiInterval / 2); - SpawnCommonInfect(20); + UnPauseTimer((g_fSiInterval / 3) + 2.0); + SpawnCommonInfect(10); #if TESTBUG Debug_Print("停刷，停刷超过%ds, 偷刷10个小僵尸，继续刷特", g_iBaitTimeCheckTime); #endif @@ -1158,10 +1158,10 @@ Action CheckShouldSpawnOrNot(Handle timer) } } } - //超过设定射箭3/2，强制4秒后刷特 + //超过设定射箭1.8倍，强制2秒后刷特 if(g_iLastSpawnTime >= RoundToFloor(g_fSiInterval * 1.8) && g_hSpawnProcess == INVALID_HANDLE) { - UnPauseTimer(4.0); + UnPauseTimer(2.0); } // 如果有停刷值大于0，而且刷特进程等于无效句柄，就继续检测，停刷 if((g_iBaitTimeCheckTime > 0 || g_iLadderBaitTimeCheckTime > 0 ) && g_hSpawnProcess == INVALID_HANDLE)return Plugin_Continue; diff --git a/cfg/cfgogl/allcharger/confogl_plugins.cfg b/cfg/cfgogl/allcharger/confogl_plugins.cfg index 8299281cc..2f02bdb51 100644 --- a/cfg/cfgogl/allcharger/confogl_plugins.cfg +++ b/cfg/cfgogl/allcharger/confogl_plugins.cfg @@ -69,7 +69,7 @@ sm_cvar z_mob_spawn_max_size 15 exec vote/normal/AnneHappy6.cfg exec vote/duoren/duoren4.cfg sm_cvar ai_Tank_Bhop 1 -sm_cvar AnnePluginVersion 2023-01 +sm_cvar AnnePluginVersion 2024-05 sm_cvar inf_EnableAutoSpawnTime 1 //是否开启自动设置增加时间 sm_cvar versus_round_restarttimer 2 sm_cvar versus_round_restarttimer_finale 2 diff --git a/cfg/cfgogl/allcharger/shared_settings.cfg b/cfg/cfgogl/allcharger/shared_settings.cfg index 4d568ca30..9af3b3205 100644 --- a/cfg/cfgogl/allcharger/shared_settings.cfg +++ b/cfg/cfgogl/allcharger/shared_settings.cfg @@ -27,6 +27,7 @@ confogl_addcvar inf_IgnoreIncappedSurvivorSight 1 //关闭高特或者多人运 confogl_addcvar inf_AddDamageToSmoker 0 confogl_addcvar inf_TeleportDistance 600.0 //confogl_addcvar l4d_infected_limit 6 +confogl_addcvar inf_AntiBaitMode 1 //[l4d2_ai_damagefix.smx] confogl_addcvar sm_aidmgfix_enable 3 diff --git a/cfg/cfgogl/alone/confogl_plugins.cfg b/cfg/cfgogl/alone/confogl_plugins.cfg index 3150242d0..5dd20b828 100644 --- a/cfg/cfgogl/alone/confogl_plugins.cfg +++ b/cfg/cfgogl/alone/confogl_plugins.cfg @@ -74,7 +74,7 @@ exec vote/normal/AnneHappy4.cfg exec vote/Anneduoren/duoren1.cfg sm_cvar inf_SpawnDistanceMin 600 sm_cvar ai_Tank_Bhop 0 -sm_cvar AnnePluginVersion 2023-01 +sm_cvar AnnePluginVersion 2024-05 sm_cvar inf_EnableAutoSpawnTime 1 //是否开启自动设置增加时间 sm_cvar versus_round_restarttimer 2 sm_cvar versus_round_restarttimer_finale 2 diff --git a/cfg/cfgogl/alone/shared_settings.cfg b/cfg/cfgogl/alone/shared_settings.cfg index b3168c21a..9395e98e3 100644 --- a/cfg/cfgogl/alone/shared_settings.cfg +++ b/cfg/cfgogl/alone/shared_settings.cfg @@ -28,6 +28,7 @@ confogl_addcvar inf_IgnoreIncappedSurvivorSight 1 //关闭高特或者多人运 confogl_addcvar inf_AddDamageToSmoker 1 confogl_addcvar inf_TeleportDistance 600.0 //confogl_addcvar l4d_infected_limit 6 +confogl_addcvar inf_AntiBaitMode 0 //[l4d2_ai_damagefix.smx] confogl_addcvar sm_aidmgfix_enable 3 diff --git a/cfg/cfgogl/annehappy/confogl_plugins.cfg b/cfg/cfgogl/annehappy/confogl_plugins.cfg index 8ecee7126..62168e4d9 100644 --- a/cfg/cfgogl/annehappy/confogl_plugins.cfg +++ b/cfg/cfgogl/annehappy/confogl_plugins.cfg @@ -73,7 +73,7 @@ sm_cvar z_mob_spawn_max_size 15 exec vote/normal/AnneHappy6.cfg exec vote/Anneduoren/duoren4.cfg sm_cvar ai_Tank_Bhop 1 -sm_cvar AnnePluginVersion 2023-01 +sm_cvar AnnePluginVersion 2024-05 sm_cvar inf_EnableAutoSpawnTime 1 //是否开启自动设置增加时间 sm_cvar versus_round_restarttimer 2 sm_cvar versus_round_restarttimer_finale 2 diff --git a/cfg/cfgogl/annehappy/shared_settings.cfg b/cfg/cfgogl/annehappy/shared_settings.cfg index 5a5f1550b..f332f6778 100644 --- a/cfg/cfgogl/annehappy/shared_settings.cfg +++ b/cfg/cfgogl/annehappy/shared_settings.cfg @@ -27,6 +27,7 @@ confogl_addcvar inf_IgnoreIncappedSurvivorSight 1 //关闭高特或者多人运 confogl_addcvar inf_AddDamageToSmoker 0 confogl_addcvar inf_TeleportDistance 600.0 //confogl_addcvar l4d_infected_limit 6 +confogl_addcvar inf_AntiBaitMode 1 //[l4d2_ai_damagefix.smx] confogl_addcvar sm_aidmgfix_enable 3 diff --git a/cfg/cfgogl/annehappy_hardcore/confogl_plugins.cfg b/cfg/cfgogl/annehappy_hardcore/confogl_plugins.cfg index 23cb41a09..3e7ce6b81 100644 --- a/cfg/cfgogl/annehappy_hardcore/confogl_plugins.cfg +++ b/cfg/cfgogl/annehappy_hardcore/confogl_plugins.cfg @@ -79,7 +79,7 @@ sm_cvar z_mob_spawn_max_size 15 exec vote/hardcore/AnneHappy6.cfg exec vote/Anneduoren/duoren4.cfg sm_cvar ai_Tank_Bhop 1 -sm_cvar AnnePluginVersion 2023-01 +sm_cvar AnnePluginVersion 2024-05 sm_cvar inf_EnableAutoSpawnTime 1 //是否开启自动设置增加时间 sm_cvar versus_round_restarttimer 2 sm_cvar versus_round_restarttimer_finale 2 diff --git a/cfg/cfgogl/annehappy_hardcore/shared_settings.cfg b/cfg/cfgogl/annehappy_hardcore/shared_settings.cfg index 14f50afb2..d151e7295 100644 --- a/cfg/cfgogl/annehappy_hardcore/shared_settings.cfg +++ b/cfg/cfgogl/annehappy_hardcore/shared_settings.cfg @@ -27,6 +27,7 @@ confogl_addcvar inf_IgnoreIncappedSurvivorSight 1 //关闭高特或者多人运 confogl_addcvar inf_AddDamageToSmoker 0 confogl_addcvar inf_TeleportDistance 600.0 //confogl_addcvar l4d_infected_limit 6 +confogl_addcvar inf_AntiBaitMode 1 //[l4d2_ai_damagefix.smx] confogl_addcvar sm_aidmgfix_enable 3 diff --git a/cfg/cfgogl/hunters/confogl_plugins.cfg b/cfg/cfgogl/hunters/confogl_plugins.cfg index ff64f0922..c376d0c57 100644 --- a/cfg/cfgogl/hunters/confogl_plugins.cfg +++ b/cfg/cfgogl/hunters/confogl_plugins.cfg @@ -60,7 +60,7 @@ exec vote/shove/Zonemod.cfg sm_cvar versus_special_respawn_interval 16 exec vote/normal/AnneHappy2.cfg sm_cvar inf_SpawnDistanceMin 600 -sm_cvar AnnePluginVersion 2023-01 +sm_cvar AnnePluginVersion 2024-05 sm_cvar inf_EnableAutoSpawnTime 1 //是否开启自动设置增加时间 sm_cvar versus_round_restarttimer 2 sm_cvar versus_round_restarttimer_finale 2 diff --git a/cfg/cfgogl/hunters/shared_settings.cfg b/cfg/cfgogl/hunters/shared_settings.cfg index d5cb58063..f0b254d0d 100644 --- a/cfg/cfgogl/hunters/shared_settings.cfg +++ b/cfg/cfgogl/hunters/shared_settings.cfg @@ -28,6 +28,7 @@ confogl_addcvar inf_IgnoreIncappedSurvivorSight 1 //关闭高特或者多人运 confogl_addcvar inf_AddDamageToSmoker 0 confogl_addcvar inf_TeleportDistance 600.0 //confogl_addcvar l4d_infected_limit 6 +confogl_addcvar inf_AntiBaitMode 0 //[l4d2_hunter_patch.smx] //confogl_addcvar l4d2_hunter_patch_convert_leap 1 diff --git a/cfg/cfgogl/witchparty/confogl_plugins.cfg b/cfg/cfgogl/witchparty/confogl_plugins.cfg index beed192a5..73ea565ab 100644 --- a/cfg/cfgogl/witchparty/confogl_plugins.cfg +++ b/cfg/cfgogl/witchparty/confogl_plugins.cfg @@ -65,7 +65,7 @@ sm_cvar z_mob_spawn_max_size 15 exec vote/normal/AnneHappy6.cfg exec vote/duoren/duoren4.cfg sm_cvar ai_Tank_Bhop 1 -sm_cvar AnnePluginVersion 2023-01 +sm_cvar AnnePluginVersion 2024-05 sm_cvar inf_EnableAutoSpawnTime 1 //是否开启自动设置增加时间 sm_cvar versus_round_restarttimer 2 sm_cvar versus_round_restarttimer_finale 2 diff --git a/cfg/cfgogl/witchparty/shared_settings.cfg b/cfg/cfgogl/witchparty/shared_settings.cfg index d06927e45..398404c9d 100644 --- a/cfg/cfgogl/witchparty/shared_settings.cfg +++ b/cfg/cfgogl/witchparty/shared_settings.cfg @@ -27,7 +27,7 @@ confogl_addcvar inf_IgnoreIncappedSurvivorSight 1 //关闭高特或者多人运 confogl_addcvar inf_AddDamageToSmoker 0 confogl_addcvar inf_TeleportDistance 600.0 //confogl_addcvar l4d_infected_limit 6 - +confogl_addcvar inf_AntiBaitMode 1 //[ai_tank_2.smx] diff --git a/cfg/vote/Anne/Anne23-1.cfg b/cfg/vote/Anne/Anne23-1.cfg new file mode 100644 index 000000000..51f56c773 --- /dev/null +++ b/cfg/vote/Anne/Anne23-1.cfg @@ -0,0 +1,13 @@ +exec vote/Anne/unloadall.cfg +sm plugins load optional/AnneHappy/infected_control23-1.smx +sm_cvar AnnePluginVersion 2023-01 +sm plugins load optional/AnneHappy/ai_smoker_new.smx +sm plugins load optional/AnneHappy/ai_hunter_new.smx +sm plugins load optional/AnneHappy/ai_jockey_new.smx +sm plugins load optional/AnneHappy/ai_spitter_new.smx +sm plugins load optional/AnneHappy/ai_charger_2.smx +sm plugins load optional/AnneHappy/ai_boomer_new.smx +sm plugins load optional/AnneHappy/AI_HardSI_2.smx +sm plugins load optional/AnneHappy/ai_tank_2.smx +sm plugins load_lock +sm_restartmap \ No newline at end of file diff --git a/cfg/vote/Anne/unloadall.cfg b/cfg/vote/Anne/unloadall.cfg index c4483c6d0..10d191282 100644 --- a/cfg/vote/Anne/unloadall.cfg +++ b/cfg/vote/Anne/unloadall.cfg @@ -9,6 +9,7 @@ sm plugins unload optional/AnneHappy/infected_control22-9.smx sm plugins unload optional/AnneHappy/infected_control22-10.smx sm plugins unload optional/AnneHappy/infected_control22-11.smx sm plugins unload optional/AnneHappy/infected_control22-12.smx +sm plugins unload optional/AnneHappy/infected_control23-1.smx sm plugins unload optional/AnneHappy/ai_charger_boomer.smx sm plugins unload optional/AnneHappy/l4d2_asiai.smx sm plugins unload optional/AnneHappy/l4d2_tank_throw.smx