From 62e8febe220a8c3f397ca8a4b97f4cae0bd1afa7 Mon Sep 17 00:00:00 2001 From: Jiboux <72362918+Jiboux@users.noreply.github.com> Date: Sat, 14 Jan 2023 17:21:47 -0500 Subject: [PATCH] Add files via upload --- Earthdawn (FASA Official)/Earthdawn.html | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Earthdawn (FASA Official)/Earthdawn.html b/Earthdawn (FASA Official)/Earthdawn.html index 7a0831c614..8b08880d26 100644 --- a/Earthdawn (FASA Official)/Earthdawn.html +++ b/Earthdawn (FASA Official)/Earthdawn.html @@ -18038,8 +18038,7 @@ var AutoFill = function fnAutoFill(eventInfo,trigger,nm,data,comp_data) { //if(tname && tname.toLowerCase().includes("thread")) log("FillEntry "+tname+ "no match in compendium" ) - - //log("Earthdawn - FillEntryData " + eventInfo+ " trigger " + trigger + " tf " + tname);// + " data "+ JSON.stringify(entry) ); + //log("Earthdawn - FillEntryData " + eventInfo+ " trigger " + trigger + " tf " + tname + " data "+ JSON.stringify(entry) ); //log("Earthdawn - FillEntryData "+ " tf " + tname);// + " data "+ JSON.stringify(entry) ); @@ -18163,13 +18162,13 @@ var AutoFill = function fnAutoFill(eventInfo,trigger,nm,data,comp_data) { case "SDh" : case "SDhp1p" : case "SD-Nat" : - case "SD1: @{target|Target|token_id}" : singleAttr("{{target_name=@{target|Target|token_name}}} {{target_number=[[@{target|Target|SD}]]}} {{target_defense=SD}}"); break; + case "SD1: @{target|Target|token_id}" : singleAttr("Target-NoAPI","{{target_name=@{target|Target|token_name}}} {{target_number=[[@{target|Target|SD}]]}} {{target_defense=SD}}"); break; //ASK case "Ask: ?{Target Number|0}" : case "Ask: PD: ?{Target Number, maybe relative to PD|0}" : case "Ask: MD: ?{Target Number, maybe relative to MD|0}" : case "Ask: SD: ?{Target Number, maybe relative to SD|0}" : - case "Riposte: @{target|Counter-attack Target|token_id}: PD: ?{Target Number, maybe relative to PD|0}" : singleAttr("{{target_number=?{Target Number|0}}}"); break; + case "Riposte: @{target|Counter-attack Target|token_id}: PD: ?{Target Number, maybe relative to PD|0}" : singleAttr("Target-NoAPI","{{target_number=?{Target Number|0}}}"); break; //None case "None" : case "2" : @@ -18348,6 +18347,8 @@ var AutoFill = function fnAutoFill(eventInfo,trigger,nm,data,comp_data) { case "Heavy" : singleAttr("CloseCombat","-4"); break; default : singleAttr("CloseCombat","-1"); } + //log("values " + JSON.stringify(vals)); + setAttrsLog( vals,null,function(){ if(["T","SK","WPN","NAC"].indexOf(code)!==-1) repRanks( rowid,code); @@ -20795,7 +20796,7 @@ var getCompendiumQuery2 = function fngetCompendiumQuery2(q,comp_data,cb) { try{ if(!comp_data) getCompendiumQuery(q,cb); else{ - log("gcq2 " + q + " data "+ JSON.stringify(comp_data)); + //log("gcq2 " + q + " data "+ JSON.stringify(comp_data)); let results=[]; let fnd=q.match(/Name\:\s*(.*)\s*/i); if(fnd && fnd[1])