diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs index dc435f9..da08a33 100644 --- a/Classic/prefs/serverPrefs.cs +++ b/Classic/prefs/serverPrefs.cs @@ -10,6 +10,7 @@ $Host::AllowAdminVotes = 1; $Host::AllowMapScript = "True"; $Host::AllowPlayerVoteChangeMission = 1; $Host::AllowPlayerVoteSkipMission = 1; +$Host::AllowPlayerVoteTeamDamage = 0; $Host::AllowPlayerVoteTimeLimit = 1; $Host::AllowPlayerVoteTournamentMode = 0; $Host::AnimateWithTransitions = 1; @@ -180,6 +181,7 @@ $Host::TN::echo = 1; $Host::TournamentMode = 0; $Host::useCustomSkins = 1; $Host::VoteCooldown = 120; +$Host::VoteDelayTime = 120; $Host::VotePassPercent = 60; $Host::VoteSpread = 20; $Host::VoteTime = "45"; diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs index af417a1..45dec5e 100644 --- a/Classic/scripts/autoexec/VoteMenu.cs +++ b/Classic/scripts/autoexec/VoteMenu.cs @@ -9,10 +9,15 @@ //$Host::AllowPlayerVoteSkipMission = 1; //$Host::AllowPlayerVoteTimeLimit = 1; //$Host::AllowPlayerVoteTournamentMode = 1; +//$Host::AllowPlayerVoteTeamDamage = 0; -//Beginning match VoteDelay -//Delay the ability to vote at the beginning of the match -$VoteDelay::Time = 120000; //120000 is two minutes +//Vote Delay +//Delay the ability to vote (For everyone) at the beginning of the match +//$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 { @@ -113,7 +118,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key) //Beginning match Vote Delay if(!%client.isAdmin) { - if((getSimTime() - $VoteDelay) < $VoteDelay::Time) + if((getSimTime() - $VoteDelay) < ($Host::VoteDelayTime * 1000)) return; } @@ -133,7 +138,7 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key) if($Host::AllowPlayerVoteTimeLimit) messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit'); - if(%multipleTeams) + if(%multipleTeams && $Host::AllowPlayerVoteTeamDamage) { if($teamDamage) 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": - if(!%isAdmin) + if((!%isAdmin && $Host::AllowPlayerVoteTeamDamage) || (%isAdmin && %client.ForceVote)) // not admin { %msg = %client.nameBase @ " initiated a vote to " @ ($TeamDamage == 0 ? "enable" : "disable") @ " team damage."; } diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs old mode 100644 new mode 100755 index 77e45e3..a616891 --- a/Classic/scripts/serverDefaults.cs +++ b/Classic/scripts/serverDefaults.cs @@ -187,13 +187,13 @@ $Host::AllowPlayerVoteChangeMission = 1; $Host::AllowPlayerVoteSkipMission = 1; $Host::AllowPlayerVoteTimeLimit = 1; $Host::AllowPlayerVoteTournamentMode = 0; +$Host::AllowPlayerVoteTeamDamage = 0; $Host::NoBaseRapeEnabled = 1; //Enable or Disable 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::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::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::TKWarn1 = 4; //Max tks before 1st 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::ClassicBanlist = "prefs/banlist.cs"; $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 $Host::LakRabbitUnlimitedDJ = 1; //Unlimited disc-jumps if enabled