Skip to content
This repository has been archived by the owner on Oct 12, 2024. It is now read-only.

Commit

Permalink
撤回到第一个Release
Browse files Browse the repository at this point in the history
  • Loading branch information
TYHH10 authored and TYHH10 committed Jul 10, 2024
1 parent e0c4ad5 commit 2539d32
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 11 deletions.
20 changes: 10 additions & 10 deletions src/mod/attr/custom_attributes.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ namespace Mod::Attr::Custom_Attributes
void FireInputAttribute(const char *input, const char *filter, const variant_t &defValue, CBaseEntity *inflictor, CBaseEntity *activator, CBaseEntity *caller, float delay)
{
if (input != nullptr && (filter == nullptr || caller->NameMatches(filter) || caller->ClassMatches(filter))) {
char input_tokenized[512];
char input_tokenized[2048];
V_strncpy(input_tokenized, input, sizeof(input_tokenized));

char *target = strtok(input_tokenized,"^");
Expand Down Expand Up @@ -7428,8 +7428,8 @@ namespace Mod::Attr::Custom_Attributes
if (players_informed_about_viewmodel[player->entindex()]) return true;

players_informed_about_viewmodel[player->entindex()] = true;
char pathinfo[512];
snprintf(pathinfo, 512, "%si%llu", disallowed_viewmodel_path.c_str(), player->GetSteamID().ConvertToUint64());
char pathinfo[2048];
snprintf(pathinfo, 2048, "%si%llu", disallowed_viewmodel_path.c_str(), player->GetSteamID().ConvertToUint64());
auto file = fopen(pathinfo, "w");
if (file) {
fclose(file);
Expand All @@ -7443,11 +7443,11 @@ namespace Mod::Attr::Custom_Attributes
DETOUR_DECL_MEMBER(void, CServerGameClients_ClientPutInServer, edict_t *edict, const char *playername)
{
DETOUR_MEMBER_CALL(CServerGameClients_ClientPutInServer)(edict, playername);
char path[512];
char path[2048];
auto player = ((CTFPlayer*) edict->GetUnknown());
snprintf(path, 512, "%s%llu", disallowed_viewmodel_path.c_str(), player->GetSteamID().ConvertToUint64());
char pathinfo[512];
snprintf(pathinfo, 512, "%si%llu", disallowed_viewmodel_path.c_str(), player->GetSteamID().ConvertToUint64());
snprintf(path, 2048, "%s%llu", disallowed_viewmodel_path.c_str(), player->GetSteamID().ConvertToUint64());
char pathinfo[2048];
snprintf(pathinfo, 2048, "%si%llu", disallowed_viewmodel_path.c_str(), player->GetSteamID().ConvertToUint64());

cell_t result = access(path, F_OK) != 0;
viewmodels_enabled_forward->PushCell(edict->m_EdictIndex);
Expand All @@ -7462,8 +7462,8 @@ namespace Mod::Attr::Custom_Attributes
auto &disallowed = players_viewmodel_disallowed[player->entindex()];
disallowed = !disallowed;

char path[512];
snprintf(path, 512, "%s%llu", disallowed_viewmodel_path.c_str(), player->GetSteamID().ConvertToUint64());
char path[2048];
snprintf(path, 2048, "%s%llu", disallowed_viewmodel_path.c_str(), player->GetSteamID().ConvertToUint64());
if (disallowed) {
auto file = fopen(path, "w");
if (file) {
Expand Down Expand Up @@ -9929,4 +9929,4 @@ namespace Mod::Attr::Custom_Attributes
s_Mod.Toggle(static_cast<ConVar *>(pConVar)->GetBool());
});

}
}
16 changes: 16 additions & 0 deletions src/mod/mvm/upgrade_disallow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ namespace Mod::MvM::Upgrade_Disallow
const char *upgradename = upgrade->GetUpgradeAttributeName(upgradeslot);

if (!cvar_explode_on_ignite.GetBool() && strcmp(upgradename,"explode_on_ignite") == 0){
<<<<<<< HEAD
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, "该任务禁用了油桶爆炸升级");
return;
}
Expand All @@ -61,6 +62,17 @@ namespace Mod::MvM::Upgrade_Disallow
}
else if (!cvar_burn_time.GetBool() && strcmp(upgradename,"weapon burn time increased") == 0){
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, "后续燃烧时长升级有BUG,请换一个升级");
=======
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, "Explode on ignite is not allowed on this server");
return;
}
else if (!cvar_medigun_shield.GetBool() && strcmp(upgradename,"generate rage on heal") == 0){
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, "Projectile shield is not allowed on this server");
return;
}
else if (!cvar_burn_time.GetBool() && strcmp(upgradename,"weapon burn time increased") == 0){
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, "Burn time bonus upgrade is broken. Buy another upgrade");
>>>>>>> parent of ecafeacf ( chi Translations Releases)
return;
}
else if (strcmp(upgradename,"engy sentry fire rate increased") == 0 &&
Expand All @@ -71,7 +83,11 @@ namespace Mod::MvM::Upgrade_Disallow

DevMsg("upgrade %f\n",upgrade);
if (upgrade >= 0.79f && upgrade <= 0.81f) {
<<<<<<< HEAD
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, "步哨射速升级的第3点有BUG,请换一个升级");
=======
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, "3rd sentry fire rate bonus upgrade is broken. Buy another upgrade");
>>>>>>> parent of ecafeacf ( chi Translations Releases)
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/mod/pop/popmgr_extensions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2158,7 +2158,7 @@ namespace Mod::Pop::PopMgr_Extensions
CONVAR_SCOPE_VALUE(tf_mvm_endless_force_on, 1);

if (state.m_bSingleClassAllowed != -1) {
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, CFmtStr("%s %s %s", "只允许",g_aRawPlayerClassNames[state.m_bSingleClassAllowed],"在当前任务"));
gamehelpers->TextMsg(ENTINDEX(player), TEXTMSG_DEST_CENTER, CFmtStr("%s %s %s", "只允许",g_aRawPlayerClassNames[state.m_bSingleClassAllowed],"兵种在当前任务"));

player->HandleCommand_JoinClass(g_aRawPlayerClassNames[state.m_bSingleClassAllowed]);

Expand Down

0 comments on commit 2539d32

Please sign in to comment.