From c11b78529b02ecd667f25dcbc09ed5c174545925 Mon Sep 17 00:00:00 2001 From: Patrick Dulebohn <40325124+DoobesURU@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:14:59 -0500 Subject: [PATCH 1/2] Add proper definitions for Wall control rooms Updates the definitions for the Garrison/Gahreesen wall control rooms and adds xLinkingPages entries for both to add to the Book on Relto. --- Scripts/Python/xLinkingBookDefs.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Scripts/Python/xLinkingBookDefs.py b/Scripts/Python/xLinkingBookDefs.py index 6c1db57150..66fa7273f4 100644 --- a/Scripts/Python/xLinkingBookDefs.py +++ b/Scripts/Python/xLinkingBookDefs.py @@ -235,8 +235,8 @@ "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' ), "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 ), @@ -313,8 +313,8 @@ "Cleft": ( "Cleft", "LinkInPointDefault" ), "CleftWithTomahna": ( "", "" ), "TomahnaFromCleft": ( "", "" ), - "grsnTeamRmPurple": ( "Garrison", "" ), - "grsnTeamRmYellow": ( "Garrison", "" ), + "grsnTeamRmPurple": ( "Garrison", "LinkInPointCtrlRm02" ), + "grsnTeamRmYellow": ( "Garrison", "LinkInPointCtrlRm01" ), "Ercana": ( "Ercana", "LinkInPointDefault" ), "Ahnonay": ( "Ahnonay", "LinkInPointDefault" ), "AhnonayCathedral": ( "AhnonayCathedral", "LinkInPointDefault" ), @@ -372,6 +372,9 @@ "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 ), } CityBookLinks = ["islmPalaceBalcony02", "islmPalaceBalcony03", "islmDakotahRoof", "KadishGallery", "BaronCityOffice", "dsntShaftFall", "grtzGrtZeroLinkRm", "Spyroom", "islmGreatTree", "Kveer"] From 58701471f0f150dae293e337f3ddbe2590979267 Mon Sep 17 00:00:00 2001 From: Edmond Mondor Date: Tue, 8 Mar 2022 21:54:37 -0800 Subject: [PATCH 2/2] Adds additional Link point to Gahreesen --- Scripts/Python/xLinkingBookDefs.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Scripts/Python/xLinkingBookDefs.py b/Scripts/Python/xLinkingBookDefs.py index 66fa7273f4..06ef2bf07f 100644 --- a/Scripts/Python/xLinkingBookDefs.py +++ b/Scripts/Python/xLinkingBookDefs.py @@ -237,6 +237,7 @@ "TomahnaFromCleft": ( 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 ), @@ -315,6 +316,7 @@ "TomahnaFromCleft": ( "", "" ), "grsnTeamRmPurple": ( "Garrison", "LinkInPointCtrlRm02" ), "grsnTeamRmYellow": ( "Garrison", "LinkInPointCtrlRm01" ), + "grsnTrnCtrlRm": ( "Garrison", "LinkInPointControlCenter" ), "Ercana": ( "Ercana", "LinkInPointDefault" ), "Ahnonay": ( "Ahnonay", "LinkInPointDefault" ), "AhnonayCathedral": ( "AhnonayCathedral", "LinkInPointDefault" ), @@ -375,6 +377,7 @@ # 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"]