From 98cecd83a30a473efb4cbbabe4e8b9ecee847a25 Mon Sep 17 00:00:00 2001
From: Stexinator <hurricane90@gmx.de>
Date: Sun, 8 Aug 2021 15:48:57 +0200
Subject: [PATCH] [Shadowrun5thA] critterpower import more robust

---
 Shadowrun5th/Shadowrun5th.html | 55 +++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index e2885114ea..56cea5d75f 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -10905,24 +10905,25 @@ on("change:chummercheckbox", function(){
                     error="Error with Powers " +err
                 }
                 try{
-                    console.log("Importing initiategrade and metamagic");
-                    if(chummerfile.characters.character.initiategrade!=null)
+                    if(chummerfile.characters.character.initiategrade != null && chummerfile.characters.character.initiategrade != 0) {
+                        console.log("Importing initiategrade and metamagic");
                         attributes.initiationgrade=chummerfile.characters.character.initiategrade;
-                    if(chummerfile.characters.character.metamagics!=null){
-                        if(chummerfile.characters.character.metamagics.metamagic.length>1){
-                            for(var i=0;i<chummerfile.characters.character.metamagics.metamagic.length;i++){
+                        if(chummerfile.characters.character.metamagics != null){
+                            if(chummerfile.characters.character.metamagics.metamagic.length>1){
+                                for(var i=0;i<chummerfile.characters.character.metamagics.metamagic.length;i++){
+                                    var newrowid=generateRowID();
+                                    attributes["repeating_initiation_"+newrowid+"_metamagicname"]=chummerfile.characters.character.metamagics.metamagic[i].name;
+                                    if(chummerfile.characters.character.metamagics.metamagic[i].notes != null) {
+                                        attributes["repeating_initiation_"+newrowid+"_metamagicdescription"]=chummerfile.characters.character.metamagics.metamagic[i].notes
+                                    }
+                                }
+                            }else{
                                 var newrowid=generateRowID();
-                                attributes["repeating_initiation_"+newrowid+"_metamagicname"]=chummerfile.characters.character.metamagics.metamagic[i].name;
-                                if(chummerfile.characters.character.metamagics.metamagic[i].notes != null) {
-                                    attributes["repeating_initiation_"+newrowid+"_metamagicdescription"]=chummerfile.characters.character.metamagics.metamagic[i].notes
-                                }
+                                attributes["repeating_initiation_"+newrowid+"_metamagicname"]=chummerfile.characters.character.metamagics.metamagic.name;
+                                if(chummerfile.characters.character.metamagics.metamagic.notes != null) {
+                                        attributes["repeating_initiation_"+newrowid+"_metamagicdescription"]=chummerfile.characters.character.metamagics.metamagic.notes
+                                    }
                             }
-                        }else{
-                            var newrowid=generateRowID();
-                            attributes["repeating_initiation_"+newrowid+"_metamagicname"]=chummerfile.characters.character.metamagics.metamagic.name;
-                            if(chummerfile.characters.character.metamagics.metamagic.notes != null) {
-                                    attributes["repeating_initiation_"+newrowid+"_metamagicdescription"]=chummerfile.characters.character.metamagics.metamagic.notes
-                                }
                         }
                     }
                 }catch(err){
@@ -10930,7 +10931,7 @@ on("change:chummercheckbox", function(){
                     error= error + "\n" + "Error with Initiations " +err
                 }
                 try{
-                    if(chummerfile.characters.character.martialarts!=null){
+                    if(chummerfile.characters.character.martialarts != null){
                         console.log("Importing martialarts");
                         if(chummerfile.characters.character.martialarts.martialart.length>1){
                             for(var i=0;i<chummerfile.characters.character.martialarts.martialart.length;i++){
@@ -11862,29 +11863,29 @@ on("change:chummercheckbox", function(){
                     try{
                         if(chummerfile.characters.character.critterpowers != null && text.experimental == "on"){
                             console.log("Importing critter powers");
-                            if(chummerfile.characters.character.critterpowers.critterpower.length>1){
-                                for(var i=0;i<chummerfile.characters.character.critterpowers.critterpower.length;i++){
+                            if(chummerfile.characters.character.critterpowers.critterpower.length > 1){
+                                for(var i=0; i < chummerfile.characters.character.critterpowers.critterpower.length; i++){
                                     var newrowid=generateRowID();
                                     attributes["repeating_spells_"+newrowid+"_spellname"]=chummerfile.characters.character.critterpowers.critterpower[i].fullname;
                                     attributes["repeating_spells_"+newrowid+"_spelltype"]=chummerfile.characters.character.critterpowers.critterpower[i].type;
-                                    if(chummerfile.characters.character.critterpowers.critterpower[i].notes!=null){
-                                        attributes["repeating_spells_"+newrowid+"_spelldescription"]=chummerfile.characters.character.critterpowers.critterpower[i].notes;
+                                    if(chummerfile.characters.character.critterpowers.critterpower[i].notes != null){
+                                        attributes["repeating_spells_"+newrowid+"_spelldescription"] = chummerfile.characters.character.critterpowers.critterpower[i].notes;
                                     }
                                     attributes["repeating_spells_"+newrowid+"_spelldrain"]="-0";
 
-                                    attributes["repeating_spells_"+newrowid+"_spellcategory"]=chummerfile.characters.character.critterpowers.critterpower[i].category;
+                                    attributes["repeating_spells_"+newrowid+"_spellcategory"] = chummerfile.characters.character.critterpowers.critterpower[i].category;
                                     attributes["repeating_spells_"+newrowid+"_spellbonus"]=0;
 
-                                    if(chummerfile.characters.character.critterpowers.critterpower[i].range !== null){
+                                    if(chummerfile.characters.character.critterpowers.critterpower[i].range != null){
                                         attributes["repeating_spells_"+newrowid+"_spellrange"]=chummerfile.characters.character.critterpowers.critterpower[i].range;
                                     } else {
                                         attributes["repeating_spells_"+newrowid+"_spellrange"]="N/A";
                                     }
 
-                                    if(chummerfile.characters.character.critterpowers.critterpower[i].duration !== null) {
-                                        attributes["repeating_spells_"+newrowid+"_spellduration"]=chummerfile.characters.character.critterpowers.critterpower[i].duration;
+                                    if(chummerfile.characters.character.critterpowers.critterpower[i].duration != null) {
+                                        attributes["repeating_spells_"+newrowid+"_spellduration"] = chummerfile.characters.character.critterpowers.critterpower[i].duration;
                                     } else {
-                                        attributes["repeating_spells_"+newrowid+"_spellduration"]="N/A";
+                                        attributes["repeating_spells_"+newrowid+"_spellduration"] = "N/A";
                                     }
 
                                 }
@@ -11899,13 +11900,13 @@ on("change:chummercheckbox", function(){
                                 attributes["repeating_spells_"+newrowid+"_spellcategory"]=chummerfile.characters.character.critterpowers.critterpower.category;
                                 attributes["repeating_spells_"+newrowid+"_spellbonus"]=0;
 
-                                if(chummerfile.characters.character.critterpowers.critterpower.range !== null){
+                                if(chummerfile.characters.character.critterpowers.critterpower.range != null){
                                     attributes["repeating_spells_"+newrowid+"_spellrange"]=chummerfile.characters.character.critterpowers.critterpower.range;
                                 } else {
                                     attributes["repeating_spells_"+newrowid+"_spellrange"]="N/A";
                                 }
 
-                                if(chummerfile.characters.character.critterpowers.critterpower.duration !== null) {
+                                if(chummerfile.characters.character.critterpowers.critterpower.duration != null) {
                                     attributes["repeating_spells_"+newrowid+"_spellduration"]=chummerfile.characters.character.critterpowers.critterpower.duration;
                                 } else {
                                     attributes["repeating_spells_"+newrowid+"_spellduration"]="N/A";