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

7/5/17 Fixes

Browse source 
Numerous fixes from today, see addition notes on Readme.md for details
This commit is contained in:
Robert Fritzen 2017-07-05 21:45:03 -05:00
parent 66218bf83b
commit 91c8b768f7
12 changed files with 644 additions and 922 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/projectiles.cs
View file

@ -25,7 +25,7 @@ function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifie
else {
%damLoc = "";
}
%test = TWM2Damage(%projectile, %targetObject, %data.directDamage, %data.directDamageType, %damLoc, "projectile");
%test = CalculateProjectileDamage(%projectile, %targetObject, %data.directDamage, %data.directDamageType, %damLoc, "projectile");
if(%test == 0) {
return;
}
@ -600,7 +600,7 @@ function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse
if (%dist > %radius)
continue;
%modifier = TWM2Damage(%explosionSource, %targetObject, %damage, %damageType, "", "explosion");
%modifier = CalculateProjectileDamage(%explosionSource, %targetObject, %damage, %damageType, "", "explosion");
if(%modifier == 0) {
return;
}