diff --git a/M-Space/M-Space.css b/M-Space/M-Space.css
index 810949b877..9d3e16eabf 100644
--- a/M-Space/M-Space.css
+++ b/M-Space/M-Space.css
@@ -289,6 +289,19 @@ input.sheet-thennla-style-toggle:checked ~ div .sheet-thennla-style {
display: initial;
}
+input.sheet-spirit-attr-toggle ~ div.sheet-spirit-attr {
+ display: none;
+}
+input.sheet-spirit-attr-toggle:checked ~ div.sheet-spirit-attr {
+ display: initial;
+}
+input.sheet-spirit-attr-toggle ~ div.sheet-nonspirit-attr {
+ display: initial;
+}
+input.sheet-spirit-attr-toggle:checked ~ div.sheet-nonspirit-attr {
+ display: none;
+}
+
input.sheet-extended-conflict-toggle:checked ~ div .sheet-char-number {
width: 19.5%;
}
@@ -402,6 +415,7 @@ input.sheet-theism-enabled-toggle:not(:checked) ~ div .sheet-theism-enabled {
/* Sheet Types */
input.sheet-type-toggle-battle-unit:not(:checked) ~ div.sheet-type-battle-unit,
+input.sheet-type-toggle-json:not(:checked) ~ div.sheet-type-json,
input.sheet-type-toggle-npc:not(:checked) ~ div.sheet-type-npc,
input.sheet-type-toggle-pc:not(:checked) ~ div.sheet-type-pc,
input.sheet-type-toggle-ship:not(:checked) ~ div.sheet-type-ship{
@@ -444,6 +458,8 @@ span.sheet-page-toggle {
margin-left: -100px;
}
+input.sheet-page-toggle-npc-sheet:checked + span.sheet-page-toggle-npc-sheet,
+input.sheet-page-toggle-npc-json:checked + span.sheet-page-toggle-npc-json,
input.sheet-page-toggle-core:checked + span.sheet-page-toggle-core,
input.sheet-page-toggle-equipment:checked + span.sheet-page-toggle-equipment,
input.sheet-page-toggle-magic:checked + span.sheet-page-toggle-magic,
@@ -460,6 +476,8 @@ div.sheet-page {
max-height: 0;
overflow: hidden;
}
+input.sheet-page-toggle-npc-sheet:checked ~ div.sheet-page-npc-sheet,
+input.sheet-page-toggle-npc-json:checked ~ div.sheet-page-npc-json,
input.sheet-page-toggle-core:checked ~ div.sheet-page-core,
input.sheet-page-toggle-equipment:checked ~ div.sheet-page-equipment,
input.sheet-page-toggle-magic:checked ~ div.sheet-page-magic,
@@ -496,6 +514,10 @@ div.sheet-npc-info {
display: inline-block;
width: 24.375%;
}
+div.sheet-npc-info-short {
+ display: inline-block;
+ width: 9%;
+}
div.sheet-info-species {
display: inline-block;
width: 20.25%;
@@ -513,7 +535,10 @@ div.sheet-info-traits {
width: 49.75%;
}
textarea.sheet-npc-traits {
- height: 98px;
+ height: 50px;
+}
+textarea.sheet-npc-notes {
+ height: 80px;
}
div.sheet-info-conditions {
display: inline-block;
@@ -957,7 +982,7 @@ div.sheet-weapon-name {
div.sheet-npc-weapon-name {
display: inline-block;
text-align: center;
- width: 125px;
+ width: 90px;
}
div.sheet-weapon-damage-mod{
@@ -966,6 +991,12 @@ div.sheet-weapon-damage-mod{
width: 2.5%;
}
+div.sheet-npc-weapon-damage-mod{
+ display: inline-block;
+ text-align: center;
+ width: 20px;
+}
+
div.sheet-weapon-damage {
display: inline-block;
text-align: center;
@@ -974,7 +1005,7 @@ div.sheet-weapon-damage {
div.sheet-npc-weapon-damage {
display: inline-block;
text-align: center;
- width: 75px;
+ width: 55px;
}
div.sheet-weapon-button {
@@ -996,7 +1027,7 @@ div.sheet-weapon-size {
div.sheet-npc-weapon-size {
display: inline-block;
text-align: center;
- width: 35px;
+ width: 40px;
}
div.sheet-weapon-reach {
@@ -1007,13 +1038,13 @@ div.sheet-weapon-reach {
div.sheet-npc-weapon-reach {
display: inline-block;
text-align: center;
- width: 40px;
+ width: 70px;
}
div.sheet-npc-weapon-notes {
display: inline-block;
text-align: center;
- width: 142px;
+ width: 139px;
}
diff --git a/M-Space/M-Space.html b/M-Space/M-Space.html
index 04ce453e7f..7d23735288 100644
--- a/M-Space/M-Space.html
+++ b/M-Space/M-Space.html
@@ -44,8 +44,8 @@
- NPC
PC
+ NPC
@@ -313,441 +313,494 @@