From 3b881f5decc2b237728cbe6350c9386df5b6328b Mon Sep 17 00:00:00 2001
From: Gulix <gulix33xp@yahoo.fr>
Date: Fri, 7 Aug 2015 14:18:54 +0200
Subject: [PATCH] Fixes #13 - A Supreme can have "Other roles" (Stygian (Queen)
 is also a Powerhouse, for example) Its other roles fill the slots (only one
 leader, only one powerhouse) and special leader effect (Honorary Member /
 Faction Card) can be granted to a Supreme who has "Leader" has an other role.

---
 builder/builder.html       | 22 +++++++++++++++-------
 builder/json/supremes.json |  2 ++
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/builder/builder.html b/builder/builder.html
index 37896bc..f1f0ca0 100644
--- a/builder/builder.html
+++ b/builder/builder.html
@@ -389,7 +389,8 @@ <h4 class="modal-title" id="modal-enter-code-label">Enter a Team unique code</h4
     if (window.selected_supremes_list[i].id == id)
     {
       // If this is a Leader, all the Honorary Members are also removed
-      var isLeader = window.selected_supremes_list[i].role_key == 'leader';
+      var isLeader = window.selected_supremes_list[i].role_key == 'leader'
+        || isInTable(window.selected_supremes_list[i].other_roles, 'leader');
       window.selected_supremes_list.splice(i, 1);
       break;
     }
@@ -791,7 +792,8 @@ <h4 class="modal-title" id="modal-enter-code-label">Enter a Team unique code</h4
 {
   for (var iSup = 0; iSup < window.selected_supremes_list.length; iSup++)
   {
-    if (window.selected_supremes_list[iSup].role_key == "leader")
+    if (window.selected_supremes_list[iSup].role_key == "leader"
+        || isInTable(window.selected_supremes_list[iSup].other_roles, 'leader'))
       return window.selected_supremes_list[iSup].factions;
   }
   
@@ -873,7 +875,8 @@ <h4 class="modal-title" id="modal-enter-code-label">Enter a Team unique code</h4
   var active = $('#honorary-member').hasClass('honorary-member-active');
   for (var iSel = 0; iSel < window.selected_supremes_list.length; iSel++)
   {
-    if (window.selected_supremes_list[iSel].role_key == "leader")
+    if ((window.selected_supremes_list[iSel].role_key == "leader") 
+        || isInTable(window.selected_supremes_list[iSel].other_roles, 'leader'))
       displayed = true;
     if (window.selected_supremes_list[iSel].is_honorary_member)
       disabled = true;
@@ -1058,9 +1061,11 @@ <h4 class="modal-title" id="modal-enter-code-label">Enter a Team unique code</h4
   var shownSupremesId = []; // Special shown Supremes
   for (var iSel=0; iSel < window.selected_supremes_list.length; iSel++)
   {
-    if (window.selected_supremes_list[iSel].role_key == "leader")
+    if ((window.selected_supremes_list[iSel].role_key == "leader")
+        || isInTable(window.selected_supremes_list[iSel].other_roles, 'leader'))
       excludeLeader = true;
-    if (window.selected_supremes_list[iSel].role_key == "powerhouse")
+    if ((window.selected_supremes_list[iSel].role_key == "powerhouse")
+        || isInTable(window.selected_supremes_list[iSel].other_roles, 'powerhouse'))
       excludePowerhouse = true;
      
     // Excluded supremes
@@ -1108,8 +1113,8 @@ <h4 class="modal-title" id="modal-enter-code-label">Enter a Team unique code</h4
      || (isVillainsOnly && !window.supremes_list[i].is_villain) 
      || isSelected
      // Only one Leader / Powerhouse
-     || (excludeLeader && (window.supremes_list[i].role_key == "leader"))
-     || (excludePowerhouse && (window.supremes_list[i].role_key == "powerhouse"))
+     || (excludeLeader && ((window.supremes_list[i].role_key == "leader") || isInTable(window.supremes_list[i].other_roles, 'leader')))
+     || (excludePowerhouse && ((window.supremes_list[i].role_key == "powerhouse") || isInTable(window.supremes_list[i].other_roles, 'powerhouse')))
      // Excluded supremes
      || (isInTable(excludedSupremesId, window.supremes_list[i].id))
      // Excluded factions
@@ -1177,6 +1182,9 @@ <h4 class="modal-title" id="modal-enter-code-label">Enter a Team unique code</h4
 /************************/
 function isInTable(tableData, searchedData)
 {
+  if ((tableData === undefined) || (tableData === null))
+    return false;
+
   for(var i=0; i<tableData.length; i++)
   {
     if (tableData[i] == searchedData)
diff --git a/builder/json/supremes.json b/builder/json/supremes.json
index 711c4eb..2e01d26 100644
--- a/builder/json/supremes.json
+++ b/builder/json/supremes.json
@@ -2364,6 +2364,7 @@
 "name": "Stygian (True)",
 "level": 3,
 "role_key": "powerhouse",
+"other_roles": [ "leader" ],
 "ap_granted": 3,
 "minions_granted": 0,
 "factions": [  "forgotten" ],
@@ -4036,6 +4037,7 @@
 "name": "Stygian (Queen)",
 "level": 3,
 "role_key": "leader",
+"other_roles": [ "powerhouse" ],
 "ap_granted": 3,
 "minions_granted": 0,
 "factions": [  "forgotten" ],