Prep for July 4th

Added in the necessary hooks to the daily challenge system for the July
4th event.

JTLdelDSO.bat

@@ -0,0 +1,2 @@
+del /s /q "..\base\*.dso"
+del /s /q "*.dso"

scripts/HordeGame.cs

@@ -427,6 +427,12 @@ function HordeNextWave(%game, %wave) {
       $HordeGame::RevivesLeft++;
    }
    $HordeGame::CurrentWave = %wave;
+   for(%i = 0; %i < ClientGroup.getCount(); %i++) {
+	  %cl = ClientGroup.getObject(%i);
+	  if(%wave != 1) {
+         recordAction(%cl, "HORDEWAVE", %wave-1);
+	  }
+   }  
    HordeKillAllZombies(); //Cleans up the server
    if($HordeGame::CurrentWave == 51) { //Victory
       for (%i = 0; %i < ClientGroup.getCount(); %i++) {

scripts/TWM2/Systems/DChalg.cs

@@ -184,6 +184,12 @@ function recordAction(%client, %action, %variables) {
 		case "AREACAP":
 			%so.areaCapture[%ymd, $CurrentMission] += 1;
 			%so.areaCaptureTotal[%ymd] += 1;
+		case "HORDEWAVE":
+			%so.totalHordeWavesCompleted[%ymd] += 1;
+			%cWave = getField(%variables, 0);
+			if(%cWave > %so.highestHordeWave[%ymd]) {
+				%so.highestHordeWave[%ymd] = %cWave;
+			}
 		case "DOMWIN":
 			%so.dominationRoundWins[%ymd, $CurrentMission] += 1;
 			%so.dominationRoundWinTotal[%ymd] += 1;
@@ -306,28 +312,38 @@ function checkCompletion(%client, %cID) {
 			}
 		case "KS":
 			%type = getWord(%cCond, 1);
-         %ammount = getWord(%cCond, 2);
+			%amount = getWord(%cCond, 2);
-         if(%so.killstreakCalls[%dateStr, %type] >= %ammount) {
+			if(%so.killstreakCalls[%dateStr, %type] >= %amount) {
 				%done = true;
 			}
 		case "KSK":
 			%type = getWord(%cCond, 1);
-         %ammount = getWord(%cCond, 2);
+			%amount = getWord(%cCond, 2);
-         if(%so.killstreakKills[%dateStr, %type] >= %ammount) {
+			if(%so.killstreakKills[%dateStr, %type] >= %amount) {
 				%done = true;
 			}
 		case "SK":
 			%soloType = getWord(%cCond, 1);
-         %ammount = getWord(%cCond, 2);
+			%amount = getWord(%cCond, 2);
 			if(%so.successiveSolo[%dateStr, %soloType] >= %ammount) {
 				%done = true;
 			}
 		case "SKS":
 			%streakType = getWord(%cCond, 1);
-         %ammount = getWord(%cCond, 2);
+			%amount = getWord(%cCond, 2);
 			if(%so.successiveStreak[%dateStr, %streakType] >= %ammount) {
 				%done = true;
 			}
+		case "Horde":
+			%waveNum = getWord(%cCond, 1);
+			if(%so.highestHordeWave[%dateStr] >= %waveNum) {
+				%done = true;
+			}
+		case "HordeWaves":
+			%amount = getWord(%cCond, 1);
+			if(%so.totalHordeWavesCompleted[%dateStr] >= %amount) {
+				%done = true;
+			}			
 		case "Prestige":
 			%level = getWord(%cCond, 1);
 			if(%client.TWM2Core.officer >= %level) {

scripts/TWM2/Systems/MainControl.cs

@@ -690,18 +690,25 @@ function TWM2Damage(%projectile, %target, %amount, %dType, %damLoc, %type) {
 			if(strStr(%SDB.getClassName(), "Turret") != -1) {
 				if(%SDB.getName() $= "HarbingerGunshipTurret") {
 					%projectile.sourceObject = %projectile.sourceObject.mountobj;
+					%sourceObject = %projectile.sourceObject;
+					%SDB = %sourceObject.getDataBlock();
 				}
 				else if(%SDB.getName() $= "AC130GunshipTurret") {
 					%projectile.sourceObject = %projectile.sourceObject.mountobj;
+					%sourceObject = %projectile.sourceObject;
+					%SDB = %sourceObject.getDataBlock();
 				}
 				else if(%SDB.getName() $= "CentaurTurret") {
 					%projectile.sourceObject = %projectile.sourceObject.source;
+					%sourceObject = %projectile.sourceObject;
+					%SDB = %sourceObject.getDataBlock();
 				}
 			}
 			//------------------------------------------------------
 			//vehicle kill checking
+			//NOTE: THIS DOESN'T GO HERE!!! 
 			if(strStr(%SDB.getClassName(), "Vehicle") != -1) {
-				if(%target.isPlayer() && %target.getState() $= "dead") {
+				if((%target.getType() & ($TypeMasks::PlayerObjectType)) && %target.getState() $= "dead") {
 					%pl = %sourceObject.getMountNodeObject(0); //the pilot
 					%cl = %pl.client;
 					if(%cl !$= "") {
@@ -717,9 +724,7 @@ function TWM2Damage(%projectile, %target, %amount, %dType, %damLoc, %type) {
 								}
 							}
 						}
-						if(!%target.isAllyBot) {
 						UpdateVehicleKillFile(%cl, %SDB.getName());
-						}
 						//
 						if(%TDB $= "DemonMotherZombieArmor" && %SDB $= "CentaurVehicle") {
 							%cl.CDLKills++;

scripts/TWM2/Systems/WeaponChallenges.cs

@@ -14,11 +14,9 @@ function GetWeaponChallenges(%Image, %number) {
 
 function UpdateVehicleKillFile(%client, %VDB) {
    if(%VDB $= "") {  //Phantom139: Ha!! No more invalid Files!!!
-      //echo("No Vehicle Datablock");
       return;
    }
    if(%client $= "") {  //Phantom139: Ha! No More UE on Invalid File
-      //echo("No Client");
       return;
    }
    %file = ""@$TWM::RanksDirectory@"/"@%client.guid@"/Saved.TWMSave";