Merge branch 'main' into develop

Author: HarmlessHarm

src/components/combat/Finished.vue

@@ -235,7 +235,7 @@ export default {
 			campaign: {},
 			patreon: true,
 			tab: "loot",
-			editableEncounter: { ...this.encounter, currency: {} },
+			editableEncounter: { currency: {}, ...this.encounter },
 		};
 	},
 	computed: {

src/mixins/difficulty.js

@@ -289,7 +289,7 @@ export const difficulty = {
 				multiplier = multiplier + 1 > 6 ? 6 : multiplier + 1;
 			}
 			//For groups larger than 6, you use 1 multiplier lower.
-			if(nPlayers > 6) {
+			if(nPlayers > 5) {
 				multiplier = multiplier - 1 < 0 ? 0 : multiplier - 1;
 			}