diff --git a/SalvageUnion/SalvageUnion.html b/SalvageUnion/SalvageUnion.html index f4f93b1723..bcfe1dd56c 100644 --- a/SalvageUnion/SalvageUnion.html +++ b/SalvageUnion/SalvageUnion.html @@ -1228,7 +1228,7 @@ const importModuleSystem = async (type, toImport) => { if(rules.includes("Passive")) { object[row + "is-passive"] = "on"; - rules = rules.split('//').slice(1).join('//').trim() + rules = rules.split('//').slice(1).map(s => s.trim()).join(' // ').trim() } rules = importHeat(rules, object, row); @@ -1365,7 +1365,7 @@ on('clicked:import-biotitan-orangebox', async (ev) => { } details = details + toImport.shift(); if(toImport.length < 3) { - details = details + toImport.join(""); + details = details + toImport.map(s => s.trim()).join(' '); //exit loop toImport = []; } @@ -1428,7 +1428,7 @@ on('clicked:import-vehicle', async (ev) => { await importModuleSystem('traits', toImport.pop()); } - vehicle.typeDetails = toImport.join(''); + vehicle.typeDetails = toImport.map(s => s.trim()).join(' '); vehicle["importerText"] ='Values imported' @@ -1476,7 +1476,7 @@ on('clicked:import-creature', async (ev) => { importMechWeapon(weaponName +"\n" + rules, creature); } - creature.typeDetails = toImport.join(''); + creature.typeDetails = toImport.map(s => s.trim()).join(' '); creature["importerText"] = 'Values imported'; @@ -1518,7 +1518,7 @@ on('clicked:import-peoplesquad', async (ev) => { importMechWeapon(weaponName +"\n" + rules, people); } - people.typeDetails = toImport.join(''); + people.typeDetails = toImport.map(s => s.trim()).join(' '); people["importerText"] = 'Values imported'; @@ -1607,7 +1607,7 @@ const importRange = (rules, object, row) => { let index = rules.split(' // ').indexOf('Range: '+ object[row + "range"]); rules = rules.split(' // '); rules.splice(index, 1); - return rules.join(' // ').trim() + return rules.map(s => s.trim()).join(' // ').trim() } return rules; @@ -1620,7 +1620,7 @@ const importDamage = (rules, object, row) => { damage = "[[" + damage + "]]"; } object[row + "damage"] = damage; - return rules.split('//').slice(1).join('//').trim() + return rules.split('//').slice(1).map(s => s.trim()).join(' // ').trim() } return rules; @@ -1658,7 +1658,7 @@ const importHeat = (rules, object, row) => { let index = rules.split(' // ').indexOf('Hot ('+ object[row + "heat"]+')'); rules = rules.split(' // '); rules.splice(index, 1); - rules = rules.join(' // ').trim() + rules = rules.map(s => s.trim()).join(' // ').trim() } else { object[row + "heat"] = 0; @@ -1669,7 +1669,7 @@ const importHeat = (rules, object, row) => { let index = rules.split(' // ').indexOf('Heat Spike'); rules = rules.split(' // '); rules.splice(index, 1); - rules = rules.join(' // ').trim() + rules = rules.map(s => s.trim()).join(' // ').trim() } return rules; @@ -1684,7 +1684,7 @@ const importEquipmentTraits = (rules, object, row) => { } const importDetails = (toImport, object, row) => { - object[row + "details"] = toImport.split('\n').slice(1).join('').trim(); + object[row + "details"] = toImport.split('\n').slice(1).map(s => s.trim()).join(' ').trim(); } const importTraits = (traits, object) => {