Merge branch 'main' of https://github.com/EndlesNights/dnd4eBeta into…

… dev

module/helper.js

@@ -251,13 +251,12 @@ export class Helper {
 						case "implement":
 							if(weaponInnerData) {
 								if(weaponInnerData.proficientI) suitableKeywords.push('proficient');
-								break;
 							}
+							break;
 						case "any":
 							if(weaponInnerData) {
 								 if(weaponInnerData.WeaponType === "implement") {
 									if(weaponInnerData.proficientI) suitableKeywords.push('proficient');
-									break;
 								}
 							}	
 						default:
@@ -336,12 +335,14 @@ export class Helper {
 
 				if(powerInnerData.attack?.isBasic){
 					suitableKeywords.push("basic");
+					if(suitableKeywords.includes("melee")) suitableKeywords.push("mBasic");
+					if(suitableKeywords.includes("ranged")) suitableKeywords.push("rBasic");
 				}
 
 				if (debug) {
-					console.log(`${debug} based on power source, effect type, damage type and (if weapon) weapon group, properties and damage type the following effect keys are suitable`)
-					suitableKeywords.sort()
-					console.log(`${debug} ${suitableKeywords.join(", ")}`)
+					console.log(`${debug} based on power source, effect type, damage type and (if weapon) weapon group, properties and damage type the following effect keys are suitable`);
+					console.log(suitableKeywords.sort());
+					console.log(`${debug} ${suitableKeywords.join(", ")}`);
 				}
 
 				// filter out to just the relevant effects by keyword
@@ -1835,4 +1836,4 @@ export function getHumanReadableAttributeLabel(attr, { actor }={}) {
 	}
 
 	return label;
-}
+}

packs/manual/CURRENT

@@ -1 +1 @@
-MANIFEST-000517
+MANIFEST-000521

packs/manual/LOG

@@ -1,3 +1,3 @@
-2024/12/02-23:27:58.058 34c8 Recovering log #515
-2024/12/02-23:27:58.064 34c8 Delete type=0 #515
-2024/12/02-23:27:58.064 34c8 Delete type=3 #513
+2024/12/06-13:58:28.040 a18 Recovering log #520
+2024/12/06-13:58:28.154 a18 Delete type=0 #520
+2024/12/06-13:58:28.154 a18 Delete type=3 #519

packs/manual/LOG.old

@@ -1,7 +1,3 @@
-2024/12/02-23:27:33.505 d10 Recovering log #510
-2024/12/02-23:27:33.511 d10 Delete type=0 #510
-2024/12/02-23:27:33.511 d10 Delete type=3 #508
-2024/12/02-23:27:51.492 6c18 Level-0 table #516: started
-2024/12/02-23:27:51.492 6c18 Level-0 table #516: 0 bytes OK
-2024/12/02-23:27:51.493 6c18 Delete type=0 #514
-2024/12/02-23:27:51.494 6c18 Manual compaction at level-0 from '!journal!PuJCVdkeDHbyFpeT' @ 72057594037927935 : 1 .. '!journal.pages!pSOFSTYYchdZ0rZB.4DbUYT9a4DdmUAaw' @ 0 : 0; will stop at (end)
+2024/12/06-12:34:03.189 455c Recovering log #518
+2024/12/06-12:34:03.278 455c Delete type=0 #518
+2024/12/06-12:34:03.278 455c Delete type=3 #517