Skip to content

Commit 19c7897

Browse files
committed
Remove ptAgeVault.getAgesIOwnFolder in favor of .getBookshelfFolder
The implementation of the two methods is identical, so this doesn't change any behavior. However, the name getBookshelfFolder more accurately describes the method's behavior and avoids confusion with ptVault.getAgesIOwnFolder, which does *not* do the same thing as the ptAgeVault method: * ptVault.getAgesIOwnFolder can be called in any age and returns the age instances owned by the current avatar. * ptAgeVault.getBookshelfFolder (formerly ptAgeVault.getAgesIOwnFolder) only succeeds when in an instance of Relto and returns the age instances owned by the avatar that owns the Relto instance (i. e. the books appearing in that Relto instance's bookshelf). These two lists will be different if one avatar is visiting another avatar's Relto!
1 parent 114d747 commit 19c7897

File tree

5 files changed

+14
-24
lines changed

5 files changed

+14
-24
lines changed

Scripts/Python/plasma/Plasma.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1187,10 +1187,6 @@ def getAgeSDL(self):
11871187
"""Returns the age's SDL (ptSDLStateDataRecord)"""
11881188
...
11891189

1190-
def getAgesIOwnFolder(self):
1191-
"""(depreciated, use getBookshelfFolder) Returns a ptVaultFolderNode that contain the Ages I own"""
1192-
...
1193-
11941190
def getBookshelfFolder(self):
11951191
"""Personal age only: Returns a ptVaultFolderNode that contains the owning player's AgesIOwn age list"""
11961192
...

Scripts/Python/psnlBahroPoles.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ def FissureForceCamRgnHandle(self):
941941

942942
def IsVolatile(self, age):
943943
ageVault = ptAgeVault()
944-
PAL = ageVault.getAgesIOwnFolder()
944+
PAL = ageVault.getBookshelfFolder()
945945
contents = PAL.getChildNodeRefList()
946946
for content in contents:
947947
link = content.getChild()
@@ -966,7 +966,7 @@ def BookLost(self, age):
966966
return 0
967967

968968
ageVault = ptAgeVault()
969-
PAL = ageVault.getAgesIOwnFolder()
969+
PAL = ageVault.getBookshelfFolder()
970970
contents = PAL.getChildNodeRefList()
971971
for content in contents:
972972
link = content.getChild()
@@ -1079,9 +1079,9 @@ def ValidityCheck(self):
10791079

10801080
def UpdateToState2(self):
10811081
vault = ptAgeVault()
1082-
myAges = vault.getAgesIOwnFolder()
1083-
myAges = myAges.getChildNodeRefList()
1084-
for ageInfo in myAges:
1082+
PAL = vault.getBookshelfFolder()
1083+
contents = PAL.getChildNodeRefList()
1084+
for ageInfo in contents:
10851085
link = ageInfo.getChild()
10861086
link = link.upcastToAgeLinkNode()
10871087
info = link.getAgeInfo()

Scripts/Python/psnlBookshelf.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ def OnNotify(self,state,id,events):
456456
note.send()
457457

458458
ageVault = ptAgeVault()
459-
PAL = ageVault.getAgesIOwnFolder()
459+
PAL = ageVault.getBookshelfFolder()
460460
contents = PAL.getChildNodeRefList()
461461
for content in contents:
462462
link = content.getChild()
@@ -1056,7 +1056,7 @@ def OnNotify(self,state,id,events):
10561056
note.send()
10571057

10581058
ageVault = ptAgeVault()
1059-
PAL = ageVault.getAgesIOwnFolder()
1059+
PAL = ageVault.getBookshelfFolder()
10601060
contents = PAL.getChildNodeRefList()
10611061
for content in contents:
10621062
link = content.getChild()
@@ -1213,7 +1213,7 @@ def IGetLinkFromBook(self, spTitle = None):
12131213
return ageLink
12141214

12151215
ageVault = ptAgeVault()
1216-
PAL = ageVault.getAgesIOwnFolder()
1216+
PAL = ageVault.getBookshelfFolder()
12171217
contents = PAL.getChildNodeRefList()
12181218
for content in contents:
12191219
link = content.getChild()
@@ -1245,7 +1245,7 @@ def IUpdateLocksAndTrays(self):
12451245
global CityBookAges
12461246

12471247
ageVault = ptAgeVault()
1248-
PAL = ageVault.getAgesIOwnFolder()
1248+
PAL = ageVault.getBookshelfFolder()
12491249
contents = PAL.getChildNodeRefList()
12501250

12511251
# check for the dang city book and do stuff
@@ -1457,7 +1457,7 @@ def IUpdateLinks(self):
14571457
break
14581458

14591459
ageVault = ptAgeVault()
1460-
PAL = ageVault.getAgesIOwnFolder()
1460+
PAL = ageVault.getBookshelfFolder()
14611461
if PAL is not None:
14621462
contents = PAL.getChildNodeRefList()
14631463

@@ -1970,7 +1970,7 @@ def HasCityBook(self):
19701970

19711971
def GetOwnedAgeLink(self, age):
19721972
vault = ptAgeVault()
1973-
PAL = vault.getAgesIOwnFolder()
1973+
PAL = vault.getBookshelfFolder()
19741974
if PAL is not None:
19751975
contents = PAL.getChildNodeRefList()
19761976
for content in contents:

Scripts/Python/xLinkingBookGUIPopup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ def BuildCityBook(self):
736736

737737
# citybook links have been changed to Hood childages, so we search there now
738738
#vault = ptAgeVault()
739-
#OwnedAges = vault.getAgesIOwnFolder().getChildNodeRefList()
739+
#OwnedAges = vault.getBookshelfFolder().getChildNodeRefList()
740740
childAgeFolder = self.IGetHoodInfoNode().getChildAgesFolder()
741741
HoodChildAges = childAgeFolder.getChildNodeRefList()
742742
spawnPoints = []
@@ -878,7 +878,7 @@ def BuildTreasureLinks(self,ageRequested):
878878

879879
# Step 1: Find this age's spawnPoints
880880
vault = ptAgeVault()
881-
OwnedAges = vault.getAgesIOwnFolder().getChildNodeRefList()
881+
OwnedAges = vault.getBookshelfFolder().getChildNodeRefList()
882882
spawnPoints = None
883883
for NodeRef in OwnedAges:
884884
tmpLink = NodeRef.getChild().upcastToAgeLinkNode()
@@ -1016,7 +1016,7 @@ def OnTimer(self,id):
10161016

10171017
def GetOwnedAgeLink(self, age):
10181018
vault = ptAgeVault()
1019-
PAL = vault.getAgesIOwnFolder()
1019+
PAL = vault.getBookshelfFolder()
10201020
if PAL is not None:
10211021
contents = PAL.getChildNodeRefList()
10221022
for content in contents:

Sources/Plasma/FeatureLib/pfPython/pyAgeVaultGlue.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ PYTHON_METHOD_DEFINITION_NOARGS(ptAgeVault, getChronicleFolder)
7979
return self->fThis->GetChronicleFolder();
8080
}
8181

82-
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeVault, getAgesIOwnFolder)
83-
{
84-
return self->fThis->GetBookshelfFolder();
85-
}
86-
8782
PYTHON_METHOD_DEFINITION_NOARGS(ptAgeVault, getBookshelfFolder)
8883
{
8984
return self->fThis->GetBookshelfFolder();
@@ -248,7 +243,6 @@ PYTHON_START_METHODS_TABLE(ptAgeVault)
248243
PYTHON_METHOD_NOARGS(ptAgeVault, getAgeDevicesFolder, "Returns a ptVaultFolderNode of the inboxes for the devices in this Age."),
249244
PYTHON_METHOD_NOARGS(ptAgeVault, getSubAgesFolder, "Returns a ptVaultFolderNode of sub Age's folder."),
250245
PYTHON_METHOD_NOARGS(ptAgeVault, getChronicleFolder, "Returns a ptVaultFolderNode"),
251-
PYTHON_METHOD_NOARGS(ptAgeVault, getAgesIOwnFolder, "(depreciated, use getBookshelfFolder) Returns a ptVaultFolderNode that contain the Ages I own"),
252246
PYTHON_METHOD_NOARGS(ptAgeVault, getBookshelfFolder, "Personal age only: Returns a ptVaultFolderNode that contains the owning player's AgesIOwn age list"),
253247
PYTHON_METHOD_NOARGS(ptAgeVault, getPeopleIKnowAboutFolder, "Returns a ptVaultPlayerInfoListNode of the players the Age knows about(?)."),
254248
PYTHON_METHOD_NOARGS(ptAgeVault, getPublicAgesFolder, "Returns a ptVaultFolderNode that contains all the public Ages"),

0 commit comments

Comments
 (0)