diff --git a/Classic/prefs/MapRotation.cs b/Classic/prefs/MapRotation.cs index 1cb299a..f30f3b7 100644 --- a/Classic/prefs/MapRotation.cs +++ b/Classic/prefs/MapRotation.cs @@ -1,11 +1,11 @@ -// __ __ _____ _ _ _ -// | \/ | | __ \ | | | | (_) -// | \ / | __ _ _ __ | |__) |___ | |_ __ _| |_ _ ___ _ __ -// | |\/| |/ _` | '_ \ | _ // _ \| __/ _` | __| |/ _ \| '_ \ +// __ __ _____ _ _ _ +// | \/ | | __ \ | | | | (_) +// | \ / | __ _ _ __ | |__) |___ | |_ __ _| |_ _ ___ _ __ +// | |\/| |/ _` | '_ \ | _ // _ \| __/ _` | __| |/ _ \| '_ \ // | | | | (_| | |_) | | | \ \ (_) | || (_| | |_| | (_) | | | | // |_| |_|\__,_| .__/ |_| \_\___/ \__\__,_|\__|_|\___/|_| |_| -// | | -// |_| +// | | +// |_| // // Use of this file // To add a new map follow this rules: @@ -34,243 +34,246 @@ //addRotationMap("VulcansHammer","Siege",1,1,0,64); //addRotationMap("AgentsOfFortune","TeamHunters",1,1,0,64); // -// _____ _______ ______ + + +// _____ _______ ______ // / ____|__ __| ____| -// | | | | | |__ -// | | | | | __| -// | |____ | | | | -// \_____| |_| |_| +// | | | | | |__ +// | | | | | __| +// | |____ | | | | +// \_____| |_| |_| ///////////////////////////////////////////////////////////////////// //Small Maps ///////////////////////////////////////////////////////////////////// //addRotationMap("SmallCrossing", "CTF",1,1,-1,16); //Using DMP Version -addRotationMap("TWL2_CanyonCrusadeDeluxe", "CTF",1,1,-1,18); +addRotationMap("TWL2_CanyonCrusadeDeluxe", "CTF",1,1,-1,24); addRotationMap("RoundTheMountain", "CTF",1,1,-1,18); -addRotationMap("oasisintensity", "CTF",1,1,-1,12); +addRotationMap("oasisintensity", "CTF",1,1,-1,10); 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,0,-1,12); -addRotationMap("Machineeggs", "CTF",1,0,-1,8); +addRotationMap("Machineeggs", "CTF",1,1,-1,10); addRotationMap("Mac_FlagArena", "CTF",1,0,-1,14); -addRotationMap("SmallTimeCTF", "CTF",1,0,-1,10); +addRotationMap("SmallTimeCTF", "CTF",1,0,-1,14); 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,10); +addRotationMap("Blink", "CTF",1,0,-1,10); addRotationMap("Discord", "CTF",1,1,6,16); addRotationMap("TWL2_MidnightMayhemDeluxe", "CTF",1,0,8,12); -addRotationMap("Sentry", "CTF",1,1,6,12); -addRotationMap("TWL2_Skylight", "CTF",1,0,6,12); -addRotationMap("Exhumed", "CTF",1,1,-1,10); -//addRotationMap("TWL2_FrozenHope", "CTF",1,0,8,20); +addRotationMap("Sentry", "CTF",1,1,-1,14); +addRotationMap("TWL2_Skylight", "CTF",1,1,-1,10); +addRotationMap("Exhumed", "CTF",1,0,-1,12); addRotationMap("FrozenHope", "CTF",1,1,8,12); -addRotationMap("ClusterUnFuct", "CTF",1,1,8,12); -addRotationMap("Raspian", "CTF",1,0,8,12); -addRotationMap("Zilch", "CTF",1,1,8,12); +addRotationMap("ClusterUnFuct", "CTF",1,0,8,12); +//addRotationMap("Raspian", "CTF",1,0,8,12); +addRotationMap("Zilch", "CTF",1,1,6,12); +addRotationMap("SuperHappyBouncyFunTime", "CTF",1,0,-1,12); +addRotationMap("SuperiorWaterworks", "CTF",1,0,-1,12); +//addRotationMap("TWL2_FrozenHope", "CTF",1,0,8,20); +//addRotationMap("Island", "CTF",1,1,-1,12); +//addRotationMap("TitForTat", "CTF",1,1,-1,12); //addRotationMap("Cinerarium", "CTF",1,0,-1,12); //Using DMP Version //addRotationMap("StarFallCTF", "CTF",1,0,6,12); //Using DMP Version +//addRotationMap("TWL_OsIris", "CTF",1,0,8,18); +//addRotationMap("FrostPipe", "CTF",1,0,-1,12); //Medium Maps ///////////////////////////////////////////////////////////////////// -addRotationMap("HighOctane", "CTF",1,1,8,24); -addRotationMap("S5_Mordacity", "CTF",1,1,12,24); -addRotationMap("S5_Damnation", "CTF",1,0,12,20); -addRotationMap("TWL2_JaggedClaw", "CTF",1,1,12,24); -addRotationMap("S5_Massive", "CTF",1,1,10,26); +addRotationMap("HighOctane", "CTF",1,0,10,24); +addRotationMap("S5_Mordacity", "CTF",1,1,10,24); +addRotationMap("S5_Damnation", "CTF",1,1,12,20); +addRotationMap("TWL2_JaggedClaw", "CTF",1,1,14,28); +addRotationMap("S5_Massive", "CTF",1,1,12,32); addRotationMap("TWL_Stonehenge", "CTF",1,1,8,20); -addRotationMap("TWL_Feign", "CTF",1,0,10,20); +addRotationMap("TWL_Feign", "CTF",1,1,10,28); addRotationMap("TheFray", "CTF",1,0,10,20); -addRotationMap("DangerousCrossing_nef", "CTF",1,1,8,20); -addRotationMap("TWL2_Ocular", "CTF",1,1,16,-1); -addRotationMap("Dire", "CTF",1,1,10,16); -addRotationMap("berlard", "CTF",1,0,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,10,26); +//addRotationMap("DangerousCrossing_nef", "CTF",1,1,8,20); +addRotationMap("TWL_DangerousCrossing", "CTF",1,0,10,28); +addRotationMap("TWL2_Ocular", "CTF",1,1,20,-1); +addRotationMap("Dire", "CTF",1,0,10,16); +addRotationMap("berlard", "CTF",1,1,12,24); +addRotationMap("S8_Opus", "CTF",1,1,12,24); +addRotationMap("TWL_BeggarsRun", "CTF",1,0,18,24); +addRotationMap("Headstone", "CTF",1,1,8,24); +addRotationMap("Signal", "CTF",1,0,8,24); +addRotationMap("S5_Woodymyrk", "CTF",1,1,10,32); addRotationMap("TenebrousCTF", "CTF",1,0,8,12); -addRotationMap("Pariah", "CTF",1,0,8,16); -addRotationMap("Prismatic", "CTF",1,1,12,26); -addRotationMap("TWL_WilderZone", "CTF",1,0,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("ShortFall", "CTF",1,1,12,24); -//addRotationMap("IceRidge_nef", "CTF",1,0,8,20); +addRotationMap("Prismatic", "CTF",1,0,16,32); +addRotationMap("TWL_WilderZone", "CTF",1,1,12,32); +addRotationMap("S5_Mimicry", "CTF",1,0,12,32); +addRotationMap("TWL_Snowblind", "CTF",1,1,20,-1); +addRotationMap("ShortFall", "CTF",1,0,18,28); +addRotationMap("IceRidge_nef", "CTF",1,0,12,32); //addRotationMap("Disjointed", "CTF",1,0,8,20); -addRotationMap("TWL2_MuddySwamp", "CTF",1,0,8,20); -addRotationMap("HighAnxiety", "CTF",1,0,8,20); -addRotationMap("S5_Centaur", "CTF",1,0,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_MuddySwamp", "CTF",1,0,10,24); +addRotationMap("HighAnxiety", "CTF",1,1,-1,12); +addRotationMap("S5_Centaur", "CTF",1,1,-1,12); +addRotationMap("S8_Cardiac", "CTF",1,1,18,-1); +addRotationMap("CirclesEdge", "CTF",1,0,10,24); +addRotationMap("S5_Icedance", "CTF",1,1,10,28); +addRotationMap("Surreal", "CTF",1,0,24,-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("TWL2_Celerity", "CTF",1,1,8,24); +addRotationMap("S5_HawkingHeat", "CTF",1,0,16,28); +addRotationMap("TWL2_Celerity", "CTF",1,1,12,32); addRotationMap("Draco", "CTF",1,0,8,24); +//addRotationMap("Pariah", "CTF",1,0,8,24); //Using DMP Version +//addRotationMap("Mirage", "CTF",1,0,8,20); +addRotationMap("Norty", "CTF",1,1,18,32); //Voteable but Not in Rotation ///////////////////////////////////////////////////////////////////// -//addRotationMap("Snowcone", "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_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,12,20); +addRotationMap("TWL2_IceDagger", "CTF",1,1,10,20); +addRotationMap("TWL_Titan", "CTF",1,0,16,32); +addRotationMap("Burstside", "CTF",1,0,10,20); +addRotationMap("Infernus", "CTF",1,0,18,26); addRotationMap("Confusco", "CTF",1,0,10,20); -//addRotationMap("Fallout", "CTF",1,0,10,20); +//addRotationMap("Snowcone", "CTF",1,0,10,20); +addRotationMap("S5_Drache", "CTF",1,0,16,28); +//addRotationMap("JadeValley", "CTF",1,0,10,20); +addRotationMap("S5_Sherman", "CTF",1,1,24,-1); +addRotationMap("S5_Silenus", "CTF",1,0,8,20); +addRotationMap("S5_Reynard", "CTF",1,0,10,20); +//addRotationMap("Coppersky", "CTF",1,0,8,20); +//addRotationMap("TWL2_Crevice", "CTF",1,0,10,20); +addRotationMap("TWL_SubZero", "CTF",1,0,16,32); +addRotationMap("Fallout", "CTF",1,1,16,24); //addRotationMap("TheClocktower", "CTF",1,0,10,20); //addRotationMap("SoylentGreen", "CTF",1,0,10,20); //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("TWL_Damnation", "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_Damnation", "CTF",1,0,10,20); +addRotationMap("TWL_DeadlyBirdsSong", "CTF",1,0,24,32); +addRotationMap("Vauban", "CTF",1,0,18,-1); +addRotationMap("TWL_Pandemonium", "CTF",1,0,16,24); +addRotationMap("TWL_WhiteDwarf", "CTF",1,0,18,24); +//addRotationMap("Cinereous", "CTF",1,0,12,20); //Vehicle Maps ///////////////////////////////////////////////////////////////////// -addRotationMap("Logans_Run", "CTF",1,1,8,28); -addRotationMap("Rollercoaster_nef", "CTF",1,1,8,28); -//addRotationMap("Rollercoaster_nef_FZ", "CTF",1,1,8,28); -addRotationMap("HostileLoch", "CTF",1,0,12,24); -addRotationMap("TWL_BeachBlitz", "CTF",1,1,12,24); -addRotationMap("TWL2_Magnum", "CTF",1,1,12,28); -addRotationMap("MoonDance", "CTF",1,0,12,28); +addRotationMap("Logans_Run", "CTF",1,1,14,28); +addRotationMap("Rollercoaster_nef", "CTF",1,1,8,-1); +addRotationMap("HostileLoch", "CTF",1,1,8,12); +addRotationMap("TWL_BeachBlitz", "CTF",1,1,18,28); +addRotationMap("TWL2_Magnum", "CTF",1,1,12,-1); +//addRotationMap("MoonDance", "CTF",1,0,12,28); //Using DMP Version addRotationMap("Raindance_nef", "CTF",1,1,12,28); addRotationMap("TWL_Magmatic", "CTF",1,0,14,28); addRotationMap("TWL2_FrozenGlory", "CTF",1,1,12,24); -addRotationMap("LandingParty", "CTF",1,1,12,28); +addRotationMap("LandingParty", "CTF",1,0,16,20); +addRotationMap("TWL_Crossfire", "CTF",1,1,18,28); //addRotationMap("TitanV", "CTF",1,0,12,28); -addRotationMap("TWL_Crossfire", "CTF",1,1,14,28); +//addRotationMap("Rollercoaster_nef_FZ", "CTF",1,1,8,28); //addRotationMap("The_Calm", "CTF",1,0,12,24); -//addRotationMap("TWL2_Dissention", "CTF",1,0,16,28); +addRotationMap("TWL2_Dissention", "CTF",1,0,16,32); //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("TWL2_BlueMoon", "CTF",1,1,18,28); -addRotationMap("TWL_Katabatic", "CTF",1,0,16,28); +addRotationMap("SubZeroV", "CTF",1,0,12,24); +addRotationMap("S8_Geothermal", "CTF",1,0,12,24); +addRotationMap("Lakefront", "CTF",1,0,16,24); +addRotationMap("ShockRidge", "CTF",1,0,12,24); +addRotationMap("TWL2_BlueMoon", "CTF",1,1,18,32); +addRotationMap("TWL_Katabatic", "CTF",1,0,16,32); +addRotationMap("SandOcean", "CTF",1,0,12,28); +addRotationMap("ks_braistv", "CTF",1,0,12,24); +addRotationMap("Nightdance", "CTF",1,0,16,24); +addRotationMap("TWL_Abaddon", "CTF",1,0,16,24); +//addRotationMap("StarIce", "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("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("StarIce", "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("Agorazscium", "CTF",1,0,12,24); //BIG Vehicle Maps ///////////////////////////////////////////////////////////////////// addRotationMap("Circleofstones", "CTF",1,1,16,-1); -//addRotationMap("TWL2_Ruined", "CTF",1,1,18,-1); -addRotationMap("Ruined", "CTF",1,0,16,-1); -//addRotationMap("Agorazscium", "CTF",1,0,24,-1); +addRotationMap("Ruined", "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,16,-1); -//addRotationMap("WindyGap", "CTF",1,0,24,-1); -addRotationMap("Fenix", "CTF",1,1,24,-1); -addRotationMap("Hillside", "CTF",1,1,24,-1); -//addRotationMap("Sangre_de_Grado", "CTF",1,0,20,-1); -//addRotationMap("Slapdash", "CTF",1,0,20,-1); -addRotationMap("BerylBasin", "CTF",1,0,16,-1); +//addRotationMap("Surro", "CTF",1,0,18,24); +addRotationMap("TWL2_RoughLand", "CTF",1,0,16,-1); +addRotationMap("HarvestDance", "CTF",1,1,24,-1); +//addRotationMap("WindyGap", "CTF",1,0,24,-1); +addRotationMap("Fenix", "CTF",1,1,26,-1); +addRotationMap("Hillside", "CTF",1,0,28,-1); +addRotationMap("TWL_Slapdash", "CTF",1,0,24,-1); +addRotationMap("BerylBasin", "CTF",1,1,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,18,-1); -addRotationMap("Pantheon", "CTF",1,0,20,-1); +addRotationMap("TWL2_Bleed", "CTF",1,0,24,-1); addRotationMap("DeathBirdsFly1", "CTF",1,1,24,-1); -addRotationMap("Scarabrae_nef", "CTF",1,0,28,-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("Horde", "CTF",1,0,24,-1); +addRotationMap("CloakofNightV", "CTF",1,0,24,-1); +//addRotationMap("TWL2_Ruined", "CTF",1,1,18,-1); //addRotationMap("Glade", "CTF",1,1,28,-1); -addRotationMap("TWL_Horde", "CTF",1,1,24,-1); -addRotationMap("CloakofNightV", "CTF",1,1,24,-1); +//addRotationMap("Pantheon", "CTF",1,0,20,-1); +//addRotationMap("Archipelago", "CTF",1,0,20,-1); +//addRotationMap("Sangre_de_Grado", "CTF",1,0,20,-1); //DMP Mappack ///////////////////////////////////////////////////////////////////// -addRotationMap("DMP_Agroleon", "CTF",1,0,16,28); -addRotationMap("DMP_Astro", "CTF",1,1,8,18); -addRotationMap("DMP_BastardForge", "CTF",1,1,6,24); -addRotationMap("DMP_BitterGorge", "CTF",1,0,18,24); -addRotationMap("DMP_Bunkered", "CTF",1,1,6,12); -addRotationMap("DMP_Cinerarium", "CTF",1,1,6,12); -addRotationMap("DMP_DermCity", "CTF",1,0,-1,-1); -addRotationMap("DMP_Embers", "CTF",1,0,6,12); -addRotationMap("DMP_EmeraldSpit", "CTF",1,1,10,20); +addRotationMap("DMP_Agroleon", "CTF",1,1,18,28); +addRotationMap("DMP_Astro", "CTF",1,0,16,26); +addRotationMap("DMP_BastardForge", "CTF",1,1,8,28); +addRotationMap("DMP_BitterGorge", "CTF",1,0,24,-1); +addRotationMap("DMP_Bunkered", "CTF",1,0,6,14); +addRotationMap("DMP_Cinerarium", "CTF",1,1,-1,20); +addRotationMap("DMP_DermCity", "CTF",1,0,-1,-1); +addRotationMap("DMP_Embers", "CTF",1,0,-1,14); +addRotationMap("DMP_EmeraldSpit", "CTF",1,0,10,20); addRotationMap("DMP_FaceCrossing", "CTF",1,0,10,20); -addRotationMap("DMP_Hoth", "CTF",1,0,24,-1); -addRotationMap("DMP_IceGiant", "CTF",1,0,16,28); +addRotationMap("DMP_Hoth", "CTF",1,1,26,-1); +addRotationMap("DMP_IceGiant", "CTF",1,0,20,32); addRotationMap("DMP_IsleDeBatalla", "CTF",1,0,10,20); -addRotationMap("DMP_LavaGods", "CTF",1,1,10,20); -addRotationMap("DMP_Magellan", "CTF",1,1,10,18); -addRotationMap("DMP_MoonDance", "CTF",1,1,12,28); -addRotationMap("DMP_Pantheon", "CTF",1,0,18,28); -addRotationMap("DMP_Paranoia", "CTF",1,1,6,10); -addRotationMap("DMP_Pariah", "CTF",1,1,8,16); -addRotationMap("DMP_PipeDream", "CTF",1,1,8,16); +addRotationMap("DMP_LavaGods", "CTF",1,0,10,20); +addRotationMap("DMP_Magellan", "CTF",1,1,10,28); +addRotationMap("DMP_MoonDance", "CTF",1,1,12,32); +addRotationMap("DMP_Pantheon", "CTF",1,0,16,24); +addRotationMap("DMP_Paranoia", "CTF",1,0,6,10); +addRotationMap("DMP_Pariah", "CTF",1,1,8,24); +addRotationMap("DMP_PipeDream", "CTF",1,0,8,16); addRotationMap("DMP_RavineV", "CTF",1,0,12,28); -addRotationMap("DMP_ScorchedEarth", "CTF",1,0,14,-1); -addRotationMap("DMP_SimpleFlagArena", "CTF",1,1,6,12); -addRotationMap("DMP_SpinCycle", "CTF",1,1,8,16); -addRotationMap("DMP_StarFall", "CTF",1,1,6,12); -addRotationMap("DMP_Tyre", "CTF",1,1,16,24); -addRotationMap("DMP_Wasteland", "CTF",1,1,10,20); +addRotationMap("DMP_ScorchedEarth", "CTF",1,0,24,-1); +addRotationMap("DMP_SimpleFlagArena", "CTF",1,0,-1,12); +addRotationMap("DMP_SpinCycle", "CTF",1,1,-1,16); +addRotationMap("DMP_StarFall", "CTF",1,0,-1,16); +addRotationMap("DMP_Tyre", "CTF",1,1,16,-1); +addRotationMap("DMP_Wasteland", "CTF",1,0,10,20); -addRotationMap("SC_Normal", "CTF",1,1,-1,16); -// addRotationMap("SC_Badlands", "CTF",1,1,-1,16); -// addRotationMap("SC_Desert", "CTF",1,1,-1,16); -// addRotationMap("SC_Lush", "CTF",1,1,-1,16); +addRotationMap("SC_Normal", "CTF",1,0,-1,16); +//addRotationMap("SC_Badlands", "CTF",1,0,-1,16); +//addRotationMap("SC_Desert", "CTF",1,0,-1,16); +//addRotationMap("SC_Lush", "CTF",1,0,-1,16); addRotationMap("SC_Ice", "CTF",1,1,-1,16); -// addRotationMap("SC_Night", "CTF",1,1,-1,16); -// addRotationMap("DX_Badlands", "CTF",1,1,10,20); -// addRotationMap("DX_Desert", "CTF",1,1,10,20); -addRotationMap("DX_Ice", "CTF",1,0,10,20); -// addRotationMap("HO_Badlands", "CTF",1,1,8,24); -// addRotationMap("HO_Desert", "CTF",1,1,8,24); -addRotationMap("HO_Ice", "CTF",1,1,8,24); -// addRotationMap("HO_Lush", "CTF",1,1,8,24); -addRotationMap("Attrition", "CTF",1,0,-1,-1); -// addRotationMap("Chasmaclysmic", "CTF",1,1,-1,-1); -// addRotationMap("DBS_Smoothed", "CTF",1,1,-1,-1); -// addRotationMap("PuliVeivari", "CTF",1,1,-1,-1); +addRotationMap("SC_Night", "CTF",1,0,-1,16); +//addRotationMap("DX_Badlands", "CTF",1,0,10,20); +//addRotationMap("DX_Desert", "CTF",1,0,10,20); +addRotationMap("DX_Ice", "CTF",1,1,10,28); +//addRotationMap("HO_Badlands", "CTF",1,1,8,24); +//addRotationMap("HO_Desert", "CTF",1,0,8,24); +addRotationMap("HO_Ice", "CTF",1,1,8,28); +addRotationMap("HO_Lush", "CTF",1,0,8,24); +addRotationMap("Attrition", "CTF",1,0,-1,10); +//addRotationMap("Chasmaclysmic", "CTF",1,1,-1,-1); +//addRotationMap("DBS_Smoothed", "CTF",1,0,-1,-1); +addRotationMap("PuliVeivari", "CTF",1,0,-1,-1); addRotationMap("PlanetX", "CTF",1,0,-1,-1); -// addRotationMap("Ravine", "CTF",1,1,-1,-1); +//addRotationMap("Ravine", "CTF",1,1,-1,-1); addRotationMap("Stripmine", "CTF",1,0,-1,-1); //Not In Rotation - Not Voteable @@ -279,7 +282,7 @@ addRotationMap("Stripmine", "CTF",1,0,-1,-1); //addRotationMap("Sandstorm", "CTF",1,0,-1,-1); //addRotationMap("Starfallen", "CTF",1,0,-1,-1); //addRotationMap("Stonehenge_nef", "CTF",1,0,-1,-1); -//addRotationMap("Extractor", "CTF",1,0,-1,-1); +addRotationMap("Extractor", "CTF",1,0,16,-1); //addRotationMap("AstersDescent", "CTF",1,0,-1,-1); //addRotationMap("Azoth", "CTF",1,0,-1,-1); //addRotationMap("BattleGrove", "CTF",1,0,-1,-1); @@ -298,7 +301,7 @@ addRotationMap("Stripmine", "CTF",1,0,-1,-1); //addRotationMap("TWL_Boss", "CTF",1,0,-1,-1); //addRotationMap("TWL_NoShelter", "CTF",1,0,-1,-1); //addRotationMap("TWL_Clusterfuct", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Curtilage", "CTF",1,0,-1,-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_Neve", "CTF",1,0,-1,-1); @@ -339,27 +342,58 @@ addRotationMap("Stripmine", "CTF",1,0,-1,-1); //addRotationMap("Sub-zero", "CTF",1,0,-1,-1); +// Custom +///////////////////////////////////////////////////////////////////// -// _ _ _ _ _ _ -// | | | | | | | | (_) | -// | | __ _| | ___ __ __ _| |__ | |__ _| |_ +addRotationMap("CoconutFury", "CTF",1,0,-1,-1); +addRotationMap("CinderCone", "CTF",1,0,-1,-1); +addRotationMap("Sector1", "CTF",1,0,-1,-1); +//addRotationMap("Slamnation", "CTF",0,0,-1,-1); +//addRotationMap("MountaintopMayhem", "CTF",0,0,-1,-1); + +addRotationMap("ChasmClash", "CTF",1,0,-1,14); +//addRotationMap("FrostBite", "CTF",1,0,-1,-1); +//addRotationMap("Lapiths", "CTF",1,0,-1,-1); +addRotationMap("GreenLawn", "CTF",1,1,12,32); +addRotationMap("OuterWilds", "CTF",1,1,-1,12); +addRotationMap("Jettisoned", "CTF",1,0,-1,10); +addRotationMap("Moonwalk", "CTF",1,1,12,-1); +addRotationMap("Drafts", "CTF",1,1,-1,12); +//addRotationMap("IslaHermano", "CTF",1,0,-1,-1); +addRotationMap("DermCrossingDeluxe", "CTF",1,0,-1,-1); +addRotationMap("DaftGulch", "CTF",1,1,16,24); +addRotationMap("Triad", "CTF",1,0,12,20); +addRotationMap("Vaubania", "CTF",1,0,-1,12); +addRotationMap("VanDamnedCTF", "CTF",1,1,-1,14); +addRotationMap("HillKingCTF", "CTF",1,1,-1,18); +addRotationMap("Bonespur", "CTF",1,1,-1,14); +addRotationMap("Bridgepoint", "CTF",1,0,-1,18); +addRotationMap("Narcolepsy", "CTF",1,1,-1,20); +addRotationMap("WhiteDwarfDeluxe", "CTF",1,0,-1,14); +addRotationMap("SmallSpit", "CTF",1,1,-1,20); +addRotationMap("MisadventureV2", "CTF",1,1,12,28); +addRotationMap("El_Fin", "CTF",1,1,-1,14); + +// _ _ _ _ _ _ +// | | | | | | | | (_) | +// | | __ _| | ___ __ __ _| |__ | |__ _| |_ // | | / _` | |/ / '__/ _` | '_ \| '_ \| | __| -// | |___| (_| | <| | | (_| | |_) | |_) | | |_ +// | |___| (_| | <| | | (_| | |_) | |_) | | |_ // |______\__,_|_|\_\_| \__,_|_.__/|_.__/|_|\__| ///////////////////////////////////////////////////////////////////// //In Rotation ///////////////////////////////////////////////////////////////////// -addRotationMap("VaubanLak", "Lakrabbit",1,1,8,-1); +addRotationMap("VaubanLak", "Lakrabbit",1,0,8,-1); addRotationMap("MiniSunDried", "Lakrabbit",1,1,-1,12); addRotationMap("Sundance", "Lakrabbit",1,1,-1,-1); -addRotationMap("TWL_BeachBlitzLak", "Lakrabbit",1,1,-1,-1); +addRotationMap("TWL_BeachBlitzLak", "Lakrabbit",1,0,-1,-1); addRotationMap("DesertofDeathLak", "Lakrabbit",1,1,-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("SkinnyDipLak", "Lakrabbit",1,0,-1,-1); +addRotationMap("SaddiesHill", "Lakrabbit",1,0,-1,-1); addRotationMap("HavenLak", "Lakrabbit",1,0,-1,-1); addRotationMap("LushLak", "Lakrabbit",1,1,8,-1); addRotationMap("BoxLak", "Lakrabbit",1,1,-1,10); @@ -369,7 +403,7 @@ 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); addRotationMap("CloakofLak", "Lakrabbit",1,1,-1,-1); addRotationMap("SpectreLak", "Lakrabbit",1,1,-1,-1); @@ -381,7 +415,7 @@ 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("PhasmaDustLak", "Lakrabbit",1,0,-1,12); addRotationMap("GodsRiftLak", "Lakrabbit",1,0,-1,-1); addRotationMap("SolsDescentLak", "Lakrabbit",1,0,-1,-1); addRotationMap("Crater71Lak", "Lakrabbit",1,0,6,-1); @@ -398,30 +432,27 @@ addRotationMap("Crater71Lak", "Lakrabbit",1,0,6,-1); //addRotationMap("DamnnationLak", "Lakrabbit",1,0,-1,-1); -// _ _____ _______ ______ +// _ _____ _______ ______ // | | / ____|__ __| ____| -// | | | | | | | |__ -// | | | | | | | __| -// | |___| |____ | | | | -// |______\_____| |_| |_| +// | | | | | | | |__ +// | | | | | | | __| +// | |___| |____ | | | | +// |______\_____| |_| |_| ///////////////////////////////////////////////////////////////////// //In Rotation ///////////////////////////////////////////////////////////////////// - -addRotationMap("BastardForgeLT", "sctf",1,1,-1,-1); -addRotationMap("DangerousCrossingLT", "sctf",1,1,-1,-1); -addRotationMap("SmallCrossingLT", "sctf",1,1,-1,12); +addRotationMap("DangerousCrossingLT", "sctf",1,0,-1,-1); +addRotationMap("SmallCrossingLT", "sctf",1,0,-1,12); addRotationMap("DireLT", "sctf",1,0,-1,-1); addRotationMap("RoundTheMountainLT", "sctf",1,1,-1,-1); -addRotationMap("CirclesEdgeLT", "sctf",1,0,-1,-1); +addRotationMap("CirclesEdgeLT", "sctf",1,1,-1,-1); addRotationMap("TenebrousCTF", "sctf",1,0,-1,-1); addRotationMap("TheFray", "sctf",1,0,-1,-1); addRotationMap("SignalLT", "sctf",1,0,-1,-1); -addRotationMap("StarFallLT", "sctf",1,1,-1,-1); -addRotationMap("S5_DamnationLT", "sctf",1,0,-1,-1); +addRotationMap("S5_DamnationLT", "sctf",1,0,8,-1); addRotationMap("S5_Icedance", "sctf",1,1,-1,-1); -addRotationMap("S5_Mordacity", "sctf",1,1,-1,-1); +addRotationMap("S5_Mordacity", "sctf",1,1,10,-1); addRotationMap("S5_SilenusLT", "sctf",1,0,-1,-1); addRotationMap("TWL2_CanyonCrusadeDeluxeLT", "sctf",1,1,-1,-1); addRotationMap("TWL2_HildebrandLT", "sctf",1,1,-1,-1); @@ -431,68 +462,80 @@ addRotationMap("TWL_RollercoasterLT", "sctf",1,0,-1,-1); addRotationMap("TWL_StonehengeLT", "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); +addRotationMap("berlard", "sctf",1,1,-1,-1); +addRotationMap("RaindanceLT", "sctf",1,0,-1,-1); addRotationMap("SmallTimeLT", "sctf",1,0,-1,-1); -addRotationMap("ArenaDome", "sctf",1,1,-1,-1); +addRotationMap("ArenaDome", "sctf",1,1,-1,10); addRotationMap("Bulwark", "sctf",1,1,-1,-1); addRotationMap("Discord", "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("S5_MassiveLT", "sctf",1,0,-1,-1); +addRotationMap("Blink", "sctf",1,0,-1,-1); +addRotationMap("HillSideLT", "sctf",1,1,-1,10); addRotationMap("IcePick", "sctf",1,1,-1,16); -addRotationMap("OsIrisLT", "sctf",1,1,-1,-1); +addRotationMap("OsIrisLT", "sctf",1,0,-1,-1); addRotationMap("GrassyKnoll", "sctf",1,1,-1,-1); addRotationMap("TWL2_MuddySwamp", "sctf",1,0,8,-1); -addRotationMap("SandyRunLT", "sctf",1,1,-1,12); +addRotationMap("SandyRunLT", "sctf",1,0,-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("TWL_BeachBlitzLT", "sctf",1,0,-1,-1); addRotationMap("FrozenHopeLT", "sctf",1,1,-1,-1); -addRotationMap("Confusco", "sctf",1,0,6,-1); -//addRotationMap("TWL2_JaggedClawLT", "sctf",1,1,-1,-1); +//addRotationMap("Confusco", "sctf",1,0,6,-1); +addRotationMap("TWL2_JaggedClawLT", "sctf",1,1,-1,-1); //Voteable, But not in rotation ///////////////////////////////////////////////////////////////////// addRotationMap("BeggarsRunLT", "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("S5_WoodymyrkLT", "sctf",1,0,-1,-1); addRotationMap("S8_Opus", "sctf",1,0,-1,-1); addRotationMap("TWL_DangerousCrossing", "sctf",1,0,-1,-1); //DMP Mappack ///////////////////////////////////////////////////////////////////// -// addRotationMap("Attrition", "sctf",1,0,-1,-1); -addRotationMap("Rush", "sctf",1,1,-1,-1); +addRotationMap("AttritionLT", "sctf",1,1,-1,-1); +addRotationMap("RushLT", "sctf",1,1,-1,-1); addRotationMap("HillKingLT", "sctf",1,1,-1,-1); -addRotationMap("DMP_BastardForge", "sctf",1,1,-1,-1); +addRotationMap("DMP_BastardForgeLT", "sctf",1,1,-1,-1); addRotationMap("VanDamnedLT", "sctf",1,1,-1,-1); addRotationMap("DMP_Paranoia", "sctf",1,0,-1,-1); addRotationMap("DMP_Spincycle", "sctf",1,1,-1,-1); addRotationMap("Ravine", "sctf",1,1,-1,-1); // addRotationMap("DX_Badlands", "sctf",1,0,-1,-1); // addRotationMap("DX_Desert", "sctf",1,0,-1,-1); -// addRotationMap("DX_Ice", "sctf",1,0,-1,-1); -//addRotationMap("Moonwalk", "sctf",1,0,-1,-1); - +addRotationMap("DX_Ice", "sctf",1,1,-1,-1); +addRotationMap("PipeDreamLT", "sctf",1,0,-1,-1); +addRotationMap("DMP_LavaGods", "sctf",1,0,10,20); +addRotationMap("DMP_StarFallLT", "sctf",1,1,-1,-1); +addRotationMap("DMP_BunkeredLT", "sctf",1,1,-1,12); +addRotationMap("DMP_PariahLT", "sctf",1,1,-1,-1); //Not Voteable, Not in rotation ///////////////////////////////////////////////////////////////////// -addRotationMap("SurrealLT", "sctf",1,0,-1,-1); +//addRotationMap("SurrealLT", "sctf",1,0,-1,-1); addRotationMap("DuelersDelight", "sctf",1,0,-1,12); +addRotationMap("SmallSpit", "sctf",1,1,-1,14); +addRotationMap("BonespurLT", "sctf",1,1,-1,14); +addRotationMap("Bridgepoint", "sctf",1,1,-1,14); +addRotationMap("NarcolepsyLT", "sctf",1,1,-1,14); +addRotationMap("WhiteDwarfDeluxeLT", "sctf",1,0,-1,14); +addRotationMap("ClusterUnFuct", "sctf",1,1,8,-1); +addRotationMap("OuterWilds", "sctf",1,1,-1,12); +addRotationMap("Drafts", "sctf",1,1,-1,12); +addRotationMap("DermCrossingDeluxeLT", "sctf",1,1,-1,-1); +addRotationMap("SuperiorWaterworks", "sctf",1,0,-1,12); +addRotationMap("FrozenForgeLT", "sctf",1,1,-1,20); +addRotationMap("TWL2_CelerityLT", "sctf",1,1,-1,20); +addRotationMap("El_Fin", "sctf",1,1,-1,14); - -// _____ _ _ _ _ -// | __ \ | | | | | | | | -// | | | | ___ __ _| |_| |__ _ __ ___ __ _| |_ ___| |__ -// | | | |/ _ \/ _` | __| '_ \| '_ ` _ \ / _` | __/ __| '_ \ +// _____ _ _ _ _ +// | __ \ | | | | | | | | +// | | | | ___ __ _| |_| |__ _ __ ___ __ _| |_ ___| |__ +// | | | |/ _ \/ _` | __| '_ \| '_ ` _ \ / _` | __/ __| '_ \ // | |__| | __/ (_| | |_| | | | | | | | | (_| | || (__| | | | // |_____/ \___|\__,_|\__|_| |_|_| |_| |_|\__,_|\__\___|_| |_| ///////////////////////////////////////////////////////////////////// @@ -509,10 +552,11 @@ 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); +addRotationMap("RingofFireDM", "DM",1,1,-1,10); +addRotationMap("GorgonDM", "DM",1,1,-1,10); - -// _____ _ +// _____ _ // | __ \ | | // | | | |_ _ ___| | // | | | | | | |/ _ \ | @@ -540,14 +584,14 @@ addRotationMap("PitsDM", "DM",1,1,-1,10); -// _____ _ -// / ____(_) -// | (___ _ ___ __ _ ___ +// _____ _ +// / ____(_) +// | (___ _ ___ __ _ ___ // \___ \| |/ _ \/ _` |/ _ \ // ____) | | __/ (_| | __/ // |_____/|_|\___|\__, |\___| -// __/ | -// |___/ +// __/ | +// |___/ ///////////////////////////////////////////////////////////////////// //addRotationMap("Alcatraz", "Siege",1,1,-1,-1); @@ -563,12 +607,13 @@ addRotationMap("PitsDM", "DM",1,1,-1,10); -// _ _ _ -// | | | | | | -// | |__| |_ _ _ __ | |_ ___ _ __ ___ +// _ _ _ +// | | | | | | +// | |__| |_ _ _ __ | |_ ___ _ __ ___ // | __ | | | | '_ \| __/ _ \ '__/ __| // | | | | |_| | | | | || __/ | \__ \ // |_| |_|\__,_|_| |_|\__\___|_| |___/ ///////////////////////////////////////////////////////////////////// -//addRotationMap("MiniSunDried", "Hunters",1,1,-1,-1); +//addRotationMap("MiniSunDried","Hunters",1,1,-1,-1); +//addRotationMap("DustToDust","Hunters",1,1,-1,-1); diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs index 528523f..6481263 100644 --- a/Classic/scripts/LakRabbitGame.cs +++ b/Classic/scripts/LakRabbitGame.cs @@ -920,6 +920,287 @@ function Player::setKnockback(%this, %val) // } //} +//Old Behavior +function ShapeBaseImageData::onFire(%data, %obj, %slot) +{ + // --------------------------------------------------------------------------- + // z0dd - ZOD, 9/3/02. Anti rapid fire mortar/missile fix. + // if (%obj.cantFire !$= "") + // { + // return 0; + // } + + // %wpnName = %data.getName(); + // if((%wpnName $= "MortarImage") || (%wpnName $= "MissileLauncherImage")) + // { + // %obj.cantFire = 1; + // %preventTime = %data.stateTimeoutValue[4]; + // //%preventTime = (%data.stateTimeoutValue[4] + %data.stateTimeoutValue[3]) - 0.032; + // %obj.reloadSchedule = schedule(%preventTime * 1000, %obj, resetFire, %obj); + // } + // --------------------------------------------------------------------------- + %obj.lfireTime[%data.getName()] = getSimTime(); + + %data.lightStart = getSimTime(); + + if( %obj.station $= "" && %obj.isCloaked() ) + { + if( %obj.respawnCloakThread !$= "" ) + { + Cancel(%obj.respawnCloakThread); + %obj.setCloaked( false ); + %obj.respawnCloakThread = ""; + } + else + { + if( %obj.getEnergyLevel() > 20 ) + { + %obj.setCloaked( false ); + %obj.reCloak = %obj.schedule( 500, "setCloaked", true ); + } + + //We check if the player is still cloaked now. So no need to limit to 20% energy for the cloak in/out animation + //%obj.setCloaked( false ); + //%obj.reCloak = schedule( 500, 0, "checkCloakState", %obj); + } + } + + if( %obj.client > 0 ) + { + %obj.setInvincibleMode(0 ,0.00); + %obj.setInvincible( false ); // fire your weapon and your invincibility goes away. + } + + %vehicle = 0; + if(%data.usesEnergy) + { + if(%data.useMountEnergy) + { + %useEnergyObj = %obj.getObjectMount(); + if(!%useEnergyObj) + %useEnergyObj = %obj; + %energy = %useEnergyObj.getEnergyLevel(); + %vehicle = %useEnergyObj; + } + else + %energy = %obj.getEnergyLevel(); + + if(%data.useCapacitor && %data.usesEnergy) + { + if( %useEnergyObj.turretObject.getCapacitorLevel() < %data.minEnergy ) + { + return; + } + } + else if(%energy < %data.minEnergy) + return; + } + // --------------------------------------------------------------------- + // z0dd - ZOD, 4/24/02. Code optimization + if(%data.projectileSpread) + { + %vec = %obj.getMuzzleVector(%slot); + %x = (getRandom() - 0.5) * 2 * 3.1415926 * %data.projectileSpread; + %y = (getRandom() - 0.5) * 2 * 3.1415926 * %data.projectileSpread; + %z = (getRandom() - 0.5) * 2 * 3.1415926 * %data.projectileSpread; + %mat = MatrixCreateFromEuler(%x @ " " @ %y @ " " @ %z); + %vector = MatrixMulVector(%mat, %vec); + } + else + { + // z0dd - ZOD, 4/10/02. Founder - fixes off center projectile drift. + //%vector = %obj.getMuzzleVector(%slot); + %vector = MatrixMulVector("0 0 0 0 0 1 0", %obj.getMuzzleVector(%slot)); + } + + %p = new (%data.projectileType)() { + dataBlock = %data.projectile; + initialDirection = %vector; + initialPosition = %obj.getMuzzlePoint(%slot); + sourceObject = %obj; + sourceSlot = %slot; + vehicleObject = %vehicle; + }; + // End streamlining + // --------------------------------------------------------------------- + if (isObject(%obj.lastProjectile) && %obj.deleteLastProjectile) + %obj.lastProjectile.delete(); + + %obj.lastProjectile = %p; + %obj.deleteLastProjectile = %data.deleteLastProjectile; + MissionCleanup.add(%p); + + // AI hook + if(%obj.client) + %obj.client.projectile = %p; + + if(%data.usesEnergy) + { + if(%data.useMountEnergy) + { + if( %data.useCapacitor ) + { + %vehicle.turretObject.setCapacitorLevel( %vehicle.turretObject.getCapacitorLevel() - %data.fireEnergy ); + } + else + %useEnergyObj.setEnergyLevel(%energy - %data.fireEnergy); + } + else + %obj.setEnergyLevel(%energy - %data.fireEnergy); + } + else + %obj.decInventory(%data.ammo,1); + return %p; +} + +//Old Behavior +function ShockLanceImage::onFire(%this, %obj, %slot) +{ + // Added Spawn Invinciblity check + if(%obj.client > 0) + { + %obj.setInvincibleMode(0, 0.00); + %obj.setInvincible( false ); + } + + // z0dd - ZOD, 4/10/04. ilys - Added rapidfire shocklance fix + if(%obj.cantfire !$= "") + return; + + %obj.cantfire = 1; + %preventTime = %this.stateTimeoutValue[4]; + %obj.reloadSchedule = schedule(%preventTime * 1000, %obj, resetFire, %obj); + + if( %obj.getEnergyLevel() < %this.minEnergy ) // z0dd - ZOD, 5/22/03. Check energy level first + { + %obj.playAudio(0, ShockLanceMissSound); + return; + } + if( %obj.isCloaked() ) + { + if( %obj.respawnCloakThread !$= "" ) + { + Cancel(%obj.respawnCloakThread); + %obj.setCloaked( false ); + } + else + { + if( %obj.getEnergyLevel() > 20 ) + { + %obj.setCloaked( false ); + %obj.reCloak = %obj.schedule( 500, "setCloaked", true ); + } + + //We check if the player is still cloaked now. So no need to limit to 20% energy for the cloak in/out animation + //%obj.setCloaked( false ); + //%obj.reCloak = schedule( 500, 0, "checkCloakState", %obj); + } + } + + %muzzlePos = %obj.getMuzzlePoint(%slot); + %muzzleVec = %obj.getMuzzleVector(%slot); + %endPos = VectorAdd(%muzzlePos, VectorScale(%muzzleVec, %this.projectile.extension)); + %damageMasks = $TypeMasks::PlayerObjectType | $TypeMasks::VehicleObjectType | + $TypeMasks::StationObjectType | $TypeMasks::GeneratorObjectType | + $TypeMasks::SensorObjectType | $TypeMasks::TurretObjectType; + + %everythingElseMask = $TypeMasks::TerrainObjectType | + $TypeMasks::InteriorObjectType | + $TypeMasks::ForceFieldObjectType | + $TypeMasks::StaticObjectType | + $TypeMasks::MoveableObjectType | + $TypeMasks::DamagableItemObjectType; + + // did I miss anything? players, vehicles, stations, gens, sensors, turrets + %hit = ContainerRayCast(%muzzlePos, %endPos, %damageMasks | %everythingElseMask, %obj); + %noDisplay = true; + + if(%hit !$= "0") + { + %obj.setEnergyLevel(%obj.getEnergyLevel() - %this.hitEnergy); + %hitobj = getWord(%hit, 0); + %hitpos = getWord(%hit, 1) @ " " @ getWord(%hit, 2) @ " " @ getWord(%hit, 3); + + if(%hitObj.getType() & %damageMasks) + { + // z0dd - ZOD, 5/18/03. Do not apply impulse to MPB. + if(%hitObj.getDataBlock().classname !$= WheeledVehicleData) + %hitobj.applyImpulse(%hitpos, VectorScale(%muzzleVec, %this.projectile.impulse)); + + %obj.playAudio(0, ShockLanceHitSound); + + // This is truly lame, but we need the sourceobject property present... + %p = new ShockLanceProjectile() { + dataBlock = %this.projectile; + initialDirection = %obj.getMuzzleVector(%slot); + initialPosition = %obj.getMuzzlePoint(%slot); + sourceObject = %obj; + sourceSlot = %slot; + targetId = %hit; + }; + MissionCleanup.add(%p); + + %damageMultiplier = 1.0; + + if(%hitObj.getDataBlock().getClassName() $= "PlayerData") + { + // Now we see if we hit from behind... + %forwardVec = %hitobj.getForwardVector(); + %objDir2D = getWord(%forwardVec, 0) @ " " @ getWord(%forwardVec,1) @ " " @ "0.0"; + %objPos = %hitObj.getPosition(); + %dif = VectorSub(%objPos, %muzzlePos); + %dif = getWord(%dif, 0) @ " " @ getWord(%dif, 1) @ " 0"; + %dif = VectorNormalize(%dif); + %dot = VectorDot(%dif, %objDir2D); + + // 120 Deg angle test... + // 1.05 == 60 degrees in radians + if (%dot >= mCos(1.05)) + { + // Rear hit + %damageMultiplier = 3.0; + if(!%hitObj.getOwnerClient().isAIControlled()) + %hitObj.getOwnerClient().rearshot = 1; // z0dd - ZOD, 8/25/02. Added Lance rear shot messages + } + // -------------------------------------------------------------- + // z0dd - ZOD, 8/25/02. Added Lance rear shot messages + else + { + if(!%hitObj.getOwnerClient().isAIControlled()) + %hitObj.getOwnerClient().rearshot = 0; + } + // -------------------------------------------------------------- + } + + %totalDamage = %this.Projectile.DirectDamage * %damageMultiplier; + %hitObj.getDataBlock().damageObject(%hitobj, %p.sourceObject, %hitpos, %totalDamage, $DamageType::ShockLance); + + %noDisplay = false; + } + } + + if( %noDisplay ) + { + // Miss + %obj.setEnergyLevel(%obj.getEnergyLevel() - %this.missEnergy); + %obj.playAudio(0, ShockLanceMissSound); + + %p = new ShockLanceProjectile() { + dataBlock = %this.projectile; + initialDirection = %obj.getMuzzleVector(%slot); + initialPosition = %obj.getMuzzlePoint(%slot); + sourceObject = %obj; + sourceSlot = %slot; + }; + MissionCleanup.add(%p); + } + // z0dd - ZOD, 4/10/04. AI hook + if(%obj.client != -1) + %obj.client.projectile = %p; + + return %p; +} + }; //Put everyone on NonRabbit Team