Tribes2/TWM2
1
0
Fork 0
mirror of https://github.com/PhantomGamesDevelopment/TWM2.git synced 2026-03-06 05:50:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

6/26 Update

Browse source 
All of the work for 6/26. New challenges, bug fixes, and deprecation of
older systems.
This commit is contained in:
Robert Fritzen 2017-06-26 19:36:30 -05:00
parent c270a1c343
commit b03f4dd2ef
37 changed files with 2662 additions and 3772 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scripts/projectiles.cs
View file

@ -27,9 +27,8 @@ function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifie
}
%targetObject.lastDamagedImage = %projectile.getDatablock().ImageSource;
%targetObject.damage(%projectile.sourceObject, %position, %modifier * %data.directDamage, %data.directDamageType);
//After Damage Stuff For Player Objects
if(%targetObject.isPlayer()) {
if (!(%targetObject.getType() & ($TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType)) && %targetObject.getDataBlock().getClassName() $= "PlayerData") {
if(%targetObject.getState() $= "dead") {
if(%projectile.sourceObject.client !$= "") {
if(%projectile.getDatablock().getName() !$= "GrenadeShrapnel") {