diff --git a/Conan_2d20_Adventures_In_An_Age_Undreamed_Of/ConanAPI.js b/Conan_2d20_Adventures_In_An_Age_Undreamed_Of/ConanAPI.js index 4b1918f522..cc13e602ad 100644 --- a/Conan_2d20_Adventures_In_An_Age_Undreamed_Of/ConanAPI.js +++ b/Conan_2d20_Adventures_In_An_Age_Undreamed_Of/ConanAPI.js @@ -319,7 +319,7 @@ var ConanAPI = ConanAPI || (function() let expertise = findInArray(a,"expertise",0); let skilled_roll_index = findInArray(a,"successes1",0); let unskilled_roll_index = findInArray(a,"successes2",0); - let num_dice_index = findInArray(a,"num_dice",0); + let show_tn = findInArray(aclone,"show_tn",0); //get these actual roll values from the converted clone let expertise_chk = findInArray(aclone,"expertise_chk",0); @@ -328,9 +328,8 @@ var ConanAPI = ConanAPI || (function() let encumbered_chk = findInArray(aclone,"encumbered",0); let num_dice = findInArray(aclone,"num_dice",0); let target_number = findInArray(aclone,"target_number",0); - let show_tn = findInArray(aclone,"show_tn",0); - let bk_nbr = findInArray(aclone,"bk_nbr",0); - let api_chk = findInArray(aclone,"api_chk",0); + let bk_nbr = findInArray(aclone,"bk_nbr",3); + let api_chk = findInArray(aclone,"api_chk",1); let fail_count = libInline.getDice(msg.inlinerolls[0], 'fumble').length; let crit_count = libInline.getDice(msg.inlinerolls[0], 'crit').length; @@ -345,13 +344,17 @@ var ConanAPI = ConanAPI || (function() total_successes += crit_count; - let roll_msg = ""; + let roll_msg = "&{template:skillapi} {{skill_name="+skill_name+"}} {{character_name="+character_name+"}} {{successes1="+libInline.getRollTip(msg.inlinerolls[skilled_roll_index])+"}}{{successes2="+libInline.getRollTip(msg.inlinerolls[unskilled_roll_index])+"}}{{num_dice="+num_dice+"}} {{target_number="+target_number+"}}{{expertise_chk=[["+expertise_chk+"]]}}{{expertise="+expertise+"}}{{crit_chk=[["+crit_count+"]]}}{{fail_chk=[["+fail_count+"]]}}{{crit_count="+crit_count+"}}{{fail_count="+fail_count+"}}{{total_successes="+total_successes+"}}{{api_chk=[[1]]}}{{bk_nbr=[["+bk_nbr+"]]}}"; + + if (show_tn > 0) + roll_msg += "{{show_tn="+show_tn+"}}"; + if (trauma_chk > -1) //tramuma based roll - roll_msg = "&{template:skillapi} {{skill_name="+skill_name+"}} {{character_name="+character_name+"}} {{successes1="+libInline.getRollTip(msg.inlinerolls[skilled_roll_index])+"}} {{successes2="+libInline.getRollTip(msg.inlinerolls[unskilled_roll_index])+"}}{{num_dice="+num_dice+"}} {{target_number="+target_number+"}}{{trauma_chk=[["+trauma_chk+"]]}}{{trauma="+trauma+"}}{{trauma_treated="+trauma_treated+"}}{{expertise_chk=[["+expertise_chk+"]]}}{{expertise="+expertise+"}}{{crit_chk=[["+crit_count+"]]}}{{fail_chk=[["+fail_count+"]]}}{{crit_count="+crit_count+"}}{{fail_count="+fail_count+"}}{{total_successes="+total_successes+"}}{{show_tn=[["+show_tn+"]]}}{{api_chk=[[1]]}}{{bk_nbr=[["+bk_nbr+"]]}}"; + roll_msg += "{{trauma_chk=[["+trauma_chk+"]]}}{{trauma="+trauma+"}}{{trauma_treated="+trauma_treated+"}}"; else //physcical based roll - roll_msg = "&{template:skillapi} {{skill_name="+skill_name+"}} {{character_name="+character_name+"}} {{successes1="+libInline.getRollTip(msg.inlinerolls[skilled_roll_index])+"}} {{successes2="+libInline.getRollTip(msg.inlinerolls[unskilled_roll_index])+"}}{{num_dice="+num_dice+"}} {{target_number="+target_number+"}}{{wounds_chk=[["+wounds_chk+"]]}}{{wounds="+wounds+"}}{{wounds_treated="+wounds_treated+"}}{{expertise_chk=[["+expertise_chk+"]]}}{{expertise="+expertise+"}}{{encumbered=[["+encumbered_chk+"]]}}{{crit_chk=[["+crit_count+"]]}}{{fail_chk=[["+fail_count+"]]}}{{crit_count="+crit_count+"}}{{fail_count="+fail_count+"}}{{total_successes="+total_successes+"}}{{show_tn=[["+show_tn+"]]}}{{api_chk=[[1]]}}{{bk_nbr=[["+bk_nbr+"]]}}"; + roll_msg += "{{wounds_chk=[["+wounds_chk+"]]}}{{wounds="+wounds+"}}{{wounds_treated="+wounds_treated+"}}{{encumbered=[["+encumbered_chk+"]]}}"; if (api_chk > 0) //only sending to skillapi template if chk value greater than zero sendChat(msg.who, roll_msg); diff --git a/Conan_2d20_Adventures_In_An_Age_Undreamed_Of/Conan_Undreamed.html b/Conan_2d20_Adventures_In_An_Age_Undreamed_Of/Conan_Undreamed.html index c008f8d368..964e61ec3a 100644 --- a/Conan_2d20_Adventures_In_An_Age_Undreamed_Of/Conan_Undreamed.html +++ b/Conan_2d20_Adventures_In_An_Age_Undreamed_Of/Conan_Undreamed.html @@ -1,15 +1,30 @@
+ + + + + + + + + + + + + + +
- - +
- +
@@ -22,52 +37,51 @@
-
Primary Attacks
+
Primary Attacks
-
BONUS DAMAGE
+
BONUS DAMAGE
-
Ranged
- -
Melee
- -
Threaten
- +
Ranged
+ +
Melee
+ +
Threaten
+
-
Weapon Name
+
Weapon Name
-
- DMG: +
DMG:
-
Type
-
Range/Reach
-
Size
-
Damage
-
Loads
+
Type
+
Range/Reach
+
Size
+
Damage
+
Loads
- + + + + + + + -
Qualities
+
Qualities
@@ -77,15 +91,15 @@
-
Stress & Harms
+
Stress & Harms
-
PHYSICAL
+
PHYSICAL
- Vigor + Vigor
@@ -216,17 +230,17 @@
-
COURAGE
+
COURAGE
-
Armour Soak
+
Armour Soak
- +
@@ -239,27 +253,27 @@
- Wounds + Wounds
@@ -289,21 +303,21 @@
- +
- +
- Treated: + Treated:
- Fatigue: + Fatigue: @@ -312,17 +326,17 @@
3-5
- +
6-8
-
MENTAL
+
MENTAL
- Resolve + Resolve
@@ -457,26 +471,26 @@
9-14
@@ -484,26 +498,26 @@
@@ -512,26 +526,26 @@
@@ -539,10 +553,10 @@
- +
- +
@@ -556,33 +570,33 @@
- Trauma + Trauma
@@ -607,16 +621,16 @@
-
Armour Qualities
+
Armour Qualities
- Treated: + Treated:
- Despair: + Despair: @@ -631,28 +645,28 @@
-
Belongings
+
Belongings
-
GOLD
+
GOLD
-
UPKEEP
+
UPKEEP
- +
-
Name/Type
-
Location
-
Weight
-
Condition
-
Value
-
Equip
+
Name/Type
+
Location
+
Weight
+
Condition
+
Value
+
Equip
@@ -661,95 +675,95 @@
-
Description
+
Description
-
Total Worth: 0
-
Total Encumbrance: +
Total Worth: 0
+
Total Encumbrance: 0
-

You are encumbered!

- Your encumbrance limit is your Brawn x 2 +

You are encumbered!

+ Your encumbrance limit is your Brawn x 2
-
NPC / Companions
+
NPC / Companions
-
Name
+
Name
- DMG: + DMG:
-
Agility
-
Awareness
-
Brawn
-
Coord.
-
Intell.
-
Person.
-
Willpower
+
Agility
+
Awareness
+
Brawn
+
Coord.
+
Intell.
+
Person.
+
Willpower
-
Skills/Details
+
Skills/Details
@@ -769,29 +783,29 @@ Name --> - Gender   + Gender   - Age   + Age   - Homeland   + Homeland   - Caste   + Caste   - Trait   + Trait   - Archetype   + Archetype   - Nature   + Nature   - Education   + Education   - Appearance   + Appearance   - Personality   + Personality   - Languages   + Languages   - War Story   + War Story  
@@ -806,14 +820,14 @@
- FORTUNE POINTS + FORTUNE POINTS
-
RENOWN
-
STANDING
+
RENOWN
+
STANDING
- XP TOTAL / SPENT / AVAIL. - + XP TOTAL / SPENT / AVAIL. +
@@ -827,64 +841,64 @@
-
Talents
+
Talents
-
Base
+
Base
-
Name
+
Name
-
Rank
+
Rank
-
Skill
+
Skill
@@ -892,7 +906,7 @@ value='&{template:talent} {{title=@{character_name} uses a Talent}} {{subtitle1=@{talent_name}}} {{base=@{talent_base}}} {{skill=@{talent_skill}}} {{rank=@{talent_rank}}} {{effects=@{talent_qualities}}} {{grid=1}}'>
-
Effect
+
Effect
@@ -907,10 +921,10 @@
-
Attributes & Skills
+
Attributes & Skills
-
AGILITY
+
AGILITY
@@ -923,14 +937,14 @@ -->
-
Skill
-
Exp
-
Foc
-
TN
+
Skill
+
Exp
+
Foc
+
TN
 
-
Acrobatics
+
Acrobatics
@@ -941,7 +955,7 @@
-
Melee
+
Melee
@@ -952,7 +966,7 @@
-
Stealth
+
Stealth
@@ -964,7 +978,7 @@
- AWARENESS + AWARENESS
@@ -976,14 +990,14 @@ -->
-
Skill
-
Exp
-
Foc
-
TN
+
Skill
+
Exp
+
Foc
+
TN
 
-
Insight
+
Insight
@@ -994,7 +1008,7 @@
-
Observation
+
Observation
@@ -1005,7 +1019,7 @@
-
Survival
+
Survival
@@ -1016,7 +1030,7 @@
-
Thievery
+
Thievery
@@ -1028,7 +1042,7 @@
- BRAWN + BRAWN
@@ -1040,14 +1054,14 @@ -->
-
Skill
-
Exp
-
Foc
-
TN
+
Skill
+
Exp
+
Foc
+
TN
 
-
Athletics
+
Athletics
@@ -1058,7 +1072,7 @@
-
Resistance
+
Resistance
@@ -1070,7 +1084,7 @@
-
COORDINATION
+
COORDINATION
@@ -1082,14 +1096,14 @@ -->
-
Skill
-
Exp
-
Foc
-
TN
+
Skill
+
Exp
+
Foc
+
TN
 
-
Parry
+
Parry
@@ -1100,7 +1114,7 @@
-
Ranged/W
+
Ranged/W
@@ -1111,7 +1125,7 @@
-
Sailing
+
Sailing
@@ -1123,7 +1137,7 @@
-
INTELLIGENCE
+
INTELLIGENCE
@@ -1135,14 +1149,14 @@ -->
-
Skill
-
Exp
-
Foc
-
TN
+
Skill
+
Exp
+
Foc
+
TN
 
-
Alchemy
+
Alchemy
@@ -1153,7 +1167,7 @@
-
Craft
+
Craft
@@ -1164,7 +1178,7 @@
-
Healing
+
Healing
@@ -1175,7 +1189,7 @@
-
Linguistics
+
Linguistics
@@ -1186,7 +1200,7 @@
-
Lore
+
Lore
@@ -1197,7 +1211,7 @@
-
Warfare
+
Warfare
@@ -1209,7 +1223,7 @@
- PERSONALITY + PERSONALITY
@@ -1221,14 +1235,14 @@ -->
-
Skill
-
Exp
-
Foc
-
TN
+
Skill
+
Exp
+
Foc
+
TN
 
-
Animal/H
+
Animal/H
@@ -1239,7 +1253,7 @@
-
Command
+
Command
@@ -1250,7 +1264,7 @@
-
Counsel
+
Counsel
@@ -1261,7 +1275,7 @@
-
Persuade
+
Persuade
@@ -1272,7 +1286,7 @@
-
Society
+
Society
@@ -1284,7 +1298,7 @@
-
WILLPOWER
+
WILLPOWER
@@ -1296,14 +1310,14 @@ -->
-
Skill
-
Exp
-
Foc
-
TN
+
Skill
+
Exp
+
Foc
+
TN
 
-
Discipline
+
Discipline
@@ -1314,7 +1328,7 @@
-
Sorcery
+
Sorcery
@@ -1329,21 +1343,21 @@
-
Magic
+
Magic
-
Spell
+
Spell
-
Difficulty
-
Duration
-
Cost
-
Momentum
+
Difficulty
+
Duration
+
Cost
+
Momentum
- Description + Description @@ -1375,24 +1389,24 @@
- XP Tracker + XP Tracker
- Total XP: + Total XP: - Spent XP: + Spent XP: - Available XP: + Available XP:
-
Date
-
XP Gain
-
XP Spend
-
Spend Description
+
Date
+
XP Gain
+
XP Spend
+
Spend Description
@@ -1418,7 +1432,7 @@
- Adventuring Log + Adventuring Log
@@ -1428,7 +1442,7 @@
- Date: + Date: