mirror of
https://github.com/PhantomGamesDevelopment/TWM2.git
synced 2026-01-19 19:44:47 +00:00
Fixed the merge issues
This commit is contained in:
Robert Fritzen
parent
26ff02fd38
commit
9add24b42e
|
|
@ -1,262 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
//LORD \/ARDISON & Dark Archmage Vardison
|
||||
//THIS BOSS WILL MURDER OCCULTBADBOY
|
||||
//Yeah, he really will
|
||||
datablock LinearFlareProjectileData(SuperlaserProjectile) {
|
||||
scale = "15.0 15.0 15.0";
|
||||
faceViewer = false;
|
||||
directDamage = 1.0;
|
||||
hasDamageRadius = true;
|
||||
indirectDamage = 0.9;
|
||||
damageRadius = 30.0;
|
||||
kickBackStrength = 1000.0;
|
||||
radiusDamageType = $DamageType::Explosion;
|
||||
|
||||
explosion[0] = "HyperDevCannonExplosion2";
|
||||
explosion[1] = "SatchelMainExplosion";
|
||||
splash = PlasmaSplash;
|
||||
baseEmitter = HyperDevCannonBaseEmitter;
|
||||
|
||||
|
||||
dryVelocity = 200.0;
|
||||
wetVelocity = 200;
|
||||
velInheritFactor = 0.5;
|
||||
fizzleTimeMS = 10000;
|
||||
lifetimeMS = 10000;
|
||||
explodeOnDeath = false;
|
||||
reflectOnWaterImpactAngle = 0.0;
|
||||
explodeOnWaterImpact = true;
|
||||
deflectionOnWaterImpact = 0.0;
|
||||
fizzleUnderwaterMS = -1;
|
||||
|
||||
//activateDelayMS = 100;
|
||||
activateDelayMS = -1;
|
||||
|
||||
size[0] = 9;
|
||||
size[1] = 10;
|
||||
size[2] = 11;
|
||||
|
||||
|
||||
numFlares = 400;
|
||||
flareColor = "0.0 1.0 0";
|
||||
flareModTexture = "flaremod";
|
||||
flareBaseTexture = "flarebase";
|
||||
|
||||
sound = MissileProjectileSound;
|
||||
fireSound = PlasmaFireSound;
|
||||
wetFireSound = PlasmaFireWetSound;
|
||||
|
||||
hasLight = true;
|
||||
lightRadius = 3.0;
|
||||
lightColor = "0 0.75 0.25";
|
||||
|
||||
};
|
||||
|
||||
//
|
||||
datablock ParticleData(ShadowBaseParticle) {
|
||||
dragCoeffiecient = 0.0;
|
||||
gravityCoefficient = -0.2;
|
||||
inheritedVelFactor = 0.0;
|
||||
|
||||
lifetimeMS = 800;
|
||||
lifetimeVarianceMS = 500;
|
||||
|
||||
useInvAlpha = true;
|
||||
spinRandomMin = -160.0;
|
||||
spinRandomMax = 160.0;
|
||||
|
||||
animateTexture = true;
|
||||
framesPerSec = 15;
|
||||
|
||||
textureName = "special/cloudflash";
|
||||
|
||||
colors[0] = "0.1 0.1 0.1 1.0";// ////////////////////
|
||||
colors[1] = "0.1 0.1 0.1 1.0";// ////////////////////
|
||||
colors[2] = "0.1 0.1 0.1 1.0";// \\\\\\\\\\\\\\\\\\\\
|
||||
|
||||
sizes[0] = 2.5;
|
||||
sizes[1] = 2.7;
|
||||
sizes[2] = 3.0;
|
||||
|
||||
times[0] = 0.0;
|
||||
times[1] = 0.7;
|
||||
times[2] = 1.0;
|
||||
};
|
||||
|
||||
datablock ParticleEmitterData(ShadowBaseEmitter) {
|
||||
ejectionPeriodMS = 10;
|
||||
periodVarianceMS = 0;
|
||||
|
||||
ejectionVelocity = 1.5;
|
||||
velocityVariance = 0.3;
|
||||
|
||||
thetaMin = 0.0;
|
||||
thetaMax = 30.0;
|
||||
|
||||
particles = "ShadowBaseParticle";
|
||||
};
|
||||
|
||||
datablock ParticleData(SmallShadowBaseParticle) {
|
||||
dragCoeffiecient = 0.0;
|
||||
gravityCoefficient = -0.2;
|
||||
inheritedVelFactor = 0.0;
|
||||
|
||||
lifetimeMS = 9999999999999;
|
||||
lifetimeVarianceMS = 9999999999999;
|
||||
|
||||
useInvAlpha = true;
|
||||
spinRandomMin = -160.0;
|
||||
spinRandomMax = 160.0;
|
||||
|
||||
animateTexture = true;
|
||||
framesPerSec = 15;
|
||||
|
||||
textureName = "special/cloudflash";
|
||||
|
||||
colors[0] = "0.1 0.1 0.1 1.0";// ////////////////////
|
||||
colors[1] = "0.1 0.1 0.1 1.0";// ////////////////////
|
||||
colors[2] = "0.1 0.1 0.1 1.0";// \\\\\\\\\\\\\\\\\\\\
|
||||
|
||||
sizes[0] = 0.5;
|
||||
sizes[1] = 0.7;
|
||||
sizes[2] = 1.0;
|
||||
|
||||
times[0] = 0.0;
|
||||
times[1] = 0.7;
|
||||
times[2] = 1.0;
|
||||
};
|
||||
|
||||
datablock ParticleEmitterData(SmallShadowBaseEmitter) {
|
||||
ejectionPeriodMS = 10;
|
||||
periodVarianceMS = 0;
|
||||
|
||||
ejectionVelocity = 1.5;
|
||||
velocityVariance = 0.3;
|
||||
|
||||
thetaMin = 0.0;
|
||||
thetaMax = 30.0;
|
||||
|
||||
particles = "SmallShadowBaseParticle";
|
||||
};
|
||||
|
||||
datablock ParticleData(JetShadowParticle) {
|
||||
dragCoeffiecient = 0.0;
|
||||
gravityCoefficient = 0;
|
||||
inheritedVelFactor = 0.0;
|
||||
|
||||
lifetimeMS = 2500;
|
||||
lifetimeVarianceMS = 0;
|
||||
|
||||
textureName = "particleTest";
|
||||
|
||||
useInvAlpha = true;
|
||||
spinRandomMin = -160.0;
|
||||
spinRandomMax = 160.0;
|
||||
|
||||
animateTexture = true;
|
||||
framesPerSec = 15;
|
||||
|
||||
animTexName[0] = "special/Explosion/exp_0016";
|
||||
animTexName[1] = "special/Explosion/exp_0018";
|
||||
animTexName[2] = "special/Explosion/exp_0020";
|
||||
animTexName[3] = "special/Explosion/exp_0022";
|
||||
animTexName[4] = "special/Explosion/exp_0024";
|
||||
animTexName[5] = "special/Explosion/exp_0026";
|
||||
animTexName[6] = "special/Explosion/exp_0028";
|
||||
animTexName[7] = "special/Explosion/exp_0030";
|
||||
animTexName[8] = "special/Explosion/exp_0032";
|
||||
|
||||
colors[0] = "0.1 0.1 0.1 1.0";// ////////////////////
|
||||
colors[1] = "0.1 0.1 0.1 1.0";// ////////////////////
|
||||
colors[2] = "0.1 0.1 0.1 1.0";// \\\\\\\\\\\\\\\\\\\\
|
||||
sizes[0] = 2.5;
|
||||
sizes[1] = 1.25;
|
||||
sizes[2] = 0.625;
|
||||
times[0] = 0.0;
|
||||
times[1] = 0.7;
|
||||
times[2] = 1.0;
|
||||
};
|
||||
|
||||
datablock ParticleEmitterData(JetShadowEmitter) {
|
||||
ejectionPeriodMS = 2;
|
||||
periodVarianceMS = 0;
|
||||
|
||||
ejectionVelocity = 0;
|
||||
velocityVariance = 0;
|
||||
ejectionOffset = 5;
|
||||
thetaMin = 22.5;
|
||||
thetaMax = 45;
|
||||
phiReferenceVel = 0;
|
||||
phiVariance = 360;
|
||||
spinRandomMin = "200";
|
||||
spinRandomMax = "-200";
|
||||
overrideAdvances = false;
|
||||
particles = "JetShadowParticle";
|
||||
};
|
||||
|
||||
datablock ParticleData(LaserBallGlobeSmoke) {
|
||||
dragCoefficient = 50;/////////-----------------------
|
||||
gravityCoefficient = 0.0;
|
||||
inheritedVelFactor = 1.0;
|
||||
constantAcceleration = 0.0;
|
||||
lifetimeMS = 1000;
|
||||
lifetimeVarianceMS = 0;
|
||||
useInvAlpha = true;
|
||||
spinRandomMin = -360.0;
|
||||
spinRandomMax = 360.0;
|
||||
textureName = "particleTest";
|
||||
colors[0] = "0.1 0.1 0.1 1.0";// ////////////////////
|
||||
colors[1] = "0.1 0.1 0.1 1.0";// ////////////////////
|
||||
colors[2] = "0.1 0.1 0.1 1.0";// \\\\\\\\\\\\\\\\\\\\
|
||||
colors[3] = "0.1 0.1 0.1 1.0";// \\\\\\\\\\\\\\\\\\\\
|
||||
sizes[0] = 1.0;
|
||||
sizes[1] = 1.0;
|
||||
sizes[2] = 1.0;
|
||||
sizes[3] = 1.0;
|
||||
times[0] = 0.0;
|
||||
times[1] = 0.33;
|
||||
times[2] = 0.66;
|
||||
times[3] = 1.0;
|
||||
mass = 0.7;
|
||||
elasticity = 0.2;
|
||||
friction = 1;
|
||||
computeCRC = true;
|
||||
haslight = true;
|
||||
lightType = "PulsingLight";
|
||||
lightColor = "0.2 0.0 0.5 1.0";
|
||||
lightTime = "200";
|
||||
lightRadius = "2.0";
|
||||
};
|
||||
|
||||
datablock ParticleEmitterData(MiniShadowBallEmitter) {
|
||||
ejectionPeriodMS = 0.3;
|
||||
periodVarianceMS = 0;
|
||||
ejectionVelocity = 0.0;
|
||||
velocityVariance = 0.0;
|
||||
ejectionOffset = 2;
|
||||
thetaMin = 0;
|
||||
thetaMax = 180;
|
||||
overrideAdvances = false;
|
||||
particles = "LaserBallGlobeSmoke";
|
||||
};
|
||||
|
||||
datablock LinearFlareProjectileData(ShadowBomb) : FlamethrowerBolt {
|
||||
baseEmitter = ShadowBaseEmitter;
|
||||
fizzleTimeMS = 14000;
|
||||
lifetimeMS = 10000; // z0dd - ZOD, 4/25/02. Was 6000
|
||||
};
|
||||
|
||||
datablock SeekerProjectileData(VardisonLaserBallMissile) : YvexNightmareMissile {
|
||||
baseEmitter = ShadowBaseEmitter;
|
||||
};
|
||||
|
||||
function VardisonLaserBallMissile::OnExplode(%data, %proj, %pos, %mod) {
|
||||
//LaserBall
|
||||
%ball = CreateEmitter(%pos, "MiniShadowBallEmitter", "0 0 0 0");
|
||||
%ball.schedule(10000, "Delete");
|
||||
LaserBallStrike(vectorAdd(%pos, "0 0 3"), 0);
|
||||
}
|
||||
=======
|
||||
//Lord Vardison
|
||||
//Version 2.0
|
||||
//Revised And Reimagined... The Pure Evil of TWM2 Has Been Reborn, Now With Less Crashing xD
|
||||
|
|
@ -281,7 +22,6 @@ function VardisonLaserBallMissile::OnExplode(%data, %proj, %pos, %mod) {
|
|||
// - All Phases Insta-Kill, Phase 3 does the spawn camp thingy :D
|
||||
// - Shadow Orb at all Phases
|
||||
// - Shadow Orb regenerates Vardison's HP
|
||||
>>>>>>> origin/development
|
||||
|
||||
$TWM2::VardisonDifficulty = 1;
|
||||
$TWM2::Vardison_DMsg[1] = "Lord Vardison Fight [EASY]: The Standard Battle... Work Togther and Be Victorious.";
|
||||
|
|
@ -335,295 +75,11 @@ $TWM2::Vardison_MinionCooldown[2] = 17;
|
|||
$TWM2::Vardison_MinionCooldown[3] = 15;
|
||||
$TWM2::Vardison_MinionCooldown[4] = 10;
|
||||
|
||||
<<<<<<< HEAD
|
||||
datablock LinearFlareProjectileData(VardisonSubShadowBomb) : DMPlasma {
|
||||
explosion = MortarExplosion;
|
||||
dryVelocity = 500.0; // z0dd - ZOD, 4/25/02. Was 50. Velocity of projectile out of water
|
||||
wetVelocity = -1;
|
||||
velInheritFactor = 1.0;
|
||||
fizzleTimeMS = 14000;
|
||||
lifetimeMS = 10000; // z0dd - ZOD, 4/25/02. Was 6000
|
||||
};
|
||||
|
||||
//ARMOR DBs
|
||||
datablock PlayerData(VardisonStage1Armor) : LightMaleHumanArmor {
|
||||
runForce = 60.20 * 90;
|
||||
runEnergyDrain = 0.0;
|
||||
minRunEnergy = 10;
|
||||
maxForwardSpeed = 9;
|
||||
maxBackwardSpeed = 7;
|
||||
maxSideSpeed = 7;
|
||||
|
||||
jumpForce = 14.0 * 90;
|
||||
|
||||
maxDamage = 300.0;
|
||||
minImpactSpeed = 35;
|
||||
shapeFile = "light_male.dts";
|
||||
jetEmitter = BiodermArmorJetEmitter;
|
||||
jetEffect = BiodermArmorJetEffect;
|
||||
|
||||
debrisShapeName = "bio_player_debris.dts";
|
||||
|
||||
//Foot Prints
|
||||
decalData = LightBiodermFootprint;
|
||||
decalOffset = 0.3;
|
||||
|
||||
waterBreathSound = WaterBreathBiodermSound;
|
||||
|
||||
damageScale[$DamageType::M1700] = 3.0;
|
||||
damageScale[$DamageType::Missile] = 0.0000000000000001;
|
||||
damageScale[$DamageType::Nuclear] = 0.0000000000000001;
|
||||
damageScale[$DamageType::EMP] = 0.0000000000000001;
|
||||
damageScale[$DamageType::Bullet] = 0.10; //I deny you shrike n0bs
|
||||
|
||||
max[RepairKit] = 0;
|
||||
max[Mine] = 0;
|
||||
max[Grenade] = 0;
|
||||
};
|
||||
|
||||
datablock PlayerData(DarkArchmageVardisonArmor) : VardisonStage1Armor {
|
||||
maxDamage = 1000.0;
|
||||
minImpactSpeed = 35;
|
||||
shapeFile = "light_male.dts";
|
||||
jetEmitter = BiodermArmorJetEmitter;
|
||||
jetEffect = BiodermArmorJetEffect;
|
||||
|
||||
damageScale[$DamageType::M1700] = 3.0;
|
||||
damageScale[$DamageType::Missile] = 0.0000000000000001;
|
||||
damageScale[$DamageType::Nuclear] = 0.0000000000000001;
|
||||
damageScale[$DamageType::EMP] = 0.0000000000000001;
|
||||
damageScale[$DamageType::Bullet] = 0.10; //I deny you shrike n0bs
|
||||
|
||||
max[RepairKit] = 0;
|
||||
max[Mine] = 0;
|
||||
max[Grenade] = 0;
|
||||
};
|
||||
|
||||
datablock FlyingVehicleData(VardisonStage2Flyer) : ShrikeDamageProfile {
|
||||
spawnOffset = "0 0 2";
|
||||
canControl = false;
|
||||
catagory = "Vehicles";
|
||||
shapeFile = "vehicle_air_bomber.dts";
|
||||
multipassenger = false;
|
||||
computeCRC = true;
|
||||
|
||||
debrisShapeName = "vehicle_air_bomber.dts";
|
||||
debris = MeShapeDebris;
|
||||
renderWhenDestroyed = false;
|
||||
|
||||
drag = 0.15;
|
||||
density = 1.0;
|
||||
|
||||
mountPose[0] = sitting;
|
||||
numMountPoints = 1;
|
||||
isProtectedMountPoint[0] = false;
|
||||
cameraMaxDist = 15;
|
||||
cameraOffset = 2.5;
|
||||
cameraLag = 0.9;
|
||||
explosion = MeVehicleExplosion;
|
||||
explosionDamage = 1.0;
|
||||
explosionRadius = 10.0;
|
||||
|
||||
maxDamage = 50.0;
|
||||
destroyedLevel = 50.0;
|
||||
|
||||
HDAddMassLevel = 49.9;
|
||||
HDMassImage = LflyerHDMassImage;
|
||||
|
||||
isShielded = false;
|
||||
energyPerDamagePoint = 0;
|
||||
maxEnergy = 5000; // Afterburner and any energy weapon pool
|
||||
rechargeRate = 4;
|
||||
|
||||
minDrag = 22; // Linear Drag (eventually slows you down when not thrusting...constant drag)
|
||||
rotationalDrag = 900; // Anguler Drag (dampens the drift after you stop moving the mouse...also tumble drag)
|
||||
|
||||
maxAutoSpeed = 50; // Autostabilizer kicks in when less than this speed. (meters/second)
|
||||
autoAngularForce = 400; // Angular stabilizer force (this force levels you out when autostabilizer kicks in)
|
||||
autoLinearForce = 1; // Linear stabilzer force (this slows you down when autostabilizer kicks in)
|
||||
autoInputDamping = 0.8; // Dampen control input so you don't` whack out at very slow speeds
|
||||
|
||||
|
||||
// Maneuvering
|
||||
maxSteeringAngle = 4.5; // Max radiens you can rotate the wheel. Smaller number is more maneuverable.
|
||||
horizontalSurfaceForce = 6; // Horizontal center "wing" (provides "bite" into the wind for climbing/diving and turning)
|
||||
verticalSurfaceForce = 4; // Vertical center "wing" (controls side slip. lower numbers make MORE slide.)
|
||||
maneuveringForce = 5250; // Horizontal jets (W,S,D,A key thrust)
|
||||
steeringForce = 675; // Steering jets (force applied when you move the mouse)
|
||||
steeringRollForce = 3000; // Steering jets (how much you heel over when you turn)
|
||||
rollForce = 1; // Auto-roll (self-correction to right you after you roll/invert)
|
||||
hoverHeight = 2.5; // Height off the ground at rest
|
||||
createHoverHeight = 1; // Height off the ground when created
|
||||
maxForwardSpeed = 165; // speed in which forward thrust force is no longer applied (meters/second)
|
||||
|
||||
// Turbo Jet
|
||||
jetForce = 2500; // Afterburner thrust (this is in addition to normal thrust)
|
||||
minJetEnergy = 40; // Afterburner can't be used if below this threshhold.
|
||||
jetEnergyDrain = 10; // Energy use of the afterburners (low number is less drain...can be fractional) // Auto stabilize speed
|
||||
vertThrustMultiple = 1.25;
|
||||
|
||||
// Rigid body
|
||||
mass = 150; // Mass of the vehicle
|
||||
bodyFriction = 0; // Don't mess with this.
|
||||
bodyRestitution = 0.5; // When you hit the ground, how much you rebound. (between 0 and 1)
|
||||
minRollSpeed = 0; // Don't mess with this.
|
||||
softImpactSpeed = 14; // Sound hooks. This is the soft hit.
|
||||
hardImpactSpeed = 25; // Sound hooks. This is the hard hit.
|
||||
|
||||
// Ground Impact Damage (uses DamageType::Ground)
|
||||
minImpactSpeed = 20; // If hit ground at speed above this then it's an impact. Meters/second
|
||||
speedDamageScale = 0.06;
|
||||
|
||||
// Object Impact Damage (uses DamageType::Impact)
|
||||
collDamageThresholdVel = 23.0;
|
||||
collDamageMultiplier = 0.02;
|
||||
|
||||
//
|
||||
minTrailSpeed = 70; // The speed your contrail shows up at.
|
||||
trailEmitter = JetShadowEmitter;
|
||||
forwardJetEmitter = JetShadowEmitter;
|
||||
downJetEmitter = JetShadowEmitter;
|
||||
|
||||
//
|
||||
jetSound = ScoutFlyerThrustSound;
|
||||
engineSound = ScoutFlyerEngineSound;
|
||||
softImpactSound = SoftImpactSound;
|
||||
hardImpactSound = HardImpactSound;
|
||||
//wheelImpactSound = WheelImpactSound;
|
||||
|
||||
//
|
||||
softSplashSoundVelocity = 10.0;
|
||||
mediumSplashSoundVelocity = 15.0;
|
||||
hardSplashSoundVelocity = 20.0;
|
||||
exitSplashSoundVelocity = 10.0;
|
||||
|
||||
exitingWater = VehicleExitWaterMediumSound;
|
||||
impactWaterEasy = VehicleImpactWaterSoftSound;
|
||||
impactWaterMedium = VehicleImpactWaterMediumSound;
|
||||
impactWaterHard = VehicleImpactWaterMediumSound;
|
||||
waterWakeSound = VehicleWakeMediumSplashSound;
|
||||
|
||||
dustEmitter = VehicleLiftoffDustEmitter;
|
||||
triggerDustHeight = 4.0;
|
||||
dustHeight = 1.0;
|
||||
|
||||
damageEmitter[0] = MeLightDamageSmoke;
|
||||
damageEmitter[1] = MeHeavyDamageSmoke;
|
||||
damageEmitter[2] = MeDamageBubbles;
|
||||
damageEmitterOffset[0] = "0.0 -3.0 0.0 ";
|
||||
damageLevelTolerance[0] = 0.4;
|
||||
damageLevelTolerance[1] = 0.75;
|
||||
numDmgEmitterAreas = 1;
|
||||
|
||||
//
|
||||
max[chaingunAmmo] = 2000;
|
||||
max[MissileLauncherAmmo] = 200;
|
||||
max[MortarAmmo] = 200;
|
||||
|
||||
damageScale[$DamageType::Nuclear] = 0.0000000000000001;
|
||||
damageScale[$DamageType::EMP] = 0.0000000000000001;
|
||||
damageScale[$DamageType::Bullet] = 0.10; //I deny you shrike n0bs
|
||||
ShieldDamageScale[$DamageType::Bullet] = 0.01; //I deny you shrike n0bs
|
||||
|
||||
minMountDist = 7;
|
||||
|
||||
splashEmitter[0] = VehicleFoamDropletsEmitter;
|
||||
splashEmitter[1] = VehicleFoamEmitter;
|
||||
|
||||
shieldImpact = VehicleShieldImpact;
|
||||
|
||||
cmdCategory = "Tactical";
|
||||
cmdIcon = CMDFlyingScoutIcon;
|
||||
cmdMiniIconName = "commander/MiniIcons/com_scout_grey";
|
||||
targetNameTag = 'Lord Vardison';
|
||||
targetTypeTag = '';
|
||||
sensorData = SSTurretBaseSensorObj;
|
||||
sensorRadius = SSTurretBaseSensorObj.detectRadius;
|
||||
sensorColor = "9 9 255";
|
||||
|
||||
checkRadius = 5.5;
|
||||
observeParameters = "1 10 10";
|
||||
|
||||
runningLight[0] = ShrikeLight1;
|
||||
// runningLight[1] = ShrikeLight2;
|
||||
|
||||
shieldEffectScale = "0.937 1.125 0.60";
|
||||
|
||||
numWeapons = 3;
|
||||
|
||||
replaceTime = 90;
|
||||
};
|
||||
|
||||
datablock PlayerData(VardisonStage3Armor) : LightMaleHumanArmor {
|
||||
runForce = 60.20 * 90;
|
||||
runEnergyDrain = 0.0;
|
||||
minRunEnergy = 10;
|
||||
maxForwardSpeed = 9;
|
||||
maxBackwardSpeed = 7;
|
||||
maxSideSpeed = 7;
|
||||
|
||||
jumpForce = 14.0 * 90;
|
||||
|
||||
maxDamage = 500.0;
|
||||
minImpactSpeed = 35;
|
||||
shapeFile = "TR2Heavy_Male.dts";
|
||||
jetEmitter = BiodermArmorJetEmitter;
|
||||
jetEffect = BiodermArmorJetEffect;
|
||||
|
||||
debrisShapeName = "bio_player_debris.dts";
|
||||
|
||||
//Foot Prints
|
||||
decalData = LightBiodermFootprint;
|
||||
decalOffset = 0.3;
|
||||
|
||||
boundingBox = "5 5 10";
|
||||
|
||||
waterBreathSound = WaterBreathBiodermSound;
|
||||
|
||||
damageScale[$DamageType::M1700] = 3.0;
|
||||
damageScale[$DamageType::PlasmaCannon] = 0.001;
|
||||
damageScale[$DamageType::Missile] = 0.0000000000000001;
|
||||
damageScale[$DamageType::Nuclear] = 0.0000000000000001;
|
||||
damageScale[$DamageType::EMP] = 0.0000000000000001;
|
||||
damageScale[$DamageType::Bullet] = 0.10; //I deny you shrike n0bs
|
||||
|
||||
max[RepairKit] = 0;
|
||||
max[Mine] = 0;
|
||||
max[Grenade] = 0;
|
||||
};
|
||||
|
||||
function StartDAVardison(%pos) {
|
||||
%Vardison = new player() {
|
||||
Datablock = "DarkArchmageVardisonArmor";
|
||||
};
|
||||
%Cpos = vectorAdd(%pos, "0 0 5");
|
||||
MessageAll('MsgVardison', "\c4"@$TWM2::BossName["DAVardison"]@": Rise forces of darkness, as our enemies shall face their demise");
|
||||
|
||||
%command = "DAVardisonmovetotarget";
|
||||
%Vardison.ticks = 0;
|
||||
InitiateBoss(%Vardison, "DAVardison");
|
||||
|
||||
%Vardison.team = 30;
|
||||
%zname = CollapseEscape("\c7"@$TWM2::BossName["DAVardison"]@""); // <- To Hosts, Enjoy, You can
|
||||
//Change the Demon Names now!!!
|
||||
%Vardison.target = createTarget(%Vardison, %zname, "", "Derm3", '', %Vardison.team, PlayerSensor);
|
||||
setTargetSensorData(%Vardison.target, PlayerSensor);
|
||||
setTargetSensorGroup(%Vardison.target, 30);
|
||||
setTargetName(%Vardison.target, addtaggedstring(%zname));
|
||||
setTargetSkin(%Vardison.target, 'Inferno');
|
||||
//
|
||||
%Vardison.setPosition(%cpos);
|
||||
%Vardison.canjump = 1;
|
||||
%Vardison.hastarget = 1;
|
||||
MissionCleanup.add(%Vardison);
|
||||
schedule(1000, %Vardison, %command, %Vardison);
|
||||
=======
|
||||
//Particles & Emitters
|
||||
datablock ParticleData(SummoningPierParticle) {
|
||||
dragCoeffiecient = 0.0;
|
||||
gravityCoefficient = -0.1;
|
||||
inheritedVelFactor = 0.1;
|
||||
>>>>>>> origin/development
|
||||
|
||||
lifetimeMS = 1500;
|
||||
lifetimeVarianceMS = 50;
|
||||
|
|
@ -1056,148 +512,11 @@ function ShadowOrb::onDestroyed(%this, %obj, %prevState) {
|
|||
$TWM2::VardisonManager.orbDestroyed();
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
function ShadowBomb::onExplode(%data, %proj, %pos, %mod) {
|
||||
%vec = %proj.spdvec;
|
||||
%vec = getword(%vec, 0)@" "@getword(%vec, 1)@" 0";
|
||||
%vec = vectorNormalize(%vec);
|
||||
%vec = vectorscale(%vec, 30);
|
||||
%result = containerRayCast(vectoradd(%pos,"0 0 10"), vectoradd(%pos,%vec), $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::ForceFieldObjectType | $TypeMasks::TerrainObjectType, %proj);
|
||||
for(%i = 0; %i < 3; %i++) {
|
||||
if(%result)
|
||||
schedule((5 * %i), 0, "Napalm2FindNewDir", %pos, %vec, %proj.sourceobject, 0, 0);
|
||||
else {
|
||||
%rndvec = (getRandom(1, 15) - 7.5)@" "@(getRandom(1, 15) - 7.5)@" "@((getRandom() * 5) + 5);
|
||||
%newvec = vectoradd(%vec,%rndvec);
|
||||
%newvec = vectoradd(%pos,%newvec);
|
||||
%p = new LinearFlareProjectile() {
|
||||
dataBlock = VardisonSubShadowBomb;
|
||||
initialDirection = "0 0 -1";
|
||||
initialPosition = %newvec;
|
||||
sourceObject = %proj.sourceobject;
|
||||
SourceSlot = 5;
|
||||
};
|
||||
%p.sourceobject = %proj.sourceobject;
|
||||
%p.vector = %vec;
|
||||
%p.count = 1;
|
||||
if(%proj.maxExplode $= "") {
|
||||
%p.maxExplode = 15;
|
||||
}
|
||||
else {
|
||||
%p.maxExplode = %proj.maxExplode;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (%data.hasDamageRadius)
|
||||
RadiusExplosion(%proj, %pos, %data.damageRadius, %data.indirectDamage, %data.kickBackStrength, %proj.sourceObject, %data.radiusDamageType);
|
||||
}
|
||||
|
||||
function VardisonSubShadowBomb::onExplode(%data, %proj, %pos, %mod) {
|
||||
if(%proj.count < %proj.maxExplode) { //holy... christ
|
||||
%vec = vectorscale(vectornormalize(%proj.vector), 24);
|
||||
%result = containerRayCast(vectoradd(%pos,"0 0 10"), vectoradd(%pos,%vec), $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::ForceFieldObjectType | $TypeMasks::TerrainObjectType, %proj);
|
||||
if(%result)
|
||||
schedule(5, 0, "Napalm2FindNewDir", %pos, %vec, %proj.sourceobject, %proj.count, 0);
|
||||
else {
|
||||
%rndvec = (getRandom(1, 10) - 5)@" "@(getRandom(1, 10) - 5)@" "@((getRandom() * 5) + 5);
|
||||
%newvec = vectoradd(%vec,%rndvec);
|
||||
%newvec = vectoradd(%pos,%newvec);
|
||||
%p = new LinearFlareProjectile() {
|
||||
dataBlock = VardisonSubShadowBomb;
|
||||
initialDirection = "0 0 -1";
|
||||
initialPosition = %newvec;
|
||||
sourceObject = %proj.sourceobject;
|
||||
sourceSlot = 5;
|
||||
};
|
||||
%p.sourceobject = %proj.sourceobject;
|
||||
%p.vector = %vec;
|
||||
%p.count = %proj.count + 1;
|
||||
}
|
||||
}
|
||||
if (%data.hasDamageRadius)
|
||||
RadiusExplosion(%proj, %pos, %data.damageRadius, %data.indirectDamage, %data.kickBackStrength, %proj.sourceObject, %data.radiusDamageType);
|
||||
}
|
||||
|
||||
function Napalm2FindNewDir(%pos, %vec, %source, %count, %count2) {
|
||||
if(%count2 == 2) {
|
||||
%rndvec = getRandom(1, 10)@" "@getRandom(1, 10)@" "@((getRandom() * 5) + 4);
|
||||
%newvec = vectoradd(%pos,%rndvec);
|
||||
%p = new LinearFlareProjectile() {
|
||||
dataBlock = VardisonSubShadowBomb;
|
||||
initialDirection = "0 0 -1";
|
||||
initialPosition = %newvec;
|
||||
sourceObject = %source;
|
||||
sourceSlot = 5;
|
||||
};
|
||||
%p.sourceobject = %source;
|
||||
%p.vector = %vec;
|
||||
%p.count = %count+1;
|
||||
return;
|
||||
}
|
||||
if(%count2 == 1) {
|
||||
%vec = vectorscale(%vec,-1);
|
||||
%result = containerRayCast(vectoradd(%pos,"0 0 10"), vectoradd(%pos,%vec), $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::ForceFieldObjectType | $TypeMasks::TerrainObjectType, 0);
|
||||
if(!(%result)){
|
||||
%rndvec = getRandom(1, 10)@" "@getRandom(1, 10)@" "@((getRandom() * 5) + 4);
|
||||
%newvec = vectoradd(%vec,%rndvec);
|
||||
%newvec = vectoradd(%pos,%newvec);
|
||||
%p = new LinearFlareProjectile() {
|
||||
dataBlock = VardisonSubShadowBomb;
|
||||
initialDirection = "0 0 -1";
|
||||
initialPosition = %newvec;
|
||||
sourceObject = %source;
|
||||
sourceSlot = 5;
|
||||
};
|
||||
%p.sourceobject = %source;
|
||||
%p.vector = %vec;
|
||||
%p.count = %count+1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
%chance = getrandom(1,4);
|
||||
if(%chance <= 2){
|
||||
%nv2 = (getword(%vec, 0) * -1);
|
||||
%nv1 = getword(%vec, 1);
|
||||
%vec = %nv1@" "@%nv2@" 0";
|
||||
}
|
||||
else {
|
||||
%nv2 = getword(%vec, 0);
|
||||
%nv1 = (getword(%vec, 1) * -1);
|
||||
%vec = %nv1@" "@%nv2@" 0";
|
||||
}
|
||||
%result = containerRayCast(vectoradd(%pos,"0 0 10"), vectoradd(%pos,%vec), $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::ForceFieldObjectType | $TypeMasks::TerrainObjectType, 0);
|
||||
if(!(%result)){
|
||||
%rndvec = getRandom(1, 10)@" "@getRandom(1, 10)@" "@((getRandom() * 5) + 4);
|
||||
%newvec = vectoradd(%vec,%rndvec);
|
||||
%newvec = vectoradd(%pos,%newvec);
|
||||
%p = new LinearFlareProjectile() {
|
||||
dataBlock = VardisonSubShadowBomb;
|
||||
initialDirection = "0 0 -1";
|
||||
initialPosition = %newvec;
|
||||
sourceObject = %source;
|
||||
sourceSlot = 5;
|
||||
};
|
||||
%p.sourceobject = %source;
|
||||
%p.vector = %vec;
|
||||
%p.count = %count+1;
|
||||
return;
|
||||
}
|
||||
}
|
||||
%count2++;
|
||||
schedule(2, 0, "Napalm2FindNewDir", %pos, %vec, %source, %count, %count2);
|
||||
}
|
||||
|
||||
function GOVDoFlameCano(%g, %target) {
|
||||
if(!isObject(%g) || %g.getState() $= "dead") {
|
||||
return;
|
||||
=======
|
||||
//Boss Functions
|
||||
function CheckVardisonManager() {
|
||||
if($TWM2::VardisonDifficulty < 1 || $TWM2::VardisonDifficulty > 4) {
|
||||
//Are the odds in your favor now, or will Vardison rek you endlessly?
|
||||
$TWM2::VardisonDifficulty = getRandom(1, 4);
|
||||
>>>>>>> origin/development
|
||||
}
|
||||
if(!isObject($TWM2::VardisonManager)) {
|
||||
$TWM2::VardisonManager = new ScriptObject() {
|
||||
|
|
@ -2099,10 +1418,6 @@ function VardisonNamedAttack(%Boss, %attack, %args) {
|
|||
initialPosition = %sPos;
|
||||
sourceSlot = 4;
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
%p.maxExplode = %detCt;
|
||||
MissionCleanup.add(%p);
|
||||
=======
|
||||
%p.sourceObject = %Boss;
|
||||
%beacon = new BeaconObject() {
|
||||
dataBlock = "SubBeacon";
|
||||
|
|
@ -2114,7 +1429,6 @@ function VardisonNamedAttack(%Boss, %attack, %args) {
|
|||
MissionCleanup.add(%beacon);
|
||||
%p.setObjectTarget(%beacon);
|
||||
DemonMotherMissileFollow(%target, %beacon, %p);
|
||||
>>>>>>> origin/development
|
||||
|
||||
case "ShadowFissure":
|
||||
%sPos = getField(%args, 0);
|
||||
|
|
@ -2310,107 +1624,6 @@ function VardisonMinionCountCheckup(%boss, %retPos, %lowEnd) {
|
|||
%boss.vmcountLoop = schedule(1000, 0, VardisonMinionCountCheckup, %boss, %retPos, %lowEnd);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//==============================================================================
|
||||
datablock SeekerProjectileData(VardisonMiniDemonSpawner) : VardisonNightmareMissile {
|
||||
baseEmitter = ShadowBaseEmitter;
|
||||
};
|
||||
|
||||
function VardisonMiniDemonSpawner::OnExplode(%data, %proj, %pos, %mod) {
|
||||
//LaserBall
|
||||
%ball = CreateEmitter(%pos, "MiniShadowBallEmitter", "0 0 0 0");
|
||||
%ball.schedule(1000, "Delete");
|
||||
%Fire = CreateEmitter(%pos, "burnEmitter", "0 0 0 0");
|
||||
%Fire.schedule(2500, "Delete");
|
||||
CreateDemonAT(vectorAdd(%pos, "0 0 3"));
|
||||
}
|
||||
|
||||
datablock PlayerData(MiniDemonArmor) : LightMaleHumanArmor {
|
||||
runForce = 60.20 * 90;
|
||||
runEnergyDrain = 0.0;
|
||||
minRunEnergy = 10;
|
||||
maxForwardSpeed = 9;
|
||||
maxBackwardSpeed = 7;
|
||||
maxSideSpeed = 7;
|
||||
|
||||
jumpForce = 14.0 * 90;
|
||||
|
||||
maxDamage = 2.8;
|
||||
minImpactSpeed = 1000;
|
||||
shapeFile = "bioderm_medium.dts";
|
||||
jetEmitter = BiodermArmorJetEmitter;
|
||||
jetEffect = BiodermArmorJetEffect;
|
||||
|
||||
debrisShapeName = "bio_player_debris.dts";
|
||||
|
||||
//Foot Prints
|
||||
decalData = LightBiodermFootprint;
|
||||
decalOffset = 0.3;
|
||||
|
||||
waterBreathSound = WaterBreathBiodermSound;
|
||||
|
||||
damageScale[$DamageType::M1700] = 3.0;
|
||||
damageScale[$DamageType::PlasmaCannon] = 0.001;
|
||||
damageScale[$DamageType::Missile] = 0.0000000000000001;
|
||||
damageScale[$DamageType::Nuclear] = 0.0000000000000001;
|
||||
damageScale[$DamageType::EMP] = 0.0000000000000001;
|
||||
|
||||
max[RepairKit] = 0;
|
||||
max[Mine] = 0;
|
||||
max[Grenade] = 0;
|
||||
};
|
||||
|
||||
datablock GrenadeProjectileData(MiniDemonBlaster) {
|
||||
projectileShapeName = "plasmabolt.dts";
|
||||
emitterDelay = -1;
|
||||
directDamage = 0.0;
|
||||
hasDamageRadius = true;
|
||||
indirectDamage = 0.45;
|
||||
damageRadius = 5.0; // z0dd - ZOD, 8/13/02. Was 20.0
|
||||
radiusDamageType = $DamageType::Demon;
|
||||
kickBackStrength = 1500;
|
||||
|
||||
explosion = "MortarExplosion";
|
||||
underwaterExplosion = "MortarExplosion";
|
||||
velInheritFactor = 0;
|
||||
splash = PlasmaSplash;
|
||||
depthTolerance = 100.0;
|
||||
|
||||
baseEmitter = DemonFBSmokeEmitter;
|
||||
bubbleEmitter = DemonFBSmokeEmitter;
|
||||
|
||||
grenadeElasticity = 0;
|
||||
grenadeFriction = 0.4;
|
||||
armingDelayMS = -1; // z0dd - ZOD, 4/14/02. Was 2000
|
||||
|
||||
gravityMod = 0.4; // z0dd - ZOD, 5/18/02. Make mortar projectile heavier, less floaty
|
||||
muzzleVelocity = 125.0; // z0dd - ZOD, 8/13/02. More velocity to compensate for higher gravity. Was 63.7
|
||||
drag = 0;
|
||||
sound = PlasmaProjectileSound;
|
||||
|
||||
hasLight = true;
|
||||
lightRadius = 10;
|
||||
lightColor = "1 0.75 0.25";
|
||||
|
||||
hasLightUnderwaterColor = true;
|
||||
underWaterLightColor = "1 0.75 0.25";
|
||||
};
|
||||
|
||||
function CreateDemon(%pos) {
|
||||
%p = new SeekerProjectile() {
|
||||
dataBlock = VardisonMiniDemonSpawner;
|
||||
initialDirection = "0 0 -10";
|
||||
initialPosition = vectorAdd(%pos, "0 0 500");
|
||||
//sourceObject = %boss;
|
||||
//sourceSlot = 4;
|
||||
=======
|
||||
//Vardison Manager Functions
|
||||
//SummonOrb()
|
||||
function VardisonManager::summonOrb(%this, %boss) {
|
||||
|
|
@ -2433,7 +1646,6 @@ function VardisonManager::summonOrb(%this, %boss) {
|
|||
position = %orb.getPosition();
|
||||
dataBlock = "defaultEmissionDummy";
|
||||
emitter = "ShadowOrbEmitter";
|
||||
>>>>>>> origin/development
|
||||
};
|
||||
MissionCleanup.add(%orb.sfx);
|
||||
//
|
||||
|
|
|
|||
|
|
@ -54,11 +54,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
//press JET
|
||||
if (%trigger == 3) {
|
||||
//Can we Call in this airstrike?
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.find("Airstrike") == -1 && !%client.UnlimitedAS) {
|
||||
=======
|
||||
if(%client.streakCount[2] <= 0 && !%client.UnlimitedAS) {
|
||||
>>>>>>> origin/development
|
||||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
|
|
@ -83,17 +79,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
if(!%client.UnlimitedAS) {
|
||||
<<<<<<< HEAD
|
||||
%newCt = getField(%client.ksListInstance.find("Airstrike"), 1) - 1;
|
||||
if(%newCt == 0) {
|
||||
%client.ksListInstance.removeElement(getField(%client.ksListInstance.find("Airstrike"), 1));
|
||||
}
|
||||
else {
|
||||
%client.ksListInstance.set(getField(%client.ksListInstance.find("Airstrike"), 1), "Airstrike" SPC %newCt);
|
||||
}
|
||||
=======
|
||||
%client.streakCount[2]--;
|
||||
>>>>>>> origin/development
|
||||
GainExperience(%client, 35, "Airstrike called in ");
|
||||
}
|
||||
bottomPrint(%client, "Coordinates Confirmed, Calling In Airstrike", 5, 2);
|
||||
|
|
@ -116,11 +102,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
//press JET
|
||||
if (%trigger == 3) {
|
||||
//Can we Call in this airstrike?
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.find("Harrier") == -1) {
|
||||
=======
|
||||
if(%client.streakCount[5] <= 0) {
|
||||
>>>>>>> origin/development
|
||||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
|
|
@ -142,17 +124,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
<<<<<<< HEAD
|
||||
%newCt = getField(%client.ksListInstance.find("Harrier"), 1) - 1;
|
||||
if(%newCt == 0) {
|
||||
%client.ksListInstance.removeElement(getField(%client.ksListInstance.find("Harrier"), 1));
|
||||
}
|
||||
else {
|
||||
%client.ksListInstance.set(getField(%client.ksListInstance.find("Harrier"), 1), "Harrier" SPC %newCt);
|
||||
}
|
||||
=======
|
||||
%client.streakCount[5]--;
|
||||
>>>>>>> origin/development
|
||||
GainExperience(%client, 150, "Harrier Airstrike called in ");
|
||||
messageTeam(%client.team, 'MsgAirstrike', "\c5TWM2: "@%client.namebase@"'s Harrier Airstrike is Approaching.");
|
||||
bottomPrint(%client, "Coordinates Confirmed, Calling In Harriers", 5, 2);
|
||||
|
|
@ -174,11 +146,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
//press JET
|
||||
if (%trigger == 3) {
|
||||
//Can we Call in this airstrike?
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.find("Napalm") == -1) {
|
||||
=======
|
||||
if(%client.streakCount[17] <= 0) {
|
||||
>>>>>>> origin/development
|
||||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
|
|
@ -200,17 +168,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
<<<<<<< HEAD
|
||||
%newCt = getField(%client.ksListInstance.find("Napalm"), 1) - 1;
|
||||
if(%newCt == 0) {
|
||||
%client.ksListInstance.removeElement(getField(%client.ksListInstance.find("Napalm"), 1));
|
||||
}
|
||||
else {
|
||||
%client.ksListInstance.set(getField(%client.ksListInstance.find("Napalm"), 1), "Napalm" SPC %newCt);
|
||||
}
|
||||
=======
|
||||
%client.streakCount[17]--;
|
||||
>>>>>>> origin/development
|
||||
GainExperience(%client, 350, "Napalm Airstrike called in ");
|
||||
messageTeam(%client.team, 'MsgAirstrike', "\c5TWM2: "@%client.namebase@"'s Napalm Airstrike is coming in hot.");
|
||||
bottomPrint(%client, "Coordinates Confirmed, Calling In Strike Fighters", 5, 2);
|
||||
|
|
@ -232,11 +190,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
//press JET
|
||||
if (%trigger == 3) {
|
||||
//Can we Call in this airstrike?
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.find("OLS") == -1) {
|
||||
=======
|
||||
if(%client.streakCount[6] <= 0) {
|
||||
>>>>>>> origin/development
|
||||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
|
|
@ -250,17 +204,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
<<<<<<< HEAD
|
||||
%newCt = getField(%client.ksListInstance.find("OLS"), 1) - 1;
|
||||
if(%newCt == 0) {
|
||||
%client.ksListInstance.removeElement(getField(%client.ksListInstance.find("OLS"), 1));
|
||||
}
|
||||
else {
|
||||
%client.ksListInstance.set(getField(%client.ksListInstance.find("OLS"), 1), "OLS" SPC %newCt);
|
||||
}
|
||||
=======
|
||||
%client.streakCount[6]--;
|
||||
>>>>>>> origin/development
|
||||
GainExperience(%client, 350, "Orbital Laser Strike Called In ");
|
||||
messageTeam(%client.team, 'MsgAirstrike', "\c5TWM2: "@%client.namebase@"'s Laser Strike is Incoming.");
|
||||
bottomPrint(%client, "Coordinates Confirmed, Spinning Laser Cannon", 5, 2);
|
||||
|
|
@ -282,11 +226,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
//press JET
|
||||
if (%trigger == 3) {
|
||||
//Can we Call in this airstrike?
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.find("Stealth") == -1) {
|
||||
=======
|
||||
if(%client.streakCount[8] <= 0) {
|
||||
>>>>>>> origin/development
|
||||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
|
|
@ -308,17 +248,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
<<<<<<< HEAD
|
||||
%newCt = getField(%client.ksListInstance.find("Stealth"), 1) - 1;
|
||||
if(%newCt == 0) {
|
||||
%client.ksListInstance.removeElement(getField(%client.ksListInstance.find("Stealth"), 1));
|
||||
}
|
||||
else {
|
||||
%client.ksListInstance.set(getField(%client.ksListInstance.find("Stealth"), 1), "Stealth" SPC %newCt);
|
||||
}
|
||||
=======
|
||||
%client.streakCount[8]--;
|
||||
>>>>>>> origin/development
|
||||
GainExperience(%client, 150, "Stealth Bomber Airstrike called in ");
|
||||
bottomPrint(%client, "Coordinates Confirmed, Calling In Stealth Bomber", 5, 2);
|
||||
StealthAirstrike(%client, %position, %direction);
|
||||
|
|
@ -339,11 +269,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
//press JET
|
||||
if (%trigger == 3) {
|
||||
//Can we Call in this airstrike?
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.find("Artillery") == -1) {
|
||||
=======
|
||||
if(%client.streakCount[12] <= 0) {
|
||||
>>>>>>> origin/development
|
||||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
|
|
@ -357,17 +283,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
<<<<<<< HEAD
|
||||
%newCt = getField(%client.ksListInstance.find("Artillery"), 1) - 1;
|
||||
if(%newCt == 0) {
|
||||
%client.ksListInstance.removeElement(getField(%client.ksListInstance.find("Artillery"), 1));
|
||||
}
|
||||
else {
|
||||
%client.ksListInstance.set(getField(%client.ksListInstance.find("Artillery"), 1), "Artillery" SPC %newCt);
|
||||
}
|
||||
=======
|
||||
%client.streakCount[12]--;
|
||||
>>>>>>> origin/development
|
||||
GainExperience(%client, 250, "Artillery called in ");
|
||||
bottomPrint(%client, "Coordinates Confirmed, Calling In Artillery", 5, 2);
|
||||
messageTeam(%client.team, 'MsgAirstrike', "\c5TWM2: Artillery Called In From "@%client.namebase@"");
|
||||
|
|
@ -389,11 +305,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
//press JET
|
||||
if (%trigger == 3) {
|
||||
//Can we Call in this airstrike?
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.find("NukeStrike") == -1) {
|
||||
=======
|
||||
if(%client.streakCount[14] <= 0) {
|
||||
>>>>>>> origin/development
|
||||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
|
|
@ -407,17 +319,7 @@ function TWM2ControlCamera::onTrigger(%data,%obj,%trigger,%state) {
|
|||
if(isObject(%client.player)) {
|
||||
%obj.schedule(1000, "delete");
|
||||
%client.setControlObject(%client.player);
|
||||
<<<<<<< HEAD
|
||||
%newCt = getField(%client.ksListInstance.find("NukeStrike"), 1) - 1;
|
||||
if(%newCt == 0) {
|
||||
%client.ksListInstance.removeElement(getField(%client.ksListInstance.find("NukeStrike"), 1));
|
||||
}
|
||||
else {
|
||||
%client.ksListInstance.set(getField(%client.ksListInstance.find("NukeStrike"), 1), "NukeStrike" SPC %newCt);
|
||||
}
|
||||
=======
|
||||
%client.streakCount[14]--;
|
||||
>>>>>>> origin/development
|
||||
GainExperience(%client, 500, "Nuclear Missile called in ");
|
||||
bottomPrint(%client, "Coordinates Confirmed, Launching Missile", 5, 2);
|
||||
messageAll('msgDanger', "\c5TWM2 ALERT: "@%client.namebase@" has activated a nuclear missile!!! ~wfx/misc/red_alert.wav");
|
||||
|
|
|
|||
|
|
@ -326,11 +326,7 @@ function GiveTWM2Weapons(%client) {
|
|||
if(%client.HasFullTeamRespawn) {
|
||||
%client.player.setInventory(FullTeamRespawnCaller, 1, true);
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.count() > 0) {
|
||||
=======
|
||||
if(getWordCount(%client.streakList()) > 0) {
|
||||
>>>>>>> origin/development
|
||||
%client.player.setInventory(KillstreakBeacon, 1, true);
|
||||
}
|
||||
if(!%client.isconfiscated) {
|
||||
|
|
@ -366,116 +362,9 @@ function GameConnection::AwardKillstreak(%client, %streakVal, %plz) {
|
|||
if(%plz != -1 && (!%client.isActiveStreak(%streakVal) && ($Killstreak::Setting != 2) && !$TWM::PlayingHelljump)) {
|
||||
return;
|
||||
}
|
||||
if(!%client.ksListInstance) {
|
||||
%client.ksListInstance = initList();
|
||||
}
|
||||
%client.player.setInventory(KillstreakBeacon, 1, true);
|
||||
%cAmt = 0;
|
||||
switch(%streakVal) {
|
||||
case 1:
|
||||
MessageClient(%client, 'MsgZKill', "\c5TWM2: UAV Recon at Your Disposal.");
|
||||
<<<<<<< HEAD
|
||||
if(%client.ksListInstance.find("UAV") != -1) {
|
||||
%cAmt = getWord(getField(%client.ksListInstance.find("UAV"), 0), 1);
|
||||
}
|
||||
%client.ksListIntance.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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
=======
|
||||
case 2:
|
||||
MessageClient(%client, 'MsgZKill', "\c5TWM2: Airstrike Standing By.");
|
||||
case 3:
|
||||
|
|
@ -508,7 +397,6 @@ function GameConnection::AwardKillstreak(%client, %streakVal, %plz) {
|
|||
MessageClient(%client, 'MsgZKill', "\c5TWM2: Fission Bomb Ready... Obliterate everyone!!!");
|
||||
case 17:
|
||||
MessageClient(%client, 'MsgZKill', "\c5TWM2: Napalm Airstrike at your disposal.");
|
||||
>>>>>>> origin/development
|
||||
}
|
||||
%client.streakCount[%streakVal]++;
|
||||
if(%plz == 0) {
|
||||
|
|
|
|||
|
|
@ -12,12 +12,6 @@ function initList() {
|
|||
}
|
||||
|
||||
function ListInstance::advancedAdd(%this, %elementTxt, %newValue) {
|
||||
<<<<<<< HEAD
|
||||
if(%this.find(%elementTxt) == -1) {
|
||||
%this.addElement(%newValue);
|
||||
}
|
||||
else {
|
||||
=======
|
||||
echo("AdvancedAdd("@%this@", "@%elementTxt@", "@%newValue@")");
|
||||
if(%this.find(%elementTxt) == -1) {
|
||||
echo("AdvancedAdd: Add New");
|
||||
|
|
@ -25,7 +19,6 @@ function ListInstance::advancedAdd(%this, %elementTxt, %newValue) {
|
|||
}
|
||||
else {
|
||||
echo("AdvancedAdd: Replace Old");
|
||||
>>>>>>> origin/development
|
||||
%indx = getField(%this.find(%elementTxt), 1);
|
||||
%this.set(%indx, %newValue);
|
||||
}
|
||||
|
|
@ -36,10 +29,7 @@ function ListInstance::set(%this, %index, %new) {
|
|||
}
|
||||
|
||||
function ListInstance::addElement(%this, %element) {
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
echo("Add "@%element@" => "@%this.numberOfElements);
|
||||
>>>>>>> origin/development
|
||||
%this.element[%this.numberOfElements] = %element;
|
||||
%this.numberOfElements++;
|
||||
}
|
||||
|
|
@ -49,12 +39,8 @@ function ListInstance::removeElement(%this, %index) {
|
|||
error("ListInstance::removeElements("@%index@"): Specified index is out of list bounds.");
|
||||
return;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
%this.element[%this.numberOfElements] = "";
|
||||
=======
|
||||
echo(%this@".removeElement("@%index@"): Strip "@%this.element[%index]);
|
||||
%this.element[%index] = "";
|
||||
>>>>>>> origin/development
|
||||
%this.compactList();
|
||||
}
|
||||
|
||||
|
|
@ -76,14 +62,6 @@ function ListInstance::find(%this, %key) {
|
|||
}
|
||||
|
||||
function ListInstance::compactList(%this) {
|
||||
<<<<<<< HEAD
|
||||
for(%i = %this.count(); %i >= 0; %i--) {
|
||||
if(%this.element[%i] $= "") {
|
||||
//Strip item, move others forward
|
||||
for(%x = %i; %x < %this.count(); %x++) {
|
||||
%this.element[%x] = %this.element[%x+1];
|
||||
}
|
||||
=======
|
||||
echo("Compact "@%this@", "@%this.count());
|
||||
for(%i = %this.count(); %i >= 0; %i--) {
|
||||
echo("Test "@%i@": "@%this.element[%i]);
|
||||
|
|
@ -97,7 +75,6 @@ function ListInstance::compactList(%this) {
|
|||
//Remove the last item....
|
||||
%this.element[%this.numberOfElements] = "";
|
||||
echo("Subduct "@%this.numberOfElements);
|
||||
>>>>>>> origin/development
|
||||
%this.numberOfElements--;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue