Future/t4_bot_warfare
1
0
Fork 0
mirror of https://github.com/ineedbots/t4_bot_warfare.git synced 2025-04-22 07:55:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve

Browse Source
This commit is contained in:
ineedbots 2021-11-16 14:28:21 -06:00
parent 7f9f9d0eb6
commit d5cdb98ffb
2 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main_shared/maps/mp/gametypes/_clientids.gsc
View File

@ -2,6 +2,8 @@ init()
{ {
level.clientid = 0; level.clientid = 0;
level.allowPrintDamage = true;
level thread onPlayerConnect(); level thread onPlayerConnect();
wait 1; wait 1;
@ -20,5 +22,7 @@ onPlayerConnect()
player.clientid = level.clientid; player.clientid = level.clientid;
level.clientid++; // Is this safe? What if a server runs for a long time and many people join/leave level.clientid++; // Is this safe? What if a server runs for a long time and many people join/leave
player.printDamage = true;
} }
} }

27
main_shared/maps/mp/gametypes/_globallogic.gsc
View File

@ -6230,6 +6230,8 @@ removeBlockedAnims( array )
doPrintDamage(dmg, hitloc) doPrintDamage(dmg, hitloc)
{ {
self endon( "disconnect" );
huddamage = newclienthudelem(self); huddamage = newclienthudelem(self);
huddamage.alignx = "center"; huddamage.alignx = "center";
huddamage.horzalign = "center"; huddamage.horzalign = "center";
@ -6239,9 +6241,15 @@ doPrintDamage(dmg, hitloc)
huddamage.font = "objective"; huddamage.font = "objective";
huddamage setvalue(dmg); huddamage setvalue(dmg);
if (hitloc == "head") if ((flags & level.iDFLAGS_RADIUS) != 0)
huddamage.color = (0.25, 0.25, 0.25);
if ((flags & level.iDFLAGS_PENETRATION) != 0)
huddamage.color = (1, 1, 0.25); huddamage.color = (1, 1, 0.25);
if (hitloc == "head")
huddamage.color = (1, 0.25, 0.25);
huddamage moveovertime(1); huddamage moveovertime(1);
huddamage fadeovertime(1); huddamage fadeovertime(1);
huddamage.alpha = 0; huddamage.alpha = 0;
@ -6255,15 +6263,24 @@ doPrintDamage(dmg, hitloc)
wait 1; wait 1;
if ( isDefined( huddamage ) )
huddamage destroy(); huddamage destroy();
} }
finishPlayerDamageWrapper( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime ) finishPlayerDamageWrapper( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime )
{ {
if ( isDefined( eAttacker ) && isPlayer( eAttacker ) ) if( isDefined( level.allowPrintDamage ) && level.allowPrintDamage )
eAttacker thread doPrintDamage(iDamage, sHitLoc); {
else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) ) if ( !isDefined( eAttacker ) )
eAttacker.owner thread doPrintDamage(iDamage, sHitLoc); {
if ( !isDefined( eInflictor ) )
self thread doPrintDamage( iDamage, sHitLoc, iDFlags );
}
else if ( isPlayer( eAttacker ) && isDefined( eAttacker.printDamage ) && eAttacker.printDamage )
eAttacker thread doPrintDamage( iDamage, sHitLoc, iDFlags );
else if( isDefined( eAttacker.owner ) && isPlayer( eAttacker.owner ) && isDefined( eAttacker.owner.printDamage ) && eAttacker.owner.printDamage )
eAttacker.owner thread doPrintDamage( iDamage, sHitLoc, iDFlags );
}
self finishPlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime ); self finishPlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, psOffsetTime );