diff --git a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt index 20cd4ec2f..dbde80681 100644 --- a/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt +++ b/src/data/kotlin/ru/dbotthepony/mc/otm/datagen/loot/LootTablesChests.kt @@ -133,13 +133,6 @@ fun addChestLootTables(loot: LootTables) { setCount(minimal = 2, maximal = 4) setWeight(2) } - setRolls(3) - } - //gear - lootPool{ - item(Items.IRON_SWORD) { - - } } //food lootPool { @@ -159,43 +152,45 @@ 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)))) } - } - lootPool { item(MItems.PROCEDURAL_BATTERY) { chanceCondition(0.05) - setWeight(1) + 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))) - } } + 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) + } + } + } } loot.builder(LootContextParamSets.CHEST, modLootTable("laboratory/reward_ominous")) { //unique lootPool { item(MItems.FALLING_SUN) { - chanceCondition(0.1) + chanceCondition(0.075) setWeight(1) } } @@ -207,11 +202,11 @@ fun addChestLootTables(loot: LootTables) { } item(Items.EMERALD) { setCount(minimal = 3, maximal = 6) - setWeight(3) + setWeight(7) } item(MItems.WITHERED_STEEL) { setCount(minimal = 2, maximal = 4) - setWeight(2) + setWeight(8) } } //materials diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/crossroads/vertical_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/crossroads/vertical_a.nbt index 11fcdd344..24a334816 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/crossroads/vertical_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/crossroads/vertical_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/center/center_a.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/center/center_a.nbt index 98326a1cd..132ee6bef 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/center/center_a.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/halls/center/center_a.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/car_portal.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/car_portal.nbt new file mode 100644 index 000000000..e916911d6 Binary files /dev/null and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/intersections/car_portal.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward.nbt index 3ec08472d..0a7f52ffb 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward_ominous_wall.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward_ominous_wall.nbt index 3412c4405..1c863614b 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward_ominous_wall.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward_ominous_wall.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward_wall.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward_wall.nbt index 315a36262..0bde810fe 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward_wall.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/reward/reward_wall.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_b.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_b.nbt index 3ae979496..adcff378b 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_b.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/rooms/office_b.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/spawner/s_android_melee.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/spawner/s_android_melee.nbt index 7cb5852f2..f0ad93ed4 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/spawner/s_android_melee.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/spawner/s_android_melee.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/structure/laboratory/spawner/s_loader.nbt b/src/main/resources/data/overdrive_that_matters/structure/laboratory/spawner/s_loader.nbt index 4618f486a..5d149702f 100644 Binary files a/src/main/resources/data/overdrive_that_matters/structure/laboratory/spawner/s_loader.nbt and b/src/main/resources/data/overdrive_that_matters/structure/laboratory/spawner/s_loader.nbt differ diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fluff.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fluff.json index 842108e80..1c2951b2e 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fluff.json +++ b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/fluff.json @@ -45,6 +45,15 @@ "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" diff --git a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json b/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json index 27a79311d..f5caecfed 100644 --- a/src/main/resources/data/overdrive_that_matters/worldgen/template_pool/laboratory/intersections.json +++ b/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": 1 + "weight": 2 }, { "element": { @@ -36,6 +36,15 @@ "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"