Tribes2/TWM2
1
0
Fork 0
mirror of https://github.com/PhantomGamesDevelopment/TWM2.git synced 2026-01-19 19:44:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updates

Browse source 
Adds missing Flatland files, some minor fixes.
This commit is contained in:
Robert Fritzen 2014-08-04 19:43:00 -05:00
parent 3536406329
commit 6541acbd7c
5 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
scripts/TWM2/Systems/Killstreak.cs
View file

@ -332,103 +332,103 @@ function GameConnection::AwardKillstreak(%client, %streakVal, %plz) {
if(%client.ksListInstance.find("UAV") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("UAV"), 0), 1);
}
%client.ksListIntance.advancedAdd("UAV", "UAV "@%cAmt+1);
%client.ksListInstance.advancedAdd("UAV", "UAV "@%cAmt+1);
case 2:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Airstrike Standing By.");
if(%client.ksListInstance.find("Airstrike") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("Airstrike"), 0), 1);
}
%client.ksListIntance.advancedAdd("Airstrike", "Airstrike "@%cAmt+1);
%client.ksListInstance.advancedAdd("Airstrike", "Airstrike "@%cAmt+1);
case 3:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Guided Missile Strike Standing By.");
if(%client.ksListInstance.find("GM") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("GM"), 0), 1);
}
%client.ksListIntance.advancedAdd("GM", "GM "@%cAmt+1);
%client.ksListInstance.advancedAdd("GM", "GM "@%cAmt+1);
case 4:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Helicopter at your disposal.");
if(%client.ksListInstance.find("AIHeli") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("AIHeli"), 0), 1);
}
%client.ksListIntance.advancedAdd("AIHeli", "AIHeli "@%cAmt+1);
%client.ksListInstance.advancedAdd("AIHeli", "AIHeli "@%cAmt+1);
case 5:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Plasma Harrier Strike at your disposal.");
if(%client.ksListInstance.find("Harrier") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("Harrier"), 0), 1);
}
%client.ksListIntance.advancedAdd("Harrier", "Harrier "@%cAmt+1);
%client.ksListInstance.advancedAdd("Harrier", "Harrier "@%cAmt+1);
case 6:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Satellite Strike at your disposal.");
if(%client.ksListInstance.find("OLS") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("OLS"), 0), 1);
}
%client.ksListIntance.advancedAdd("OLS", "OLS "@%cAmt+1);
%client.ksListInstance.advancedAdd("OLS", "OLS "@%cAmt+1);
case 7:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Gunship Helicopter at your disposal.");
if(%client.ksListInstance.find("AIGunHeli") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("AIGunHeli"), 0), 1);
}
%client.ksListIntance.advancedAdd("AIGunHeli", "AIGunHeli "@%cAmt+1);
%client.ksListInstance.advancedAdd("AIGunHeli", "AIGunHeli "@%cAmt+1);
case 8:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Stealth Bomber at your disposal.");
if(%client.ksListInstance.find("Stealth") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("Stealth"), 0), 1);
}
%client.ksListIntance.advancedAdd("Stealth", "Stealth "@%cAmt+1);
%client.ksListInstance.advancedAdd("Stealth", "Stealth "@%cAmt+1);
case 9:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Harbinger's Wrath Standing By.");
if(%client.ksListInstance.find("HarbWrath") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("HarbWrath"), 0), 1);
}
%client.ksListIntance.advancedAdd("HarbWrath", "HarbWrath "@%cAmt+1);
%client.ksListInstance.advancedAdd("HarbWrath", "HarbWrath "@%cAmt+1);
case 10:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Apache Gunner Standing By.");
if(%client.ksListInstance.find("Apache") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("Apache"), 0), 1);
}
%client.ksListIntance.advancedAdd("Apache", "Apache "@%cAmt+1);
%client.ksListInstance.advancedAdd("Apache", "Apache "@%cAmt+1);
case 11:
MessageClient(%client, 'MsgZKill', "\c5TWM2: AC-130 Gunner Standing By.");
if(%client.ksListInstance.find("AC130") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("AC130"), 0), 1);
}
%client.ksListIntance.advancedAdd("AC130", "AC130 "@%cAmt+1);
%client.ksListInstance.advancedAdd("AC130", "AC130 "@%cAmt+1);
case 12:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Centaur Bombardment Standing By.");
if(%client.ksListInstance.find("Artillery") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("Artillery"), 0), 1);
}
%client.ksListIntance.advancedAdd("Artillery", "Artillery "@%cAmt+1);
%client.ksListInstance.advancedAdd("Artillery", "Artillery "@%cAmt+1);
case 13:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Mass EMP Standing By.");
if(%client.ksListInstance.find("EMP") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("EMP"), 0), 1);
}
%client.ksListIntance.advancedAdd("EMP", "EMP "@%cAmt+1);
%client.ksListInstance.advancedAdd("EMP", "EMP "@%cAmt+1);
case 14:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Nuclear Strike Standing By.");
if(%client.ksListInstance.find("NukeStrike") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("NukeStrike"), 0), 1);
}
%client.ksListIntance.advancedAdd("NukeStrike", "NukeStrike "@%cAmt+1);
%client.ksListInstance.advancedAdd("NukeStrike", "NukeStrike "@%cAmt+1);
case 15:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Zombie Bomb Standing By.");
if(%client.ksListInstance.find("ZBomb") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("ZBomb"), 0), 1);
}
%client.ksListIntance.advancedAdd("ZBomb", "ZBomb "@%cAmt+1);
%client.ksListInstance.advancedAdd("ZBomb", "ZBomb "@%cAmt+1);
case 16:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Fission Bomb Ready... Obliterate everyone!!!");
if(%client.ksListInstance.find("FBomb") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("FBomb"), 0), 1);
}
%client.ksListIntance.advancedAdd("FBomb", "FBomb "@%cAmt+1);
%client.ksListInstance.advancedAdd("FBomb", "FBomb "@%cAmt+1);
case 17:
MessageClient(%client, 'MsgZKill', "\c5TWM2: Napalm Airstrike at your disposal.");
if(%client.ksListInstance.find("Napalm") != -1) {
%cAmt = getWord(getField(%client.ksListInstance.find("Napalm"), 0), 1);
}
%client.ksListIntance.advancedAdd("Napalm", "Napalm "@%cAmt+1);
%client.ksListInstance.advancedAdd("Napalm", "Napalm "@%cAmt+1);
}
if(%plz == 0) {
if(%client.IsHighestPLStreak(%streakVal)) {

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

@ -18,7 +18,7 @@ datablock ItemData(KillstreakBeacon) {
friction = 0.6;
pickupRadius = 2;
pickUpName = "a targeting laser rifle";
isKSSW = 1;
computeCRC = true;
@ -31,7 +31,7 @@ datablock ShapeBaseImageData(KillstreakBeaconImage) {
shapeFile = "weapon_targeting.dts";
item = KillstreakBeacon;
offset = "0 0 0";
isKSSW = 1;
projectile = BasicTargeter;
@ -120,7 +120,7 @@ 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";
@ -157,7 +157,7 @@ function DisplayKillstreakInfo(%obj) {
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);
}
@ -178,7 +178,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
}
return;
}
switch$(%strkName) {
//
//
@ -222,7 +222,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
}
}
}
//
//
// Airstrike
@ -238,7 +238,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
%ASCam.mode = "AirstrikeCall";
%obj.client.setControlObject(%ASCam);
CameraMessageLoop(%obj.client, %ASCam, %ASCam.mode);
//
//
// UAMS
@ -265,7 +265,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
//
//
// Helicopter
@ -622,7 +622,7 @@ function KillstreakBeaconImage::OnFire(%data, %obj, %slot) {
else {
%obj.client.ksListInstance.set(getField(%obj.client.ksListInstance.find(%strkName), 1), %strkName SPC %newCt);
}
//
//
// Napalm
@ -728,7 +728,7 @@ function ConstantBomberTurningLoop(%obj, %TPos) {
%SwapA = -1 * getWord(%target, 0);
%TVector = getWord(%target, 1)@" "@%SwapA@" 0";
%obj.setRotation(fullrot("0 0 0",%TVector));
%dist = vectorDist(%TPos, %BPos);
if(%dist < 75) {
%obj.ReachedDest = 1;
@ -747,7 +747,7 @@ function Airstrike(%CallerClient, %position, %dirFrom) {
%CallerClient.TWM2Core.AirstrikeCalls++;
UpdateSWBeaconFile(%CallerClient, "AirStrike");
}
//new stuff TWM2 2.6
//%dirFrom = Spawn Position of Aircraft
%THeight = getTerrainHeight(%dirFrom);
@ -844,7 +844,7 @@ function MakeTheHeli(%cl, %gunner) {
if(%gunner $= "") {
%gunner = 0;
}
if(%gunner) {
%Heli = new FlyingVehicle() {
dataBlock = ApacheHelicopter;
@ -961,7 +961,7 @@ function HeliBeginAttack(%heli, %target) {
%heli.Targeting = schedule(500, 0, "HeliScan", %heli);
return;
}
schedule(500, 0, "HeliBeginAttack", %heli, %target);
%clpos = %target.getPosition();
if(vectorDist(%clpos, %pos) < 125) {
@ -1129,7 +1129,7 @@ function MakeTheHeli2(%cl, %harrier) {
%Heli.doneAttack = 0;
//
%Heli.team = %cl.team;
%heli.canFireMissiles = 1;
%heli.Targeting = GunshipHeliScan(%heli);

BIN
terrains/Flatland.nav Normal file
View file

Binary file not shown.

BIN
terrains/Flatland.spn Normal file
View file

Binary file not shown.

1
terrains/Flatland.ter Normal file
View file

File diff suppressed because one or more lines are too long