Permalink
Browse files

/hitman consistency update (#475)

* /hitman consistency update

* Add the player ID in various places
* Consistency update. Was formatting as [ID] [Nick] where as in all other instances I could find it's [Nick] [ID]

* Fixed the format-parameters in HitmanCommands.pwn

Since some orders and/or ids were added at some format's it was needed to reorder and/or add some parameters at them. Now everything is shown properly instead of being bugged if this doesn't happen.
  • Loading branch information...
George authored and xhoogland committed Feb 16, 2017
1 parent 42b8881 commit 395404e87ccf3ea584a8b2fddbf47deeaf50450f
Showing with 5 additions and 5 deletions.
  1. +5 −5 pawn/Features/Deathmatch/Hitman/HitmanCommands.pwn
@@ -75,7 +75,7 @@ class HitmanCommands {
new maxBountyAmount, message[256];
if (HitmanTracker(victimId)->playerBounty() + bountyAmount > HitmanTracker::MaximumBountyAmount) {
maxBountyAmount = HitmanTracker::MaximumBountyAmount - HitmanTracker(victimId)->playerBounty();
- format(message, sizeof(message), "The maximum amount you can place on %s (%d) is $%s.",
+ format(message, sizeof(message), "The maximum amount you can place on %s (Id:%d) is $%s.",
Player(victimId)->nicknameString(), victimId, formatPrice(maxBountyAmount));
SendClientMessage(playerId, Color::Error, message);
return 1;
@@ -92,13 +92,13 @@ class HitmanCommands {
HitmanTracker(playerId)->lastHitmanUsageTime() = Time->currentTime();
format(message, sizeof(message),
- "* %s has had a {A9C4E4}$%s bounty {CCCCCC}put on their head from %s {A9C4E4}(total: $%s){CCCCCC}.",
- Player(victimId)->nicknameString(), formatPrice(bountyAmount), Player(playerId)->nicknameString(),
+ "* %s (Id:%d) has had a {A9C4E4}$%s bounty {CCCCCC}put on their head from %s (Id:%d) {A9C4E4}(total: $%s){CCCCCC}.",
+ Player(victimId)->nicknameString(), victimId, formatPrice(bountyAmount), Player(playerId)->nicknameString(), playerId,
formatPrice(HitmanTracker(victimId)->playerBounty()));
SendClientMessageToAllEx(Color::ConnectionMessage, message);
- format(message, sizeof(message), "* You have had a $%s bounty put on you from [%d] %s.",
- formatPrice(bountyAmount), playerId, Player(playerId)->nicknameString());
+ format(message, sizeof(message), "* You have had a $%s bounty put on you from %s (Id:%d).",
+ formatPrice(bountyAmount), Player(playerId)->nicknameString(), playerId);
SendClientMessage(victimId, Color::Warning, message);
return 1;

0 comments on commit 395404e

Please sign in to comment.