Skip to content
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

Jump to bottom

[SW2] 借金／預金がともに 0 なら ― と表示する #152

Closed
wants to merge 1 commit into from
Closed

[SW2] 借金／預金がともに 0 なら ― と表示する #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion _core/lib/sw2/view-chara.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,7 @@
$SHEET->param(money => commify($pc{moneyTotal}));
}
if($pc{deposit} =~ /^(?:自動|auto)$/i){
$SHEET->param(deposit => commify($pc{depositTotal}).' G ／ '.commify($pc{debtTotal}));
$SHEET->param(deposit => $pc{depositTotal} || $pc{debtTotal} ? commify($pc{depositTotal}).' G ／ '.commify($pc{debtTotal}) : '');
}
$pc{cashbook} =~ s/(:(?:\:|<|>))((?:[\+\-\*\/]?[0-9,]+)+)/$1.cashCheck($2)/eg;
$SHEET->param(cashbook => $pc{cashbook});
Expand Down
2 changes: 1 addition & 1 deletion _core/skin/sw2.0/sheet-chara.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ <h2><TMPL_VAR MagicPowerHeader></h2>
<div id="area-items-L">
<dl class="box" id="money">
<dt>所持金<dd><TMPL_VAR money> G
<dt>預金／借金<dd><TMPL_VAR deposit> G
<dt>預金／借金<dd><TMPL_IF deposit><TMPL_VAR deposit> G</TMPL_IF></dd>
</dl>
<section class="box" id="items">
<h2><TMPL_IF head_items><TMPL_VAR head_items><TMPL_ELSE>所持品</TMPL_IF></h2>
Expand Down
4 changes: 4 additions & 0 deletions _core/skin/sw2/css/chara.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,6 +901,10 @@ dl#level {
}
& dd {
grid-row: 2;

&:last-child:empty::before {
content: "―";
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion _core/skin/sw2/sheet-chara.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ <h2><TMPL_VAR MagicPowerHeader></h2>
<div id="area-items-L">
<dl class="box" id="money">
<dt>所持金<dd><TMPL_VAR money> G
<dt>預金／借金<dd><TMPL_VAR deposit> G
<dt>預金／借金<dd><TMPL_IF deposit><TMPL_VAR deposit> G</TMPL_IF></dd>
</dl>
<section class="box" id="items">
<h2><TMPL_IF head_items><TMPL_VAR head_items><TMPL_ELSE>所持品</TMPL_IF></h2>
Expand Down