diff --git a/5eShaped/5eShaped.html b/5eShaped/5eShaped.html
index fe1fe57583..89042ebbbe 100644
--- a/5eShaped/5eShaped.html
+++ b/5eShaped/5eShaped.html
@@ -60,7 +60,7 @@
 'use strict';Object.defineProperty(exports,"__esModule",{value:true});exports.Modifiers=undefined;var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _constants=require('../scripts/constants');var _Abilities=require('../abilities/Abilities');var _AbilitiesUtil=require('../abilities/AbilitiesUtil');var _AbilityChecks=require('../abilities/AbilityChecks');var _Actions=require('../actions/Actions');var _ArmorClass=require('../armorClass/ArmorClass');var _SavingThrows=require('../savingThrows/SavingThrows');var _Server=require('../scripts/Server');var _Spells=require('../spells/Spells');var _utilities=require('../scripts/utilities');function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}var abilities=new _Abilities.Abilities();var abilitiesUtil=new _AbilitiesUtil.AbilitiesUtil();var abilityChecks=new _AbilityChecks.AbilityChecks();var actions=new _Actions.Actions();var armorClass=new _ArmorClass.ArmorClass();var savingThrows=new _SavingThrows.SavingThrows();var server=new _Server.Server();var spells=new _Spells.Spells();var Modifiers=exports.Modifiers=function(){function Modifiers(){_classCallCheck(this,Modifiers);}_createClass(Modifiers,[{key:'addToModifierTotal',value:function addToModifierTotal(data,repString,prefix){if((0,_utilities.exists)(data[repString+'_'+prefix+'_modifier_dice'])&&(0,_utilities.exists)(data[repString+'_'+prefix+'_modifier_die'])){if((0,_utilities.exists)(data[prefix+'_modifier_dice'])){data[prefix+'_modifier_dice']+=' + ';}else{data[prefix+'_modifier_dice']='';}data[prefix+'_modifier_dice']+=data[repString+'_'+prefix+'_modifier_dice'];data[prefix+'_modifier_dice']+=data[repString+'_'+prefix+'_modifier_die'];data[prefix+'_modifier_dice']+='cf0cs0';if((0,_utilities.exists)(data.show_dice_modifiers)&&(0,_utilities.exists)(data[repString+'_'+prefix+'_modifier_dice_modifier'])){data[prefix+'_modifier_dice']+=data[repString+'_'+prefix+'_modifier_dice_modifier'];}}if((0,_utilities.exists)(data[repString+'_'+prefix+'_modifier_ability'])||(0,_utilities.exists)(data[repString+'_'+prefix+'_modifier'])){data[prefix+'_modifier']=(0,_utilities.getIntValue)(data[prefix+'_modifier']);if((0,_utilities.exists)(data[repString+'_'+prefix+'_modifier_ability'])){data[prefix+'_modifier']+=abilitiesUtil.getAbilityModFromShortName(data,data[repString+'_'+prefix+'_modifier_ability']);}if((0,_utilities.exists)(data[repString+'_'+prefix+'_modifier'])){if(!isNaN(data[repString+'_'+prefix+'_modifier'])){data[prefix+'_modifier']+=(0,_utilities.getIntValue)(data[repString+'_'+prefix+'_modifier']);}else{if((0,_utilities.exists)(data[prefix+'_modifier_dice'])){data[prefix+'_modifier_dice']+=' + ';}else{data[prefix+'_modifier_dice']='';}data[prefix+'_modifier_dice']+=data[repString+'_'+prefix+'_modifier'];}}}}},{key:'update',value:function update(){var _this=this;var updatedSections=[];var updatedFields=[];var categoriesToAdd=[{name:'ability_score',fields:['ability_score']},{name:'ability_check',fields:['ability_check','initiative']},{name:'attack',fields:['attack','weapon_attack','melee_weapon_attack','ranged_weapon_attack','spell_attack']},{name:'damage',fields:['damage','weapon_damage','melee_weapon_damage','ranged_weapon_damage','spell_damage']},{name:'spell',fields:['spell_dc','spell_heal']},{name:'ac',fields:['ac']},{name:'saving_throw',fields:['saving_throw']}];_constants.ABILITIES.forEach(function(ability){categoriesToAdd[0].fields.push(ability+'_score');categoriesToAdd[1].fields.push(ability+'_check');});for(var i=0;i<=23;i+=1){categoriesToAdd[1].fields.push('skill_'+i);categoriesToAdd[1].fields.push('skill_'+i+'_passive');}_constants.SAVING_THROWS.concat(_constants.CUSTOM_SAVING_THROWS).forEach(function(savingThrow){categoriesToAdd[6].fields.push(savingThrow+'_saving_throw');});var fieldsToAdd=[];categoriesToAdd.forEach(function(category){category.fields.forEach(function(field){fieldsToAdd.push(field);});});server.getSetItems('modifiers.update',{collectionArray:['show_dice_modifiers'].concat(_constants.ABILITIES).concat(fieldsToAdd.map(function(field){return field+'_modifier';})).concat(fieldsToAdd.map(function(field){return field+'_modifier_dice';})),repeatingSections:[{name:'repeating_modifier',collectionArrayAddItems:['active','type'].concat(categoriesToAdd.map(function(category){return category.name+'_toggle';})).concat(fieldsToAdd.map(function(field){return field+'_modifier_dice';})).concat(fieldsToAdd.map(function(field){return field+'_modifier_die';})).concat(fieldsToAdd.map(function(field){return field+'_modifier_dice_modifier';})).concat(fieldsToAdd.map(function(field){return field+'_modifier_ability';})).concat(fieldsToAdd.map(function(field){return field+'_modifier';})).concat(fieldsToAdd.map(function(field){return''+field;})).concat(_constants.REPEATING_FIELDS.default).concat(_constants.REPEATING_FIELDS.modifiersAndProperties)}],process:function process(data,repStrings){var originalValues={};fieldsToAdd.forEach(function(field){originalValues[field+'_modifier']=data[field+'_modifier'];originalValues[field+'_modifier_dice']=data[field+'_modifier_dice'];if((0,_utilities.exists)(data[field+'_modifier'])){data[field+'_modifier']=0;}if((0,_utilities.exists)(data[field+'_modifier_dice'])){data[field+'_modifier_dice']='';}});repStrings.forEach(function(repString){if((0,_utilities.exists)(data[repString+'_active'])||(0,_utilities.isUndefined)(data[repString+'_active'])){categoriesToAdd.forEach(function(category){if((0,_utilities.exists)(data[repString+'_'+category.name+'_toggle'])||(0,_utilities.isUndefined)(data[repString+'_'+category.name+'_toggle'])){category.fields.forEach(function(field){_this.addToModifierTotal(data,repString,field);});}});}});fieldsToAdd.forEach(function(field){if(data[field+'_modifier']!==originalValues[field+'_modifier']||data[field+'_modifier_dice']!==originalValues[field+'_modifier_dice']){updatedFields.push(field);updatedSections.push(categoriesToAdd.find(function(category){return category.fields.includes(field);}).name);}});},callback:function callback(){if(updatedSections.includes('ability_score')){abilities.update();}else{if(updatedSections.includes('ability_check')){abilityChecks.update();abilityChecks.updateSkill();}if(updatedFields.includes('attack')||updatedFields.includes('weapon_attack')||updatedFields.includes('melee_weapon_attack')||updatedFields.includes('ranged_weapon_attack')||updatedFields.includes('damage')||updatedFields.includes('weapon_damage')||updatedFields.includes('melee_weapon_damage')||updatedFields.includes('ranged_weapon_damage')){actions.updateAllWithAttack();}if(updatedFields.includes('attack')||updatedFields.includes('spell_attack')||updatedFields.includes('damage')||updatedFields.includes('spell_damage')||updatedFields.includes('spell_dc')||updatedFields.includes('spell_heal')){spells.update();spells.updateDCAndAttack();}if(updatedSections.includes('ac')){armorClass.update();}if(updatedSections.includes('saving_throw')){savingThrows.updateSavingThrows();}}}});}},{key:'setup',value:function setup(){var _this2=this;on('change:repeating_modifier',function(eventInfo){var repeatingInfo=(0,_utilities.getRepeatingInfo)('repeating_modifier',eventInfo);if(repeatingInfo&&repeatingInfo.field!=='toggle_details'){_this2.update();}});on('remove:repeating_modifier',function(){_this2.update();});}}]);return Modifiers;}();
 
 },{"../abilities/Abilities":1,"../abilities/AbilitiesUtil":2,"../abilities/AbilityChecks":3,"../actions/Actions":9,"../armorClass/ArmorClass":10,"../savingThrows/SavingThrows":26,"../scripts/Server":33,"../scripts/constants":35,"../scripts/utilities":37,"../spells/Spells":41}],21:[function(require,module,exports){
-'use strict';Object.defineProperty(exports,"__esModule",{value:true});exports.Npc=undefined;var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _constants=require('../scripts/constants');var _AbilitiesUtil=require('../abilities/AbilitiesUtil');var _Actions=require('../actions/Actions');var _HitDice=require('../hitDice/HitDice');var _Format=require('../scripts/Format');var _ProficiencyBonus=require('../proficiencyBonus/ProficiencyBonus');var _Server=require('../scripts/Server');var _Spells=require('../spells/Spells');var _utilities=require('../scripts/utilities');function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}var abilitiesUtil=new _AbilitiesUtil.AbilitiesUtil();var actions=new _Actions.Actions();var hitDice=new _HitDice.HitDice();var format=new _Format.Format();var proficiencyBonus=new _ProficiencyBonus.ProficiencyBonus();var server=new _Server.Server();var spells=new _Spells.Spells();var Npc=exports.Npc=function(){function Npc(){_classCallCheck(this,Npc);this.xpPerChallenge={0:0,'1/8':25,'1/4':50,'1/2':100,1:200,2:450,3:700,4:1100,5:1800,6:2300,7:2900,8:3900,9:5000,10:5900,11:7200,12:8400,13:10000,14:11500,15:13000,16:15000,17:18000,18:20000,19:22000,20:25000,21:33000,22:41000,23:50000,24:62000,25:75000,26:90000,27:105000,28:120000,29:135000,30:155000};this.sizeToHdSize={TINY:4,SMALL:6,MEDIUM:8,LARGE:10,HUGE:12,GARGANTUAN:20};}_createClass(Npc,[{key:'updateType',value:function updateType(){server.getSetItems('npc.updateType',{collectionArray:['type'],process:function process(data){if((0,_utilities.exists)(data.type)){data.type=data.type.toLowerCase();}}});}},{key:'updateSize',value:function updateSize(){var _this=this;server.getSetItems('npc.updateSize',{collectionArray:['size'],process:function process(data){if((0,_utilities.exists)(data.size)){data.size=data.size.toUpperCase();}else{data.size='MEDIUM';}data.hit_die='d'+_this.sizeToHdSize[data.size];}});}},{key:'updateAC',value:function updateAC(){server.getSetItems('npc.updateAC',{collectionArray:['ac_srd','armorClass','ac_note'],process:function process(data){if((0,_utilities.exists)(data.ac_srd)){var match=data.ac_srd.match(/(\d+)\s?(.*)/);if(match&&match[1]){data.AC=match[1];data.ac_srd='';}if(match&&match[2]){data.ac_note=match[2].replace(/\(|\)/g,'');}}}});}},{key:'switchTo',value:function switchTo(){server.getSetItems('npc.switchTo',{collectionArray:['is_npc','size','ac_srd'],process:function process(data){if((0,_utilities.exists)(data.is_npc)){data.hit_dice_output_option='/w GM';if((0,_utilities.isUndefinedOrEmpty)(data.size)){data.size='MEDIUM';}}else{data.hit_dice_output_option='';}}});}},{key:'updateChallenge',value:function updateChallenge(callback){var _this2=this;server.getSetItems('npc.updateChallenge',{collectionArray:['challenge','xp'],process:function process(data){var challenge=data.challenge;data.xp=_this2.xpPerChallenge[challenge];data.xp_readable=format.numberWithCommas(data.xp);var challengeInt=Math.max(1,(0,_utilities.getIntValue)(challenge));data.level=challengeInt;proficiencyBonus.set(challengeInt,callback);}});}},{key:'updateHPInner',value:function updateHPInner(data){var hdNum=parseFloat(data.hit_dice);var hdSize=(0,_utilities.getIntValue)(data.hit_die.replace('d',''));var hdAverage=hdSize/2+0.5;var conMod=abilitiesUtil.getAbilityMod(data,'constitution');data.HP=Math.floor(hdNum*hdAverage);data.hp_formula=hdNum+'d'+hdSize;if(conMod!==0){var bonusHP=hdNum*conMod;data.HP+=bonusHP;data.hp_formula+=format.addArithmeticOperator(bonusHP);}if((0,_utilities.exists)(data.hp_extra)){var regex=/(?:(\+|-)\s?)?(\d+)(?:d(\d+))?/gi;var splitFormula=void 0;while((splitFormula=regex.exec(data.hp_extra))!==null){if(!splitFormula||!splitFormula[2]){console.error('Character doesn\'t have valid hp formula');}else{var amount=0;if(!splitFormula[3]){amount=(0,_utilities.getIntValue)(splitFormula[2]);}else{var extraHdNum=(0,_utilities.getIntValue)(splitFormula[2]);var extraHdSize=(0,_utilities.getIntValue)(splitFormula[3]);var extraHdAverage=extraHdSize/2+0.5;amount=Math.floor(extraHdNum*extraHdAverage);}if(!splitFormula[1]||splitFormula[1]==='+'){data.HP+=amount;data.hp_formula+=' + '+amount;}else if(splitFormula[1]==='-'){data.HP-=amount;data.hp_formula+=' - '+amount;}}data.hp_extra.toString().replace(splitFormula[0],'');}}if(data.HP){data.HP_max=data.HP;}}},{key:'updateHP',value:function updateHP(){var _this3=this;server.getSetItems('npc.updateHP',{collectionArray:['HP','HP_max','hp_formula','hit_dice','hit_die','hp_extra','constitution'],process:function process(data){if((0,_utilities.exists)(data.hit_dice)){_this3.updateHPInner(data);}}});}},{key:'updateHPFromSRD',value:function updateHPFromSRD(){var _this4=this;server.getSetItems('npc.updateHPFromSRD',{collectionArray:['hp_srd','HP','HP_max','hp_formula','hp_extra','hit_dice','hit_die','constitution','ability_score_modifier'],process:function process(data){if((0,_utilities.exists)(data.hp_srd)){var match=data.hp_srd.match(/\((\d+)d(\d+)(?:\s?(\+|-)\s?(\d+))?\)/i);if(!match||!match[1]||!match[2]){console.error('Character doesn\'t have valid HP/HD format');}else{var hdNum=(0,_utilities.getIntValue)(match[1]);var conMod=abilitiesUtil.getAbilityMod(data,'constitution');data.hit_dice=hdNum;data.hit_die='d'+(0,_utilities.getIntValue)(match[2]);var hpExpectedBonus=hdNum*conMod;var hpBonusSign=match[3];var hpBonus=(0,_utilities.getIntValue)(match[4]);if(hpBonus!==hpExpectedBonus){if(hpBonusSign==='-'){data.hp_extra=hpBonus+hpExpectedBonus;}else{data.hp_extra=hpBonus-hpExpectedBonus;}}}_this4.updateHPInner(data);}},callback:function callback(){hitDice.update();}});}},{key:'splitContentByTitles',value:function splitContentByTitles(data,title){if((0,_utilities.exists)(data.content_srd)&&data.content_srd.includes(title)){var contentSplit=data.content_srd.split('\n '+title+'\n');data.content_srd=contentSplit[0];return contentSplit[1];}return'';}},{key:'parseSRDContentSection',value:function parseSRDContentSection(data,title,name){var section=this.splitContentByTitles(data,title,name);if((0,_utilities.exists)(section)){if(name==='regionaleffect'||name==='lairaction'){var typeList=section.split(/•/);typeList.slice(1,typeList.length).forEach(function(type){var repString='repeating_'+name+'_'+generateRowID();data[repString+'_content']=type.replace(/\n.*/g,'').trim();});}else{if(name==='legendaryaction'){var legendaryActionsMatch=section.match(/Can take (\d+) Legendary Actions/i);if(legendaryActionsMatch&&legendaryActionsMatch[1]){data.legendary_action_amount=(0,_utilities.getIntValue)(legendaryActionsMatch[1]);data.legendary_action_amount_max=(0,_utilities.getIntValue)(legendaryActionsMatch[1]);}}var re=/@(.*)@(?::|\.)\s([^@]+)/gi;var match=void 0;while((match=re.exec(section.replace(/\*\*/g,'@')))!==null){if(match&&match[1]&&match[2]){var repString='repeating_'+name+'_'+generateRowID();data[repString+'_name']=match[1];data[repString+'_content']=match[2].trim();}else{console.error('Character doesn\'t have a valid '+name+' format');}}}}}},{key:'setSpellAbility',value:function setSpellAbility(data){var abilityScores=[(0,_utilities.getIntValue)(data.intelligence),(0,_utilities.getIntValue)(data.wisdom),(0,_utilities.getIntValue)(data.charisma)];var highestAbilityScore=Math.max.apply(Math,abilityScores);var highestAbilityName='INTELLIGENCE';if(highestAbilityScore===abilityScores[1]){highestAbilityName='WISDOM';}else if(highestAbilityScore===abilityScores[2]){highestAbilityName='CHARISMA';}data.spell_ability=highestAbilityName;}},{key:'cleanContent',value:function cleanContent(content){return content.replace(/\*\*\n\t/g,'**').replace(/\*\*\n/g,'**').replace(/  \n\n/g,'\n\n').replace(/“/g,'"').replace(/”/g,'"').replace(/’/g,'\'').replace(/ Legendary Actions\n/g,'\n Legendary Actions\n').replace(/ Reactions\n/g,'\n Reactions\n').replace(/^(?:\s?Actions\n)/g,'\n Actions\n').replace(/ Traits\n/g,'\n Traits\n').replace(/ Regional Effects\n/g,'\n Regional Effects\n').replace(/ Lair Actions\n/g,'\n Lair Actions\n');}},{key:'updateContent',value:function updateContent(){var _this5=this;server.getSetItems('npc.updateContent',{collectionArray:['content_srd'].concat(_constants.ABILITIES),process:function process(data){data.is_npc=1;data.edit_mode=0;data.sheet_processing_complete='';_this5.setSpellAbility(data);if((0,_utilities.exists)(data.content_srd)){data.content_srd=_this5.cleanContent(data.content_srd);_this5.parseSRDContentSection(data,'Legendary Actions','legendaryaction');_this5.parseSRDContentSection(data,'Reactions','reaction');_this5.parseSRDContentSection(data,'Actions','action');_this5.parseSRDContentSection(data,'Traits','trait');_this5.parseSRDContentSection(data,'Regional Effects','regionaleffect');_this5.parseSRDContentSection(data,'Lair Actions','lairaction');}},callback:function callback(){actions.update(['trait','action','reaction','legendaryaction','lairaction','regionaleffect']);spells.findSpellcasting();},serverCallCallback:function serverCallCallback(){server.getSetItems('npc.updateContentComplete',{collectionArray:['sheet_processing_complete'],process:function process(data){data.sheet_processing_complete='drag_from_srd';}});}});}},{key:'updateLanguages',value:function updateLanguages(){server.getSetItems('npc.updateLanguages',{collectionArray:['languages','languages_chat_var'],process:function process(data){data.languages_chat_var='';if(data.languages){data.languages_chat_var='{{Languages=@{languages}}}';}}});}},{key:'updateACNote',value:function updateACNote(){server.getSetItems('npc.updateACNote',{collectionArray:['ac_note'],process:function process(data){if(data.ac_note){data.ac_note=data.ac_note.toLowerCase();}}});}},{key:'updateCasterLevel',value:function updateCasterLevel(){server.getSetItems('npc.updateCasterLevel',{collectionArray:['spellcaster_level','caster_level'],process:function process(data){data.caster_level=(0,_utilities.getIntValue)(data.spellcaster_level);}});}},{key:'processSense',value:function processSense(tokenProps,sense,senseRange){if(sense==='darkvision'){tokenProps.light_dimradius=format.round(-5*(senseRange/60));}if(!tokenProps.light_radius||senseRange>tokenProps.light_radius){tokenProps.light_radius=format.round(senseRange*1.166666666666);}else if(senseRange<tokenProps.light_radius){tokenProps.light_dimradius=senseRange;}}},{key:'npcDroppedOnTabletop',value:function npcDroppedOnTabletop(){var _this6=this;server.getSetItems('npc.npcDroppedOnTabletop',{collectionArray:['hp_max','token_size'].concat(_constants.SENSES),process:function process(data){var hp=(0,_utilities.getIntValue)(data.hp_max);var tokenProps={bar1_value:hp,bar1_max:hp,bar2_link:'AC',bar3_link:'speed',height:70,light_angle:360,light_hassight:true,light_losangle:360,showname:true,showplayers_aura1:true,showplayers_aura2:true,width:70};var squarelength=70;if(data.token_size){var tokenWidth=parseFloat(data.token_size)*squarelength;var tokenHeight=parseFloat(data.token_size)*squarelength;if(data.token_size.includes(',')){tokenWidth=parseFloat(data.token_size.substring(0,data.token_size.indexOf(',')));tokenHeight=parseFloat(data.token_size.substring(data.token_size.indexOf(',')+1,data.token_size.length));}if(tokenWidth>0){tokenProps.width=tokenWidth;}if(tokenHeight>0){tokenProps.height=tokenHeight;}}_constants.SENSES.forEach(function(sense){if((0,_utilities.exists)(data.senses)){var senseRegex=new RegExp(sense+'\\s(\\d+)','gi');var senseResult=data.senses.match(senseRegex);if(senseResult){_this6.processSense(tokenProps,sense,senseResult[1]);}}else if(data[sense]){_this6.processSense(tokenProps,sense,parseFloat(data[sense]));}});setDefaultToken(tokenProps);}});}},{key:'turnOnSlotsIfItsNotSet',value:function turnOnSlotsIfItsNotSet(){server.getSetItems('npc.turnOnSlotsIfItsNotSet',{collectionArray:['spellcasting','spell_slots_toggle'],process:function process(data){if((0,_utilities.exists)(data.spellcasting)){data.spell_slots_toggle=1;}}});}},{key:'setup',value:function setup(){var _this7=this;on('change:type',function(){_this7.updateType();});on('change:size',function(){_this7.updateSize();});on('change:ac_srd',function(){_this7.updateAC();});on('change:is_npc',function(){_this7.switchTo();});on('change:challenge',function(){_this7.updateChallenge();});on('change:hp_srd',function(){_this7.updateHPFromSRD();});on('change:hit_dice change:hit_die change:hp_extra change:constitution change:ability_score_modifier',function(){_this7.updateHP();});on('change:content_srd',function(){_this7.updateContent();});on('change:languages',function(){_this7.updateLanguages();});on('change:ac_note',function(){_this7.updateACNote();});on('change:spellcaster_level',function(){_this7.updateCasterLevel();});on('change:spellcasting',function(){_this7.turnOnSlotsIfItsNotSet();});on('sheet:compendium-drop',function(){_this7.npcDroppedOnTabletop();});}}]);return Npc;}();
+'use strict';Object.defineProperty(exports,"__esModule",{value:true});exports.Npc=undefined;var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _constants=require('../scripts/constants');var _AbilitiesUtil=require('../abilities/AbilitiesUtil');var _Actions=require('../actions/Actions');var _HitDice=require('../hitDice/HitDice');var _Format=require('../scripts/Format');var _ProficiencyBonus=require('../proficiencyBonus/ProficiencyBonus');var _Server=require('../scripts/Server');var _Spells=require('../spells/Spells');var _utilities=require('../scripts/utilities');function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}var abilitiesUtil=new _AbilitiesUtil.AbilitiesUtil();var actions=new _Actions.Actions();var hitDice=new _HitDice.HitDice();var format=new _Format.Format();var proficiencyBonus=new _ProficiencyBonus.ProficiencyBonus();var server=new _Server.Server();var spells=new _Spells.Spells();var Npc=exports.Npc=function(){function Npc(){_classCallCheck(this,Npc);this.xpPerChallenge={0:0,'1/8':25,'1/4':50,'1/2':100,1:200,2:450,3:700,4:1100,5:1800,6:2300,7:2900,8:3900,9:5000,10:5900,11:7200,12:8400,13:10000,14:11500,15:13000,16:15000,17:18000,18:20000,19:22000,20:25000,21:33000,22:41000,23:50000,24:62000,25:75000,26:90000,27:105000,28:120000,29:135000,30:155000};this.sizeToHdSize={TINY:4,SMALL:6,MEDIUM:8,LARGE:10,HUGE:12,GARGANTUAN:20};}_createClass(Npc,[{key:'updateType',value:function updateType(){server.getSetItems('npc.updateType',{collectionArray:['type'],process:function process(data){if((0,_utilities.exists)(data.type)){data.type=data.type.toLowerCase();}}});}},{key:'updateSize',value:function updateSize(){var _this=this;server.getSetItems('npc.updateSize',{collectionArray:['size'],process:function process(data){if((0,_utilities.exists)(data.size)){data.size=data.size.toUpperCase();}else{data.size='MEDIUM';}data.hit_die='d'+_this.sizeToHdSize[data.size];}});}},{key:'updateAC',value:function updateAC(){server.getSetItems('npc.updateAC',{collectionArray:['ac_srd','armorClass','ac_note'],process:function process(data){if((0,_utilities.exists)(data.ac_srd)){var match=data.ac_srd.match(/(\d+)\s?(.*)/);if(match&&match[1]){data.AC=match[1];data.ac_srd='';}if(match&&match[2]){data.ac_note=match[2].replace(/\(|\)/g,'');}}}});}},{key:'switchTo',value:function switchTo(){server.getSetItems('npc.switchTo',{collectionArray:['is_npc','size','ac_srd'],process:function process(data){if((0,_utilities.exists)(data.is_npc)){data.hit_dice_output_option='/w GM';if((0,_utilities.isUndefinedOrEmpty)(data.size)){data.size='MEDIUM';}}else{data.hit_dice_output_option='';}}});}},{key:'updateChallenge',value:function updateChallenge(callback){var _this2=this;server.getSetItems('npc.updateChallenge',{collectionArray:['challenge','xp'],process:function process(data){var challenge=data.challenge;data.xp=_this2.xpPerChallenge[challenge];data.xp_readable=format.numberWithCommas(data.xp);var challengeInt=Math.max(1,(0,_utilities.getIntValue)(challenge));data.level=challengeInt;proficiencyBonus.set(challengeInt,callback);}});}},{key:'updateHPInner',value:function updateHPInner(data){var hdNum=parseFloat(data.hit_dice);var hdSize=(0,_utilities.getIntValue)(data.hit_die.replace('d',''));var hdAverage=hdSize/2+0.5;var conMod=abilitiesUtil.getAbilityMod(data,'constitution');data.HP=Math.floor(hdNum*hdAverage);data.hp_formula=hdNum+'d'+hdSize;if(conMod!==0){var bonusHP=hdNum*conMod;data.HP+=bonusHP;data.hp_formula+=format.addArithmeticOperator(bonusHP);}if((0,_utilities.exists)(data.hp_extra)){var regex=/(?:(\+|-)\s?)?(\d+)(?:d(\d+))?/gi;var splitFormula=void 0;while((splitFormula=regex.exec(data.hp_extra))!==null){if(!splitFormula||!splitFormula[2]){console.error('Character doesn\'t have valid hp formula');}else{var amount=0;if(!splitFormula[3]){amount=(0,_utilities.getIntValue)(splitFormula[2]);}else{var extraHdNum=(0,_utilities.getIntValue)(splitFormula[2]);var extraHdSize=(0,_utilities.getIntValue)(splitFormula[3]);var extraHdAverage=extraHdSize/2+0.5;amount=Math.floor(extraHdNum*extraHdAverage);}if(!splitFormula[1]||splitFormula[1]==='+'){data.HP+=amount;data.hp_formula+=' + '+amount;}else if(splitFormula[1]==='-'){data.HP-=amount;data.hp_formula+=' - '+amount;}}data.hp_extra.toString().replace(splitFormula[0],'');}}if(data.HP){data.HP_max=data.HP;}}},{key:'updateHP',value:function updateHP(){var _this3=this;server.getSetItems('npc.updateHP',{collectionArray:['HP','HP_max','hp_formula','hit_dice','hit_die','hp_extra','constitution'],process:function process(data){if((0,_utilities.exists)(data.hit_dice)){_this3.updateHPInner(data);}}});}},{key:'cleanHPFromSRD',value:function cleanHPFromSRD(data){data.hp_srd=data.hp_srd.replace(/—/g,'-').replace(/–/g,'-').replace(/\u2012/g,'-');}},{key:'processUpdateHPFromSRD',value:function processUpdateHPFromSRD(data){if((0,_utilities.exists)(data.hp_srd)){this.cleanHPFromSRD(data);var match=data.hp_srd.match(/\((\d+)d(\d+)(?:\s?(\+|-)\s?(\d+))?\)/i);if(!match||!match[1]||!match[2]){console.error('Character doesn\'t have valid HP/HD format');}else{var hdNum=(0,_utilities.getIntValue)(match[1]);var conMod=abilitiesUtil.getAbilityMod(data,'constitution');data.hit_dice=hdNum;data.hit_die='d'+(0,_utilities.getIntValue)(match[2]);var hpExpectedBonus=hdNum*conMod;var hpBonusSign=match[3];var hpBonus=(0,_utilities.getIntValue)(''+hpBonusSign+match[4]);if(hpBonus!==hpExpectedBonus){if(hpBonusSign==='-'){data.hp_extra=hpBonus+hpExpectedBonus;}else{data.hp_extra=hpBonus-hpExpectedBonus;}}}this.updateHPInner(data);}}},{key:'updateHPFromSRD',value:function updateHPFromSRD(){var _this4=this;server.getSetItems('npc.updateHPFromSRD',{collectionArray:['hp_srd','HP','HP_max','hp_formula','hp_extra','hit_dice','hit_die','constitution','ability_score_modifier'],process:function process(data){return _this4.processUpdateHPFromSRD(data);},callback:function callback(){return hitDice.update();}});}},{key:'splitContentByTitles',value:function splitContentByTitles(data,title){if((0,_utilities.exists)(data.content_srd)&&data.content_srd.includes(title)){var contentSplit=data.content_srd.split('\n '+title+'\n');data.content_srd=contentSplit[0];return contentSplit[1];}return'';}},{key:'parseSRDContentSection',value:function parseSRDContentSection(data,title,name){var section=this.splitContentByTitles(data,title,name);if((0,_utilities.exists)(section)){if(name==='regionaleffect'||name==='lairaction'){var typeList=section.split(/•/);typeList.slice(1,typeList.length).forEach(function(type){var repString='repeating_'+name+'_'+generateRowID();data[repString+'_content']=type.replace(/\n.*/g,'').trim();});}else{if(name==='legendaryaction'){var legendaryActionsMatch=section.match(/Can take (\d+) Legendary Actions/i);if(legendaryActionsMatch&&legendaryActionsMatch[1]){data.legendary_action_amount=(0,_utilities.getIntValue)(legendaryActionsMatch[1]);data.legendary_action_amount_max=(0,_utilities.getIntValue)(legendaryActionsMatch[1]);}}var re=/@(.*)@(?::|\.)\s([^@]+)/gi;var match=void 0;while((match=re.exec(section.replace(/\*\*/g,'@')))!==null){if(match&&match[1]&&match[2]){var repString='repeating_'+name+'_'+generateRowID();data[repString+'_name']=match[1];data[repString+'_content']=match[2].trim();}else{console.error('Character doesn\'t have a valid '+name+' format');}}}}}},{key:'setSpellAbility',value:function setSpellAbility(data){var abilityScores=[(0,_utilities.getIntValue)(data.intelligence),(0,_utilities.getIntValue)(data.wisdom),(0,_utilities.getIntValue)(data.charisma)];var highestAbilityScore=Math.max.apply(Math,abilityScores);var highestAbilityName='INTELLIGENCE';if(highestAbilityScore===abilityScores[1]){highestAbilityName='WISDOM';}else if(highestAbilityScore===abilityScores[2]){highestAbilityName='CHARISMA';}data.spell_ability=highestAbilityName;}},{key:'cleanContent',value:function cleanContent(content){return content.replace(/\*\*\n\t/g,'**').replace(/\*\*\n/g,'**').replace(/:\*\*/g,'**:').replace(/  \n\n/g,'\n\n').replace(/“/g,'"').replace(/”/g,'"').replace(/'/g,'’').replace(/ Legendary Actions\n/g,'\n Legendary Actions\n').replace(/ Reactions\n/g,'\n Reactions\n').replace(/^(?:\s?Actions\n)/g,'\n Actions\n').replace(/ Traits\n/g,'\n Traits\n').replace(/ Regional Effects\n/g,'\n Regional Effects\n').replace(/ Lair Actions\n/g,'\n Lair Actions\n');}},{key:'updateContent',value:function updateContent(){var _this5=this;server.getSetItems('npc.updateContent',{collectionArray:['content_srd'].concat(_constants.ABILITIES),process:function process(data){data.is_npc=1;data.edit_mode=0;data.sheet_processing_complete='';_this5.setSpellAbility(data);if((0,_utilities.exists)(data.content_srd)){data.content_srd=_this5.cleanContent(data.content_srd);_this5.parseSRDContentSection(data,'Legendary Actions','legendaryaction');_this5.parseSRDContentSection(data,'Reactions','reaction');_this5.parseSRDContentSection(data,'Actions','action');_this5.parseSRDContentSection(data,'Traits','trait');_this5.parseSRDContentSection(data,'Regional Effects','regionaleffect');_this5.parseSRDContentSection(data,'Lair Actions','lairaction');}},callback:function callback(){actions.update(['trait','action','reaction','legendaryaction','lairaction','regionaleffect']);spells.findSpellcasting();},serverCallCallback:function serverCallCallback(){server.getSetItems('npc.updateContentComplete',{collectionArray:['sheet_processing_complete'],process:function process(data){data.sheet_processing_complete='drag_from_srd';}});}});}},{key:'updateLanguages',value:function updateLanguages(){server.getSetItems('npc.updateLanguages',{collectionArray:['languages','languages_chat_var'],process:function process(data){data.languages_chat_var='';if(data.languages){data.languages_chat_var='{{Languages=@{languages}}}';}}});}},{key:'updateACNote',value:function updateACNote(){server.getSetItems('npc.updateACNote',{collectionArray:['ac_note'],process:function process(data){if(data.ac_note){data.ac_note=data.ac_note.toLowerCase();}}});}},{key:'updateCasterLevel',value:function updateCasterLevel(){server.getSetItems('npc.updateCasterLevel',{collectionArray:['spellcaster_level','caster_level'],process:function process(data){data.caster_level=(0,_utilities.getIntValue)(data.spellcaster_level);}});}},{key:'processSense',value:function processSense(tokenProps,sense,senseRange){if(sense==='darkvision'){tokenProps.light_dimradius=format.round(-5*(senseRange/60));}if(!tokenProps.light_radius||senseRange>tokenProps.light_radius){tokenProps.light_radius=format.round(senseRange*1.166666666666);}else if(senseRange<tokenProps.light_radius){tokenProps.light_dimradius=senseRange;}}},{key:'npcDroppedOnTabletop',value:function npcDroppedOnTabletop(){var _this6=this;server.getSetItems('npc.npcDroppedOnTabletop',{collectionArray:['hp_max','token_size'].concat(_constants.SENSES),process:function process(data){var hp=(0,_utilities.getIntValue)(data.hp_max);var tokenProps={bar1_value:hp,bar1_max:hp,bar2_link:'AC',bar3_link:'speed',height:70,light_angle:360,light_hassight:true,light_losangle:360,showname:true,showplayers_aura1:true,showplayers_aura2:true,width:70};var squarelength=70;if(data.token_size){var tokenWidth=parseFloat(data.token_size)*squarelength;var tokenHeight=parseFloat(data.token_size)*squarelength;if(data.token_size.includes(',')){tokenWidth=parseFloat(data.token_size.substring(0,data.token_size.indexOf(',')));tokenHeight=parseFloat(data.token_size.substring(data.token_size.indexOf(',')+1,data.token_size.length));}if(tokenWidth>0){tokenProps.width=tokenWidth;}if(tokenHeight>0){tokenProps.height=tokenHeight;}}_constants.SENSES.forEach(function(sense){if((0,_utilities.exists)(data.senses)){var senseRegex=new RegExp(sense+'\\s(\\d+)','gi');var senseResult=data.senses.match(senseRegex);if(senseResult){_this6.processSense(tokenProps,sense,senseResult[1]);}}else if(data[sense]){_this6.processSense(tokenProps,sense,parseFloat(data[sense]));}});setDefaultToken(tokenProps);}});}},{key:'turnOnSlotsIfItsNotSet',value:function turnOnSlotsIfItsNotSet(){server.getSetItems('npc.turnOnSlotsIfItsNotSet',{collectionArray:['spellcasting','spell_slots_toggle'],process:function process(data){if((0,_utilities.exists)(data.spellcasting)){data.spell_slots_toggle=1;}}});}},{key:'setup',value:function setup(){var _this7=this;on('change:type',function(){_this7.updateType();});on('change:size',function(){_this7.updateSize();});on('change:ac_srd',function(){_this7.updateAC();});on('change:is_npc',function(){_this7.switchTo();});on('change:challenge',function(){_this7.updateChallenge();});on('change:hp_srd',function(){_this7.updateHPFromSRD();});on('change:hit_dice change:hit_die change:hp_extra change:constitution change:ability_score_modifier',function(){_this7.updateHP();});on('change:content_srd',function(){_this7.updateContent();});on('change:languages',function(){_this7.updateLanguages();});on('change:ac_note',function(){_this7.updateACNote();});on('change:spellcaster_level',function(){_this7.updateCasterLevel();});on('change:spellcasting',function(){_this7.turnOnSlotsIfItsNotSet();});on('sheet:compendium-drop',function(){_this7.npcDroppedOnTabletop();});}}]);return Npc;}();
 
 },{"../abilities/AbilitiesUtil":2,"../actions/Actions":9,"../hitDice/HitDice":18,"../proficiencyBonus/ProficiencyBonus":23,"../scripts/Format":29,"../scripts/Server":33,"../scripts/constants":35,"../scripts/utilities":37,"../spells/Spells":41}],22:[function(require,module,exports){
 'use strict';Object.defineProperty(exports,"__esModule",{value:true});exports.Processing=undefined;var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _Server=require('../scripts/Server');function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}var server=new _Server.Server();var Processing=exports.Processing=function(){function Processing(){_classCallCheck(this,Processing);}_createClass(Processing,[{key:'close',value:function close(){server.getSetItems('Processing.close',{collectionArray:['processing'],process:function process(data){data.processing='';}});}},{key:'setup',value:function setup(){var _this=this;on('change:close_processing',function(){_this.close();});}}]);return Processing;}();
@@ -123,7 +123,7 @@
 'use strict';Object.defineProperty(exports,"__esModule",{value:true});exports.Spells=undefined;var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _constants=require('../scripts/constants');var _AbilitiesUtil=require('../abilities/AbilitiesUtil');var _ActionComponents=require('../actionComponents/ActionComponents');var _Actions=require('../actions/Actions');var _Attack=require('../actionComponents/Attack');var _Distance=require('../scripts/Distance');var _Format=require('../scripts/Format');var _Heal=require('../actionComponents/Heal');var _SavingThrow=require('../actionComponents/SavingThrow');var _Server=require('../scripts/Server');var _utilities=require('../scripts/utilities');function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}var abilitiesUtil=new _AbilitiesUtil.AbilitiesUtil();var actions=new _Actions.Actions();var actionComponents=new _ActionComponents.ActionComponents();var attack=new _Attack.Attack();var distance=new _Distance.Distance();var format=new _Format.Format();var heal=new _Heal.Heal();var savingThrow=new _SavingThrow.SavingThrow();var server=new _Server.Server();var Spells=exports.Spells=function(){function Spells(){_classCallCheck(this,Spells);}_createClass(Spells,[{key:'parseFromSRD',value:function parseFromSRD(data,repString){if(data[repString+'_name']==='Magic Missile'&&!isNaN(data[repString+'_spell_level'])){data[repString+'_other_damage_dice']=1;data[repString+'_other_damage_die']='d4';data[repString+'_other_damage_bonus']=1;data[repString+'_other_higher_level_dice']='';}this.parseRepeatFromName(data,repString);if(data[repString+'_type_from_srd']){if(data[repString+'_type_from_srd']==='Melee'){data[repString+'_attack_type']='MELEE_SPELL_ATTACK';attack.setAttackAbilityBasedOnAttackType(data,repString);}else if(data[repString+'_type_from_srd']==='Ranged'){data[repString+'_attack_type']='RANGED_SPELL_ATTACK';attack.setAttackAbilityBasedOnAttackType(data,repString);}data[repString+'_type_from_srd']='';}if(data[repString+'_spell_level']&&!isNaN(data[repString+'_spell_level'])){data[repString+'_spell_level']=format.ordinalSpellLevel(data[repString+'_spell_level']);}if(data[repString+'_school']){var newSchool=data[repString+'_school'].toUpperCase();if(data[repString+'_school']!==newSchool){data[repString+'_school']=newSchool;}}if(data[repString+'_casting_time']){var newCastingTime=data[repString+'_casting_time'].toUpperCase().trim().replace(/\s/g,'_');if(data[repString+'_casting_time']!==newCastingTime){data[repString+'_casting_time']=newCastingTime;}}if(data[repString+'_components']){if(!data[repString+'_components'].includes('COMPONENTS_')&&!data[repString+'_components'].includes('DISPLAY_')){data[repString+'_components']='COMPONENTS_'+data[repString+'_components'].toUpperCase().trim().replace(/\s/g,'_');}}if(data[repString+'_duration']){var newDuration=''+(data[repString+'_duration'].toLowerCase().includes('up to')?'CONCENTRATION_':'')+data[repString+'_duration'].toUpperCase().trim().replace(/\s/g,'_');if(data[repString+'_duration']&&data[repString+'_duration']!==newDuration){data[repString+'_duration']=newDuration;}}if((0,_utilities.exists)(data[repString+'_higher_spell_slot_dice_from_srd'])){var prefix=(0,_utilities.getDamagePrefix)(data,repString);data[repString+'_'+prefix+'_higher_level_dice']=data[repString+'_higher_spell_slot_dice_from_srd'];data[repString+'_higher_spell_slot_dice_from_srd']='';}if((0,_utilities.exists)(data[repString+'_add_casting_modifier'])&&(0,_utilities.exists)(data.spell_ability)){var _prefix=(0,_utilities.getDamagePrefix)(data,repString);if((0,_utilities.exists)(data[repString+'_damage_from_srd'])){data[repString+'_'+_prefix+'_damage_ability']=abilitiesUtil.getFormattedAbility(data.spell_ability);}if((0,_utilities.exists)(data[repString+'_heal_from_srd'])){data[repString+'_heal_ability']=abilitiesUtil.getFormattedAbility(data.spell_ability);}data[repString+'_add_casting_modifier']='';}if(data[repString+'_damage_progression_from_srd']==='Cantrip Dice'&&(0,_utilities.exists)(data[repString+'_damage_from_srd'])){var _prefix2=(0,_utilities.getDamagePrefix)(data,repString);data[repString+'_'+_prefix2+'_damage_dice']='[[ceil((@{level} + 2) / 6)]]';data[repString+'_'+_prefix2+'_damage_die']=data[repString+'_damage_from_srd'].replace('1d','d');data[repString+'_damage_progression_from_srd']='';data[repString+'_damage_from_srd']='';}if((0,_utilities.exists)(data[repString+'_content'])){var spellHigherLevelRegex=/((?:This spell'?s damage increases|At Higher Levels|When you cast this spell using).*)/gi;var spellHigherLevelResult=spellHigherLevelRegex.exec(data[repString+'_content']);if(spellHigherLevelResult){data[repString+'_higher_level']=spellHigherLevelResult[1];data[repString+'_higher_level_toggle']=1;data[repString+'_content']=data[repString+'_content'].replace(spellHigherLevelResult[1],'').trim();}}}},{key:'parseRepeatFromName',value:function parseRepeatFromName(data,repString){var repeatableSpells=['acid fog','aggressive thundercloud','animate objects','astral construct','blade barrier','burst with light','call lightning','chaos bolt','cloud of daggers','cloudkill','concussive onslaught','cordon of arrows','dust devil','ego whip','eldritch blast','evard\'s black tentacles','black tentacles','flaming sphere','guardian of faith','heat metal','hex','hunger of hadar','hunter\'s mark','ice slick','immolation','incendiary cloud','insect plague','investiture of flame','investiture of ice','investiture of stone','investiture of wind','maelstrom','maximilian\'s earthen grasp','earthen grasp','melf\'s minute meteors','minute meteors','moonbeam','mordenkainen\'s faithful hound','faithful hound','mordenkainen\'s sword','arcane sword','earthen grasp','phantasmal killer','scorching ray','searing smite','spirit guardians','spiritual weapon','storm sphere','sunbeam','tsunami','vampiric touch','wall of fire','wall of ice','wall of thorns','whirlwind','wind wall','witch bolt'];if((0,_utilities.exists)(data[repString+'_name'])&&((0,_utilities.isUndefinedOrEmpty)(data[repString+'_parsed'])||data[repString+'_parsed']&&!data[repString+'_parsed'].includes('repeat'))&&repeatableSpells.includes(data[repString+'_name'].toLowerCase())){data[repString+'_repeat_toggle']=1;if((0,_utilities.isUndefinedOrEmpty)(data[repString+'_parsed'])){data[repString+'_parsed']='';}data[repString+'_parsed']+=' repeat';}}},{key:'updateSpellAbility',value:function updateSpellAbility(){server.getSetItems('spells.updateSpellAbility',{collectionArray:['spell_ability'],repeatingSections:_constants.SPELL_LEVELS.map(function(spellLevel){return{name:'repeating_spell'+spellLevel,collectionArrayAddItems:['name','attack_toggle','attack_ability','attack_damage_ability','attack_second_damage_ability','saving_throw_toggle','saving_throw_ability','saving_throw_damage_ability','saving_throw_second_damage_ability','other_damage_toggle','other_damage_ability','other_second_damage_ability','heal_toggle','heal_ability']};}),process:function process(data,repStrings){repStrings.forEach(function(repString){if((0,_utilities.isUndefinedOrEmpty)(data[repString+'_name'])){removeRepeatingRow(repString);}else if(data.spell_ability){var spellAbility=abilitiesUtil.getFormattedAbility(data.spell_ability);if((0,_utilities.exists)(data[repString+'_attack_toggle'])){data[repString+'_attack_ability']=spellAbility;data[repString+'_attack_damage_ability']=spellAbility;if((0,_utilities.exists)(data[repString+'_attack_second_damage_ability'])){data[repString+'_attack_second_damage_ability']=spellAbility;}}if((0,_utilities.exists)(data[repString+'_saving_throw_toggle'])){data[repString+'_saving_throw_ability']=spellAbility;if((0,_utilities.exists)(data[repString+'_saving_throw_damage_ability'])){data[repString+'_saving_throw_damage_ability']=spellAbility;}if((0,_utilities.exists)(data[repString+'_saving_throw_second_damage_ability'])){data[repString+'_saving_throw_second_damage_ability']=spellAbility;}}if((0,_utilities.exists)(data[repString+'_other_damage_toggle'])){if((0,_utilities.exists)(data[repString+'_other_damage_ability'])){data[repString+'_other_damage_ability']=spellAbility;}if((0,_utilities.exists)(data[repString+'_other_second_damage_ability'])){data[repString+'_other_second_damage_ability']=spellAbility;}}if((0,_utilities.exists)(data[repString+'_heal_toggle'])&&(0,_utilities.exists)(data[repString+'_heal_ability'])){data[repString+'_heal_ability']=spellAbility;}}});}});}},{key:'updateConcentration',value:function updateConcentration(data,repString){if((0,_utilities.exists)(data[repString+'_duration'])&&data[repString+'_duration'].includes('CONCENTRATION')){data[repString+'_concentration']='Yes';}else{data[repString+'_concentration']='';}}},{key:'updateRitual',value:function updateRitual(data,repString){if(data[repString+'_ritual']==='Yes'){data[repString+'_ritual_output']='?{Cast as|Ritual,{{ritual=1&#125;&#125;|Spell,}';}else{data[repString+'_ritual_output']='';}}},{key:'updateMaterials',value:function updateMaterials(data,repString){if(!(0,_utilities.isUndefinedOrEmpty)(data[repString+'_materials'])){data[repString+'_materials_show']=1;}else if(!(0,_utilities.isUndefinedOrEmpty)(data[repString+'_materials_show'])){data[repString+'_materials_show']=0;}}},{key:'updateRange',value:function updateRange(data,repString){if((0,_utilities.exists)(data[repString+'_range'])){distance.convert(data,repString+'_range');}}},{key:'update',value:function update(levelToUpdate,repeatingInfo){var _this=this;var collectionArray=_constants.FIELDS.pb.concat(['is_npc','spell_ability','caster_level','distance_system']).concat(_constants.FIELDS.abilityScores).concat(_constants.FIELDS.d20).concat(_constants.FIELDS.savingThrow).concat(_constants.FIELDS.spellAttackModifier).concat(_constants.FIELDS.spellDamageModifier).concat(_constants.FIELDS.spellDCModifier).concat(_constants.FIELDS.attacksVs).concat(_constants.FIELDS.automaticDamage).concat(['spell_heal_modifier']).concat(['show_dice_modifiers','show_crit_range','critical_damage_houserule']).concat(['automatic_higher_level_queries']).concat(_constants.SPELL_LEVELS.map(function(level){return'spell_slots_l'+level+'_max';})).concat(['use_custom_saving_throws']);_constants.CUSTOM_SAVING_THROWS.forEach(function(customSavingThrow){collectionArray=collectionArray.concat(_constants.ABILITIES.map(function(ability){return customSavingThrow+'_'+ability;}));});var updateSpellFilter=false;var levelsToUpdate=levelToUpdate?[levelToUpdate]:_constants.SPELL_LEVELS;server.getSetItems('spells.update',{collectionArray:collectionArray,repeatingSections:levelsToUpdate.map(function(spellLevel){return{name:'repeating_spell'+spellLevel,collectionArrayAddItems:['type_from_srd','spell_level','school','ritual','ritual_output','is_prepared','casting_time','components','materials','materials_show','duration','higher_level_toggle','higher_level','damage_progression_from_srd','concentration','higher_spell_slot_dice_from_srd','add_casting_modifier','special_effects_toggle','roll_formula_repeat'].concat(_constants.REPEATING_FIELDS.default).concat(_constants.REPEATING_FIELDS.parse).concat(_constants.REPEATING_FIELDS.uses).concat(_constants.REPEATING_FIELDS.content).concat(_constants.REPEATING_FIELDS.attack).concat(_constants.REPEATING_FIELDS.attackDamage).concat(_constants.REPEATING_FIELDS.attackSecondDamage).concat(_constants.REPEATING_FIELDS.savingThrow).concat(_constants.REPEATING_FIELDS.savingThrowDamage).concat(_constants.REPEATING_FIELDS.savingThrowSecondDamage).concat(_constants.REPEATING_FIELDS.otherDamage).concat(_constants.REPEATING_FIELDS.otherSecondDamage).concat(_constants.REPEATING_FIELDS.heal).concat(_constants.REPEATING_FIELDS.extras).concat(_constants.REPEATING_FIELDS.repeat).concat(_constants.SPELL_LEVELS.map(function(level){return'spell_level_filter_'+level;})),repeatingInfo:repeatingInfo};}),process:function process(data,repStrings){repStrings.forEach(function(repString){if((0,_utilities.isUndefinedOrEmpty)(data[repString+'_name'])){removeRepeatingRow(repString);}else{var level=(0,_utilities.getLevelOfRepeatingString)(repString);if((0,_utilities.isUndefinedOrEmpty)(data[repString+'_spell_level'])){data[repString+'_spell_level']=format.ordinalSpellLevel(level);}if((0,_utilities.getIntValue)(data[repString+'_spell_level'])!==level){_this.changeLevel(level,repeatingInfo);}else{if(!data['spell_level_filter_'+level]){data['spell_level_filter_'+level]=1;updateSpellFilter=true;}data[repString+'_roll_formula']='';_this.parseFromSRD(data,repString);actionComponents.parse(data,repString);actionComponents.updateUses(data,repString);actionComponents.updateRecharge(data,repString);actionComponents.updateContent(data,repString);if(level===0&&(0,_utilities.isUndefinedOrEmpty)(data[repString+'_is_prepared'])){data[repString+'_is_prepared']='Yes';}_this.updateConcentration(data,repString);_this.updateRitual(data,repString);_this.updateMaterials(data,repString);_this.updateRange(data,repString);if((0,_utilities.exists)(data.is_npc)&&data.caster_level){var prefixes=['attack','attack_second','saving_throw','saving_throw_second','other','other_second'];prefixes.forEach(function(prefix){if(data[repString+'_'+prefix+'_damage_dice']&&data[repString+'_'+prefix+'_damage_dice'].includes('@{level}')){data[repString+'_'+prefix+'_damage_dice']=data[repString+'_'+prefix+'_damage_dice'].replace('@{level}','@{caster_level}');}});}attack.update(data,repString,repeatingInfo);savingThrow.update(data,repString,repeatingInfo);actionComponents.updateOtherDamage(data,repString,repeatingInfo);heal.update(data,repString);actionComponents.updateHigherLevel(data,repString,level);actionComponents.updateSpecialEffects(data,repString);actionComponents.updateRepeat(data,repString);actionComponents.updateExtras(data,repString);actionComponents.updateRepeatAfterExtras(data,repString,level);}}});},callback:function callback(){if(updateSpellFilter){_this.filtersMacroOutput();}}});}},{key:'updateDCAndAttack',value:function updateDCAndAttack(){server.getSetItems('spells.updateDCAndAttack',{collectionArray:_constants.FIELDS.pb.concat(_constants.FIELDS.abilityScores).concat(_constants.FIELDS.d20).concat(_constants.FIELDS.savingThrow).concat(_constants.FIELDS.spellAttackModifier).concat(_constants.FIELDS.spellDCModifier).concat(_constants.FIELDS.attacksVs).concat(['spell_ability','spell_save_DC','spell_to_hit']),process:function process(data){var pb=(0,_utilities.getPB)(data);var abilityMod=0;if((0,_utilities.exists)(data.spell_ability)){abilityMod=abilitiesUtil.getAbilityMod(data,data.spell_ability);}var obj={saveDC:parseFloat(data.base_dc||8)+abilityMod,saveDCFormula:parseFloat(data.base_dc||8)+abilityMod,attack:abilityMod,attackFormula:abilityMod};if(!isNaN(pb)){obj.saveDC+=pb;obj.attack+=pb;}obj.saveDCFormula=format.addTo(obj.saveDCFormula,pb+'['+getTranslationByKey('PROFICIENT').toLowerCase()+']');obj.attackFormula=format.addTo(obj.attackFormula,pb+'['+getTranslationByKey('PROFICIENT').toLowerCase()+']');format.addModifier(data,obj,'spell_dc','saveDC','saveDCFormula',''+getTranslationByKey('SPELL_DC_MODIFIER').toLowerCase());format.addModifier(data,obj,'attack','attack','attackFormula',''+getTranslationByKey('ATTACK_MODIFIER').toLowerCase());format.addModifier(data,obj,'spell_attack','attack','attackFormula',''+getTranslationByKey('SPELL_ATTACK_MODIFIER').toLowerCase());data.spell_save_DC=obj.saveDC;data.spell_to_hit=format.showSign(obj.attack);data.spell_save_DC_formula='{{saving_throw_dc=[['+obj.saveDCFormula+']]}}';data.spell_to_hit_formula='{{attack1=[[@{shaped_d20}@{d20_mod} + '+obj.attackFormula+'}]]}}';if(data.shaped_d20==='1d20'){data.spell_to_hit_formula+=' {{attack2=[[@{shaped_d20}@{d20_mod} + '+obj.attackFormula+']]}}';}if((0,_utilities.exists)(data.attacks_vs_target_ac)){data.spell_to_hit_formula+=' {{targetName=@{target|token_name}}}';}if((0,_utilities.exists)(data.attacks_vs_target_name)){data.spell_save_DC_formula+=' {{targetName=@{target|token_name}}}';data.spell_to_hit_formula+=' {{targetName=@{target|token_name}}}';}}});}},{key:'changeLevel',value:function changeLevel(oldLevel,repeatingInfo){var _this2=this;var newLevel=void 0;var newRowId=void 0;var fieldsToChange=['spell_level','school','ritual','ritual_output','is_prepared','casting_time','components','materials','materials_show','duration','higher_level_toggle','higher_level','concentration','special_effects_toggle'].concat(_constants.REPEATING_FIELDS.default).concat(_constants.REPEATING_FIELDS.parse).concat(_constants.REPEATING_FIELDS.content).concat(_constants.REPEATING_FIELDS.attack).concat(_constants.REPEATING_FIELDS.attackDamage).concat(_constants.REPEATING_FIELDS.attackSecondDamage).concat(_constants.REPEATING_FIELDS.savingThrow).concat(_constants.REPEATING_FIELDS.savingThrowDamage).concat(_constants.REPEATING_FIELDS.savingThrowSecondDamage).concat(_constants.REPEATING_FIELDS.otherDamage).concat(_constants.REPEATING_FIELDS.otherSecondDamage).concat(_constants.REPEATING_FIELDS.heal).concat(_constants.REPEATING_FIELDS.extras).concat(['type_from_srd','higher_spell_slot_dice_from_srd','add_casting_modifier','damage_progression_from_srd']);server.getSetItems('spells.changeLevel',{repeatingSections:[{name:'repeating_spell'+oldLevel,collectionArrayAddItems:fieldsToChange,repeatingInfo:repeatingInfo}],process:function process(data,repStrings){repStrings.forEach(function(repString){newLevel=(0,_utilities.getIntValue)(data[repString+'_spell_level']);if(oldLevel!==newLevel){newRowId=generateRowID();var newRepeatingString='repeating_spell'+newLevel+'_'+newRowId;fieldsToChange.forEach(function(field){if(data[repString+'_'+field]){data[newRepeatingString+'_'+field]=data[repString+'_'+field];}});removeRepeatingRow(repString);}});},callback:function callback(){_this2.update(newLevel,{rowId:newRowId});_this2.updateChatMacro([oldLevel,newLevel]);}});}},{key:'updateSlots',value:function updateSlots(){var _this3=this;var levels={1:0,2:0,3:0,4:0,5:0,6:0,7:0,8:0,9:0};server.getSetItems('spells.updateSlots',{collectionArray:['caster_level','caster_type'].concat(_constants.SPELL_LEVELS.map(function(level){return'spell_slots_l'+level;})).concat(_constants.SPELL_LEVELS.map(function(level){return'spell_slots_l'+level+'_calc';})).concat(_constants.SPELL_LEVELS.map(function(level){return'spell_slots_l'+level+'_bonus';})).concat(_constants.SPELL_LEVELS.map(function(level){return'spell_slots_l'+level+'_max';})).concat(_constants.SPELL_LEVELS.map(function(level){return'spell_level_filter_'+level;})),process:function process(data){var casterLevel=(0,_utilities.getIntValue)(data.caster_level);var casterType=data.caster_type;if(casterType==='full'){if(casterLevel>=3){levels[1]=4;}else if(casterLevel===2){levels[1]=3;}else if(casterLevel===1){levels[1]=2;}if(casterLevel>=4){levels[2]=3;}else if(casterLevel===3){levels[2]=2;}if(casterLevel>=6){levels[3]=3;}else if(casterLevel===5){levels[3]=2;}if(casterLevel>=9){levels[4]=3;}else if(casterLevel===8){levels[4]=2;}else if(casterLevel===7){levels[4]=1;}if(casterLevel>=18){levels[5]=3;}else if(casterLevel>=10){levels[5]=2;}else if(casterLevel===9){levels[5]=1;}if(casterLevel>=19){levels[6]=2;}else if(casterLevel>=11){levels[6]=1;}if(casterLevel>=20){levels[7]=2;}else if(casterLevel>=13){levels[7]=1;}if(casterLevel>=15){levels[8]=1;}if(casterLevel>=17){levels[9]=1;}}if(casterType==='half'){if(casterLevel>=5){levels[1]=4;}else if(casterLevel>=3){levels[1]=3;}else if(casterLevel===2){levels[1]=2;}if(casterLevel>=7){levels[2]=3;}else if(casterLevel>=5){levels[2]=2;}if(casterLevel>=11){levels[3]=3;}else if(casterLevel>=9){levels[3]=2;}if(casterLevel>=17){levels[4]=3;}else if(casterLevel>=15){levels[4]=2;}else if(casterLevel>=13){levels[4]=1;}if(casterLevel>=19){levels[5]=2;}else if(casterLevel>=17){levels[5]=1;}}if(casterType==='third'){if(casterLevel>=7){levels[1]=4;}else if(casterLevel>=4){levels[1]=3;}else if(casterLevel===3){levels[1]=2;}if(casterLevel>=10){levels[2]=3;}else if(casterLevel>=7){levels[2]=2;}if(casterLevel>=16){levels[3]=3;}else if(casterLevel>=13){levels[3]=2;}if(casterLevel>=19){levels[4]=1;}}Object.keys(levels).forEach(function(level){if(levels[level]>0||(0,_utilities.exists)(data['spell_slots_l'+level+'_calc'])){data['spell_slots_l'+level+'_calc']=levels[level];}else if((0,_utilities.exists)(data['spell_slots_l'+level+'_calc'])){data['spell_slots_l'+level+'_calc']='';}var spellSlotMax=levels[level]+(0,_utilities.getIntValue)(data['spell_slots_l'+level+'_bonus']);if(spellSlotMax>0){data['spell_slots_l'+level+'_max']=spellSlotMax;if((0,_utilities.isUndefinedOrEmpty)(data['spell_slots_l'+level])){data['spell_slots_l'+level]=spellSlotMax;}data['spell_level_filter_'+level]=1;}else{if((0,_utilities.exists)(data['spell_slots_l'+level])){data['spell_slots_l'+level]='';}if((0,_utilities.exists)(data['spell_slots_l'+level+'_max'])){data['spell_slots_l'+level+'_max']=0;}if((0,_utilities.exists)(data['spell_level_filter_'+level])){data['spell_level_filter_'+level]=0;}}});},callback:function callback(){_this3.generateHigherLevelQueries();}});}},{key:'updateWarlockSlots',value:function updateWarlockSlots(){server.getSetItems('spells.updateWarlockSlots',{collectionArray:['warlock_spell_slots','warlock_spell_slots_calc','warlock_spell_slots_bonus','warlock_spell_slots_max'],process:function process(data){var warlockSlots=(0,_utilities.getIntValue)(data.warlock_spell_slots_calc)+(0,_utilities.getIntValue)(data.warlock_spell_slots_bonus);data.warlock_spell_slots=warlockSlots;data.warlock_spell_slots_max=warlockSlots;}});}},{key:'updateChatMacro',value:function updateChatMacro(levelsToUpdate){if(!levelsToUpdate){levelsToUpdate=_constants.SPELL_LEVELS;}var chatMacro={};levelsToUpdate.forEach(function(spellLevel){chatMacro[spellLevel]=[];});server.getSetItems('spells.updateChatMacro',{collectionArray:levelsToUpdate.map(function(level){return'spells_level_'+level+'_macro_var';}),repeatingSections:levelsToUpdate.map(function(spellLevel){return{name:'repeating_spell'+spellLevel,collectionArrayAddItems:['name','is_prepared'].concat(_constants.REPEATING_FIELDS.uses)};}),process:function process(data,repStrings){repStrings.forEach(function(repString){if((0,_utilities.isUndefinedOrEmpty)(data[repString+'_name'])){removeRepeatingRow(repString);}else{var level=(0,_utilities.getLevelOfRepeatingString)(repString);var classes=['spell-wrapper'];if(data[repString+'_is_prepared']==='Yes'){classes.push('prepared');}classes=classes.map(function(className){return'sheet-'+className;}).join(' ');var action={name:data[repString+'_name']};actionComponents.updateUsesForChatMacro(data,repString,action);chatMacro[level].push('<span class="'+classes+'">['+action.name+'](~'+repString+'_spell)</span>');}});levelsToUpdate.forEach(function(level){data['spells_level_'+level+'_macro_var']=chatMacro[level].join(', ');if(level===0||data['spells_level_'+level+'_macro_var']&&data['spells_level_'+level+'_macro_var'].length>0){data['spell_level_filter_'+level]=1;}});}});}},{key:'count',value:function count(){server.getSetItems('spells.count',{collectionArray:['spells_known','spells_prepared'],repeatingSections:_constants.SPELL_LEVELS.map(function(spellLevel){return{name:'repeating_spell'+spellLevel,collectionArrayAddItems:['name','is_prepared']};}),process:function process(data,repStrings){data.spells_known=0;data.spells_prepared=0;repStrings.forEach(function(repString){if((0,_utilities.isUndefinedOrEmpty)(data[repString+'_name'])){removeRepeatingRow(repString);}else{var level=(0,_utilities.getLevelOfRepeatingString)(repString);if(level>0){data.spells_known+=1;if((0,_utilities.exists)(data[repString+'_is_prepared'])){data.spells_prepared+=1;}}}});}});}},{key:'generateHigherLevelQueries',value:function generateHigherLevelQueries(){var collectionArray=['automatic_higher_level_queries','warlock_slots_toggle','warlock_spells_max_level'];for(var level=1;level<=8;level+=1){collectionArray.push('cast_as_level_'+level);collectionArray.push('higher_level_query_'+level);}for(var _level=1;_level<=9;_level+=1){collectionArray.push('spell_slots_l'+_level);}server.getSetItems('spells.generateHigherLevelQueries',{collectionArray:collectionArray,process:function process(data){for(var _level2=1;_level2<=8;_level2+=1){var levels=[];var warlockSpellsMaxLevel=(0,_utilities.getIntValue)(data.warlock_spells_max_level);for(var j=_level2;j<=9;j+=1){if(!(0,_utilities.exists)(data.automatic_higher_level_queries)||(0,_utilities.getIntValue)(data['spell_slots_l'+j])||j===warlockSpellsMaxLevel){levels.push(j);}}if(levels&&levels.length>1||levels.length===1&&levels[0]!==_level2&&!(0,_utilities.exists)(data.warlock_slots_toggle)){data['higher_level_query_'+_level2]='?{Spell Level|'+levels.join('|')+'}';}else if(levels&&levels.length===1){data['higher_level_query_'+_level2]=levels[0];}else{data['higher_level_query_'+_level2]='?{Spell Level|'+_level2+'}';}if(levels&&levels.includes(_level2)){data['cast_as_level_'+_level2]=_level2;}else{data['cast_as_level_'+_level2]=data['higher_level_query_'+_level2];}}}});}},{key:'updateHasSpellSlots',value:function updateHasSpellSlots(){server.getSetItems('spells.updateHasSpellSlots',{collectionArray:['spell_slots_toggle','has_spell_slots'],process:function process(data){if((0,_utilities.exists)(data.spell_slots_toggle)){data.has_spell_slots=true;}else{data.has_spell_slots='';}}});}},{key:'updateHasWarlockSlots',value:function updateHasWarlockSlots(){server.getSetItems('spells.updateHasWarlockSlots',{collectionArray:['warlock_slots_toggle','has_warlock_slots'],process:function process(data){if((0,_utilities.exists)(data.warlock_slots_toggle)){data.has_warlock_slots=true;}else{data.has_warlock_slots='';}}});}},{key:'updateHasSpellPoints',value:function updateHasSpellPoints(){server.getSetItems('spells.updateHasSpellPoints',{collectionArray:['spell_points_toggle','has_spell_points'],process:function process(data){if((0,_utilities.exists)(data.spell_points_toggle)){data.has_spell_points=true;}else{data.has_spell_points='';}}});}},{key:'parseSpellcastingAbilityFromTraits',value:function parseSpellcastingAbilityFromTraits(data,repString){var spellcastingAbilityRegex=/spellcasting ability is (\w+)/i;var spellcastingAbilityRegexSecond=/uses (\w+) as (her|his|its) spellcasting ability/i;var spellcastingSearch=spellcastingAbilityRegex.exec(data[repString+'_content']);if(spellcastingSearch&&spellcastingSearch[1]){data.spell_ability=spellcastingSearch[1].toUpperCase();}else{var spellcastingSearchSecond=spellcastingAbilityRegexSecond.exec(data[repString+'_content']);if(spellcastingSearchSecond&&spellcastingSearchSecond[1]){data.spell_ability=spellcastingSearchSecond[1].toUpperCase();}}}},{key:'parseSpellsPerLevel',value:function parseSpellsPerLevel(data,repStrings,spellsToParseObj){var listOfSpells=repStrings.map(function(repString){return data[repString+'_name'].toLowerCase();});Object.keys(spellsToParseObj).forEach(function(level){if(spellsToParseObj[level].bonusSlots){data['spell_slots_l'+level+'_bonus']=spellsToParseObj[level].bonusSlots;}spellsToParseObj[level].spells.split(',').forEach(function(spell){spell=spell.trim();if(listOfSpells&&!listOfSpells.includes(spell)){var repStringNew='repeating_spell'+level+'_'+generateRowID();data[repStringNew+'_name']=spell;data[repStringNew+'_spell_level']=format.ordinalSpellLevel(level);}});});}},{key:'parseSpellcastingFromTraits',value:function parseSpellcastingFromTraits(data,repStrings,traitContent){data.spell_slots_toggle=1;data.spellcasting=1;var cantripsRegex=/Cantrips.*:\s(.*)/gi;var spellcastingRegex=/(\d+)\w+\slevel\s\((\d+)\s?slot(?:s)?\):?\s?(.*)/gi;var spellcastingLevelRegex=/(\d+)(?:st|dn|rd|th)-level spellcaster/i;var spellcastingClassRegex=/following (\w+) spells prepared/i;var spellcastingClassRegexSecond=/following spells prepared from the (\w+) spell list/i;var spellsToParseObj={};var cantripsSearch=cantripsRegex.exec(traitContent);if(cantripsSearch&&cantripsSearch[1]){spellsToParseObj[0]={spells:cantripsSearch[1]};}var match=void 0;while((match=spellcastingRegex.exec(traitContent))!==null){if(match&&match[1]&&match[2]&&match[3]){spellsToParseObj[match[1]]={bonusSlots:match[2],spells:match[3]};}}if((0,_utilities.objIsNotEmpty)(spellsToParseObj)){this.parseSpellsPerLevel(data,repStrings,spellsToParseObj);}var spellcastingLevelSearch=spellcastingLevelRegex.exec(traitContent);if(spellcastingLevelSearch&&spellcastingLevelSearch[1]){data.caster_level=spellcastingLevelSearch[1];data.spellcaster_level=format.ordinalSpellLevel(spellcastingLevelSearch[1]);}var spellcastingClassSearch=spellcastingClassRegex.exec(traitContent);if(spellcastingClassSearch&&spellcastingClassSearch[1]){data.spellcasting_class=spellcastingClassSearch[1].toUpperCase();}else{var spellcastingClassSearchSecond=spellcastingClassRegexSecond.exec(traitContent);if(spellcastingClassSearchSecond&&spellcastingClassSearchSecond[1]){data.spellcasting_class=spellcastingClassSearchSecond[1].toUpperCase();}}}},{key:'parseInnateSpellcastingFromTraits',value:function parseInnateSpellcastingFromTraits(data,repStrings,traitContent){data.innate_spellcasting=1;var innateSpellsRegex=/(?:At will|each):\s(.*)/gi;var innateSpellcastingComponentRegex=/(.*requiring no material components:)/i;var innateSpellcastingComponentRegexSecond=/(.*requiring only verbal components:)/i;var spellsToParseObj={0:{spells:''},1:{spells:''},2:{spells:''},3:{spells:''},4:{spells:''},5:{spells:''},6:{spells:''},7:{spells:''},8:{spells:''},9:{spells:''}};var match=void 0;while((match=innateSpellsRegex.exec(traitContent))!==null){if(match&&match[1]){spellsToParseObj[0].spells+=', '+match[1];}}if((0,_utilities.objIsNotEmpty)(spellsToParseObj)){this.parseSpellsPerLevel(data,repStrings,spellsToParseObj);}var innateSpellcastingComponentSearch=innateSpellcastingComponentRegex.exec(traitContent);if(innateSpellcastingComponentSearch){data.innate_spellcasting_components='INNATE_SPELLCASTING_NO_MATERIAL';if(innateSpellcastingComponentSearch[1]){data.innate_spellcasting_blurb=traitContent.replace(innateSpellcastingComponentSearch[1],'').trim();}}else{var innateSpellcastingComponentSearchSecond=innateSpellcastingComponentRegexSecond.exec(traitContent);if(innateSpellcastingComponentSearchSecond){data.innate_spellcasting_components='INNATE_SPELLCASTING_ONLY_VERBAL';if(innateSpellcastingComponentSearchSecond[1]){data.innate_spellcasting_blurb=traitContent.replace(innateSpellcastingComponentSearchSecond[1],'').trim();}}}}},{key:'parseSpellcasting',value:function parseSpellcasting(type,traitContent){var _this4=this;server.getSetItems('spells.parseSpellcasting',{collectionArray:['level','challenge','spellcasting_class','innate_spellcasting','spellcasting'].concat(_constants.SPELL_LEVELS.map(function(spellLevel){return'spell_slots_l'+spellLevel+'_bonus';})),repeatingSections:_constants.SPELL_LEVELS.map(function(spellLevel){return{name:'repeating_spell'+spellLevel,collectionArrayAddItems:['name','spell_level']};}),process:function process(data,repStrings){if(type==='innate'){_this4.parseInnateSpellcastingFromTraits(data,repStrings,traitContent);}else{_this4.parseSpellcastingFromTraits(data,repStrings,traitContent);}},callback:function callback(){_this4.updateSpellAbility();_this4.updateDCAndAttack();_this4.updateSlots();_this4.updateChatMacro();_this4.updateHasSpellSlots();_this4.updateHasWarlockSlots();_this4.updateHasSpellPoints();}});}},{key:'findSpellcasting',value:function findSpellcasting(repeatingInfo){var _this5=this;var deleteItem=false;server.getSetItems('spells.findSpellcasting',{collectionArray:['is_npc','spell_ability','show_spells'],repeatingSections:[{name:'repeating_trait',collectionArrayAddItems:['name','content'].concat(_constants.REPEATING_FIELDS.attack),repeatingInfo:repeatingInfo}],process:function process(data,repStrings){if((0,_utilities.exists)(data.is_npc)){repStrings.forEach(function(repString){if((0,_utilities.isUndefinedOrEmpty)(data[repString+'_name'])){deleteItem=true;removeRepeatingRow(repString);}else if(data[repString+'_name']&&data[repString+'_name'].includes('Spellcasting')){data.show_spells=1;_this5.parseSpellcastingAbilityFromTraits(data,repString);if(data[repString+'_name'].includes('Innate')){_this5.parseSpellcasting('innate',data[repString+'_content']);deleteItem=true;removeRepeatingRow(repString);}else{_this5.parseSpellcasting('normal',data[repString+'_content']);if(!data[repString+'_name'].includes('Shared')){deleteItem=true;removeRepeatingRow(repString);}}}});}},callback:function callback(){if(!deleteItem){actions.update(['trait'],repeatingInfo);}}});}},{key:'filtersToggleAll',value:function filtersToggleAll(){var _this6=this;server.getSetItems('spells.filtersToggleAll',{collectionArray:['spell_level_filter_all'].concat(_constants.SPELL_LEVELS.map(function(spellLevel){return'spell_level_filter_'+spellLevel;})),process:function process(data){var onOrOff=0;if((0,_utilities.exists)(data.spell_level_filter_all)){onOrOff=1;}_constants.SPELL_LEVELS.forEach(function(spellLevel){data['spell_level_filter_'+spellLevel]=onOrOff;});},callback:function callback(){_this6.filtersMacroOutput();}});}},{key:'filtersMacroOutput',value:function filtersMacroOutput(){server.getSetItems('spells.filtersToggleAll',{collectionArray:['spells_filter_var'].concat(_constants.SPELL_LEVELS.map(function(spellLevel){return'spell_level_filter_'+spellLevel;})),process:function process(data){data.spells_filter_var='';_constants.SPELL_LEVELS.forEach(function(spellLevel){if((0,_utilities.exists)(data['spell_level_filter_'+spellLevel])){data.spells_filter_var+=' {{spells_level_'+spellLevel+'_show=1}}';}});}});}},{key:'setup',value:function setup(){var _this7=this;var _loop=function _loop(level){on('change:repeating_spell'+level,function(eventInfo){var repeatingInfo=(0,_utilities.getRepeatingInfo)('repeating_spell'+level,eventInfo);if(repeatingInfo&&repeatingInfo.field==='spell_level'){_this7.changeLevel(level,repeatingInfo);}else if(repeatingInfo&&repeatingInfo.field!=='toggle_details'){_this7.update(level,repeatingInfo);_this7.updateChatMacro([level]);_this7.count();}});on('change:_reporder_repeating_spell'+level+' remove:repeating_spell'+level,function(){_this7.updateChatMacro([level]);_this7.count();});};for(var level=0;level<=9;level+=1){_loop(level);}on('change:distance_system',function(){_this7.update();});on('change:spell_slots_toggle change:spell_points_toggle',function(){_this7.updateChatMacro();});on('change:spell_ability',function(){_this7.updateSpellAbility();});on('change:spell_slots_l1_bonus change:spell_slots_l2_bonus change:spell_slots_l3_bonus change:spell_slots_l4_bonus change:spell_slots_l5_bonus change:spell_slots_l6_bonus change:spell_slots_l7_bonus change:spell_slots_l8_bonus change:spell_slots_l9_bonus',function(){_this7.updateSlots();});on('change:warlock_spell_slots_calc change:warlock_spell_slots_bonus',function(){_this7.updateWarlockSlots();});on('change:spell_slots_toggle',function(){_this7.updateHasSpellSlots();});on('change:warlock_slots_toggle',function(){_this7.updateHasWarlockSlots();});on('change:spell_points_toggle',function(){_this7.updateHasSpellPoints();});on('change:automatic_higher_level_queries change:warlock_spell_slots change:warlock_spells_max_level change:spell_slots_l1 change:spell_slots_l2 change:spell_slots_l3 change:spell_slots_l4 change:spell_slots_l5 change:spell_slots_l6 change:spell_slots_l7 change:spell_slots_l8 change:spell_slots_l9',function(){_this7.generateHigherLevelQueries();});on('change:spell_ability change:base_dc',function(){_this7.updateDCAndAttack();});on('change:spell_level_filter_all',function(){_this7.filtersToggleAll();});var filters=_constants.SPELL_LEVELS.map(function(spellLevel){return'spell_level_filter_'+spellLevel;});on(filters.map(function(field){return'change:'+field;}).join(' '),function(){_this7.filtersMacroOutput();});on('change:repeating_trait:content',function(eventInfo){var repeatingInfo=(0,_utilities.getRepeatingInfo)('repeating_trait',eventInfo);_this7.findSpellcasting(repeatingInfo);});}}]);return Spells;}();
 
 },{"../abilities/AbilitiesUtil":2,"../actionComponents/ActionComponents":4,"../actionComponents/Attack":5,"../actionComponents/Heal":7,"../actionComponents/SavingThrow":8,"../actions/Actions":9,"../scripts/Distance":28,"../scripts/Format":29,"../scripts/Server":33,"../scripts/constants":35,"../scripts/utilities":37}],42:[function(require,module,exports){
-'use strict';Object.defineProperty(exports,"__esModule",{value:true});var currentVersion='15.7.2';exports.currentVersion=currentVersion;
+'use strict';Object.defineProperty(exports,"__esModule",{value:true});var currentVersion='15.7.4';exports.currentVersion=currentVersion;
 
 },{}]},{},[36]);
 </script>
\ No newline at end of file
diff --git a/5eShaped/changelog.md b/5eShaped/changelog.md
index be3583b9d2..aa71de9cfa 100644
--- a/5eShaped/changelog.md
+++ b/5eShaped/changelog.md
@@ -11,6 +11,16 @@ Bugs fall into the patch category.
 
 The sheet will always upgrade itself unless I specify otherwise, though some things like roll template fields changing will require users who have added custom macros to fix.
 
+## 15.7.4
+
+### Bug Fixes
+* Fix parsing of single quotes that I broke as part of 15.7.3
+
+## 15.7.3
+
+### Bug Fixes
+* [#652: Tome of Beasts characters have errors on import](https://bitbucket.org/mlenser/5eshaped/issues/652/tome-of-beasts-characters-have-errors-on). Tome of Beast format variations parsed away to the expected format.
+
 ## 15.7.2
 
 ### Bug Fixes