From 9e197a2b2dca0168472c21a92098cdc23601ab7d Mon Sep 17 00:00:00 2001 From: Hrom Date: Thu, 7 Mar 2024 14:28:05 +0100 Subject: [PATCH] add all function to most creatures loot tables --- .../common/entity/wild/aggressive/roshwalr_boss.ron | 2 +- assets/common/entity/wild/peaceful/hirdrasil.ron | 2 +- assets/common/entity/wild/peaceful/moose.ron | 2 +- .../loot_tables/creature/arthropod/antlion.ron | 7 +++++-- .../loot_tables/creature/arthropod/black_widow.ron | 9 ++++++--- .../loot_tables/creature/arthropod/carapace.ron | 7 +++++-- .../creature/arthropod/crawler_molten.ron | 9 ++++++--- .../common/loot_tables/creature/arthropod/leaf.ron | 7 +++++-- .../loot_tables/creature/arthropod/leaf_beetle.ron | 9 ++++++--- .../common/loot_tables/creature/arthropod/ooze.ron | 7 +++++-- .../loot_tables/creature/arthropod/tarantula.ron | 7 +++++-- .../common/loot_tables/creature/arthropod/web.ron | 7 +++++-- .../loot_tables/creature/biped_large/blue_oni.ron | 10 +++++++--- .../loot_tables/creature/biped_large/default.ron | 7 +++++-- .../loot_tables/creature/biped_large/red_oni.ron | 10 +++++++--- .../loot_tables/creature/biped_large/troll.ron | 11 +++++++---- .../loot_tables/creature/biped_large/tursus.ron | 2 +- .../loot_tables/creature/biped_large/wendigo.ron | 11 +++++++---- .../loot_tables/creature/bird_large/cockatrice.ron | 11 +++++++---- .../common/loot_tables/creature/bird_large/roc.ron | 9 ++++++--- .../loot_tables/creature/quad_low/basilisk.ron | 6 +++--- .../loot_tables/creature/quad_low/carapace.ron | 4 ++-- .../loot_tables/creature/quad_low/deadwood.ron | 13 ++++++++----- .../loot_tables/creature/quad_low/driggle.ron | 9 ++++++--- .../common/loot_tables/creature/quad_low/elbst.ron | 9 ++++++--- .../common/loot_tables/creature/quad_low/fanged.ron | 7 +++++-- .../loot_tables/creature/quad_low/generic.ron | 7 +++++-- .../loot_tables/creature/quad_low/lavadrake.ron | 6 +++--- .../loot_tables/creature/quad_low/maneater.ron | 6 +++--- .../common/loot_tables/creature/quad_low/moss.ron | 6 +++--- .../loot_tables/creature/quad_low/reefsnapper.ron | 9 ++++++--- .../loot_tables/creature/quad_low/rootsnapper.ron | 9 ++++++--- .../loot_tables/creature/quad_low/salamander.ron | 9 ++++++--- .../loot_tables/creature/quad_low/venemous.ron | 9 ++++++--- .../loot_tables/creature/quad_medium/carapace.ron | 10 ++++++---- .../loot_tables/creature/quad_medium/catoblepas.ron | 9 ++++++--- .../loot_tables/creature/quad_medium/cattle.ron | 7 +++++-- .../loot_tables/creature/quad_medium/clawed.ron | 7 +++++-- .../loot_tables/creature/quad_medium/dreadhorn.ron | 4 ++-- .../loot_tables/creature/quad_medium/fanged.ron | 7 +++++-- .../loot_tables/creature/quad_medium/frostfang.ron | 9 ++++++--- .../loot_tables/creature/quad_medium/gentle.ron | 9 ++++++--- .../loot_tables/creature/quad_medium/highland.ron | 9 ++++++--- .../loot_tables/creature/quad_medium/hirdrasil.ron | 9 +++++++++ .../common/loot_tables/creature/quad_medium/ice.ron | 4 ++-- .../loot_tables/creature/quad_medium/icedrake.ron | 6 +++--- .../loot_tables/creature/quad_medium/mammoth.ron | 2 +- .../loot_tables/creature/quad_medium/moose.ron | 8 ++++++++ .../loot_tables/creature/quad_medium/roshwalr.ron | 4 ++-- .../loot_tables/creature/quad_medium/tuskram.ron | 8 ++++++-- .../loot_tables/creature/quad_medium/wolf.ron | 9 ++++++--- .../loot_tables/creature/quad_medium/wool.ron | 11 +++++++---- .../common/loot_tables/creature/quad_medium/yak.ron | 7 +++++-- .../creature/quad_small/treant_sapling.ron | 11 +++++++---- .../loot_tables/creature/theropod/archaeos.ron | 6 +++--- .../loot_tables/creature/theropod/axebeak.ron | 9 ++++++--- .../loot_tables/creature/theropod/dodarock.ron | 7 +++++-- .../common/loot_tables/creature/theropod/horned.ron | 2 +- .../common/loot_tables/creature/theropod/ntouka.ron | 6 +++--- .../common/loot_tables/creature/theropod/odonto.ron | 8 ++++---- .../common/loot_tables/creature/theropod/raptor.ron | 9 ++++++--- .../common/loot_tables/creature/theropod/scale.ron | 7 +++++-- 62 files changed, 302 insertions(+), 157 deletions(-) create mode 100644 assets/common/loot_tables/creature/quad_medium/hirdrasil.ron create mode 100644 assets/common/loot_tables/creature/quad_medium/moose.ron diff --git a/assets/common/entity/wild/aggressive/roshwalr_boss.ron b/assets/common/entity/wild/aggressive/roshwalr_boss.ron index bc9ce54809..6f804e11cf 100644 --- a/assets/common/entity/wild/aggressive/roshwalr_boss.ron +++ b/assets/common/entity/wild/aggressive/roshwalr_boss.ron @@ -6,7 +6,7 @@ body_type: Female, ))), alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.creature.quad_medium.ice"), + loot: LootTable("common.loot_tables.creature.quad_medium.roshwalr"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/peaceful/hirdrasil.ron b/assets/common/entity/wild/peaceful/hirdrasil.ron index 21dcef6fad..548c646c46 100644 --- a/assets/common/entity/wild/peaceful/hirdrasil.ron +++ b/assets/common/entity/wild/peaceful/hirdrasil.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("hirdrasil"), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), + loot: LootTable("common.loot_tables.creature.quad_medium.hirdrasil"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/entity/wild/peaceful/moose.ron b/assets/common/entity/wild/peaceful/moose.ron index c4916cb8e9..6ecb3aa6ca 100644 --- a/assets/common/entity/wild/peaceful/moose.ron +++ b/assets/common/entity/wild/peaceful/moose.ron @@ -3,7 +3,7 @@ name: Automatic, body: RandomWith("moose"), alignment: Alignment(Wild), - loot: LootTable("common.loot_tables.creature.quad_medium.generic"), + loot: LootTable("common.loot_tables.creature.quad_medium.moose"), inventory: ( loadout: FromBody, ), diff --git a/assets/common/loot_tables/creature/arthropod/antlion.ron b/assets/common/loot_tables/creature/arthropod/antlion.ron index 36e7048be3..6726e40124 100644 --- a/assets/common/loot_tables/creature/arthropod/antlion.ron +++ b/assets/common/loot_tables/creature/arthropod/antlion.ron @@ -1,4 +1,7 @@ [ - (1.5, MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 4, 5)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 5, 8), + MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/arthropod/black_widow.ron b/assets/common/loot_tables/creature/arthropod/black_widow.ron index 62b0033301..8cf2911d1a 100644 --- a/assets/common/loot_tables/creature/arthropod/black_widow.ron +++ b/assets/common/loot_tables/creature/arthropod/black_widow.ron @@ -1,5 +1,8 @@ [ - (2.0, MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 3, 5)), - (0.5, Item("common.items.crafting_ing.animal_misc.venom_sac")), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 3, 7), + MultiDrop(Item("common.items.crafting_ing.animal_misc.venom_sac"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/arthropod/carapace.ron b/assets/common/loot_tables/creature/arthropod/carapace.ron index b15664afc2..f303a77e40 100644 --- a/assets/common/loot_tables/creature/arthropod/carapace.ron +++ b/assets/common/loot_tables/creature/arthropod/carapace.ron @@ -1,4 +1,7 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 4, 5)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/arthropod/crawler_molten.ron b/assets/common/loot_tables/creature/arthropod/crawler_molten.ron index 8e5b425253..e6c56e89ae 100644 --- a/assets/common/loot_tables/creature/arthropod/crawler_molten.ron +++ b/assets/common/loot_tables/creature/arthropod/crawler_molten.ron @@ -1,5 +1,8 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 2, 3)), - (0.5, MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, 1)), - (1.0, MultiDrop(Item("common.items.crafting_ing.living_embers"), 2, 3)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 0, 4), + MultiDrop(Item("common.items.crafting_ing.living_embers"), 2, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/arthropod/leaf.ron b/assets/common/loot_tables/creature/arthropod/leaf.ron index d8c15b109e..ff062db50e 100644 --- a/assets/common/loot_tables/creature/arthropod/leaf.ron +++ b/assets/common/loot_tables/creature/arthropod/leaf.ron @@ -1,4 +1,7 @@ [ - (2.0, MultiDrop(Item("common.items.flowers.plant_fiber"), 2, 4)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, 1)), + (1, All([ + MultiDrop(Item("common.items.flowers.plant_fiber"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, 3), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/arthropod/leaf_beetle.ron b/assets/common/loot_tables/creature/arthropod/leaf_beetle.ron index 607384d9fc..ff1cb44e63 100644 --- a/assets/common/loot_tables/creature/arthropod/leaf_beetle.ron +++ b/assets/common/loot_tables/creature/arthropod/leaf_beetle.ron @@ -1,5 +1,8 @@ [ - (1.0, MultiDrop(Item("common.items.flowers.plant_fiber"), 1, 3)), - (1.0, Item("common.items.crafting_ing.animal_misc.strong_pincer")), - (0.5, MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, 1)), + (1, All([ + MultiDrop(Item("common.items.flowers.plant_fiber"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 0, 2), + MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, 3), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/arthropod/ooze.ron b/assets/common/loot_tables/creature/arthropod/ooze.ron index 3302623fc4..92ede0643e 100644 --- a/assets/common/loot_tables/creature/arthropod/ooze.ron +++ b/assets/common/loot_tables/creature/arthropod/ooze.ron @@ -1,4 +1,7 @@ [ - (1.5, MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 3, 4)), - (0.5, MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 1, 1)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 0, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/arthropod/tarantula.ron b/assets/common/loot_tables/creature/arthropod/tarantula.ron index 506d5a41a9..3446fbf330 100644 --- a/assets/common/loot_tables/creature/arthropod/tarantula.ron +++ b/assets/common/loot_tables/creature/arthropod/tarantula.ron @@ -1,4 +1,7 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 3, 5)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 3, 7), + MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/arthropod/web.ron b/assets/common/loot_tables/creature/arthropod/web.ron index eb1e8b55e2..97dc027236 100644 --- a/assets/common/loot_tables/creature/arthropod/web.ron +++ b/assets/common/loot_tables/creature/arthropod/web.ron @@ -1,4 +1,7 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 2, 3)), - (1.0, Item("common.items.crafting_ing.animal_misc.strong_pincer")), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.sticky_thread"), 2, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.strong_pincer"), 0, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/blue_oni.ron b/assets/common/loot_tables/creature/biped_large/blue_oni.ron index 7cb08aa349..eae9955e20 100644 --- a/assets/common/loot_tables/creature/biped_large/blue_oni.ron +++ b/assets/common/loot_tables/creature/biped_large/blue_oni.ron @@ -1,5 +1,9 @@ [ - (0.7, LootTable("common.loot_tables.food.prepared")), - (2.3, LootTable("common.loot_tables.cave_large")), - (0.4, Item("common.items.glider.morpho")), + (1.2, All([ + MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 3), + MultiDrop(LootTable("common.loot_tables.cave_large"), 2, 3), + ], + )), + (0.6, LootTable("common.loot_tables.weapons.components.tier-2"), 1, 1), + (0.2, Item("common.items.glider.morpho")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/default.ron b/assets/common/loot_tables/creature/biped_large/default.ron index a0ddb97017..17578f325d 100644 --- a/assets/common/loot_tables/creature/biped_large/default.ron +++ b/assets/common/loot_tables/creature/biped_large/default.ron @@ -1,4 +1,7 @@ [ - (0.5, LootTable("common.loot_tables.food.prepared")), - (2.0, LootTable("common.loot_tables.cave_large")), + (1.2, All([ + MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 3), + MultiDrop(LootTable("common.loot_tables.cave_large"), 2, 3), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/red_oni.ron b/assets/common/loot_tables/creature/biped_large/red_oni.ron index bb29280dce..675318690e 100644 --- a/assets/common/loot_tables/creature/biped_large/red_oni.ron +++ b/assets/common/loot_tables/creature/biped_large/red_oni.ron @@ -1,5 +1,9 @@ [ - (0.7, LootTable("common.loot_tables.food.prepared")), - (2.3, LootTable("common.loot_tables.cave_large")), - (0.4, Item("common.items.glider.monarch")), + (1.2, All([ + MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 3), + MultiDrop(LootTable("common.loot_tables.cave_large"), 2, 3), + ], + )), + (0.6, LootTable("common.loot_tables.weapons.components.tier-2"), 1, 1), + (0.2, Item("common.items.glider.monarch")), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/troll.ron b/assets/common/loot_tables/creature/biped_large/troll.ron index c4d25aebc1..1639b14d72 100644 --- a/assets/common/loot_tables/creature/biped_large/troll.ron +++ b/assets/common/loot_tables/creature/biped_large/troll.ron @@ -1,6 +1,9 @@ [ - (0.7, LootTable("common.loot_tables.food.prepared")), - (1.0, LootTable("common.loot_tables.cave_large")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), - (5.0, MultiDrop(Item("common.items.crafting_ing.hide.leather_troll"), 1, 2)), + (1, All([ + MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.hide.leather_troll"), 3, 5), + MultiDrop(LootTable("common.loot_tables.weapons.components.tier-2"), 1, 1), + MultiDrop(LootTable("common.loot_tables.cave_large"), 2, 3), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/biped_large/tursus.ron b/assets/common/loot_tables/creature/biped_large/tursus.ron index 08813faa92..97d734ff6f 100644 --- a/assets/common/loot_tables/creature/biped_large/tursus.ron +++ b/assets/common/loot_tables/creature/biped_large/tursus.ron @@ -1,7 +1,7 @@ [ (1, All([ MultiDrop(Item("common.items.food.meat.beast_large_raw"), 3, 4), - MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 3, 5), MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, 2), ], )), diff --git a/assets/common/loot_tables/creature/biped_large/wendigo.ron b/assets/common/loot_tables/creature/biped_large/wendigo.ron index 9e78330a41..b67a4c08bc 100644 --- a/assets/common/loot_tables/creature/biped_large/wendigo.ron +++ b/assets/common/loot_tables/creature/biped_large/wendigo.ron @@ -1,6 +1,9 @@ [ - (0.7, LootTable("common.loot_tables.food.prepared")), - (2.0, Item("common.items.crafting_ing.animal_misc.icy_fang")), - (1.0, LootTable("common.loot_tables.weapons.components.tier-2")), - (4.0, LootTable("common.loot_tables.cave_large")), + (0.7, All([ + MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 2, 4), + MultiDrop(LootTable("common.loot_tables.cave_large"), 2, 3), + ], + )), + (0.3, LootTable("common.loot_tables.weapons.components.tier-2"), 1, 1), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/bird_large/cockatrice.ron b/assets/common/loot_tables/creature/bird_large/cockatrice.ron index 636310cc1d..e288573de0 100644 --- a/assets/common/loot_tables/creature/bird_large/cockatrice.ron +++ b/assets/common/loot_tables/creature/bird_large/cockatrice.ron @@ -1,6 +1,9 @@ [ - (1.0, MultiDrop(Item("common.items.food.meat.bird_large_raw"), 1, 2)), - (1.0, MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 2)), - (2.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, 3)), - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 2, 6)), + (1, All([ + MultiDrop(Item("common.items.food.meat.bird_large_raw"), 2, 4), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 5, 7), + MultiDrop(Item("common.items.crafting_ing.hide.scales"), 3, 7), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/bird_large/roc.ron b/assets/common/loot_tables/creature/bird_large/roc.ron index d5f649feef..3248e478ff 100644 --- a/assets/common/loot_tables/creature/bird_large/roc.ron +++ b/assets/common/loot_tables/creature/bird_large/roc.ron @@ -1,5 +1,8 @@ [ - (1.0, MultiDrop(Item("common.items.food.meat.bird_large_raw"), 1, 2)), - (1.0, MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 2)), - (2.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, 3)), + (1, All([ + MultiDrop(Item("common.items.food.meat.bird_large_raw"), 4, 8), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 6, 12), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/basilisk.ron b/assets/common/loot_tables/creature/quad_low/basilisk.ron index 67a3e33f9a..b3690a0d58 100644 --- a/assets/common/loot_tables/creature/quad_low/basilisk.ron +++ b/assets/common/loot_tables/creature/quad_low/basilisk.ron @@ -1,8 +1,8 @@ [ (1, All([ - MultiDrop(Item("common.items.food.meat.beast_large_raw"), 3, 4), - MultiDrop(Item("common.items.crafting_ing.hide.plate"), 4, 6), - Item("common.items.crafting_ing.animal_misc.grim_eyeball"), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 5, 8), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 6, 10), + MultiDrop(Item("common.items.crafting_ing.animal_misc.grim_eyeball"), 1, 5), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/carapace.ron b/assets/common/loot_tables/creature/quad_low/carapace.ron index 718c6cc322..4b64ec2ceb 100644 --- a/assets/common/loot_tables/creature/quad_low/carapace.ron +++ b/assets/common/loot_tables/creature/quad_low/carapace.ron @@ -1,7 +1,7 @@ [ (1, All([ - MultiDrop(Item("common.items.food.meat.tough_raw"), 1, 3), - MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 2, 3), + MultiDrop(Item("common.items.food.meat.tough_raw"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 4, 8), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/deadwood.ron b/assets/common/loot_tables/creature/quad_low/deadwood.ron index f7d85f9516..e85d654e5c 100644 --- a/assets/common/loot_tables/creature/quad_low/deadwood.ron +++ b/assets/common/loot_tables/creature/quad_low/deadwood.ron @@ -1,7 +1,10 @@ [ - (2.0, MultiDrop(Item("common.items.log.wood"), 1, 3)), - (1.0, Item("common.items.log.hardwood")), - (2.0, Item("common.items.flowers.plant_fiber")), - (2.0, Item("common.items.crafting_ing.resin")), - (1.0, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.twigs"), 2, 3), + MultiDrop(Item("common.items.log.hardwood"), 3, 4), + MultiDrop(Item("common.items.flowers.plant_fiber"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.resin"), 0, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.grim_eyeball"), 0, 1), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/driggle.ron b/assets/common/loot_tables/creature/quad_low/driggle.ron index 78e513d983..dca565f187 100644 --- a/assets/common/loot_tables/creature/quad_low/driggle.ron +++ b/assets/common/loot_tables/creature/quad_low/driggle.ron @@ -1,4 +1,7 @@ [ - (1.0, Item("common.items.crafting_ing.living_embers")), - (1.0, Item("common.items.crafting_ing.hide.animal_hide")), -] + (1, All([ + MultiDrop(Item("common.items.crafting_ing.living_embers"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.hide.animal_hide"), 3, 5), + ], + )), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/elbst.ron b/assets/common/loot_tables/creature/quad_low/elbst.ron index fc0a7e08eb..17e25bcb3a 100644 --- a/assets/common/loot_tables/creature/quad_low/elbst.ron +++ b/assets/common/loot_tables/creature/quad_low/elbst.ron @@ -1,5 +1,8 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 1, 2)), - (1.0, Item("common.items.crafting_ing.animal_misc.viscous_ooze")), - (1.0, Item("common.items.food.meat.tough_raw")), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.animal_misc.viscous_ooze"), 2, 4), + MultiDrop(Item("common.items.food.meat.tough_raw"), 3, 5), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/fanged.ron b/assets/common/loot_tables/creature/quad_low/fanged.ron index 2dc17ae2f5..ad37c1c99e 100644 --- a/assets/common/loot_tables/creature/quad_low/fanged.ron +++ b/assets/common/loot_tables/creature/quad_low/fanged.ron @@ -1,4 +1,7 @@ [ - (4.0, LootTable("common.loot_tables.creature.quad_low.generic")), - (2.0, Item("common.items.crafting_ing.animal_misc.sharp_fang")), + (1, All([ + MultiDrop(LootTable("common.loot_tables.creature.quad_low.generic"), 1, 1), + MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/generic.ron b/assets/common/loot_tables/creature/quad_low/generic.ron index 2fadb68e3a..677e5bd6a6 100644 --- a/assets/common/loot_tables/creature/quad_low/generic.ron +++ b/assets/common/loot_tables/creature/quad_low/generic.ron @@ -1,4 +1,7 @@ [ - (1.0, Item("common.items.food.meat.tough_raw")), - (3.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 2, 3)), + (1, All([ + MultiDrop(Item("common.items.food.meat.tough_raw"), 4, 6), + MultiDrop(Item("common.items.crafting_ing.hide.scales"), 4, 8), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/lavadrake.ron b/assets/common/loot_tables/creature/quad_low/lavadrake.ron index 4621773c6a..8a7b3dcd94 100644 --- a/assets/common/loot_tables/creature/quad_low/lavadrake.ron +++ b/assets/common/loot_tables/creature/quad_low/lavadrake.ron @@ -1,8 +1,8 @@ [ (1, All([ - MultiDrop(Item("common.items.food.meat.tough_raw"), 0, 3), - MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2), - MultiDrop(Item("common.items.crafting_ing.living_embers"), 1, 3), + MultiDrop(Item("common.items.food.meat.tough_raw"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.living_embers"), 5, 10), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/maneater.ron b/assets/common/loot_tables/creature/quad_low/maneater.ron index 744a601e36..c4806c7cbc 100644 --- a/assets/common/loot_tables/creature/quad_low/maneater.ron +++ b/assets/common/loot_tables/creature/quad_low/maneater.ron @@ -1,8 +1,8 @@ [ (9.5, All([ - MultiDrop(Item("common.items.crafting_ing.animal_misc.lively_vine"), 2, 4), - MultiDrop(Item("common.loot_tables.food.wild_ingredients"), 1, 1), - MultiDrop(Item("common.items.crafting_ing.sentient_seed"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.animal_misc.lively_vine"), 4, 8), + MultiDrop(LootTable("common.loot_tables.food.wild_ingredients"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.sentient_seed"), 3, 6), ], )), (0.5, Item("common.items.armor.misc.head.bamboo_twig")), diff --git a/assets/common/loot_tables/creature/quad_low/moss.ron b/assets/common/loot_tables/creature/quad_low/moss.ron index 8468df3392..221776b229 100644 --- a/assets/common/loot_tables/creature/quad_low/moss.ron +++ b/assets/common/loot_tables/creature/quad_low/moss.ron @@ -1,8 +1,8 @@ [ (1, All([ - MultiDrop(Item("common.items.crafting_ing.resin"), 2, 3), - MultiDrop(Item("common.items.log.hardwood"), 2, 3), - MultiDrop(Item("common.items.flowers.plant_fiber""), 3, 4), + MultiDrop(Item("common.items.crafting_ing.resin"), 3, 6), + MultiDrop(Item("common.items.log.hardwood"), 5, 10), + MultiDrop(Item("common.items.flowers.plant_fiber""), 4, 5), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/reefsnapper.ron b/assets/common/loot_tables/creature/quad_low/reefsnapper.ron index dcb5975554..d10a6c51d2 100644 --- a/assets/common/loot_tables/creature/quad_low/reefsnapper.ron +++ b/assets/common/loot_tables/creature/quad_low/reefsnapper.ron @@ -1,5 +1,8 @@ [ - (1.0, Item("common.items.food.meat.tough_raw")), - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 1, 2)), - (1.0, Item("common.items.crafting_ing.coral_branch")), + (1, All([ + MultiDrop(Item("common.items.food.meat.tough_raw"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.coral_branch"), 0, 3), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/rootsnapper.ron b/assets/common/loot_tables/creature/quad_low/rootsnapper.ron index 65238eee4a..530233ced0 100644 --- a/assets/common/loot_tables/creature/quad_low/rootsnapper.ron +++ b/assets/common/loot_tables/creature/quad_low/rootsnapper.ron @@ -1,5 +1,8 @@ [ - (1.0, Item("common.items.food.meat.tough_raw")), - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 1, 2)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.lively_vine"), 1, 3)), + (1, All([ + MultiDrop(Item("common.items.food.meat.tough_raw"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.animal_misc.lively_vine"), 0, 3), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/salamander.ron b/assets/common/loot_tables/creature/quad_low/salamander.ron index cf1d235b80..36199d99be 100644 --- a/assets/common/loot_tables/creature/quad_low/salamander.ron +++ b/assets/common/loot_tables/creature/quad_low/salamander.ron @@ -1,5 +1,8 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 1, 2)), - (1.0, MultiDrop(Item("common.items.crafting_ing.living_embers"), 1, 2)), - (1.0, Item("common.items.food.meat.tough_raw")), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.living_embers"), 2, 4), + MultiDrop(Item("common.items.food.meat.tough_raw"), 3, 5), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_low/venemous.ron b/assets/common/loot_tables/creature/quad_low/venemous.ron index 84b61173bc..387df11db7 100644 --- a/assets/common/loot_tables/creature/quad_low/venemous.ron +++ b/assets/common/loot_tables/creature/quad_low/venemous.ron @@ -1,5 +1,8 @@ [ - (4.0, LootTable("common.loot_tables.creature.quad_low.generic")), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 2)), - (1.0, Item("common.items.crafting_ing.animal_misc.venom_sac")), + (1, All([ + MultiDrop(LootTable("common.loot_tables.creature.quad_low.generic"), 1, 1), + MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 2), + MultiDrop(Item("common.items.crafting_ing.animal_misc.venom_sac"), 1, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/carapace.ron b/assets/common/loot_tables/creature/quad_medium/carapace.ron index 432f820da5..c1f7f50b81 100644 --- a/assets/common/loot_tables/creature/quad_medium/carapace.ron +++ b/assets/common/loot_tables/creature/quad_medium/carapace.ron @@ -1,6 +1,8 @@ [ - (1.5, Item("common.items.food.meat.beast_small_raw")), - (0.5, Item("common.items.food.meat.beast_large_raw")), - (2.0, Item("common.items.crafting_ing.animal_misc.sharp_fang")), - (3.0, Item("common.items.crafting_ing.hide.carapace")), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_small_raw"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 4), + MultiDrop(Item("common.items.crafting_ing.hide.carapace"), 2, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/catoblepas.ron b/assets/common/loot_tables/creature/quad_medium/catoblepas.ron index 439a6c9314..97e4533815 100644 --- a/assets/common/loot_tables/creature/quad_medium/catoblepas.ron +++ b/assets/common/loot_tables/creature/quad_medium/catoblepas.ron @@ -1,5 +1,8 @@ [ - (1.5, Item("common.items.crafting_ing.animal_misc.grim_eyeball")), - (2.5, LootTable("common.loot_tables.creature.quad_medium.generic")), - (1.0, Item("common.items.crafting_ing.hide.rugged_hide")), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.animal_misc.grim_eyeball"), 0, 1), + MultiDrop(LootTable("common.loot_tables.creature.quad_medium.generic"), 1, 5), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 2, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/cattle.ron b/assets/common/loot_tables/creature/quad_medium/cattle.ron index c1c91ff337..7f3458d0d4 100644 --- a/assets/common/loot_tables/creature/quad_medium/cattle.ron +++ b/assets/common/loot_tables/creature/quad_medium/cattle.ron @@ -1,4 +1,7 @@ [ - (1.0, Item("common.items.food.meat.beast_large_raw")), - (1.0, Item("common.items.crafting_ing.hide.animal_hide")), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 1, 4), + MultiDrop(Item("common.items.crafting_ing.hide.animal_hide"), 2, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/clawed.ron b/assets/common/loot_tables/creature/quad_medium/clawed.ron index e29b1f7433..f29778ae87 100644 --- a/assets/common/loot_tables/creature/quad_medium/clawed.ron +++ b/assets/common/loot_tables/creature/quad_medium/clawed.ron @@ -1,4 +1,7 @@ [ - (4.0, LootTable("common.loot_tables.creature.quad_medium.generic")), - (2.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 1, 4)), + (1, All([ + MultiDrop(LootTable("common.loot_tables.creature.quad_medium.generic"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 3, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron b/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron index 936f968d49..7d529cdf49 100644 --- a/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron +++ b/assets/common/loot_tables/creature/quad_medium/dreadhorn.ron @@ -1,8 +1,8 @@ [ (1, All([ - MultiDrop(Item("common.items.food.meat.beast_large_raw"), 3, 4), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 5, 8), MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 1, 2), - MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 5, 8), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/fanged.ron b/assets/common/loot_tables/creature/quad_medium/fanged.ron index 2c10e314c5..c2c39976e7 100644 --- a/assets/common/loot_tables/creature/quad_medium/fanged.ron +++ b/assets/common/loot_tables/creature/quad_medium/fanged.ron @@ -1,4 +1,7 @@ [ - (4.0, LootTable("common.loot_tables.creature.quad_medium.generic")), - (2.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 2)), + (1, All([ + MultiDrop(LootTable("common.loot_tables.creature.quad_medium.generic"), 3, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/frostfang.ron b/assets/common/loot_tables/creature/quad_medium/frostfang.ron index 9ad48c6199..a7ee9df02c 100644 --- a/assets/common/loot_tables/creature/quad_medium/frostfang.ron +++ b/assets/common/loot_tables/creature/quad_medium/frostfang.ron @@ -1,5 +1,8 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 1, 2)), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 3)), - (1.0, Item("common.items.crafting_ing.hide.tough_hide")), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 1, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 3, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/gentle.ron b/assets/common/loot_tables/creature/quad_medium/gentle.ron index a11ac921f4..6e2b967468 100644 --- a/assets/common/loot_tables/creature/quad_medium/gentle.ron +++ b/assets/common/loot_tables/creature/quad_medium/gentle.ron @@ -1,5 +1,8 @@ [ - (1.5, Item("common.items.food.meat.beast_small_raw")), - (0.5, Item("common.items.food.meat.beast_large_raw")), - (3.0, Item("common.items.crafting_ing.hide.animal_hide")), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_small_raw"), 1, 4), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 0, 3), + MultiDrop(Item("common.items.crafting_ing.hide.animal_hide"), 2, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/highland.ron b/assets/common/loot_tables/creature/quad_medium/highland.ron index 40db52b79f..d1172ea7b9 100644 --- a/assets/common/loot_tables/creature/quad_medium/highland.ron +++ b/assets/common/loot_tables/creature/quad_medium/highland.ron @@ -1,5 +1,8 @@ [ - (1.0, Item("common.items.food.meat.beast_large_raw")), - (1.0, Item("common.items.crafting_ing.hide.animal_hide")), - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.fur"), 1, 2)), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 4, 5), + MultiDrop(Item("common.items.crafting_ing.hide.animal_hide"), 5, 8), + MultiDrop(Item("common.items.crafting_ing.animal_misc.fur"), 3, 7), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/hirdrasil.ron b/assets/common/loot_tables/creature/quad_medium/hirdrasil.ron new file mode 100644 index 0000000000..3a97004184 --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/hirdrasil.ron @@ -0,0 +1,9 @@ +[ + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_small_raw"), 3, 5), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.lively_vine"), 0, 1), + ], + )), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/ice.ron b/assets/common/loot_tables/creature/quad_medium/ice.ron index eab4772425..b8ffe54fb9 100644 --- a/assets/common/loot_tables/creature/quad_medium/ice.ron +++ b/assets/common/loot_tables/creature/quad_medium/ice.ron @@ -1,7 +1,7 @@ [ (1, All([ - MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 2, 3), - MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 2), + MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 3, 6), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 4, 6), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/icedrake.ron b/assets/common/loot_tables/creature/quad_medium/icedrake.ron index 47b95699cb..cfdb1cd172 100644 --- a/assets/common/loot_tables/creature/quad_medium/icedrake.ron +++ b/assets/common/loot_tables/creature/quad_medium/icedrake.ron @@ -1,8 +1,8 @@ [ (1, All([ - MultiDrop(Item("common.items.food.meat.tough_raw"), 0, 3), - MultiDrop(Item("common.items.crafting_ing.hide.plate"), 1, 2), - MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 1, 3), + MultiDrop(Item("common.items.food.meat.tough_raw"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 5, 10), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/mammoth.ron b/assets/common/loot_tables/creature/quad_medium/mammoth.ron index f9aded3056..b8ed581067 100644 --- a/assets/common/loot_tables/creature/quad_medium/mammoth.ron +++ b/assets/common/loot_tables/creature/quad_medium/mammoth.ron @@ -1,6 +1,6 @@ [ (1, All([ - MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 2, 4), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 6, 12), MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, 2), ], )), diff --git a/assets/common/loot_tables/creature/quad_medium/moose.ron b/assets/common/loot_tables/creature/quad_medium/moose.ron new file mode 100644 index 0000000000..ccbe45e22c --- /dev/null +++ b/assets/common/loot_tables/creature/quad_medium/moose.ron @@ -0,0 +1,8 @@ +[ + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_small_raw"), 2, 4), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 3, 5), + ], + )), +] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/roshwalr.ron b/assets/common/loot_tables/creature/quad_medium/roshwalr.ron index 2e5d546043..f2f1385cdd 100644 --- a/assets/common/loot_tables/creature/quad_medium/roshwalr.ron +++ b/assets/common/loot_tables/creature/quad_medium/roshwalr.ron @@ -1,7 +1,7 @@ [ (1, All([ - MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 3), - MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 4, 8), + MultiDrop(Item("common.items.crafting_ing.animal_misc.icy_fang"), 2, 6), MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, 2), ], )), diff --git a/assets/common/loot_tables/creature/quad_medium/tuskram.ron b/assets/common/loot_tables/creature/quad_medium/tuskram.ron index a23f361710..b8d1fdb278 100644 --- a/assets/common/loot_tables/creature/quad_medium/tuskram.ron +++ b/assets/common/loot_tables/creature/quad_medium/tuskram.ron @@ -1,4 +1,8 @@ [ - (4.0, LootTable("common.loot_tables.creature.quad_medium.generic")), - (1.0, Item("common.items.crafting_ing.animal_misc.long_tusk")), + (1, All([ + MultiDrop(LootTable("common.loot_tables.creature.quad_medium.generic"), 4, 5), + MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, 2), + MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/wolf.ron b/assets/common/loot_tables/creature/quad_medium/wolf.ron index beda2c6488..32c5489d4b 100644 --- a/assets/common/loot_tables/creature/quad_medium/wolf.ron +++ b/assets/common/loot_tables/creature/quad_medium/wolf.ron @@ -1,5 +1,8 @@ [ - (1.0, Item("common.items.food.meat.beast_small_raw")), - (1.0, Item("common.items.crafting_ing.hide.tough_hide")), - (1.0, Item("common.items.crafting_ing.animal_misc.sharp_fang")), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_small_raw"), 2, 5), + MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 2, 5), + MultiDrop(Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, 4), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/wool.ron b/assets/common/loot_tables/creature/quad_medium/wool.ron index d59d4e067c..3a0d7ec081 100644 --- a/assets/common/loot_tables/creature/quad_medium/wool.ron +++ b/assets/common/loot_tables/creature/quad_medium/wool.ron @@ -1,6 +1,9 @@ [ - (1.5, Item("common.items.food.meat.beast_small_raw")), - (0.5, Item("common.items.food.meat.beast_large_raw")), - (1.0, Item("common.items.crafting_ing.hide.animal_hide")), - (5.0, MultiDrop(Item("common.items.crafting_ing.cloth.wool"), 2, 5)), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_small_raw"), 2, 4), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.hide.animal_hide"), 3, 5), + MultiDrop(Item("common.items.crafting_ing.cloth.wool"), 3, 6), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_medium/yak.ron b/assets/common/loot_tables/creature/quad_medium/yak.ron index ef31cf3847..60d679bb67 100644 --- a/assets/common/loot_tables/creature/quad_medium/yak.ron +++ b/assets/common/loot_tables/creature/quad_medium/yak.ron @@ -1,4 +1,7 @@ [ - (1.0, Item("common.items.food.meat.beast_large_raw")), - (1.0, Item("common.items.crafting_ing.hide.tough_hide")), + (1, All([ + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 5, 8), + MultiDrop(Item("common.items.crafting_ing.hide.tough_hide"), 6, 8), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/quad_small/treant_sapling.ron b/assets/common/loot_tables/creature/quad_small/treant_sapling.ron index fadf82680e..3b5dac6eeb 100644 --- a/assets/common/loot_tables/creature/quad_small/treant_sapling.ron +++ b/assets/common/loot_tables/creature/quad_small/treant_sapling.ron @@ -1,6 +1,9 @@ [ - (2.0, Item("common.items.log.wood")), - (2.0, Item("common.items.flowers.plant_fiber")), - (1.0, Item("common.items.crafting_ing.resin")), - (1.0, Item("common.items.crafting_ing.sentient_seed")), + (1, All([ + MultiDrop(Item("common.items.log.wood"), 2, 4), + MultiDrop(Item("common.items.flowers.plant_fiber"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.resin"), 0, 2), + MultiDrop(Item("common.items.crafting_ing.sentient_seed"), 1, 2), + ], + )), ] diff --git a/assets/common/loot_tables/creature/theropod/archaeos.ron b/assets/common/loot_tables/creature/theropod/archaeos.ron index 80b8b72cba..91a19c0c43 100644 --- a/assets/common/loot_tables/creature/theropod/archaeos.ron +++ b/assets/common/loot_tables/creature/theropod/archaeos.ron @@ -1,9 +1,9 @@ [ (1, All([ - MultiDrop(Item("common.items.food.meat.beast_large_raw"), 3, 5), - MultiDrop(Item("common.items.crafting_ing.hide.plate"), 3, 5), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 6, 10), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 6, 10), MultiDrop(Item("common.items.crafting_ing.animal_misc.claw"), 2, 4), - MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 1), + MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2), ], )), ] diff --git a/assets/common/loot_tables/creature/theropod/axebeak.ron b/assets/common/loot_tables/creature/theropod/axebeak.ron index 03979386ef..a60f3cc824 100644 --- a/assets/common/loot_tables/creature/theropod/axebeak.ron +++ b/assets/common/loot_tables/creature/theropod/axebeak.ron @@ -1,5 +1,8 @@ [ - (4.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 3, 6)), - (1.0, Item("common.items.crafting_ing.animal_misc.raptor_feather")), - (0.5, Item("common.items.food.meat.bird_large_raw")), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 3, 6), + MultiDrop(Item("common.items.crafting_ing.animal_misc.raptor_feather"), 2, 3), + MultiDrop(Item("common.items.food.meat.bird_large_raw"), 1, 3), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/dodarock.ron b/assets/common/loot_tables/creature/theropod/dodarock.ron index 84a5e37950..0d79abb87e 100644 --- a/assets/common/loot_tables/creature/theropod/dodarock.ron +++ b/assets/common/loot_tables/creature/theropod/dodarock.ron @@ -1,4 +1,7 @@ [ - (1.0, MultiDrop(LootTable("common.loot_tables.materials.underground"), 1, 2)), - (1.0, MultiDrop(Item("common.items.crafting_ing.stones"), 2, 6)), + (1, All([ + MultiDrop(LootTable("common.loot_tables.materials.underground"), 1, 2), + MultiDrop(Item("common.items.crafting_ing.stones"), 2, 6), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/horned.ron b/assets/common/loot_tables/creature/theropod/horned.ron index bf91e5387c..1f89025aac 100644 --- a/assets/common/loot_tables/creature/theropod/horned.ron +++ b/assets/common/loot_tables/creature/theropod/horned.ron @@ -1,6 +1,6 @@ [ (1, All([ - MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 1, 2), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 3, 5), MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2), ], )), diff --git a/assets/common/loot_tables/creature/theropod/ntouka.ron b/assets/common/loot_tables/creature/theropod/ntouka.ron index 9da532c45e..c1b32a956d 100644 --- a/assets/common/loot_tables/creature/theropod/ntouka.ron +++ b/assets/common/loot_tables/creature/theropod/ntouka.ron @@ -1,8 +1,8 @@ [ (1, All([ - MultiDrop(Item("common.items.food.meat.beast_large_raw"), 3, 5), - MultiDrop(Item("common.items.crafting_ing.hide.plate"), 3, 5), - MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 2), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 6, 10), + MultiDrop(Item("common.items.crafting_ing.hide.plate"), 6, 10), + MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 7), ], )), ] diff --git a/assets/common/loot_tables/creature/theropod/odonto.ron b/assets/common/loot_tables/creature/theropod/odonto.ron index e05d002fa1..b83fe91dab 100644 --- a/assets/common/loot_tables/creature/theropod/odonto.ron +++ b/assets/common/loot_tables/creature/theropod/odonto.ron @@ -1,9 +1,9 @@ [ (1, All([ - MultiDrop(Item("common.items.food.meat.beast_large_raw"), 3, 5), - MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 3, 5), - MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 2, 4), - MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 1), + MultiDrop(Item("common.items.food.meat.beast_large_raw"), 6, 10), + MultiDrop(Item("common.items.crafting_ing.hide.rugged_hide"), 6, 10), + MultiDrop(Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, 2), + MultiDrop(Item("common.items.crafting_ing.animal_misc.large_horn"), 0, 3), ], )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/raptor.ron b/assets/common/loot_tables/creature/theropod/raptor.ron index 9e63c401a3..4708e538be 100644 --- a/assets/common/loot_tables/creature/theropod/raptor.ron +++ b/assets/common/loot_tables/creature/theropod/raptor.ron @@ -1,5 +1,8 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, 3)), - (2.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.raptor_feather"), 2, 6)), - (1.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 2, 3)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, 4), + MultiDrop(Item("common.items.crafting_ing.animal_misc.raptor_feather"), 1, 3), + MultiDrop(Item("common.items.crafting_ing.hide.scales"), 3, 6), + ], + )), ] \ No newline at end of file diff --git a/assets/common/loot_tables/creature/theropod/scale.ron b/assets/common/loot_tables/creature/theropod/scale.ron index 5bca5280e2..98c7f3d6d3 100644 --- a/assets/common/loot_tables/creature/theropod/scale.ron +++ b/assets/common/loot_tables/creature/theropod/scale.ron @@ -1,4 +1,7 @@ [ - (1.0, MultiDrop(Item("common.items.crafting_ing.animal_misc.raptor_feather"), 2, 3)), - (2.0, MultiDrop(Item("common.items.crafting_ing.hide.scales"), 2, 6)), + (1, All([ + MultiDrop(Item("common.items.crafting_ing.animal_misc.raptor_feather"), 2, 3), + MultiDrop(Item("common.items.crafting_ing.hide.scales"), 2, 6), + ], + )), ] \ No newline at end of file