From 7ba049be25fe2de2ebd9e63a4a97be17172b12d2 Mon Sep 17 00:00:00 2001
From: Plykiya <58439124+Plykiya@users.noreply.github.com>
Date: Sun, 18 Aug 2024 20:29:52 -0700
Subject: [PATCH] Convert bookshelves from StorageFill to EntityTables (#30895)

* Convert bookshelves to EntityTables

* the fixy

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
---
 .../Catalog/Fills/Books/bookshelf.yml         | 189 ++++++------------
 1 file changed, 65 insertions(+), 124 deletions(-)

diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index a0b6b57ec1..7d96d6f540 100644
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -1,129 +1,70 @@
+- type: entityTable
+  id: BookshelfEntityTable
+  table: !type:AllSelector
+    children:
+    # Randomly generated books
+    - id: BookRandomStory
+      amount: !type:RangeNumberSelector
+        range: 0, 4
+    # Guidebooks
+    - !type:GroupSelector
+      children:
+      - id: BookBartendersManual
+      - id: BookChemicalCompendium
+      - id: BookEngineersHandbook
+      - id: BookHowToCookForFortySpaceman
+      - id: BookHowToKeepStationClean
+      - id: BookHowToRockAndStone
+      - id: BookHowToSurvive
+      - id: BookLeafLoversSecret
+      - id: BookMedicalReferenceBook
+      - id: BookScientistsGuidebook
+      - id: BookSecurity
+      - id: BookSpaceEncyclopedia
+      - id: BookSpaceLaw
+      - id: BookTheBookOfControl
+    # Handwritten books
+    - !type:GroupSelector
+      rolls: !type:RangeNumberSelector
+        range: 0, 2
+      children:
+      - id: BookAurora
+      - id: BookCafe
+      - id: BookEarth
+      - id: BookFeather
+      - id: BookIanAntarctica
+      - id: BookIanArctic
+      - id: BookIanCity
+      - id: BookIanDesert
+      - id: BookIanLostWolfPup
+      - id: BookIanMountain
+      - id: BookIanOcean
+      - id: BookIanRanch
+      - id: BookInspiration
+      - id: BookJourney
+      - id: BookMap
+      - id: BookMedicalOfficer
+      - id: BookMorgue
+      - id: BookNames
+      - id: BookNarsieLegend
+      - id: BookPossum
+      - id: BookRufus
+      - id: BookSlothClownMMD
+      - id: BookSlothClownPranks
+      - id: BookSlothClownSSS
+      - id: BookStruck
+      - id: BookSun
+      - id: BookTemple
+      - id: BookTruth
+      - id: BookWatched
+      - id: BookWorld
+
 - type: entity
   id: BookshelfFilled
   parent: Bookshelf
   suffix: random filled
   components:
-  - type: StorageFill
-    contents:
-      - id: BookRandomStory
-        prob: 0.6
-        amount: 2
-        maxAmount: 6
-      - id: BookSpaceEncyclopedia
-        orGroup: BookPool
-      - id: BookTheBookOfControl
-        orGroup: BookPool
-      - id: BookBartendersManual
-        orGroup: BookPool
-      - id: BookHowToCookForFortySpaceman
-        orGroup: BookPool
-      - id: BookLeafLoversSecret
-        orGroup: BookPool
-      - id: BookEngineersHandbook
-        orGroup: BookPool
-      - id: BookScientistsGuidebook
-        orGroup: BookPool
-      - id: BookSecurity
-        orGroup: BookPool
-      - id: BookHowToKeepStationClean
-        orGroup: BookPool
-      - id: BookHowToRockAndStone
-        orGroup: BookPool
-      - id: BookMedicalReferenceBook
-        orGroup: BookPool
-      - id: BookHowToSurvive
-        orGroup: BookPool
-      - id: BookChemicalCompendium
-        orGroup: BookPool
-      - id: BookSpaceLaw
-        orGroup: BookPool
-      - id: BookNarsieLegend
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookTruth
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookWorld
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookIanAntarctica
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookSlothClownSSS
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookSlothClownPranks
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookSlothClownMMD
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookStruck
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookSun
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookPossum
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookCafe
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookFeather
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookIanLostWolfPup
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookIanRanch
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookIanOcean
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookIanMountain
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookIanCity
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookIanArctic
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookIanDesert
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookNames
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookEarth
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookAurora
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookTemple
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookWatched
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookMedicalOfficer
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookMorgue
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookRufus
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookMap
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookJourney
-        prob: 0.1
-        orGroup: BookAuthor
-      - id: BookInspiration
-        prob: 0.1
-        orGroup: BookAuthor
+  - type: EntityTableContainerFill
+    containers:
+      storagebase: !type:NestedSelector
+        tableId: BookshelfEntityTable