diff --git a/Classic/prefs/MapRotation.cs b/Classic/prefs/MapRotation.cs index cdda03e..a7bfdef 100644 --- a/Classic/prefs/MapRotation.cs +++ b/Classic/prefs/MapRotation.cs @@ -54,13 +54,14 @@ addRotationMap("Minotaur", "CTF",1,0,-1,18); //addRotationMap("TitForTat", "CTF",1,1,-1,12); addRotationMap("SmallMelee", "CTF",1,0,-1,12); //addRotationMap("SuperHappyBouncyFunTime", "CTF",1,1,-1,12); -addRotationMap("Machineeggs", "CTF",1,1,-1,12); +addRotationMap("Machineeggs", "CTF",1,1,-1,8); addRotationMap("Mac_FlagArena", "CTF",1,0,-1,18); -addRotationMap("SmallTimeCTF", "CTF",1,1,-1,18); +addRotationMap("SmallTimeCTF", "CTF",1,1,-1,10); addRotationMap("TWL2_Hildebrand", "CTF",1,1,-1,18); addRotationMap("ArenaDome", "CTF",1,1,-1,12); -addRotationMap("Firestorm", "CTF",1,1,-1,18); +addRotationMap("Firestorm", "CTF",1,1,-1,12); addRotationMap("Bulwark", "CTF",1,1,-1,12); +addRotationMap("TWL_OsIris", "CTF",1,1,-1,12); //Medium Maps ///////////////////////////////////////////////////////////////////// @@ -68,55 +69,57 @@ addRotationMap("Bulwark", "CTF",1,1,-1,12); addRotationMap("HighOctane", "CTF",1,1,8,24); addRotationMap("S5_Mordacity", "CTF",1,1,8,24); addRotationMap("S5_Damnation", "CTF",1,1,8,20); -addRotationMap("TWL2_JaggedClaw", "CTF",1,0,8,24); +addRotationMap("TWL2_JaggedClaw", "CTF",1,1,8,24); addRotationMap("S5_Massive", "CTF",1,1,8,26); addRotationMap("TWL_Stonehenge", "CTF",1,1,8,20); addRotationMap("TWL_Feign", "CTF",1,0,12,24); addRotationMap("TheFray", "CTF",1,1,8,20); addRotationMap("DangerousCrossing_nef", "CTF",1,1,8,20); -addRotationMap("TWL2_Skylight", "CTF",1,0,8,20); -addRotationMap("TWL2_Ocular", "CTF",1,1,12,28); -addRotationMap("Dire", "CTF",1,1,8,24); -addRotationMap("berlard", "CTF",1,1,8,24); -addRotationMap("S8_Opus", "CTF",1,0,8,24); -addRotationMap("BeggarsRun", "CTF",1,0,8,24); +addRotationMap("TWL2_Skylight", "CTF",1,1,8,20); +addRotationMap("TWL2_Ocular", "CTF",1,1,12,-1); +addRotationMap("Dire", "CTF",1,1,12,24); +addRotationMap("berlard", "CTF",1,1,12,24); +addRotationMap("S8_Opus", "CTF",1,1,8,24); +addRotationMap("BeggarsRun", "CTF",1,1,8,24); addRotationMap("Headstone", "CTF",1,1,8,20); -addRotationMap("Signal", "CTF",1,1,8,26); +addRotationMap("Signal", "CTF",1,0,8,26); addRotationMap("S5_Woodymyrk", "CTF",1,1,8,26); addRotationMap("Discord", "CTF",1,1,8,20); addRotationMap("TenebrousCTF", "CTF",1,1,8,20); addRotationMap("Pariah", "CTF",1,0,8,20); -addRotationMap("Prismatic", "CTF",1,0,8,26); +addRotationMap("Prismatic", "CTF",1,0,12,26); addRotationMap("TWL_WilderZone", "CTF",1,1,8,20); -addRotationMap("Mirage", "CTF",1,1,8,20); -addRotationMap("S5_Mimicry", "CTF",1,1,8,24); -addRotationMap("TWL_Snowblind", "CTF",1,0,12,28); -addRotationMap("ShortFall", "CTF",1,0,8,24); +addRotationMap("Mirage", "CTF",1,0,8,20); +addRotationMap("S5_Mimicry", "CTF",1,0,8,24); +addRotationMap("TWL_Snowblind", "CTF",1,0,12,-1); +addRotationMap("ShortFall", "CTF",1,0,12,24); addRotationMap("IceRidge_nef", "CTF",1,0,8,20); -//addRotationMap(Disjointed", "CTF",1,1,8,20); +addRotationMap("Disjointed", "CTF",1,0,8,20); addRotationMap("TWL2_MuddySwamp", "CTF",1,0,8,20); addRotationMap("Blink", "CTF",1,1,8,20); addRotationMap("HighAnxiety", "CTF",1,0,8,20); addRotationMap("S5_Centaur", "CTF",1,0,8,20); -addRotationMap("S8_Cardiac", "CTF",1,1,12,28); +addRotationMap("S8_Cardiac", "CTF",1,1,12,-1); addRotationMap("CirclesEdge", "CTF",1,1,10,24); addRotationMap("S5_Icedance", "CTF",1,1,8,24); -addRotationMap("Surreal", "CTF",1,1,12,28); +addRotationMap("Surreal", "CTF",1,0,16,-1); +addRotationMap("TWL2_Drifts", "CTF",1,0,14,24); +addRotationMap("TWL2_Drorck", "CTF",1,1,12,24); +//addRotationMap("TWL2_Norty", "CTF",1,0,12,24); +addRotationMap("S5_HawkingHeat", "CTF",1,0,16,24); //Voteable but Not in Rotation ///////////////////////////////////////////////////////////////////// //addRotationMap("Snowcone", "CTF",1,0,10,20); -//addRotationMap("S5_Drache", "CTF",1,0,10,20); -//addRotationMap("S5_HawkingHeat", "CTF",1,0,10,20); +addRotationMap("S5_Drache", "CTF",1,0,10,24); //addRotationMap("JadeValley", "CTF",1,0,10,20); -//addRotationMap("S5_Sherman", "CTF",1,0,10,20); +addRotationMap("S5_Sherman", "CTF",1,0,10,20); addRotationMap("S5_Silenus", "CTF",1,0,8,20); addRotationMap("TWL2_FrozenHope", "CTF",1,0,8,20); -//addRotationMap("TWL2_IceDagger", "CTF",1,0,10,20); -//addRotationMap("S5_Reynard", "CTF",1,0,10,20); -//addRotationMap("TWL_Cinereous", "CTF",1,0,10,20); -//addRotationMap("TWL_OsIris, "CTF",1,0,10,20); +addRotationMap("TWL2_IceDagger", "CTF",1,0,10,20); +addRotationMap("S5_Reynard", "CTF",1,0,10,20); +addRotationMap("TWL_Cinereous", "CTF",1,0,10,24); addRotationMap("Coppersky", "CTF",1,0,8,20); //addRotationMap("TWL2_Crevice", "CTF",1,0,10,20); //addRotationMap("TWL_SubZero", "CTF",1,0,10,20); @@ -125,18 +128,18 @@ addRotationMap("Confusco", "CTF",1,0,10,20); //addRotationMap("Fallout", "CTF",1,0,10,20); //addRotationMap("TheClocktower", "CTF",1,0,10,20); //addRotationMap("SoylentGreen", "CTF",1,0,10,20); -addRotationMap("TWL2_MidnightMayhemDeluxe", "CTF",1,0,8,20); -addRotationMap("Nightdance", "CTF",1,0,10,24); +addRotationMap("TWL2_MidnightMayhemDeluxe", "CTF",1,0,8,18); //addRotationMap("Ramparts", "CTF",1,0,10,20); -addRotationMap("TWL2_Celerity", "CTF",1,0,8,20); -addRotationMap("Blastside_nef", "CTF",1,0,10,20); +addRotationMap("TWL2_Celerity", "CTF",1,1,8,24); +//addRotationMap("Blastside_nef", "CTF",1,0,10,24); addRotationMap("Burstside", "CTF",1,0,10,20); addRotationMap("Infernus", "CTF",1,0,18,26); addRotationMap("NatureMagic", "CTF",1,0,10,20); -//addRotationMap(TWL_Damnation", "CTF",1,0,10,20); -//addRotationMap(TWL_DangerousCrossing", "CTF",1,0,10,20); -//addRotationMap(TWL_DeadlyBirdsSong", "CTF",1,0,10,20); -addRotationMap("Vauban", "CTF",1,0,12,28); +//addRotationMap("TWL_Damnation", "CTF",1,0,10,20); +//addRotationMap("TWL_DangerousCrossing", "CTF",1,0,10,20); +addRotationMap("TWL_DeadlyBirdsSong", "CTF",1,0,10,20); +addRotationMap("Vauban", "CTF",1,0,18,-1); +addRotationMap("TWL_Pandemonium", "CTF",1,0,10,24); //Vehicle Maps ///////////////////////////////////////////////////////////////////// @@ -144,16 +147,17 @@ addRotationMap("Vauban", "CTF",1,0,12,28); addRotationMap("HostileLoch", "CTF",1,1,12,24); addRotationMap("TWL_BeachBlitz", "CTF",1,0,12,24); addRotationMap("TWL2_Magnum", "CTF",1,1,12,28); -addRotationMap("Logans_Run", "CTF",1,1,12,28); -addRotationMap("Rollercoaster_nef", "CTF",1,1,12,28); +addRotationMap("Logans_Run", "CTF",1,1,10,28); +addRotationMap("Rollercoaster_nef", "CTF",1,1,10,28); addRotationMap("MoonDance", "CTF",1,1,12,28); addRotationMap("Raindance_nef", "CTF",1,1,12,28); -addRotationMap("TWL_Magmatic", "CTF",1,1,12,24); +addRotationMap("TWL_Magmatic", "CTF",1,1,18,28); addRotationMap("TWL2_FrozenGlory", "CTF",1,1,12,24); -addRotationMap("LandingParty", "CTF",1,1,12,28); +addRotationMap("LandingParty", "CTF",1,0,12,28); addRotationMap("TitanV", "CTF",1,1,12,28); -addRotationMap("TWL_Crossfire", "CTF",1,1,12,-1); +addRotationMap("TWL_Crossfire", "CTF",1,1,18,-1); //addRotationMap("The_Calm", "CTF",1,0,12,24); +addRotationMap("TWL2_Dissention", "CTF",1,1,16,28); //Vehicle Maps: Voteable, But Not in Rotation ///////////////////////////////////////////////////////////////////// @@ -162,7 +166,7 @@ addRotationMap("SubZeroV", "CTF",1,0,12,24); addRotationMap("S8_Geothermal", "CTF",1,0,12,24); addRotationMap("Lakefront", "CTF",1,0,12,24); addRotationMap("ShockRidge", "CTF",1,0,12,24); -addRotationMap("TWL2_BlueMoon", "CTF",1,0,18,28); +addRotationMap("TWL2_BlueMoon", "CTF",1,1,18,28); addRotationMap("TWL_Katabatic", "CTF",1,0,12,28); addRotationMap("TWL_Starfallen", "CTF",1,0,12,24); addRotationMap("ConstructionYard", "CTF",1,0,12,24); @@ -172,33 +176,38 @@ addRotationMap("SandOcean", "CTF",1,0,12,28); addRotationMap("ks_braistv", "CTF",1,0,12,24); addRotationMap("FilteredDust", "CTF",1,0,12,24); //addRotationMap("Choke", "CTF",1,0,12,24); -addRotationMap("TWL2_Ruined", "CTF",1,0,12,24); //addRotationMap("TWL_Chokepoint", "CTF",1,0,12,24); -//addRotationMap("Glade", "CTF",1,0,12,24); +addRotationMap("Nightdance", "CTF",1,0,10,24); +addRotationMap("TWL_Abaddon", "CTF",1,0,16,24); //BIG Vehicle Maps ///////////////////////////////////////////////////////////////////// -addRotationMap("Agorazscium", "CTF",1,1,20,-1); -addRotationMap("FullCircle", "CTF",1,1,18,30); -addRotationMap("Surro", "CTF",1,1,20,28); -addRotationMap("TWL2_RoughLand", "CTF",1,1,20,-1); +addRotationMap("TWL2_Ruined", "CTF",1,1,24,-1); +addRotationMap("Agorazscium", "CTF",1,0,24,-1); +addRotationMap("FullCircle", "CTF",1,0,18,30); +addRotationMap("Surro", "CTF",1,0,18,24); +addRotationMap("TWL2_RoughLand", "CTF",1,0,20,-1); addRotationMap("HarvestDance", "CTF",1,1,20,-1); -addRotationMap("WindyGap", "CTF",1,1,20,-1); -addRotationMap("Fenix", "CTF",1,1,24,-1); -addRotationMap("Hillside", "CTF",1,1,20,-1); +addRotationMap("WindyGap", "CTF",1,0,24,-1); +addRotationMap("Fenix", "CTF",1,1,28,-1); +addRotationMap("Hillside", "CTF",1,1,28,-1); //addRotationMap("Sangre_de_Grado", "CTF",1,0,20,-1); addRotationMap("Slapdash", "CTF",1,0,20,-1); addRotationMap("BerylBasin", "CTF",1,1,20,-1); -//addRotationMap("TWL_Frozen", "CTF",1,0,20,-1); +addRotationMap("TWL_Frozen", "CTF",1,0,20,-1); addRotationMap("TWL_Harvester", "CTF",1,1,24,-1); addRotationMap("Archipelago", "CTF",1,0,20,-1); addRotationMap("TWL2_Bleed", "CTF",1,0,20,-1); -//addRotationMap("Pantheon", "CTF",1,0,20,-1); -addRotationMap("Circleofstones", "CTF",1,1,20,-1); -addRotationMap("Scarabrae_nef", "CTF",1,0,24,-1); -addRotationMap("aabaaGH", "CTF",1,1,24,-1); -addRotationMap("TWL_Reversion", "CTF",1,1,24,-1); +addRotationMap("Pantheon", "CTF",1,1,24,-1); +addRotationMap("Circleofstones", "CTF",1,1,18,-1); +addRotationMap("DeathBirdsFly1", "CTF",1,1,24,-1); +addRotationMap("Scarabrae_nef", "CTF",1,0,28,-1); +addRotationMap("aabaa", "CTF",1,1,28,-1); +addRotationMap("TWL_Reversion", "CTF",1,1,28,-1); +addRotationMap("Glade", "CTF",1,1,28,-1); +addRotationMap("TWL_Horde", "CTF",1,0,28,-1); +addRotationMap("CloakofNightV", "CTF",1,1,24,-1); //Not In Rotation - Not Voteable ///////////////////////////////////////////////////////////////////// @@ -216,16 +225,11 @@ addRotationMap("TWL_Reversion", "CTF",1,1,24,-1); //addRotationMap("MountainMist", "CTF",1,0,-1,-1); //addRotationMap("Peak", "CTF",1,0,-1,-1); //addRotationMap("Pendulum", "CTF",1,0,-1,-1); -//addRotationMap("S5_Misadventure", "CTF",1,0,-1,-1); -//addRotationMap("S8_CentralDogma", "CTF",1,0,-1,-1); +addRotationMap("S5_Misadventure", "CTF",1,0,-1,-1); +addRotationMap("S8_CentralDogma", "CTF",1,0,-1,-1); //addRotationMap("S8_Mountking", "CTF",1,0,-1,-1); //addRotationMap("S8_Zilch", "CTF",1,0,-1,-1); //addRotationMap("TWL2_CloakOfNight", "CTF",1,0,-1,-1); -//addRotationMap("TWL2_Dissention", "CTF",1,0,-1,-1); -//addRotationMap("TWL2_Drifts", "CTF",1,0,-1,-1); -//addRotationMap("TWL2_Drorck", "CTF",1,0,-1,-1); -//addRotationMap("TWL2_Norty", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Abaddon", "CTF",1,0,-1,-1); //addRotationMap("TWL_BaNsHee", "CTF",1,0,-1,-1); //addRotationMap("TWL_Boss", "CTF",1,0,-1,-1); //addRotationMap("TWL_NoShelter", "CTF",1,0,-1,-1); @@ -233,9 +237,7 @@ addRotationMap("TWL_Reversion", "CTF",1,1,24,-1); //addRotationMap("TWL_Curtilage", "CTF",1,0,-1,-1); //addRotationMap("TWL_Deserted", "CTF",1,0,-1,-1); //addRotationMap("TWL_Frostclaw", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Horde", "CTF",1,0,-1,-1); //addRotationMap("TWL_Neve", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Pandemonium", "CTF",1,0,-1,-1); //addRotationMap("TWL_Ramparts", "CTF",1,0,-1,-1); //addRotationMap("TWL_Sandstorm", "CTF",1,0,-1,-1); //addRotationMap("TWL_WoodyMyrk", "CTF",1,0,-1,-1); @@ -288,12 +290,12 @@ addRotationMap("TWL_Reversion", "CTF",1,1,24,-1); addRotationMap("VaubanLak", "Lakrabbit",1,1,-1,-1); addRotationMap("MiniSunDried", "Lakrabbit",1,1,-1,12); addRotationMap("Sundance", "Lakrabbit",1,1,-1,-1); -addRotationMap("TWL_BeachBlitzLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("DesertofDeathLak", "Lakrabbit",1,1,-1,-1); +addRotationMap("TWL_BeachBlitzLak", "Lakrabbit",1,0,-1,-1); +addRotationMap("DesertofDeathLak", "Lakrabbit",1,0,-1,-1); addRotationMap("Raindance_nefLak", "Lakrabbit",1,1,-1,-1); addRotationMap("SunDriedLak", "Lakrabbit",1,1,-1,-1); addRotationMap("SkinnyDipLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("SaddiesHill", "Lakrabbit",1,1,-1,-1); +addRotationMap("SaddiesHill", "Lakrabbit",1,0,-1,-1); addRotationMap("HavenLak", "Lakrabbit",1,0,-1,-1); addRotationMap("LushLak", "Lakrabbit",1,1,-1,-1); addRotationMap("BoxLak", "Lakrabbit",1,1,-1,10); @@ -303,19 +305,19 @@ addRotationMap("InfernusLak", "Lakrabbit",1,1,-1,-1); addRotationMap("S8_GeothermalLak", "Lakrabbit",1,1,-1,-1); addRotationMap("CankerLak", "Lakrabbit",1,1,-1,-1); addRotationMap("DustRunLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("CrossfiredLak", "Lakrabbit",1,0,-1,-1); +addRotationMap("CrossfiredLak", "Lakrabbit",1,1,-1,-1); //Voteable, But not in rotation ///////////////////////////////////////////////////////////////////// -addRotationMap("TreasureIslandLak", "Lakrabbit",1,0,-1,-1); +addRotationMap("TreasureIslandLak", "Lakrabbit",1,1,-1,-1); addRotationMap("Sulfide", "Lakrabbit",1,0,-1,-1); addRotationMap("FrozenFuryLak", "Lakrabbit",1,0,-1,-1); addRotationMap("Arrakis", "Lakrabbit",1,0,-1,-1); addRotationMap("EquinoxLak", "Lakrabbit",1,0,-1,-1); addRotationMap("PhasmaDustLak", "Lakrabbit",1,1,-1,12); addRotationMap("GodsRiftLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("SolsDescentLak", "Lakrabbit",1,0,-1,-1); +addRotationMap("SolsDescentLak", "Lakrabbit",1,1,-1,-1); addRotationMap("Crater71Lak", "Lakrabbit",1,0,-1,-1); //Not Voteable, Not in rotation @@ -438,7 +440,7 @@ addRotationMap("PariahLT", "sctf",1,1,-1,16); //addRotationMap("S5_Reynard", "sctf",1,1,-1,-1); //addRotationMap("S5_Sherman", "sctf",1,1,-1,-1); //addRotationMap("S8_Geothermal", "sctf",1,1,-1,-1); -//addRotationMap("S8_Zilch", "sctf",1,1,-1,-1); +addRotationMap("S8_ZilchLT", "sctf",1,1,-1,-1); //addRotationMap("TWL2_Drifts", "sctf",1,1,-1,-1); //addRotationMap("TWL2_Drorck", "sctf",1,1,-1,-1); //addRotationMap("TWL2_FrozenGlory", "sctf",1,1,-1,-1); @@ -487,6 +489,7 @@ addRotationMap("ShrineDM", "DM",1,1,-1,12); addRotationMap("LiveBaitDM", "DM",1,1,-1,-1); addRotationMap("FourSquareDM", "DM",1,1,-1,10); addRotationMap("BrigDM", "DM",1,1,-1,8); +addRotationMap("PitsDM", "DM",1,1,-1,10); @@ -528,14 +531,25 @@ addRotationMap("BrigDM", "DM",1,1,-1,8); // |___/ ///////////////////////////////////////////////////////////////////// -addRotationMap("Alcatraz", "Siege",1,1,-1,-1); -addRotationMap("BridgeTooFar", "Siege",1,1,-1,-1); -addRotationMap("Caldera", "Siege",1,1,-1,-1); -addRotationMap("Gauntlet", "Siege",1,1,-1,-1); -addRotationMap("IceBound", "Siege",1,1,-1,-1); -addRotationMap("Isleofman", "Siege",1,1,-1,-1); -addRotationMap("Masada", "Siege",1,1,-1,-1); -addRotationMap("Respite", "Siege",1,1,-1,-1); -addRotationMap("Trident", "Siege",1,1,-1,-1); -addRotationMap("UltimaThule", "Siege",1,1,-1,-1); +//addRotationMap("Alcatraz", "Siege",1,1,-1,-1); +//addRotationMap("BridgeTooFar", "Siege",1,1,-1,-1); +//addRotationMap("Caldera", "Siege",1,1,-1,-1); +//addRotationMap("Gauntlet", "Siege",1,1,-1,-1); +//addRotationMap("IceBound", "Siege",1,1,-1,-1); +//addRotationMap("Isleofman", "Siege",1,1,-1,-1); +//addRotationMap("Masada", "Siege",1,1,-1,-1); +//addRotationMap("Respite", "Siege",1,1,-1,-1); +//addRotationMap("Trident", "Siege",1,1,-1,-1); +//addRotationMap("UltimaThule", "Siege",1,1,-1,-1); + + +// _ _ _ +// | | | | | | +// | |__| |_ _ _ __ | |_ ___ _ __ ___ +// | __ | | | | '_ \| __/ _ \ '__/ __| +// | | | | |_| | | | | || __/ | \__ \ +// |_| |_|\__,_|_| |_|\__\___|_| |___/ +///////////////////////////////////////////////////////////////////// + +addRotationMap("MiniSunDried", "Hunters",1,1,-1,-1); diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs index baf8eb3..e2e0b68 100644 --- a/Classic/prefs/serverPrefs.cs +++ b/Classic/prefs/serverPrefs.cs @@ -12,8 +12,8 @@ $Host::AllowPlayerVoteSkipMission = 1; $Host::AllowPlayerVoteTimeLimit = 1; $Host::AllowPlayerVoteTournamentMode = 0; $Host::AnimateWithTransitions = 1; -$Host::AntiCloakEnable = 1; -$Host::AntiCloakPlayerCount = 6; +$Host::AntiPackEnable = 1; +$Host::AntiPackPlayerCount = 6; $Host::AveragePings = 1; $Host::BanTime = 1440; $Host::BotCount = 14; @@ -50,7 +50,7 @@ $Host::ClassicLoadSniperChanges = 0; $Host::ClassicLoadTR2Gametype = 0; $Host::ClassicLoadVRamChanges = 0; $Host::ClassicLogEchoEnabled = 0; -$Host::ClassicMaxVotes = 5; +$Host::ClassicMaxVotes = 3; $Host::ClassicMaxTelepads = 3; $Host::ClassicMOTD = "Discord PUB\nServer Hosted/Provided by Branzone/Ravin\nGet Mappacks at https://playt2.com/"; $Host::ClassicMOTDLines = 3; diff --git a/Classic/scripts/SCtFGame.cs b/Classic/scripts/SCtFGame.cs index 1354790..4360194 100644 --- a/Classic/scripts/SCtFGame.cs +++ b/Classic/scripts/SCtFGame.cs @@ -385,6 +385,9 @@ package SCtFGame %damageScale = %data.damageScale[%damageType]; if(%damageScale !$= "") %amount *= %damageScale; + + if(%damageType == $DamageType::Laser && $InvBanList[SctF, "SniperRifle"]) //banned + return; %flash = %targetObject.getDamageFlash() + (%amount * 2); if (%flash > 0.75) diff --git a/Classic/scripts/autoexec/AntiCloak.cs b/Classic/scripts/autoexec/AntiCloak.cs deleted file mode 100644 index e830508..0000000 --- a/Classic/scripts/autoexec/AntiCloak.cs +++ /dev/null @@ -1,78 +0,0 @@ -// AntiCloak Script -// -// Amount of players needed on server for CloakPack to be banned/unbanned -// This is useful for low numbers -// -// Enable/Disable the feature -// $Host::AntiCloakEnable = 1; -// When you would like for it to deactivate -// $Host::AntiCloakPlayerCount = 6; -// - -// Called in GetCounts.cs -function CheckAntiCloak( %game ) -{ - //CTF only - if( $Host::AntiCloakEnable && $CurrentMissionType $= "CTF" && !$Host::TournamentMode ) - { - //echo("TotalTeamPlayerCount " @ $TotalTeamPlayerCount); - //echo("AntiCloakPlayerCount " @ $AntiCloakPlayerCount); - - if( $TotalTeamPlayerCount < $Host::AntiCloakPlayerCount ) - { - if( $AntiCloakStatus !$= "ACTIVEON" ) - $AntiCloakStatus = "ON"; - } - //Off - else - { - if( $AntiCloakStatus !$= "ACTIVEOFF" ) - $AntiCloakStatus = "OFF"; - } - } - //All other cases outside of CTF - else - { - if( $AntiCloakStatus !$= "ACTIVEOFF" ) - $AntiCloakStatus = "OFF"; - } - - switch$($AntiCloakStatus) - { - case ON: - $InvBanList[CTF, "CloakingPack"] = 1; - if(!isActivePackage(DisableCloakPack)) - activatePackage(DisableCloakPack); - $AntiCloakStatus = "ACTIVEON"; - case OFF: - $InvBanList[CTF, "CloakingPack"] = 0; - if(isActivePackage(DisableCloakPack)) - deactivatePackage(DisableCloakPack); - $AntiCloakStatus = "ACTIVEOFF"; - case ACTIVEON: - //Do Nothing - case ACTIVEOFF: - //Do Nothing - } -} - -// So if the player is able to get a cloakpack, he cant use it -package DisableCloakPack -{ - -function CloakingPackImage::onActivate(%data, %obj, %slot) -{ - if(%obj.client.armor $= "Light") - { - if(%obj.canCloak() $= "true") - messageClient(%obj.client, 'MsgCloakingPackInvalid', '\c2Cloakpack is disabled until %1 players.', $Host::AntiCloakPlayerCount ); - } - else - { - messageClient(%obj.client, 'MsgCloakingPackInvalid', '\c2Cloaking available for light armors only.'); - } -} - -}; - - diff --git a/Classic/scripts/autoexec/AntiPack.cs b/Classic/scripts/autoexec/AntiPack.cs new file mode 100644 index 0000000..dd9e9c2 --- /dev/null +++ b/Classic/scripts/autoexec/AntiPack.cs @@ -0,0 +1,92 @@ +// AntiPack Script +// +// Amount of players needed on server for (Cloak and Shield) Pack to be banned/unbanned +// This is useful for low numbers +// +// Enable/Disable the feature +// $Host::AntiPackEnable = 1; +// When you would like for it to deactivate +// $Host::AntiPackPlayerCount = 6; +// + +// Called in GetCounts.cs +function CheckAntiPack( %game ) +{ + //CTF only + if( $Host::AntiPackEnable && $CurrentMissionType $= "CTF" && !$Host::TournamentMode ) + { + //echo("TotalTeamPlayerCount " @ $TotalTeamPlayerCount); + //echo("AntiPackPlayerCount " @ $AntiPackPlayerCount); + + if( $TotalTeamPlayerCount < $Host::AntiPackPlayerCount ) + { + if( $AntiPackStatus !$= "ACTIVEON" ) + $AntiPackStatus = "ON"; + } + //Off + else + { + if( $AntiPackStatus !$= "ACTIVEOFF" ) + $AntiPackStatus = "OFF"; + } + } + //All other cases outside of CTF + else + { + if( $AntiPackStatus !$= "ACTIVEOFF" ) + $AntiPackStatus = "OFF"; + } + + switch$($AntiPackStatus) + { + case ON: + $InvBanList[CTF, "CloakingPack"] = 1; + $InvBanList[CTF, "ShieldPack"] = 1; + if(!isActivePackage(AntiPack)) + activatePackage(AntiPack); + $AntiPackStatus = "ACTIVEON"; + case OFF: + $InvBanList[CTF, "CloakingPack"] = 0; + $InvBanList[CTF, "ShieldPack"] = 0; + if(isActivePackage(AntiPack)) + deactivatePackage(AntiPack); + $AntiPackStatus = "ACTIVEOFF"; + case ACTIVEON: + //Do Nothing + case ACTIVEOFF: + //Do Nothing + } +} + +// So if the player is able to get said pack, he cant use it +package AntiPack +{ + +function CloakingPackImage::onActivate(%data, %obj, %slot) +{ + if(%obj.client.armor $= "Light") + { + if(%obj.canCloak() $= "true") + messageClient(%obj.client, 'MsgCloakingPackInvalid', '\c2Cloakpack is disabled until %1 players.', $Host::AntiPackPlayerCount ); + } + else + { + messageClient(%obj.client, 'MsgCloakingPackInvalid', '\c2Cloaking available for light armors only.'); + } +} + +function ShieldPackImage::onActivate(%data, %obj, %slot) +{ + messageClient(%obj.client, 'MsgShieldPackInvalid', '\c2Shieldpack is disabled until %1 players.', $Host::AntiPackPlayerCount ); + %obj.setImageTrigger(%slot,false); + %obj.isShielded = ""; +} + +function ShieldPackImage::onDeactivate(%data, %obj, %slot) +{ + //Nothing +} + +}; + + diff --git a/Classic/scripts/autoexec/GetTeamCounts.cs b/Classic/scripts/autoexec/GetTeamCounts.cs index be82bc9..36c2d3e 100644 --- a/Classic/scripts/autoexec/GetTeamCounts.cs +++ b/Classic/scripts/autoexec/GetTeamCounts.cs @@ -75,7 +75,7 @@ function GetTeamCounts( %game, %client, %respawn ) //Start Team Balance Notify schedule(1000, 0, "TeamBalanceNotify", %game, %team1difference, %team2difference); //Start AntiCloak - schedule(1500, 0, "CheckAntiCloak", %game); + schedule(1500, 0, "CheckAntiPack", %game); //Set so counter wont run when it doesnt need to. $GetCountsStatus = "IDLE"; diff --git a/Classic/scripts/autoexec/zDarkTigerStats.cs b/Classic/scripts/autoexec/zDarkTigerStats.cs index 2a968ba..a8a3799 100644 --- a/Classic/scripts/autoexec/zDarkTigerStats.cs +++ b/Classic/scripts/autoexec/zDarkTigerStats.cs @@ -1641,7 +1641,7 @@ package dtStatsGame{ function Weapon::onPickup(%this, %obj, %shape, %amount){ parent::onPickup(%this, %obj, %shape, %amount); if($dtStats::Enable) - %this.weaponpickupCount++; + %shape.client.weaponpickupCount++; } }; diff --git a/Classic/scripts/player.cs b/Classic/scripts/player.cs index 2f8e656..3e29239 100644 --- a/Classic/scripts/player.cs +++ b/Classic/scripts/player.cs @@ -1230,7 +1230,7 @@ datablock PlayerData(LightMaleHumanArmor) : LightPlayerDamageProfile cameraDefaultFov = 90.0; cameraMinFov = 5.0; - cameraMaxFov = 120.0; + cameraMaxFov = 138.0; debrisShapeName = "debris_player.dts"; debris = playerDebris; @@ -1486,7 +1486,7 @@ datablock PlayerData(MediumMaleHumanArmor) : MediumPlayerDamageProfile cameraDefaultFov = 90.0; cameraMinFov = 5.0; - cameraMaxFov = 120.0; + cameraMaxFov = 138.0; debrisShapeName = "debris_player.dts"; debris = playerDebris; @@ -1743,7 +1743,7 @@ datablock PlayerData(HeavyMaleHumanArmor) : HeavyPlayerDamageProfile cameraDefaultFov = 90.0; cameraMinFov = 5.0; - cameraMaxFov = 120.0; + cameraMaxFov = 138.0; debrisShapeName = "debris_player.dts"; debris = playerDebris; diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs index 407721b..6055f31 100644 --- a/Classic/scripts/serverDefaults.cs +++ b/Classic/scripts/serverDefaults.cs @@ -126,8 +126,8 @@ $Host::EnableNoBaseRapeNotify = 1; //Get a base rape notification $Host::EnableTeamBalanceNotify = 1; //Get a teambalance notification $Host::EnableTurretPlayerCount = 10; //How many to enable turrets $Host::EnableVoteSoundReminders = 3; //If you want a sound chime during voting, number of times -$Host::AntiCloakEnable = 1; //Enable or disable AntiCloak -$Host::AntiCloakPlayerCount = 6; //How many to enable Cloak +$Host::AntiPackEnable = 1; //Enable or disable AntiCloak +$Host::AntiPackPlayerCount = 6; //How many to enable Cloak $Host::PUGautoPassword = 0; //Auto enable a password in tournament mode $Host::PUGPassword = "pickup"; //PUG password, Auto or enable/disable thru admin menu $Host::PUGpasswordAlwaysOn = 0; //If you want the pug password Always on