Merge branch 'family-tree-fix' into 'pregmod-master'

Family Tree Display Fix

See merge request pregmodfan/fc-pregmod!1875

src/js/familyTree.tw

@@ -118,7 +118,7 @@ window.renderFamilyTree = function(slaves, filterID) {
 		node.append('circle')
 			.attr('r', function(d){  return d.r })
 			.attr('stroke', function(d) {
-				if(d.id == filterID) {
+				if(d.ID == filterID) {
 					return '#ffff20';
 				} else {
 					return '#5a5a5a';
@@ -131,8 +131,14 @@ window.renderFamilyTree = function(slaves, filterID) {
 			.text(function(d) {
 				var ssym;
 				if(d.ID == -1) {
-					ssym = '';
-				} else if(d.dick > 0 && d.vagina > -1) {
+					if(d.dick == 1 && d.vagina == 1) {
+						ssym = '☿'
+					} else if (d.dick == 1) {
+						ssym = '♂';
+					} else if (d.vagina == 1) {
+						ssym = '♀';
+					}
+				} else if (d.dick > 0 && d.vagina > -1) {
 					ssym = '☿'
 				} else if (d.dick > 0) {
 					ssym = '♂';
@@ -384,7 +390,7 @@ window.buildFamilyTree = function(slaves = State.variables.slaves, filterID) {
 		}
 		node_lookup[char_id] = family_graph.nodes.length;
 		var char_obj = {
-			id: char_id,
+			ID: char_id,
 			name: character.slaveName,
 			dick: character.dick,
 			unborn: !!unborn[char_id],