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

Minor Adjustments

Browse source 
Removed the rest of the PGD Connect stuff (Did a test run on a server to check).

Another quick balance pass on weapons and adjustment to Zombie HP due to a reduction of damage values in many weapons to PvP balance the mod.
This commit is contained in:
Robert Fritzen 2021-01-14 19:32:09 -06:00
parent 52ad2235c7
commit 6070426c06
16 changed files with 82 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/TWM2/Systems/AdvancedRankSystem.cs
View file

@ -215,7 +215,7 @@ function PromoteToPrestige(%client) {
SaveClientFile(%client);
MessageAll('msgSpecial', "\c5"@%client.namebase@" has promoted to Officer level "@%next@".");
recordAction(%client, "", ""); //record blank action for the challenges to pick off any officer challenges
//recordAction(%client, "", ""); //record blank action for the challenges to pick off any officer challenges
for(%i = %next; %i > 0; %i--) {
%oChN = "Prestige"@%i;

6
scripts/TWM2/Systems/BossSystem.cs
View file

@ -86,7 +86,7 @@ function BossCheckUp(%boss, %name) {
%count = ClientGroup.getCount();
for(%i = 0; %i < %count; %i++) {
%cl = ClientGroup.getObject(%i);
recordAction(%cl, "BOSS", "Vardison1");
//recordAction(%cl, "BOSS", "Vardison1");
}
SpawnVardison2(%boss.getPosition());
return;
@ -95,7 +95,7 @@ function BossCheckUp(%boss, %name) {
%count = ClientGroup.getCount();
for(%i = 0; %i < %count; %i++) {
%cl = ClientGroup.getObject(%i);
recordAction(%cl, "BOSS", "Vardison2");
//recordAction(%cl, "BOSS", "Vardison2");
}
SpawnVardison3(%boss.getPosition());
return;
@ -143,7 +143,7 @@ function GameConnection::GiveBossAward(%client, %bossName) {
%percentage = (%damageCount / %maxHP) * 100;
if(%percentage > 5) {
recordAction(%client, "BOSS", %bossName);
//recordAction(%client, "BOSS", %bossName);
if(!isSet(%scriptController.bossDefeatCount[%bossName])) {
%scriptController.bossDefeatCount[%bossName] = 0;

1
scripts/TWM2/Systems/Directorate.cs
View file

@ -33,6 +33,5 @@ function LoadClientFile(%client) {
exec(%file);
ClientContainer(%client);
//
loadChallengeData(%client);
loadSettings(%client);
}

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

@ -90,7 +90,8 @@ function GetRequiredKills(%client, %streakVal, %plZ) {
}
function GameConnection::OnUseKillstreak(%client, %ID) {
recordAction(%client, "KSCC", %ID@"\t1");
//TWM2 3.9.2: Depricated, but keeping this callback in case we'd like it in the future.
//recordAction(%client, "KSCC", %ID@"\t1");
}
//Handles Player Based Killstreaks

4
scripts/TWM2/Systems/ObjectDamage.cs
View file

@ -370,7 +370,7 @@ function postObjectDestroyed(%source, %targetObject, %dType, %dLoc) {
}
}
//Challenges, Successive Kills, Killstreaks
doChallengeCheck(%sourceClient, %targetClient);
//doChallengeCheck(%sourceClient, %targetClient);
%sourceObject.killsinarow++;
%sourceObject.killsinarow2++;
//TWM2 3.2 -> Successive Kills
@ -391,7 +391,7 @@ function postObjectDestroyed(%source, %targetObject, %dType, %dLoc) {
}
}
//Record Challenge Kill
doChallengeKillRecording(%sourceObject, %targetObject);
//doChallengeKillRecording(%sourceObject, %targetObject);
//martydom
if(%targetClient !$= "" && %targetClient != 0 && %targetClient.IsActivePerk("Martydom")) {
serverPlay3d(SatchelChargeActivateSound, %targetObject.getPosition());

4
scripts/TWM2/Systems/SuccessiveKills.cs
View file

@ -29,7 +29,7 @@ function ResetSuccessive(%player) {
function DoStreakPrint(%player, %kills, %damageType) {
%client = %player.client;
recordAction(%client, "SKSC", %kills@"\t1");
//recordAction(%client, "SKSC", %kills@"\t1");
switch(%kills) {
case 5:
BottomPrint(%client, "<color:EE0000><Font:Arial Bold:18>KILLING SPREE", 3, 3);
@ -55,7 +55,7 @@ function DoSuccessivePrint(%player) {
}
%client = %player.client;
messageClient(%client, 'msgSoundFX', "~wfx/misc/MA1.wav");
recordAction(%client, "SKC", %player.successive@"\t1");
//recordAction(%client, "SKC", %player.successive@"\t1");
switch(%player.successive) {
case 2:
CenterPrint(%client, "<color:EE0000><Font:Arial Bold:18>DOUBLE KILL", 3, 3);

2
scripts/TWM2/Zombie/ZombieTypes/Demon.cs
View file

@ -2,7 +2,7 @@ $TWM2::ArmorHasCollisionFunction[DemonZombieArmor] = true;
datablock PlayerData(DemonZombieArmor) : LightMaleHumanArmor {
boundingBox = "1.63 1.63 2.6";
maxDamage = 4.0;
maxDamage = 3.0;
minImpactSpeed = 35;
shapeFile = "bioderm_heavy.dts";

2
scripts/TWM2/Zombie/ZombieTypes/DemonLord.cs
View file

@ -2,7 +2,7 @@ $TWM2::ArmorHasCollisionFunction[DemonMotherZombieArmor] = true;
datablock PlayerData(DemonMotherZombieArmor) : LightMaleHumanArmor {
boundingBox = "1.5 1.5 2.6";
maxDamage = 9.0;
maxDamage = 7.5;
minImpactSpeed = 35;
shapeFile = "medium_female.dts";

2
scripts/TWM2/Zombie/ZombieTypes/Lord.cs
View file

@ -15,7 +15,7 @@ datablock AudioProfile(HZLordFootSound) {
datablock PlayerData(LordZombieArmor) : HeavyMaleBiodermArmor {
shapefile = "TR2medium_male.dts";
mass = 500;
maxDamage = 18.0;
maxDamage = 12.5;
minImpactSpeed = 50;
speedDamageScale = 0.015;
boundingBox = "2.9 2.9 4.8";

2
scripts/TWM2/Zombie/ZombieTypes/Normal.cs
View file

@ -10,7 +10,7 @@ datablock PlayerData(ZombieArmor) : LightMaleHumanArmor {
jumpForce = 14.0 * 90;
maxDamage = 2.8;
maxDamage = 2.0;
minImpactSpeed = 35;
shapeFile = "bioderm_medium.dts";
jetEmitter = BiodermArmorJetEmitter;

2
scripts/TWM2/Zombie/ZombieTypes/Shifter.cs
View file

@ -10,7 +10,7 @@ datablock PlayerData(ShifterZombieArmor) : LightMaleHumanArmor {
jumpForce = 14.0 * 90;
maxDamage = 2.8;
maxDamage = 2.25;
minImpactSpeed = 35;
shapeFile = "bioderm_light.dts";
jetEmitter = BiodermArmorJetEmitter;

10
scripts/TWM2/loadMenu.cs
View file

@ -3,8 +3,7 @@
// and Modified later by the T2CC
//-------------------------------------------
package loadmodinfo
{
package loadmodinfo {
function GetTipMessage() {
%r = getRandom(1,19);
@ -52,8 +51,8 @@ package loadmodinfo
}
function sendLoadInfoToClient( %client ) {
Parent::sendLoadInfoToClient(%client);
schedule(1000, 0, "sendLoadscreen", %client);
Parent::sendLoadInfoToClient(%client);
schedule(1000, 0, "sendLoadscreen", %client);
}
function sendLoadscreen(%client){
@ -64,8 +63,7 @@ package loadmodinfo
messageClient(%client, 'MsgDebriefResult', "", "<Font:Arial Bold:14><Just:CENTER>Total Warfare Mod 2 : Advanced Warfare");
messageClient(%client, 'MsgDebriefResult', "", "<Font:Arial Bold:14><Just:CENTER>Mod Version: "@$TWM2::ModVersionString);
%Credits = "\n<Font:Arial:16>Version v"@$TWM2::ModVersionString@"" @
"\n<Font:Arial:14>TWM 2 Creator (Lead Developer): Phantom139"@
%Credits = "\n<Font:Arial:14>TWM 2 Creator (Lead Developer): Phantom139"@
"\n<Font:Arial:14>TWM 2 Co-Devs: Dark Dragon DX, DarknessOfLight, and Signal360"@
"\n<Font:Arial:14>CCM Developers: Dondelium_X, FalconBlade, and Ur_A_Dum";

4
scripts/player.cs
View file

@ -1399,7 +1399,7 @@ datablock PlayerData(LightMaleHumanArmor) : LightPlayerDamageProfile
max[G41Rifle] = 1;
max[G41RifleAmmo] = 20;
max[R700SniperRifle] = 1;
max[R700SniperRifleAmmo] = 4;
max[R700SniperRifleAmmo] = 7;
max[Javelin] = 0;
max[JavelinAmmo] = 0;
max[Stinger] = 0;
@ -2017,7 +2017,7 @@ datablock PlayerData(HeavyMaleHumanArmor) : HeavyPlayerDamageProfile
max[G41Rifle] = 0;
max[G41RifleAmmo] = 0;
max[R700SniperRifle] = 1;
max[R700SniperRifleAmmo] = 4;
max[R700SniperRifleAmmo] = 7;
max[MiniChaingun] = 1;
max[MiniChaingunAmmo] = 100;
max[MiniColliderCannon] = 1;

68
scripts/weapons/Rifles/R700Sniper.cs
View file

@ -42,36 +42,52 @@ datablock ParticleEmitterData(R700SmokeEmitter) {
particles = "R700SmokeParticle";
};
datablock GrenadeProjectileData(R700Bullet) {
projectileShapeName = "weapon_missile_projectile.dts";
emitterDelay = -1;
directDamage = 0.62;
hasDamageRadius = false;
directDamageType = $DamageType::R700;
kickBackStrength = 6400;
bubbleEmitTime = 1.0;
datablock LinearFlareProjectileData(R700Bullet)
{
projectileShapeName = "weapon_missile_projectile.dts";
scale = "1.0 1.0 1.0";
faceViewer = true;
directDamage = 0.6;
kickBackStrength = 6400;
radiusDamageType = $DamageType::R700;
HeadMultiplier = 1.5;
LegsMultiplier = 0.35;
LegsMultiplier = 0.35;
HeadShotKill = 1;
HeadShotKill = 1;
ImageSource = "R700SniperRifleImage";
ImageSource = "R700SniperRifleImage";
sound = ChaingunProjectile;
explosion = "ChaingunExplosion";
underwaterExplosion = "ChaingunExplosion";
velInheritFactor = 0.5;
splash = ChaingunSplash;
explosion = "ChaingunExplosion";
splash = ChaingunSplash;
baseEmitter = R700SmokeEmitter;
bubbleEmitter = R700SmokeEmitter;
baseEmitter = R700SmokeEmitter;
grenadeElasticity = 0.35;
grenadeFriction = 0.2;
armingDelayMS = 1;
muzzleVelocity = 2000.00;
drag = 0.1;
dryVelocity = 2000.0;
wetVelocity = 2000.0;
velInheritFactor = 1.0;
fizzleTimeMS = 1000;
lifetimeMS = 1000;
explodeOnDeath = false;
reflectOnWaterImpactAngle = 0.0;
explodeOnWaterImpact = false;
deflectionOnWaterImpact = 0.0;
fizzleUnderwaterMS = 3000;
//activateDelayMS = 100;
activateDelayMS = -1;
size[0] = 0.2;
size[1] = 0.5;
size[2] = 0.1;
numFlares = 5; //less flares = less lag
flareColor = "1 0.18 0.03";
flareModTexture = "flaremod";
flareBaseTexture = "flarebase";
hasLight = true;
lightRadius = 10.0;
lightColor = "0.94 0.03 0.12";
};
datablock ItemData(R700SniperRifleAmmo) {
@ -98,7 +114,7 @@ datablock ShapeBaseImageData(R700SniperRifleImage) {
item = R700SniperRifle;
ammo = R700SniperRifleAmmo;
projectile = R700Bullet;
projectileType = GrenadeProjectile;
projectileType = LinearFlareProjectile;
emap = true;
armThread = looksn;
@ -108,7 +124,7 @@ datablock ShapeBaseImageData(R700SniperRifleImage) {
ClipPickupName["R700Clip"] = "A Few Boxes Of R700 Sniper Bullets";
ShowsClipInHud = 1;
ClipReloadTime = 7;
ClipReturn = 4;
ClipReturn = 7;
InitialClips = 6;
//
//Challenges