mirror of
https://github.com/Azgaar/Fantasy-Map-Generator.git
synced 2025-12-22 20:11:24 +01:00
Code cleanup
This commit is contained in:
parent
cfee08934f
commit
a36cada22c
2 changed files with 6 additions and 20 deletions
11
index.html
11
index.html
|
|
@ -4468,19 +4468,14 @@
|
||||||
></button>
|
></button>
|
||||||
<button
|
<button
|
||||||
id="diplomacyBatchEdit"
|
id="diplomacyBatchEdit"
|
||||||
data-tip=""
|
data-tip="Toggle bacth edit of relations"
|
||||||
class="icon-edit"
|
class="icon-edit"
|
||||||
></button>
|
></button>
|
||||||
<hr>
|
<hr id="BatchEditHr" style="display:none">
|
||||||
<!--<button
|
|
||||||
id="diplomacyImport"
|
|
||||||
data-tip=""
|
|
||||||
class="icon-download"
|
|
||||||
></button>-->
|
|
||||||
<select id="diplomacyRelationSelect" style="display:none"></select>
|
<select id="diplomacyRelationSelect" style="display:none"></select>
|
||||||
<button
|
<button
|
||||||
id="diplomacyBatchEditConfirm"
|
id="diplomacyBatchEditConfirm"
|
||||||
data-tip=""
|
data-tip="Change relation of selected states"
|
||||||
class="icon-ok-circled"
|
class="icon-ok-circled"
|
||||||
style="display:none"
|
style="display:none"
|
||||||
></button>
|
></button>
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,6 @@ function editDiplomacy() {
|
||||||
document.getElementById("diplomacyShowMatrix").addEventListener("click", showRelationsMatrix);
|
document.getElementById("diplomacyShowMatrix").addEventListener("click", showRelationsMatrix);
|
||||||
document.getElementById("diplomacyHistory").addEventListener("click", showRelationsHistory);
|
document.getElementById("diplomacyHistory").addEventListener("click", showRelationsHistory);
|
||||||
document.getElementById("diplomacyExport").addEventListener("click", downloadDiplomacyData);
|
document.getElementById("diplomacyExport").addEventListener("click", downloadDiplomacyData);
|
||||||
//document.getElementById("diplomacyImport").addEventListener("click", uploadDiplomacyData);
|
|
||||||
document.getElementById("diplomacyBatchEdit").addEventListener("click", toggleDiplomacyCheckbox);
|
document.getElementById("diplomacyBatchEdit").addEventListener("click", toggleDiplomacyCheckbox);
|
||||||
document.getElementById("diplomacyBatchEditConfirm").addEventListener("click", ConfirmDiplomacyBatch);
|
document.getElementById("diplomacyBatchEditConfirm").addEventListener("click", ConfirmDiplomacyBatch);
|
||||||
|
|
||||||
|
|
@ -121,10 +120,8 @@ function editDiplomacy() {
|
||||||
function diplomacyEditorAddLines() {
|
function diplomacyEditorAddLines() {
|
||||||
const states = pack.states;
|
const states = pack.states;
|
||||||
const selectedLine = body.querySelector("div.Self");
|
const selectedLine = body.querySelector("div.Self");
|
||||||
|
|
||||||
const selectedId = selectedLine ? +selectedLine.dataset.id : states.find(s => s.i && !s.removed).i;
|
const selectedId = selectedLine ? +selectedLine.dataset.id : states.find(s => s.i && !s.removed).i;
|
||||||
const selectedName = states[selectedId].name;
|
const selectedName = states[selectedId].name;
|
||||||
|
|
||||||
const toggleState = modules.batchEditDiplomacy ? 'inline-block' : 'none';
|
const toggleState = modules.batchEditDiplomacy ? 'inline-block' : 'none';
|
||||||
|
|
||||||
COArenderer.trigger("stateCOA" + selectedId, states[selectedId].coa);
|
COArenderer.trigger("stateCOA" + selectedId, states[selectedId].coa);
|
||||||
|
|
@ -146,8 +143,6 @@ function editDiplomacy() {
|
||||||
const name = state.fullName.length < 23 ? state.fullName : state.name;
|
const name = state.fullName.length < 23 ? state.fullName : state.name;
|
||||||
COArenderer.trigger("stateCOA" + state.i, state.coa);
|
COArenderer.trigger("stateCOA" + state.i, state.coa);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
lines += /* html */ `<div class="states" data-id=${state.i} data-name="${name}" data-relations="${relation}">
|
lines += /* html */ `<div class="states" data-id=${state.i} data-name="${name}" data-relations="${relation}">
|
||||||
<div data-tip="${tipSelect}" style="display:${toggleState}" class="diploDivChk"><input class="diploChk" type="checkbox" name="chk[${selectedId}][]" value="${state.i}"></div>
|
<div data-tip="${tipSelect}" style="display:${toggleState}" class="diploDivChk"><input class="diploChk" type="checkbox" name="chk[${selectedId}][]" value="${state.i}"></div>
|
||||||
<svg data-tip="${tipSelect}" class="coaIcon" viewBox="0 0 200 200"><use href="#stateCOA${state.i}"></use></svg>
|
<svg data-tip="${tipSelect}" class="coaIcon" viewBox="0 0 200 200"><use href="#stateCOA${state.i}"></use></svg>
|
||||||
|
|
@ -466,9 +461,6 @@ function editDiplomacy() {
|
||||||
downloadFile(data, name);
|
downloadFile(data, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
function uploadDiplomacyData() {
|
|
||||||
}
|
|
||||||
|
|
||||||
function closeDiplomacyEditor() {
|
function closeDiplomacyEditor() {
|
||||||
restoreDefaultEvents();
|
restoreDefaultEvents();
|
||||||
clearMainTip();
|
clearMainTip();
|
||||||
|
|
@ -482,6 +474,7 @@ function editDiplomacy() {
|
||||||
function toggleDiplomacyCheckbox(){
|
function toggleDiplomacyCheckbox(){
|
||||||
modules.batchEditDiplomacy = !modules.batchEditDiplomacy;
|
modules.batchEditDiplomacy = !modules.batchEditDiplomacy;
|
||||||
|
|
||||||
|
BatchEditHr.style.display = (modules.batchEditDiplomacy?"block":"none");
|
||||||
diplomacyRelationSelect.style.display = (modules.batchEditDiplomacy?"inline-block":"none");
|
diplomacyRelationSelect.style.display = (modules.batchEditDiplomacy?"inline-block":"none");
|
||||||
diplomacyBatchEditConfirm.style.display = (modules.batchEditDiplomacy?"inline-block":"none");
|
diplomacyBatchEditConfirm.style.display = (modules.batchEditDiplomacy?"inline-block":"none");
|
||||||
diplomacyHeader.style['grid-template-columns'] = (modules.batchEditDiplomacy?"1.5em 15em 6em":"15em 6em");
|
diplomacyHeader.style['grid-template-columns'] = (modules.batchEditDiplomacy?"1.5em 15em 6em":"15em 6em");
|
||||||
|
|
@ -495,9 +488,7 @@ function editDiplomacy() {
|
||||||
document.querySelectorAll(".diploDivChk > input.diploChk:checked").forEach(function(ipt){
|
document.querySelectorAll(".diploDivChk > input.diploChk:checked").forEach(function(ipt){
|
||||||
const objectId = +body.querySelector("div.Self").dataset.id;
|
const objectId = +body.querySelector("div.Self").dataset.id;
|
||||||
const subjectId =ipt.value;
|
const subjectId =ipt.value;
|
||||||
|
|
||||||
changeRelation(subjectId, objectId, states[subjectId].diplomacy[objectId], diplomacyRelationSelect.value);
|
changeRelation(subjectId, objectId, states[subjectId].diplomacy[objectId], diplomacyRelationSelect.value);
|
||||||
|
|
||||||
});
|
});
|
||||||
//Clear selection waiting for next batch
|
//Clear selection waiting for next batch
|
||||||
document.querySelectorAll(".diploDivChk").forEach(el => (el.checked = false));
|
document.querySelectorAll(".diploDivChk").forEach(el => (el.checked = false));
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue