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

Addressed some bugs caught during playtime today

Browse source
This commit is contained in:
Robert Fritzen 2017-07-01 22:46:11 -05:00
parent fa84b01691
commit 04f85e58a6
3 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/TWM2/Bosses/LordYvex.cs
View file

@ -629,9 +629,10 @@ function YvexAttacks(%yvex) {
if(!isObject(%yvex) || %yvex.getState() $= "dead") { if(!isObject(%yvex) || %yvex.getState() $= "dead") {
return; return;
} }
%closestClient = ZombieLookForTarget(%zombie); %closestClient = ZombieLookForTarget(%yvex);
%closestDistance = getWord(%closestClient,1); //%closestDistance = getWord(%closestClient,1);
%closestClient = getWord(%closestClient,0).Player; %closestClient = getWord(%closestClient,0).Player;
%closestDistance = vectorDist(%yvex.getPosition(), %closestClient.getPosition());
if(%closestClient) { if(%closestClient) {
if(%closestDistance <= 150) { if(%closestDistance <= 150) {
@ -885,7 +886,7 @@ function Yvexnightmareloop(%zombie,%viewer) {
} }
function KillerPulse::onCollision(%data,%projectile,%targetObject,%modifier,%position,%normal) { function KillerPulse::onCollision(%data,%projectile,%targetObject,%modifier,%position,%normal) {
if (%targetObject.getClassName() $= "Player" && %targetObject.isBoss) { if (%targetObject.getClassName() $= "Player" && !%targetObject.isBoss) {
messageall('msgkillcurse', "\c5"@getTaggedString(%targetObject.client.name)@" Took a fatal Hit from "@$TWM2::ZombieName[7]@"'s Dark Energy"); messageall('msgkillcurse', "\c5"@getTaggedString(%targetObject.client.name)@" Took a fatal Hit from "@$TWM2::ZombieName[7]@"'s Dark Energy");
%targetObject.throwWeapon(); %targetObject.throwWeapon();
%targetObject.clearinventory(); %targetObject.clearinventory();

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

@ -158,7 +158,7 @@ function GenerateCompletedChallegnesMenu(%client, %tag, %index) {
%Image = %db.getName().image; %Image = %db.getName().image;
if(%Image.HasChallenges) { if(%Image.HasChallenges) {
if(DoMedalCheck(%client, %image) == 1 && CanUseRankedWeapon(%image, %client) == 1) { if(DoMedalCheck(%client, %image) == 1 && CanUseRankedWeapon(%image, %client) == 1) {
messageClient( %client, 'SetLineHud', "", %tag, %index, "<a:gamelink\tCompletedSub\t"@%Image@"\t1>"@%Image.GunName@"</a>"); messageClient( %client, 'SetLineHud', "", %tag, %index, "<a:gamelink\tWeaponUpgradesSub\t"@%Image@"\t1>"@%Image.GunName@"</a>");
%index++; %index++;
} }
else { else {

10
scripts/projectiles.cs
View file

@ -17,8 +17,14 @@
// //
function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal) { function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal) {
if(isObject(%targetObject)) { // Console spam fix - ToS. z0ddm0d if(isObject(%targetObject)) { // Console spam fix - ToS. z0ddm0d
if(!(%targetObject.getType() & ($TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType)) && (%targetObject.getDataBlock().getClassName() $= "PlayerData")) { if(!(%targetObject.getType() & ($TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType))
%damLoc = firstWord(%targetObject.getDamageLocation(%position)); && (%targetObject.getType() & ($TypeMasks::PlayerObjectType | $TypeMasks::VehicleObjectType))) {
if(%targetObject.getType() & $TypeMasks::PlayerObjectType) {
%damLoc = firstWord(%targetObject.getDamageLocation(%position));
}
else {
%damLoc = "";
}
%test = TWM2Damage(%projectile, %targetObject, %data.directDamage, %data.directDamageType, %damLoc, "projectile"); %test = TWM2Damage(%projectile, %targetObject, %data.directDamage, %data.directDamageType, %damLoc, "projectile");
if(%test == 0) { if(%test == 0) {
return; return;