Convert bookshelves from StorageFill to EntityTables (#30895)

* Convert bookshelves to EntityTables

* the fixy

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
index a0b6b57ec17a4ab899ba6d345d822f96a748135c..7d96d6f540a4ead71d6e0b76a39c94835b1c55bc 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
+++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
@@ -1,129 +1,70 @@
-- 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
+- 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
-        orGroup: BookPool
-      - id: BookHowToCookForFortySpaceman
-        orGroup: BookPool
-      - id: BookLeafLoversSecret
-        orGroup: BookPool
+      - id: BookChemicalCompendium
       - id: BookEngineersHandbook
-        orGroup: BookPool
-      - id: BookScientistsGuidebook
-        orGroup: BookPool
-      - id: BookSecurity
-        orGroup: BookPool
+      - id: BookHowToCookForFortySpaceman
       - id: BookHowToKeepStationClean
-        orGroup: BookPool
       - id: BookHowToRockAndStone
-        orGroup: BookPool
-      - id: BookMedicalReferenceBook
-        orGroup: BookPool
       - id: BookHowToSurvive
-        orGroup: BookPool
-      - id: BookChemicalCompendium
-        orGroup: BookPool
+      - id: BookLeafLoversSecret
+      - id: BookMedicalReferenceBook
+      - id: BookScientistsGuidebook
+      - id: BookSecurity
+      - id: BookSpaceEncyclopedia
       - 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: BookTheBookOfControl
+    # Handwritten books
+    - !type:GroupSelector
+      rolls: !type:RangeNumberSelector
+        range: 0, 2
+      children:
+      - id: BookAurora
       - id: BookCafe
-        prob: 0.1
-        orGroup: BookAuthor
+      - id: BookEarth
       - 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: BookIanAntarctica
       - id: BookIanArctic
-        prob: 0.1
-        orGroup: BookAuthor
+      - id: BookIanCity
       - 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: BookIanLostWolfPup
+      - id: BookIanMountain
+      - id: BookIanOcean
+      - id: BookIanRanch
+      - id: BookInspiration
+      - id: BookJourney
+      - id: BookMap
       - id: BookMedicalOfficer
-        prob: 0.1
-        orGroup: BookAuthor
       - id: BookMorgue
-        prob: 0.1
-        orGroup: BookAuthor
+      - id: BookNames
+      - id: BookNarsieLegend
+      - id: BookPossum
       - 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
+      - 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: EntityTableContainerFill
+    containers:
+      storagebase: !type:NestedSelector
+        tableId: BookshelfEntityTable