Merge pull request #414 from shadowfoundry/dev

v11.0.1
shadowfoundry · Jul 31, 2023 · d1b8e7b · d1b8e7b
2 parents 35b59df + 9e6a4f4
commit d1b8e7b
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 58 deletions.
diff --git a/scripts/entities/actors/entityActor.js b/scripts/entities/actors/entityActor.js
@@ -70,6 +70,7 @@ export class SR5Actor extends Actor {
 
 		// Initialize empty items
 		data.items = [];
+		data.effects = []
 
 		// Handle special create method
 		let dialogData = {lists: SR5_EntityHelpers.sortTranslations(SR5),};
@@ -151,6 +152,11 @@ export class SR5Actor extends Actor {
 					"type": "baseDevice",
 				}
 				data.items.push(baseItems);
+				let effect = await _getSRStatusEffect("matrixInit");
+				let initiativeEffect = new CONFIG.ActiveEffect.documentClass(effect);
+				const effects = data.effects.map(e => e.toObject());
+				effects.push(initiativeEffect.toObject());
+				mergeObject(data, {"effects": effects });
 				super.create(data, options);
 				break;
 			case "actorGrunt":
@@ -218,17 +224,12 @@ export class SR5Actor extends Actor {
 				break;
 			case "actorDevice":
 			case "actorSprite":
-			case "actorAgent":
+			case "actorAgent": 
 				mergeObject(createData, {
 					"prototypeToken.lockRotation": true,
 					"prototypeToken.actorLink": actorLink,
 					"prototypeToken.bar2": {attribute: "statusBars.matrix",},
 				});
-				let effect = await _getSRStatusEffect("matrixInit");
-				let initiativeEffect = new CONFIG.ActiveEffect.documentClass(effect);
-				const effects = this.effects.map(e => e.toObject());
-				effects.push(initiativeEffect.toObject());
-				mergeObject(createData, {"effects": effects });
 				break;
 			default :
 				SR5_SystemHelpers.srLog(1, `Unknown '${this.type}' type in 'base _preCreate()'`);
@@ -662,6 +663,7 @@ export class SR5Actor extends Actor {
 					} else if (actor.type === "actorDevice"){
 						SR5_CharacterUtility.generateDeviceMatrix(actor, iData);
 						SR5_CharacterUtility.generateMatrixResistances(actor, i);
+						SR5_CharacterUtility.generateDeviceMatrixActions(actor);
 						SR5_CharacterUtility.generateMatrixActionsDefenses(actor);
 						if (actorData.matrix.deviceType === "ice") SR5_CharacterUtility.updateInitiativeMatrix(actor);
 					} else if (actor.type === "actorSprite"){

diff --git a/scripts/entities/actors/utilityActor.js b/scripts/entities/actors/utilityActor.js
@@ -3649,6 +3649,33 @@ export class SR5_CharacterUtility extends Actor {
 		}
 	}
 
+	static generateDeviceMatrixActions(actor){
+		let actorData = actor.system, matrix = actorData.matrix, matrixAttributes = matrix.attributes, matrixActions = matrix.actions;
+
+		for (let key of Object.keys(SR5.matrixActions)) {
+			if (matrixActions[key].test !== undefined) {
+				SR5_EntityHelpers.updateModifier(matrixActions[key].test, game.i18n.localize('SR5.DeviceRating'), "linkedAttribute", matrix.deviceRating);
+				SR5_EntityHelpers.updateModifier(matrixActions[key].test, game.i18n.localize('SR5.DeviceRating'), "linkedAttribute", matrix.deviceRating);
+				// test
+				if (matrix.runningSilent) {
+					SR5_EntityHelpers.updateModifier(matrixActions[key].test, game.i18n.localize('SR5.RunningSilent'), "silentMode", -2);
+				}
+				if (matrix.userMode === "hotsim") {
+					SR5_EntityHelpers.updateModifier(matrixActions[key].test, game.i18n.localize('SR5.VirtualRealityHotSimShort'), "matrixUserMode", 2);
+				}
+				if (matrixActions[key].specialization){
+					SR5_EntityHelpers.updateModifier(matrixActions[key].test, `${game.i18n.localize('SR5.Specialization')}`, "specialization", 2, false, true);
+				}
+				SR5_EntityHelpers.updateDicePool(matrixActions[key].test, 0);
+				// limits
+				let linkedAttribute = matrixActions[key].limit.linkedAttribute;
+				matrixActions[key].limit.base = 0;
+				SR5_EntityHelpers.updateModifier(matrixActions[key].limit, game.i18n.localize(SR5.matrixAttributes[linkedAttribute]), "linkedAttribute", matrixAttributes[linkedAttribute].value);
+				SR5_EntityHelpers.updateValue(matrixActions[key].limit, 0);
+			}
+		}
+	}
+
 	static generateMatrixActionsDefenses(actor) {
 		let actorData = actor.system, matrix = actorData.matrix, matrixAttributes = matrix.attributes, matrixActions = matrix.actions;
 		let intuitionValue, willpowerValue, logicValue, firewallValue, sleazeValue, dataProcessingValue, attackValue;
@@ -4147,7 +4174,7 @@ export class SR5_CharacterUtility extends Actor {
 
 	static async updateMatrixEffect(actor){
 		let status, isStatusEffectOn, statusEffects = [];
-		isStatusEffectOn = actor.effects.find(e => e.flags.core?.statusId === "matrixInit");
+		isStatusEffectOn = actor.effects.find(e => e.statuses.has("matrixInit"));
 		if (!actor.system.isDirectlyConnected) {
 			if (!isStatusEffectOn){				
 				status = await _getSRStatusEffect("matrixInit");

diff --git a/scripts/rolls/roll-test.js b/scripts/rolls/roll-test.js
@@ -364,8 +364,6 @@ export class SR5_RollTest {
 			borderColor: userActive.color,
 		};
 
-		console.log(chatData.flags.sr5data);
-
 		//Handle Dice so Nice
 		if (cardData.roll.originalRoll) await SR5_RollTest.showDiceSoNice(cardData.roll.originalRoll, cardData.roll.rollMode);