diff --git a/Shadowrun6th-German/sheet-compiled.css b/Shadowrun6th-German/sheet-compiled.css index 17d7c90775..5bc00f2ce1 100644 --- a/Shadowrun6th-German/sheet-compiled.css +++ b/Shadowrun6th-German/sheet-compiled.css @@ -136,7 +136,6 @@ .charsheet input[type=checkbox].toggle-hide:checked + h4::before, .charsheet input[type=checkbox].toggle-hide:checked + div h4.collapsearrow::before { content: "►"; - color: var(--base-color); font-size: 0.95rem; -webkit-transform: rotate(90deg); transform: rotate(90deg); @@ -151,7 +150,6 @@ .charsheet input[type=checkbox].toggle-hide:not(:checked) + h4::before, .charsheet input[type=checkbox].toggle-hide:not(:checked) + div h4.collapsearrow::before { content: "►"; - color: var(--base-color); font-size: 0.95rem; -webkit-transform: rotate(0deg); transform: rotate(0deg); @@ -165,7 +163,6 @@ .charsheet input[type=checkbox].toggle-hide:checked + h4.invert::before { content: "►"; - color: var(--base-color); font-size: 0.95rem; -webkit-transform: rotate(0deg); transform: rotate(0deg); @@ -179,7 +176,6 @@ .charsheet input[type=checkbox].toggle-hide:not(:checked) + h4.invert::before { content: "►"; - color: var(--base-color); font-size: 0.95rem; -webkit-transform: rotate(90deg); transform: rotate(90deg); @@ -191,6 +187,14 @@ margin-right: 10px; } +.charsheet input[type=checkbox].toggle-hide + h4.invert:hover::before { + font-size: var(--fontsize-hover); +} + +.charsheet label.collapse h4.invert:hover::before { + color: var(--text-color); +} + .charsheet div.togglesection { width: 100%; } diff --git a/Shadowrun6th-German/sheet-compiled.html b/Shadowrun6th-German/sheet-compiled.html index a555ff87c1..97c2c1d5b5 100644 --- a/Shadowrun6th-German/sheet-compiled.html +++ b/Shadowrun6th-German/sheet-compiled.html @@ -1021,7 +1021,7 @@ Schadenswiderstand
 
-
 
@@ -1257,19 +1257,30 @@
Geschlecht
-
-
+
+
Alter
-
-
+
+
Fandungsstufe
-
+
karma
+ +
+
NewYen
+
+
+ +
+
@@ -1367,7 +1378,7 @@
@@ -1549,15 +1560,16 @@ +
body
-
+
-
+
+
agility
-
+
-
+
+
reaction
-
+
-
+
+
strength
-
+
-
+
+
willpower
-
+
-
+
+
logic
-
+
-
+
+
intuition
-
+
-
+
+
charisma
-
+
-
+
+
edge
-
+
-
+
@@ -1865,7 +1885,7 @@
-
@@ -1879,7 +1899,7 @@
-
@@ -4077,7 +4097,7 @@
-
@@ -4540,7 +4560,7 @@
-

+

@@ -5076,15 +5096,16 @@
+
magic
-
+
-
+
+
adeptpowerpoints
-
+
-
+
@@ -6644,7 +6666,7 @@
-
@@ -7219,16 +7241,25 @@
- -
+ + + + + + +
+
- +
+ + +
@@ -7276,7 +7307,7 @@ - @@ -7285,14 +7316,14 @@
-
-
@@ -7307,7 +7338,7 @@ -
@@ -7317,7 +7348,7 @@
-
@@ -7337,21 +7368,21 @@ -
-
-
@@ -7365,7 +7396,7 @@ -
@@ -7375,7 +7406,7 @@
-
@@ -7390,21 +7421,21 @@ -
-
-
@@ -7419,7 +7450,7 @@ -
@@ -7436,7 +7467,7 @@ -
@@ -7446,7 +7477,7 @@
-
@@ -7460,7 +7491,7 @@ -
@@ -7470,7 +7501,7 @@
-
@@ -7489,7 +7520,7 @@ -
@@ -7499,7 +7530,7 @@
-
@@ -7513,21 +7544,21 @@ -
-
-
@@ -7541,21 +7572,21 @@ -
-
-
@@ -7569,21 +7600,21 @@ -
-
-
@@ -7597,21 +7628,21 @@ -
-
-
@@ -7626,21 +7657,21 @@ -
-
-
@@ -7662,21 +7693,21 @@ -
-
-
@@ -7693,21 +7724,21 @@ -
-
-
@@ -7721,21 +7752,21 @@ -
-
-
@@ -7749,7 +7780,7 @@ -
@@ -7765,21 +7796,21 @@ -
-
-
@@ -7793,7 +7824,7 @@ -
@@ -7809,21 +7840,21 @@ -
-
@@ -7837,7 +7868,7 @@ -
@@ -7853,7 +7884,7 @@ -
@@ -7875,21 +7906,21 @@ -
-
-
@@ -7910,14 +7941,14 @@ -
@@ -7925,7 +7956,7 @@
-
@@ -7939,21 +7970,21 @@ -
-
-
@@ -7967,29 +7998,31 @@ -
-
-
+ - + +
@@ -8068,15 +8101,16 @@
+
resonance
-
+
-
+
- -
-
-
- -
-
-
-
Probe
-
Verteidigung
-
GeräteVerteidigung
-
-
-
-
Pool/Modifier/prg
-
Pool/Modifier
-
Pool/Modifier
- -
- - - -
-
Ausstöpseln
- -
- - - - -
-
-
- - - -
-
- - - -
- -
- - -
-
Befehl vortäuschen
- -
- - - - -
-
- -
-
- - - -
-
- - -
-
- -
- Brute Force - [ -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
Datei cracken
- -
- - - - -
-
- -
-
- - - -
-
- - -
-
- -
- - - - - -
-
- - - -
-
- - - -
-
- - - -
-
- -
- - - - -
-
-
- -
- - -
-
- -
- - - - -
-
- -
-
- - - -
-
- - -
-
- -
- - - - -
-
- -
-
- - - -
-
- - -
-
- -
- - [
-
- -
- - - - -
-
- -
-
- - - -
-
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - - -
-
- -
- - -
- -
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
- - - - -
-
-
-
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
- - - - -
-
-
-
- - -
-
- -
- - - - -
-
- -
-
- - - -
-
- - -
-
- -
- - - - -
-
-
-
- - -
-
- -
- - - - -
-
-
-
- - -
-
- -
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
- - [ -
-
- - -
- - - - -
-
- -
-
- - - -
-
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
- - -
-
- -
- - - - -
-
- - - -
-
- - - -
-
-
- -
- + <%- include("section.ejs",{title:"matrix_actions",template:"matrix_actions.ejs",hideby:"matrix_section_actions"}); %> +
diff --git a/Shadowrun6th-German/views/matrix_actions.ejs b/Shadowrun6th-German/views/matrix_actions.ejs new file mode 100644 index 0000000000..177ce285a1 --- /dev/null +++ b/Shadowrun6th-German/views/matrix_actions.ejs @@ -0,0 +1,762 @@ + + + +
+ +
+ +
+ +
+
+ + + +
+
+
+ + +
+
+
+
Probe
+
Verteidigung
+
GeräteVerteidigung
+
+
+
+
Pool/Modifier/prg
+
Pool/Modifier
+
Pool/Modifier
+ +
+ + + +
+
Ausstöpseln
+ +
+ + + + +
+
+
+ + + +
+
+ + + +
+ +
+ + +
+
Befehl vortäuschen
+ +
+ + + + +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+ Brute Force + [ +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
Datei cracken
+ +
+ + + + +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+ + + + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+ + + + +
+
+
+ +
+ + +
+
+ +
+ + + + +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+ + [
+
+ +
+ + + + +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+ + +
+ +
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+
+
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+
+
+ + +
+
+ +
+ + + + +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+
+
+ + +
+
+ +
+ + + + +
+
+
+
+ + +
+
+ +
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+ + [ +
+
+ + +
+ + + + +
+
+ +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+ +
+ + + + +
+
+ + + +
+
+ + + +
+
+
+ diff --git a/Shadowrun6th-German/views/script/jsonImport.js b/Shadowrun6th-German/views/script/jsonImport.js index 8ea8da0c85..e1b0997454 100644 --- a/Shadowrun6th-German/views/script/jsonImport.js +++ b/Shadowrun6th-German/views/script/jsonImport.js @@ -135,6 +135,7 @@ for (var i = 0; i < data["skills"].length; i++) { newrowid = generateRowID(); c["repeating_language_" + newrowid + "_language_name"]=data["skills"][i].name; c["repeating_language_" + newrowid + "_language_level"]=data["skills"][i].rating; + if (c["repeating_language_" + newrowid + "_language_level"]==4) c["repeating_language_" + newrowid + "_language_level"]=99; } if(data["skills"][i].id!="language" && data["skills"][i].id!="knowledge"){ diff --git a/Shadowrun6th-German/views/script/sheetworker.js b/Shadowrun6th-German/views/script/sheetworker.js index e0b34729dd..5c57e26998 100644 --- a/Shadowrun6th-German/views/script/sheetworker.js +++ b/Shadowrun6th-German/views/script/sheetworker.js @@ -18,7 +18,7 @@ on("sheet:opened change:wilddie_toggle",function(){ on("sheet:opened change:sustain_count change:sustain_mod change:sustain_mod2", function(){ getAttrs(["sustain_count","sustain_mod","sustain_mod2"], function (v) { - let val=pInt(v.sustain_count)*2+(pInt(v.sustain_mod)+pInt(v.sustain_mod2)) + let val=Math.max(pInt(v.sustain_count)-1,0) *2+(pInt(v.sustain_mod)+pInt(v.sustain_mod2)) log("Sustain val:" + val) setAttrs({ sustain_malus:Math.max(val,0) @@ -552,7 +552,7 @@ on("change:repeating_vehicle:vehicle_speed",function(){ - const attributes = ["body","agility","reaction","strength","willpower","logic","intuition","charisma","edge","magic","resonance","composure","judgeintent","memory","liftcarry","ini","inidice","iniphys","inimatrix","iniastral","soak","soakstun","magic"]; + const attributes = ["body","agility","reaction","strength","willpower","logic","intuition","charisma","edge","magic","resonance","composure","judgeintent","memory","liftcarry","ini","inidice","iniphys","inimatrix","iniastral","soak","soakstun","magic","adeptpowerpoints"]; const s_attributes = ["body","agility","reaction","strength","willpower","logic","intuition","charisma","edge","magic","resonance"]; const skills = ["athletics","influence","electronics","firearms","stealth","engineering","melee","outdoors","piloting","con","perception","astral","biotech","cracking","task","conjuring","sorcery","enchanting","exoticweapon1","exoticweapon2"];/*,"exoticweapons"*/ const magicalSkills = ["astral","conjuring","sorcery","enchanting"];