Merge pull request #445 from shadowfoundry/dev

v11.0.9
shadowfoundry · Oct 29, 2023 · e662696 · e662696
2 parents f74c72d + 5ea9f3b
commit e662696
Show file tree

Hide file tree

Showing 8 changed files with 71 additions and 56 deletions.
diff --git a/scripts/entities/actors/baseSheet.js b/scripts/entities/actors/baseSheet.js
@@ -654,6 +654,8 @@ export class ActorSheetSR5 extends ActorSheet {
 				setProperty(item, "system.wirelessTurnedOn", false);
 
 				// Handle drug taken
+				SR5_SystemHelpers.srLog(1, "Handle drug taken: " + drugType);
+
 				let alreadyTaken = actorData.addictions.find((d) => item.name === d.name);
 				let addiction = [];
 
@@ -672,12 +674,16 @@ export class ActorSheetSR5 extends ActorSheet {
 							actorData.addictions = actorData.addictions.concat(addiction);
 							actorData.addictions = Object.values(actorData.addictions);
 						}		
-						SR5_EntityHelpers.updateValue(actorData.addictions.shot);
-						SR5_EntityHelpers.updateValue(actorData.addictions.weekAddiction);
+
+						SR5_SystemHelpers.srLog(1, "actorData.addictions : " + JSON.stringify(actorData.addictions));
+						if (actorData.addictions.shot) SR5_EntityHelpers.updateValue(actorData.addictions.shot);
+						if (actorData.addictions.weekAddiction) SR5_EntityHelpers.updateValue(actorData.addictions.weekAddiction);		
 
 					// Check if the drug is set on systemEffect					
 					if (drugType) {
 
+						SR5_SystemHelpers.srLog(1, "Check drugType");
+
 						// Generate the drug stat
 						drug = await SR5_CharacterUtility.handleDrugShots(item, drugType, actorData);
 						itemData.handleShot = drug;
@@ -763,8 +769,8 @@ export class ActorSheetSR5 extends ActorSheet {
 						addiction = SR5_CharacterUtility.generateDrugAddiction(item);
 						actorData.addictions = actorData.addictions.concat(addiction);
 					}		
-					SR5_EntityHelpers.updateValue(actorData.addictions.shot);
-					SR5_EntityHelpers.updateValue(actorData.addictions.weekAddiction);		
+					if (actorData.addictions.shot) SR5_EntityHelpers.updateValue(actorData.addictions.shot);
+					if (actorData.addictions.weekAddiction) SR5_EntityHelpers.updateValue(actorData.addictions.weekAddiction);		
 				}
 
 			} else {

diff --git a/scripts/entities/actors/entityActor.js b/scripts/entities/actors/entityActor.js
@@ -212,6 +212,7 @@ export class SR5Actor extends Actor {
 					"prototypeToken.actorLink": actorLink,
 					"prototypeToken.bar1": {attribute: "statusBars.physical",},
 					"prototypeToken.bar2": {attribute: "statusBars.stun",},
+					"prototypeToken.texture.src": this.img,
 				});
 				break;
 			case "actorDrone":
@@ -220,6 +221,7 @@ export class SR5Actor extends Actor {
 					"prototypeToken.actorLink": actorLink,
 					"prototypeToken.bar1": {attribute: "statusBars.condition",},
 					"prototypeToken.bar2": {attribute: "statusBars.matrix",},
+					"prototypeToken.texture.src": this.img,
 				});
 				break;
 			case "actorDevice":
@@ -229,6 +231,7 @@ export class SR5Actor extends Actor {
 					"prototypeToken.lockRotation": true,
 					"prototypeToken.actorLink": actorLink,
 					"prototypeToken.bar2": {attribute: "statusBars.matrix",},
+					"prototypeToken.texture.src": this.img,
 				});
 				break;
 			default :

diff --git a/scripts/system/effectArea.js b/scripts/system/effectArea.js
@@ -23,6 +23,8 @@ export class SR5_EffectArea {
         let actor = SR5_EntityHelpers.getRealActorFromID(active.id);
         let passiveActor = SR5_EntityHelpers.getRealActorFromID(passive.id);
 
+        if(!actor || !passiveActor) return 
+
         let actorJammedEffect = actor.items.find(i => i.system.type === "signalJammed");
         let actorJamEffect = actor.items.find(i => i.system.type === "signalJam");
         let passiveJammedEffect = passiveActor.items.find(i => i.system.type === "signalJammed");

diff --git a/scripts/system/effectsList.js b/scripts/system/effectsList.js
diff --git a/system.json b/system.json
@@ -9,7 +9,7 @@
       "flags": {}
     }
   ],
-  "version": "11.0.8",
+  "version": "11.0.9",
   "compatibility": {
     "minimum": "11",
     "maximum": "11",

diff --git a/template.json b/template.json
@@ -4952,7 +4952,8 @@
         "hobby": "",
         "familySituation": "",
         "background": ""     
-      },
+      },      
+      "addictions": [],
       "activeSpecialAttribute": "magic",
       "skills": {
         "flight": {

diff --git a/templates/actors/_partials/left-tabs/qualities/addictions.html b/templates/actors/_partials/left-tabs/qualities/addictions.html
@@ -14,7 +14,7 @@
 
 		</li>
 		{{#each actor.system.addictions as |a i|}}
-        {{#if_ge shot.value 1}}
+        {{#if (and (gt shot.value 0) (ne addiction.type '') )}}
 		<li class="subItemManagement grid" data-key="{{@key}}">
 			<div class="col-5">
 				<p>{{name}} ({{findTranslation 'addictionTypesShort' addiction.type}})</p>
@@ -37,7 +37,7 @@
             <div class="col-1 SR-TextRight"><a class="subItem" data-title="{{localize 'SR5.Delete'}}" data-index="{{@key}}" data-binding="addictions" data-action="delete" data-helpTitle="{{localize 'SR5.HELP_DrugDelete' key=name}}"
             data-helpMessage="{{localize 'SR5.HELP_DrugDeleteMsg'}}"><i class="fas fa-trash"></i></a></div>
 		</li>
-        {{/if_ge}}
+        {{/if}}
 		{{/each}}
 	</ul>
 </div>
diff --git a/templates/actors/grunt-sheet.html b/templates/actors/grunt-sheet.html
@@ -61,6 +61,9 @@
 						<div class="tab" data-group="gauche" data-tab="tab-traits">
 							{{> systems/sr5/templates/actors/_partials/left-tabs/qualities/qualities.html}}
 							{{> systems/sr5/templates/actors/_partials/left-tabs/qualities/visions.html}}
+							{{#if system.addictions}}
+							{{> systems/sr5/templates/actors/_partials/left-tabs/qualities/addictions.html}}
+							{{/if}}
 						</div>
 					</section>
 				</div>