diff --git a/Delta Green/delta_green.html b/Delta Green/delta_green.html index db87e09a6b..c0e9cedeb0 100644 --- a/Delta Green/delta_green.html +++ b/Delta Green/delta_green.html @@ -25,44 +25,57 @@ setAttrs(setting); on("sheet:opened", function() { -var updates = {}; -getAttrs(['version','name','sex','v1','v2','v3','h1','h2','h3','special1','special2','special3','special4','special5','special6','special_skill1','special_skill2','special_skill3','special_skill4','special_skill5','special_skill6'], function(v) { -if(v.version != "1.2") { -//updates=[{'version': '1.2'} , {'gender': attrs['sex'] ||''}, {'violence_1': attrs['v1'] ||''}, {'violence_2': attrs['v2'] ||''}, {'violence_3': attrs['v3'] ||''}, {'helpness_1': attrs['h1'] ||''}, {'helpness_2': attrs['h2'] ||''}, {'helpness_3': attrs['h3'] ||''}, ] + var updates = {}; + getAttrs(['version','name','sex','v1','v2','v3','h1','h2','h3','special1','special2','special3','special4','special5','special6','special_skill1','special_skill2','special_skill3','special_skill4','special_skill5','special_skill6','antropology'], function(v) { + if(v.version != "1.3") { + //updates=[{'version': '1.2'} , {'gender': attrs['sex'] ||''}, {'violence_1': attrs['v1'] ||''}, {'violence_2': attrs['v2'] ||''}, {'violence_3': attrs['v3'] ||''}, {'helpness_1': attrs['h1'] ||''}, {'helpness_2': attrs['h2'] ||''}, {'helpness_3': attrs['h3'] ||''}, ] -if(v.name) { -updates.character_name = v.name; -} -if(v.sex) { -updates.gender = v.sex; -} -if(v.v1) { -updates.violence_1 = v.v1; -} -if(v.v2) { -updates.violence_2 = v.v2; -} -if(v.v3) { -updates.violence_3 = v.v3; -} + if(v.name) { + updates.character_name = v.name; + } -if(v.h1) { -updates.helpness_1 = v.h1; -} -if(v.h2) { -updates.helpness_2 = v.h2; -} -if(v.h3) { -updates.helpness_3 = v.h3; -} -updates.version = "1.2"; + if(v.sex) { + updates.gender = v.sex; + } -setAttrs(updates); -let data = [{newtraining: v.special1 ||'', skilltraining: v.special_skill1 ||''}, {newtraining: v.special2 ||'', skilltraining: v.special_skill2 ||''}, {newtraining: v.special3 ||'', skilltraining: v.special_skill3 ||''}, {newtraining: v.special4 ||'', skilltraining: v.special_skill4 ||''}, {newtraining: v.special5 ||'', skilltraining: v.special_skill5 ||''}, {newtraining: v.special6 ||'', skilltraining: v.special_skill6 ||''} ].filter(o => (o.newtraining || o.skilltraining)); -fillRepeatingSectionFromData('repeating_training', data); + if(v.v1) { + updates.violence_1 = v.v1; + } -} -}); + if(v.v2) { + updates.violence_2 = v.v2; + } + + if(v.v3) { + updates.violence_3 = v.v3; + } + + if(v.h1) { + updates.helpness_1 = v.h1; + } + + if(v.h2) { + updates.helpness_2 = v.h2; + } + + if(v.h3) { + updates.helpness_3 = v.h3; + } + + if (v.antropology) {//Duplicating the anthropology attribute into a version with correct spelling + updates.anthropology = v.antropology; + setAttrs({anthropology: v.antropology}); + } + + updates.version = "1.3"; + + setAttrs(updates); + + let data = [{newtraining: v.special1 ||'', skilltraining: v.special_skill1 ||''}, {newtraining: v.special2 ||'', skilltraining: v.special_skill2 ||''}, {newtraining: v.special3 ||'', skilltraining: v.special_skill3 ||''}, {newtraining: v.special4 ||'', skilltraining: v.special_skill4 ||''}, {newtraining: v.special5 ||'', skilltraining: v.special_skill5 ||''}, {newtraining: v.special6 ||'', skilltraining: v.special_skill6 ||''} ].filter(o => (o.newtraining || o.skilltraining)); + + fillRepeatingSectionFromData('repeating_training', data); + } + }); }); @@ -254,6 +267,13 @@ on(" change:headshot_chk", function(){ }); }); +on("change:anthropology", function(){ + getAttrs(["anthropology"], function(v) { + //Maintaining the value in both fields to preserve any macros that used the misspelling + setAttrs({antropology: v.anthropology}); + }); +}); + // Breaking points unconcious, stunned, incapacitated and death on('sheet:opened change:wp change:hp change:san change:wp_max change:hp_max change:san_max',function(){ getAttrs(["wp","lowwill_chk","wp_max","hp","unconscious_chk","death_chk","hp_max","san","bp","san_max","pow" ],function(v){ @@ -952,9 +972,9 @@ sheet version: 1.2 - Antropology (0%) - -