Skip to content

Commit

Permalink
updated logger calls for damage and knockout
Browse files Browse the repository at this point in the history
  • Loading branch information
Southclaws committed Oct 27, 2020
1 parent 2e0c93c commit 08fe151
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 7 deletions.
6 changes: 4 additions & 2 deletions gamemodes/sss/core/char/knockout.pwn
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ stock KnockOutPlayer(playerid, duration)
if(!IsPlayerSpawned(playerid))
return 0;

log("[KNOCKOUT] Player %p knocked out for %s", playerid, MsToString(duration, "%1m:%1s.%1d"));
Logger_Log("player knocked out",
Logger_P(playerid),
Logger_S("duration", MsToString(duration, "%1m:%1s.%1d")));

ShowPlayerProgressBar(playerid, KnockoutBar);

Expand Down Expand Up @@ -111,7 +113,7 @@ stock KnockOutPlayer(playerid, duration)

stock WakeUpPlayer(playerid)
{
log("[WAKEUP] Player %p woke up after knockout", playerid);
Logger_Log("player awoke from knockout", Logger_P(playerid));

stop knockout_Timer[playerid];

Expand Down
21 changes: 16 additions & 5 deletions gamemodes/sss/core/weapon/damage.pwn
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,9 @@ stock PlayerInflictWound(playerid, targetid, E_WND_TYPE:type, Float:bleedrate, F

if(IsPlayerKnockedOut(playerid))
{
log("[WARNING] Knocked out player %p tried to wound player %p", playerid, targetid);
Logger_Log("knocked out player tried to wound player",
Logger_P(playerid),
Logger_P(targetid));
return 0;
}

Expand Down Expand Up @@ -118,7 +120,6 @@ stock PlayerInflictWound(playerid, targetid, E_WND_TYPE:type, Float:bleedrate, F
strcpy(wnd_Data[targetid][woundid][wnd_source], source, MAX_WOUND_SRCLEN);

totalbleedrate += bleedrate;
dbg("gamemodes/sss/core/weapon/damage-core.pwn", 2, "[PlayerInflictWound] inflicted bleedrate: %f, total bleedrate = %f", bleedrate, totalbleedrate);

// Truncate result to 1.0
totalbleedrate = totalbleedrate > 1.0 ? 1.0 : totalbleedrate;
Expand Down Expand Up @@ -148,7 +149,6 @@ stock PlayerInflictWound(playerid, targetid, E_WND_TYPE:type, Float:bleedrate, F

if(knockouttime > 1500)
{
dbg("gamemodes/sss/core/weapon/damage-core.pwn", 2, "[PlayerInflictWound] Knocking out %p for %dms - %d wounds, %f health %f bleedrate", targetid, knockouttime, woundcount, hp, totalbleedrate);
KnockOutPlayer(targetid, knockouttime);
}
}
Expand All @@ -167,11 +167,22 @@ stock PlayerInflictWound(playerid, targetid, E_WND_TYPE:type, Float:bleedrate, F
dmg_LastHitById[targetid] = playerid;
dmg_LastHitByItem[targetid] = GetPlayerItem(targetid);

log("[WOUND] %p wounds %p. bleedrate %f knockmult %f bodypart %d source '%s'", playerid, targetid, bleedrate, knockmult, bodypart, source);
Logger_Log("player wounded player",
Logger_S("player", dmg_LastHitBy[targetid]),
Logger_S("target", dmg_LastHit[playerid]),
Logger_F("bleedrate", bleedrate),
Logger_F("knockmult", knockmult),
Logger_I("bodypart", bodypart),
Logger_S("source", source));
}
else
{
log("[WOUND] %p wounded. bleedrate %f knockmult %f bodypart %d source '%s'", targetid, bleedrate, knockmult, bodypart, source);
Logger_Log("player wounded self",
Logger_P(targetid),
Logger_F("bleedrate", bleedrate),
Logger_F("knockmult", knockmult),
Logger_I("bodypart", bodypart),
Logger_S("source", source));
}

ShowActionText(targetid, sprintf(ls(targetid, "WOUNDEDMSSG", true), source, (knockmult * (((woundcount + 1) * 0.2) * ((totalbleedrate * 50) + 1)) < 50.0 ? ("Minor") : ("Severe"))), 5000);
Expand Down

1 comment on commit 08fe151

@vercel
Copy link

@vercel vercel bot commented on 08fe151 Oct 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.