diff --git a/Shadowrun5th/Shadowrun5th.css b/Shadowrun5th/Shadowrun5th.css index 3165da4971..6792f6dc51 100644 --- a/Shadowrun5th/Shadowrun5th.css +++ b/Shadowrun5th/Shadowrun5th.css @@ -1144,13 +1144,16 @@ input[disabled="true"]{ .charnamewrapper, -.contactnamewrapper, -.contacttypewrapper, .metamagicnamewrapper, .programnamewrapper{ width:25%; } +.contactnamewrapper, +.contacttypewrapper{ + width:18%; +} + .spiritenamewrapper, .charmetawrapper, diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html index f75ed1d31b..227c62b4b7 100644 --- a/Shadowrun5th/Shadowrun5th.html +++ b/Shadowrun5th/Shadowrun5th.html @@ -12899,6 +12899,9 @@ Click again to switch to Manual and Remote">
+
+ +
@@ -12917,6 +12920,9 @@ Click again to switch to Manual and Remote">
+
+ +
@@ -14474,19 +14480,25 @@ async function importSocialTabChummer(chummerfile) { attributes["repeating_contacts_"+newrowid+"_contactname"]=""; } if(chummerfile.characters.character.contacts.contact[i].role !== null) { - attributes["repeating_contacts_"+newrowid+"_contactdescription"]=chummerfile.characters.character.contacts.contact[i].role; + attributes["repeating_contacts_"+newrowid+"_contactdescription"] = chummerfile.characters.character.contacts.contact[i].role; } - attributes["repeating_contacts_"+newrowid+"_contactconnection"]=chummerfile.characters.character.contacts.contact[i].connection; - attributes["repeating_contacts_"+newrowid+"_contactloyalty"]=chummerfile.characters.character.contacts.contact[i].loyalty; + if(chummerfile.characters.character.contacts.contact[i].location !== null) { + attributes["repeating_contacts_"+newrowid+"_contactlocation"] = chummerfile.characters.character.contacts.contact[i].location; + } + attributes["repeating_contacts_"+newrowid+"_contactconnection"] = chummerfile.characters.character.contacts.contact[i].connection; + attributes["repeating_contacts_"+newrowid+"_contactloyalty"] = chummerfile.characters.character.contacts.contact[i].loyalty; } }else{ var newrowid=generateRowID(); - attributes["repeating_contacts_"+newrowid+"_contactname"]=chummerfile.characters.character.contacts.contact.name; + attributes["repeating_contacts_"+newrowid+"_contactname"] = chummerfile.characters.character.contacts.contact.name; if(chummerfile.characters.character.contacts.contact.role !== null) { - attributes["repeating_contacts_"+newrowid+"_contactdescription"]=chummerfile.characters.character.contacts.contact.role; - } - attributes["repeating_contacts_"+newrowid+"_contactconnection"]=chummerfile.characters.character.contacts.contact.connection; - attributes["repeating_contacts_"+newrowid+"_contactloyalty"]=chummerfile.characters.character.contacts.contact.loyalty; + attributes["repeating_contacts_"+newrowid+"_contactdescription"] = chummerfile.characters.character.contacts.contact.role; + } + if(chummerfile.characters.character.contacts.contact.location !== null) { + attributes["repeating_contacts_"+newrowid+"_contactlocation"] = chummerfile.characters.character.contacts.contact.location; + } + attributes["repeating_contacts_"+newrowid+"_contactconnection"] = chummerfile.characters.character.contacts.contact.connection; + attributes["repeating_contacts_"+newrowid+"_contactloyalty"] = chummerfile.characters.character.contacts.contact.loyalty; } } }catch(err){