diff --git a/Splittermond/Sheet.css b/Splittermond/Sheet.css index 59bde4dbc6..5945d697e0 100644 --- a/Splittermond/Sheet.css +++ b/Splittermond/Sheet.css @@ -203,7 +203,8 @@ input.sheet-arrow:checked ~ div.sheet-body { div .repitem:nth-child(odd), div .repitem:nth-child(odd) input, -div .repitem:nth-child(odd) select { +div .repitem:nth-child(odd) select, +div .repitem:nth-child(odd) textarea.sheet-textarea-description { background-color: #81BEF7; } diff --git a/Splittermond/Sheet.html b/Splittermond/Sheet.html index ca10119698..5d4ede6b60 100644 --- a/Splittermond/Sheet.html +++ b/Splittermond/Sheet.html @@ -2281,8 +2281,7 @@  
- Wirkung:  - + Wirkung:  @@ -2436,8 +2435,7 @@ - - + @@ -2588,7 +2586,7 @@ -

Achtung: Diese Tooltips werden vom Bogen ab sofort nicht mehr berücksichtigt. Stattdessen wird ab sofort automatisch der Text in der Spalte "Wirkung" (bei Meisterschaften) als Tooltip angezeigt.

+

Achtung: Nach User-Feedback von euch werden die Tooltips wieder so gehandhabt wie vorher, diese Sektion ist also wieder verwendbar.

@@ -2605,6 +2603,18 @@ + + + + + + +
Tooltips
ZauberspruchTooltip
+
+ + +
+
@@ -2673,7 +2683,11 @@

Letzte Updates


-

16.07.2020

+

23.06.2020

+ +

16.06.2020

-

19.05.2020

-

Mit Dank an alle begeisterten Splittermond-Spieler, die diesen Charakterbogen nutzen und mit ihrem Feedback für stetige Verbesserungen sorgen!

@@ -5295,8 +5303,12 @@ on("change:notizen", function(eventInfo) { break; case "gsw": setAttrs({hiddengsw: 0}); + setAttrs({hiddengswag: 0}); + setAttrs({hiddengswbe: 0}); + setAttrs({hiddengswspr: 0}); break; case "gw": + setAttrs({hiddengw: 0}); setAttrs({hiddengw: 0}); break; case "kw": @@ -5444,7 +5456,10 @@ function writeToSheet (characterData) { character["repeating_meisterschaften_" + newrowid + "_meisterschaftsfertigkeit"] = skillname; character["repeating_meisterschaften_" + newrowid + "_meisterschaftsbeschreibung"] = skillname; character["repeating_meisterschaften_" + newrowid + "_meisterschaftsschwelle"] = +level; - character["repeating_meisterschaften_" + newrowid + "_meisterschaftswirkung"] = masterylongdescription; + character["repeating_meisterschaften_" + newrowid + "_meisterschaftswirkung"] = masteryshortdescription; + newrowid = generateRowID(); + character["repeating_masterytooltips_" + newrowid + "_masterytooltipname"] = masteryname; + character["repeating_masterytooltips_" + newrowid + "_masterytooltiptext"] = masterylongdescription; character["tooltips"] = 1; } } @@ -5452,6 +5467,7 @@ function writeToSheet (characterData) { } if (characterData["spells"].length > 0) { let translatedschoolstoschools = {"Arkane Kunde":"arkanekundezauber","Bannmagie":"bann","Beherrschungsmagie":"beherrschung","Bewegungsmagie":"bewegung","Erkenntnismagie":"erkenntnis","Felsmagie":"fels","Feuermagie":"feuer","Heilungsmagie":"heilung","Illusionsmagie":"illusion","Kampfmagie":"kampf","Lichtmagie":"licht","Naturmagie":"natur","Schattenmagie":"schatten","Schicksalsmagie":"schicksal","Schutzmagie":"schutz","Stärkungsmagie":"staerkung","Todesmagie":"tod","Verwandlungsmagie":"verwandlung","Wassermagie":"wasser","Windmagie":"wind"}; + let spelllongdescription = ""; for (var i = 0; i < characterData["spells"].length; i++) { newrowid = generateRowID(); character["repeating_zauber_" + newrowid + "_zaubername"] = characterData["spells"][i]["name"]; @@ -5462,8 +5478,12 @@ function writeToSheet (characterData) { character["repeating_zauber_" + newrowid + "_zauberrw"] = characterData["spells"][i]["castRange"]; character["repeating_zauber_" + newrowid + "_zauberwd"] = characterData["spells"][i]["spellDuration"]; if (characterData["spells"][i]["longDescription"] != null) { - character["repeating_zauber_" + newrowid + "_zauberwirkung"] = characterData["spells"][i]["longDescription"]; + spelllongdescription = characterData["spells"][i]["longDescription"]; + //character["repeating_zauber_" + newrowid + "_zauberwirkung"] = characterData["spells"][i]["longDescription"]; } + newrowid = generateRowID(); + character["repeating_spelltooltips_" + newrowid + "_spelltooltipname"] = characterData["spells"][i]["name"]; + character["repeating_spelltooltips_" + newrowid + "_spelltooltiptext"] = spelllongdescription; } character["tooltips_spells"] = 1; } @@ -5494,9 +5514,6 @@ function writeToSheet (characterData) { if (characterData["meleeWeapons"][i]["features"].length > 0) { for (var j = 0; j < characterData["meleeWeapons"][i]["features"].length; j++) { merkmale += characterData["meleeWeapons"][i]["features"][j]["name"]; - /*if (+characterData["meleeWeapons"][i]["features"][j]["level"] > 0) { - merkmale += " " + characterData["meleeWeapons"][i]["features"][j]["level"]; - }*/ if (j < (characterData["meleeWeapons"][i]["features"].length - 1)) { merkmale += ", "; } @@ -5540,15 +5557,33 @@ function writeToSheet (characterData) { character["repeating_fernkampfwaffen_" + newrowid + "_waffenmerkmalefern"] = merkmale; } } + let ruestungsmerkmale; if (characterData["armors"].length > 0) { for (var i = 0; i < characterData["armors"].length; i++) { + ruestungsmerkmale = ""; newrowid = generateRowID(); character["repeating_ruestungen_" + newrowid + "_ruestungsname"] = characterData["armors"][i]["name"]; character["repeating_ruestungen_" + newrowid + "_ruestungsvtd"] = characterData["armors"][i]["defense"]; character["repeating_ruestungen_" + newrowid + "_ruestungssr"] = characterData["armors"][i]["damageReduction"]; character["repeating_ruestungen_" + newrowid + "_ruestungsbe"] = characterData["armors"][i]["handicap"]; character["repeating_ruestungen_" + newrowid + "_ruestungstickplus"] = characterData["armors"][i]["tickMalus"]; - character["repeating_ruestungen_" + newrowid + "_ruestungsmerkmal"] = characterData["armors"][i]["features"]; + if (characterData["armors"][i]["features"].length == 1) { + ruestungsmerkmale = characterData["armors"][i]["features"][0]["name"]; + if (characterData["armors"][i]["features"][0]["level"] > 0) { + ruestungsmerkmale += " " + characterData["armors"][i]["features"][0]["level"]; + } + } else if (characterData["armors"][i]["features"].length > 1) { + for (var j = 0; j < characterData["armors"][i]["features"].length; j++) { + ruestungsmerkmale += characterData["armors"][i]["features"][j]["name"]; + if (characterData["armors"][i]["features"][j]["level"] > 0) { + ruestungsmerkmale += " " + characterData["armors"][i]["features"][j]["level"]; + } + if (j < (characterData["armors"][i]["features"].length - 1)) { + ruestungsmerkmale += ", "; + } + } + } + character["repeating_ruestungen_" + newrowid + "_ruestungsmerkmal"] = ruestungsmerkmale; } } if (characterData["shields"].length > 0) { @@ -6074,6 +6109,16 @@ function clearSheet() { removeRepeatingRow("repeating_meisterschaften_" + idarray[i]); } }); + getSectionIDs("repeating_masterytooltips", function(idarray) { + for(var i=0; i < idarray.length; i++) { + removeRepeatingRow("repeating_masterytooltips_" + idarray[i]); + } + }); + getSectionIDs("repeating_spelltooltips", function(idarray) { + for(var i=0; i < idarray.length; i++) { + removeRepeatingRow("repeating_spelltooltips_" + idarray[i]); + } + }); } function translateGenesis (termToTranslate) { @@ -7713,6 +7758,49 @@ on("change:creature_vtd_ruestung change:creature_verteidigung", function(eventIn }); }); +on("change:repeating_masterytooltips:masterytooltipname change:repeating_masterytooltips:masterytooltiptext", function() { + getAttrs(["repeating_masterytooltips_masterytooltipname", "repeating_masterytooltips_masterytooltiptext"], function(values) { + let mastery = values.repeating_masterytooltips_masterytooltipname; + let tooltip = values.repeating_masterytooltips_masterytooltiptext; + let update = {}; + getSectionIDs("repeating_meisterschaften", function(idarray) { + if (idarray.length > 0) + { + _.each(idarray, function(currentID, i) { + getAttrs(["repeating_meisterschaften_" + currentID + "_meisterschaftsname"], function(v) { + var name = v["repeating_meisterschaften_" + currentID + "_meisterschaftsname"]; + if (name.toLowerCase() == mastery.toLowerCase()) { + update["repeating_meisterschaften_" + currentID + "_meisterschaftsbeschreibung"] = tooltip; + setAttrs(update); + } + }); + }); + } + }); + }); +}); + +on("change:repeating_spelltooltips:spelltooltipname change:repeating_spelltooltips:spelltooltiptext", function() { + getAttrs(["repeating_spelltooltips_spelltooltipname", "repeating_spelltooltips_spelltooltiptext"], function(values) { + let spell = values.repeating_spelltooltips_spelltooltipname; + let tooltip = values.repeating_spelltooltips_spelltooltiptext; + let update = {}; + getSectionIDs("repeating_zauber", function(idarray) { + if (idarray.length > 0) + { + _.each(idarray, function(currentID, i) { + getAttrs(["repeating_zauber_" + currentID + "_zaubername"], function(v) { + var name = v["repeating_zauber_" + currentID + "_zaubername"]; + if (name.toLowerCase() == spell.toLowerCase()) { + update["repeating_zauber_" + currentID + "_zauberbeschreibung"] = tooltip; + setAttrs(update); + } + }); + }); + } + }); + }); +}); on("change:tooltips change:tooltips_spells", function() { getAttrs(["tooltips", "tooltips_spells"], function(values) {