First push for Relto page 28

H-uru · May 17, 2022 · a5fe58e · a5fe58e
1 parent 01e077f
commit a5fe58e
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 6 deletions.
diff --git a/Scripts/Python/clftYeeshaPage08.py b/Scripts/Python/clftYeeshaPage08.py
@@ -93,6 +93,8 @@
 kYeeshaPage24 = 224
 kYeeshaPage25 = 225
 kYeeshaPage26 = 226
+kYeeshaPage27 = 227
+kYeeshaPage28 = 228
 kYeeshaPageCancel = 299
 
 isOpen = 0
@@ -233,7 +235,9 @@ def SetStdGUIVisibility(self, visible):
             ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage24)).hide()
             ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage25)).hide()
             ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage26)).hide()
+            ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage27)).hide()
+            ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage28)).hide()
 
             ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage08)).show()
 
-            GUIDialogObject.value.draw.disable()
+            GUIDialogObject.value.draw.disable()
diff --git a/Scripts/Python/psnlYeeshaPageChanges.py b/Scripts/Python/psnlYeeshaPageChanges.py
@@ -53,6 +53,7 @@
 from PlasmaVaultConstants import *
 from PlasmaNetConstants import *
 from xPsnlVaultSDL import *
+import xLinkingBookDefs
 
 PageNumber = ptAttribInt(1, "Yeesha Page Number")
 stringShowStates = ptAttribString(2,"States in which shown")
@@ -61,9 +62,9 @@
 
 respEnable = ptAttribResponder(5, "Enabled resp (if necessary)")
 respDisable = ptAttribResponder(6, "Disabled resp (if necessary)")
+bushDistrib = ptAttribClusterList(7, "Bush distributor")
 
 #globals
-import xLinkingBookDefs
 TotalPossibleYeeshaPages = len(xLinkingBookDefs.xYeeshaPages)
 HideCleftPole = 0
 
@@ -237,6 +238,9 @@ def EnableDisable(self, val):
 
             respAudioStop.run(self.key,avatar=None,fastforward=0)
             respDisable.run(self.key,avatar=None,fastforward=1)
+            if len(bushDistrib.value) > 0:
+                for x in bushDistrib.value:
+                    x.setVisible(0)
 
 
     def TimeToGrow(self):

diff --git a/Scripts/Python/xLinkingBookDefs.py b/Scripts/Python/xLinkingBookDefs.py
@@ -99,11 +99,14 @@
 xYeeshaPage24 = ( "YeeshaPage24", '<pb><img src="xYeeshaPageAlphaSketchStorm*1#0.hsm" align=center check=00ff18,00800c,%d link=25>' )
 xYeeshaPage25 = ( "YeeshaPage25", '<pb><img src="xYeeshaPageAlphaSketch14*1#0.hsm" align=center check=00ff18,00800c,%d link=26>' )
 xYeeshaPage26 = ( "YeeshaPage26", '<pb><img src="xYeeshaPageVeelay7.dds" align=center check=00ff18,00800c,%d link=27>' )
+xYeeshaPage27 = ( "YeeshaPage27", '<pb><img src="xYeeshaPageOcean.dds" align=center check=00ff18,00800c,%d link=28>' )
+xYeeshaPage28 = ( "YeeshaPage28", '<pb><img src="xYeeshaPageBlueFlower.dds" align=center check=00ff18,00800c,%d link=29>' )
 
 
 xYeeshaPages = [ xYeeshaPage1, xYeeshaPage2, xYeeshaPage3, xYeeshaPage4, xYeeshaPage5, xYeeshaPage6, xYeeshaPage7,\
                 xYeeshaPage8, xYeeshaPage9, xYeeshaPage10, xYeeshaPage12, xYeeshaPage13, xYeeshaPage14, xYeeshaPage15,\
-                xYeeshaPage16, xYeeshaPage17, xYeeshaPage18, xYeeshaPage19, xYeeshaPage20, xYeeshaPage21, xYeeshaPage22, xYeeshaPage23, xYeeshaPage24, xYeeshaPage25, xYeeshaPage26 ]
+                xYeeshaPage16, xYeeshaPage17, xYeeshaPage18, xYeeshaPage19, xYeeshaPage20, xYeeshaPage21, xYeeshaPage22,\
+                xYeeshaPage23, xYeeshaPage24, xYeeshaPage25, xYeeshaPage26, xYeeshaPage27, xYeeshaPage28 ]
 
 
 

diff --git a/Scripts/Python/xYeeshaPages.py b/Scripts/Python/xYeeshaPages.py
@@ -97,13 +97,17 @@
 kYeeshaPage24 = 224
 kYeeshaPage25 = 225
 kYeeshaPage26 = 226
+kYeeshaPage27 = 227
+kYeeshaPage28 = 228
 kYeeshaPageCancel = 299
 
 YeeshaPageIDList = [ kYeeshaPage01, kYeeshaPage02, kYeeshaPage03, kYeeshaPage04,\
                     kYeeshaPage05, kYeeshaPage06, kYeeshaPage07, kYeeshaPage08,\
                     kYeeshaPage09, kYeeshaPage10, kYeeshaPage12, kYeeshaPage13,\
                     kYeeshaPage14, kYeeshaPage15, kYeeshaPage16, kYeeshaPage17,\
-                    kYeeshaPage18, kYeeshaPage19, kYeeshaPage20, kYeeshaPage21, kYeeshaPage22, kYeeshaPage23, kYeeshaPage24, kYeeshaPage25, kYeeshaPage26 ]
+                    kYeeshaPage18, kYeeshaPage19, kYeeshaPage20, kYeeshaPage21, \
+                    kYeeshaPage22, kYeeshaPage23, kYeeshaPage24, kYeeshaPage25, \
+                    kYeeshaPage26, kYeeshaPage27, kYeeshaPage28 ]
 
 
 class xYeeshaPages(ptModifier):
@@ -236,6 +240,8 @@ def IDrawLinkPanel(self):
         ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage24)).hide()
         ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage25)).hide()
         ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage26)).hide()
+        ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage27)).hide()
+        ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage28)).hide()
 
         #now draw correct panel
         if (PageNumber.value) == 1:
@@ -288,6 +294,10 @@ def IDrawLinkPanel(self):
             ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage25)).show()
         elif (PageNumber.value) == 26:
             ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage26)).show()
+        elif (PageNumber.value) == 27:
+            ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage27)).show()
+        elif (PageNumber.value) == 28:
+            ptGUIControlButton(mydialog.getControlFromTag(kYeeshaPage28)).show()
 
 
         else:

diff --git a/Scripts/SDL/Cleft.sdl b/Scripts/SDL/Cleft.sdl
@@ -212,3 +212,47 @@ STATEDESC Cleft
     VAR BOOL    clftIsCleftDone[1]    DEFAULT=0 DISPLAYOPTION=red
 }
 
+
+STATEDESC Cleft
+{
+	VERSION 25
+
+# Boolean variables
+
+    VAR BOOL    clftJourneyCloth01Vis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftJourneyCloth02Vis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftJourneyCloth03Vis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftJourneyCloth04Vis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftJourneyCloth05Vis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftJourneyCloth06Vis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftJourneyCloth07Vis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftZandiShirtVis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftAtrusGogglesVis[1]    DEFAULT=1 DEFAULTOPTION=VAULT
+    VAR BOOL    clftYeeshaPage19Vis[1]    DEFAULT=0 DISPLAYOPTION=VAULT
+    VAR BOOL    clftYeeshaPage28Vis[1]    DEFAULT=0 DISPLAYOPTION=VAULT
+
+# Age Mechanics
+
+    VAR BOOL    clftAgeSDLWindmillLocked[1] DEFAULT=1 DISPLAYOPTION=red
+    VAR BOOL    clftAgeSDLWindmillRunning[1] DEFAULT=0 DISPLAYOPTION=red
+    VAR BOOL    clftBahroDoorClosed[1]    DEFAULT=1 DISPLAYOPTION=red
+    VAR BOOL    clftJourneysVis[1]    DEFAULT=1 DISPLAYOPTION=red
+    VAR BOOL    clftYeeshaBookVis[1]    DEFAULT=1 DISPLAYOPTION=red
+    VAR BOOL    clftZandiVis[1]    DEFAULT=1 DISPLAYOPTION=red
+    VAR BOOL    clftYeeshaPage08Vis[1]    DEFAULT=1 DISPLAYOPTION=red
+    VAR BOOL    clftBridgeCollapse[1]    DEFAULT=0 DISPLAYOPTION=red
+    VAR BOOL    clftBucketLowered[1]    DEFAULT=0 DISPLAYOPTION=red
+    VAR BOOL    clftKitchenDoorClosed[1]    DEFAULT=1 DISPLAYOPTION=red
+    VAR BOOL    clftOfficeDoorClosed[1]    DEFAULT=0 DISPLAYOPTION=red
+    VAR BOOL    clftTomahnaActive[1]    DEFAULT=0 DISPLAYOPTION=red
+    VAR BOOL    clftSceneYeeshaUnseen[1]    DEFAULT=1 DISPLAYOPTION=red
+    VAR BOOL    clftSceneBahroUnseen[1]    DEFAULT=1 DISPLAYOPTION=red
+    VAR BYTE    clftImagerPanelN[1]    DEFAULT=3 DISPLAYOPTION=red
+    VAR BYTE    clftImagerPanelS[1]    DEFAULT=5 DISPLAYOPTION=red
+    VAR BYTE    clftImagerPanelE[1]    DEFAULT=3 DISPLAYOPTION=red
+    VAR BYTE    clftImagerPanelW[1]    DEFAULT=0 DISPLAYOPTION=red
+    VAR BOOL    clftWindmillUnstuck[1]    DEFAULT=0 DISPLAYOPTION=red
+    VAR BOOL    clftYeeshaShowJC[1]    DEFAULT=0 DISPLAYOPTION=red
+    VAR BOOL    clftIsCleftDone[1]    DEFAULT=0 DISPLAYOPTION=red
+}
+
diff --git a/Scripts/dat/Personal.fni b/Scripts/dat/Personal.fni
@@ -1,4 +1,4 @@
 Graphics.Renderer.Setyon 10000 
-Graphics.Renderer.Fog.SetDefLinear 1 900 2
+Graphics.Renderer.Fog.SetDefLinear 1 1800 2
 Graphics.Renderer.Fog.SetDefColor .4 .4 .5
-Graphics.Renderer.SetClearColor .4 .4 .5
+Graphics.Renderer.SetClearColor .4 .4 .5