Bugfix : Bt in xp tab, Gm monitor render and combat with null

This commit is contained in:
Vlyan
2022-02-11 14:26:17 +01:00
parent 01d14dc580
commit 3dfee20484
4 changed files with 11 additions and 5 deletions

View File

@@ -1,5 +1,10 @@
# Changelog # Changelog
## 1.6.1 - Bugfix
- PC sheet : fixed the "Complete this rank" button who stayed hidden in experience tab.
- GmMonitor : fixed a bug with render when the list was emptied.
- Combat : fixed a null error when sometimes the combatant actor is null.
## 1.6.0 - QoL & SoftLock ## 1.6.0 - QoL & SoftLock
- PC/NPC/Armies sheet: - PC/NPC/Armies sheet:
- Added SoftLock functionality. - Added SoftLock functionality.

View File

@@ -142,14 +142,14 @@ export class CombatL5r5e extends Combat {
* @private * @private
*/ */
_sortCombatants(a, b) { _sortCombatants(a, b) {
// if tie, sort by honor, less honorable first // if tie : sort by honor, less honorable first
if (a.initiative === b.initiative) { if (a.initiative === b.initiative) {
// skip if armies // skip if no actor or if armies
if (a.actor.data.type === "army" || b.actor.data.type === "army") { if (!a.actor || !b.actor || a.actor.data.type === "army" || b.actor.data.type === "army") {
return 0; return 0;
} }
// if tie, Character > Adversary > Minion // if tie again : Character > Adversary > Minion
if (a.actor.data.data.social.honor === b.actor.data.data.social.honor) { if (a.actor.data.data.social.honor === b.actor.data.data.social.honor) {
return ( return (
CombatL5r5e._getWeightByActorType(a.actor.data) - CombatL5r5e._getWeightByActorType(b.actor.data) CombatL5r5e._getWeightByActorType(a.actor.data) - CombatL5r5e._getWeightByActorType(b.actor.data)

View File

@@ -330,6 +330,7 @@ export class GmMonitor extends FormApplication {
} }
if (!foundry.utils.isObjectEmpty(updateData)) { if (!foundry.utils.isObjectEmpty(updateData)) {
await actor.update(updateData); await actor.update(updateData);
this.render(false);
} }
} }

View File

@@ -55,7 +55,7 @@
<th>{{localize 'l5r5e.advancements.total_xp_curriculum'}} : {{rankObject.spent.curriculum}}{{#if rankObject.goal}} / {{rankObject.goal}}{{/if}}</th> <th>{{localize 'l5r5e.advancements.total_xp_curriculum'}} : {{rankObject.spent.curriculum}}{{#if rankObject.goal}} / {{rankObject.goal}}{{/if}}</th>
<th>{{localize 'l5r5e.advancements.total_xp_spent'}} : {{rankObject.spent.total}}</th> <th>{{localize 'l5r5e.advancements.total_xp_spent'}} : {{rankObject.spent.total}}</th>
</tr> </tr>
{{#if data.editable_not_soft_locked}} {{#if ../data.editable_not_soft_locked}}
{{#ifCond ../data.data.identity.school_rank '<' 6}} {{#ifCond ../data.data.identity.school_rank '<' 6}}
{{#ifCond (ifCond ../data.data.identity.school_rank '==' rankObject.rank) '&&' (ifCond rankObject.spent.curriculum '>=' rankObject.goal)}} {{#ifCond (ifCond ../data.data.identity.school_rank '==' rankObject.rank) '&&' (ifCond rankObject.spent.curriculum '>=' rankObject.goal)}}
<tr class="tfoot flexrow row tab" data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}"> <tr class="tfoot flexrow row tab" data-group="advancements" data-tab="advancement_rank_{{rankObject.rank}}">