From 26586036bf2b5b03fa587a8ac271adbc5151220e Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Tue, 4 Sep 2018 22:39:04 -0400 Subject: [PATCH] Changed some MapLimits --- autoexec/NoBaseRapeNotify.cs | 24 ++++++------ defaultGame.cs | 6 +-- prefs/serverPrefs.cs | 74 ++++++++++++++++++------------------ 3 files changed, 51 insertions(+), 53 deletions(-) diff --git a/autoexec/NoBaseRapeNotify.cs b/autoexec/NoBaseRapeNotify.cs index 6d68fa4..3988152 100644 --- a/autoexec/NoBaseRapeNotify.cs +++ b/autoexec/NoBaseRapeNotify.cs @@ -1,5 +1,5 @@ //Start and Reset Notify -package NoRapeNotify { +//package NoRapeNotify { //Start Notify //function DefaultGame::spawnPlayer( %game, %client, %respawn ) { @@ -12,19 +12,21 @@ package NoRapeNotify { //} //} -//Reset Notify -function DefaultGame::gameOver( %game ) { - //Call default function - parent::gameOver( %game ); - //Reset NoBaseRape Notify - ResetNotify::MissionEnd( %game, %client ); -} +//Moved the DefaultGame::gameOver in evo defaultgame.ovl -}; +//Reset Notify +//function DefaultGame::gameOver( %game ) { + //Call default function + //parent::gameOver( %game ); + //Reset NoBaseRape Notify + //ResetNotify::MissionEnd( %game, %client ); +//} + +//}; // Prevent package from being activated if it is already -if (!isActivePackage(NoRapeNotify)) - activatePackage(NoRapeNotify); +//if (!isActivePackage(NoRapeNotify)) + //activatePackage(NoRapeNotify); diff --git a/defaultGame.cs b/defaultGame.cs index 8d2275b..b8a8390 100644 --- a/defaultGame.cs +++ b/defaultGame.cs @@ -159,8 +159,6 @@ function DefaultGame::initGameVars(%game) %game.SCORE_PER_KILL = 0; %game.SCORE_PER_TURRET_KILL = 0; - - $EndCountdownStart = false; } //-- tracking --- @@ -620,8 +618,6 @@ function DefaultGame::gameOver( %game ) // Default game does nothing... except lets the AI know the mission is over AIMissionEnd(); - - ResetNotify::MissionEnd( %game, %client ); } @@ -3758,7 +3754,7 @@ function notifyMatchEnd(%time) if (%seconds > 1) { MessageAll('MsgMissionEnd', '\c2Match ends in %1 seconds.~wfx/misc/hunters_%1.wav', %seconds); - if (%seconds > 59) { + if (%seconds == 60) { MessageAll('MsgNotifyEvoNextMission', '\c2Next Mission: \c3%1', $EvoCachedNextMission); } } diff --git a/prefs/serverPrefs.cs b/prefs/serverPrefs.cs index 7fc38a2..4db2aaa 100644 --- a/prefs/serverPrefs.cs +++ b/prefs/serverPrefs.cs @@ -872,18 +872,18 @@ $Host::MapFFAVaubanLak_LakRabbit = "1"; $Host::MapFFAWhiteout_Duel = "1"; $Host::MapFFAWindyGap_CTF = "1"; $Host::MapPlayerLimitsAbominable_CnH = "-1 -1"; -$Host::MapPlayerLimitsAcidRain_CTF = "6 32"; +$Host::MapPlayerLimitsAcidRain_CTF = "8 32"; $Host::MapPlayerLimitsAgentsOfFortune_Duel = "-1 64"; $Host::MapPlayerLimitsAgentsOfFortune_TeamHunters = "-1 32"; $Host::MapPlayerLimitsAgorazscium_CTF = "10 64"; $Host::MapPlayerLimitsAlcatraz_Siege = "-1 64"; $Host::MapPlayerLimitsArchipelago_CTF = "16 64"; -$Host::MapPlayerLimitsArenaDome_CTF = "-1 32"; -$Host::MapPlayerLimitsArenaDome_sctf = "-1 32"; +$Host::MapPlayerLimitsArenaDome_CTF = "-1 16"; +$Host::MapPlayerLimitsArenaDome_sctf = "-1 16"; $Host::MapPlayerLimitsArrakis_LakRabbit = "-1 32"; $Host::MapPlayerLimitsAshesToAshes_CnH = "16 -1"; -$Host::MapPlayerLimitsAstersDescent_CTF = "-1 32"; -$Host::MapPlayerLimitsAstersDescent_sctf = "-1 32"; +$Host::MapPlayerLimitsAstersDescent_CTF = "6 32"; +$Host::MapPlayerLimitsAstersDescent_sctf = "6 32"; $Host::MapPlayerLimitsAzoth_CTF = "-1 32"; $Host::MapPlayerLimitsAzoth_sctf = "-1 32"; $Host::MapPlayerLimitsBasinFury_CTF = "6 32"; @@ -909,12 +909,12 @@ $Host::MapPlayerLimitsCasernCavite_DM = "-1 32"; $Host::MapPlayerLimitsCasernCavite_Hunters = "-1 32"; $Host::MapPlayerLimitsChoke_CTF = "6 24"; $Host::MapPlayerLimitsCircleofstones_CTF = "8 32"; -$Host::MapPlayerLimitsCirclesEdge_CTF = "4 32"; -$Host::MapPlayerLimitsCirclesEdge_sctf = "4 32"; +$Host::MapPlayerLimitsCirclesEdge_CTF = "6 32"; +$Host::MapPlayerLimitsCirclesEdge_sctf = "6 32"; $Host::MapPlayerLimitsCloseCombat_CTF = "-1 10"; -$Host::MapPlayerLimitsCloudBurst_CTF = "6 32"; +$Host::MapPlayerLimitsCloudBurst_CTF = "8 32"; $Host::MapPlayerLimitsCloudCity_CTF = "6 32"; -$Host::MapPlayerLimitsConfusco_CTF = "6 32"; +$Host::MapPlayerLimitsConfusco_CTF = "8 32"; $Host::MapPlayerLimitsConstructionYard_CTF = "8 32"; $Host::MapPlayerLimitsCoppersky_CTF = "-1 32"; $Host::MapPlayerLimitsCrater71Lak_LakRabbit = "-1 32"; @@ -963,7 +963,7 @@ $Host::MapPlayerLimitsExtractor_CTF = "6 32"; $Host::MapPlayerLimitsExtractor_sctf = "6 32"; $Host::MapPlayerLimitsFallout_CTF = "6 32"; $Host::MapPlayerLimitsFallout_sctf = "6 32"; -$Host::MapPlayerLimitsFenix_CTF = "8 32"; +$Host::MapPlayerLimitsFenix_CTF = "12 32"; $Host::MapPlayerLimitsFilteredDust_CTF = "8 32"; $Host::MapPlayerLimitsFirestorm_CnH = "-1 24"; $Host::MapPlayerLimitsFirestorm_CTF = "-1 32"; @@ -971,7 +971,7 @@ $Host::MapPlayerLimitsFirestorm_sctf = "-1 32"; $Host::MapPlayerLimitsFlashpoint_CnH = "-1 -1"; $Host::MapPlayerLimitsFracas_Duel = "-1 32"; $Host::MapPlayerLimitsFrozenFuryLak_LakRabbit = "-1 32"; -$Host::MapPlayerLimitsFullCircle_CTF = "6 32"; +$Host::MapPlayerLimitsFullCircle_CTF = "8 32"; $Host::MapPlayerLimitsGauntlet_Siege = "-1 32"; $Host::MapPlayerLimitsGehenna_Hunters = "-1 -1"; $Host::MapPlayerLimitsGehenna_TeamHunters = "-1 -1"; @@ -986,7 +986,7 @@ $Host::MapPlayerLimitsHighOctane_CTF = "4 32"; $Host::MapPlayerLimitsHighOctane_sctf = "4 32"; $Host::MapPlayerLimitsHighTrepidation_CTF = "6 32"; $Host::MapPlayerLimitsHighWire_CTF = "8 16"; -$Host::MapPlayerLimitsHillside_CTF = "8 64"; +$Host::MapPlayerLimitsHillside_CTF = "10 64"; $Host::MapPlayerLimitsHillsideLak_LakRabbit = "-1 32"; $Host::MapPlayerLimitsHillsOfSorrow_LakRabbit = "-1 32"; $Host::MapPlayerLimitsHostileLoch_CTF = "6 32"; @@ -1021,9 +1021,9 @@ $Host::MapPlayerLimitsmelee_sctf = "-1 32"; $Host::MapPlayerLimitsMiniSunDried_LakRabbit = "-1 32"; $Host::MapPlayerLimitsMinotaur_CTF = "6 32"; $Host::MapPlayerLimitsMinotaur_sctf = "6 32"; -$Host::MapPlayerLimitsMirage_CTF = "-1 32"; -$Host::MapPlayerLimitsMirage_sctf = "-1 32"; -$Host::MapPlayerLimitsMoonDance_CTF = "6 32"; +$Host::MapPlayerLimitsMirage_CTF = "6 32"; +$Host::MapPlayerLimitsMirage_sctf = "6 32"; +$Host::MapPlayerLimitsMoonDance_CTF = "8 32"; $Host::MapPlayerLimitsMountainMist_CTF = "8 32"; $Host::MapPlayerLimitsMyrkwood_DM = "-1 32"; $Host::MapPlayerLimitsMyrkWood_Duel = "-1 32"; @@ -1124,7 +1124,7 @@ $Host::MapPlayerLimitsSolsDescentLak_LakRabbit = "-1 32"; $Host::MapPlayerLimitsSoylentGreen_CTF = "4 18"; $Host::MapPlayerLimitsStarfallen_CTF = "8 64"; $Host::MapPlayerLimitsStarIce_CTF = "6 32"; -$Host::MapPlayerLimitsStonehenge_nef_CTF = "4 32"; +$Host::MapPlayerLimitsStonehenge_nef_CTF = "6 32"; $Host::MapPlayerLimitsSundance_LakRabbit = "-1 32"; $Host::MapPlayerLimitsSunDried_Bounty = "8 -1"; $Host::MapPlayerLimitsSunDried_DM = "8 -1"; @@ -1132,7 +1132,7 @@ $Host::MapPlayerLimitsSunDried_Duel = "-1 32"; $Host::MapPlayerLimitsSunDriedLak_LakRabbit = "-1 32"; $Host::MapPlayerLimitsSuperHappyBouncyFunTime_CTF = "-1 32"; $Host::MapPlayerLimitsSuperHappyBouncyFunTime_sctf = "-1 32"; -$Host::MapPlayerLimitsSurreal_CTF = "12 32"; +$Host::MapPlayerLimitsSurreal_CTF = "10 32"; $Host::MapPlayerLimitsSurro_CTF = "4 32"; $Host::MapPlayerLimitsTalus_Bounty = "-1 32"; $Host::MapPlayerLimitsTalus_Duel = "-1 32"; @@ -1152,29 +1152,29 @@ $Host::MapPlayerLimitsTreasureIslandLak_LakRabbit = "-1 32"; $Host::MapPlayerLimitsTrident_CTF = "-1 32"; $Host::MapPlayerLimitsTrident_Siege = "-1 32"; $Host::MapPlayerLimitsTWL2_Bleed_CTF = "8 32"; -$Host::MapPlayerLimitsTWL2_BlueMoon_CTF = "8 32"; +$Host::MapPlayerLimitsTWL2_BlueMoon_CTF = "10 32"; $Host::MapPlayerLimitsTWL2_CanyonCrusadeDeluxe_CTF = "4 32"; $Host::MapPlayerLimitsTWL2_CanyonCrusadeDeluxe_sctf = "4 32"; -$Host::MapPlayerLimitsTWL2_Celerity_CTF = "4 32"; -$Host::MapPlayerLimitsTWL2_Celerity_sctf = "4 32"; +$Host::MapPlayerLimitsTWL2_Celerity_CTF = "6 32"; +$Host::MapPlayerLimitsTWL2_Celerity_sctf = "6 32"; $Host::MapPlayerLimitsTWL2_CloakOfNight_CTF = "8 32"; $Host::MapPlayerLimitsTWL2_Crevice_CTF = "6 32"; $Host::MapPlayerLimitsTWL2_Crevice_sctf = "6 32"; $Host::MapPlayerLimitsTWL2_Dissention_CTF = "8 32"; -$Host::MapPlayerLimitsTWL2_Drifts_CTF = "6 32"; -$Host::MapPlayerLimitsTWL2_Drifts_sctf = "6 32"; +$Host::MapPlayerLimitsTWL2_Drifts_CTF = "8 32"; +$Host::MapPlayerLimitsTWL2_Drifts_sctf = "8 32"; $Host::MapPlayerLimitsTWL2_Drorck_CTF = "6 32"; $Host::MapPlayerLimitsTWL2_Drorck_sctf = "6 32"; -$Host::MapPlayerLimitsTWL2_FrozenGlory_CTF = "6 32"; -$Host::MapPlayerLimitsTWL2_FrozenGlory_sctf = "6 32"; -$Host::MapPlayerLimitsTWL2_FrozenHope_CTF = "4 32"; -$Host::MapPlayerLimitsTWL2_FrozenHope_sctf = "4 32"; +$Host::MapPlayerLimitsTWL2_FrozenGlory_CTF = "8 32"; +$Host::MapPlayerLimitsTWL2_FrozenGlory_sctf = "8 32"; +$Host::MapPlayerLimitsTWL2_FrozenHope_CTF = "6 32"; +$Host::MapPlayerLimitsTWL2_FrozenHope_sctf = "6 32"; $Host::MapPlayerLimitsTWL2_Hildebrand_CTF = "4 32"; $Host::MapPlayerLimitsTWL2_Hildebrand_sctf = "4 32"; $Host::MapPlayerLimitsTWL2_IceDagger_CTF = "6 32"; $Host::MapPlayerLimitsTWL2_IceDagger_sctf = "6 32"; -$Host::MapPlayerLimitsTWL2_JaggedClaw_CTF = "4 32"; -$Host::MapPlayerLimitsTWL2_JaggedClaw_sctf = "4 32"; +$Host::MapPlayerLimitsTWL2_JaggedClaw_CTF = "6 32"; +$Host::MapPlayerLimitsTWL2_JaggedClaw_sctf = "6 32"; $Host::MapPlayerLimitsTWL2_Magnum_CTF = "8 32"; $Host::MapPlayerLimitsTWL2_MidnightMayhemDeluxe_CTF = "6 32"; $Host::MapPlayerLimitsTWL2_MidnightMayhemDeluxe_sctf = "6 32"; @@ -1187,10 +1187,10 @@ $Host::MapPlayerLimitsTWL2_Ocular_CTF = "6 32"; $Host::MapPlayerLimitsTWL2_Ocular_sctf = "6 32"; $Host::MapPlayerLimitsTWL2_RoughLand_CTF = "8 32"; $Host::MapPlayerLimitsTWL2_RoughLand_sctf = "8 32"; -$Host::MapPlayerLimitsTWL2_Ruined_CTF = "8 32"; -$Host::MapPlayerLimitsTWL2_Ruined_sctf = "8 32"; -$Host::MapPlayerLimitsTWL2_Skylight_CTF = "4 32"; -$Host::MapPlayerLimitsTWL2_Skylight_sctf = "4 32"; +$Host::MapPlayerLimitsTWL2_Ruined_CTF = "10 32"; +$Host::MapPlayerLimitsTWL2_Ruined_sctf = "10 32"; +$Host::MapPlayerLimitsTWL2_Skylight_CTF = "6 32"; +$Host::MapPlayerLimitsTWL2_Skylight_sctf = "6 32"; $Host::MapPlayerLimitsTWL_BaNsHee_CTF = "8 32"; $Host::MapPlayerLimitsTWL_BaNsHee_sctf = "8 32"; $Host::MapPlayerLimitsTWL_BeachBlitz_CTF = "6 32"; @@ -1199,16 +1199,16 @@ $Host::MapPlayerLimitsTWL_BeachBlitzLak_LakRabbit = "-1 32"; $Host::MapPlayerLimitsTWL_Boss_CTF = "8 32"; $Host::MapPlayerLimitsTWL_Boss_sctf = "8 32"; $Host::MapPlayerLimitsTWL_Chokepoint_CTF = "8 32"; -$Host::MapPlayerLimitsTWL_Cinereous_CTF = "6 32"; -$Host::MapPlayerLimitsTWL_Cinereous_sctf = "6 32"; +$Host::MapPlayerLimitsTWL_Cinereous_CTF = "8 32"; +$Host::MapPlayerLimitsTWL_Cinereous_sctf = "8 32"; $Host::MapPlayerLimitsTWL_Clusterfuct_CTF = "8 32"; $Host::MapPlayerLimitsTWL_Clusterfuct_sctf = "8 32"; $Host::MapPlayerLimitsTWL_Crossfire_CTF = "8 32"; $Host::MapPlayerLimitsTWL_Crossfire_sctf = "8 32"; $Host::MapPlayerLimitsTWL_Curtilage_CTF = "8 32"; $Host::MapPlayerLimitsTWL_Curtilage_sctf = "8 32"; -$Host::MapPlayerLimitsTWL_Damnation_CTF = "4 32"; -$Host::MapPlayerLimitsTWL_Damnation_sctf = "4 32"; +$Host::MapPlayerLimitsTWL_Damnation_CTF = "6 32"; +$Host::MapPlayerLimitsTWL_Damnation_sctf = "6 32"; $Host::MapPlayerLimitsTWL_DangerousCrossing_CTF = "4 32"; $Host::MapPlayerLimitsTWL_DangerousCrossing_sctf = "4 32"; $Host::MapPlayerLimitsTWL_DeadlyBirdsSong_CTF = "8 32"; @@ -1249,7 +1249,7 @@ $Host::MapPlayerLimitsUltimaThule_Siege = "8 -1"; $Host::MapPlayerLimitsUnderhill_Bounty = "-1 32"; $Host::MapPlayerLimitsUnderhill_DM = "-1 -1"; $Host::MapPlayerLimitsUnderhill_Duel = "8 32"; -$Host::MapPlayerLimitsVauban_CTF = "8 32"; +$Host::MapPlayerLimitsVauban_CTF = "10 32"; $Host::MapPlayerLimitsVaubanLak_Duel = "-1 32"; $Host::MapPlayerLimitsVaubanLak_LakRabbit = "-1 32"; $Host::MapPlayerLimitsWhiteout_Bounty = "8 -1";