slaguru666/roll20-character-sheets-tester
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3805 from BuildAndDie/master

Browse Source 
[Open Legend] NPC Initiative go to Tracker
This commit is contained in:
Jeffrey Lamb
2018-05-29 10:25:06 -04:00
committed by GitHub
parent 7d38824606 f3b3a03c3c
commit 8e01a2b95f
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Open Legend Basic by Great Moustache/Open Legend.html
+20 -16
View File
@@ -590,9 +590,9 @@
var type = "d" + values.npc1_initiative_dice_type + "!!";
var roll = "";
if(values.npc1_initiative_score*1 === 0) {
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}]]}}";
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}&{tracker}]]}}";
} else {
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc1_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc1_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
}
setAttrs({
"npc1_initiative_roll": roll
@@ -605,9 +605,9 @@
var type = "d" + values.npc2_initiative_dice_type + "!!";
var roll = "";
if(values.npc2_initiative_score*1 === 0) {
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}]]}}";
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}&{tracker}]]}}";
} else {
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc2_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc2_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
}
setAttrs({
"npc2_initiative_roll": roll
@@ -620,9 +620,9 @@
var type = "d" + values.npc3_initiative_dice_type + "!!";
var roll = "";
if(values.npc3_initiative_score*1 === 0) {
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}]]}}";
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}&{tracker}]]}}";
} else {
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc3_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc3_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
}
setAttrs({
"npc3_initiative_roll": roll
@@ -635,9 +635,9 @@
var type = "d" + values.npc4_initiative_dice_type + "!!";
var roll = "";
if(values.npc4_initiative_score*1 === 0) {
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}]]}}";
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}&{tracker}]]}}";
} else {
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc4_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc4_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
}
setAttrs({
"npc4_initiative_roll": roll
@@ -650,9 +650,9 @@
var type = "d" + values.npc5_initiative_dice_type + "!!";
var roll = "";
if(values.npc5_initiative_score*1 === 0) {
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}]]}}";
roll = "{{roll=[[?{Do you have Advantage or Disadvantage?|Neither,1d20!!|Advantage,2d20!!kh1|Disadvantage,2d20!!kl1}&{tracker}]]}}";
} else {
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc5_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
roll = "{{roll=[[1d20!! + [[" + number + "+?{# of Advantage/Disadvantage Dice|" + values.npc5_initiative_default_advantage*1 + "}]]" + type + "k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[" + number + "]]|Disadvantage,l[[" + number + "]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}";
}
setAttrs({
"npc5_initiative_roll": roll
@@ -4787,7 +4787,7 @@ on("change:repeating_featsLeft", function() {
<div class="inlineBlock vertBottom" style="width: 110px;"> <!-- Right Third of 2/3 rows for info (Open Legend Logo) -->
<div class="column width100 textCenter vertBottom"><img src="http://www.openlegendrpg.com/assets/img/open_legend_lg_logo.png" alt="Open Legend Open source roleplaying game" /></div>
</div>
<div class="column textSmall inlineBlock padLeft vertMiddle bold">Version 1.9.6</div>
<div class="column textSmall inlineBlock padLeft vertMiddle bold">Version 1.9.7</div>
<div class="row width100 padBottom"></div>
<!-- Sheet Options, Change Logs, and Links -->
<div class="option-main options width100 padTop marginTop">
@@ -4891,6 +4891,10 @@ on("change:repeating_featsLeft", function() {
Might end up just removing the changelog, not sure it is really needed here -->
<div class="width100 height150 scroll">
<div class="width90 inlineBlock boxShadow marginBottom marginTop">
<div class="column width100 textLarge bold borderBottom textLeft">1.9.7 on 2018 May 27th</div>
<div class="column width100 textLeft">Made NPC initiative rolls go to the tracker</div>
<div class="column width100 textLeft padLeft">- Oops, not sure how I let that slip through</div>
</div><div class="width90 inlineBlock boxShadow marginBottom marginTop">
<div class="column width100 textLarge bold borderBottom textLeft">1.9.6 on 2018 May 14th</div>
<div class="column width100 textLeft">Resist Rolls Update</div>
<div class="column width100 textLeft padLeft">- Made Resist Roll buttons next to Speed</div>
@@ -5252,7 +5256,7 @@ on("change:repeating_featsLeft", function() {
<!-- Initiative -->
<div class="row">
<div class="column width55 inlineBlock textLarge speedButton"><button type="roll" name="roll_npc1_initiative" value="@{tab_chat}&{template:openLegend} {{border=@{template_border}}} {{title=Initiative Roll}} {{subTitle=@{npc1_name}}} {{subTitleAdd=Score of @{npc1_initiative_score}}} @{npc1_initiative_roll} {{description=Make sure you selected your token to have it automatically added to the turn order.}}">Initiative</button></div>
<input type="hidden" name="attr_npc1_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<input type="hidden" name="attr_npc1_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<div class="column inlineBlock textCenter inputNumber30 width10"><input type="number" name="attr_npc1_initiative_score" value=4 /></div>
<div class="column inlineBlock inputDiceNum"><input type="text" name="attr_npc1_initiative_dice_number" value="1" /></div>
<div class="column inlineBlock inputDiceType">
@@ -5744,7 +5748,7 @@ on("change:repeating_featsLeft", function() {
<!-- Initiative -->
<div class="row">
<div class="column width55 inlineBlock textLarge speedButton"><button type="roll" name="roll_npc2_initiative" value="@{tab_chat}&{template:openLegend} {{border=@{template_border}}} {{title=Initiative Roll}} {{subTitle=@{npc2_name}}} {{subTitleAdd=Score of @{npc2_initiative_score}}} @{npc2_initiative_roll} {{description=Make sure you selected your token to have it automatically added to the turn order.}}">Initiative</button></div>
<input type="hidden" name="attr_npc2_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<input type="hidden" name="attr_npc2_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<div class="column inlineBlock textCenter inputNumber30 width10"><input type="number" name="attr_npc2_initiative_score" value=4 /></div>
<div class="column inlineBlock inputDiceNum"><input type="text" name="attr_npc2_initiative_dice_number" value="1" /></div>
<div class="column inlineBlock inputDiceType">
@@ -6236,7 +6240,7 @@ on("change:repeating_featsLeft", function() {
<!-- Initiative -->
<div class="row">
<div class="column width55 inlineBlock textLarge speedButton"><button type="roll" name="roll_npc3_initiative" value="@{tab_chat}&{template:openLegend} {{border=@{template_border}}} {{title=Initiative Roll}} {{subTitle=@{npc3_name}}} {{subTitleAdd=Score of @{npc3_initiative_score}}} @{npc3_initiative_roll} {{description=Make sure you selected your token to have it automatically added to the turn order.}}">Initiative</button></div>
<input type="hidden" name="attr_npc3_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<input type="hidden" name="attr_npc3_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<div class="column inlineBlock textCenter inputNumber30 width10"><input type="number" name="attr_npc3_initiative_score" value=4 /></div>
<div class="column inlineBlock inputDiceNum"><input type="text" name="attr_npc3_initiative_dice_number" value="1" /></div>
<div class="column inlineBlock inputDiceType">
@@ -6728,7 +6732,7 @@ on("change:repeating_featsLeft", function() {
<!-- Initiative -->
<div class="row">
<div class="column width55 inlineBlock textLarge speedButton"><button type="roll" name="roll_npc4_initiative" value="@{tab_chat}&{template:openLegend} {{border=@{template_border}}} {{title=Initiative Roll}} {{subTitle=@{npc4_name}}} {{subTitleAdd=Score of @{npc4_initiative_score}}} @{npc4_initiative_roll} {{description=Make sure you selected your token to have it automatically added to the turn order.}}">Initiative</button></div>
<input type="hidden" name="attr_npc4_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<input type="hidden" name="attr_npc4_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<div class="column inlineBlock textCenter inputNumber30 width10"><input type="number" name="attr_npc4_initiative_score" value=4 /></div>
<div class="column inlineBlock inputDiceNum"><input type="text" name="attr_npc4_initiative_dice_number" value="1" /></div>
<div class="column inlineBlock inputDiceType">
@@ -7220,7 +7224,7 @@ on("change:repeating_featsLeft", function() {
<!-- Initiative -->
<div class="row">
<div class="column width55 inlineBlock textLarge speedButton"><button type="roll" name="roll_npc5_initiative" value="@{tab_chat}&{template:openLegend} {{border=@{template_border}}} {{title=Initiative Roll}} {{subTitle=@{npc5_name}}} {{subTitleAdd=Score of @{npc5_initiative_score}}} @{npc5_initiative_roll} {{description=Make sure you selected your token to have it automatically added to the turn order.}}">Initiative</button></div>
<input type="hidden" name="attr_npc5_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<input type="hidden" name="attr_npc5_initiative_roll" value="{{roll=[[1d20!! + [[1+?{# of Advantage/Disadvantage Dice|0}]]d10!!k?{Do you have Advantage or Disadvantage?|Neither/Advantage,[[1]]|Disadvantage,l[[1]]}&{tracker}]]}} {{numberadvantage=?{# of Advantage/Disadvantage Dice}}}" /> <!-- hidden value of the roll button string -->
<div class="column inlineBlock textCenter inputNumber30 width10"><input type="number" name="attr_npc5_initiative_score" value=4 /></div>
<div class="column inlineBlock inputDiceNum"><input type="text" name="attr_npc5_initiative_dice_number" value="1" /></div>
<div class="column inlineBlock inputDiceType">
Open Legend Basic by Great Moustache/OpenLegend.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 235 KiB

After

Width:  |  Height:  |  Size: 967 KiB

Open Legend Basic by Great Moustache/ReadMe.md
+4
View File
@@ -4,6 +4,10 @@
## Tell YOUR story
### Changelog
### 1.9.7 on 2018 May 27th
* Made NPC initiative rolls go to the tracker
- Oopsie, not sure how I let that slip by
### 1.9.6 on 2018 May 14th
* Resist Rolls Updated
- Made Resist Roll buttons next to Speed (to match what was on NPC section)