Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove references to pages that don't exist (i. e. have no .prp file) #1366

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Scripts/Python/Cleft.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ def __init__(self):
else:
pages += ["Desert","Cleft","FemaleCleftDropIn","MaleCleftDropIn","clftJCsDesert","clftJCsChasm"]
if loadZandi:
pages += ["clftZandiVis","ZandiCrossLegs","ZandiDirections","ZandiDirections01","ZandiDirections02","ZandiDirections03"]
pages += ["clftZandiVis","ZandiCrossLegs","ZandiDirections"]
pages += ["ZandiIdle","ZandiRubNose","ZandiScratchHead","ZandiTurnPage","ZandiAllFace","ZandiOpen01Face"]
pages += ["ZandiOpen02Face","ZandiRand01Face","ZandiRand02Face","ZandiRand03Face","ZandiRand04Face","ZandiRand05Face"]
pages += ["ZandiRes01aFace","ZandiRes01bFace","ZandiRes02aFace","ZandiRes02bFace","ZandiRes03aFace","ZandiRes03bFace"]
pages += ["ZandiJC01aFace","ZandiJC01bFace","ZandiJC02aFace","ZandiJC02bFace","ZandiJC03aFace","ZandiJC03bFace"]
pages += ["ZandiJC04aFace","ZandiJC04bFace","ZandiJC05aFace","ZandiJC05bFace","ZandiJC06aFace","ZandiJC06bFace"]
pages += ["ZandiJC04aFace","ZandiJC05aFace","ZandiJC05bFace","ZandiJC06aFace","ZandiJC06bFace"]
pages += ["ZandiJC07aFace","ZandiJC07bFace"]
else:
PtDebugPrint("Zandi seems to have stepped away from the Airstream. Hmmm...")
Expand Down Expand Up @@ -191,8 +191,6 @@ def OnServerInitComplete(self):
SDLVarSceneYeesha = "clftSceneYeeshaUnseen"
boolSceneYeesha = ageSDL[SDLVarSceneYeesha][0]
if boolSceneYeesha:
#PtDebugPrint("Cleft.OnServerInitComplete: SDL says Yeesha hasn't played yet, paging in SceneYeesha stuff...")
#PtPageInNode("clftSceneYeesha")
SDLVarOfficeDoor = "clftOfficeDoorClosed"
boolOfficeDoor = ageSDL[SDLVarOfficeDoor][0]
if boolOfficeDoor:
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Python/city.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def __init__(self):
# For the non-public age, add all the remaining pages
if not IsKadishGallery:
pages += ["canyon","cavetjunction","courtyard","ferry","greatstair","guildhall","harbor","HarborReflect"]
pages += ["islmGreatZeroState","islmJCNote","islmNegilahnCreatureChartGUI","islmNickNote","islmPodMapGUI"]
pages += ["islmJCNote","islmNegilahnCreatureChartGUI","islmNickNote","islmPodMapGUI"]
pages += ["islmWatsonLetterGUI","KahloPub","kahlopubtunnel","library","LibraryInterior"]
pages += ["MuseumInteriorPage","palace"]
pages += ["islmBahroShoutFerry","islmBahroShoutLibrary","islmBahroShoutPalace"]
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Python/clftNpcZandi.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ def ZandiSpeaks(self, clicked = 0):
if useSpeech == "1":
self.ZandiFace = "ZandiJC04aFace"
else:
self.ZandiFace = "ZandiJC04bFace"
self.ZandiFace = "ZandiJC04aFace" # Because ZandiJC04bFace is missing...

elif not self.CheckForJC(jcProgress, JC.Sign) and not PtIsDemoMode():
if self.LastSpeech != 7:
Expand Down
4 changes: 1 addition & 3 deletions Scripts/Python/kemoEmgrPhase0.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@
#globals
variable = None

BooleanVARs = [
"kemoJourneySymbolVis",
]
BooleanVARs = []


AgeStartedIn = None
Expand Down
6 changes: 0 additions & 6 deletions Scripts/Python/ki/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,9 @@ def __del__(self):
PtUnloadDialog("KIHelp")
PtUnloadDialog("KIHelpMenu")
PtUnloadDialog("KeyMapDialog")
PtUnloadDialog("GameSettingsDialog")
PtUnloadDialog("CalibrationGUI")
PtUnloadDialog("TrailerPreviewGUI")
PtUnloadDialog("KeyMap2Dialog")
PtUnloadDialog("AdvancedGameSettingsDialog")
PtUnloadDialog("OptionsHelpGUI")
PtUnloadDialog("bkNotebook")
PtUnloadDialog("bkBahroRockBook")
PtUnloadDialog("YeeshaPageGUI")
Expand Down Expand Up @@ -344,12 +341,9 @@ def OnInit(self):
PtLoadDialog("KIHelp")
PtLoadDialog("KIHelpMenu")
PtLoadDialog("KeyMapDialog")
PtLoadDialog("GameSettingsDialog")
PtLoadDialog("CalibrationGUI")
PtLoadDialog("TrailerPreviewGUI")
PtLoadDialog("KeyMap2Dialog")
PtLoadDialog("AdvancedGameSettingsDialog")
PtLoadDialog("OptionsHelpGUI")
PtLoadDialog("bkNotebook")
PtLoadDialog("bkBahroRockBook")
PtLoadDialog("YeeshaPageGUI")
Expand Down
4 changes: 1 addition & 3 deletions Scripts/Python/tldnEmgrPhase0.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@
#globals
variable = None

BooleanVARs = [
"tldnPumpSwitchFunc"
]
BooleanVARs = []

AgeStartedIn = None

Expand Down
2 changes: 0 additions & 2 deletions Scripts/Python/xOptionsMenu.py
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ def OnFirstUpdate(self):
"First update, load our dialogs"
PtLoadDialog("OptionsMenuGUI",self.key)
PtLoadDialog("KeyMapDialog",self.key)
PtLoadDialog("GameSettingsDialog",self.key)
PtLoadDialog("CalibrationGUI",self.key)
PtLoadDialog("TrailerPreviewGUI",self.key)
PtLoadDialog("AdvancedGameSettingsDialog",self.key)
Expand All @@ -479,7 +478,6 @@ def OnFirstUpdate(self):
def __del__(self):
"the destructor - unload any dialogs we loaded"
PtUnloadDialog("KeyMapDialog")
PtUnloadDialog("GameSettingsDialog")
PtUnloadDialog("CalibrationGUI")
PtUnloadDialog("TrailerPreviewGUI")
PtUnloadDialog("AdvancedGameSettingsDialog")
Expand Down
1 change: 0 additions & 1 deletion Scripts/dat/Ahnonay.age
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Page=MaleValveWheelCCW,21
Page=MaleValveWheelCW,22
Page=MaleVogChairExit,14
Page=MaleVogChairRide,15
Page=QuabIdle,23
Page=QuabIdle01,24
Page=QuabIdle02,25
Page=QuabIdle03,26
Expand Down
21 changes: 0 additions & 21 deletions Scripts/dat/Cleft.age
Original file line number Diff line number Diff line change
Expand Up @@ -33,46 +33,26 @@ Page=MaleWindmillLockedCW,38,1
Page=MaleWindmillStart,37,1
Page=tmnaDesert,35,1
Page=trailerCamPage,18,1
Page=trailerDistribution01,19,1
Page=trailerDistribution02,20,1
Page=trailerDistribution03,21,1
Page=trailerDistribution04,22,1
Page=trailerDistribution05,23,1
Page=trailerDistribution06,24,1
Page=trailerDistribution07,25,1
Page=trailerDistribution08,26,1
Page=trailerDistribution09,27,1
Page=YeeshaFinalEncounter,33,1
Page=YeeshaFinalVision,49,1
Page=YeeshaVisionBlocked,16,1
Page=ZandiAllFace,56,1
Page=ZandiCrossLegs,6,1
Page=ZandiDirections,15,1
Page=ZandiDirections01,8,1
Page=ZandiDirections02,9,1
Page=ZandiDirections03,10,1
Page=ZandiIdle,3,1
Page=ZandiJC01aFace,34,1
Page=ZandiJC01bFace,36,1
Page=ZandiJC01Face,41,1
Page=ZandiJC02aFace,72,1
Page=ZandiJC02bFace,73,1
Page=ZandiJC02Face,50,1
Page=ZandiJC03aFace,74,1
Page=ZandiJC03bFace,75,1
Page=ZandiJC03Face,51,1
Page=ZandiJC04aFace,76,1
Page=ZandiJC04bFace,77,1
Page=ZandiJC04Face,52,1
Page=ZandiJC05aFace,78,1
Page=ZandiJC05bFace,79,1
Page=ZandiJC05Face,53,1
Page=ZandiJC06aFace,80,1
Page=ZandiJC06bFace,81,1
Page=ZandiJC06Face,54,1
Page=ZandiJC07aFace,82,1
Page=ZandiJC07bFace,83,1
Page=ZandiJC07Face,55,1
Page=ZandiOpen01Face,63,1
Page=ZandiOpen02Face,64,1
Page=ZandiRand01Face,65,1
Expand All @@ -88,5 +68,4 @@ Page=ZandiRes03aFace,61,1
Page=ZandiRes03bFace,62,1
Page=ZandiRubNose,5,1
Page=ZandiScratchHead,7,1
Page=ZandiTalk01,44,1
Page=ZandiTurnPage,4,1
2 changes: 0 additions & 2 deletions Scripts/dat/CustomAvatars.age
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ LingerTime=180
SequencePrefix=-3
ReleaseVersion=0
Page=Bahro1,14
Page=Bahro2,15
Page=Blake,12
Page=Cate,11
Page=DrWatson,1
Page=Engberg,9
Page=Fix,6
Page=Kodama,7
Page=Quab,13
Page=RandMiller,2
Expand Down
15 changes: 0 additions & 15 deletions Scripts/dat/Descent.age
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,4 @@ MaxCapacity=10
LingerTime=180
SequencePrefix=9
ReleaseVersion=0
Page=Balcony,2
Page=CaveNode1,10
Page=CaveNode2,11
Page=CaveTunnel1,12
Page=CaveTunnel3,13
Page=Channel,1
Page=Generator,8
Page=Node,5
Page=NodeTunnel,7
Page=RiverTunnel,6
Page=ShaftLow,3
Page=ShaftUnder,4
Page=TianaCave,14
Page=TreasureBookShaft,15
Page=TunnelSystem,9
Page=UpperShaft,16
8 changes: 0 additions & 8 deletions Scripts/dat/Ercana.age
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,24 @@ Page=BakingRmGUI,18
Page=BakingRmGUIBad,29
Page=Canyon,1
Page=CanyonDistribution,13,1
Page=CitySilo,7
Page=ControlRoom,12
Page=ercaBahroFissureGoneVis,17
Page=ercaBahroFissureVis,16
Page=FemaleFloorLeverAPullHard,27
Page=FemaleFloorLeverAPushHard,28
Page=FemaleFloorLeverAStuck,30
Page=FemaleHatchLockedBelow,21
Page=FemaleHrvstrLeverBackward,25
Page=FemaleHrvstrLeverForward,23
Page=FemalePushDebris,19
Page=Harvester,14
Page=MaintenanceTunnel,9
Page=MaleFloorLeverAPullHard,31
Page=MaleFloorLeverAPushHard,32
Page=MaleFloorLeverAStuck,33
Page=MaleHatchLockedBelow,26
Page=MaleHrvstrLeverBackward,24
Page=MaleHrvstrLeverForward,22
Page=MalePushDebris,20
Page=Massing,3,1
Page=Mill,2
Page=PelletRm,11
Page=PlantExterior01,4
Page=PlantExterior02,34
Page=SiloA1,6
Page=SiloB,8
Page=Tunnel,5
Page=VillageArea,15
14 changes: 0 additions & 14 deletions Scripts/dat/GUI.age
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,12 @@ ReleaseVersion=0
Page=AdvancedGameSettingsDialog,19
Page=AudioSettingsDialog,33
Page=AvatarCustomization,7
Page=BahroRockPageGUI,10
Page=bkBahroRockBook,11
Page=BkBook,29
Page=BkBook2,60
Page=BkBookImages,56
Page=bkNotebook,61
Page=CalibrationGUI,16
Page=ContactSupportGUI,65
Page=GameSettingsDialog,15
Page=GraphicsSettingsDialog,34
Page=GUIDialog04a,51
Page=GUIDialog04b,57
Expand All @@ -28,11 +25,9 @@ Page=GUIDialog13,59
Page=IntroBahroBgGUI,32
Page=IntroMovieGUI,21
Page=jalakControlPanel,67
Page=KeyMap2Dialog,18
Page=KeyMapDialog,13
Page=KIAgeOwnerSettings,39
Page=KIBlackBar,5
Page=KIEntry,2
Page=KIHelp,42
Page=KIHelpMenu,43
Page=KIJournalExpanded,26
Expand All @@ -41,7 +36,6 @@ Page=KIMain,4
Page=KIMarkerFolder,52
Page=KIMarkerTimeMenu,54
Page=KIMarkerTypeMenu,58
Page=KIMayorSettings,37
Page=KIMicro,35
Page=KIMicroBlackBar,36
Page=KIMini,3
Expand All @@ -55,20 +49,12 @@ Page=KIRateIt,38
Page=KISettings,40
Page=KIVolumeSettings,31
Page=KIYesNo,6
Page=LinkingBooksGUI,53
Page=NavigationSettingsDialog,44
Page=OptionsHelpGUI,22
Page=OptionsMenuGUI,9
Page=OptionsMenuRestart,45
Page=OrientationGUI,64
Page=PlayerBook,8
Page=psnlClosetGUI,41
Page=ReleaseNotesDialog,63
Page=StartupHelpGUI,20
Page=telescope,12
Page=TestDialog,1
Page=TestNexusLinksGUI,28
Page=TestPersonalAgeLinksGUI,27
Page=tldnupperroompage3,14
Page=TrailerPreviewGUI,17
Page=YeeshaPageGUI,49
1 change: 0 additions & 1 deletion Scripts/dat/Garden.age
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ LingerTime=180
SequencePrefix=1
ReleaseVersion=0
Page=ItinerantBugCloud,3
Page=KemoCreatureVis,2
Page=kemoGarden,4
Page=kemoStorm,5
Page=trailerCamPage,1,1
10 changes: 0 additions & 10 deletions Scripts/dat/Garrison.age
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ MaxCapacity=10
LingerTime=180
SequencePrefix=2
ReleaseVersion=0
Page=cell1,50,1
Page=FemaleClimbUpDebris,34,1
Page=FemaleDescendDebris,43,1
Page=FemaleElevatorArrivingBottom,46,1
Page=FemaleElevatorArrivingTop,45,1
Page=FemaleElevatorLeavingBottom,48,1
Expand All @@ -26,22 +23,15 @@ Page=grsnTeamRoom02,2,1
Page=grsnTrainingCenterHalls,3,1
Page=grsnTrainingCenterMudRooms,4,1
Page=grsnTrainingCntrLinkRm,26,1
Page=grsnTrnCtrBridgesExtended,53,1
Page=grsnVeranda,14,1
Page=grsnVerandaExterior,54,1
Page=grsnWallRoomClimbingPhys,49,1
Page=grsnWellCameras,27
Page=grsnWellFirstFloorHalls,8
Page=grsnWellFirstFloorRooms,9
Page=grsnWellInner,10
Page=grsnWellOccluders,28,1
Page=grsnWellSecondFloorGearRoom,11,1
Page=grsnWellSecondFloorHalls,12,1
Page=grsnWellSecondFloorRooms,13
Page=grsnWellTopSubworld,33,1
Page=KIMiniMarkers,84
Page=MaleClimbUpDebris,39,1
Page=MaleDescendDebris,44,1
Page=MaleElevatorArrivingBottom,36,1
Page=MaleElevatorArrivingTop,35,1
Page=MaleElevatorLeavingBottom,37,1
Expand Down
1 change: 0 additions & 1 deletion Scripts/dat/GlobalAnimations.age
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ Page=FemaleDoorButtonTouch,79
Page=FemaleFall,33
Page=FemaleFall2,114
Page=FemaleFallingLinkOut,108
Page=FemaleFishBookLinkOut,149
Page=FemaleFlinch,298
Page=FemaleFloorLeverA,97
Page=FemaleFloorLeverAUp,235
Expand Down
1 change: 0 additions & 1 deletion Scripts/dat/Jalak.age
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ LingerTime=180
SequencePrefix=43
ReleaseVersion=0
Page=jlakArena,2
Page=jlakProto,1,1
8 changes: 0 additions & 8 deletions Scripts/dat/Kadish.age
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,15 @@ MaxCapacity=10
LingerTime=180
SequencePrefix=22
ReleaseVersion=0
Page=exterior,0
Page=FemaleRingPull,29
Page=kdshCourtyard,12
Page=kdshForest,1
Page=kdshGlowInTheDark,2
Page=kdshJourneyCloth03Vis,28
Page=KdshNoteGUI,31
Page=kdshPillars,3
Page=kdshScope01,22,1
Page=kdshScope02,23,1
Page=kdshScope03,26,1
Page=kdshShadowPath,13
Page=kdshStore,4
Page=kdshVaultExtr,5
Page=kdshVaultExtrYeesha,25
Page=kdshVaultIntr,11
Expand All @@ -26,13 +22,9 @@ Page=kdshYeeshaExcerpts,6,1
Page=kdshYeeshaExcerpts02,7,1
Page=kdshYeeshaExcerpts03,10,1
Page=kdshYeeshaExcerpts04,27,1
Page=MaleRingPull,30
Page=opt-kdshCourtyardPartLeaves,18
Page=opt-kdshCourtyardPhysLeaves,19
Page=opt-kdshCourtyardProjLights,20
Page=opt-kdshForestPartLeaves,9
Page=opt-kdshForestPhysLeaves,14
Page=opt-kdshForestProjLights,15
Page=opt-kdshWalkViewPartLeaves,16
Page=opt-kdshWalkViewPhysLeaves,17
Page=opt-kdshWalkViewProjLights,21
7 changes: 0 additions & 7 deletions Scripts/dat/Myst.age
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,5 @@ MaxCapacity=10
LingerTime=180
SequencePrefix=28
ReleaseVersion=0
Page=FemaleFireplaceButton,8
Page=FemaleFireplaceClimbIn,4
Page=FemaleFireplaceClimbOut,2
Page=Fireplace,1
Page=MaleFireplaceButton,7
Page=MaleFireplaceClimbIn,5
Page=MaleFireplaceClimbOut,3
Page=mystEggRecipeGUI,6
Page=Pelican,9
Loading