diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html index 56cfd98d8b..969e5f64d6 100644 --- a/Shadowrun5th/Shadowrun5th.html +++ b/Shadowrun5th/Shadowrun5th.html @@ -10432,8 +10432,15 @@ on("change:chummercheckbox", function(){ if((chummerfile.characters.character.gears.gear[i].category_english=="Common Programs")||(chummerfile.characters.character.gears.gear[i].category_english=="Hacking Programs")){ attributes["repeating_programs_"+newrowid+"_programname"]=chummerfile.characters.character.gears.gear[i].name; }else if(chummerfile.characters.character.gears.gear[i].name!=null){ - attributes["repeating_equipment_"+newrowid+"_equipmentname"]=chummerfile.characters.character.gears.gear[i].name; + name = chummerfile.characters.character.gears.gear[i].name; + if(chummerfile.characters.character.gears.gear[i].rating > 0){ + name += " " + chummerfile.characters.character.gears.gear[i].rating; + } + attributes["repeating_equipment_"+newrowid+"_equipmentname"]=name; attributes["repeating_equipment_"+newrowid+"_equipmentnumber"]=chummerfile.characters.character.gears.gear[i].qty; + if(chummerfile.characters.character.gears.gear[i].extra != null) { + attributes["repeating_equipment_"+newrowid+"_equipmentdescription"]=chummerfile.characters.character.gears.gear[i].extra; + } attributes["repeating_equipment_"+newrowid+"_equipmentnotes"]=""; if(chummerfile.characters.character.gears.gear[i].children!=null){ if(chummerfile.characters.character.gears.gear[i].children.gear.length>1){ @@ -10442,7 +10449,14 @@ on("change:chummercheckbox", function(){ var newrowidb=generateRowID(); attributes["repeating_programs_"+newrowidb+"_programname"]=chummerfile.characters.character.gears.gear[i].children.gear[j].name; }else{ - attributes["repeating_equipment_"+newrowid+"_equipmentnotes"]+=chummerfile.characters.character.gears.gear[i].children.gear[j].name+"\n"; + note = chummerfile.characters.character.gears.gear[i].children.gear[j].name; + if(chummerfile.characters.character.gears.gear[i].children.gear[j].rating > 0){ + note += " " + chummerfile.characters.character.gears.gear[i].children.gear[j].rating; + } + if(chummerfile.characters.character.gears.gear[i].children.gear[j].extra != null) { + note += " " + chummerfile.characters.character.gears.gear[i].children.gear[j].extra; + } + attributes["repeating_equipment_"+newrowid+"_equipmentnotes"]+= note +"\n"; } } }else{ @@ -10450,7 +10464,14 @@ on("change:chummercheckbox", function(){ var newrowidb=generateRowID(); attributes["repeating_programs_"+newrowidb+"_programname"]=chummerfile.characters.character.gears.gear[i].children.gear.name; }else{ - attributes["repeating_equipment_"+newrowid+"_equipmentnotes"]+=chummerfile.characters.character.gears.gear[i].children.gear.name+"\n"; + note = chummerfile.characters.character.gears.gear[i].children.gear.name; + if(chummerfile.characters.character.gears.gear[i].children.gear.rating > 0){ + note += " " + chummerfile.characters.character.gears.gear[i].children.gear.rating; + } + if(chummerfile.characters.character.gears.gear[i].children.gear.extra != null) { + note += " " + chummerfile.characters.character.gears.gear[i].children.gear.extra; + } + attributes["repeating_equipment_"+newrowid+"_equipmentnotes"]+= note +"\n"; } } }