diff --git a/Scripts/Python/islmRegisterNexusLink.py b/Scripts/Python/islmRegisterNexusLink.py index a3ddc49743..6a8a174865 100644 --- a/Scripts/Python/islmRegisterNexusLink.py +++ b/Scripts/Python/islmRegisterNexusLink.py @@ -108,6 +108,20 @@ def OnNotify(self,state,id,events): vault.addChronicleEntry("GotLinkToKveerPublic",1,"yes") PtDebugPrint("islmRegisterNexusLink.OnNotify(): Chronicle entry 'GotLinkToKveerPublic' not present, adding entry and setting to 'yes'") PtSendKIMessage(kKILocalChatStatusMsg,PtGetLocalizedString("KI.Messages.NexusLinkAdded")) + # Hacking away for GoMe Pub + if stationName.value == "GoMePubNew": + entryName = "GotLinkToGoMePublic" + entry = vault.findChronicleEntry(entryName) + if entry is not None: + entryValue = entry.chronicleGetValue() + if entryValue != "yes": + entry.chronicleSetValue("yes") + entry.save() + PtDebugPrint("islmRegisterNexusLink.OnNotify(): Chronicle entry 'GotLinkToGoMePublic' already added, setting to 'yes'") + else: + vault.addChronicleEntry("GotLinkToGoMePublic",1,"yes") + PtDebugPrint("islmRegisterNexusLink.OnNotify(): Chronicle entry 'GotLinkToGoMePublic' not present, adding entry and setting to 'yes'") + PtSendKIMessage(kKILocalChatStatusMsg,PtGetLocalizedString("KI.Messages.NexusLinkAdded")) else: # just business-as-usual here self.avatar = 0 diff --git a/Scripts/Python/nxusBookMachine.py b/Scripts/Python/nxusBookMachine.py index 4b3c584f4c..95e0c5ddf6 100644 --- a/Scripts/Python/nxusBookMachine.py +++ b/Scripts/Python/nxusBookMachine.py @@ -203,9 +203,9 @@ } -kHiddenPersonalAges = ["Personal", "Nexus", "Neighborhood", "city", "AvatarCustomization", "Cleft", "BaronCityOffice", "BahroCave", "PelletBahroCave", "Kveer", "Myst", "LiveBahroCaves", "LiveBahroCave", "Tiam"] +kHiddenPersonalAges = ["Personal", "Nexus", "Neighborhood", "city", "AvatarCustomization", "Cleft", "BaronCityOffice", "BahroCave", "PelletBahroCave", "Kveer", "Myst", "LiveBahroCaves", "LiveBahroCave"] kHiddenCityLinks = ["islmPalaceBalcony03", "KadishGallery", "islmPalaceBalcony02", "islmDakotahRoof", ] -kHiddenAgesIfInvited = ["BahroCave", "PelletBahroCave", "Pellet Cave", "LiveBahroCave", "LiveBahroCaves", "Myst", "Tiam"] +kHiddenAgesIfInvited = ["BahroCave", "PelletBahroCave", "Pellet Cave", "LiveBahroCave", "LiveBahroCaves", "Myst"] #public ages SDL variables to be read from Vault on start (max. population, is link visible) kAgeSdlVariables = { @@ -214,6 +214,7 @@ 'guildPub' : ('MaxGuildPubPop', None), 'Neighborhood02' : ('MaxKirelPop', 'nxusShowKirel'), 'Kveer' : ('MaxKveerPublicPop', None), +'GoMePubNew' : ('MaxKirelPop', None), } kGuildPubs = ["Cartographers", "Greeters", "Maintainers", "Messengers", "Writers"] @@ -224,7 +225,8 @@ "GuildPub-Maintainers" : "e8306311-56d3-4954-a32d-3da01712e9b5", "GuildPub-Messengers" : "9420324e-11f8-41f9-b30b-c896171a8712", "GuildPub-Writers" : "5cf4f457-d546-47dc-80eb-a07cdfefa95d", - "Kveer" : "68e219e0-ee25-4df0-b855-0435584e29e2"} + "Kveer" : "68e219e0-ee25-4df0-b855-0435584e29e2", + "GoMePubNew" : "d002da26-db26-53f1-bdc0-a05a84274d5c"} #id for ages descriptions kPublicAgesDescription = { @@ -236,6 +238,7 @@ 'GuildPub-Maintainers' : ("Nexus.Messages.GuildPubFull", "Nexus.Messages.GuildPubPopulation"), 'GuildPub-Messengers' : ("Nexus.Messages.GuildPubFull", "Nexus.Messages.GuildPubPopulation"), 'GuildPub-Writers' : ("Nexus.Messages.GuildPubFull", "Nexus.Messages.GuildPubPopulation"), + 'GoMePubNew' : ("Nexus.Messages.GoMePubNewFull", "Nexus.Messages.GoMePubNewPopulation"), } # hood sorting vars @@ -344,6 +347,7 @@ def __init__(self): 'guildPub' : AgeData(ageFilename = '', defaultMaxPop = 0, linkVisible = 0), 'Neighborhood02' : AgeData(ageFilename = 'Neighborhood02', defaultMaxPop = 100, linkVisible = 0), 'Kveer' : AgeData(ageFilename = 'Kveer', defaultMaxPop = 100, linkVisible = 0), + 'GoMePubNew' : AgeData(ageFilename = 'GoMePubNew', defaultMaxPop = 100, linkVisible = 0), } self.categoryLinksList = { @@ -438,6 +442,15 @@ def OnServerInitComplete(self): self.publicAges['Kveer'].linkVisible = True else: PtDebugPrint("nxusBookMachine.OnServerInitComplete(): chron says no link to public Kveer yet, so sorry") + # copy pasta for the Pub + entrygmpn = vault.findChronicleEntry("GotLinkToGoMePublic") + if entrygmpn is not None: + entryValue02 = entrygmpn.chronicleGetValue() + if entryValue02 == "yes": + PtDebugPrint("nxusBookMachine.OnServerInitComplete(): chron says you have the link to public GoMePub, hooray!") + self.publicAges['GoMePubNew'].linkVisible = True + else: + PtDebugPrint("nxusBookMachine.OnServerInitComplete(): chron says no link to public GoMePub yet, so go to Chiso!") def __del__(self): @@ -1297,6 +1310,9 @@ def IUpdateCityLinksList(self): #special case: and another one for GuildPub name elif hasattr(ageData, 'guild'): displayName = "The %s' Pub" % (ageData.guild) + #another special case for the new GoMe Pub + elif ageData.ageFilename == 'GoMePubNew': + displayName = "New Messengers Pub" else: displayName = selectedInfo.getDisplayName()