fix: merge conflict header

Fix NPCs

See merge request wintermyst/kidsonbrooms!7

.gitlab-ci.yml

@@ -11,7 +11,7 @@ variables:
   PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${CI_PROJECT_NAME}/${CI_COMMIT_TAG}"
   MANIFEST_RELEASE_URL: "${PACKAGE_REGISTRY_URL}/${MANIFEST}"
   ZIPFILE_RELEASE_URL: "${PACKAGE_REGISTRY_URL}/${ZIPFILE}"
-  MANIFEST_PERMALINK_URL: "https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/releases/permalink/latest/downloads/${MANIFEST}"
+  MANIFEST_PERMALINK_URL: "https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/releases/${CI_COMMIT_TAG}/downloads/${MANIFEST}"
   ZIPFILE_PERMALINK_URL: "https://gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/-/releases/${CI_COMMIT_TAG}/downloads/${ZIPFILE}"
   dry_run: true
 
@@ -79,6 +79,6 @@ create-release:
           url: "${MANIFEST_RELEASE_URL}"
           filepath: "/${MANIFEST}"
         - name: "$ZIPFILE"
-          url: "${ZIPFILE_PERMALINK_URL}"
+          url: "${ZIPFILE_RELEASE_URL}"
           filepath: "/${ZIPFILE}"
 

css/kidsonbrooms.css

@@ -162,72 +162,140 @@
 }
 
 .flex-group-center {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: center;
   flex-direction: center;
+  -ms-flex-wrap: center;
   flex-wrap: center;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
   justify-content: flex-start;
+  -webkit-box-align: stretch;
+  -ms-flex-align: stretch;
   align-items: stretch;
   text-align: center;
 }
 
 .flex-group-left {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: flex-start;
   flex-direction: flex-start;
+  -ms-flex-wrap: center;
   flex-wrap: center;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
   justify-content: flex-start;
+  -webkit-box-align: stretch;
+  -ms-flex-align: stretch;
   align-items: stretch;
   text-align: left;
 }
 
 .flex-group-right {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: flex-end;
   flex-direction: flex-end;
+  -ms-flex-wrap: center;
   flex-wrap: center;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
   justify-content: flex-start;
+  -webkit-box-align: stretch;
+  -ms-flex-align: stretch;
   align-items: stretch;
   text-align: right;
 }
 
 .flexshrink {
+  -webkit-box-flex: 0;
+  -ms-flex: 0;
   flex: 0;
 }
 
 .flex-between {
+  -webkit-box-pack: justify;
+  -ms-flex-pack: justify;
   justify-content: space-between;
 }
 
 .flexlarge {
+  -webkit-box-flex: 2;
+  -ms-flex: 2;
   flex: 2;
 }
 
 .align-left {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: flex-start;
   flex-direction: flex-start;
+  -ms-flex-wrap: center;
   flex-wrap: center;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
   justify-content: flex-start;
+  -webkit-box-align: stretch;
+  -ms-flex-align: stretch;
   align-items: stretch;
   text-align: left;
 }
 
 .align-right {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: flex-end;
   flex-direction: flex-end;
+  -ms-flex-wrap: center;
   flex-wrap: center;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
   justify-content: flex-start;
+  -webkit-box-align: stretch;
+  -ms-flex-align: stretch;
   align-items: stretch;
   text-align: right;
 }
 
 .align-center {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: center;
   flex-direction: center;
+  -ms-flex-wrap: center;
   flex-wrap: center;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
   justify-content: flex-start;
+  -webkit-box-align: stretch;
+  -ms-flex-align: stretch;
   align-items: stretch;
   text-align: center;
 }
 
 .right-align-input {
+  -webkit-box-flex: 1;
+  -ms-flex: 1;
   flex: 1;
   margin-left: auto;
   max-width: 260px;
@@ -243,26 +311,47 @@
   cursor: pointer;
 }
 
+.editor-container {
+  min-height: 200px; /* Adjust this value as needed */
+}
+
 /* Styles limited to kidsonbrooms sheets */
 .kids-on-brooms .item-form {
   font-family: "Roboto", sans-serif;
 }
 .kids-on-brooms .sheet-header {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+  -ms-flex-direction: row;
   flex-direction: row;
+  -ms-flex-wrap: wrap;
   flex-wrap: wrap;
+  -webkit-box-align: start;
+  -ms-flex-align: start;
+  align-items: flex-start;
+  -webkit-box-pack: start;
+  -ms-flex-pack: start;
   justify-content: flex-start;
-  align-items: stretch;
+  -webkit-box-flex: 0;
-  flex: 0 auto;
+  -ms-flex: 0 1 auto;
+  flex: 0 1 auto;
   overflow: hidden;
   margin-bottom: 10px;
+  height: 110px;
 }
 .kids-on-brooms .sheet-header .profile-img {
+  -webkit-box-flex: 0;
+  -ms-flex: 0 0 100px;
   flex: 0 0 100px;
   height: 100px;
   margin-right: 10px;
 }
 .kids-on-brooms .sheet-header .header-fields {
+  -webkit-box-flex: 1;
+  -ms-flex: 1;
   flex: 1;
 }
 .kids-on-brooms .sheet-header h1.charname {
@@ -281,7 +370,9 @@
   border-radius: 10px;
 }
 .kids-on-brooms .sheet-tabs {
-  flex: 0;
+  -webkit-box-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
 }
 .kids-on-brooms .sheet-body,
 .kids-on-brooms .sheet-body .tab,
@@ -295,8 +386,14 @@
   padding: 0 8px;
 }
 .kids-on-brooms .selection-row {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-pack: justify;
+  -ms-flex-pack: justify;
   justify-content: space-between;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
   align-items: center;
   margin-bottom: 10px;
 }
@@ -307,6 +404,8 @@
   height: 28px;
   margin: 2px 0;
   padding: 0;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
   align-items: center;
   background: rgba(0, 0, 0, 0.05);
   border: 2px groove #eeede0;
@@ -320,6 +419,8 @@
   font-weight: bold;
   padding-left: 5px;
   text-align: left;
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
 }
 .kids-on-brooms .items-list {
@@ -336,7 +437,11 @@
   padding: 0;
 }
 .kids-on-brooms .items-list .item {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
   align-items: center;
   padding: 0 2px;
   border-bottom: 1px solid #c9c7b8;
@@ -345,11 +450,15 @@
   border-bottom: none;
 }
 .kids-on-brooms .items-list .item .item-name {
+  -webkit-box-flex: 2;
+  -ms-flex: 2;
   flex: 2;
   margin: 0;
   overflow: hidden;
   font-size: 13px;
   text-align: left;
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
   color: #191813;
 }
@@ -359,6 +468,8 @@
   overflow-x: hidden;
 }
 .kids-on-brooms .items-list .item .item-name .item-image {
+  -webkit-box-flex: 0;
+  -ms-flex: 0 0 30px;
   flex: 0 0 30px;
   height: 30px;
   background-size: 30px;
@@ -366,8 +477,14 @@
   margin-right: 5px;
 }
 .kids-on-brooms .items-list .item-controls {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
+  -webkit-box-flex: 0;
+  -ms-flex: 0 0 100px;
   flex: 0 0 100px;
+  -webkit-box-pack: end;
+  -ms-flex-pack: end;
   justify-content: flex-end;
 }
 .kids-on-brooms .items-list .item-controls a {
@@ -385,6 +502,8 @@
   height: 28px;
   margin: 2px 0;
   padding: 0;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
   align-items: center;
   background: rgba(0, 0, 0, 0.05);
   border: 2px groove #eeede0;
@@ -399,6 +518,8 @@
   text-align: left;
 }
 .kids-on-brooms .item-formula {
+  -webkit-box-flex: 0;
+  -ms-flex: 0 0 200px;
   flex: 0 0 200px;
   padding: 0 8px;
 }
@@ -418,6 +539,4 @@
 .kids-on-brooms .kids-on-brooms select:focus {
   outline: none;
   border-color: #8102dd;
-}
+}
-
-/*# sourceMappingURL=kidsonbrooms.css.map */

gulpfile.js

@@ -4,7 +4,7 @@ const sourcemaps = require('gulp-sourcemaps');
 const sass = require('gulp-sass')(require('sass'));
 const zip = require('gulp-zip');
 const fs = require('fs');
-const fetch = import('node-fetch');
+const fetch = require('node-fetch');
 const replace = require('gulp-replace');
 const FormData = require('form-data');
 
@@ -71,7 +71,7 @@ function compileScss() {
 /* ----------------------------------------- */
 
 function watchUpdates() {
-  gulp.watch(SYSTEM_SCSS, css);
+  gulp.watch(SYSTEM_SCSS, compileScss);
 }
 
 
@@ -259,7 +259,7 @@ async function uploadToPackageRegistry(done) {
 /* Publish to FoundryVTT               
 /* ----------------------------------------- */
 
-function publishToFoundry(done) {
+async function publishToFoundry(done) {
   const moduleManifestPath = 'system.json';
   const moduleManifest = JSON.parse(fs.readFileSync(moduleManifestPath));
 
@@ -268,8 +268,8 @@ function publishToFoundry(done) {
   const compMin = moduleManifest.compatibility.minimum;
   const compVer = moduleManifest.compatibility.verified;
   const compMax = moduleManifest.compatibility.maximum;
-  const manifest = process.env.MANIFEST_RELEASE_URL || `https://gitlab.com/${process.env.CI_PROJECT_NAMESPACE}/${process.env.CI_PROJECT_NAME}/-/releases/${process.env.CI_COMMIT_TAG}/downloads/${moduleManifestPath}`;
+  const manifest = process.env.MANIFEST_PERMALINK_URL || `https://gitlab.com/${process.env.CI_PROJECT_NAMESPACE}/${process.env.CI_PROJECT_NAME}/-/releases/${process.env.CI_COMMIT_TAG}/downloads/${moduleManifestPath}`;
-  const notes = `https://gitlab.com/${process.env.CI_PROJECT_NAMESPACE}/${process.env.CI_PROJECT_NAME}/-/tags/${process.env.CI_COMMIT_TAG}`;
+  const notes = `https://gitlab.com/${process.env.CI_PROJECT_NAMESPACE}/${process.env.CI_PROJECT_NAME}/-/releases/${process.env.CI_COMMIT_TAG}`;
 
   const dryRun = process.env.dry_run === 'true';
   const authToken = process.env.FOUNDRY_API_KEY;
@@ -281,7 +281,7 @@ function publishToFoundry(done) {
 
   // Construct the payload
   const payload = {
-    id: id,
+    id: "kidsonbrooms",
     release: {
       version: version,
       manifest: manifest,
@@ -299,7 +299,7 @@ function publishToFoundry(done) {
   }
 
   // Send the POST request to Foundry VTT API
-  const response = fetch('https://api.foundryvtt.com/_api/packages/release', {
+  const response = await fetch('https://api.foundryvtt.com/_api/packages/release_version', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
@@ -308,9 +308,9 @@ function publishToFoundry(done) {
     body: JSON.stringify(payload),
   });
 
-  const responseData = response.json();
+  const responseData = await response.text();
 
-  if (responseData.status === 'success') {
+  if (responseData.includes('success')) {
     console.log('Successfully published to Foundry VTT:');
     console.log(JSON.stringify(responseData, null, 2));
     done();
@@ -328,7 +328,7 @@ function publishToFoundry(done) {
 function updateSystemJson(done) {
   const ManifestPath = 'system.json';
   const Manifest = JSON.parse(fs.readFileSync(ManifestPath));
-  const zipUrl = process.env.ZIPFILE_PERMALINK_URL || 'https://gitlab.com/wintermyst/kidsonbrooms/-/raw/master/kidsonbrooms.zip?inline=false';
+  const zipUrl = process.env.ZIPFILE_RELEASE_URL || 'https://gitlab.com/wintermyst/kidsonbrooms/-/raw/master/kidsonbrooms.zip?inline=false';
 
   Manifest.download = zipUrl;
 

module/documents/actor.mjs

@@ -7,7 +7,7 @@ export class KidsOnBroomsActor extends Actor {
   /**
    * Override getRollData() that's supplied to rolls.
    */
-  getRollData() {
+  getRollDataPC() {
     let data = { ...this.system };
   
     // Wand bonuses
@@ -18,6 +18,12 @@ export class KidsOnBroomsActor extends Actor {
   
     return data;
   }
+
+  getRollDataNPC() {
+    let data = { ...this.system};
+
+    return data;
+  }
   
   _getWandBonus(type) {
     const bonuses = {

module/kidsonbrooms.mjs

@@ -42,6 +42,7 @@ Hooks.once('init', async function() {
     decimals: 2
   };
 
+
   // Define custom Document classes
   CONFIG.Actor.documentClass = KidsOnBroomsActor;
 
@@ -104,12 +105,10 @@ Hooks.once('init', async function() {
     }
   });
   
-
-  
-  
-
   // Preload Handlebars templates.
   return preloadHandlebarsTemplates();
+
+  
 });
 
 /***

module/sheets/actor-sheet.mjs

@@ -8,7 +8,7 @@ export class KidsOnBroomsActorSheet extends ActorSheet {
   static get defaultOptions() 
   {
     return foundry.utils.mergeObject(super.defaultOptions, {
-      classes: ["kids-on-brooms", "sheet", "actor"],
+      classes: ["kidsonbrooms", "sheet", "actor"],
       width: 800,
       height: 800,
       tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "features" }]
@@ -19,7 +19,9 @@ export class KidsOnBroomsActorSheet extends ActorSheet {
   get template() 
   {
     console.log("template", this.actor)
-    return `systems/kids-on-brooms/templates/actor/actor-${this.actor.type}-sheet.html`;
+    return `systems/kidsonbrooms/templates/actor/actor-${this.actor.type}-sheet.html`;
+
+
   }
 
   /* -------------------------------------------- */
@@ -40,8 +42,6 @@ async getData()
 
   // Add roll data for TinyMCE editors.
   context.rollData = context.actor.getRollData();
-  // Add roll data for TinyMCE editors.
-  context.rollData = context.actor.getRollData();
 
 
   console.log(context);
@@ -87,7 +87,16 @@ async getData()
       if (dataset.roll) {
       let label = dataset.label ? `${dataset.label}` : '';
       // Get the roll data and include wand bonuses
-      let rollData = this.actor.getRollData();
+
+      let rollData;
+      if(this.actor.type == "character") {
+        rollData = this.actor.getRollDataPC();
+      } else if (this.actor.type == "npc") {
+        rollData = this.actor.getRollDataNPC();
+      } else {
+        console.log("ERROR: UNKNOWN AUTHOR TYPE");
+        return;
+      }
       let totalBonus = 0;
       console.log(dataset.roll);
       // Apply wood bonus if it matches the stat being rolled for

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kidsonbrooms",
-  "version": "1.1.2",
+  "version": "1.1.5",
   "description": "CSS compiler for the Kids On Brooms system",
   "scripts": {
     "build": "gulp build",
@@ -23,7 +23,7 @@
     "gulp-sourcemaps": "^2.6.5",
     "gulp-zip": "^5.0.1",
     "kidsonbrooms": "file:",
-    "node-fetch": "^3.3.2"
+    "node-fetch": "^2.7.0"
   },
   "devDependencies": {
     "sass": "^1.79.1"

readme.md

@@ -1,3 +1,5 @@
 The Kids On Brooms System Implemented in FoundryVTT
 
-To get support create a issue on this Repository
+To get support create a issue on this Repository or join my discord:
+
+https://discord.gg/4sTXjxs5Yv

scss/components/_forms.scss

@@ -3,10 +3,15 @@
 }
 
 .sheet-header {
-  @include flexbox(row, wrap, flex-start); // Use a mixin for flexbox
+  display: flex;
-  flex: 0 auto;
+  flex-direction: row;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  justify-content: flex-start; // Use a mixin for flexbox
+  flex: 0 1 auto;
   overflow: hidden;
   margin-bottom: 10px;
+  height: 110px;
 
   .profile-img {
     flex: 0 0 100px;
@@ -38,7 +43,7 @@ div.editor-border {
 }
 
 .sheet-tabs {
-  flex: 0;
+  flex: 1;
 }
 
 .sheet-body,

scss/kidsonbrooms.scss

@@ -14,6 +14,10 @@
 @import 'global/flex';
 @import 'global/base';
 
+.editor-container {
+  min-height: 200px; /* Adjust this value as needed */
+}
+
 /* Styles limited to kidsonbrooms sheets */
 .kids-on-brooms {
   @import 'components/forms';

system.json

@@ -2,7 +2,7 @@
   "id": "kidsonbrooms",
   "title": "Kids on Brooms System",
   "description": "The Kids on Brooms system for FoundryVTT!",
-  "version": "1.1.2",
+  "version": "1.1.6",
   "compatibility": {
     "minimum": 12,
     "verified": 12.331

template.json

@@ -0,0 +1,68 @@
+{
+  "Actor": {
+    "types": ["character", "npc"],
+    "templates": {
+      "base": {
+        "stats": {
+          "fight": {
+            "value": "d4",
+            "stat": 0,
+            "magic": 0
+          },
+          "flight": {
+            "value": "d4",
+            "stat": 0,
+            "magic": 0
+          },
+          "brains": {
+            "value": "d4",
+            "stat": 0,
+            "magic": 0
+          },
+          "brawn": {
+            "value": "d4",
+            "stat": 0,
+            "magic": 0
+          },
+          "charm": {
+            "value": "d4",
+            "stat": 0,
+            "magic": 0
+          },
+          "grit": {
+            "value": "d4",
+            "stat": 0,
+            "magic": 0
+          }
+        },
+        "description": ""
+      }
+    },
+    "character": {
+      "templates": ["base"],
+      "trope": "",
+      "age": "",
+      "pronouns": "",
+      "fear": "",
+      "motivation": "",
+      "grade":"",
+      "broom": {
+        "name": "",
+        "look": "",
+        "mechanicalbenifit": ""
+      },
+      "wand": {
+        "wood": "",
+        "core": ""
+      },
+      "animalfamiliar":"",
+      "schoolbag": "",
+      "adversityTokens": 0,
+      "tropequestions": "",
+      "strengths": ""
+    },
+    "npc": {
+      "templates": ["base"]
+    }
+  }
+}

templates/actor/actor-character-sheet.html

@@ -43,10 +43,16 @@
 
       </section>
     </div>
-    {{!-- Schoolbag Tab --}}
+
-    <div class="tab features editor-border" data-group="primary" data-tab="schoolbag">
+    <div class="tab schoolbag" data-group="primary" data-tab="schoolbag">
-      {{editor schoolbag target="system.schoolbag" engine="prosemirror" button=false collaborate=false editable=true}}
+      {{!-- Schoolbag Tab --}}
+      <div class="tab features editor-border" data-group="primary" data-tab="schoolbag">
+        {{editor schoolbag target="system.schoolbag" engine="prosemirror" button=false collaborate=false editable=true}}
+      </div>
     </div>
+    
+    
+    
 
     {{!-- Strengths Tab --}}
     <div class="tab features editor-border" data-group="primary" data-tab="strengths">

templates/actor/parts/actor-stats.html

@@ -25,7 +25,7 @@
         <!-- Magic rolling and input -->
         <Fieldset class="flexrow flex-group-center">
           <legend>Magic</legend>
-          <span class="ability-mod rollable" data-roll="1{{stat.value}}x+1d4+{{stat.stat}}" data-label="Magic Roll for {{key}}" data-key="{{key}}">
+          <span class="ability-mod rollable" data-roll="1{{stat.value}}x+1d4x+{{stat.stat}}" data-label="Magic Roll for {{key}}" data-key="{{key}}">
             <i class="fas fa-dice-d20"></i>
           </span>
         </Fieldset>