From ed25ab2dcacf3270fe6477f0a3be6d827d1144ff Mon Sep 17 00:00:00 2001 From: Robert Fritzen Date: Sat, 1 Jul 2017 16:06:02 -0500 Subject: [PATCH] Fixes, 3.9.2 Prep Work Fixed the PvP Zombie Kills challenge bug, installed challenges for upcoming 3.9.2 Killstreaks --- scripts/RankStuff.cs | 2 +- scripts/TWM2/Systems/Killstreak.cs | 3 + scripts/TWM2/Systems/NWChallengeIndex.cs | 64 ++++++++++++-------- scripts/TWM2/Zombie/PlayerZombieFunctions.cs | 1 + scripts/player.cs | 2 +- 5 files changed, 45 insertions(+), 27 deletions(-) diff --git a/scripts/RankStuff.cs b/scripts/RankStuff.cs index 790a2b6..f114808 100644 --- a/scripts/RankStuff.cs +++ b/scripts/RankStuff.cs @@ -27,7 +27,7 @@ $Prestige::Rewards[5] = "Silver Armor Flag, Crimson Hawk"; $Prestige::Rewards[6] = "Blue Armor Flag"; $Prestige::Rewards[7] = "Red Armor Flag"; $Prestige::Rewards[8] = "Green Armor Flag"; -$Prestige::Rewards[9] = "Plasma Torpedo Cannon"; +$Prestige::Rewards[9] = "PulseStar Strike, Plasma Torpedo Cannon"; $Prestige::Rewards[10] = "Dartanian Elite Armor, Incendiary Cannon"; $Prestige::Rewards[11] = "VMC9 Gravity Cannon"; $Prestige::Rewards[12] = "DDV4 Plasma Launcher"; diff --git a/scripts/TWM2/Systems/Killstreak.cs b/scripts/TWM2/Systems/Killstreak.cs index 7ed42a7..12c7ba7 100644 --- a/scripts/TWM2/Systems/Killstreak.cs +++ b/scripts/TWM2/Systems/Killstreak.cs @@ -17,6 +17,9 @@ $Killstreak[14] = "Arrow IV Nuke Strike\t"@$Killstreak::Kills["Nuke", 0]@"\t"@$K $Killstreak[15] = "Z-Bomb\t-1\t"@$Killstreak::Kills["ZBomb", 1]@"\tWipe out all zombies (not bosses) in a flash."; $Killstreak[16] = "Fission Bomb\t"@$Killstreak::Kills["Fission", 0]@"\t-1\t(Matches) End the game with an explosive bang."; $Killstreak[17] = "Napalm Airstrike\t"@$Killstreak::Kills["Napalm", 0]@"\t"@$Killstreak::Kills["Napalm", 1]@"\tQuick destructive airstrike with remaining fire."; +//Coming Soon 3.9.2 +//$Killstreak[18] = "PulseStar Shield System\t"@$Killstreak::Kills["PulseStar", 0]@"\t"@$Killstreak::Kills["PulseStar", 1]@"\tAirdrop an advanced Harbinger shield system."; +//$Killstreak[19] = "LOAS\t"@$Killstreak::Kills["LOAS", 0]@"\t"@$Killstreak::Kills["LOAS", 1]@"\tControl a localized satellite to direct high powered explosive rod strikes."; //Phantom: V3.9: Order the streaks based on killcounts... function OrderStreaks() { diff --git a/scripts/TWM2/Systems/NWChallengeIndex.cs b/scripts/TWM2/Systems/NWChallengeIndex.cs index 3387b46..9e128af 100644 --- a/scripts/TWM2/Systems/NWChallengeIndex.cs +++ b/scripts/TWM2/Systems/NWChallengeIndex.cs @@ -127,21 +127,30 @@ $Challenge::Challenge[1, 44] = "Nuke3"; $Challenge::Info["Nuke3"] = "Nuke Expert III\t1\t50000\tZ-Bomb Killstreak\tCall in 25 Nukes"; $Challenge::Challenge[1, 45] = "Fission1"; $Challenge::SetRequirement[1, 45] = "Officer 1"; -$Challenge::Info["Fission1"] = "Fission Bomb Expert I\t1\t25000\tNone\tCall in 1 Fission Bomb"; +$Challenge::Info["Fission1"] = "Fission Bomb Expert I\t1\t25000\tNone\tCall in a Fission Bomb"; $Challenge::Challenge[1, 46] = "Fission2"; $Challenge::SetRequirement[1, 46] = "Officer 1"; -$Challenge::Info["Fission2"] = "Fission Bomb Expert II\t1\t50000\tNone\tCall in 2 Fission Bomb"; +$Challenge::Info["Fission2"] = "Fission Bomb Expert II\t1\t50000\tNone\tCall in 2 Fission Bombs"; $Challenge::Challenge[1, 47] = "Fission3"; $Challenge::SetRequirement[1, 47] = "Officer 1"; -$Challenge::Info["Fission3"] = "Fission Bomb Expert III\t1\t75000\tNone\tCall in 5 Fission Bomb"; -$Challenge::Challenge[1, 48] = "LOAS1"; -$Challenge::SetRequirement[1, 48] = "Officer 15"; +$Challenge::Info["Fission3"] = "Fission Bomb Expert III\t1\t75000\tNone\tCall in 5 Fission Bombs"; +$Challenge::Challenge[1, 48] = "PulseStar1"; +$Challenge::SetRequirement[1, 48] = "Officer 9"; +$Challenge::Info["PulseStar1"] = "PulseStar Expert I\t1\t5000\tNone\tCall in 15 PulseStar Shield Systems"; +$Challenge::Challenge[1, 49] = "PulseStar2"; +$Challenge::SetRequirement[1, 49] = "Officer 9"; +$Challenge::Info["PulseStar2"] = "PulseStar Expert II\t1\t10000\tNone\tCall in 30 PulseStar Shield Systems"; +$Challenge::Challenge[1, 50] = "PulseStar3"; +$Challenge::SetRequirement[1, 50] = "Officer 9"; +$Challenge::Info["PulseStar3"] = "PulseStar Expert III\t1\t25000\tNone\tCall in 50 PulseStar Shield Systems"; +$Challenge::Challenge[1, 51] = "LOAS1"; +$Challenge::SetRequirement[1, 51] = "Officer 15"; $Challenge::Info["LOAS1"] = "LOAS Expert I\t1\t25000\tNone\tCall in 5 Low Orbit Orbital Strikes (LOAS)"; -$Challenge::Challenge[1, 49] = "LOAS2"; -$Challenge::SetRequirement[1, 49] = "Officer 15"; +$Challenge::Challenge[1, 52] = "LOAS2"; +$Challenge::SetRequirement[1, 52] = "Officer 15"; $Challenge::Info["LOAS2"] = "LOAS Expert II\t1\t50000\tNone\tCall in 10 Low Orbit Orbital Strikes (LOAS)"; -$Challenge::Challenge[1, 50] = "LOAS3"; -$Challenge::SetRequirement[1, 50] = "Officer 15"; +$Challenge::Challenge[1, 53] = "LOAS3"; +$Challenge::SetRequirement[1, 53] = "Officer 15"; $Challenge::Info["LOAS3"] = "LOAS Expert III\t1\t75000\tNone\tCall in 15 Low Orbit Orbital Strikes (LOAS)"; //Bosses @@ -518,98 +527,103 @@ $Challenge::Category[12] = "Officer Challenges\tTasks related to officer ranks a $Challenge::Challenge[12, 0] = "Prestige1"; $Challenge::SetHidden[12, 0] = true; -$Challenge::HiddenMessage[12, 0] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 0] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige1"] = true; $Challenge::Info["Prestige1"] = "Instructive Officer\t12\t100\tNone\tReach Officer Level 1"; $Challenge::Challenge[12, 1] = "Prestige2"; $Challenge::SetHidden[12, 1] = true; -$Challenge::HiddenMessage[12, 1] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 1] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige2"] = true; $Challenge::Info["Prestige2"] = "Excelling Officer\t12\t250\tNone\tReach Officer Level 2"; $Challenge::Challenge[12, 2] = "Prestige3"; $Challenge::SetHidden[12, 2] = true; -$Challenge::HiddenMessage[12, 2] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 2] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige3"] = true; $Challenge::Info["Prestige3"] = "Champion Officer\t12\t350\tNone\tReach Officer Level 3"; $Challenge::Challenge[12, 3] = "Prestige4"; $Challenge::SetHidden[12, 3] = true; -$Challenge::HiddenMessage[12, 3] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 3] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige4"] = true; $Challenge::Info["Prestige4"] = "Prestigious Officer\t12\t500\tNone\tReach Officer Level 4"; $Challenge::Challenge[12, 4] = "Prestige5"; $Challenge::SetHidden[12, 4] = true; -$Challenge::HiddenMessage[12, 4] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 4] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige5"] = true; $Challenge::Info["Prestige5"] = "Supreme Officer\t12\t1000\tNone\tReach Officer Level 5"; $Challenge::Challenge[12, 5] = "Prestige6"; $Challenge::SetHidden[12, 5] = true; -$Challenge::HiddenMessage[12, 5] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 5] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige6"] = true; $Challenge::Info["Prestige6"] = "Glorious Officer\t12\t2500\tNone\tReach Officer Level 6"; $Challenge::Challenge[12, 6] = "Prestige7"; $Challenge::SetHidden[12, 6] = true; -$Challenge::HiddenMessage[12, 6] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 6] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige7"] = true; $Challenge::Info["Prestige7"] = "Ultimate Officer\t12\t5000\tNone\tReach Officer Level 7"; $Challenge::Challenge[12, 7] = "Prestige8"; $Challenge::SetHidden[12, 7] = true; -$Challenge::HiddenMessage[12, 7] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 7] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige8"] = true; $Challenge::Info["Prestige8"] = "Shadowing Officer\t12\t7500\tNone\tReach Officer Level 8"; $Challenge::Challenge[12, 8] = "Prestige9"; $Challenge::SetHidden[12, 8] = true; -$Challenge::HiddenMessage[12, 8] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 8] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige9"] = true; $Challenge::Info["Prestige9"] = "Phantom Officer\t12\t10000\tNone\tReach Officer Level 9"; $Challenge::Challenge[12, 9] = "Prestige10"; $Challenge::SetHidden[12, 9] = true; -$Challenge::HiddenMessage[12, 9] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 9] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige10"] = true; $Challenge::Info["Prestige10"] = "Brutal Officer\t12\t10000\tNone\tReach Officer Level 10"; $Challenge::Challenge[12, 10] = "Prestige11"; $Challenge::SetHidden[12, 10] = true; -$Challenge::HiddenMessage[12, 10] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 10] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige11"] = true; $Challenge::Info["Prestige11"] = "Vengeful Officer\t12\t10000\tNone\tReach Officer Level 11"; $Challenge::Challenge[12, 11] = "Prestige12"; $Challenge::SetHidden[12, 11] = true; -$Challenge::HiddenMessage[12, 11] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 11] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige12"] = true; $Challenge::Info["Prestige12"] = "Spectral Officer\t12\t10000\tNone\tReach Officer Level 12"; $Challenge::Challenge[12, 12] = "Prestige13"; $Challenge::SetHidden[12, 12] = true; -$Challenge::HiddenMessage[12, 12] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 12] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige13"] = true; $Challenge::Info["Prestige13"] = "Noble Officer\t12\t10000\tNone\tReach Officer Level 13"; $Challenge::Challenge[12, 13] = "Prestige14"; $Challenge::SetHidden[12, 13] = true; -$Challenge::HiddenMessage[12, 13] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 13] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige14"] = true; $Challenge::Info["Prestige14"] = "Masterful Officer\t12\t10000\tNone\tReach Officer Level 14"; $Challenge::Challenge[12, 14] = "Prestige15"; $Challenge::SetHidden[12, 14] = true; -$Challenge::HiddenMessage[12, 14] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; +$Challenge::HiddenMessage[12, 14] = "=== CLASSIFIED: REQUIRES CLEARANCE ==="; $Challenge::IsNotMultiTier["Prestige15"] = true; $Challenge::Info["Prestige15"] = "Rising Harbinger\t12\t10000\tNone\tReach The Highest Officer Level (15)"; $Challenge::Challenge[12, 15] = "GameEnder"; $Challenge::IsNotMultiTier["GameEnder"] = true; $Challenge::Info["GameEnder"] = "Game Ender\t12\t5000\tNone\tUse a Fission Bomb to end a game"; - +$Challenge::Challenge[12, 16] = "CastleWalls"; +$Challenge::IsNotMultiTier["CastleWalls"] = true; +$Challenge::Info["CastleWalls"] = "Castle Walls\t12\t15000\tNone\tAbsorb 100 enemy rounds with a single PulseStar Shield System"; +$Challenge::Challenge[12, 17] = "OrbitalDeath"; +$Challenge::IsNotMultiTier["OrbitalDeath"] = true; +$Challenge::Info["OrbitalDeath"] = "Orbital Death Dealer\t12\t20000\tNone\tEliminate 15 enemy players or 50 zombies with a single LOAS strike"; //CORE diff --git a/scripts/TWM2/Zombie/PlayerZombieFunctions.cs b/scripts/TWM2/Zombie/PlayerZombieFunctions.cs index 10f8666..d86e919 100644 --- a/scripts/TWM2/Zombie/PlayerZombieFunctions.cs +++ b/scripts/TWM2/Zombie/PlayerZombieFunctions.cs @@ -205,6 +205,7 @@ function DoZombPlayerMaker(%client, %type) { } // %player.zombieType = %type; + %player.isPlayerZombie = true; ZombieGroup.add(%player); return %player TAB %function; diff --git a/scripts/player.cs b/scripts/player.cs index 86cb6ef..5f30f01 100644 --- a/scripts/player.cs +++ b/scripts/player.cs @@ -3681,7 +3681,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am } } // - if(%targetObject.getControllingClient() !$= "") { + if(%targetObject.isPlayerZombie) { %sourceClient.TWM2Core.PvPZombieKills++; if(%sourceClient.TWM2Core.PvPZombieKills >= 100) { CompleteNWChallenge(%sourceClient, "Defectionator1");