diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html index 749946248c..d94b8b8b0e 100644 --- a/Shadowrun5th/Shadowrun5th.html +++ b/Shadowrun5th/Shadowrun5th.html @@ -14760,32 +14760,45 @@ async function importEnhancementTab(text, chummerfile) { console.log("Importing martialarts"); if(chummerfile.characters.character.martialarts.martialart.length>1){ for(var i=0;i1){ - for(var j=0;j 1){ + for(var j=0; j < chummerfile.characters.character.martialarts.martialart[i].martialarttechniques.length; j++){ var newrowid=generateRowID(); - attributes["repeating_martial_"+newrowid+"_martialname"]=chummerfile.characters.character.martialarts.martialart[i].martialarttechniques.martialarttechnique[j].name; - attributes["repeating_martial_"+newrowid+"_martialdescription"]=chummerfile.characters.character.martialarts.martialart[i].name; + attributes["repeating_martial_"+newrowid+"_martialname"] = chummerfile.characters.character.martialarts.martialart[i].martialarttechniques.martialarttechnique[j].name; + attributes["repeating_martial_"+newrowid+"_martialdescription"] = chummerfile.characters.character.martialarts.martialart[i].name; + if(chummerfile.characters.character.martialarts.martialart[i].martialarttechniques.martialarttechnique[j].notes != undefined) { + attributes["repeating_martial_"+newrowid+"_martialnotes"] = chummerfile.characters.character.martialarts.martialart[i].martialarttechniques.martialarttechnique[j].notes; + } } }else{ + console.log(chummerfile.characters.character.martialarts.martialart[i]); var newrowid=generateRowID(); attributes["repeating_martial_"+newrowid+"_martialname"]=chummerfile.characters.character.martialarts.martialart[i].martialarttechniques.martialarttechnique.name; attributes["repeating_martial_"+newrowid+"_martialdescription"]=chummerfile.characters.character.martialarts.martialart[i].name; + if(chummerfile.characters.character.martialarts.martialart[i].martialarttechniques.martialarttechnique.notes != undefined) { + attributes["repeating_martial_"+newrowid+"_martialnotes"] = chummerfile.characters.character.martialarts.martialart[i].martialarttechniques.martialarttechnique.notes; + } } } } }else{ - if(chummerfile.characters.character.martialarts.martialart.martialarttechniques!=null){ + if(chummerfile.characters.character.martialarts.martialart.martialarttechniques != null){ if(chummerfile.characters.character.martialarts.martialart.martialarttechniques.martialarttechnique.length>1){ for(var j=0;j