@@ -9782,7 +9816,7 @@
-
+
@@ -10348,7 +10382,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)
@@ -10882,7 +10916,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"];
@@ -11892,6 +11926,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/sheet.css b/Shadowrun6th-German/sheet.css
index 2b68faf2f2..5bc00f2ce1 100644
--- a/Shadowrun6th-German/sheet.css
+++ b/Shadowrun6th-German/sheet.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%;
}
@@ -813,6 +817,9 @@
.charsheet div.repcontainer[data-groupname="repeating_gear"] > .repitem,
.charsheet div.repcontainer[data-groupname="repeating_perks"] > .repitem,
.charsheet div.repcontainer[data-groupname="repeating_adeptpowers"] > .repitem,
+.charsheet div.repcontainer[data-groupname="repeating_metamagic"] > .repitem,
+.charsheet div.repcontainer[data-groupname="repeating_focus"] > .repitem,
+.charsheet div.repcontainer[data-groupname="repeating_granates"] > .repitem,
.charsheet div.repcontainer[data-groupname="repeating_spirits"] > .repitem {
background-color: var(--base-backcolor3);
border: none;
@@ -2453,4 +2460,90 @@
}
.sheet-rolltemplate-warning {
color:var(--base-warning-color);
-}
\ No newline at end of file
+}
+
+
+.sheet-rolltemplate-diviation1::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(330deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation2::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(0deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation3::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(30deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation4::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(60deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation5::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(90deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation6::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(120deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation7::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(150deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation8::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(180deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation9::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(210deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation10::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(240deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation11::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(270deg);
+ display: inline-block;
+
+}
+.sheet-rolltemplate-diviation12::before{
+ font-family: "pictos";
+ content:"]";
+ transform: rotate(300deg);
+ display: inline-block;
+
+}
diff --git a/Shadowrun6th-German/sheet.html b/Shadowrun6th-German/sheet.html
index 8e90651397..97c2c1d5b5 100644
--- a/Shadowrun6th-German/sheet.html
+++ b/Shadowrun6th-German/sheet.html
@@ -567,9 +567,7 @@
Schicksalswürfel
-
+