Tribes2/TWM2
1
0
Fork 0
mirror of https://github.com/PhantomGamesDevelopment/TWM2.git synced 2026-02-27 02:23:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the merge issues

Browse source
This commit is contained in:
Robert Fritzen 2015-02-12 19:56:24 -06:00
parent 26ff02fd38
commit 9add24b42e
9 changed files with 0 additions and 1375 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/weapons/Construction/EditGun.cs
View file

@ -113,11 +113,7 @@ function EditGunImage::onMount(%this, %obj, %slot) {
%obj.hasGrenadeModes = 1;
//Phantom139: End
%obj.UsingEditTool = true;
<<<<<<< HEAD
displayWeaponInfo(%this, %obj, %obj.client.EditPMode, %obj.client.EditSMode);
=======
displayWeaponInfo(%this, %obj, %obj.EditPMode, %obj.EditSMode);
>>>>>>> origin/development
}
function EditGunImage::onunmount(%this,%obj,%slot) {
@ -163,27 +159,6 @@ function EditGunImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
<<<<<<< HEAD
%obj.client.EditPMode++;
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode >= 5)
%obj.client.EditPMode = 0;
case 2:
//Grenade Modes
%obj.client.EditSMode++;
if (%obj.client.EditPMode == 0 && %obj.client.EditSMode == 21)
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode == 1 && %obj.client.EditSMode == 21)
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode == 2 && %obj.client.EditSMode == 5)
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode == 3 && %obj.client.EditSMode == 4)
%obj.client.EditSMode = 0;
if (%obj.client.EditPMode == 4 && %obj.client.EditSMode == 2)
%obj.client.EditSMode = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.EditPMode, %obj.client.EditSMode);
=======
%obj.EditPMode++;
%obj.EditSMode = 0;
if (%obj.EditPMode >= 5)
@ -203,7 +178,6 @@ function EditGunImage::changeMode(%this, %obj, %key) {
%obj.EditSMode = 0;
}
displayWeaponInfo(%this, %obj, %obj.EditPMode, %obj.EditSMode);
>>>>>>> origin/development
}
//Editor Tool Functioning

27
scripts/weapons/Construction/constructionTool.cs
View file

@ -135,25 +135,6 @@ function ConstructionToolImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
<<<<<<< HEAD
%obj.client.constructionToolMode++;
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode >= 4)
%obj.client.constructionToolMode = 0;
case 2:
//Grenade Modes
%obj.client.constructionToolMode2++;
if (%obj.client.constructionToolMode == 0 && %obj.client.constructionToolMode2 == 2)
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode == 1 && %obj.client.constructionToolMode2 == 2)
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode == 2 && %obj.client.constructionToolMode2 == 6)
%obj.client.constructionToolMode2 = 0;
if (%obj.client.constructionToolMode == 3 && %obj.client.constructionToolMode2 == 4)
%obj.client.constructionToolMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.constructionToolMode, %obj.client.constructionToolMode2, "[REPA] "@%obj.client.RotateAngle);
=======
%obj.constructionToolMode++;
%obj.constructionToolMode2 = 0;
if (%obj.constructionToolMode >= 4)
@ -171,7 +152,6 @@ function ConstructionToolImage::changeMode(%this, %obj, %key) {
%obj.constructionToolMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.constructionToolMode, %obj.constructionToolMode2, "[REPA] "@%obj.client.RotateAngle);
>>>>>>> origin/development
}
//Phantom139: End
@ -241,17 +221,10 @@ function ConstructionToolImage::onMount(%this,%obj,%slot) {
%obj.errMsgSent = false;
%obj.client.setWeaponsHudActive(%this.item);
%obj.usingConstructionTool = true;
<<<<<<< HEAD
if (!%obj.constructionToolMode)
%obj.constructionToolMode = 0;
if (!%obj.constructionToolMode2)
%obj.constructionToolMode2 = 0;
=======
if (!isSet(%obj.client.constructionToolMode))
%obj.client.constructionToolMode = 0;
if (!isSet(%obj.client.constructionToolMode2))
%obj.client.constructionToolMode2 = 0;
>>>>>>> origin/development
//Phantom139: Added
%obj.hasMineModes = 1;
%obj.hasGrenadeModes = 1;

7
scripts/weapons/Construction/modifiertool.cs
View file

@ -545,17 +545,10 @@ function MergeToolImage::onFire(%data,%obj,%slot)
function MergeToolImage::onMount(%this,%obj,%slot)
{
<<<<<<< HEAD
if(%obj.MTMode $= "")
%obj.MTMode = 0;
if(%obj.MTSubMode $= "")
%obj.MTSubMode = 0;
=======
if(%obj.client.MTMode $= "")
%obj.client.MTMode = 0;
if(%obj.client.MTSubMode $= "")
%obj.client.MTSubMode = 0;
>>>>>>> origin/development
%obj.usingMTelec = 1;
//Phantom139: Added
%obj.hasMineModes = 1;

18
scripts/weapons/Construction/superChaingun.cs
View file

@ -216,11 +216,7 @@ function SuperChaingunImage::onMount(%this,%obj,%slot) {
%obj.superChaingunMode2 = 0;
%obj.hasMineModes = 1;
%obj.hasGrenadeModes = 1;
<<<<<<< HEAD
displayWeaponInfo(%this, %obj, %obj.client.superChaingunMode, %obj.client.superChaingunMode2);
=======
displayWeaponInfo(%this, %obj, %obj.superChaingunMode, %obj.superChaingunMode2);
>>>>>>> origin/development
WeaponImage::onMount(%this,%obj,%slot);
}
@ -235,19 +231,6 @@ function SuperChaingunImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
<<<<<<< HEAD
%obj.client.superChaingunMode++;
%obj.client.superChaingunMode2 = 0;
if (%obj.client.superChaingunMode > 6 - (5 * $host::nopulseSCG))
%obj.client.superChaingunMode = 0;
case 2:
//Grenade Modes
%obj.client.superChaingunMode2++;
if (%obj.client.superChaingunMode == 1 && %obj.client.superChaingunMode2 == 2)
%obj.client.superChaingunMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.client.superChaingunMode, %obj.client.superChaingunMode2);
=======
%obj.superChaingunMode++;
%obj.superChaingunMode2 = 0;
if (%obj.superChaingunMode > 6 - (5 * $host::nopulseSCG))
@ -261,5 +244,4 @@ function SuperChaingunImage::changeMode(%this, %obj, %key) {
%obj.superChaingunMode2 = 0;
}
displayWeaponInfo(%this, %obj, %obj.superChaingunMode, %obj.superChaingunMode2);
>>>>>>> origin/development
}

276
scripts/weapons/Equipment/SWBeaconer.cs
View file

@ -73,14 +73,11 @@ datablock ShapeBaseImageData(KillstreakBeaconImage) {
};
function KillstreakBeaconImage::onMount(%this, %obj, %slot) {
<<<<<<< HEAD
=======
if(getWordCount(%obj.client.streakList()) == 0) {
%obj.throwWeapon(1);
%obj.throwWeapon(0);
%obj.setInventory(KillstreakBeacon, 0, true);
}
>>>>>>> origin/development
Parent::onMount(%this, %obj, %slot);
%obj.hasMineModes = 1;
%obj.hasGrenadeModes = 1;
@ -90,115 +87,6 @@ function KillstreakBeaconImage::onMount(%this, %obj, %slot) {
}
%obj.usingKSBeacon = true;
}
<<<<<<< HEAD
function KillstreakBeaconImage::onunmount(%this,%obj,%slot) {
Parent::onUnmount(%this, %obj, %slot);
%obj.hasMineModes = 0;
%obj.hasGrenadeModes = 0;
%obj.usingKSBeacon = false;
}
function KillstreakBeaconImage::changeMode(%this, %obj, %key) {
switch(%key) {
case 1:
//Mine Modes
%obj.KSSetMode++;
if(%obj.KSSetMode >= %obj.client.ksListInstance.count()) {
%obj.KSSetMode = 0;
}
case 2:
//Grenade Modes
%obj.KSSetMode--;
if(%obj.KSSetMode < 0) {
%obj.KSSetMode = %obj.client.ksListInstance.count() - 1;
}
}
DisplayKillstreakInfo(%obj);
}
function DisplayKillstreakInfo(%obj) {
%currentStreak = %obj.client.ksListInstance.element(%obj.KSSetMode);
%strkName = getWord(%currentStreak, 0);
%strkCnt = getWord(%currentStreak, 1);
switch$(%strkName) {
case "UAV":
%msg = "UAV Recon";
case "Airstrike":
%msg = "Thundersword Airstrike";
case "GM":
%msg = "UAMS Assault Drone";
case "AIHeli":
%msg = "Support Helicopter";
case "Harrier":
%msg = "Plasma Harrier Airstrike";
case "OLS":
%msg = "Orbital Laser Strike";
case "AIGunHeli":
%msg = "Gunship Helicopter Support";
case "Stealth":
%msg = "Stealth Bomber Airstrike";
case "HarbWrath":
%msg = "Harbinger's Wrath";
case "Apache":
%msg = "Apache Gunner";
case "AC130":
%msg = "AC-130 Gunner";
case "Artillery":
%msg = "Centaur Artillery Bombardment";
case "EMP":
%msg = "EMP Strike";
case "NukeStrike":
%msg = "Tactical Nuke Strike";
case "ZBomb":
%msg = "Anti-Zombie Bomb";
case "FBomb":
%msg = "Fission Bomb Strike";
case "Napalm":
%msg = "Napalm Airstrike";
}
commandToClient(%obj.client, 'BottomPrint', "<font:Sui Generis:14>>>>Killstreak Beacon<<<\n<font:Arial:14>"@%msg@" ["@%strkCnt@" Available]\n<font:Arial:12>Press Mine to select next streak, Grenade to select previous streak.", 3, 3);
}
function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
%currentStreak = %obj.client.ksListInstance.element(%obj.KSSetMode);
%strkName = getWord(%currentStreak, 0);
%strkCnt = getWord(%currentStreak, 1);
%newCt = %strkCnt - 1;
if(%strkCnt <= 0) {
//Oops...
messageClient(%obj.client, 'msgError', "\c5TWM2: Nice Try...");
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
if(%obj.client.ksListInstance.count() <= 0) {
//No more streaks in the list...
%obj.throwWeapon(1);
%obj.throwWeapon(0);
%obj.setInventory(KillstreakBeacon, 0, true);
}
return;
}
switch$(%strkName) {
//
//
// UAV
//
//
case "UAV":
GainExperience(%obj.client, 25, "UAV Called in ");
%obj.client.TWM2Core.UAVCalls++;
UpdateSWBeaconFile(%obj.client, "UAV");
%obj.client.OnUseKillstreak(1);
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
function KillstreakBeaconImage::onunmount(%this,%obj,%slot) {
Parent::onUnmount(%this, %obj, %slot);
@ -268,7 +156,6 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
%obj.client.OnUseKillstreak(1);
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
%count = 0;
if(!$TWM2::FFAMode) {
%obj.team.UAVLoop = UAVLoop(%obj, %obj.client.team, %count);
@ -294,21 +181,13 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
}
}
}
<<<<<<< HEAD
=======
>>>>>>> origin/development
//
//
// Airstrike
//
//
<<<<<<< HEAD
case "Airstrike":
=======
case 2:
>>>>>>> origin/development
%ASCam = new Camera() {
dataBlock = TWM2ControlCamera;
};
@ -318,21 +197,13 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
%ASCam.mode = "AirstrikeCall";
%obj.client.setControlObject(%ASCam);
CameraMessageLoop(%obj.client, %ASCam, %ASCam.mode);
<<<<<<< HEAD
=======
>>>>>>> origin/development
//
//
// UAMS
//
//
<<<<<<< HEAD
case "GM":
=======
case 3:
>>>>>>> origin/development
GainExperience(%obj.client, 50, "UAMS Called in ");
%obj.client.TWM2Core.GMCalls++;
%obj.client.OnUseKillstreak(3);
@ -347,29 +218,15 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
}
}
CreateMissileSat(%obj.client);
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
//
//
// Helicopter
//
//
<<<<<<< HEAD
case "AIHeli":
=======
case 4:
>>>>>>> origin/development
if(Game.CheckModifier("Scrambler") == 1) {
for(%i = 0; %i < MissionCleanup.getCount(); %i++) {
%obj = MissionCleanup.getObject(%i);
@ -396,16 +253,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
messageClient(%cl, 'msgHeliComing', "\c5TWM2: Enemy Helicopter Inbound");
}
}
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
MakeTheHeli(%obj.client);
//
@ -413,11 +261,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// Harrier
//
//
<<<<<<< HEAD
case "Harrier":
=======
case 5:
>>>>>>> origin/development
%ASCam = new Camera() {
dataBlock = TWM2ControlCamera;
};
@ -433,11 +277,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// OLS
//
//
<<<<<<< HEAD
case "OLS":
=======
case 6:
>>>>>>> origin/development
%ASCam = new Camera() {
dataBlock = TWM2ControlCamera;
};
@ -453,11 +293,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// Gunship Helicopter
//
//
<<<<<<< HEAD
case "AIGunHeli":
=======
case 7:
>>>>>>> origin/development
if(Game.CheckModifier("Scrambler") == 1) {
for(%i = 0; %i < MissionCleanup.getCount(); %i++) {
%obj = MissionCleanup.getObject(%i);
@ -484,16 +320,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
messageClient(%cl, 'msgHeliComing', "\c5TWM2: Enemy Gunship Helicopter Inbound!!!");
}
}
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
MakeTheHeli2(%obj.client, 0);
//
@ -501,11 +328,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// Stealth Airstrike
//
//
<<<<<<< HEAD
case "Stealth":
=======
case 8:
>>>>>>> origin/development
%ASCam = new Camera() {
dataBlock = TWM2ControlCamera;
};
@ -521,11 +344,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// Harbinger Gunship
//
//
<<<<<<< HEAD
case "HarbWrath":
=======
case 9:
>>>>>>> origin/development
GainExperience(%obj.client, 100, "Harbinger Gunship Called In ");
if($CurrentMission $= "ChristmasMall09") {
CompleteNWChallenge(%CallerClient, "GunshipMall");
@ -542,16 +361,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
messageClient(%cl, 'msgHeliComing', "\c5TWM2: Enemy Gunship... INCOMING!!!");
}
}
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
if($TWM2::UnmannedGunship) {
StartHarbingersWrath(%obj.client, 1);
}
@ -564,11 +374,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// Apache
//
//
<<<<<<< HEAD
case "Apache":
=======
case 10:
>>>>>>> origin/development
GainExperience(%obj.client, 100, "Apache Gunner Called in ");
%obj.client.OnUseKillstreak(10);
%obj.client.TWM2Core.CGCalls++;
@ -582,16 +388,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
messageClient(%cl, 'msgHeliComing', "\c5TWM2: Enemy Apache... INCOMING!!!");
}
}
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
MakeTheHeli(%obj.client, 1);
//
@ -599,11 +396,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// AC130
//
//
<<<<<<< HEAD
case "AC130":
=======
case 11:
>>>>>>> origin/development
GainExperience(%obj.client, 100, "AC130 Called in ");
if($CurrentMission $= "ChristmasMall09") {
CompleteNWChallenge(%CallerClient, "GunshipMall");
@ -620,16 +413,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
messageClient(%cl, 'msgHeliComing', "\c5TWM2: Enemy AC130 ABOVE!!!");
}
}
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
if($TWM2::UnmannedGunship) {
StartAC130(%obj.client, 1);
}
@ -642,11 +426,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// Artillery
//
//
<<<<<<< HEAD
case "Artillery":
=======
case 12:
>>>>>>> origin/development
%ASCam = new Camera() {
dataBlock = TWM2ControlCamera;
};
@ -662,11 +442,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// EMP
//
//
<<<<<<< HEAD
case "EMP":
=======
case 13:
>>>>>>> origin/development
%obj.client.TWM2Core.EMPCalls++;
UpdateSWBeaconFile(%obj.client, "EMP");
GainExperience(%obj.client, 1000, "Mass EMP Called in ");
@ -694,27 +470,14 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
}
}
}
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
//
//
// Nuke
//
//
<<<<<<< HEAD
case "NukeStrike":
=======
case 14:
>>>>>>> origin/development
%ASCam = new Camera() {
dataBlock = TWM2ControlCamera;
};
@ -730,11 +493,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
// ZBomb
//
//
<<<<<<< HEAD
case "ZBomb":
=======
case 15:
>>>>>>> origin/development
GainExperience(%obj.client, 1000, "Zombie Annihilation Bomb Activated ");
MessageAll('msgWohoo', "\c5TWM2: "@%obj.client.namebase@" has activated a Z-Bomb, eliminating all zombies");
%obj.client.OnUseKillstreak(15);
@ -761,27 +520,14 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
%flcl.player.setWhiteout(1.8);
}
}
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
//
//
// Fission
//
//
<<<<<<< HEAD
case "FBomb":
=======
case 16:
>>>>>>> origin/development
%obj.client.HasFission = 0;
GainExperience(%obj.client, 25000, "Anti-Matter Based Fission Bomb Activated ");
%obj.client.OnUseKillstreak(16);
@ -790,28 +536,14 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
CompleteNWChallenge(%obj.client, "GameEnder");
MessageAll('msgItsOva', "\c5COMMAND: FISSION BOMB!!! IT'S OVER!! RUN!!!!!! ~wfx/misc/red_alert_short.wav");
FissionBombLoop(%obj.client, %obj, %obj.getPosition(), 30);
<<<<<<< HEAD
if(%newCt == 0) {
%obj.client.ksListInstance.removeElement(getField(%obj.client.ksListInstance.find(%strkName), 1));
}
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
=======
%obj.client.streakCount[%currentStreak]--;
>>>>>>> origin/development
//
//
// Napalm
//
//
<<<<<<< HEAD
case "Napalm":
=======
case 17:
>>>>>>> origin/development
%ASCam = new Camera() {
dataBlock = TWM2ControlCamera;
};
@ -823,11 +555,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
CameraMessageLoop(%obj.client, %ASCam, %ASCam.mode);
}
//Post-Fire Checks
<<<<<<< HEAD
if(%obj.client.ksListInstance.count() <= 0) {
=======
if(getWordCount(%obj.client.streakList()) == 0) {
>>>>>>> origin/development
//No more streaks in the list...
%obj.throwWeapon(1);
%obj.throwWeapon(0);
@ -915,11 +643,7 @@ function ConstantBomberTurningLoop(%obj, %TPos) {
%SwapA = -1 * getWord(%target, 0);
%TVector = getWord(%target, 1)@" "@%SwapA@" 0";
%obj.setRotation(fullrot("0 0 0",%TVector));
<<<<<<< HEAD
=======
>>>>>>> origin/development
%dist = vectorDist(%TPos, %BPos);
if(%dist < 75) {
%obj.ReachedDest = 1;