Vote changes, Map Rot changes

CTFGame.cs

@@ -87,6 +87,8 @@ function CTFGame::initGameVars(%game)
    %game.stalemateTimeMS = 60000;
    %game.stalemateFreqMS = 15000;
    %game.stalemateDurationMS = 6000;
+   
+   
    // --------------------------------------------------- 
 
    // z0dd - ZOD, 9/29/02. Removed T2 demo code from here
@@ -550,21 +552,21 @@ function CTFGame::flagCap(%game, %player)
    %game.AIflagCap(%player, %flag);
 
    //if this cap didn't end the game, play the announcer...
-   if ($missionRunning)
+   //if ($missionRunning)
-   {
+   //{
-      if (%game.getTeamName(%client.team) $= 'Inferno')
+      //if (%game.getTeamName(%client.team) $= 'Inferno')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.infscores.wav');
-      else if (%game.getTeamName(%client.team) $= 'Storm')
+      //else if (%game.getTeamName(%client.team) $= 'Storm')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.stoscores.wav');
-      else if (%game.getTeamName(%client.team) $= 'Phoenix')
+      //else if (%game.getTeamName(%client.team) $= 'Phoenix')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.pxscore.wav');
-      else if (%game.getTeamName(%client.team) $= 'Blood Eagle')
+      //else if (%game.getTeamName(%client.team) $= 'Blood Eagle')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.bescore.wav');
-      else if (%game.getTeamName(%client.team) $= 'Diamond Sword')
+      //else if (%game.getTeamName(%client.team) $= 'Diamond Sword')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.dsscore.wav');
-      else if (%game.getTeamName(%client.team) $= 'Starwolf')
+      //else if (%game.getTeamName(%client.team) $= 'Starwolf')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.swscore.wav');
-   }
+   //}
 }
 
 function CTFGame::flagReturnFade(%game, %flag)
@@ -673,6 +675,7 @@ function CTFGame::hideStalemateTargets(%game)
 function CTFGame::beginStalemate(%game)
 {
    %game.stalemate = true;
+   $stalemate = true;
    %game.showStalemateTargets();
 
    // z0dd - ZOD, 5/27/03. Added anti-turtling, return flags after x minutes
@@ -686,6 +689,7 @@ function CTFGame::beginStalemate(%game)
 function CTFGame::endStalemate(%game)
 {
    %game.stalemate = false;
+   $stalemate = false;
    %game.hideStalemateTargets();
    cancel(%game.stalemateSchedule);
 }
@@ -753,9 +757,9 @@ function CTFGame::flagReset(%game, %flag)
 
 function CTFGame::timeLimitReached(%game)
 {
-   logEcho("game over (timelimit)");
+	logEcho("game over (timelimit)");
-   %game.gameOver();
+	%game.gameOver();
-   cycleMissions();
+	cycleMissions();
 }
 
 function CTFGame::scoreLimitReached(%game)
@@ -838,6 +842,9 @@ function CTFGame::gameOver(%game)
    }
    for(%j = 1; %j <= %game.numTeams; %j++)
       $TeamScore[%j] = 0;
+  
+   ResetNotify::MissionEnd( %game, %client );
+  
 }
 
 function CTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc)
@@ -1627,6 +1634,7 @@ function CTFGame::dropFlag(%game, %player)
       else
          %game.boundaryLoseFlag(%player);
    }
+
 }
 
 function CTFGame::applyConcussion(%game, %player)

SCtF/DeleteObjects.cs

@@ -78,7 +78,7 @@ function deleteObjectsFromGroupByType(%group, %type)
 
 function deleteNonSCtFObjectsFromMap()
 {   
-   deleteObjectsFromGroupByType(MissionGroup, "PhysicalZone");
+   //deleteObjectsFromGroupByType(MissionGroup, "PhysicalZone");
    deleteObjectsFromGroupByType(MissionGroup, "Turret");
    deleteObjectsFromGroupByType(MissionGroup, "StaticShape");
    //deleteObjectsFromGroupByType(MissionGroup, "ForceFieldBare");
@@ -86,5 +86,5 @@ function deleteNonSCtFObjectsFromMap()
    deleteObjectsFromGroupByType(MissionGroup, "WheeledVehicle");
    deleteObjectsFromGroupByType(MissionGroup, "HoverVehicle");
    deleteObjectsFromGroupByType(MissionGroup, "Waypoint");
- 
+   //deleteObjectsFromGroupByType(MissionGroup, "Item");
 }

SCtFGame.cs

@@ -104,8 +104,6 @@ function SCtFGame::initGameVars(%game)
    %game.stalemateTimeMS = 60000;
    %game.stalemateFreqMS = 15000;
    %game.stalemateDurationMS = 6000;
-   
-   %game.NotPure = false;
 }
 
 package SCtFGame
@@ -643,7 +641,7 @@ function SCtFGame::playerDroppedFlag(%game, %player)
    $flagStatus[%flag.team] = "<In the Field>";
    
    %player.unMountImage($FlagSlot);   
-   %flag.hide(false); //Does the throwItem function handle this?   
+   %flag.hide(false); //Does the throwItem function handle this?
 
    %teamName = %game.getTeamName(%flag.team);
    messageTeamExcept(%client, 'MsgCTFFlagDropped', '\c2Teammate %1 dropped the %2 flag. (Held: %4)~wfx/misc/flag_drop.wav', %client.name, %teamName, %flag.team, %held); // z0dd - ZOD, 8/15/02. How long flag was held
@@ -688,21 +686,21 @@ function SCtFGame::flagCap(%game, %player)
    %game.AIflagCap(%player, %flag);
 
    //if this cap didn't end the game, play the announcer...
-   if ($missionRunning)
+   //if ($missionRunning)
-   {
+   //{
-      if (%game.getTeamName(%client.team) $= 'Inferno')
+      //if (%game.getTeamName(%client.team) $= 'Inferno')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.infscores.wav');
-      else if (%game.getTeamName(%client.team) $= 'Storm')
+      //else if (%game.getTeamName(%client.team) $= 'Storm')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.stoscores.wav');
-      else if (%game.getTeamName(%client.team) $= 'Phoenix')
+      //else if (%game.getTeamName(%client.team) $= 'Phoenix')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.pxscore.wav');
-      else if (%game.getTeamName(%client.team) $= 'Blood Eagle')
+      //else if (%game.getTeamName(%client.team) $= 'Blood Eagle')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.bescore.wav');
-      else if (%game.getTeamName(%client.team) $= 'Diamond Sword')
+      //else if (%game.getTeamName(%client.team) $= 'Diamond Sword')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.dsscore.wav');
-      else if (%game.getTeamName(%client.team) $= 'Starwolf')
+      //else if (%game.getTeamName(%client.team) $= 'Starwolf')
-         messageAll("", '~wfx/misc/flag_capture.wav');
+         //messageAll("", '~wvoice/announcer/ann.swscore.wav');
-   }
+   //}
 }
 
 function SCtFGame::flagReturnFade(%game, %flag)
@@ -1650,7 +1648,7 @@ function SCtFGame::boundaryLoseFlag(%game, %player)
 }
 
 function SCtFGame::dropFlag(%game, %player)
-{
+{   
    if(%player.holdingFlag > 0)
    {
       if (!%player.client.outOfBounds)

autoexec/VoteOverTime.cs

@@ -0,0 +1,94 @@
+//Changes were also made in the Evo Admin.ovl and DefaultGame.ovl
+//DefaultGame::voteChangeMission, DefaultGame::voteChangeTimeLimit, serverCmdStartNewVote
+
+package VoteOverTime {
+
+//CTF
+function CTFGame::timeLimitReached(%game)
+{
+   if( !$VoteInProgress && !$TimeLimitChanged ) {
+		logEcho("game over (timelimit)");
+		%game.gameOver();
+		cycleMissions();
+		
+		$VoteInProgress = false;
+		$TimeLimitChanged = false;
+		$VoteInProgressMessege = false;
+		$VoteSoundInProgress = false;
+   }   
+   else if( $missionRunning && $VoteInProgress && !$TimeLimitChanged ) {
+		schedule(1000, 0, "CTFRestarttimeLimitReached", %game);
+		
+			if( !$VoteInProgressMessege ) {
+			messageAll('', '\c2Vote Overtime Initiated.', %display);
+			$VoteInProgressMessege = true;
+			}
+	}
+}
+
+function CTFRestarttimeLimitReached(%game)
+{
+	CTFGame::timeLimitReached(%game);
+}
+
+//LakRabbit
+function LakRabbitGame::timeLimitReached(%game)
+{
+   if( !$VoteInProgress && !$TimeLimitChanged ) {
+		logEcho("game over (timelimit)");
+		%game.gameOver();
+		cycleMissions();
+		
+		$VoteInProgress = false;
+		$TimeLimitChanged = false;
+		$VoteInProgressMessege = false;
+		$VoteSoundInProgress = false;
+   }   
+   else if( $missionRunning && $VoteInProgress && !$TimeLimitChanged ) {
+		schedule(1000, 0, "LakRabbitRestarttimeLimitReached", %game);
+		
+			if( !$VoteInProgressMessege ) {
+			messageAll('', '\c2Vote Overtime Initiated.', %display);
+			$VoteInProgressMessege = true;
+			}
+	}
+}
+
+function LakRabbitRestarttimeLimitReached(%game)
+{
+	LakRabbitGame::timeLimitReached(%game);
+}
+
+//SCtF
+function SCtFGame::timeLimitReached(%game)
+{
+   if( !$VoteInProgress && !$TimeLimitChanged ) {
+		logEcho("game over (timelimit)");
+		%game.gameOver();
+		cycleMissions();
+		
+		$VoteInProgress = false;
+		$TimeLimitChanged = false;
+		$VoteInProgressMessege = false;
+		$VoteSoundInProgress = false;
+   }   
+   else if( $missionRunning && $VoteInProgress && !$TimeLimitChanged ) {
+		schedule(1000, 0, "SCtFRestarttimeLimitReached", %game);
+		
+			if( !$VoteInProgressMessege ) {
+			messageAll('', '\c2Vote Overtime Initiated.', %display);
+			$VoteInProgressMessege = true;
+			}
+	}
+}
+
+function SCtFRestarttimeLimitReached(%game)
+{
+	SCtFGame::timeLimitReached(%game);
+}
+
+};
+
+// Prevent package from being activated if it is already
+if (!isActivePackage(VoteOverTime))
+    activatePackage(VoteOverTime);

autoexec/VoteSound.cs

@@ -0,0 +1,13 @@
+//Make a sound every so seconds to make sure everyone votes
+
+function VoteSound( %game ) {
+	
+	if($VoteSoundInProgress) {
+	messageAll('', '\c1Vote in Progress: \c0Press Insert for Yes or Delete for No.~wgui/objective_notification.wav', %display);
+	//$VoteSoundSchedule = schedule(12000, "VoteSound", %game);
+	schedule(12000, 0, "VoteSound", %game);
+	}
+	else
+	return;
+
+}

inventory.cs

@@ -477,7 +477,10 @@ function ShapeBase::throwObject(%this,%obj)
    //we need to up the %vec so that you can still throw them...
    if (%obj.getDataBlock().getName() $= "Flag")
    {
-      %vec = vectorScale(%vec, (%srcCorpse ? 40 : 75)); // z0dd - ZOD, 4/14/02. Throw flag force. Value was 40
+      if ($CurrentMissionType $= "sctf")
+	  %vec = vectorScale(%vec, (%srcCorpse ? 50 : 95)); // Added so SCtF gets more force for Flag passes
+	  else
+	  %vec = vectorScale(%vec, (%srcCorpse ? 40 : 75)); // z0dd - ZOD, 4/14/02. Throw flag force. Value was 40
       // ------------------------------------------------------------
       // z0dd - ZOD, 9/27/02. Delay on grabbing flag after tossing it
       %this.flagTossWait = true;

prefs/evo_mapRotation.cs

@@ -68,6 +68,7 @@ addRotationMap("Discord", CTF, 1, 1);
 addRotationMap("NatureMagic", CTF, 1, 1);
 addRotationMap("TenebrousCTF", CTF, 1, 1);
 addRotationMap("Pariah", CTF, 1, 1);
+addRotationMap("Prizmatic", CTF, 1, 1);
 addRotationMap("TWL_WilderZone", CTF, 1, 1);
 addRotationMap("Mirage", CTF, 1, 1);
 addRotationMap("S5_Mimicry", CTF, 1, 1);
@@ -294,13 +295,11 @@ addRotationMap("Tombstone", Duel, 1, 1);
 
 addRotationMap("BastardForgeLT", sctf, 1, 1);
 addRotationMap("FirestormLT", sctf, 1, 1);
-addRotationMap("DangerousCrossing_nef", sctf, 1, 1);
+addRotationMap("DangerousCrossingLT", sctf, 1, 1);
 addRotationMap("SmallCrossingLT", sctf, 1, 1);
 addRotationMap("DireLT", sctf, 1, 1);
 addRotationMap("RoundTheMountainLT", sctf, 1, 1);
 addRotationMap("CirclesEdgeLT", sctf, 1, 1);
-addRotationMap("HighOctane", sctf, 1, 1);
-addRotationMap("JadeValley", sctf, 1, 1);
 addRotationMap("TenebrousCTF", sctf, 1, 1);
 addRotationMap("TheFray", sctf, 1, 1);
 addRotationMap("SignalLT", sctf, 1, 1);
@@ -308,13 +307,13 @@ addRotationMap("StarFallLT", sctf, 1, 1);
 addRotationMap("S5_DamnationLT", sctf, 1, 1);
 addRotationMap("S5_Icedance", sctf, 1, 1);
 addRotationMap("S5_Mordacity", sctf, 1, 1);
-addRotationMap("S5_Silenus", sctf, 1, 1);
+addRotationMap("S5_SilenusLT", sctf, 1, 1);
 addRotationMap("TWL2_CanyonCrusadeDeluxeLT", sctf, 1, 1);
 addRotationMap("TWL2_FrozenHopeLT", sctf, 1, 1);
+addRotationMap("TWL2_JaggedClawLT", sctf, 1, 1);
 addRotationMap("TWL2_HildebrandLT", sctf, 1, 1);
 addRotationMap("TWL2_SkylightLT", sctf, 1, 1);
 addRotationMap("TWL_BeachBlitzLT", sctf, 1, 1);
-addRotationMap("TWL_DangerousCrossing", sctf, 1, 1);
 addRotationMap("TWL_FeignLT", sctf, 1, 1);
 addRotationMap("TWL_RollercoasterLT", sctf, 1, 1);
 addRotationMap("TWL_StonehengeLT", sctf, 1, 1);
@@ -322,17 +321,20 @@ addRotationMap("TWL_WilderZoneLT", sctf, 1, 1);
 addRotationMap("oasisintensity", sctf, 1, 1);
 addRotationMap("berlard", sctf, 1, 1);
 addRotationMap("SurrealLT", sctf, 1, 1);
+addRotationMap("RaindanceLT", sctf, 1, 1);
 addRotationMap("Coppersky", sctf, 1, 1);
 addRotationMap("DuelersDelight", sctf, 1, 1);
 addRotationMap("SuperHappyBouncyFunTime", sctf, 1, 0);
-addRotationMap("SmallTimeCTF", sctf, 1, 1);
+addRotationMap("SmallTimeLT", sctf, 1, 1);
-addRotationMap("Pariah", sctf, 1, 1);
+addRotationMap("PariahLT", sctf, 1, 1);
 addRotationMap("SmallMelee", sctf, 1, 1);
 addRotationMap("ArenaDome", sctf, 1, 1);
 addRotationMap("Bulwark", sctf, 1, 1);
 addRotationMap("Discord", sctf, 1, 1);
 addRotationMap("TitForTat", sctf, 1, 1);
 addRotationMap("CloseCombatLT", sctf, 1, 1);
+addRotationMap("PrizmaticLT", sctf, 1, 1);
+addRotationMap("JadeValley", sctf, 1, 1);
 addRotationMap("BeggarsRunLT", sctf, 0, 0);
 addRotationMap("Damnation", sctf, 0, 0);
 addRotationMap("DustToDust", sctf, 0, 0);
@@ -353,7 +355,7 @@ addRotationMap("Snowcone", sctf, 0, 0);
 addRotationMap("S5_Centaur", sctf, 0, 0);
 addRotationMap("S5_Drache", sctf, 0, 0);
 addRotationMap("S5_HawkingHeat", sctf, 0, 0);
-addRotationMap("S5_Massive", sctf, 0, 0);
+addRotationMap("S5_MassiveLT", sctf, 1, 1);
 addRotationMap("S5_Mimicry", sctf, 0, 0);
 addRotationMap("S5_Misadventure", sctf, 0, 0);
 addRotationMap("S5_Reynard", sctf, 0, 0);
@@ -369,7 +371,6 @@ addRotationMap("TWL2_Drifts", sctf, 0, 0);
 addRotationMap("TWL2_Drorck", sctf, 0, 0);
 addRotationMap("TWL2_FrozenGlory", sctf, 0, 0);
 addRotationMap("TWL2_IceDagger", sctf, 0, 0);
-addRotationMap("TWL2_JaggedClaw", sctf, 0, 0);
 addRotationMap("TWL2_MidnightMayhemDeluxe", sctf, 0, 0);
 addRotationMap("TWL2_MuddySwamp", sctf, 0, 0);
 addRotationMap("TWL2_Norty", sctf, 0, 0);
@@ -380,6 +381,7 @@ addRotationMap("TWL_BaNsHee", sctf, 0, 0);
 addRotationMap("TWL_Boss", sctf, 0, 0);
 addRotationMap("TWL_Cinereous", sctf, 0, 0);
 addRotationMap("TWL_Crossfire", sctf, 0, 0);
+addRotationMap("TWL_DangerousCrossing", sctf, 0, 0);
 addRotationMap("TWL_NoShelter", sctf, 0, 0);
 addRotationMap("TWL_OsIris", sctf, 0, 0);
 addRotationMap("TWL_Clusterfuct", sctf, 0, 0);
@@ -402,6 +404,7 @@ addRotationMap("ShortFall", sctf, 0, 0);
 addRotationMap("Fallout", sctf, 0, 0);
 addRotationMap("SoylentGreen", sctf, 0, 0);
 addRotationMap("Island", sctf, 0, 0);
+addRotationMap("HighOctane", sctf, 0, 0);
 
 
 
@@ -409,7 +412,7 @@ addRotationMap("Island", sctf, 0, 0);
 // * Siege Maps *
 // ************************
 
-addRotationMap("Isleofman", siege, 1, 1);
+addRotationMap("Isleofman", Siege, 1, 1);
-addRotationMap("Trident", siege, 1, 1);
+addRotationMap("Trident", Siege, 1, 1);
-addRotationMap("Alcatraz", siege, 1, 1);
+addRotationMap("Alcatraz", Siege, 1, 1);
 

prefs/serverPrefs.cs

@@ -62,10 +62,10 @@ $Host::EvoAdminCRCCheck = 0;
 $Host::EvoAdminLogging = 1;
 $Host::EvoAdminMaxPlayers = 20;
 $Host::EvoAdminMinPlayers = 20;
-$Host::EvoAdminPassVote = 1;
+$Host::EvoAdminPassVote = 0;
 $Host::EvoAdminReset = 0;
 $Host::EvoAdminServerPW = 0;
-$Host::EvoAdminStopVotes = 1;
+$Host::EvoAdminStopVotes = 0;
 $Host::EvoAdminWhois = 0;
 $Host::EvoAllowAdminVoteGameType = 1;
 $Host::EvoAllowPlayerVoteChangeMission = 1;
@@ -1291,5 +1291,5 @@ $Host::TournamentMode = "0";
 $Host::useCustomSkins = 1;
 $Host::VotePassPercent = "60";
 $Host::VoteSpread = 20;
-$Host::VoteTime = "30";
+$Host::VoteTime = "45";
 $Host::warmupTime = "20";