Merge pull request #109 from unrealkakeman89/professorbunbury-sw5e

Updates to CSS/LESS and New Character Sheet

less/original/apps.less

@@ -487,3 +487,40 @@
     margin: 2px;
   }
 }
+
+/* ----------------------------------------- */
+/* HUD
+/* ----------------------------------------- */
+
+.placeable-hud .control-icon {
+  box-sizing: content-box;
+  width: 40px;
+  flex: 0 0 40px;
+  margin: 8px 0;
+  font-size: 28px;
+  line-height: 40px;
+  text-align: center;
+  color: #FBF4F4;
+  background: rgba(0, 0, 0, 0.6);
+  box-shadow: 0 0 15px #000;
+  border: 1px solid #333;
+  border-radius: 8px;
+  pointer-events: all;
+}
+#token-hud .status-effects {
+  visibility: hidden;
+  position: absolute;
+  left: 50px;
+  top: 0;
+  display: grid;
+  padding: 3px;
+  box-sizing: content-box;
+  width: 100px;
+  color: #FBF4F4;
+  grid-template-columns: 25px 25px 25px 25px;
+  background: rgba(0, 0, 0, 0.6);
+  box-shadow: 0 0 15px #000;
+  border: 1px solid #333;
+  border-radius: 4px;
+  pointer-events: all;
+}

less/original/variables.less

@@ -19,15 +19,15 @@
   font-size: @font-size;
   font-weight: 400;
 }
-/* bungee-inline-regular - latin */
+/* engli-besh */
 @font-face {
-  font-family: 'Bungee Inline';
+  font-family: 'Engli-Besh';
   font-style: normal;
   font-weight: 400;
-  src: url('./fonts/BungeeInline.ttf');
+  src: url('./fonts/EngliBesh-KG3W.ttf');
 }
-.bungeeInline {
+.engli-Besh {
-  font-family: 'Bungee Inline';
+  font-family: 'Engli-Besh';
   font-size: 20px;
   font-weight: 400;
 }

less/update/components/actor-global.less

@@ -5,7 +5,7 @@
     .dropShadow1();
 }
 .sw5e.sheet.actor.character {
-    min-width: 800px;
+    min-width: 850px;
     min-height: 720px;
 }
 .sw5e.sheet .window-content {
@@ -54,7 +54,7 @@
             grid-template-rows: 1fr 26px auto;
             grid-template-columns: 128px 1fr;
             column-gap: 8px;
-            row-gap: 8px;
+            grid-row-gap: 8px;
             
             img {
                 grid-column-start: 1;
@@ -683,7 +683,7 @@
                     display: grid;
                     grid-template-columns: 1fr 1fr;
                     grid-gap: 16px;
-                    row-gap: 8px;
+                    grid-row-gap: 8px;
 
                     input,
                     select {
@@ -715,7 +715,7 @@
                     }
 
                     .languages {
-                        grid-column-end: span 2;
+                        grid-column-end: span 1;
                         label {
                             &:hover {
                                 cursor: pointer;
@@ -745,7 +745,7 @@
                         display: grid;
                         grid-template-columns: 1fr 1fr;
                         grid-gap: 4px;
-                        row-gap: 4px;
+                        grid-row-gap: 4px;
 
                         strong {
                             font-size: 13px;
@@ -994,7 +994,7 @@
         }
         &.limited {
             grid-template-rows: 144px auto;
-            row-gap: 8px;
+            grid-row-gap: 8px;
             header {
                 grid-template-rows: 1fr;
             }

less/update/sw5e-global.less

@@ -48,6 +48,12 @@
   font-weight: 400;
   src: url('./fonts/Aurebesh.ttf');
 }
+@font-face {
+  font-family: 'Engli-Besh';
+  font-style: normal;
+  font-weight: 400;
+  src: url('./fonts/EngliBesh-KG3W.ttf');
+}
 @import "_variables.less";
 
 html {

module/templates.js

@@ -21,7 +21,6 @@ export const preloadHandlebarsTemplates = async function() {
 	"systems/sw5e/templates/actors/newActor/parts/swalt-active-effects.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-features.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-inventory.html",
-    "systems/sw5e/templates/actors/newActor/parts/swalt-notes.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-powerbook.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-resources.html",
     "systems/sw5e/templates/actors/newActor/parts/swalt-traits.html",

sw5e-global.css

@@ -48,6 +48,17 @@
   font-weight: 400;
   src: url('./fonts/Aurebesh.ttf');
 }
+@font-face {
+  font-family: 'Engli-Besh';
+  font-style: normal;
+  font-weight: 400;
+  src: url('./fonts/EngliBesh-KG3W.ttf');
+}
+.engli-Besh {
+  font-family: 'Engli-Besh';
+  font-size: 20px;
+  font-weight: 400;
+}
 /* ----------------------------------------- */
 /*  Fonts                                    */
 /* ----------------------------------------- */
@@ -705,7 +716,7 @@ input[type="reset"]:disabled {
   box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2);
 }
 .sw5e.sheet.actor.character {
-  min-width: 800px;
+  min-width: 850px;
   min-height: 720px;
 }
 .sw5e.sheet .window-content {
@@ -1330,7 +1341,7 @@ input[type="reset"]:disabled {
   display: grid;
   grid-template-columns: 1fr 1fr;
   grid-gap: 16px;
-  row-gap: 8px;
+  grid-row-gap: 8px;
 }
 .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits input,
 .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits select {
@@ -1357,7 +1368,7 @@ input[type="reset"]:disabled {
   text-shadow: none;
 }
 .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits .languages {
-  grid-column-end: span 2;
+  grid-column-end: span 1;
 }
 .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits .languages label:hover {
   cursor: pointer;

sw5e.css

@@ -9,15 +9,15 @@
   font-weight: 400;
   src: url('./fonts/RussoOne.ttf');
 }
-/* bungee-inline-regular - latin */
+/* engli-besh */
 @font-face {
-  font-family: 'Bungee Inline';
+  font-family: 'Engli-Besh';
   font-style: normal;
   font-weight: 400;
-  src: url('./fonts/BungeeInline.ttf');
+  src: url('./fonts/EngliBesh-KG3W.ttf');
 }
-.bungeeInline {
+.engli-Besh {
-  font-family: 'Bungee Inline';
+  font-family: 'Engli-Besh';
   font-size: 20px;
   font-weight: 400;
 }
@@ -1837,3 +1837,35 @@
   max-width: 40px;
   text-align: right;
 }
+.placeable-hud .control-icon {
+  box-sizing: content-box;
+  width: 40px;
+  flex: 0 0 40px;
+  margin: 8px 0;
+  font-size: 28px;
+  line-height: 40px;
+  text-align: center;
+  color: #FBF4F4;
+  background: rgba(0, 0, 0, 0.6);
+  box-shadow: 0 0 15px #000;
+  border: 1px solid #333;
+  border-radius: 8px;
+  pointer-events: all;
+}
+#token-hud .status-effects {
+  visibility: hidden;
+  position: absolute;
+  left: 50px;
+  top: 0;
+  display: grid;
+  padding: 3px;
+  box-sizing: content-box;
+  width: 100px;
+  color: #FBF4F4;
+  grid-template-columns: 25px 25px 25px 25px;
+  background: rgba(0, 0, 0, 0.6);
+  box-shadow: 0 0 15px #000;
+  border: 1px solid #333;
+  border-radius: 4px;
+  pointer-events: all;
+}

sw5e.js

@@ -26,7 +26,6 @@ import ActorSheet5eCharacter from "./module/actor/sheets/oldSheets/character.js"
 import ActorSheet5eNPC from "./module/actor/sheets/oldSheets/npc.js";
 import ActorSheet5eVehicle from "./module/actor/sheets/oldSheets/vehicle.js";
 import ActorSheet5eCharacterNew from "./module/actor/sheets/newSheet/character.js";
-import ActorSheet5eNPCNew from "./module/actor/sheets/newSheet/npc.js";
 import ItemSheet5e from "./module/item/sheet.js";
 import ShortRestDialog from "./module/apps/short-rest.js";
 import TraitSelector from "./module/apps/trait-selector.js";
@@ -54,7 +53,6 @@ Hooks.once("init", function() {
       ActorSheet5eCharacter,
       ActorSheet5eCharacterNew,
       ActorSheet5eNPC,
-      ActorSheet5eNPCNew,
       ActorSheet5eVehicle,
       ItemSheet5e,
       ShortRestDialog,
@@ -80,6 +78,11 @@ Hooks.once("init", function() {
   CONFIG.Actor.entityClass = Actor5e;
   CONFIG.Item.entityClass = Item5e;
   CONFIG.time.roundTime = 6;
+  CONFIG.fontFamilies = [
+    "Engli-Besh",
+    "Open Sans",
+    "Russo One"
+  ];
 
   // 5e cone RAW should be 53.13 degrees
   CONFIG.MeasuredTemplate.defaults.angle = 53.13;
@@ -107,16 +110,11 @@ Hooks.once("init", function() {
     makeDefault: false,
     label: "SW5E.SheetClassCharacterOld"
    });
-  Actors.registerSheet("sw5e", ActorSheet5eNPCNew, {
+  Actors.registerSheet("sw5e", ActorSheet5eNPC, {
     types: ["npc"],
     makeDefault: true,
     label: "SW5E.SheetClassNPC"
   });
-  Actors.registerSheet("sw5e", ActorSheet5eNPC, {
-    types: ["npc"],
-    makeDefault: false,
-    label: "SW5E.SheetClassNPCOld"
-  });
   Actors.registerSheet('sw5e', ActorSheet5eVehicle, {
     types: ['vehicle'],
     makeDefault: true,

templates/actors/newActor/character-sheet.html

@@ -115,7 +115,7 @@
 		<button class="item" data-tab="powerbook">{{ localize "SW5E.Powerbook" }}</button>
         <button class="item" data-tab="effects">{{ localize "SW5E.Effects" }}</button>
 		<button class="item" data-tab="biography">{{ localize "SW5E.Biography" }}</button>
-		<button class="item" data-tab="notes">{{ localize "SW5E.Notes" }}</button>
+<!--		<button class="item" data-tab="notes">{{ localize "SW5E.Notes" }}</button> -->
 	</nav>
 	{{!-- PC Sheet Body --}}
 	<section class="sheet-body">
@@ -143,8 +143,8 @@
 		<section class="tab biography" data-group="primary" data-tab="biography">
 			{{> "systems/sw5e/templates/actors/newActor/parts/swalt-biography.html"}}
 		</section>
-		{{!-- Notes Tab --}}
+<!--		{{!-- Notes Tab --}}
 		<section class="tab notes" data-group="primary" data-tab="notes">
 			{{> "systems/sw5e/templates/actors/newActor/parts/swalt-notes.html"}}
-		</section>
+		</section> -->
 </form>

templates/actors/newActor/parts/swalt-core.html

@@ -44,8 +44,8 @@
 </section>
 <section class="panel traits-resources">
     <nav class="core-tabs tab-list" data-subgroup-selection>
-        <button type="button" class="item active" data-subgroup="coreattributes" data-target="traits">Traits</button>
+        <button type="button" class="item active" data-subgroup="coreattributes" data-target="traits">Resources & Traits</button>
-        <button type="button" class="item" data-subgroup="coreattributes" data-target="resources">Resources</button>
+        <button type="button" class="item" data-subgroup="coreattributes" data-target="resources">Favorites & Notes</button>
     </nav>
     <div class="tab core-traits active" data-subgroup="coreattributes" data-target="traits">
         {{> "systems/sw5e/templates/actors/newActor/parts/swalt-traits.html"}}

templates/actors/newActor/parts/swalt-resources.html

@@ -1,65 +1,36 @@
 {{!-- Resources, Counters, & Favorites --}}
-<section class="resources">
-	<section class="resource-items">
-		{{#each resources as |res|}}
-		<div class="resource">
-			<h1>
-				<input name="data.resources.{{res.name}}.label" type="text" value="{{res.label}}"
-					placeholder="{{res.placeholder}}" />
-			</h1>
-			<div class="attribute-value">
-				<input name="data.resources.{{res.name}}.value" type="text" value="{{res.value}}" data-dtype="Number"
-					placeholder="0" class="value-number" />
-				<span class="value-separator">/</span>
-				<input name="data.resources.{{res.name}}.max" type="text" value="{{res.max}}" data-dtype="Number"
-					placeholder="0" class="value-number" />
-			</div>
-			<footer class="attribute-footer">
-				<label class="recharge checkbox">
-					{{ localize "SW5E.AbbreviationSR" }} <input name="data.resources.{{res.name}}.sr" type="checkbox"
-						{{checked res.sr}} />
-				</label>
-				<label class="recharge checkbox">
-					{{ localize "SW5E.AbbreviationLR" }} <input name="data.resources.{{res.name}}.lr" type="checkbox"
-						{{checked res.lr}} />
-				</label>
-			</footer>
-		</div>
-		{{/each}}
-	</section>
-	<section class="counters">
-		<div class="counter">
-			<h4 class="death-save rollable">{{ localize "SW5E.DeathSave" }}</h4>
-			<div class="counter-value">
-				<div class="death-success">
-					<i class="fas fa-check"></i>
-					<input type="text" name="data.attributes.death.success" data-dtype="Number" placeholder="0"
-						value="{{data.attributes.death.success}}" />
-				</div>
-				<div class="death-fail">
-					<i class="fas fa-times"></i>
-					<input type="text" name="data.attributes.death.failure" data-dtype="Number" placeholder="0"
-						value="{{data.attributes.death.failure}}" />
-				</div>
-			</div>
-		</div>
-		<div class="counter">
-			<h4>{{ localize "SW5E.Exhaustion" }}</h4>
-			<div class="counter-value">
-				<input type="text" name="data.attributes.exhaustion" data-dtype="Number" placeholder="0"
-					value="{{data.attributes.exhaustion}}" />
-			</div>
-		</div>
-		<div class="counter">
-			<h4>{{ localize "SW5E.Inspiration" }}</h4>
-			<div class="counter-value">
-				<input type="checkbox" name="data.attributes.inspiration" data-dtype="Boolean"
-					{{checked data.attributes.inspiration}} />
-			</div>
-		</div>
-	</section>
 <section class="favorites">
 	<h1>Favorites</h1>
 		<div class="favtabtarget"></div>
 </section>
+<p>&nbsp;</p>
+  <section class="background">
+    <h1>Journal and Notes</h1>
+    <input type="text" name="data.details.notesname" value="{{data.details.notesname}}"
+      placeholder="Personal Journal" />
+
+    {{editor content=data.details.notes.value target="data.details.notes.value" button=true owner=owner editable=editable}}
+  </section>
+  <section>
+    <input type="text" name="data.details.notes1name" value="{{data.details.notes1name}}"
+      placeholder="Additional Notes" />
+      {{editor content=data.details.notes1.value target="data.details.notes1.value" button=true owner=owner editable=editable}}
+  </section>
+  
+  <section>
+    <input type="text" name="data.details.notes2name" value="{{data.details.notes2name}}"
+      placeholder="Additional Notes" />
+      {{editor content=data.details.notes2.value target="data.details.notes2.value" button=true owner=owner editable=editable}}
+  </section>
+  
+  <section>
+    <input type="text" name="data.details.notes3name" value="{{data.details.notes3name}}"
+      placeholder="Additional Notes" />
+      {{editor content=data.details.notes3.value target="data.details.notes3.value" button=true owner=owner editable=editable}}
+  </section>
+  
+  <section>
+    <input type="text" name="data.details.notes4name" value="{{data.details.notes4name}}"
+      placeholder="Additional Notes" />
+      {{editor content=data.details.notes4.value target="data.details.notes4.value" button=true owner=owner editable=editable}}
   </section>

templates/actors/newActor/parts/swalt-traits.html

@@ -1,3 +1,63 @@
+<section class="resources">
+<section class="resource-items">
+    {{#each resources as |res|}}
+	<div class="resource">
+		<h1>
+			<input name="data.resources.{{res.name}}.label" type="text" value="{{res.label}}"
+				placeholder="{{res.placeholder}}" />
+		</h1>
+		<div class="attribute-value">
+			<input name="data.resources.{{res.name}}.value" type="text" value="{{res.value}}" data-dtype="Number"
+				placeholder="0" class="value-number" />
+			<span class="value-separator">/</span>
+			<input name="data.resources.{{res.name}}.max" type="text" value="{{res.max}}" data-dtype="Number"
+				placeholder="0" class="value-number" />
+		</div>
+		<footer class="attribute-footer">
+			<label class="recharge checkbox">
+				{{ localize "SW5E.AbbreviationSR" }} <input name="data.resources.{{res.name}}.sr" type="checkbox"
+					{{checked res.sr}} />
+			</label>
+			<label class="recharge checkbox">
+				{{ localize "SW5E.AbbreviationLR" }} <input name="data.resources.{{res.name}}.lr" type="checkbox"
+					{{checked res.lr}} />
+			</label>
+		</footer>
+	</div>
+	{{/each}}
+
+</section>
+<section class="counters">
+	<div class="counter">
+		<h4 class="death-save rollable">{{ localize "SW5E.DeathSave" }}</h4>
+		<div class="counter-value">
+			<div class="death-success">
+				<i class="fas fa-check"></i>
+				<input type="text" name="data.attributes.death.success" data-dtype="Number" placeholder="0"
+					value="{{data.attributes.death.success}}" />
+			</div>
+			<div class="death-fail">
+				<i class="fas fa-times"></i>
+				<input type="text" name="data.attributes.death.failure" data-dtype="Number" placeholder="0"
+					value="{{data.attributes.death.failure}}" />
+			</div>
+		</div>
+	</div>
+	<div class="counter">
+		<h4>{{ localize "SW5E.Exhaustion" }}</h4>
+		<div class="counter-value">
+			<input type="text" name="data.attributes.exhaustion" data-dtype="Number" placeholder="0"
+				value="{{data.attributes.exhaustion}}" />
+		</div>
+	</div>
+	<div class="counter">
+		<h4>{{ localize "SW5E.Inspiration" }}</h4>
+		<div class="counter-value">
+			<input type="checkbox" name="data.attributes.inspiration" data-dtype="Boolean"
+				{{checked data.attributes.inspiration}} />
+		</div>
+	</div>
+</section>
 <section class="traits">
     <label>
         {{localize "SW5E.Size"}}
@@ -20,6 +80,16 @@
         </ul>
         {{/unless}}
     </label>
+	<div>
+        <label>{{localize "SW5E.MovementConfig"}}</label>
+        <a class="configure-movement" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
+	</div>
+	<div>
+    {{#unless isVehicle}}
+        <label>{{localize "SW5E.SpecialTraits"}}</label>
+        <a class="configure-flags"><i class="fas fa-cog"></i></a>
+    {{/unless}}
+    </div>
     <div class="languages">
         <label data-options="share-languages" class="languages">{{localize "SW5E.Languages"}}</label>
         <a class="trait-selector" data-options="languages" data-target="data.traits.languages">
@@ -31,6 +101,39 @@
             {{/each}}
         </ul>
     </div>	
+    <div>
+        <label>{{localize "SW5E.TraitArmorProf"}}</label>
+        <a class="trait-selector" data-options="armorProficiencies" data-target="data.traits.armorProf">
+            <i class="fas fa-edit"></i>
+        </a>
+        <ul class="traits-list">
+        {{#each data.traits.armorProf.selected as |v k|}}
+            <li>{{v}}</li>
+        {{/each}}
+        </ul>
+    </div>
+    <div>
+        <label>{{localize "SW5E.TraitToolProf"}}</label>
+        <a class="trait-selector" data-options="toolProficiencies" data-target="data.traits.toolProf">
+            <i class="fas fa-edit"></i>
+        </a>
+        <ul class="traits-list">
+        {{#each data.traits.toolProf.selected as |v k|}}
+            <li>{{v}}</li>
+        {{/each}}
+        </ul>
+    </div>
+    <div>
+        <label>{{localize "SW5E.TraitWeaponProf"}}</label>
+        <a class="trait-selector" data-options="weaponProficiencies" data-target="data.traits.weaponProf">
+            <i class="fas fa-edit"></i>
+        </a>
+        <ul class="traits-list">
+        {{#each data.traits.weaponProf.selected as |v k|}}
+            <li>{{v}}</li>
+        {{/each}}
+        </ul>
+    </div>	
     <div>
         <label>{{localize "SW5E.DamImm"}}</label>
         <a class="trait-selector" data-options="damageResistanceTypes" data-target="data.traits.di">
@@ -76,42 +179,8 @@
         {{/each}}
         </ul>
     </div>{{#if isCharacter}}
-    <div>
-        <label>{{localize "SW5E.TraitWeaponProf"}}</label>
-        <a class="trait-selector" data-options="weaponProficiencies" data-target="data.traits.weaponProf">
-            <i class="fas fa-edit"></i>
-        </a>
-        <ul class="traits-list">
-        {{#each data.traits.weaponProf.selected as |v k|}}
-            <li>{{v}}</li>
-        {{/each}}
-        </ul>
-    </div>
-    <div>
-        <label>{{localize "SW5E.TraitArmorProf"}}</label>
-        <a class="trait-selector" data-options="armorProficiencies" data-target="data.traits.armorProf">
-            <i class="fas fa-edit"></i>
-        </a>
-        <ul class="traits-list">
-        {{#each data.traits.armorProf.selected as |v k|}}
-            <li>{{v}}</li>
-        {{/each}}
-        </ul>
-    </div>
 
-    <div>
-        <label>{{localize "SW5E.TraitToolProf"}}</label>
-        <a class="trait-selector" data-options="toolProficiencies" data-target="data.traits.toolProf">
-            <i class="fas fa-edit"></i>
-        </a>
-        <ul class="traits-list">
-        {{#each data.traits.toolProf.selected as |v k|}}
-            <li>{{v}}</li>
-        {{/each}}
-        </ul>
-    </div>
     {{/if}}
-
     {{#unless isVehicle}}
     <div>
         <label>{{localize "SW5E.SpecialTraits"}}</label>