Initial import

modules/pegasus-actor-sheet.js

@@ -48,6 +48,7 @@ export class PegasusActorSheet extends ActorSheet {
       shields: duplicate(this.actor.getShields()),
       equipments: duplicate(this.actor.getEquipments()),
       perks: duplicate(this.actor.getPerks()),
+      activePerks: duplicate(this.actor.getActivePerks()),
       powers: duplicate(this.actor.getPowers()),
       subActors: duplicate(this.actor.getSubActors()),
       options: this.options,
@@ -162,6 +163,13 @@ export class PegasusActorSheet extends ActorSheet {
       const li = $(ev.currentTarget).parents(".item");
       this.actor.equipItem( li.data("item-id") );
       this.render(true);
+      
+    });
+    html.find('.perk-active').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      this.actor.activatePerk( li.data("item-id") );
+      this.render(true);
+      
     });
 
   }

modules/pegasus-actor.js

@@ -84,7 +84,11 @@ export class PegasusActor extends Actor {
 
     super._preUpdate(changed, options, user);
   }
-  
+  /* -------------------------------------------- */
+  getActivePerks() {
+    let perks = this.data.items.filter( item => item.type == 'perk' && item.data.data.active);
+    return perks;
+  }  
   /* -------------------------------------------- */
   getPerks() {
     let comp = this.data.items.filter( item => item.type == 'perk');
@@ -139,6 +143,15 @@ export class PegasusActor extends Actor {
     return comp;
   }
   
+  /* -------------------------------------------- */
+  async activatePerk(perkId ) {
+    let item = this.data.items.find( item => item.id == perkId );
+    if (item && item.data.data) {
+      let update = { _id: item.id, "data.active": !item.data.data.active };
+      await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
+    }
+  }
+
   /* -------------------------------------------- */
   async equipItem(itemId ) {
     let item = this.data.items.find( item => item.id == itemId );
@@ -392,6 +405,7 @@ export class PegasusActor extends Actor {
         rollMode: game.settings.get("core", "rollMode"),
         title: `Stat ${stat.label} `,
         stat: stat,
+        activePerks: duplicate(this.getActivePerks()),
         optionsDiceList: PegasusUtility.getOptionsDiceList(),
         bonusDicesLevel: 0, 
         hindranceDicesLevel: 0,
@@ -420,10 +434,11 @@ export class PegasusActor extends Actor {
         actorId: this.id,
         img: spec.img,
         rollMode: game.settings.get("core", "rollMode"),
-        title: `Specialisation Roll : ${spec.name} `,
+        title: `Spec. : ${spec.name} `,
-        spec : spec ,
-        optionsDiceList: PegasusUtility.getOptionsDiceList(),
         stat: this.getStat( spec.data.statistic ),
+        spec : spec ,
+        activePerks: duplicate(this.getActivePerks()),
+        optionsDiceList: PegasusUtility.getOptionsDiceList(),
         bonusDicesLevel: 0, 
         hindranceDicesLevel: 0,
         otherDicesLevel: 0,
@@ -439,17 +454,6 @@ export class PegasusActor extends Actor {
     }
   }
 
-  /* -------------------------------------------- */
-  applyTechniqueCost( techId) {
-    let tech = duplicate(this.data.items.find( item => item.id == techId));
-    if (tech ) {
-      let attr = this.getAttributeFromChiName( tech.data.chicolor);
-      let chiscore = attr.chiscore - tech.data.chicost;
-      chiscore = (chiscore < 0) ? 0 : chiscore;
-      this.update( { [`data.attributes.${attr.key}.chiscore`]: chiscore } );
-    }
-  }
-
   /* -------------------------------------------- */
   updateWithTarget( rollData) {
     let objectDefender
@@ -469,48 +473,30 @@ export class PegasusActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  async rollTechnique( techId ) {
+  async rollPower( powId ) {
-      let technique = this.data.items.find( item => item.type == 'technique' && item.id == techId);
+      let power = this.data.items.find( item => item.type == 'power' && item.id == powId);
-      if (technique) {        
+      if (power) {        
-        let usedChi = this.getAttributeFromChiName( technique.data.data.chicolor);
-        if ( usedChi.chiscore < 0 || technique.data.data.chicost > usedChi.chiscore) {
-          ui.notifications.warn(`Not enough ${usedChi.chi} to use Technique ${technique.name}`);
-          return;
-        }
-
-        let chi = undefined;
-        let skill = this.data.items.find( item => item.type == 'skill' && item.name == technique.data.data.skillchi);
-        if ( !skill) {
-          chi = this.getAttributeFromChiName( technique.data.data.skillchi);
-        }
         let rollData = {
-          mode: "technique",
+          mode: "power",
           alias: this.name, 
-          armorModifier: this.getArmorModifier(),
           actorImg: this.img,
           actorId: this.id,
-          img: technique.img,
+          img: power.img,
           rollMode: game.settings.get("core", "rollMode"),
-          title: `Technique ${technique.name} `,
+          title: `Power ${power.name} `,
-          technique: duplicate(technique),
+          power: duplicate(power),
-          optionsNegative: WotGUtility.getNegativeModifiers(),
+          activePerks: duplicate(this.getActivePerks()),
-          optionsPositive: WotGUtility.getPositiveModifiers(),
+          optionsDiceList: PegasusUtility.getOptionsDiceList(),
-          negativeModifier: 0,
+          bonusDicesLevel: 0, 
-          positiveModifier: 0,
+          hindranceDicesLevel: 0,
-          specialtiesBonus: 0
+          otherDicesLevel: 0,
-        }
-        if ( skill) {
-          rollData.skill = duplicate(skill);
-          rollData.attr = this.getAttribute( skill.data.data.attribute );
-        } else {
-          rollData.attr = chi;
         }
 
         this.updateWithTarget(rollData);
 
         this.syncRoll( rollData);
   
-        let rollDialog = await WotGRollDialog.create( this, rollData);
+        let rollDialog = await PegasusRollDialog.create( this, rollData);
         console.log(rollDialog);
         rollDialog.render( true );
       } else {
@@ -534,22 +520,20 @@ export class PegasusActor extends Actor {
         actorId: this.id,
         img: weapon.img,
         rollMode: game.settings.get("core", "rollMode"),
-        armorModifier: this.getArmorModifier(),
         title: "Attack : " + weapon.name,
         weapon: weapon,
-        skillKey : 0,
+        activePerks: duplicate(this.getActivePerks()),
-        optionsNegative: WotGUtility.getNegativeModifiers(),
+        optionsDiceList: PegasusUtility.getOptionsDiceList(),
-        optionsPositive: WotGUtility.getPositiveModifiers(),
+        bonusDicesLevel: 0, 
-        negativeModifier: 0,
+        hindranceDicesLevel: 0,
-        positiveModifier: 0,
+        otherDicesLevel: 0,
-        specialtiesBonus: 0,
     }
 
       this.updateWithTarget(rollData);
 
       this.syncRoll( rollData);
 
-      let rollDialog = await WotGRollDialog.create( this, rollData);
+      let rollDialog = await PegasusRollDialog.create( this, rollData);
       console.log("WEAPON ROLL", rollData);
       rollDialog.render( true );
     } else {

modules/pegasus-utility.js

@@ -122,6 +122,7 @@ export class PegasusUtility  {
     
     const templatePaths = [
       'systems/fvtt-pegasus-rpg/templates/editor-notes-gm.html',
+      'systems/fvtt-pegasus-rpg/templates/partial-roll-common-dices.html',
       'systems/fvtt-pegasus-rpg/templates/partial-options-statistics.html',
       'systems/fvtt-pegasus-rpg/templates/partial-options-level.html',
       'systems/fvtt-pegasus-rpg/templates/partial-options-equipment-types.html'

system.json

@@ -40,9 +40,9 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 4,
+  "templateVersion": 6,
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "0.0.4'",
+  "version": "0.0.6",
   "background" : ""
 }

template.json

@@ -40,7 +40,7 @@
             "mod": 0
           },
           "soc":{ 
-            "label": "Sociability",
+            "label": "Social",
             "abbrev": "soc",
             "level": 1,
             "mod": 0
@@ -52,19 +52,19 @@
             "mod": 0
           },
           "phy":{ 
-            "label": "Physical",
+            "label": "Physique",
             "abbrev": "phy",
             "level": 1,
             "mod": 0
           },
           "com":{ 
-            "label": "Communication",
+            "label": "Combat",
             "abbrev": "com",
             "level": 1,
             "mod": 0
           },
           "def":{ 
-            "label": "Defense",
+            "label": "Defence",
             "abbrev": "def",
             "level": 1,
             "mod": 0
@@ -92,20 +92,24 @@
           "health": {
             "label": "Health",
             "value": 0,
+            "type": "value",
             "max": 0
           },
           "delirium": {
             "label": "Delirium",
             "value": 0,
+            "type": "value",
             "max": 0
           },
           "nrg": {
-            "label": "NRJ",
+            "label": "NRG",
             "value": 0,
+            "type": "value",
             "max": 0
           },
           "mr": {
             "label": "MR",
+            "type": "dice",
             "value": 0
           }          
         }
@@ -123,7 +127,7 @@
    }
   },
   "Item": {
-    "types": [ "race", "role", "ability", "specialisation", "perk", "power" , "armor", "equipment", "weapon"],
+    "types": [ "race", "role", "ability", "specialisation", "perk", "power" , "armor", "shield", "equipment", "weapon"],
     "race": {
       "description": "",
       "environment": "",
@@ -149,6 +153,7 @@
       "level": 1,
       "active": false,
       "roundcount": 0,
+      "nbuse": "",
       "description": "",
       "upgrades": "",
       "rules": ""
@@ -161,7 +166,8 @@
       "range": "",
       "action": "",
       "type": "",
-      "effects": ""
+      "effects": "",
+      "purchasedeffects": ""
     },    
     "armor": {
       "statistic": "",

templates/actor-sheet.html

@@ -15,7 +15,7 @@
         <a class="item" data-tab="statistics">Statistics</a>
         <a class="item" data-tab="specs">Specialisations</a>
         <a class="item" data-tab="powers">Powers</a>
-        <a class="item" data-tab="fight">Fight</a>
+        <a class="item" data-tab="combat">Combat</a>
         <a class="item" data-tab="equipment">Equipment</a>
         <a class="item" data-tab="biodata">Biography</a>
     </nav>
@@ -42,7 +42,7 @@
                 {{{@root.optionsDiceList}}}
                 {{/select}}
               </select> 
-              <input type="text" class="input-numeric-short padd-right" name="stat.mod" value="{{stat.mod}}" data-dtype="Number"  {{#unless @root.editScore}}disabled{{/unless}}/>
+              <input type="text" class="input-numeric-short padd-right" name="data.statistics.{{key}}.mod" value="{{stat.mod}}" data-dtype="Number"  {{#unless @root.editScore}}disabled{{/unless}}/>
             </li>
             {{/each}}
           </ul>  
@@ -55,7 +55,11 @@
               <span class="stat-label flexrow" name="{{key}}"><h4>{{stat2.label}}</h4></span>
               <select class="carac-base flexrow" type="text" name="data.secondary.{{key}}.value" value="{{stat2.value}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
                 {{#select stat2.value}}
+                  {{#if (eq stat2.type "value")}}
                     {{{@root.optionsLevel}}}
+                  {{else}}
+                    {{{@root.optionsDiceList}}}
+                  {{/if}}
                   {{/select}}
               </select> 
             </li>
@@ -71,6 +75,8 @@
     {{!-- Other Tab --}}
     <div class="tab items" data-group="primary" data-tab="specs">
 
+      <div class="grid grid-2col">
+
         <div>
           <span class="generic-label"><h3>Specialisations</h3></span>
           <ul class="stat-list alternate-list">
@@ -89,10 +95,29 @@
           </ul>          
         </div>
   
+        <div>
+          <span class="generic-label"><h3>Perks</h3></span>
+          <ul class="stat-list alternate-list">
+            {{#each perks as |perk key|}}
+            <li class="item stat flexrow list-item" data-item-id="{{perk._id}}">
+              <img class="sheet-competence-img" src="{{perk.img}}"/>
+              <span class="stat-label">{{perk.name}}</span>
+              <span class="stat-label">{{perk.data.level}}</span>
+              <div class="item-controls">
+                <a class="item-control perk-active" title="active">{{#if perk.data.active}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+                <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              </div>
+            </li>
+            {{/each}}                
+          </ul>          
+        </div>
+      </div>
+
     </div>
     
     {{!-- Combat Tab --}}
-    <div class="tab fight" data-group="primary" data-tab="fight">
+    <div class="tab fight" data-group="primary" data-tab="combat">
       <div class="flexcol">
     
         <span class="generic-label"><h3>Weapons</h3></span>
@@ -105,7 +130,7 @@
             <span class="generic-label">Speed {{weapon.data.speed}}</span>
             <span class="generic-label">Damage {{weapon.data.damage}}</span>
             <div class="item-controls">
-              <a class="item-control item-equip" title="Worn">{{#if weapon.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+              <a class="item-control item-equip" title="Equip">{{#if weapon.data.equipped}}<i class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
               <a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
               <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
             </div>

templates/item-armor-sheet.html

@@ -18,7 +18,7 @@
                 {{/select}}
               </select> 
             </li>
-            <li class="flexrow"><label class="generic-label">Resistance</label>
+            <li class="flexrow"><label class="generic-label">DMG RES Other Dice</label>
               <input type="text" class="padd-right" name="data.resistance" value="{{data.resistance}}" data-dtype="String"/>
             </li>
 
@@ -32,9 +32,13 @@
               <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
             </li>
             <li class="flexrow"><label class="generic-label">IDR</label>
-              <input type="text" class="padd-right" name="data.idr" value="{{data.idr}}" data-dtype="String"/>
+              <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+                {{#select data.idr}}
+                {{{optionsDiceList}}}
+                {{/select}}
+              </select> 
               </li>
-            <li class="flexrow"><label class="generic-label">Description</label>
+            <li class="flexrow"><label class="generic-label">Notes</label>
               <div class="small-editor item-text-long-line">
               {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
               </div>  

templates/item-equipment-sheet.html

@@ -28,9 +28,13 @@
             <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">IDR</label>
-            <input type="text" class="padd-right" name="data.idr" value="{{data.idr}}" data-dtype="String"/>
+            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+              {{#select data.idr}}
+              {{{optionsDiceList}}}
+              {{/select}}
+            </select> 
           </li>
-          <li class="flexrow"><label class="generic-label">Description</label>
+          <li class="flexrow"><label class="generic-label">Notes</label>
             <div class="small-editor item-text-long-line">
             {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
             </div>  

templates/item-perk-sheet.html

@@ -10,18 +10,46 @@
     <section class="sheet-body">
 
         <div class="tab" data-group="primary">
+          <ul>
+            <li class="flexrow"><label class="generic-label">Active ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="data.active" {{checked data.active}}/></label>
+            </li>
+            <li class="flexrow"><label class="generic-label">Level</label>
+              <input type="text" class="input-numeric-short padd-right" name="data.level" value="{{data.level}}" data-dtype="Number"/>
+            </li>
+            <li class="flexrow"><label class="generic-label">Number of use during activation</label>
+              <select class="competence-base flexrow" type="text" name="data.nbuse" value="{{data.nbuse}}" data-dtype="Number">
+                {{#select data.nbuse}}
+                <option value="unlimited">Unlimited</option>
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                {{/select}}
+              </select> 
+            </li>
+            <li class="flexrow"><label class="generic-label">Remaining round</label>
+              <select class="competence-base flexrow" type="text" name="data.roundcount" value="{{data.roundcount}}" data-dtype="Number">
+                {{#select data.roundcount}}
+                <option value="0">0</option>
+                <option value="1">1</option>
+                <option value="2">2</option>
+                <option value="3">3</option>
+                {{/select}}
+              </select> 
+            </li>
+          </ul>
           <label class="generic-label">Description</label>
           <div class="small-editor item-text-long-line">
           {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
           </div>
-          <label class="generic-label">Upgrades</label>
-          <div class="small-editor item-text-long-line">
-          {{editor content=data.upgrades target="data.upgrades" button=true owner=owner editable=editable}}
-          </div>
           <label class="generic-label">Rules</label>
           <div class="small-editor item-text-long-line">
           {{editor content=data.rules target="data.rules" button=true owner=owner editable=editable}}
           </div>
+          <label class="generic-label">Upgrades</label>
+          <div class="small-editor item-text-long-line">
+          {{editor content=data.upgrades target="data.upgrades" button=true owner=owner editable=editable}}
+          </div>
         </div>
 
     </section>

templates/item-power-sheet.html

@@ -14,6 +14,7 @@
             <li class="flexrow"><label class="generic-label">Roll Needed ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="data.rollneeded" {{checked data.rollneeded}}/></label>
             </li>
+            {{#if data.rollneeded}}
             <li class="flexrow"><label class="generic-label">Related Statistic (only if roll is needed)</label>
               <select class="competence-base flexrow" type="text" name="data.statistic" value="{{data.statistic}}" data-dtype="String">
                 {{#select data.statistic}}
@@ -21,10 +22,11 @@
                 {{/select}}
               </select> 
             </li>
-            <li class="flexrow"><label class="generic-label">Cost</label>
+            {{/if}}
+            <li class="flexrow"><label class="generic-label">NRG Cost</label>
               <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
             </li>
-            <li class="flexrow"><label class="generic-label">Cost Type</label>
+            <li class="flexrow"><label class="generic-label">NRG Spent</label>
               <select class="competence-base flexrow" type="text" name="data.costtype" value="{{data.costtype}}" data-dtype="String">
                 {{#select data.family}}
                 <option value="once">Once</option>
@@ -41,6 +43,8 @@
                 {{#select data.action}}
                 <option value="soft">Soft</option>
                 <option value="hard">Hard</option>
+                <option value="full">Full</option>
+                <option value="reactive">Reactive</option>
                 {{/select}}
               </select> 
             </li>
@@ -54,12 +58,17 @@
                 {{/select}}
               </select> 
             </li>
-            <li class="flexrow"><label class="generic-label">Effects</label>
+            <li class="flexrow"><label class="generic-label">Available Effects</label>
               <div class="small-editor item-text-long-line">
               {{editor content=data.effects target="data.effects" button=true owner=owner editable=editable}}
               </div>
             </li>
-          <
+            <li class="flexrow"><label class="generic-label">Purchased Effects</label>
+              <div class="small-editor item-text-long-line">
+              {{editor content=data.purchasedeffects target="data.purchasedeffects" button=true owner=owner editable=editable}}
+              </div>
+            </li>
+          </ul>
         </div>
 
     </section>

templates/item-race-sheet.html

@@ -10,6 +10,14 @@
     <section class="sheet-body">
 
         <div class="tab" data-group="primary">
+          <label class="generic-label">Statistics Enhancements</label>
+          <div class="small-editor item-text-long-line">
+          {{editor content=data.statistics target="data.statistics" button=true owner=owner editable=editable}}
+          </div>
+          <label class="generic-label">Abilities</label>
+          <div class="small-editor item-text-long-line">
+          {{editor content=data.abilities target="data.abilities" button=true owner=owner editable=editable}}
+          </div>
           <label class="generic-label">Description</label>
           <div class="small-editor item-text-long-line">
           {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
@@ -26,14 +34,6 @@
           <div class="small-editor item-text-long-line">
           {{editor content=data.outlook target="data.outlook" button=true owner=owner editable=editable}}
           </div>
-          <label class="generic-label">Abilities</label>
-          <div class="small-editor item-text-long-line">
-          {{editor content=data.abilities target="data.abilities" button=true owner=owner editable=editable}}
-          </div>
-          <label class="generic-label">Statistics</label>
-          <div class="small-editor item-text-long-line">
-          {{editor content=data.statistics target="data.statistics" button=true owner=owner editable=editable}}
-          </div>
         </div>
 
     </section>

templates/item-role-sheet.html

@@ -2,7 +2,9 @@
     <header class="sheet-header">
         <img class="profile-img" src="{{img}}" data-edit="img" title="{{name}}"/>
         <div class="header-fields">
-            <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+            <h1 class="charname">
+              <input name="name" type="text" value="{{name}}" placeholder="Name"/>
+            </h1>
         </div>
     </header>
 

templates/item-shield-sheet.html

@@ -34,9 +34,13 @@
               <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
             </li>
             <li class="flexrow"><label class="generic-label">IDR</label>
-              <input type="text" class="input-numeric-short padd-right" name="data.idr" value="{{data.idr}}" data-dtype="String"/>
+              <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+                {{#select data.idr}}
+                {{{optionsDiceList}}}
+                {{/select}}
+              </select> 
             </li>
-            <li class="flexrow"><label class="generic-label">Description</label>
+            <li class="flexrow"><label class="generic-label">Notes</label>
               <div class="small-editor item-text-long-line">
               {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
               </div>  

templates/item-weapon-sheet.html

@@ -19,7 +19,11 @@
             </select> 
           </li>
           <li class="flexrow"><label class="generic-label">Damage</label>
-            <input type="text" class="padd-right" name="data.damage" value="{{data.damage}}" data-dtype="String"/>
+            <select class="competence-base flexrow" type="text" name="data.damage" value="{{data.damage}}" data-dtype="String">
+              {{#select data.damage}}
+              {{{optionsDiceList}}}
+              {{/select}}
+            </select> 
           </li>
 
           <li class="flexrow"><label class="generic-label">Equipped ?</label>
@@ -32,9 +36,13 @@
             <input type="text" class="input-numeric-short padd-right" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
           </li>
           <li class="flexrow"><label class="generic-label">IDR</label>
-            <input type="text" class="padd-right" name="data.idr" value="{{data.idr}}" data-dtype="String"/>
+            <select class="competence-base flexrow" type="text" name="data.idr" value="{{data.idr}}" data-dtype="String">
+              {{#select data.idr}}
+              {{{optionsDiceList}}}
+              {{/select}}
+            </select> 
           </li>
-          <li class="flexrow"><label class="generic-label">Description</label>
+          <li class="flexrow"><label class="generic-label">Notes</label>
             <div class="small-editor item-text-long-line">
             {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
             </div>