Astrologie !

module/controllers/bol-rolls.js

@@ -30,6 +30,19 @@ export class BoLRoll {
     return appEffects
   }
 
+  /* -------------------------------------------- */
+  static buildHoroscopeGroupList() {
+    let horoscopes = game.settings.get("bol", "horoscope-group")
+  let horoList = [ { id: -1, name: "Aucun", type: "malus", nbDice: 0 }]
+    for (let id in horoscopes) {
+      let horo = horoscopes[id]
+      for (let i=0; i<horo.availableDice; i++) {
+        horoList.push( { id: id, name: horo.name, type: horo.type, nbDice: i+1})
+      }
+    }
+    return horoList
+  }
+
   /* -------------------------------------------- */
   static getCommonRollData(actor, mode, attribute, aptitude = undefined) {
 
@@ -53,7 +66,8 @@ export class BoLRoll {
       mod: 0,
       modRanged: 0,
       aptValue: 0,
-      bolEffects: actor.boleffects
+      bolEffects: actor.boleffects,
+      horoscopeGroupList: this.buildHoroscopeGroupList()
     }
     if (aptitude) {
       rollData.aptitude = aptitude
@@ -94,7 +108,7 @@ export class BoLRoll {
   /* -------------------------------------------- */
   static async detectDistance(weapon, target) {
     let visible, dist
-    if (weapon.system.properties.ranged || weapon.system.properties.throwing) {
+    if (target && (weapon.system.properties.ranged || weapon.system.properties.throwing)) {
       console.log("target", target, weapon)
       visible = canvas.effects.visibility.testVisibility(target.center, { object: _token })
       dist = Number(canvas.grid.measureDistances([{ ray: new Ray(_token.center, target.center) }], { gridSpaces: false })).toFixed(2)
@@ -205,12 +219,17 @@ export class BoLRoll {
 
   /* -------------------------------------------- */
   static horoscopeCheck(actor, event, horoscopeType) {
+    let cost  = (horoscopeType == "minor") ? 1 : 2
+    if (cost > actor.getAstrologyPoints() ) {
+      ui.notifications.warn(game.i18n.localize("BOL.ui.astrologyNoPoints"))
+      return
+    }
     let rollData = this.getCommonRollData(actor, "horoscope", actor.system.attributes.mind)
 
     rollData.careerBonus = actor.getAstrologerBonus()
     rollData.horoscopeType = horoscopeType
     rollData.horoscopeTypeLabel = "BOL.ui."+horoscopeType
-    rollData.astrologyPointsCost = (horoscopeType == "minor") ? 1 : 2
+    rollData.astrologyPointsCost = cost
     rollData.label = game.i18n.localize('BOL.ui.makeHoroscope')
     rollData.description = game.i18n.localize('BOL.ui.makeHoroscope') + " " + game.i18n.localize(rollData.horoscopeTypeLabel)
 
@@ -276,7 +295,10 @@ export class BoLRoll {
     }
     this.rollData.bmDice += this.rollData.horoscopeBonus
     this.rollData.bmDice -= this.rollData.horoscopeMalus
-
+    if ( this.rollData.selectedGroupHoroscopeIndex && this.rollData.selectedGroupHoroscopeIndex > 0) {      
+      let horo = this.rollData.horoscopeGroupList[this.rollData.selectedGroupHoroscopeIndex]
+      this.rollData.bmDice += (horo.type == "malus") ? -horo.nbDice : horo.nbDice;
+    }
     // Keep track of the final effect modifier
     this.rollData.effectModifier = effectModifier
 
@@ -425,21 +447,29 @@ export class BoLRoll {
       this.updateTotalDice()
     })
     html.find('#horoscope-bonus-applied').change((event) => {
-      if (event.currentTarget.value != undefined) {
-        this.rollData.selectedHoroscope.push( duplicate(this.rollData.horoscopeBonusList[Number(event.currentTarget.value)]) )
-      }
+      this.rollData.selectedHoroscope = []
+      for (let option of event.currentTarget.selectedOptions) {
+        this.rollData.selectedHoroscope.push( duplicate(this.rollData.horoscopeBonusList[Number(option.index)]) )
+      }      
       let horoscopes = $('#horoscope-bonus-applied').val()
       this.rollData.horoscopeBonus = (!horoscopes || horoscopes.length == 0) ? 0 : horoscopes.length
       this.updateTotalDice()
     })
+
     html.find('#horoscope-malus-applied').change((event) => {
-      if (event.currentTarget.value != undefined) {
-        this.rollData.selectedHoroscope.push( duplicate(this.rollData.horoscopeMalusList[Number(event.currentTarget.value)]) )
-      }
+      this.rollData.selectedHoroscope = []
+      for (let option of event.currentTarget.selectedOptions) {
+        this.rollData.selectedHoroscope.push( duplicate(this.rollData.horoscopeBonusList[Number(option.index)]) )
+      }      
       let horoscopes = $('#horoscope-malus-applied').val()
       this.rollData.horoscopeMalus = (!horoscopes || horoscopes.length == 0) ? 0 : horoscopes.length
       this.updateTotalDice()
     })
+    html.find('#horoscope-group-applied').change((event) => {
+      this.rollData.selectedGroupHoroscopeIndex = event.currentTarget.value
+      this.updateTotalDice()
+    })
+    
 
   }
 
@@ -608,7 +638,6 @@ export class BoLDefaultRoll {
     if (this.rollData.reroll == undefined) {
       this.rollData.reroll = actor.heroReroll()
     }
-
     if (this.rollData.registerInit) {
       actor.registerInit(this.rollData)
       this.rollData.initiativeRank = actor.getInitiativeRank(this.rollData)
@@ -616,20 +645,25 @@ export class BoLDefaultRoll {
     if (this.rollData.isSuccess && this.rollData.mode == "spell") { // PP cost management
       this.rollData.remainingPP = actor.spendPowerPoint(this.rollData.ppCost + this.rollData.ppCostArmor)
     }
+
     if (this.rollData.mode == "alchemy") { // PP cost management
       actor.resetAlchemyStatus(this.rollData.alchemy._id)
     }
     if (this.rollData.mode == "bougette" && this.rollData.isFailure) {
       actor.decBougette()
     }
+
+    await this.sendChatMessage()
+
     if (this.rollData.mode == "horoscope") { // PP cost management
       actor.manageHoroscope(this.rollData)
     }
     if (this.rollData.selectedHoroscope.length > 0) { // PP cost management
       actor.removeHoroscopeMinor(this.rollData)
     }
-
-    await this.sendChatMessage()
+    if (this.rollData.selectedGroupHoroscopeIndex && this.rollData.selectedGroupHoroscopeIndex > 0) { // PP cost management
+      BoLUtility.removeGroupHoroscope(this.rollData)
+    }
   }
 
   /* -------------------------------------------- */