Merge branch 'H-uru:master' into Prevent-Sort-Visible-Spans-Reallocat…

…ions
H-uru · Dec 31, 2024 · fc2aad9 · fc2aad9
2 parents 071bdc1 + c4cbb98
commit fc2aad9
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 525 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -182,7 +182,7 @@ jobs:
           path: build/install
 
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: ${{ matrix.platform.str }}-${{ matrix.cfg.str }}
     strategy:
       matrix:

diff --git a/Scripts/Python/Serene.py b/Scripts/Python/Serene.py
diff --git a/Scripts/Python/Tiam.py b/Scripts/Python/Tiam.py
diff --git a/Scripts/Python/Vothol.py b/Scripts/Python/Vothol.py
diff --git 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", "ChisoPreniv", "GoMePubNew", "FahetsHighgarden"]
+kHiddenPersonalAges = ["Personal", "Nexus", "Neighborhood", "city", "AvatarCustomization", "Cleft", "BaronCityOffice", "BahroCave", "PelletBahroCave", "Kveer", "Myst", "LiveBahroCaves", "LiveBahroCave", "ChisoPreniv", "GoMePubNew"]
 kHiddenCityLinks = ["islmPalaceBalcony03", "KadishGallery", "islmPalaceBalcony02", "islmDakotahRoof", "islmGreatTree"]
-kHiddenAgesIfInvited = ["BahroCave", "PelletBahroCave", "Pellet Cave", "LiveBahroCave", "LiveBahroCaves", "Myst", "ChisoPreniv", "GoMePubNew", "FahetsHighgarden"]
+kHiddenAgesIfInvited = ["BahroCave", "PelletBahroCave", "Pellet Cave", "LiveBahroCave", "LiveBahroCaves", "Myst", "ChisoPreniv", "GoMePubNew"]
 
 #public ages SDL variables to be read from Vault on start (max. population, is link visible)
 kAgeSdlVariables = {

diff --git a/Scripts/Python/trebivdil.py b/Scripts/Python/trebivdil.py
diff --git a/Scripts/Python/xLinkingBookDefs.py b/Scripts/Python/xLinkingBookDefs.py
@@ -264,18 +264,10 @@
         "BahroCaveLower":     ( 'xLinkPanelBahroCaveLower','bkBahroRockBook','Bahro' ),
         "islmGreatTree":        ( 'xLinkPanelCityGreatTree','bkBahroRockBook','Bahro' ),
 # Begin Fan Ages
-        "Trebivdil":          ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpaneltrebivdil' + LinkEnd ),
-        "FehnirHouse":          ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpanelfehnirhouse' + LinkEnd ),
         "GoMePubNew":           ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpanelgomepubnew' + LinkEnd ),
         "VeeTsah":              ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpanelsheten' + LinkEnd ),
-        "Vothol":               ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpanelvothol' + LinkEnd ),
         "ChisoPreniv":          ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpanelchisopreniv' + LinkEnd ),
         "ChisoPrenivNote":      ( 0, 1.0, 1.0, FanAgeStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpanelchisopreniv' + LinkEnd ),
-        "Serene":               ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpanelserene' + LinkEnd ),
-        "Tiam":                 ( 1, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + DRCStampHolder + ShareBookDelete2 + LinkStart + 'xlinkpaneltiam' + LinkEnd ),
-        "Elonin":               ( 1, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + DRCStampHolder + ShareBookDelete2 + LinkStart + 'xlinkpanelelonin' + LinkEnd ),
-        "EderNaybree":          ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpaneledernaybree' + LinkEnd ),
-        "FahetsHighgarden":     ( 0, 1.0, 1.0, NoDRCStamp, BookStart1 + DRCStampHolder + NoShare + LinkStart + 'xlinkpanelhighgarden' + LinkEnd ),
 }
 
 # cross-references the book name with the age and spawn point it links to

diff --git a/Scripts/SDL/Serene.sdl b/Scripts/SDL/Serene.sdl
diff --git a/Scripts/SDL/Tiam.sdl b/Scripts/SDL/Tiam.sdl