From 39c0e8c30a8f69ee4a254a17e37e4d2f9d795025 Mon Sep 17 00:00:00 2001
From: sladecraven <sylvain@lahiette.com>
Date: Sat, 30 Jul 2022 23:29:55 +0200
Subject: [PATCH] Add new compendiums

---
 modules/crucible-actor.js          | 30 ++++++++++++++++++++++++++++--
 modules/crucible-roll-dialog.js    |  4 ++++
 modules/crucible-utility.js        | 17 ++++++++++++++++-
 templates/partial-roll-select.html |  5 +++++
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/modules/crucible-actor.js b/modules/crucible-actor.js
index 1b4e405..bc86f2a 100644
--- a/modules/crucible-actor.js
+++ b/modules/crucible-actor.js
@@ -380,6 +380,31 @@ export class CrucibleActor extends Actor {
     }
   }
 
+  /* -------------------------------------------- */
+  async incrementSkillExp(skillId, inc) {
+    let skill = this.data.items.get(skillId)
+    if (skill) {
+      await this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'data.exp': skill.data.data.exp + inc }])
+      let chatData = {
+        user: game.user.id,
+        rollMode: game.settings.get("core", "rollMode"),
+        whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
+        content: `<div>${this.name} has gained 1 exp in the skill ${skill.name} (exp = ${skill.data.data.exp}}</div`
+      }
+      ChatMessage.create(chatData)
+      if (skill.data.data.exp >= 25) {
+        await this.updateEmbeddedDocuments('Item', [{ _id: skill.id, 'data.exp': 0, 'data.level': skill.data.data.level + 1 }])
+        let chatData = {
+          user: game.user.id,
+          rollMode: game.settings.get("core", "rollMode"),
+          whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
+          content: `<div>${this.name} has gained 1 SL in the skill ${skill.name} (new SL :  ${skill.data.data.level} ) !</div`
+        }
+        ChatMessage.create(chatData)
+      }
+    }
+  }
+
   /* -------------------------------------------- */
   async incDecQuantity(objetId, incDec = 0) {
     let objetQ = this.data.items.get(objetId)
@@ -411,8 +436,9 @@ export class CrucibleActor extends Actor {
     rollData.featsDie = this.getFeatsWithDie()
     rollData.featsSL = this.getFeatsWithSL()
     rollData.featDieName = "none"
-    rollData.featSLName  = "none"
-    
+    rollData.featSLName = "none"
+    rollData.rollAdvantage = false
+
     if (abilityKey) {
       rollData.ability = this.getAbility(abilityKey)
       //rollData.skillList = this.getRelevantSkill(abilityKey)
diff --git a/modules/crucible-roll-dialog.js b/modules/crucible-roll-dialog.js
index 35af3fc..743089d 100644
--- a/modules/crucible-roll-dialog.js
+++ b/modules/crucible-roll-dialog.js
@@ -70,6 +70,10 @@ export class CrucibleRollDialog extends Dialog {
       this.rollData.advantage = "disadvantage"
       this.refreshDialog()
     })
+    html.find('#roll-with-advantage-clicked').change((event) => {
+      this.rollData.rollAdvantage = !this.rollData.rollAdvantage
+      this.refreshDialog()
+    })
     html.find('#featDieName').change((event) => {
       this.rollData.featDieName = event.currentTarget.value
     })
diff --git a/modules/crucible-utility.js b/modules/crucible-utility.js
index 39ad458..1c49192 100644
--- a/modules/crucible-utility.js
+++ b/modules/crucible-utility.js
@@ -287,9 +287,24 @@ export class CrucibleUtility {
     if (!myRoll) { // New rolls only of no rerolls
       myRoll = new Roll(diceFormula).roll({ async: false })
       await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
-      rollData.roll = myRoll
     }
+    rollData.roll = myRoll
     rollData.nbSuccess = myRoll.total
+    if (rollData.rollAdvantage) {
+      let myRoll2 = new Roll(diceFormula).roll({ async: false })
+      await this.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
+      if ( myRoll2.total > rollData.nbSuccess) {
+        rollData.roll = myRoll2
+        rollData.nbSuccess = myRoll2.total
+      }
+    }
+    // Manage exp
+    if (rollData.skill) {
+      let nbSkillSuccess = rollData.roll.terms[2].total
+      if ( nbSkillSuccess == 0 || nbSkillSuccess == rollData.skill.data.level) {
+        actor.incrementSkillExp(rollData.skill._id, 1)
+      }
+    }
 
     this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-crucible-rpg/templates/chat-generic-result.html`, rollData)
diff --git a/templates/partial-roll-select.html b/templates/partial-roll-select.html
index 8648242..3995a84 100644
--- a/templates/partial-roll-select.html
+++ b/templates/partial-roll-select.html
@@ -15,5 +15,10 @@
         <input type="checkbox" id="disadvantage-clicked" class="disadvantage-clicked" {{#if (eq advantage "disadvantage")}} checked {{/if}} /></label>
         <label class="generic-label">Disadvantage ?</label>
     </li>
+    <li class="flex-group-left">
+      <label class="ability-value checkbox">
+        <input type="checkbox" id="roll-with-advantage-clicked" class="roll-with-advantage-clicked" {{#if rollAdvantage}} checked {{/if}} /></label>
+        <label class="generic-label">Roll With Advantage ?</label>
+    </li>
 </ul>