Skip to content

Display selected characters in player panel and log #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lulco wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Display selected characters in player panel and log #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f54e8b
Display selected characters in player panel and log
lulco Oct 5, 2025
f678c7c
Merge branch 'Syarwin:master' into display-selected-characters
lulco Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bang_bang.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ var jstpl_events_row = `<div class="cards-row">
<div id="eventActive"></div>
</div>`

var jstpl_player_board_data = `<div class='bang-player-board' id="bang-player-board-\${id}" data-max-bullets="\${bullets}" data-bullets="\${hp}" data-hand="\${handCount}">
var jstpl_player_board_data = `<div class="bang-player-board dialog-character-name">\${character}</div>
<div class='bang-player-board' id="bang-player-board-\${id}" data-max-bullets="\${bullets}" data-bullets="\${hp}" data-hand="\${handCount}">
<ul class='player-bullets'>
<li class='bullet'></li>
<li class='bullet'></li>
Expand Down
10 changes: 5 additions & 5 deletions modules/php/Core/Notifications.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ class Notifications
protected static function notifyAll($name, $msg, $data)
{
self::updateArgs($data);
bang::get()->notifyAllPlayers($name, $msg, $data);
bang::get()->notifyAllPlayers($name, $msg, $data);
}

protected static function notify($pId, $name, $msg, $data)
{
self::updateArgs($data);
$pId = is_int($pId) ? $pId : $pId->getId();
bang::get()->notifyPlayer($pId, $name, $msg, $data);
bang::get()->notifyPlayer($pId, $name, $msg, $data);
}

/**
Expand Down Expand Up @@ -439,7 +439,6 @@ public static function reshuffle()
/**
* characterChosen: send all info about
* @param Player $player
* @param Player $character
*/
public static function characterChosen($player)
{
Expand All @@ -449,6 +448,7 @@ public static function characterChosen($player)
'character_name' => $characterName,
'character' => $player->getUiCharacterSpecificData(),
'player' => $player,
'player_name' => $player->getName(false),
]);
}

Expand Down Expand Up @@ -493,13 +493,13 @@ public static function updateArgs(&$data)
{
if (isset($data['player'])) {
$data['player_id'] = $data['player']->getId();
$data['player_name'] = $data['player']->getName();
$data['player_name'] = !isset($data['player_name']) ? $data['player']->getName() : $data['player_name'];
Copy link
Collaborator

@kuwizard kuwizard Oct 14, 2025

Choose a reason for hiding this comment

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

Could you please invert !isset to isset? It's harder to read ternary conditions when it starts with !

unset($data['player']);
}

if (isset($data['player2'])) {
$data['player_id2'] = $data['player2']->getId();
$data['player_name2'] = $data['player2']->getName();
$data['player_name2'] = !isset($data['player_name2']) ? $data['player2']->getName() : $data['player_name2'];
unset($data['player2']);
}

Expand Down
8 changes: 6 additions & 2 deletions modules/php/Models/Player.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,13 @@ public function getNo()
return $this->no;
}

public function getName()
public function getName(bool $withCharacter = true): string
{
return $this->name;
$name = $this->name;
if ($withCharacter && $this->getCharName()) {
$name .= ' (' . $this->getCharName() . ')';
Copy link
Collaborator

@kuwizard kuwizard Oct 14, 2025

Choose a reason for hiding this comment

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

Can we go with JS-like syntax: $name = "{$name} ({$this->getCharName()})" ? It's much more readable IMO

}
return $name;
}

public function getColor()
Expand Down