uberwald/l5rx-chiaroscuro
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	system/system.json
This commit is contained in:
Vlyan
2022-02-13 17:07:27 +01:00
parent f640949016 d06926e8f6
commit 92e5c780e6
4 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
system/scripts/combat.js
View File

@@ -142,14 +142,14 @@ export class CombatL5r5e extends Combat {
* @private
*/
_sortCombatants(a, b) {
// if tie, sort by honor, less honorable first
// if tie : sort by honor, less honorable first
if (a.initiative === b.initiative) {
// skip if armies
if (a.actor.data.type === "army" || b.actor.data.type === "army") {
// skip if no actor or if armies
if (!a.actor || !b.actor || a.actor.data.type === "army" || b.actor.data.type === "army") {
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) {
return (
CombatL5r5e._getWeightByActorType(a.actor.data) - CombatL5r5e._getWeightByActorType(b.actor.data)

1
system/scripts/gm/gm-monitor.js
View File

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