Integration

This commit is contained in:
ChocoTaco 2021-08-10 12:59:49 -04:00
parent 45c62a347b
commit 3f16819470
3 changed files with 16 additions and 7 deletions

View file

@ -10,6 +10,7 @@ $Host::AllowAdminVotes = 1;
$Host::AllowMapScript = "True"; $Host::AllowMapScript = "True";
$Host::AllowPlayerVoteChangeMission = 1; $Host::AllowPlayerVoteChangeMission = 1;
$Host::AllowPlayerVoteSkipMission = 1; $Host::AllowPlayerVoteSkipMission = 1;
$Host::AllowPlayerVoteTeamDamage = 0;
$Host::AllowPlayerVoteTimeLimit = 1; $Host::AllowPlayerVoteTimeLimit = 1;
$Host::AllowPlayerVoteTournamentMode = 0; $Host::AllowPlayerVoteTournamentMode = 0;
$Host::AnimateWithTransitions = 1; $Host::AnimateWithTransitions = 1;
@ -180,6 +181,7 @@ $Host::TN::echo = 1;
$Host::TournamentMode = 0; $Host::TournamentMode = 0;
$Host::useCustomSkins = 1; $Host::useCustomSkins = 1;
$Host::VoteCooldown = 120; $Host::VoteCooldown = 120;
$Host::VoteDelayTime = 120;
$Host::VotePassPercent = 60; $Host::VotePassPercent = 60;
$Host::VoteSpread = 20; $Host::VoteSpread = 20;
$Host::VoteTime = "45"; $Host::VoteTime = "45";

View file

@ -9,10 +9,15 @@
//$Host::AllowPlayerVoteSkipMission = 1; //$Host::AllowPlayerVoteSkipMission = 1;
//$Host::AllowPlayerVoteTimeLimit = 1; //$Host::AllowPlayerVoteTimeLimit = 1;
//$Host::AllowPlayerVoteTournamentMode = 1; //$Host::AllowPlayerVoteTournamentMode = 1;
//$Host::AllowPlayerVoteTeamDamage = 0;
//Beginning match VoteDelay //Vote Delay
//Delay the ability to vote at the beginning of the match //Delay the ability to vote (For everyone) at the beginning of the match
$VoteDelay::Time = 120000; //120000 is two minutes //$Host::VoteDelayTime = 120; //(120 is 2 mins)
//Vote Cooldown
//Time cooldown that dosnt allow a player to vote again after theyve initiated a vote
//$Host::VoteCooldown = 120; //(120 is 2 mins)
package ExtraVoteMenu package ExtraVoteMenu
{ {
@ -113,7 +118,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
//Beginning match Vote Delay //Beginning match Vote Delay
if(!%client.isAdmin) if(!%client.isAdmin)
{ {
if((getSimTime() - $VoteDelay) < $VoteDelay::Time) if((getSimTime() - $VoteDelay) < ($Host::VoteDelayTime * 1000))
return; return;
} }
@ -133,7 +138,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
if($Host::AllowPlayerVoteTimeLimit) if($Host::AllowPlayerVoteTimeLimit)
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit'); messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit');
if(%multipleTeams) if(%multipleTeams && $Host::AllowPlayerVoteTeamDamage)
{ {
if($teamDamage) if($teamDamage)
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'disable team damage', 'Vote to Disable Team Damage'); messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'disable team damage', 'Vote to Disable Team Damage');
@ -333,7 +338,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %
} }
case "VoteTeamDamage": case "VoteTeamDamage":
if(!%isAdmin) if((!%isAdmin && $Host::AllowPlayerVoteTeamDamage) || (%isAdmin && %client.ForceVote)) // not admin
{ {
%msg = %client.nameBase @ " initiated a vote to " @ ($TeamDamage == 0 ? "enable" : "disable") @ " team damage."; %msg = %client.nameBase @ " initiated a vote to " @ ($TeamDamage == 0 ? "enable" : "disable") @ " team damage.";
} }

4
Classic/scripts/serverDefaults.cs Normal file → Executable file
View file

@ -187,13 +187,13 @@ $Host::AllowPlayerVoteChangeMission = 1;
$Host::AllowPlayerVoteSkipMission = 1; $Host::AllowPlayerVoteSkipMission = 1;
$Host::AllowPlayerVoteTimeLimit = 1; $Host::AllowPlayerVoteTimeLimit = 1;
$Host::AllowPlayerVoteTournamentMode = 0; $Host::AllowPlayerVoteTournamentMode = 0;
$Host::AllowPlayerVoteTeamDamage = 0;
$Host::NoBaseRapeEnabled = 1; //Enable or Disable No Base Rape $Host::NoBaseRapeEnabled = 1; //Enable or Disable No Base Rape
$Host::NoBaseRapePlayerCount = 14; //Min number players the turn off No Base Rape $Host::NoBaseRapePlayerCount = 14; //Min number players the turn off No Base Rape
$Host::AveragePings = 1; //Show Average ping in F2 menu $Host::AveragePings = 1; //Show Average ping in F2 menu
$Host::GuidCheck = 1; //Dont allow players to join without a Guid or Name $Host::GuidCheck = 1; //Dont allow players to join without a Guid or Name
$Host::MinFlagRecordPlayerCount = 6; //Min number players to allow flag record to be recorded $Host::MinFlagRecordPlayerCount = 6; //Min number players to allow flag record to be recorded
$Host::ItemRespawnTime = 30; //Time it takes for items to respawn (repairpacks) $Host::ItemRespawnTime = 30; //Time it takes for items to respawn (repairpacks)
$Host::VoteCooldown = 120; //Time cooldown to allow a player to vote again after a vote (120 is 2 mins)
$Host::TKMax = 12; //Max tks before kick $Host::TKMax = 12; //Max tks before kick
$Host::TKWarn1 = 4; //Max tks before 1st warning $Host::TKWarn1 = 4; //Max tks before 1st warning
$Host::TKWarn2 = 8; //Max tks before 2nd warning $Host::TKWarn2 = 8; //Max tks before 2nd warning
@ -201,6 +201,8 @@ $Host::KickObserverStartOnJoin = 0; //Start KickObserver Timer as so
$Host::KickObserverTimeout = 1200; //How long player can stay in observer before being booted (1200 is 20 mins) $Host::KickObserverTimeout = 1200; //How long player can stay in observer before being booted (1200 is 20 mins)
//$Host::ClassicBanlist = "prefs/banlist.cs"; //$Host::ClassicBanlist = "prefs/banlist.cs";
$Host::dtBanlist = "prefs/dtBanlist.cs"; //Alternate Ban System $Host::dtBanlist = "prefs/dtBanlist.cs"; //Alternate Ban System
$Host::VoteCooldown = 120; //Time cooldown that dosnt allow a player to vote again after theyve initiated a vote (120 is 2 mins)
$Host::VoteDelayTime = 120; //Delay the ability to vote (For everyone) at the beginning of the match (120 is 2 minutes)
//LakRabbit //LakRabbit
$Host::LakRabbitUnlimitedDJ = 1; //Unlimited disc-jumps if enabled $Host::LakRabbitUnlimitedDJ = 1; //Unlimited disc-jumps if enabled