diff --git a/Delta Green 2/deltagreen.html b/Delta Green 2/deltagreen.html
index c88b9c28bf..4a75d015c2 100644
--- a/Delta Green 2/deltagreen.html
+++ b/Delta Green 2/deltagreen.html
@@ -1939,7 +1939,7 @@ each val,key in defensiveQualities
@@ -1948,17 +1948,17 @@ each val,key in defensiveQualities
-
+
-
+
@@ -4270,7 +4270,7 @@ each val,key in defensiveQualities
{{/damage}} {{#lethality_percent}}
{{roll}}%
{{#^rollTotal() isHealing 1}}
{{#^rollGreater() roll lethality_percent}}kill{{/^rollGreater() roll lethality_percent}}
- {{#rollGreater() roll lethality_percent}}failure| {{/rollGreater() roll lethality_percent}}
+ {{#rollGreater() roll lethality_percent}}damage {{/rollGreater() roll lethality_percent}}
{{/^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;
};
diff --git a/Delta Green 2/src/js/sheetworkers_helpers.dev.js b/Delta Green 2/src/js/sheetworkers_helpers.dev.js
index 19c16eba84..0e62796fc6 100644
--- a/Delta Green 2/src/js/sheetworkers_helpers.dev.js
+++ b/Delta Green 2/src/js/sheetworkers_helpers.dev.js
@@ -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}}';
diff --git a/Delta Green 2/src/js/sheetworkers_helpers.js b/Delta Green 2/src/js/sheetworkers_helpers.js
index a783f73d49..a6f3e96c3b 100644
--- a/Delta Green 2/src/js/sheetworkers_helpers.js
+++ b/Delta Green 2/src/js/sheetworkers_helpers.js
@@ -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}}';
diff --git a/Delta Green 2/src/js/sheetworkers_rolls.dev.js b/Delta Green 2/src/js/sheetworkers_rolls.dev.js
index 0b7f95cbf3..6b96bf03bd 100644
--- a/Delta Green 2/src/js/sheetworkers_rolls.dev.js
+++ b/Delta Green 2/src/js/sheetworkers_rolls.dev.js
@@ -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;
diff --git a/Delta Green 2/src/js/sheetworkers_rolls.js b/Delta Green 2/src/js/sheetworkers_rolls.js
index c0187e9821..681d63533d 100644
--- a/Delta Green 2/src/js/sheetworkers_rolls.js
+++ b/Delta Green 2/src/js/sheetworkers_rolls.js
@@ -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;
};
diff --git a/Delta Green 2/src/pug/rolltemplates/_rolltemplate.html b/Delta Green 2/src/pug/rolltemplates/_rolltemplate.html
index d10f8c8292..2a529d8dff 100644
--- a/Delta Green 2/src/pug/rolltemplates/_rolltemplate.html
+++ b/Delta Green 2/src/pug/rolltemplates/_rolltemplate.html
@@ -228,7 +228,7 @@
{{/damage}} {{#lethality_percent}}
{{roll}}%
{{#^rollTotal() isHealing 1}}
{{#^rollGreater() roll lethality_percent}}kill{{/^rollGreater() roll lethality_percent}}
- {{#rollGreater() roll lethality_percent}}failure| {{/rollGreater() roll lethality_percent}}
+ {{#rollGreater() roll lethality_percent}}damage {{/rollGreater() roll lethality_percent}}
{{/^rollTotal() isHealing 1}}
{{#rollTotal() isHealing 1}}
{{#^rollGreater() roll lethality_percent}}
diff --git a/Delta Green 2/src/pug/rolltemplates/_rolltemplate.pug b/Delta Green 2/src/pug/rolltemplates/_rolltemplate.pug
index b606f5ac93..1ddc9bb89a 100644
--- a/Delta Green 2/src/pug/rolltemplates/_rolltemplate.pug
+++ b/Delta Green 2/src/pug/rolltemplates/_rolltemplate.pug
@@ -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}}
diff --git a/Delta Green 2/src/pug/sections/_ritual_activation.pug b/Delta Green 2/src/pug/sections/_ritual_activation.pug
index 8ba593b8ae..a8325fd239 100644
--- a/Delta Green 2/src/pug/sections/_ritual_activation.pug
+++ b/Delta Green 2/src/pug/sections/_ritual_activation.pug
@@ -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')