Nighthawk/roll20-character-sheets
1
0
Fork 0
mirror of https://github.com/Nighthawk42/roll20-character-sheets.git synced 2026-09-11 09:32:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

bug fix

Browse Source 
- corrected logic for ammo
- fixed the header substitution for critical selective fire
- modified kill/failure to kill/damage
This commit is contained in:
uriele
2024-09-01 04:36:34 +02:00
parent 1800a80c48
commit 60221b43c0
8 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Delta Green 2/deltagreen.html
+12 -12
View File
@@ -1939,7 +1939,7 @@ each val,key in defensiveQualities
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="skill % input" title="skill % input">
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text">
<input data-i18n-placeholder="skill %" name="attr_skill_percent" list="ritualskills" placeholder="skill %" title="@{repeating_rituals_${x}_skill_percent}" type="text" value="@{ritual_skill}"/></span><span class="unedit_text"><span name="attr_skill_span"></span></span>
<input data-i18n-placeholder="skill %" name="attr_skill_percent" list="ritualskills" title="@{repeating_rituals_${x}_skill_percent}" type="text" value="@{ritual_skill}"/></span><span class="unedit_text"><span name="attr_skill_span"></span></span>
</label>
<div class="vert-line"></div>
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text"><span class="ritualsanloss">
@@ -1948,17 +1948,17 @@ each val,key in defensiveQualities
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="hit_points_cost input" title="hit_points_cost input">
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text">
<input data-i18n-placeholder="hit_points_cost" name="attr_hit_points_cost" placeholder="hit_points_cost" title="@{repeating_rituals_${x}_hit_points_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_hit_points_cost"></span></span>
<input data-i18n-placeholder="hit_points_cost" name="attr_hit_points_cost" title="@{repeating_rituals_${x}_hit_points_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_hit_points_cost"></span></span>
</label>
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="willpower_points_cost input" title="willpower_points_cost input">
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text">
<input data-i18n-placeholder="willpower_points_cost" name="attr_willpower_points_cost" placeholder="willpower_points_cost" title="@{repeating_rituals_${x}_willpower_points_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_willpower_points_cost"></span></span>
<input data-i18n-placeholder="willpower_points_cost" name="attr_willpower_points_cost" title="@{repeating_rituals_${x}_willpower_points_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_willpower_points_cost"></span></span>
</label>
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="power_score_cost input" title="power_score_cost input">
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text">
<input data-i18n-placeholder="power_score_cost" name="attr_power_score_cost" placeholder="power_score_cost" title="@{repeating_rituals_${x}_power_score_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_power_score_cost"></span></span>
<input data-i18n-placeholder="power_score_cost" name="attr_power_score_cost" title="@{repeating_rituals_${x}_power_score_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_power_score_cost"></span></span>
</label>
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="complexity input" title="complexity input">
@@ -3787,7 +3787,7 @@ each val,key in defensiveQualities
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="skill % input" title="skill % input">
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text">
<input data-i18n-placeholder="skill %" name="attr_skill_percent" list="ritualskills" placeholder="skill %" title="@{repeating_rituals_${x}_skill_percent}" type="text" value="@{ritual_skill}"/></span><span class="unedit_text"><span name="attr_skill_span"></span></span>
<input data-i18n-placeholder="skill %" name="attr_skill_percent" list="ritualskills" title="@{repeating_rituals_${x}_skill_percent}" type="text" value="@{ritual_skill}"/></span><span class="unedit_text"><span name="attr_skill_span"></span></span>
</label>
<div class="vert-line"></div>
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text"><span class="ritualsanloss">
@@ -3796,17 +3796,17 @@ each val,key in defensiveQualities
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="hit_points_cost input" title="hit_points_cost input">
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text">
<input data-i18n-placeholder="hit_points_cost" name="attr_hit_points_cost" placeholder="hit_points_cost" title="@{repeating_rituals_${x}_hit_points_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_hit_points_cost"></span></span>
<input data-i18n-placeholder="hit_points_cost" name="attr_hit_points_cost" title="@{repeating_rituals_${x}_hit_points_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_hit_points_cost"></span></span>
</label>
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="willpower_points_cost input" title="willpower_points_cost input">
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text">
<input data-i18n-placeholder="willpower_points_cost" name="attr_willpower_points_cost" placeholder="willpower_points_cost" title="@{repeating_rituals_${x}_willpower_points_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_willpower_points_cost"></span></span>
<input data-i18n-placeholder="willpower_points_cost" name="attr_willpower_points_cost" title="@{repeating_rituals_${x}_willpower_points_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_willpower_points_cost"></span></span>
</label>
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="power_score_cost input" title="power_score_cost input">
<input class="edit_test" type="hidden" name="attr_test"/><span class="edit_text">
<input data-i18n-placeholder="power_score_cost" name="attr_power_score_cost" placeholder="power_score_cost" title="@{repeating_rituals_${x}_power_score_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_power_score_cost"></span></span>
<input data-i18n-placeholder="power_score_cost" name="attr_power_score_cost" title="@{repeating_rituals_${x}_power_score_cost}" type="text" value=""/></span><span class="unedit_text"><span name="attr_power_score_cost"></span></span>
</label>
<div class="vert-line"></div>
<label class="ritual_label" data-i18n-title="complexity input" title="complexity input">
@@ -4270,7 +4270,7 @@ each val,key in defensiveQualities
</div>{{/damage}} {{#lethality_percent}}
<div class="sheet-template-row sheet-template-onerow"><span class="span inlinerollresult">{{roll}}%</span></div>{{#^rollTotal() isHealing 1}}
<div class="sheet-template-row sheet-template-tworows"> <span class="sheet-after-colons sheet-rolltitle" data-i18n="outcome:"> </span>{{#^rollGreater() roll lethality_percent}}<span class="sheet-template-computed" data-i18n="kill">kill</span>{{/^rollGreater() roll lethality_percent}}
{{#rollGreater() roll lethality_percent}}<span class="sheet-template-computed" data-i18n="failure">failure| </span>{{/rollGreater() roll lethality_percent}}
{{#rollGreater() roll lethality_percent}}<span class="sheet-template-computed" data-i18n="failure">damage </span>{{/rollGreater() roll lethality_percent}}
</div>{{/^rollTotal() isHealing 1}}
{{#rollTotal() isHealing 1}}
{{#^rollGreater() roll lethality_percent}}
@@ -4968,7 +4968,7 @@ const setAdvancedWeaponsString = (options,character_id,repsecid) => {
if (options.trackAmmo) {
advancedWeaponsString += '{{trackbullets=1}}';
advancedWeaponsString += '{{current_ammo=[[' + options.current_ammo + ']]}}';
if (options.current_ammo>0) {
if (options.current_ammo==0) {
advancedWeaponsString += '{{noammo=1}}';
}else{
advancedWeaponsString += '{{wammo=0}}';
@@ -6288,9 +6288,9 @@ const realDmgHeader=(values,names) => {
if (names.hasOwnProperty)
var header=names['header'];
if (header.includes('_tmp_header_')){ // I can use it for other things
if (names['rollName']==='selective_fire'){
//if (names['rollName']==='selective_fire'){
return header.replace('_tmp_header_',values[names[`selfire_type`]]);
}
//}
}
return header;
};
Delta Green 2/src/js/sheetworkers_helpers.dev.js
+1 -1
View File
@@ -328,7 +328,7 @@ var setAdvancedWeaponsString = function setAdvancedWeaponsString(options, charac
advancedWeaponsString += '{{trackbullets=1}}';
advancedWeaponsString += '{{current_ammo=[[' + options.current_ammo + ']]}}';
if (options.current_ammo > 0) {
if (options.current_ammo == 0) {
advancedWeaponsString += '{{noammo=1}}';
} else {
advancedWeaponsString += '{{wammo=0}}';
Delta Green 2/src/js/sheetworkers_helpers.js
+1 -1
View File
@@ -198,7 +198,7 @@ const setAdvancedWeaponsString = (options,character_id,repsecid) => {
if (options.trackAmmo) {
advancedWeaponsString += '{{trackbullets=1}}';
advancedWeaponsString += '{{current_ammo=[[' + options.current_ammo + ']]}}';
if (options.current_ammo>0) {
if (options.current_ammo==0) {
advancedWeaponsString += '{{noammo=1}}';
}else{
advancedWeaponsString += '{{wammo=0}}';
Delta Green 2/src/js/sheetworkers_rolls.dev.js
+2 -3
View File
@@ -328,9 +328,8 @@ var realDmgHeader = function realDmgHeader(values, names) {
if (header.includes('_tmp_header_')) {
// I can use it for other things
if (names['rollName'] === 'selective_fire') {
return header.replace('_tmp_header_', values[names["selfire_type"]]);
}
//if (names['rollName']==='selective_fire'){
return header.replace('_tmp_header_', values[names["selfire_type"]]); //}
}
return header;
Delta Green 2/src/js/sheetworkers_rolls.js
+2 -2
View File
@@ -322,9 +322,9 @@ const realDmgHeader=(values,names) => {
if (names.hasOwnProperty)
var header=names['header'];
if (header.includes('_tmp_header_')){ // I can use it for other things
if (names['rollName']==='selective_fire'){
//if (names['rollName']==='selective_fire'){
return header.replace('_tmp_header_',values[names[`selfire_type`]]);
}
//}
}
return header;
};
Delta Green 2/src/pug/rolltemplates/_rolltemplate.html
+1 -1
View File
@@ -228,7 +228,7 @@
</div>{{/damage}} {{#lethality_percent}}
<div class="sheet-template-row sheet-template-onerow"><span class="span inlinerollresult">{{roll}}%</span></div>{{#^rollTotal() isHealing 1}}
<div class="sheet-template-row sheet-template-tworows"> <span class="sheet-after-colons sheet-rolltitle" data-i18n="outcome:"> </span>{{#^rollGreater() roll lethality_percent}}<span class="sheet-template-computed" data-i18n="kill">kill</span>{{/^rollGreater() roll lethality_percent}}
{{#rollGreater() roll lethality_percent}}<span class="sheet-template-computed" data-i18n="failure">failure| </span>{{/rollGreater() roll lethality_percent}}
{{#rollGreater() roll lethality_percent}}<span class="sheet-template-computed" data-i18n="failure">damage </span>{{/rollGreater() roll lethality_percent}}
</div>{{/^rollTotal() isHealing 1}}
{{#rollTotal() isHealing 1}}
{{#^rollGreater() roll lethality_percent}}
Delta Green 2/src/pug/rolltemplates/_rolltemplate.pug
+1 -1
View File
@@ -361,7 +361,7 @@ mixin lethality_outcome()
span.sheet-template-computed(data-i18n="kill") kill
|{{/^rollGreater() roll lethality_percent}}
|{{#rollGreater() roll lethality_percent}}
span.sheet-template-computed(data-i18n="failure") failure|
span.sheet-template-computed(data-i18n="failure") damage
|{{/rollGreater() roll lethality_percent}}
|{{/^rollTotal() isHealing 1}}
Delta Green 2/src/pug/sections/_ritual_activation.pug
+2 -2
View File
@@ -81,9 +81,9 @@ mixin rituals(ritualsAttrs)
input(type='hidden' class='edit_test' name='attr_test')
span.edit_text
if (attrName==='skill_percent')
input(data-i18n-placeholder=ritual name='attr_' + attrName list='ritualskills' placeholder=ritual title='@{repeating_rituals_${x}_' + attrName + '}' type='text' value='@{ritual_skill}')
input(data-i18n-placeholder=ritual name='attr_' + attrName list='ritualskills' title='@{repeating_rituals_${x}_' + attrName + '}' type='text' value='@{ritual_skill}')
else
input(data-i18n-placeholder=ritual name='attr_' + attrName placeholder=ritual title='@{repeating_rituals_${x}_' + attrName + '}' type=atype value='')
input(data-i18n-placeholder=ritual name='attr_' + attrName title='@{repeating_rituals_${x}_' + attrName + '}' type=atype value='')
span.unedit_text
if (attrName === 'skill_percent')
span(name='attr_skill_span')