src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt

@@ -133,6 +133,13 @@ fun addChestLootTables(loot: LootTables) {
 				setCount(minimal = 2, maximal = 4)
 				setWeight(2)
 			}
+			setRolls(3)
+		}
+		//gear
+		lootPool{
+			item(Items.IRON_SWORD) {
+
+			}
 		}
 		//food
 		lootPool {
@@ -152,45 +159,43 @@ fun addChestLootTables(loot: LootTables) {
 				setWeight(1)
 			}
 		}
+		//pills
+		lootPool {
+			item(MItems.PILL_ANDROID) { chanceCondition(0.1)
+				setWeight(1)
+			}
+			item(MItems.PILL_HEAL) { chanceCondition(0.5)
+				setWeight(2)
+				setCount(2, 5)
+			}
+		}
 		//otm
 		lootPool {
 			item(MItems.MATTER_DUST) { chanceCondition(0.1)
 				setWeight(4)
 				apply(MatterDustItem.Randomizer(UniformDecimal(Decimal(100), Decimal(2_500))))
 			}
-			item(MItems.PROCEDURAL_BATTERY) {
-				chanceCondition(0.05)
-				setWeight(1)
-
-				apply(
-					ProceduralBatteryItem.Randomizer(
-						maxBatteryLevel = UniformDecimal(Decimal(10_000_000), Decimal(50_000_000)),
-						batteryLevel = UniformDecimal(Decimal(0), Decimal(25_000_000)),
-						maxInput = UniformDecimal(Decimal(1_000), Decimal(5_000)),
-					)
-				)
-			}
-			item(MItems.ExopackUpgrades.INVENTORY_UPGRADE_PROCEDURAL) {
-				chanceCondition(0.2)
-				setWeight(2)
-				apply(ProceduralExopackSlotUpgradeItem.Randomizer(UniformInt.of(1, 9), UniformInt.of(0, 3)))
-			}
-			lootPool {
-				item(MItems.PILL_ANDROID) { chanceCondition(0.1)
-					setWeight(1)
-				}
-				item(MItems.PILL_HEAL) { chanceCondition(0.5)
-					setWeight(2)
-					setCount(2, 5)
-				}
-			}
 		}
+		lootPool { item(MItems.PROCEDURAL_BATTERY) { chanceCondition(0.05)
+			setWeight(1)
+
+			apply(
+				ProceduralBatteryItem.Randomizer(
+					maxBatteryLevel = UniformDecimal(Decimal(10_000_000), Decimal(50_000_000)),
+					batteryLevel = UniformDecimal(Decimal(0), Decimal(25_000_000)),
+					maxInput = UniformDecimal(Decimal(1_000), Decimal(5_000)),
+				))
+		} }
+		lootPool { item(MItems.ExopackUpgrades.INVENTORY_UPGRADE_PROCEDURAL) { chanceCondition(0.2)
+			setWeight(2)
+			apply(ProceduralExopackSlotUpgradeItem.Randomizer(UniformInt.of(1, 9), UniformInt.of(0, 3)))
+		} }
 	}
 
 	loot.builder(LootContextParamSets.CHEST, modLootTable("laboratory/reward_ominous")) {
 		//unique
 		lootPool { item(MItems.FALLING_SUN) {
-			chanceCondition(0.075)
+			chanceCondition(0.1)
 			setWeight(1)
 		} }
 
@@ -202,11 +207,11 @@ fun addChestLootTables(loot: LootTables) {
 			}
 			item(Items.EMERALD) {
 				setCount(minimal = 3, maximal = 6)
-				setWeight(7)
+				setWeight(3)
 			}
 			item(MItems.WITHERED_STEEL) {
 				setCount(minimal = 2, maximal = 4)
-				setWeight(8)
+				setWeight(2)
 			}
 		}
 		//materials

src/main/resources/data/overdrive_that_matters/worldgen/structure/laboratory.json

@@ -1,7 +1,7 @@
 {
   "type": "minecraft:jigsaw",
   "biomes": "#overdrive_that_matters:laboratory",
-  "max_distance_from_center": 80,
+  "max_distance_from_center": 60,
   "liquid_settings": "ignore_waterlogging",
   "size": 20,
   "start_height": {

src/main/resources/data/overdrive_that_matters/worldgen/structure_set/laboratory.json

@@ -3,7 +3,7 @@
     "type": "minecraft:random_spread",
     "salt": 20803232,
     "separation": 8,
-    "spacing": 30
+    "spacing": 12
   },
   "structures": [
     {

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fluff.json

@@ -45,15 +45,6 @@
 		"projection": "rigid"
       },
 	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/fluff/bench",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 1
     }
   ],
   "fallback": "minecraft:empty"

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/halls/decor.json

@@ -8,7 +8,7 @@
         "processors": "minecraft:empty",
 		"projection": "rigid"
       },
-	  "weight": 3
+	  "weight": 1
     },
 	{
       "element": {
@@ -17,7 +17,7 @@
         "processors": "minecraft:empty",
 		"projection": "rigid"
       },
-	  "weight": 3
+	  "weight": 1
     },
 	{
       "element": {
@@ -27,15 +27,6 @@
 		"projection": "rigid"
       },
 	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/halls/decor/pillager_fort",
-        "processors": "minecraft:empty",
-		"projection": "rigid"
-      },
-	  "weight": 2
     }
   ],
   "fallback": "minecraft:empty"

src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json

@@ -26,7 +26,7 @@
         "processors": "overdrive_that_matters:laboratory_weathering",
 		"projection": "rigid"
       },
-	  "weight": 2
+	  "weight": 1
     },
 	{
       "element": {
@@ -36,15 +36,6 @@
 		"projection": "rigid"
       },
 	  "weight": 1
-    },
-	{
-      "element": {
-		"element_type": "minecraft:single_pool_element",
-		"location": "overdrive_that_matters:laboratory/intersections/car_portal",
-        "processors": "overdrive_that_matters:laboratory_weathering",
-		"projection": "rigid"
-      },
-	  "weight": 1
     }
   ],
   "fallback": "overdrive_that_matters:laboratory/fallback_pool"