Package loot tables part 1: Medical (#35895)

* :3

* oops

* moved file, comments

diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
index 7d0441ee3d113fd15e5b57c17df403d3aea1f26f..e4e1372f89a77b0a644ab138a5bd0b9af5f87bd3 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
+++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml
@@ -687,3 +687,16 @@
   - type: Tag
     tags:
     - WhitelistChameleon
+
+# Entity tables
+- type: entityTable
+  id: AnimalMaskTable
+  table: !type:GroupSelector
+    children:
+    - id: ClothingMaskFox
+    - id: ClothingMaskBat
+    - id: ClothingMaskBear
+    - id: ClothingMaskBee
+    - id: ClothingMaskRaven
+    - id: ClothingMaskRat
+    - id: ClothingMaskJackal

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
index ea5d4cdb89d494d7973403d0552538cc2436d633..42323a7e77b66524fbcf20a59c8ffa4e9f28aabf 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/drinks_bottles.yml
@@ -11,33 +11,50 @@
       - state: red
       - sprite: Objects/Consumable/Drinks/ginbottle.rsi
         state: icon
-  - type: RandomSpawner
-  #small item
-    prototypes:
-      - DrinkAbsintheBottleFull
-      - DrinkBlueCuracaoBottleFull
-      - DrinkCognacBottleFull
-      - DrinkGrenadineBottleFull
-      - DrinkGinBottleFull
-      - DrinkGildlagerBottleFull
-      - DrinkCoffeeLiqueurBottleFull
-      - DrinkMelonLiquorBottleFull
-      - DrinkPatronBottleFull
-      - DrinkRumBottleFull
-      - DrinkSakeBottleFull
-      - DrinkTequilaBottleFull
-      - DrinkVermouthBottleFull
-      - DrinkVodkaBottleFull
-      - DrinkWhiskeyBottleFull
-      - DrinkWineBottleFull
-      - DrinkBeerBottleFull
-      - DrinkBeerGrowler
-      - DrinkAleBottleFull
-      - DrinkAleBottleFullGrowler
-      - DrinkChampagneBottleFull
-    chance: 0.8
-    offset: 0.0
-    #rare
-    rarePrototypes:
-      - DrinkPoisonWinebottleFull
-    rareChance: 0.01
+  - type: EntityTableSpawner
+    table: !type:NestedSelector
+      tableId: RandomAllAlcoholTable
+      prob: 0.8
+
+- type: entityTable
+  id: RandomAllAlcoholTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: RandomCommonAlcoholTable
+      weight: 0.95
+    - !type:NestedSelector
+      tableId: RandomRareAlcoholTable
+      weight: 0.05
+
+- type: entityTable
+  id: RandomCommonAlcoholTable
+  table: !type:GroupSelector
+    children:
+    - id: DrinkAbsintheBottleFull
+    - id: DrinkBlueCuracaoBottleFull
+    - id: DrinkCognacBottleFull
+    - id: DrinkGrenadineBottleFull
+    - id: DrinkGinBottleFull
+    - id: DrinkGildlagerBottleFull
+    - id: DrinkCoffeeLiqueurBottleFull
+    - id: DrinkMelonLiquorBottleFull
+    - id: DrinkPatronBottleFull
+    - id: DrinkRumBottleFull
+    - id: DrinkSakeBottleFull
+    - id: DrinkTequilaBottleFull
+    - id: DrinkVermouthBottleFull
+    - id: DrinkVodkaBottleFull
+    - id: DrinkWhiskeyBottleFull
+    - id: DrinkWineBottleFull
+    - id: DrinkBeerBottleFull
+    - id: DrinkBeerGrowler
+    - id: DrinkAleBottleFull
+    - id: DrinkAleBottleFullGrowler
+    - id: DrinkChampagneBottleFull
+
+- type: entityTable
+  id: RandomRareAlcoholTable
+  table: !type:GroupSelector
+    children:
+    - id: DrinkPoisonWinebottleFull

diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
index 67419335d74ed1674fb4ae388ff1ec9ed494ef23..5b30335e206b7487e555a46a3fa486fca52996f3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml
@@ -125,29 +125,36 @@
   id: PackageUncommonEntityTable
   table: !type:GroupSelector
     children:
-    # Fluff
     - !type:NestedSelector
       tableId: MaintFluffTable
       weight: 0.4
       rolls: !type:RangeNumberSelector
         range: 1, 2
-    # Plushies
     - !type:NestedSelector
       tableId: AllPlushiesTable
       weight: 0.4
-    # Weapons
-    - !type:NestedSelector
-      tableId: MaintWeaponTable
-      weight: 0.1
-    # Syndie Loot
     - !type:NestedSelector
-      tableId: SyndieMaintLoot
-      weight: 0.1
+      tableId: RandomAllAlcoholTable
+      weight: 0.2
+      rolls: !type:RangeNumberSelector
+        range: 2, 3
 
 - type: entityTable # TODO: Add more variety!
   id: PackageRareEntityTable
   table: !type:GroupSelector
     children:
-    - id: MedkitAdvancedFilled
-    - id: MobMothroach
-    - id: PipeBomb
+    - id: MedkitAdvancedFilled # TODO: Replace with PackageRareGeneralBundlesTable for when something doesn't fit with a department. (Like a bundle of bed sheets, dunno)
+    - id: MobMothroach # TODO: Replace with SmallCritterTable so you can get mice and snails and similiar
+    - id: PipeBomb # TODO: PackageRarePunishmentTable, including things like pipebombs and other potentially harmful things (the pipebomb should also get primed when unpacked)
+    #- !type:NestedSelector TODO: Uncomment after all the rare department bundles are done (medical, security, etc...)
+    #  tableId: PackageRareDepartmentBundlesTable
+    - !type:NestedSelector
+      tableId: AnimalMaskTable
+    # Weapons
+    - !type:NestedSelector
+      tableId: MaintWeaponTable
+      weight: 0.5
+    # Syndie Loot
+    - !type:NestedSelector
+      tableId: SyndieMaintLoot
+      weight: 0.5

diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/package_rare_tables.yml b/Resources/Prototypes/Entities/Objects/Deliveries/package_rare_tables.yml
new file mode 100644 (file)
index 0000000..ec62372
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Deliveries/package_rare_tables.yml
@@ -0,0 +1,98 @@
+# Basically all different loot tables that the mail can choose from
+
+# Loot tables
+- type: entityTable
+  id: PackageRareDepartmentBundlesTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: PackageRareMedicalBundlesTable
+
+# Package Bundles
+## Basically items that should always spawn together, specific to packages
+
+### Medical
+- type: entityTable
+  id: PackageRareMedicalBundlesTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: PackageMedicalTopicalBundle
+    - !type:NestedSelector
+      tableId: PackageMedicalChemicalBundle
+    - !type:NestedSelector
+      tableId: PackageMedicalClothingBundle
+    - !type:NestedSelector
+      tableId: PackageMedicalReagentBottleBundle
+
+- type: entityTable
+  id: PackageMedicalTopicalBundle
+  table: !type:AllSelector
+    children:
+    - id: Gauze1
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: Brutepack1
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: Bloodpack1
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+    - id: Ointment1
+      amount: !type:RangeNumberSelector
+        range: 1, 4
+
+- type: entityTable
+  id: PackageMedicalChemicalBundle
+  table: !type:AllSelector
+    children:
+    - id: Beaker
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: LargeBeaker
+      amount: !type:RangeNumberSelector
+        range: 0, 1
+    - id: Syringe
+      amount: !type:RangeNumberSelector
+        range: 1, 2
+    - id: BaseChemistryEmptyVial
+      amount: !type:RangeNumberSelector
+        range: 0, 2
+
+- type: entityTable
+  id: PackageMedicalClothingBundle
+  table: !type:AllSelector
+    children:
+    - !type:GroupSelector
+      children:
+      - id: ClothingUniformJumpskirtMedicalDoctor
+      - id: ClothingUniformJumpsuitMedicalDoctor
+    - !type:GroupSelector
+      children:
+      - id: ClothingBackpackMedical
+      - id: ClothingBackpackDuffelMedical
+      - id: ClothingBackpackSatchelMedical
+    - !type:GroupSelector
+      children:
+      - id: ClothingHandsGlovesNitrile
+      - id: ClothingHandsGlovesLatex
+    - !type:AllSelector
+      prob: 0.5
+      children:
+      - id: ClothingShoesBootsWinterMed
+      - id: ClothingOuterWinterMed
+    - !type:GroupSelector
+      children:
+      - id: ClothingEyesHudMedical
+      - id: ClothingEyesEyepatchHudMedical
+    - id: ClothingBeltMedical
+    - id: ClothingShoesColorWhite
+
+- type: entityTable
+  id: PackageMedicalReagentBottleBundle
+  table: !type:AllSelector
+    children:
+    - !type:NestedSelector
+      tableId: BasicReagentBottlesTable
+      rolls: !type:RangeNumberSelector
+        range: 3, 4

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index d9ee2dcd39664949e35305a09273f256c0977b26..768bc77004efe86339d18e70eeb56db7452c3787 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -226,6 +226,15 @@
   - type: StackPrice
     price: 10
 
+- type: entity
+  parent: Bloodpack
+  id: Bloodpack1
+  suffix: Single
+  components:
+  - type: Stack
+    stackType: Bloodpack
+    count: 1
+
 - type: entity
   parent: Bloodpack
   id: Bloodpack10Lingering

diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
index 6f85db29445396717aa2a1a75fa6e98e274c51a4..a892ee6395d99bad5a39622419424fa25f34cde5 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -642,3 +642,29 @@
         reagents:
         - ReagentId: Sulfur
           Quantity: 30
+
+# Entity tables
+- type: entityTable
+  id: BasicReagentBottlesTable
+  table: !type:GroupSelector
+    children:
+    - id: ChemistryBottleAluminium
+    - id: ChemistryBottleCarbon
+    - id: ChemistryBottleChlorine
+    - id: ChemistryBottleCopper
+    - id: ChemistryBottleEthanol
+    - id: ChemistryBottleFluorine
+    - id: ChemistryBottleHydrogen
+    - id: ChemistryBottleIodine
+    - id: ChemistryBottleIron
+    - id: ChemistryBottleLithium
+    - id: ChemistryBottleMercury
+    - id: ChemistryBottleNitrogen
+    - id: ChemistryBottleOxygen
+    - id: ChemistryBottlePhosphorus
+    - id: ChemistryBottlePotassium
+    - id: ChemistryBottleRadium
+    - id: ChemistryBottleSilicon
+    - id: ChemistryBottleSodium
+    - id: ChemistryBottleSugar
+    - id: ChemistryBottleSulfur