mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-03-18 02:50:37 +00:00
Merge branch 'NoEvo'
This commit is contained in:
ChocoTaco1
commit
510b7759d4
9 changed files with 8872 additions and 4637 deletions
|
|
@ -47,101 +47,107 @@
|
|||
|
||||
addRotationMap("SmallCrossing", "CTF",1,1,-1,16);
|
||||
addRotationMap("TWL2_CanyonCrusadeDeluxe", "CTF",1,1,-1,18);
|
||||
addRotationMap("RoundTheMountain", "CTF",1,1,-1,16);
|
||||
addRotationMap("RoundTheMountain", "CTF",1,1,-1,18);
|
||||
addRotationMap("oasisintensity", "CTF",1,1,-1,12);
|
||||
addRotationMap("Minotaur", "CTF",1,0,-1,18);
|
||||
//addRotationMap("Island", "CTF",1,1,-1,12);
|
||||
//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,8);
|
||||
addRotationMap("SuperHappyBouncyFunTime", "CTF",1,0,-1,12);
|
||||
addRotationMap("Machineeggs", "CTF",1,0,-1,8);
|
||||
addRotationMap("Mac_FlagArena", "CTF",1,0,-1,14);
|
||||
addRotationMap("SmallTimeCTF", "CTF",1,1,-1,10);
|
||||
addRotationMap("SmallTimeCTF", "CTF",1,0,-1,10);
|
||||
addRotationMap("TWL2_Hildebrand", "CTF",1,1,-1,18);
|
||||
addRotationMap("ArenaDome", "CTF",1,0,-1,12);
|
||||
addRotationMap("Firestorm", "CTF",1,0,-1,12);
|
||||
addRotationMap("Bulwark", "CTF",1,1,-1,12);
|
||||
addRotationMap("TWL_OsIris", "CTF",1,0,8,18);
|
||||
addRotationMap("FrostPipe", "CTF",1,0,-1,12);
|
||||
addRotationMap("Blink", "CTF",1,1,-1,12);
|
||||
//addRotationMap("TWL_OsIris", "CTF",1,0,8,18);
|
||||
//addRotationMap("FrostPipe", "CTF",1,0,-1,12);
|
||||
addRotationMap("Blink", "CTF",1,1,-1,10);
|
||||
addRotationMap("Discord", "CTF",1,1,6,16);
|
||||
addRotationMap("StarFallCTF", "CTF",1,1,6,12);
|
||||
addRotationMap("TWL2_MidnightMayhemDeluxe", "CTF",1,1,8,12);
|
||||
addRotationMap("Sentry", "CTF",1,1,6,12);
|
||||
addRotationMap("TWL2_Skylight", "CTF",1,1,6,12);
|
||||
addRotationMap("Cinerarium", "CTF",1,1,-1,10);
|
||||
addRotationMap("Exhumed", "CTF",1,0,-1,10);
|
||||
//addRotationMap("TWL2_FrozenHope", "CTF",1,0,8,20);
|
||||
addRotationMap("FrozenHope", "CTF",1,0,8,12);
|
||||
|
||||
//Medium Maps
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
addRotationMap("HighOctane", "CTF",1,1,8,24);
|
||||
addRotationMap("S5_Mordacity", "CTF",1,1,8,24);
|
||||
addRotationMap("S5_Damnation", "CTF",1,1,8,20);
|
||||
addRotationMap("S5_Damnation", "CTF",1,0,8,20);
|
||||
addRotationMap("TWL2_JaggedClaw", "CTF",1,1,8,24);
|
||||
addRotationMap("S5_Massive", "CTF",1,1,10,26);
|
||||
addRotationMap("TWL_Stonehenge", "CTF",1,1,8,20);
|
||||
addRotationMap("TWL_Feign", "CTF",1,1,10,20);
|
||||
addRotationMap("TheFray", "CTF",1,0,10,20);
|
||||
addRotationMap("TheFray", "CTF",1,1,10,20);
|
||||
addRotationMap("DangerousCrossing_nef", "CTF",1,1,8,20);
|
||||
addRotationMap("TWL2_Skylight", "CTF",1,1,8,20);
|
||||
addRotationMap("TWL2_Ocular", "CTF",1,1,12,-1);
|
||||
addRotationMap("Dire", "CTF",1,1,10,24);
|
||||
addRotationMap("berlard", "CTF",1,0,12,24);
|
||||
addRotationMap("Dire", "CTF",1,0,10,16);
|
||||
addRotationMap("berlard", "CTF",1,1,12,24);
|
||||
addRotationMap("S8_Opus", "CTF",1,0,8,24);
|
||||
addRotationMap("BeggarsRun", "CTF",1,0,8,24);
|
||||
addRotationMap("Headstone", "CTF",1,0,8,20);
|
||||
addRotationMap("Signal", "CTF",1,0,8,26);
|
||||
addRotationMap("S5_Woodymyrk", "CTF",1,1,8,26);
|
||||
addRotationMap("TenebrousCTF", "CTF",1,1,8,12);
|
||||
addRotationMap("Pariah", "CTF",1,0,8,20);
|
||||
addRotationMap("Prismatic", "CTF",1,1,12,26);
|
||||
addRotationMap("TWL_WilderZone", "CTF",1,0,8,20);
|
||||
addRotationMap("Mirage", "CTF",1,0,8,20);
|
||||
addRotationMap("Pariah", "CTF",1,1,8,16);
|
||||
addRotationMap("Prismatic", "CTF",1,0,12,26);
|
||||
addRotationMap("TWL_WilderZone", "CTF",1,1,8,20);
|
||||
//addRotationMap("Mirage", "CTF",1,0,8,20);
|
||||
addRotationMap("S5_Mimicry", "CTF",1,0,8,24);
|
||||
addRotationMap("TWL_Snowblind", "CTF",1,0,12,-1);
|
||||
//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,0,8,20);
|
||||
addRotationMap("TWL2_MuddySwamp", "CTF",1,0,8,20);
|
||||
//addRotationMap("IceRidge_nef", "CTF",1,0,8,20);
|
||||
//addRotationMap("Disjointed", "CTF",1,0,8,20);
|
||||
addRotationMap("TWL2_MuddySwamp", "CTF",1,1,8,20);
|
||||
addRotationMap("HighAnxiety", "CTF",1,0,8,20);
|
||||
addRotationMap("S5_Centaur", "CTF",1,0,8,20);
|
||||
addRotationMap("S5_Centaur", "CTF",1,1,8,20);
|
||||
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,0,16,-1);
|
||||
addRotationMap("TWL2_Drifts", "CTF",1,0,14,24);
|
||||
addRotationMap("TWL2_Drorck", "CTF",1,1,12,24);
|
||||
//addRotationMap("Surreal", "CTF",1,0,16,-1);
|
||||
//addRotationMap("TWL2_Drifts", "CTF",1,0,14,24);
|
||||
//addRotationMap("TWL2_Drorck", "CTF",1,0,12,24);
|
||||
//addRotationMap("TWL2_Norty", "CTF",1,0,12,24);
|
||||
addRotationMap("S5_HawkingHeat", "CTF",1,0,16,24);
|
||||
addRotationMap("StarFallCTF", "CTF",1,1,10,24);
|
||||
//addRotationMap("S5_HawkingHeat", "CTF",1,0,16,24);
|
||||
addRotationMap("TWL2_Celerity", "CTF",1,1,8,24);
|
||||
addRotationMap("Draco", "CTF",1,0,8,24);
|
||||
|
||||
//Voteable but Not in Rotation
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
//addRotationMap("Snowcone", "CTF",1,0,10,20);
|
||||
addRotationMap("S5_Drache", "CTF",1,0,10,24);
|
||||
//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_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,24);
|
||||
addRotationMap("Coppersky", "CTF",1,0,8,20);
|
||||
//addRotationMap("S5_Sherman", "CTF",1,0,10,20);
|
||||
//addRotationMap("S5_Silenus", "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,24);
|
||||
addRotationMap("Cinereous", "CTF",1,0,12,20);
|
||||
//addRotationMap("Coppersky", "CTF",1,0,8,20);
|
||||
//addRotationMap("TWL2_Crevice", "CTF",1,0,10,20);
|
||||
//addRotationMap("TWL_SubZero", "CTF",1,0,10,20);
|
||||
addRotationMap("TWL_Titan", "CTF",1,0,10,20);
|
||||
addRotationMap("Confusco", "CTF",1,0,10,20);
|
||||
//addRotationMap("TWL_Titan", "CTF",1,0,10,20);
|
||||
//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,1,8,18);
|
||||
//addRotationMap("Ramparts", "CTF",1,0,10,20);
|
||||
//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("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("TWL_DangerousCrossing", "CTF",1,1,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);
|
||||
//addRotationMap("TWL_Pandemonium", "CTF",1,0,10,24);
|
||||
|
||||
//Vehicle Maps
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -156,59 +162,59 @@ addRotationMap("Raindance_nef", "CTF",1,1,12,28);
|
|||
addRotationMap("TWL_Magmatic", "CTF",1,0,18,28);
|
||||
addRotationMap("TWL2_FrozenGlory", "CTF",1,1,12,24);
|
||||
addRotationMap("LandingParty", "CTF",1,1,12,28);
|
||||
addRotationMap("TitanV", "CTF",1,0,12,28);
|
||||
//addRotationMap("TitanV", "CTF",1,0,12,28);
|
||||
addRotationMap("TWL_Crossfire", "CTF",1,1,14,28);
|
||||
//addRotationMap("The_Calm", "CTF",1,0,12,24);
|
||||
addRotationMap("TWL2_Dissention", "CTF",1,0,16,28);
|
||||
//addRotationMap("TWL2_Dissention", "CTF",1,0,16,28);
|
||||
|
||||
//Vehicle Maps: Voteable, But Not in Rotation
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
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("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,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);
|
||||
addRotationMap("TWL_Katabatic", "CTF",1,0,16,28);
|
||||
//addRotationMap("TWL_Starfallen", "CTF",1,0,12,24);
|
||||
//addRotationMap("ConstructionYard", "CTF",1,0,12,24);
|
||||
//addRotationMap("AcidRain", "CTF",1,0,12,24);
|
||||
addRotationMap("SandOcean", "CTF",1,0,12,28);
|
||||
//addRotationMap("SandOcean", "CTF",1,0,12,28);
|
||||
//addRotationMap("StarIce", "CTF",1,0,12,24);
|
||||
addRotationMap("ks_braistv", "CTF",1,0,12,24);
|
||||
addRotationMap("FilteredDust", "CTF",1,0,12,24);
|
||||
//addRotationMap("ks_braistv", "CTF",1,0,12,24);
|
||||
//addRotationMap("FilteredDust", "CTF",1,0,12,24);
|
||||
//addRotationMap("Choke", "CTF",1,0,12,24);
|
||||
//addRotationMap("TWL_Chokepoint", "CTF",1,0,12,24);
|
||||
addRotationMap("Nightdance", "CTF",1,0,10,24);
|
||||
addRotationMap("TWL_Abaddon", "CTF",1,0,16,24);
|
||||
//addRotationMap("Nightdance", "CTF",1,0,10,24);
|
||||
//addRotationMap("TWL_Abaddon", "CTF",1,0,16,24);
|
||||
|
||||
//BIG Vehicle Maps
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
addRotationMap("Circleofstones", "CTF",1,1,12,-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("TWL2_Ruined", "CTF",1,1,18,-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,0,24,-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("Slapdash", "CTF",1,0,20,-1);
|
||||
addRotationMap("BerylBasin", "CTF",1,1,16,-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("Archipelago", "CTF",1,0,20,-1);
|
||||
addRotationMap("TWL2_Bleed", "CTF",1,0,18,-1);
|
||||
addRotationMap("Pantheon", "CTF",1,1,20,-1);
|
||||
addRotationMap("DeathBirdsFly1", "CTF",1,1,20,-1);
|
||||
addRotationMap("Scarabrae_nef", "CTF",1,0,28,-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("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
|
||||
|
|
@ -227,8 +233,8 @@ addRotationMap("CloakofNightV", "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);
|
||||
|
|
@ -347,30 +353,26 @@ addRotationMap("Crater71Lak", "Lakrabbit",1,1,6,-1);
|
|||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
addRotationMap("BastardForgeLT", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("FirestormLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("DangerousCrossingLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("SmallCrossingLT", "sctf",1,0,-1,12);
|
||||
addRotationMap("DireLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("SmallCrossingLT", "sctf",1,1,-1,12);
|
||||
addRotationMap("DireLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("RoundTheMountainLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("CirclesEdgeLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TenebrousCTF", "sctf",1,1,-1,-1);
|
||||
addRotationMap("CirclesEdgeLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("TenebrousCTF", "sctf",1,0,-1,-1);
|
||||
addRotationMap("TheFray", "sctf",1,0,-1,-1);
|
||||
addRotationMap("SignalLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("SignalLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("StarFallLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("S5_DamnationLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("S5_DamnationLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("S5_Icedance", "sctf",1,1,-1,-1);
|
||||
addRotationMap("S5_Mordacity", "sctf",1,1,-1,-1);
|
||||
addRotationMap("S5_SilenusLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("TWL2_CanyonCrusadeDeluxeLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL2_FrozenHopeLT", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL2_JaggedClawLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL2_HildebrandLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL2_SkylightLT", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_BeachBlitzLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL_FeignLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("TWL_RollercoasterLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL_RollercoasterLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("TWL_StonehengeLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL_WilderZoneLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL_WilderZoneLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("oasisintensity", "sctf",1,1,-1,10);
|
||||
addRotationMap("berlard", "sctf",1,0,-1,-1);
|
||||
addRotationMap("RaindanceLT", "sctf",1,1,-1,-1);
|
||||
|
|
@ -378,100 +380,41 @@ addRotationMap("SmallTimeLT", "sctf",1,0,-1,-1);
|
|||
addRotationMap("ArenaDome", "sctf",1,1,-1,-1);
|
||||
addRotationMap("Bulwark", "sctf",1,1,-1,-1);
|
||||
addRotationMap("Discord", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("JadeValley", "sctf",1,1,-1,-1);
|
||||
addRotationMap("S5_MassiveLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("Blink", "sctf",1,1,-1,-1);
|
||||
addRotationMap("HillSideLT", "sctf",1,1,-1,12);
|
||||
addRotationMap("IcePick", "sctf",1,1,-1,16);
|
||||
addRotationMap("OsIrisLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("GrassyKnoll", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL2_MuddySwamp", "sctf",1,1,8,-1);
|
||||
addRotationMap("TWL2_MuddySwamp", "sctf",1,0,8,-1);
|
||||
addRotationMap("SandyRunLT", "sctf",1,1,-1,12);
|
||||
addRotationMap("Sentry", "sctf",1,1,-1,-1);
|
||||
addRotationMap("Cinerarium", "sctf",1,1,-1,-1);
|
||||
addRotationMap("Exhumed", "sctf",1,1,-1,-1);
|
||||
addRotationMap("PariahLT", "sctf",1,1,-1,16);
|
||||
addRotationMap("S8_ZilchLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("TWL_BeachBlitzLT", "sctf",1,1,-1,-1);
|
||||
addRotationMap("FrozenHopeLT", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL2_JaggedClawLT", "sctf",1,1,-1,-1);
|
||||
|
||||
//Voteable, But not in rotation
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
//addRotationMap("CamellandLT", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Headstone", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("Mirage", "sctf",1,0,-1,-1);
|
||||
addRotationMap("BeggarsRunLT", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("S5_HawkingHeat", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("S5_Mimicry", "sctf",1,0,-1,-1);
|
||||
addRotationMap("S5_Woodymyrk", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("S8_Cardiac", "sctf",1,0,-1,-1);
|
||||
addRotationMap("S5_WoodymyrkLT", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_BeachBlitzLak", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL2_Celerity", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL2_Crevice", "sctf",1,0,-1,-1);
|
||||
addRotationMap("S8_Opus", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL2_MidnightMayhemDeluxe", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL2_Ocular", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL_Cinereous", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL_Deserted", "sctf",1,0,-1,-1);
|
||||
addRotationMap("TWL_DangerousCrossing", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL_OsIris", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL_Damnation", "sctf",1,0,-1,-1);
|
||||
//addRotationMap("TWL_Titan", "sctf",1,0,-1,-1);
|
||||
|
||||
|
||||
//Not Voteable, Not in rotation
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
addRotationMap("SurrealLT", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Coppersky", "sctf",1,1,-1,-1);
|
||||
addRotationMap("SurrealLT", "sctf",1,0,-1,-1);
|
||||
addRotationMap("DuelersDelight", "sctf",1,0,-1,12);
|
||||
//addRotationMap("SuperHappyBouncyFunTime", "sctf",1,1,-1,-1);
|
||||
addRotationMap("PariahLT", "sctf",1,1,-1,16);
|
||||
//addRotationMap("SmallMelee", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TitForTat", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("CloseCombatLT", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Prismatic", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Damnation", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("DustToDust", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Minotaur", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("DesertofDeath_nef", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Gorgon", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Titan", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Mac_FlagArena", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Extractor", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("AstersDescent", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Azoth", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("DustLust", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Disjointed", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Peak", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Snowcone", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("S5_Centaur", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("S5_Drache", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("S5_Misadventure", "sctf",1,1,-1,-1);
|
||||
//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_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);
|
||||
//addRotationMap("TWL2_IceDagger", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL2_Norty", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL2_RoughLand", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL2_Ruined", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_BaNsHee", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Boss", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Crossfire", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_NoShelter", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Clusterfuct", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Curtilage", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_DeadlyBirdsSong", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Frostclaw", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Magamatic", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Neve", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Pandemonium", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("TWL_Ramparts", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("DehSwamp", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("HostileLoch", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("DevilsElbow", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("SmallDesertofDeath", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("ShortFall", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Fallout", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("SoylentGreen", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("Island", "sctf",1,1,-1,-1);
|
||||
//addRotationMap("HighOctane", "sctf",1,1,-1,-1);
|
||||
|
||||
|
||||
|
||||
// _____ _ _ _ _
|
||||
// | __ \ | | | | | | | |
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ $Host::holoName3 = "Starwolf";
|
|||
$Host::holoName4 = "DSword";
|
||||
$Host::holoName5 = "BloodEagle";
|
||||
$Host::holoName6 = "Harbinger";
|
||||
$Host::Info = " ";
|
||||
$Host::Info = "This is a Tribes 2 Classic server. More information in Discord. <a:playt2.com/discord>playt2.com/discord</a>";
|
||||
$Host::ItemRespawnTime = 30;
|
||||
$Host::KickBanTime = 600;
|
||||
$Host::KickObserverTimeout = 1200;
|
||||
|
|
|
|||
|
|
@ -2073,7 +2073,7 @@ function CTFGame::awardScoreKill(%game, %killerID)
|
|||
function checkVehicleCamping( %team )
|
||||
{
|
||||
%position = $flagPos[%team];
|
||||
%radius = 5;
|
||||
%radius = 15;
|
||||
InitContainerRadiusSearch(%position, %radius, $TypeMasks::VehicleObjectType );
|
||||
|
||||
while ((%vehicle = containerSearchNext()) != 0)
|
||||
|
|
|
|||
|
|
@ -709,7 +709,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
|||
}
|
||||
else if(%points >= 100)
|
||||
{
|
||||
%sound = '~wfx/Misc/MA1.wav';
|
||||
messageAll('', '~wfx/Misc/Flair.wav');
|
||||
}
|
||||
|
||||
Game.recalcScore(%sourceObject.client);
|
||||
|
|
@ -1768,11 +1768,6 @@ function LakRabbitGame::playerDroppedFlag(%game, %player)
|
|||
}
|
||||
}
|
||||
|
||||
function ResetCantPickUpFlag(%player)
|
||||
{
|
||||
%player.client.CantPickUpFlag = false;
|
||||
}
|
||||
|
||||
function LakRabbitGame::playerTouchFlag(%game, %player, %flag)
|
||||
{
|
||||
if(%player.getState() $= "Dead" || %player.client.flagDeny)
|
||||
|
|
@ -1781,11 +1776,11 @@ function LakRabbitGame::playerTouchFlag(%game, %player, %flag)
|
|||
// borlak - can't pick up flag until 2 ppl are on
|
||||
if(PlayingPlayers() < 2)
|
||||
{
|
||||
if(!%player.client.CantPickUpFlag)
|
||||
%timeDif = getSimTime() - %player.client.pickUpTime;
|
||||
if(%timeDif > 5000 || !%player.client.pickUpTime)
|
||||
{
|
||||
messageClient(%player.client, 'msgNoFlagWarning', "\c2You can't pick up the flag until another person joins." );
|
||||
%player.client.CantPickUpFlag = true;
|
||||
schedule(5000, 0, "ResetCantPickUpFlag", %player ); //message only every 5 seconds
|
||||
%player.client.pickUpTime = getSimTime();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -471,59 +471,7 @@ package SCtFGame
|
|||
function SCtFGame::missionLoadDone(%game)
|
||||
{
|
||||
//default version sets up teams - must be called first...
|
||||
%game.initGameVars(); //set up scoring variables and other game specific globals
|
||||
|
||||
// make team0 visible/friendly to all
|
||||
setSensorGroupAlwaysVisMask(0, 0xffffffff);
|
||||
setSensorGroupFriendlyMask(0, 0xffffffff);
|
||||
|
||||
// update colors:
|
||||
// - enemy teams are red
|
||||
// - same team is green
|
||||
// - team 0 is white
|
||||
for(%i = 0; %i < 32; %i++)
|
||||
{
|
||||
%team = (1 << %i);
|
||||
setSensorGroupColor(%i, %team, "0 255 0 255");
|
||||
setSensorGroupColor(%i, ~%team, "255 0 0 255");
|
||||
setSensorGroupColor(%i, 1, "255 255 255 255");
|
||||
|
||||
// setup the team targets (alwyas friendly and visible to same team)
|
||||
setTargetAlwaysVisMask(%i, %team);
|
||||
setTargetFriendlyMask(%i, %team);
|
||||
}
|
||||
|
||||
//set up the teams
|
||||
%game.setUpTeams();
|
||||
|
||||
//clear out the team rank array...
|
||||
for (%i = 0; %i < 32; %i++)
|
||||
$TeamRank[%i, count] = "";
|
||||
|
||||
// objectiveInit has to take place after setupTeams -- objective HUD relies on flags
|
||||
// having their team set
|
||||
MissionGroup.objectiveInit();
|
||||
|
||||
//initialize the AI system
|
||||
%game.aiInit();
|
||||
|
||||
//need to reset the teams if we switch from say, CTF to Bounty...
|
||||
// assign the bots team
|
||||
if ($currentMissionType !$= $previousMissionType)
|
||||
{
|
||||
$previousMissionType = $currentMissionType;
|
||||
for(%i = 0; %i < ClientGroup.getCount(); %i++)
|
||||
{
|
||||
%cl = ClientGroup.getObject(%i);
|
||||
if (%cl.isAIControlled())
|
||||
%game.assignClientTeam(%cl);
|
||||
}
|
||||
}
|
||||
|
||||
//Save off respawn or Siege Team switch information...
|
||||
if(%game.class !$= "SiegeGame")
|
||||
MissionGroup.setupPositionMarkers(true);
|
||||
echo("Default game mission load done.");
|
||||
DefaultGame::missionLoadDone(%game);
|
||||
|
||||
for(%i = 1; %i < (%game.numTeams + 1); %i++)
|
||||
$teamScore[%i] = 0;
|
||||
|
|
@ -539,7 +487,7 @@ function SCtFGame::missionLoadDone(%game)
|
|||
%game.campThread_1 = schedule( 1000, 0, "checkVehicleCamping", 1 );
|
||||
%game.campThread_2 = schedule( 1000, 0, "checkVehicleCamping", 2 );
|
||||
|
||||
deleteNonSCtFObjectsFromMap();
|
||||
deleteNonSCtFObjectsFromMap();
|
||||
}
|
||||
|
||||
function SCtFGame::clientMissionDropReady(%game, %client)
|
||||
|
|
|
|||
|
|
@ -1,19 +1,15 @@
|
|||
// Team Autobalance Script
|
||||
//
|
||||
// Determines which team needs players and proceeds to find candidates
|
||||
// Candidates are based on low scores then switches the candidate
|
||||
// Determines which team needs players and proceeds to switch them
|
||||
// Goon style: At respawn
|
||||
//
|
||||
// Enable or Disable Autobalance
|
||||
// $Host::EnableAutobalance = 1;
|
||||
//
|
||||
// exec("scripts/autoexec/Autobalance.cs");
|
||||
|
||||
// How far behind littleTeam must be to use All Mode.
|
||||
// Meaning picking from a pool of all players on the bigTeam instead of just the lowest scoring player.
|
||||
// 400 equals 400 points. 4 caps behind.
|
||||
$AllModeThreshold = 300;
|
||||
|
||||
|
||||
// Run from TeamBalanceNotify.cs via UnbalancedSound( %game )
|
||||
function Autobalance( %game, %AutobalanceSafetynetTrys )
|
||||
// Run from TeamBalanceNotify.cs via NotifyUnbalanced
|
||||
function Autobalance( %game )
|
||||
{
|
||||
if(isEventPending($AutoBalanceSchedule))
|
||||
cancel($AutoBalanceSchedule);
|
||||
|
|
@ -21,111 +17,67 @@ function Autobalance( %game, %AutobalanceSafetynetTrys )
|
|||
if( $TBNStatus !$= "NOTIFY" ) //If Status has changed to EVEN or anything else (GameOver reset).
|
||||
return;
|
||||
|
||||
//Debug: Uncomment to enable
|
||||
//%AutobalanceDebug = true;
|
||||
|
||||
//Difference Variables
|
||||
%team1difference = $TeamRank[1, count] - $TeamRank[2, count];
|
||||
%team2difference = $TeamRank[2, count] - $TeamRank[1, count];
|
||||
|
||||
//Determine bigTeam
|
||||
//Determine BigTeam
|
||||
if( %team1difference >= 2 )
|
||||
%bigTeam = 1;
|
||||
$BigTeam = 1;
|
||||
else if( %team2difference >= 2 )
|
||||
%bigTeam = 2;
|
||||
$BigTeam = 2;
|
||||
else
|
||||
return;
|
||||
|
||||
%otherteam = $BigTeam == 1 ? 2 : 1;
|
||||
if($TeamRank[$BigTeam, count] - $TeamRank[%otherteam, count] >= 3)
|
||||
%s = "s";
|
||||
|
||||
//Warning message
|
||||
messageAll('MsgTeamBalanceNotify', '\c1Teams are unbalanced: \c0Autobalance will switch the next respawning player%2 on Team %1.', $TeamName[$BigTeam], %s);
|
||||
}
|
||||
|
||||
%littleTeam = ( %bigTeam == 1 ) ? 2 : 1;
|
||||
|
||||
//Toggle for All Mode
|
||||
//If a team is behind pick anyone, not just a low scoring player
|
||||
if( $TeamScore[%bigTeam] > ($TeamScore[%littleTeam] + $AllModeThreshold))
|
||||
{
|
||||
%UseAllMode = 1;
|
||||
%autobalanceRandom = getRandom(1,($PlayerCount[%bigTeam] - 1));
|
||||
}
|
||||
|
||||
//Pick a client for autobalance
|
||||
for(%i = 0; %i < ClientGroup.getCount(); %i++)
|
||||
{
|
||||
%client = ClientGroup.getObject(%i);
|
||||
%team = %client.team;
|
||||
|
||||
//Holding flag?
|
||||
if(%client.player.holdingFlag !$= "")
|
||||
continue;
|
||||
|
||||
if(%UseAllMode)
|
||||
{
|
||||
//Try to pick any player
|
||||
if(%autobalanceRandom == %AllmodeLoop || %lastclient[%team] $= "")
|
||||
%teamcanidate[%team] = %client;
|
||||
|
||||
%AllmodeLoop++;
|
||||
package Autobalance
|
||||
{
|
||||
|
||||
// called from player scripts
|
||||
function DefaultGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation)
|
||||
{
|
||||
parent::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation);
|
||||
|
||||
if($BigTeam !$= "" && %clVictim.team == $BigTeam)
|
||||
{
|
||||
%otherteam = $BigTeam == 1 ? 2 : 1;
|
||||
if($TeamRank[$BigTeam, count] - $TeamRank[%otherteam, count] >= 2)
|
||||
{
|
||||
//If someone switches to observer or disconnects
|
||||
if(%damageType !$= 0)
|
||||
{
|
||||
echo(%clVictim.nameBase @ " has been moved to Team " @ %otherTeam @ " for balancing.");
|
||||
messageClient(%clVictim, 'MsgTeamBalanceNotify', '\c0You were switched to Team %1 for balancing.~wfx/powered/vehicle_screen_on.wav', $TeamName[%otherteam]);
|
||||
messageAllExcept(%clVictim, -1, 'MsgTeamBalanceNotify', '~wfx/powered/vehicle_screen_on.wav');
|
||||
|
||||
Game.clientChangeTeam( %clVictim, %otherTeam, 0 );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//Normal circumstances
|
||||
//Try to pick a low scoring player
|
||||
if(%client.score < %lastclient[%team].score || %lastclient[%team] $= "")
|
||||
%teamcanidate[%team] = %client;
|
||||
$BigTeam = "";
|
||||
ResetTBNStatus();
|
||||
}
|
||||
%lastclient[%team] = %client;
|
||||
}
|
||||
|
||||
//Debug
|
||||
if( %AutobalanceDebug )
|
||||
AutobalanceDebug(%teamcanidate1, %teamcanidate2, %team1difference, %team2difference, %bigTeam, %AutobalanceSafetynetTrys, %UseAllMode);
|
||||
|
||||
%client = %teamcanidate[%bigTeam];
|
||||
%team = %teamcanidate[%bigTeam].team;
|
||||
%otherTeam = ( %team == 1 ) ? 2 : 1;
|
||||
|
||||
// Fire Autobalance
|
||||
Game.clientChangeTeam( %client, %otherTeam, 0 );
|
||||
messageClient(%client, 'MsgTeamBalanceNotify', "\c0You were switched to the other team for balancing.~wfx/powered/vehicle_screen_on.wav");
|
||||
messageAllExcept(%client, -1, 'MsgTeamBalanceNotify', "~wfx/powered/vehicle_screen_on.wav");
|
||||
|
||||
//Trigger GetCounts
|
||||
ResetGetCountsStatus();
|
||||
//Reset TBN
|
||||
ResetTBNStatus();
|
||||
}
|
||||
}
|
||||
|
||||
function AutobalanceDebug(%teamcanidate1, %teamcanidate2, %team1difference, %team2difference, %bigTeam, %AutobalanceSafetynetTrys, %UseAllMode)
|
||||
function DefaultGame::gameOver(%game)
|
||||
{
|
||||
if( %teamcanidate[%bigTeam] $= "" )
|
||||
{
|
||||
%AutobalanceSafetynetTrys++;
|
||||
if(%AutobalanceSafetynetTrys $= 3)
|
||||
return;
|
||||
|
||||
if( %teamcanidate1 $= "" && %teamcanidate2 $= "" )
|
||||
%error = "Both Teams";
|
||||
else if( %teamcanidate[%bigTeam] $= "" )
|
||||
%error = "Team " @ %bigTeam;
|
||||
|
||||
if( %error !$= "" )
|
||||
messageAll('MsgTeamBalanceNotify', '\c0Autobalance error: %1', %error );
|
||||
|
||||
//Trigger GetCounts
|
||||
ResetGetCountsStatus();
|
||||
//Rerun in 10 secs
|
||||
schedule(10000, 0, "Autobalance", %game, %AutobalanceSafetynetTrys );
|
||||
}
|
||||
Parent::gameOver(%game);
|
||||
|
||||
if(%UseAllMode)
|
||||
%mode = "All Mode";
|
||||
else
|
||||
%mode = "Low Mode";
|
||||
|
||||
if( %teamcanidate1 $= "" )
|
||||
%teamcanidate1 = "NULL";
|
||||
if( %teamcanidate2 $= "" )
|
||||
%teamcanidate2 = "NULL";
|
||||
|
||||
messageAll('MsgTeamBalanceNotify', '\c0Autobalance stat: %1, %2, %3, %4, %5', %teamcanidate1, %team1difference, %teamcanidate2, %team2difference, %mode );
|
||||
|
||||
return;
|
||||
}
|
||||
//Reset Autobalance
|
||||
$BigTeam = "";
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// Prevent package from being activated if it is already
|
||||
if (!isActivePackage(Autobalance))
|
||||
activatePackage(Autobalance);
|
||||
|
|
@ -10,24 +10,23 @@ package ObserverTimeout
|
|||
function serverCmdClientMakeObserver( %client )
|
||||
{
|
||||
//10 second cooldown on becoming an observer
|
||||
if( !%client.MakeObserverTimeout || %client.isAdmin )
|
||||
{
|
||||
%timeDif = getSimTime() - %client.observerTimeout;
|
||||
%timeDif1 = getSimTime() - %client.observerMsg;
|
||||
if(%timeDif > 10000 || !%client.observerTimeout || %client.isAdmin)
|
||||
{
|
||||
if ( isObject( Game ) && Game.kickClient != %client )
|
||||
Game.forceObserver( %client, "playerChoose" );
|
||||
|
||||
%client.MakeObserverTimeout = true;
|
||||
%client.ObserverProtectStart = getSimTime();
|
||||
schedule(10000, 0, "ResetMakeObserverTimeout", %client );
|
||||
%client.observerProtectStart = getSimTime();
|
||||
%client.observerTimeout = getSimTime();
|
||||
}
|
||||
//5 second cooldown on the notification
|
||||
else if( !%client.ObserverCooldownMsgPlayed )
|
||||
//1 second cooldown on message
|
||||
else if((%timeDif1 > 1000 || !%client.observerMsg))
|
||||
{
|
||||
%wait = mFloor((10000 - (getSimTime() - %client.ObserverProtectStart)) / 1000);
|
||||
%wait = mFloor((10000 - (getSimTime() - %client.observerProtectStart)) / 1000);
|
||||
messageClient(%client, 'MsgObserverCooldown', '\c3Observer Cooldown:\cr Please wait another %1 seconds.', %wait );
|
||||
//messageClient(%client, 'MsgObserverCooldown', '\c2Observer is on cooldown.' );
|
||||
|
||||
%client.ObserverCooldownMsgPlayed = true;
|
||||
schedule(2000, 0, "ResetObserverCooldownMsgPlayed", %client );
|
||||
%client.observerMsg = getSimTime();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -35,16 +34,4 @@ function serverCmdClientMakeObserver( %client )
|
|||
|
||||
// Prevent package from being activated if it is already
|
||||
if (!isActivePackage(ObserverTimeout))
|
||||
activatePackage(ObserverTimeout);
|
||||
|
||||
//Allow client to become observer again
|
||||
function ResetMakeObserverTimeout( %client )
|
||||
{
|
||||
%client.MakeObserverTimeout = false;
|
||||
}
|
||||
|
||||
//Allow a notification again
|
||||
function ResetObserverCooldownMsgPlayed( %client )
|
||||
{
|
||||
%client.ObserverCooldownMsgPlayed = false;
|
||||
}
|
||||
activatePackage(ObserverTimeout);
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -68,7 +68,6 @@ $dtLoadingScreen::ShowImages = 0;
|
|||
if( $Host::LoadScreenColor1 $= " " ) $Host::LoadScreenColor1 = "05edad";
|
||||
if( $Host::LoadScreenColor2 $= " " ) $Host::LoadScreenColor2 = "29DEE7";
|
||||
if( $Host::LoadScreenColor3 $= " " ) $Host::LoadScreenColor3 = "33CCCC";
|
||||
if( $Host::Info !$= " " ) $Host::Info = " ";
|
||||
|
||||
// So ServerDefaults wont replace a "" value when meant to be blank
|
||||
for(%x = 1; %x <= 4; %x++)
|
||||
|
|
@ -458,8 +457,8 @@ function NORMALsendModInfoToClient(%client)
|
|||
messageClient(%client, 'MsgLoadObjectiveLine', "", %SpecialTextLine[%line], !%singlePlayer);
|
||||
|
||||
// Send server info:
|
||||
if(!%singlePlayer)
|
||||
messageClient(%client, 'MsgLoadRulesLine', "", "<color:29DEE7>" @ $Host::Info, false);
|
||||
//if(!%singlePlayer)
|
||||
// messageClient(%client, 'MsgLoadRulesLine', "", "<color:29DEE7>" @ $Host::Info, false);
|
||||
|
||||
for(%line = 0; %line < %ServerCnt; %line++)
|
||||
if (%ServerTextLine[%line] !$= "")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue