backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-17 09:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

v1.22.33

Browse source
This commit is contained in:
Azgaar 2019-12-29 19:24:10 +03:00
parent 904951d6c0
commit 8a6108e203
5 changed files with 186 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/ui/cultures-editor.js
View file

@ -470,6 +470,7 @@ function editCultures() {
drawCultures();
pack.burgs.forEach(b => b.culture = pack.cells.culture[b.cell]);
refreshCulturesEditor();
document.querySelector("input.statePower").focus(); // to not trigger hotkeys
}
function enterCultureManualAssignent() {

12
modules/ui/diplomacy-editor.js
View file

@ -39,7 +39,7 @@ function editDiplomacy() {
document.getElementById("diplomacyMatrix").addEventListener("click", showRelationsMatrix);
document.getElementById("diplomacyHistory").addEventListener("click", showRelationsHistory);
document.getElementById("diplomacyExport").addEventListener("click", downloadDiplomacyData);
document.getElementById("diplomacySelect").addEventListener("click", diplomacyChangeRelations);
document.getElementById("diplomacySelect").addEventListener("mouseup", diplomacyChangeRelations);
function refreshDiplomacyEditor() {
diplomacyEditorAddLines();
@ -170,7 +170,7 @@ function editDiplomacy() {
function diplomacyChangeRelations(event) {
event.stopPropagation();
diplomacySelect.style.display = "none";
const subject = body.dataset.state;
const subject = +body.dataset.state;
const rel = event.target.innerHTML;
const states = pack.states, chronicle = states[0].diplomacy;
@ -195,10 +195,10 @@ function editDiplomacy() {
const war = () => [`War declaration`, `${subjectName} declared a war on its enemy ${objectName}`];
const peace = () => {
const treaty = `${subjectName} and ${objectName} agreed to cease fire and signed a peace treaty`;
const changed = rel === "Ally" ? ally()
: rel === "Vassal" ? vassal()
: rel === "Suzerain" ? suzerain()
: rel === "Unknown" ? unknown()
const changed = rel === "Ally" ? ally()
: rel === "Vassal" ? vassal()
: rel === "Suzerain" ? suzerain()
: rel === "Unknown" ? unknown()
: change();
return [`War termination`, treaty, changed[1]];
}