Fix extended test roll mode and reload test skill

close #2284
close #2596

Author: moo-man

src/documents/actor.js

@@ -244,9 +244,8 @@ export default class ActorWFRP4e extends WarhammerActor
       return ui.notifications.error(game.i18n.localize("ExtendedError1"))
 
     context.extended = item.uuid;
-    context.rollMode = defaultRollMode;
     context.hitLocation = false;
-    context.fields = {difficulty : item.system.difficulty.value || "challenging"}
+    context.fields = {difficulty : item.system.difficulty.value || "challenging", rollMode : context.fields?.rollMode || defaultRollMode}
 
     let characteristic = warhammer.utility.findKey(item.test.value, game.wfrp4e.config.characteristics)
     if (characteristic) {
@@ -272,7 +271,7 @@ export default class ActorWFRP4e extends WarhammerActor
     if (!extendedTest) {
 
       //ui.notifications.error(game.i18n.localize("ITEM.ReloadError"))
-      await this.checkReloadExtendedTest(weapon, this.actor);
+      await this.checkReloadExtendedTest(weapon, this);
       return
     }
     await this.setupExtendedTest(extendedTest, { reload: true, weapon, appendTitle: " - " + game.i18n.localize("ITEM.Reloading") }, options);