Skip to content

[DX3] 侵蝕率を固定にする機能を追加 #313

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
ViVi-shark wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[DX3] 侵蝕率を固定にする機能を追加 #313

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions _core/lib/dx3/edit-chara.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ window.onload = function() {
checkStage();
checkWorks();
checkSyndrome();
encroachModeChanged();
calcStt();
calcEffect();
calcMagic();
Expand Down Expand Up @@ -445,6 +446,33 @@ function encroachBonusSet(enc){
}
}

function encroachModeChanged() {
const checkbox = document.querySelector('input[name="encroachFixed"]');
const fixed = checkbox != null && checkbox.checked;

const lifePathNode = document.getElementById('lifepath');
lifePathNode.classList.toggle('encroach-fixed', fixed);

const awakenInputCell = lifePathNode.querySelector('tbody.awaken tr > td:nth-child(2)');
const awakenNoteCell = lifePathNode.querySelector('tbody.awaken tr > td:last-child');
const impulseInputCell = lifePathNode.querySelector('tbody.impulse tr:first-child > td:nth-child(2)');
const impulseNoteCell = lifePathNode.querySelector('tbody.impulse tr:first-child > td:last-child');

if (fixed) {
awakenInputCell.setAttribute('colspan', '2');
awakenNoteCell.setAttribute('colspan', '2');
impulseInputCell.setAttribute('colspan', '2');
impulseNoteCell.setAttribute('colspan', '2');
} else {
awakenInputCell.removeAttribute('colspan');
awakenNoteCell.removeAttribute('colspan');
impulseInputCell.removeAttribute('colspan');
impulseNoteCell.removeAttribute('colspan');
}

calcEncroach();
}

// ロイス ----------------------------------------
function emoP(num){ form["lois"+num+"EmoNegaCheck"].checked = false; }
function emoN(num){ form["lois"+num+"EmoPosiCheck"].checked = false; }
Expand Down
25 changes: 14 additions & 11 deletions _core/lib/dx3/edit-chara.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,33 +506,36 @@
<th id="encounter-or-desire">邂逅/欲望
<td colspan="2">@{[input "lifepathEncounter"]}
<td colspan="2" class="left">@{[input "lifepathEncounterNote",'','','placeholder="備考"']}
<tbody>
<tbody class="awaken">
<tr>
<th>覚醒
<td><select name="lifepathAwaken" oninput="calcEncroach()">@{[option "lifepathAwaken",@awakens]}</select>
<th class="small">侵蝕値
<td class="center" id="awaken-encroach">
<th class="small encroach">侵蝕値
<td class="center encroach" id="awaken-encroach">
<td class="left">@{[input "lifepathAwakenNote",'','','placeholder="備考"']}
<tbody>
<tbody class="impulse">
<tr>
<th rowspan="2">衝動
<td><select name="lifepathImpulse" oninput="refreshByImpulse()">@{[option "lifepathImpulse",@impulses]}</select>
<th class="small">侵蝕値
<td class="center" id="impulse-encroach">
<th class="small encroach">侵蝕値
<td class="center encroach" id="impulse-encroach">
<td class="left">@{[input "lifepathImpulseNote",'','','placeholder="備考"']}
<tr>
<th class="small">@{[input "lifepathUrgeCheck",'checkbox']}変異暴走
<th><span class="small">@{[input "lifepathUrgeCheck",'checkbox']}変異暴走</span>
<th class="small">効果
<td class="left" colspan="2">@{[input "lifepathUrgeNote",'','','placeholder="効果"']}
<tbody>
<tbody class="encroach-offset">
<tr>
<th colspan="3" class="right small">その他の修正
<td class="center">@{[input "lifepathOtherEncroach",'number','calcEncroach']}
<td class="left">@{[input "lifepathOtherNote",'','','placeholder="備考"']}
<tbody>
<tbody class="neutral-encroach">
<tr>
<th colspan="3" class="right">侵蝕率基本値
<td class="center bold" id="base-encroach">
<th colspan="3" class="right">侵蝕率<span class="suffix">基本値</span>
<td class="center bold">
<span class="calculated-value" id="base-encroach"></span>
@{[input "encroachFixedValue", 'number', 'calcEncroach']}
<td>@{[ checkbox 'encroachFixed', '侵蝕率を固定にする（ＮＰＣ向け）', 'encroachModeChanged' ]}
</tbody>
</table>
</details>
Expand Down
4 changes: 4 additions & 0 deletions _core/lib/dx3/view-chara.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,10 @@
$SHEET->param(breed => isNoiseText(removeTags $breedPrefix) ? $breedPrefix : $breedPrefix ? "$breedPrefix<span class=\"shorten\">ブリード</span>" : '');

### 侵蝕率基本値 --------------------------------------------------
if ($pc{encroachFixed}) {
$pc{'lifepathOtherEncroach'} = undef;
$pc{'lifepathOtherNote'} = undef;
}
$SHEET->param(hasEncroachOffset => $pc{'lifepathOtherEncroach'} || $pc{'lifepathOtherNote'} ? 1 : 0);

### 能力値 --------------------------------------------------
Expand Down
15 changes: 15 additions & 0 deletions _core/skin/dx3/css/chara.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,18 @@ body {
font-size: 87%;
}
}
#lifepath.encroach-fixed table {
tbody.awaken .encroach,
tbody.impulse .encroach,
table tbody.encroach-offset,
tbody.neutral-encroach .suffix {
display: none;
}

tbody.neutral-encroach {
background-color: var(--box-even-rows-bg-color);
}
}


/* // Status / Skills
Expand Down Expand Up @@ -1213,6 +1225,9 @@ body {
opacity: 0.8;
}
}
#enc-bonus.encroach-fixed p .encroach-prefix {
display: none;
}
#enc-bonus table {
border-top: 1px;
border-bottom: hidden;
Expand Down
46 changes: 44 additions & 2 deletions _core/skin/dx3/css/edit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,10 @@ body:not(.mode-crc) .crc-only {
#lifepath table {
table-layout: auto;
& th:nth-child(1) { width: 5em; }
& td:nth-child(2) { width: 6em; }
& th:nth-child(3) { width: 4em; }
& td:nth-child(2),
& tbody.impulse tr:nth-child(2) th:nth-child(1) { width: 6em; }
& th:nth-child(3),
& tbody.impulse tr:nth-child(2) th:nth-child(2) { width: 4em; }
& td.center { width: 4em; }
& td:last-child { width: auto; }
}
Expand All @@ -158,6 +160,39 @@ body:not(.mode-crc) .crc-only {
transform: scale(1.4) translateY(.1em);
margin-right: .2em;
}
#lifepath table th.small {
border-bottom-style: solid;
}
#lifepath.encroach-fixed {
table {
tbody.awaken .encroach,
tbody.impulse .encroach,
tbody.encroach-offset,
tbody.neutral-encroach th .suffix,
tbody.neutral-encroach td .calculated-value {
display: none;
}

tbody.neutral-encroach {
background-color: var(--box-even-rows-bg-color);
}
}
}
#lifepath:not(.encroach-fixed) {
table tbody.neutral-encroach {
td input[name="encroachFixedValue"] {
display: none;
}
}
}
#lifepath table tbody.neutral-encroach td:last-child {
text-align: left;

.check-button {
border: none;
font-size: 80%;
}
}
@media screen and (width <= 735px){
#lifepath table,
#lifepath tbody,
Expand Down Expand Up @@ -203,6 +238,13 @@ body:not(.mode-crc) .crc-only {
#lifepath tbody:nth-child(5) tr:nth-child(2) th:nth-child(2) {
display: none;
}
#lifepath tbody.neutral-encroach:nth-child(n+7) tr {
grid-template-columns: 6em 1fr auto;
}
#lifepath tbody.neutral-encroach:nth-child(n+7) tr td:last-child {
font-size: 80%;
vertical-align: middle;
}
}


Expand Down
45 changes: 28 additions & 17 deletions _core/skin/dx3/sheet-chara.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ <h2>経験点</h2>
<div class="create-type"><TMPL_UNLESS forbiddenMode><TMPL_VAR createTypeName><span class="nowrap shorten">作成</span></TMPL_UNLESS></div>
</section>

<section class="box" id="lifepath">
<section class="box <TMPL_IF encroachFixed>encroach-fixed</TMPL_IF>" id="lifepath">
<h2>ライフパス</h2>
<table class="data-table line-tbody">
<colgroup><col><col><col></colgroup>
Expand All @@ -198,32 +198,34 @@ <h2>ライフパス</h2>
<td rowspan="2" class="comment"><TMPL_VAR lifepathEncounterNote>
<tr>
<td colspan="2"><TMPL_VAR lifepathEncounter></td>
<tbody>
<tbody class="awaken">
<tr>
<th class="left">覚醒
<th class="small">侵蝕値
<th class="left" <TMPL_IF encroachFixed>colspan="2"</TMPL_IF>>覚醒
<th class="small encroach">侵蝕値
<td rowspan="2" class="comment"><TMPL_VAR lifepathAwakenNote>
<tr>
<td><TMPL_VAR lifepathAwaken>
<td class="center"><TMPL_VAR lifepathAwakenEncroach></td>
<tbody>
<td <TMPL_IF encroachFixed>colspan="2"</TMPL_IF>><TMPL_VAR lifepathAwaken>
<td class="center encroach"><TMPL_VAR lifepathAwakenEncroach>
<tbody class="impulse">
<tr>
<th class="left">衝動
<th class="small">侵蝕値
<th class="left" <TMPL_IF encroachFixed>colspan="2"</TMPL_IF>>衝動
<th class="small encroach">侵蝕値
<td rowspan="2" class="comment"><TMPL_VAR lifepathImpulseNote>
<tr>
<td <TMPL_IF lifepathUrgeCheck>style="border-bottom:hidden"</TMPL_IF>><TMPL_VAR lifepathImpulse></td>
<td class="center"><TMPL_VAR lifepathImpulseEncroach>
<td <TMPL_IF encroachFixed>colspan="2"</TMPL_IF> <TMPL_IF lifepathUrgeCheck>style="border-bottom:hidden"</TMPL_IF>><TMPL_VAR lifepathImpulse>
<td class="center encroach"><TMPL_VAR lifepathImpulseEncroach>
<TMPL_IF lifepathUrgeCheck><tr class="urge">
<th colspan="2" class="right">／変異暴走
<td class="comment"><TMPL_VAR lifepathUrgeNote></td>
</TMPL_IF>
<TMPL_IF hasEncroachOffset>
<tbody>
<tbody class="encroach-offset">
<tr><th class="right small">その他の修正<td class="center"><TMPL_VAR lifepathOtherEncroach><td class="comment"><TMPL_VAR lifepathOtherNote>
</TMPL_IF>
<tbody>
<tr><th class="right">侵蝕率基本値<td class="center bold"><TMPL_VAR baseEncroach><td>
<tbody class="neutral-encroach">
<tr><th class="right">侵蝕率<span class="suffix">基本値</span>
<td class="center bold"><TMPL_IF encroachFixed><TMPL_VAR encroachFixedValue><TMPL_ELSE><TMPL_VAR baseEncroach></TMPL_IF>
<td>
</tbody>
</table>
</section>
Expand Down Expand Up @@ -587,11 +589,11 @@ <h2>経験点計算</h2>
</table>
</section>
</div>
<div id="enc-bonus">
<div id="enc-bonus" <TMPL_IF encroachFixed>class="encroach-fixed"</TMPL_IF>>
<details class="box">
<summary>侵蝕率効果表</summary>
<p>
現在侵蝕率:<input type="number" id="current-encroach" value="<TMPL_VAR currentEncroach>" oninput="encroachBonusSet(this.value);">
<span class="encroach-prefix">現在</span>侵蝕率:<TMPL_IF encroachFixed><span class="encroach-fixed-value"><TMPL_VAR encroachFixedValue></span><TMPL_ELSE><input type="number" id="current-encroach" value="<TMPL_VAR currentEncroach>" oninput="encroachBonusSet(this.value);"></TMPL_IF>
<input type="checkbox" id="encroach-ea-on" oninput="encroachBonusType();" <TMPL_IF encroachEaOn>checked</TMPL_IF>><label for="encroach-ea-on">エフェクトアーカイブ</label>
<input type="checkbox" id="encroach-or-on" oninput="encroachBonusType();" <TMPL_IF encroachOrOn>checked</TMPL_IF>><label for="encroach-or-on">起源種</label>
</p>
Expand Down Expand Up @@ -631,7 +633,16 @@ <h2>経験点計算</h2>
let thBonus = document.createElement("th"); thBonus.textContent = 'ダイス' ; document.getElementById('enc-table-dices').prepend(thBonus);
let thLevel = document.createElement("th"); thLevel.textContent = 'Efct.Lv'; document.getElementById('enc-table-level').prepend(thLevel);

encroachBonusSet(document.getElementById('current-encroach').value);
let encroachValue;

if (document.getElementById('enc-bonus').classList.contains('encroach-fixed')) {
const valueText = document.querySelector('#enc-bonus .encroach-fixed-value').textContent;
encroachValue = /^\d+$/.test(valueText) ? parseInt(valueText) : -1;
} else {
encroachValue = document.getElementById('current-encroach').value;
}

encroachBonusSet(encroachValue);
}
function encroachBonusSet(enc){
for (let v of array){ document.getElementById('enc-col'+v).classList.remove('current'); }
Expand Down