Merge pull request #3 from Hazado/GahreesenNewLinkAndPanel

Gahreesen new link and panel

Author: DamnBriggsy

Scripts/Python/xLinkingBookDefs.py

@@ -235,8 +235,9 @@
         "Cleft":                ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xLinkPanelCleftDesert' + LinkEnd ),
         "CleftWithTomahna":     ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + LinkStart + 'xLinkPanelTomahnaDesert' + LinkEndPage + PageStart + LinkStart + 'xLinkPanelCleftDesert' + LinkEndPage ),
         "TomahnaFromCleft":     ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xLinkPanelTomahnaDesert' + LinkEnd ),
-        "grsnTeamRmPurple":     ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xLinkPanelCleftDesert' + LinkEnd ),
-        "grsnTeamRmYellow":     ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xLinkPanelTomahnaDesert' + LinkEnd ),
+        "grsnTeamRmPurple":     ( 'xLinkPanelGarrisonPurpleControlRoom' ),
+        "grsnTeamRmYellow":     ( 'xLinkPanelGarrisonYellowControlRoom' ),
+        "grsnTrnCtrlRm":       ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xLinkPanelGarrisonControlRoom' + LinkEnd ),
         "grtzGrtZeroLinkRm":    ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xLinkPanelGrtZeroLinkRm' + LinkEnd + YeeshaStamp ),
         "Ercana":     		  ( 1, 1.0, 1.0, DRCStamp1+DRCPos2, BookStart1 + DRCStampHolder + ShareHolder + LinkStart + 'xLinkPanelErcanaDefault' + LinkEnd + YeeshaStamp ),
         "Ahnonay":     		  ( 0, 1.0, 1.0, DRCStamp2+DRCPos1, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xLinkPanelAhnonayVortex' + LinkEnd + YeeshaStamp ),
@@ -314,8 +315,9 @@
     "Cleft":                    ( "Cleft", "LinkInPointDefault" ),
     "CleftWithTomahna":         ( "", "" ),
     "TomahnaFromCleft":         ( "", "" ),
-    "grsnTeamRmPurple":         ( "Garrison", "" ),
-    "grsnTeamRmYellow":         ( "Garrison", "" ),
+    "grsnTeamRmPurple":         ( "Garrison", "LinkInPointCtrlRm02" ),
+    "grsnTeamRmYellow":         ( "Garrison", "LinkInPointCtrlRm01" ),
+    "grsnTrnCtrlRm":           ( "Garrison", "LinkInPointControlCenter" ),
     "Ercana":     		  ( "Ercana", "LinkInPointDefault" ),
     "Ahnonay":     		  ( "Ahnonay", "LinkInPointDefault" ),
     "AhnonayCathedral":   ( "AhnonayCathedral", "LinkInPointDefault" ),
@@ -374,6 +376,10 @@
     "islmGreatTree":        ( PageStart + NoShare + LinkStart + 'xLinkPanelCityGreatTree' + LinkEndPage),
     "BahroCaveUpper":       ( PageStart + NoShare + LinkStart + 'xLinkPanelBahroCaveUpper' + LinkEndPage ),
     "BahroCaveLower":       ( PageStart + NoShare + LinkStart + 'xLinkPanelBahroCaveLower' + LinkEndPage ),
+    # Garrison Wall Control Room Pages
+    "grsnTeamRmPurple":     ( PageStart + NoShare + LinkStart + 'xLinkPanelGarrisonPurpleControlRoom' + LinkEndPage ),
+    "grsnTeamRmYellow":     ( PageStart + NoShare + LinkStart + 'xLinkPanelGarrisonYellowControlRoom' + LinkEndPage ),
+    "grsnTrnCtrlRm":       ( PageStart + NoShare + LinkStart + 'xLinkPanelGarrisonControlRoom' + LinkEndPage ),
 }
 
 CityBookLinks = ["islmPalaceBalcony02", "islmPalaceBalcony03", "islmDakotahRoof", "KadishGallery", "BaronCityOffice", "dsntShaftFall", "grtzGrtZeroLinkRm", "Spyroom", "islmGreatTree", "Kveer"]