From 2475b979182dae5300e610326ca0d9453ea2f77d Mon Sep 17 00:00:00 2001 From: juliancoffee Date: Wed, 22 Sep 2021 22:53:11 +0300 Subject: [PATCH] Move loot tables to entity configs --- assets/common/entity/village/guard.ron | 2 +- assets/common/entity/village/merchant.ron | 4 +- assets/common/entity/village/villager.ron | 2 +- .../entity/wild/aggressive/alligator.ron | 2 +- .../entity/wild/aggressive/archaeos.ron | 2 +- assets/common/entity/wild/aggressive/asp.ron | 2 +- .../common/entity/wild/aggressive/batfox.ron | 2 +- assets/common/entity/wild/aggressive/bear.ron | 2 +- .../entity/wild/aggressive/bonerattler.ron | 2 +- .../entity/wild/aggressive/cockatrice.ron | 2 +- .../entity/wild/aggressive/crocodile.ron | 2 +- .../common/entity/wild/aggressive/cyclope.ron | 2 +- .../entity/wild/aggressive/deadwood.ron | 2 +- .../entity/wild/aggressive/dodarock.ron | 2 +- .../entity/wild/aggressive/dreadhorn.ron | 2 +- .../entity/wild/aggressive/frostfang.ron | 2 +- .../common/entity/wild/aggressive/grolgar.ron | 2 +- .../common/entity/wild/aggressive/hakulaq.ron | 2 +- .../common/entity/wild/aggressive/hyena.ron | 2 +- .../common/entity/wild/aggressive/icepike.ron | 2 +- .../entity/wild/aggressive/lavadrake.ron | 2 +- assets/common/entity/wild/aggressive/lion.ron | 2 +- .../common/entity/wild/aggressive/mammoth.ron | 2 +- .../entity/wild/aggressive/maneater.ron | 2 +- .../entity/wild/aggressive/mighty_saurok.ron | 2 +- .../common/entity/wild/aggressive/monitor.ron | 2 +- .../entity/wild/aggressive/mountain_troll.ron | 2 +- .../common/entity/wild/aggressive/ngoubou.ron | 2 +- .../common/entity/wild/aggressive/ntouka.ron | 2 +- .../entity/wild/aggressive/occult_saurok.ron | 2 +- .../common/entity/wild/aggressive/odonto.ron | 2 +- assets/common/entity/wild/aggressive/ogre.ron | 2 +- .../entity/wild/aggressive/rocksnapper.ron | 2 +- .../entity/wild/aggressive/roshwalr.ron | 2 +- .../entity/wild/aggressive/roshwalr_boss.ron | 2 +- .../common/entity/wild/aggressive/saber.ron | 2 +- .../entity/wild/aggressive/sand_raptor.ron | 2 +- .../entity/wild/aggressive/sandshark.ron | 2 +- .../entity/wild/aggressive/sly_saurok.ron | 2 +- .../entity/wild/aggressive/snow_leopard.ron | 2 +- .../entity/wild/aggressive/snow_raptor.ron | 2 +- .../entity/wild/aggressive/sunlizard.ron | 2 +- .../entity/wild/aggressive/swamp_troll.ron | 2 +- .../entity/wild/aggressive/tarasque.ron | 2 +- .../common/entity/wild/aggressive/tiger.ron | 2 +- .../common/entity/wild/aggressive/wendigo.ron | 2 +- assets/common/entity/wild/aggressive/wolf.ron | 2 +- .../entity/wild/aggressive/wood_raptor.ron | 2 +- assets/common/entity/wild/aggressive/yale.ron | 2 +- assets/common/entity/wild/peaceful/alpaca.ron | 2 +- .../common/entity/wild/peaceful/antelope.ron | 2 +- .../entity/wild/peaceful/arctic_fox.ron | 2 +- .../entity/wild/peaceful/arctic_hare.ron | 2 +- .../common/entity/wild/peaceful/axolotl.ron | 2 +- assets/common/entity/wild/peaceful/bear.ron | 3 +- assets/common/entity/wild/peaceful/beaver.ron | 2 +- assets/common/entity/wild/peaceful/boar.ron | 2 +- assets/common/entity/wild/peaceful/camel.ron | 2 +- assets/common/entity/wild/peaceful/cat.ron | 2 +- .../entity/wild/peaceful/catoblepas.ron | 2 +- assets/common/entity/wild/peaceful/cattle.ron | 2 +- .../common/entity/wild/peaceful/chicken.ron | 2 +- .../common/entity/wild/peaceful/clownfish.ron | 2 +- assets/common/entity/wild/peaceful/deer.ron | 2 +- assets/common/entity/wild/peaceful/donkey.ron | 2 +- assets/common/entity/wild/peaceful/duck.ron | 2 +- assets/common/entity/wild/peaceful/eagle.ron | 2 +- .../entity/wild/peaceful/forest_fox.ron | 2 +- assets/common/entity/wild/peaceful/frog.ron | 2 +- .../common/entity/wild/peaceful/fungome.ron | 2 +- assets/common/entity/wild/peaceful/gecko.ron | 2 +- assets/common/entity/wild/peaceful/goat.ron | 2 +- assets/common/entity/wild/peaceful/goose.ron | 2 +- .../common/entity/wild/peaceful/highland.ron | 2 +- .../common/entity/wild/peaceful/hirdrasil.ron | 2 +- .../common/entity/wild/peaceful/holladon.ron | 2 +- assets/common/entity/wild/peaceful/horse.ron | 2 +- .../common/entity/wild/peaceful/jackalope.ron | 2 +- assets/common/entity/wild/peaceful/kelpie.ron | 2 +- assets/common/entity/wild/peaceful/llama.ron | 2 +- assets/common/entity/wild/peaceful/marlin.ron | 2 +- assets/common/entity/wild/peaceful/moose.ron | 2 +- .../common/entity/wild/peaceful/mouflon.ron | 2 +- assets/common/entity/wild/peaceful/owl.ron | 2 +- .../common/entity/wild/peaceful/pangolin.ron | 2 +- assets/common/entity/wild/peaceful/parrot.ron | 2 +- .../common/entity/wild/peaceful/peacock.ron | 2 +- assets/common/entity/wild/peaceful/pig.ron | 2 +- .../common/entity/wild/peaceful/piranha.ron | 2 +- .../common/entity/wild/peaceful/porcupine.ron | 2 +- assets/common/entity/wild/peaceful/quokka.ron | 2 +- assets/common/entity/wild/peaceful/rabbit.ron | 2 +- .../common/entity/wild/peaceful/raccoon.ron | 2 +- assets/common/entity/wild/peaceful/rat.ron | 2 +- .../entity/wild/peaceful/river_salamander.ron | 2 +- .../common/entity/wild/peaceful/sand_hare.ron | 2 +- .../entity/wild/peaceful/sand_salamander.ron | 2 +- assets/common/entity/wild/peaceful/sheep.ron | 2 +- assets/common/entity/wild/peaceful/skunk.ron | 2 +- .../common/entity/wild/peaceful/squirrel.ron | 2 +- .../common/entity/wild/peaceful/tortoise.ron | 2 +- .../common/entity/wild/peaceful/truffler.ron | 2 +- assets/common/entity/wild/peaceful/turtle.ron | 2 +- .../common/entity/wild/peaceful/tuskram.ron | 2 +- assets/common/entity/wild/peaceful/yak.ron | 2 +- assets/common/entity/wild/peaceful/zebra.ron | 2 +- server/src/events/entity_manipulation.rs | 149 +----------------- server/src/rtsim/tick.rs | 2 + world/src/layer/mod.rs | 5 +- 109 files changed, 115 insertions(+), 256 deletions(-) diff --git a/assets/common/entity/village/guard.ron b/assets/common/entity/village/guard.ron index 0b344ac502..1e4caa691e 100644 --- a/assets/common/entity/village/guard.ron +++ b/assets/common/entity/village/guard.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.humanoid"), hands: TwoHanded(Choice([ (1.0, Some(Item("common.items.weapons.sword.cobalt-0"))), diff --git a/assets/common/entity/village/merchant.ron b/assets/common/entity/village/merchant.ron index d0632f737b..c20c0297bc 100644 --- a/assets/common/entity/village/merchant.ron +++ b/assets/common/entity/village/merchant.ron @@ -3,8 +3,8 @@ EntityConfig ( body: RandomWith("humanoid"), alignment: Alignment(Npc), - // considering giving some gold/gems/materials? - loot: Uninit, + // TODO: consider giving some gold/gems/materials? + loot: LootTable("common.loot_tables.creature.humanoid"), hands: TwoHanded(Item("common.items.weapons.bow.eldwood-0")), diff --git a/assets/common/entity/village/villager.ron b/assets/common/entity/village/villager.ron index df46376d35..0320909a6d 100644 --- a/assets/common/entity/village/villager.ron +++ b/assets/common/entity/village/villager.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("humanoid"), alignment: Alignment(Npc), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.humanoid"), hands: TwoHanded(Choice([ (1.0, Some(Item("common.items.weapons.tool.broom"))), diff --git a/assets/common/entity/wild/aggressive/alligator.ron b/assets/common/entity/wild/aggressive/alligator.ron index 9e63eb22a2..878022cd3e 100644 --- a/assets/common/entity/wild/aggressive/alligator.ron +++ b/assets/common/entity/wild/aggressive/alligator.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("alligator"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/archaeos.ron b/assets/common/entity/wild/aggressive/archaeos.ron index ef9fd560d9..43d7b1929c 100644 --- a/assets/common/entity/wild/aggressive/archaeos.ron +++ b/assets/common/entity/wild/aggressive/archaeos.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("archaeos"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.theropod.horned"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/asp.ron b/assets/common/entity/wild/aggressive/asp.ron index f40cbcb3ee..84cff4d550 100644 --- a/assets/common/entity/wild/aggressive/asp.ron +++ b/assets/common/entity/wild/aggressive/asp.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("asp"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.venemous"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/batfox.ron b/assets/common/entity/wild/aggressive/batfox.ron index dd0c68e9a3..fa77ed21b9 100644 --- a/assets/common/entity/wild/aggressive/batfox.ron +++ b/assets/common/entity/wild/aggressive/batfox.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("batfox"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/bear.ron b/assets/common/entity/wild/aggressive/bear.ron index 66d3bd0042..15678ceaab 100644 --- a/assets/common/entity/wild/aggressive/bear.ron +++ b/assets/common/entity/wild/aggressive/bear.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("bear"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.fanged"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/bonerattler.ron b/assets/common/entity/wild/aggressive/bonerattler.ron index e5fa5910b1..7dc9b52038 100644 --- a/assets/common/entity/wild/aggressive/bonerattler.ron +++ b/assets/common/entity/wild/aggressive/bonerattler.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("bonerattler"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.carapace"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/cockatrice.ron b/assets/common/entity/wild/aggressive/cockatrice.ron index a367c30fcc..8de0517d5d 100644 --- a/assets/common/entity/wild/aggressive/cockatrice.ron +++ b/assets/common/entity/wild/aggressive/cockatrice.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("cockatrice"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.bird_large.cockatrice"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/crocodile.ron b/assets/common/entity/wild/aggressive/crocodile.ron index b839d4b4e5..469a497d8b 100644 --- a/assets/common/entity/wild/aggressive/crocodile.ron +++ b/assets/common/entity/wild/aggressive/crocodile.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("crocodile"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/cyclope.ron b/assets/common/entity/wild/aggressive/cyclope.ron index 2e679b9458..6726ec0bca 100644 --- a/assets/common/entity/wild/aggressive/cyclope.ron +++ b/assets/common/entity/wild/aggressive/cyclope.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("cyclops"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.biped_large.default"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/deadwood.ron b/assets/common/entity/wild/aggressive/deadwood.ron index ebbcadf2e6..69d15721b6 100644 --- a/assets/common/entity/wild/aggressive/deadwood.ron +++ b/assets/common/entity/wild/aggressive/deadwood.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("deadwood"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.deadwood"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/dodarock.ron b/assets/common/entity/wild/aggressive/dodarock.ron index 444d4ae085..9d7693ff01 100644 --- a/assets/common/entity/wild/aggressive/dodarock.ron +++ b/assets/common/entity/wild/aggressive/dodarock.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("dodarock"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.dodarock"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/dreadhorn.ron b/assets/common/entity/wild/aggressive/dreadhorn.ron index e42bc14392..24cc0a5d07 100644 --- a/assets/common/entity/wild/aggressive/dreadhorn.ron +++ b/assets/common/entity/wild/aggressive/dreadhorn.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("dreadhorn"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.dreadhorn"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/frostfang.ron b/assets/common/entity/wild/aggressive/frostfang.ron index c315373e4c..6df71fb1d9 100644 --- a/assets/common/entity/wild/aggressive/frostfang.ron +++ b/assets/common/entity/wild/aggressive/frostfang.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("frostfang"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.ice"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/grolgar.ron b/assets/common/entity/wild/aggressive/grolgar.ron index 2b868ac934..0d8bed95ff 100644 --- a/assets/common/entity/wild/aggressive/grolgar.ron +++ b/assets/common/entity/wild/aggressive/grolgar.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("grolgar"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.fanged"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/hakulaq.ron b/assets/common/entity/wild/aggressive/hakulaq.ron index 68e4b77697..456b00db07 100644 --- a/assets/common/entity/wild/aggressive/hakulaq.ron +++ b/assets/common/entity/wild/aggressive/hakulaq.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("hakulaq"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.fanged"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/hyena.ron b/assets/common/entity/wild/aggressive/hyena.ron index dea8ade1f6..55807136aa 100644 --- a/assets/common/entity/wild/aggressive/hyena.ron +++ b/assets/common/entity/wild/aggressive/hyena.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("hyena"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/icepike.ron b/assets/common/entity/wild/aggressive/icepike.ron index 2cb568b75d..8e3e119445 100644 --- a/assets/common/entity/wild/aggressive/icepike.ron +++ b/assets/common/entity/wild/aggressive/icepike.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("icepike"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.fish"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/lavadrake.ron b/assets/common/entity/wild/aggressive/lavadrake.ron index 43f9dfd981..2e73529654 100644 --- a/assets/common/entity/wild/aggressive/lavadrake.ron +++ b/assets/common/entity/wild/aggressive/lavadrake.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("lavadrake"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.carapace"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/lion.ron b/assets/common/entity/wild/aggressive/lion.ron index 703577cfa1..1f8bc3eafe 100644 --- a/assets/common/entity/wild/aggressive/lion.ron +++ b/assets/common/entity/wild/aggressive/lion.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("lion"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.clawed"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/mammoth.ron b/assets/common/entity/wild/aggressive/mammoth.ron index 6bf88c0e38..aa01c0f6b8 100644 --- a/assets/common/entity/wild/aggressive/mammoth.ron +++ b/assets/common/entity/wild/aggressive/mammoth.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("mammoth"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.mammoth"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/maneater.ron b/assets/common/entity/wild/aggressive/maneater.ron index 92ff16fa66..a546988da9 100644 --- a/assets/common/entity/wild/aggressive/maneater.ron +++ b/assets/common/entity/wild/aggressive/maneater.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("maneater"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.maneater"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/mighty_saurok.ron b/assets/common/entity/wild/aggressive/mighty_saurok.ron index 4fd00cc454..dba3286043 100644 --- a/assets/common/entity/wild/aggressive/mighty_saurok.ron +++ b/assets/common/entity/wild/aggressive/mighty_saurok.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("saurok_mighty"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.biped_large.saurok"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/monitor.ron b/assets/common/entity/wild/aggressive/monitor.ron index 2195fd63de..1b11c1407f 100644 --- a/assets/common/entity/wild/aggressive/monitor.ron +++ b/assets/common/entity/wild/aggressive/monitor.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("monitor"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/mountain_troll.ron b/assets/common/entity/wild/aggressive/mountain_troll.ron index ef24ea5561..51c4cae461 100644 --- a/assets/common/entity/wild/aggressive/mountain_troll.ron +++ b/assets/common/entity/wild/aggressive/mountain_troll.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("troll_mountain"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.biped_large.troll"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/ngoubou.ron b/assets/common/entity/wild/aggressive/ngoubou.ron index 191d6642ac..f1441ed668 100644 --- a/assets/common/entity/wild/aggressive/ngoubou.ron +++ b/assets/common/entity/wild/aggressive/ngoubou.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("ngoubou"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.horned"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/ntouka.ron b/assets/common/entity/wild/aggressive/ntouka.ron index de2e848273..73cdc0465d 100644 --- a/assets/common/entity/wild/aggressive/ntouka.ron +++ b/assets/common/entity/wild/aggressive/ntouka.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("ntouka"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.theropod.horned"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/occult_saurok.ron b/assets/common/entity/wild/aggressive/occult_saurok.ron index 332ce79602..859799ac21 100644 --- a/assets/common/entity/wild/aggressive/occult_saurok.ron +++ b/assets/common/entity/wild/aggressive/occult_saurok.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("saurok_occult"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.biped_large.saurok"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/odonto.ron b/assets/common/entity/wild/aggressive/odonto.ron index a8cba7c234..5ac5b7ee1a 100644 --- a/assets/common/entity/wild/aggressive/odonto.ron +++ b/assets/common/entity/wild/aggressive/odonto.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("odonto"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.theropod.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/ogre.ron b/assets/common/entity/wild/aggressive/ogre.ron index 7e3e655cfa..972ef756ef 100644 --- a/assets/common/entity/wild/aggressive/ogre.ron +++ b/assets/common/entity/wild/aggressive/ogre.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("ogre"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.biped_large.default"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/rocksnapper.ron b/assets/common/entity/wild/aggressive/rocksnapper.ron index b003b4f4d7..6e886a367e 100644 --- a/assets/common/entity/wild/aggressive/rocksnapper.ron +++ b/assets/common/entity/wild/aggressive/rocksnapper.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("rocksnapper"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.carapace"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/roshwalr.ron b/assets/common/entity/wild/aggressive/roshwalr.ron index cee362c67b..4d856d5d60 100644 --- a/assets/common/entity/wild/aggressive/roshwalr.ron +++ b/assets/common/entity/wild/aggressive/roshwalr.ron @@ -6,7 +6,7 @@ EntityConfig ( ))), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.ice"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/roshwalr_boss.ron b/assets/common/entity/wild/aggressive/roshwalr_boss.ron index 2f105614a1..95ce5d963a 100644 --- a/assets/common/entity/wild/aggressive/roshwalr_boss.ron +++ b/assets/common/entity/wild/aggressive/roshwalr_boss.ron @@ -3,7 +3,7 @@ EntityConfig ( body: Exact(QuadrupedMedium(Body(species: Roshwalr, body_type: Female))), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.ice"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/saber.ron b/assets/common/entity/wild/aggressive/saber.ron index 08e39d6245..c628224265 100644 --- a/assets/common/entity/wild/aggressive/saber.ron +++ b/assets/common/entity/wild/aggressive/saber.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("sabertooth"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.fanged"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/sand_raptor.ron b/assets/common/entity/wild/aggressive/sand_raptor.ron index 82f5a1abf3..e65e583856 100644 --- a/assets/common/entity/wild/aggressive/sand_raptor.ron +++ b/assets/common/entity/wild/aggressive/sand_raptor.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("raptor_sand"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.theropod.raptor"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/sandshark.ron b/assets/common/entity/wild/aggressive/sandshark.ron index 23df7e3f49..d06c09b294 100644 --- a/assets/common/entity/wild/aggressive/sandshark.ron +++ b/assets/common/entity/wild/aggressive/sandshark.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("sandshark"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.carapace"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/sly_saurok.ron b/assets/common/entity/wild/aggressive/sly_saurok.ron index d52795bda5..82c7b42ca2 100644 --- a/assets/common/entity/wild/aggressive/sly_saurok.ron +++ b/assets/common/entity/wild/aggressive/sly_saurok.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("saurok_sly"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.biped_large.saurok"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/snow_leopard.ron b/assets/common/entity/wild/aggressive/snow_leopard.ron index fbdeb737a3..83ac609422 100644 --- a/assets/common/entity/wild/aggressive/snow_leopard.ron +++ b/assets/common/entity/wild/aggressive/snow_leopard.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("snowleopard"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.clawed"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/snow_raptor.ron b/assets/common/entity/wild/aggressive/snow_raptor.ron index f892f197a3..48fb72a1f5 100644 --- a/assets/common/entity/wild/aggressive/snow_raptor.ron +++ b/assets/common/entity/wild/aggressive/snow_raptor.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("raptor_snow"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.theropod.raptor"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/sunlizard.ron b/assets/common/entity/wild/aggressive/sunlizard.ron index 0d5d11803b..594a17864e 100644 --- a/assets/common/entity/wild/aggressive/sunlizard.ron +++ b/assets/common/entity/wild/aggressive/sunlizard.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("sunlizard"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.theropod.raptor"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/swamp_troll.ron b/assets/common/entity/wild/aggressive/swamp_troll.ron index d8410db0e0..9cac895d83 100644 --- a/assets/common/entity/wild/aggressive/swamp_troll.ron +++ b/assets/common/entity/wild/aggressive/swamp_troll.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("troll_swamp"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.biped_large.troll"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/tarasque.ron b/assets/common/entity/wild/aggressive/tarasque.ron index 9240f05109..0ee11655bf 100644 --- a/assets/common/entity/wild/aggressive/tarasque.ron +++ b/assets/common/entity/wild/aggressive/tarasque.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("tarasque"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.carapace"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/tiger.ron b/assets/common/entity/wild/aggressive/tiger.ron index 309c9e7df7..ee8c890b65 100644 --- a/assets/common/entity/wild/aggressive/tiger.ron +++ b/assets/common/entity/wild/aggressive/tiger.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("tiger"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.clawed"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/wendigo.ron b/assets/common/entity/wild/aggressive/wendigo.ron index 8fef962284..2bf2f490a3 100644 --- a/assets/common/entity/wild/aggressive/wendigo.ron +++ b/assets/common/entity/wild/aggressive/wendigo.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("wendigo"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.biped_large.wendigo"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/wolf.ron b/assets/common/entity/wild/aggressive/wolf.ron index 57509f6382..54be102034 100644 --- a/assets/common/entity/wild/aggressive/wolf.ron +++ b/assets/common/entity/wild/aggressive/wolf.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("wolf"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.fanged"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/wood_raptor.ron b/assets/common/entity/wild/aggressive/wood_raptor.ron index fbc093e14a..bf9210ad56 100644 --- a/assets/common/entity/wild/aggressive/wood_raptor.ron +++ b/assets/common/entity/wild/aggressive/wood_raptor.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("raptor_wood"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.theropod.raptor"), hands: Uninit, diff --git a/assets/common/entity/wild/aggressive/yale.ron b/assets/common/entity/wild/aggressive/yale.ron index 0ea8d6dc09..fe7e4c9e77 100644 --- a/assets/common/entity/wild/aggressive/yale.ron +++ b/assets/common/entity/wild/aggressive/yale.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("yale"), alignment: Alignment(Enemy), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.theropod.horned"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/alpaca.ron b/assets/common/entity/wild/peaceful/alpaca.ron index b1b06b53a9..c74c42916b 100644 --- a/assets/common/entity/wild/peaceful/alpaca.ron +++ b/assets/common/entity/wild/peaceful/alpaca.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("alpaca"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.wool"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/antelope.ron b/assets/common/entity/wild/peaceful/antelope.ron index 573e457850..6712881c2f 100644 --- a/assets/common/entity/wild/peaceful/antelope.ron +++ b/assets/common/entity/wild/peaceful/antelope.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("antelope"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/arctic_fox.ron b/assets/common/entity/wild/peaceful/arctic_fox.ron index 4a289c0644..cc5ed43126 100644 --- a/assets/common/entity/wild/peaceful/arctic_fox.ron +++ b/assets/common/entity/wild/peaceful/arctic_fox.ron @@ -3,7 +3,7 @@ EntityConfig ( body: Exact(QuadrupedSmall(Body(species: Fox, body_type: Female))), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/arctic_hare.ron b/assets/common/entity/wild/peaceful/arctic_hare.ron index 566b5c15e2..9104b17bbb 100644 --- a/assets/common/entity/wild/peaceful/arctic_hare.ron +++ b/assets/common/entity/wild/peaceful/arctic_hare.ron @@ -3,7 +3,7 @@ EntityConfig ( body: Exact(QuadrupedSmall(Body(species: Hare, body_type: Female))), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.fur"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/axolotl.ron b/assets/common/entity/wild/peaceful/axolotl.ron index f7b04e723e..02e3b21093 100644 --- a/assets/common/entity/wild/peaceful/axolotl.ron +++ b/assets/common/entity/wild/peaceful/axolotl.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("axolotl"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.ooze"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/bear.ron b/assets/common/entity/wild/peaceful/bear.ron index 3d132caf15..332e1ca541 100644 --- a/assets/common/entity/wild/peaceful/bear.ron +++ b/assets/common/entity/wild/peaceful/bear.ron @@ -1,9 +1,10 @@ EntityConfig ( + // FIXME: move this boi to spot directory name: Name("Well-fed Bear"), body: RandomWith("bear"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.clawed"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/beaver.ron b/assets/common/entity/wild/peaceful/beaver.ron index fb7ed84625..647d55d6c4 100644 --- a/assets/common/entity/wild/peaceful/beaver.ron +++ b/assets/common/entity/wild/peaceful/beaver.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("beaver"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.fur"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/boar.ron b/assets/common/entity/wild/peaceful/boar.ron index bba9eac893..8fea407899 100644 --- a/assets/common/entity/wild/peaceful/boar.ron +++ b/assets/common/entity/wild/peaceful/boar.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("boar"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/camel.ron b/assets/common/entity/wild/peaceful/camel.ron index fd574f17e1..a835a5a2cd 100644 --- a/assets/common/entity/wild/peaceful/camel.ron +++ b/assets/common/entity/wild/peaceful/camel.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("camel"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/cat.ron b/assets/common/entity/wild/peaceful/cat.ron index 1e7ad2372a..2ae273f45c 100644 --- a/assets/common/entity/wild/peaceful/cat.ron +++ b/assets/common/entity/wild/peaceful/cat.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("cat"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/catoblepas.ron b/assets/common/entity/wild/peaceful/catoblepas.ron index d15457d45c..7e3217792d 100644 --- a/assets/common/entity/wild/peaceful/catoblepas.ron +++ b/assets/common/entity/wild/peaceful/catoblepas.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("catoblepas"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.catoblepas"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/cattle.ron b/assets/common/entity/wild/peaceful/cattle.ron index 72cc745057..94e74f5681 100644 --- a/assets/common/entity/wild/peaceful/cattle.ron +++ b/assets/common/entity/wild/peaceful/cattle.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("cattle"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/chicken.ron b/assets/common/entity/wild/peaceful/chicken.ron index 7d65a663ee..ca89bc50b3 100644 --- a/assets/common/entity/wild/peaceful/chicken.ron +++ b/assets/common/entity/wild/peaceful/chicken.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("chicken"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.bird_medium"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/clownfish.ron b/assets/common/entity/wild/peaceful/clownfish.ron index 76c8698071..57a01bdca5 100644 --- a/assets/common/entity/wild/peaceful/clownfish.ron +++ b/assets/common/entity/wild/peaceful/clownfish.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("clownfish"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.fish"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/deer.ron b/assets/common/entity/wild/peaceful/deer.ron index 0b12f635ca..6bb8316e2c 100644 --- a/assets/common/entity/wild/peaceful/deer.ron +++ b/assets/common/entity/wild/peaceful/deer.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("deer"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/donkey.ron b/assets/common/entity/wild/peaceful/donkey.ron index 5838cf2710..3725c02ae3 100644 --- a/assets/common/entity/wild/peaceful/donkey.ron +++ b/assets/common/entity/wild/peaceful/donkey.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("donkey"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/duck.ron b/assets/common/entity/wild/peaceful/duck.ron index c0f9283508..8fcba4874c 100644 --- a/assets/common/entity/wild/peaceful/duck.ron +++ b/assets/common/entity/wild/peaceful/duck.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("duck"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.bird_medium"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/eagle.ron b/assets/common/entity/wild/peaceful/eagle.ron index 093606f786..5cd69f2774 100644 --- a/assets/common/entity/wild/peaceful/eagle.ron +++ b/assets/common/entity/wild/peaceful/eagle.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("eagle"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.bird_medium"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/forest_fox.ron b/assets/common/entity/wild/peaceful/forest_fox.ron index f2a7e88651..14751ed70a 100644 --- a/assets/common/entity/wild/peaceful/forest_fox.ron +++ b/assets/common/entity/wild/peaceful/forest_fox.ron @@ -3,7 +3,7 @@ EntityConfig ( body: Exact(QuadrupedSmall(Body(species: Fox, body_type: Male))), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/frog.ron b/assets/common/entity/wild/peaceful/frog.ron index 6bc65393f6..d2b0ca03e3 100644 --- a/assets/common/entity/wild/peaceful/frog.ron +++ b/assets/common/entity/wild/peaceful/frog.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("frog"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.ooze"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/fungome.ron b/assets/common/entity/wild/peaceful/fungome.ron index 96540f5d61..fa369e7a93 100644 --- a/assets/common/entity/wild/peaceful/fungome.ron +++ b/assets/common/entity/wild/peaceful/fungome.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("fungome"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.mushroom"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/gecko.ron b/assets/common/entity/wild/peaceful/gecko.ron index 830c51cb0d..e4569e9f9c 100644 --- a/assets/common/entity/wild/peaceful/gecko.ron +++ b/assets/common/entity/wild/peaceful/gecko.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("gecko"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.ooze"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/goat.ron b/assets/common/entity/wild/peaceful/goat.ron index 9f33ed002e..6f2e387932 100644 --- a/assets/common/entity/wild/peaceful/goat.ron +++ b/assets/common/entity/wild/peaceful/goat.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("goat"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.wool") hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/goose.ron b/assets/common/entity/wild/peaceful/goose.ron index 294f05754a..1e2a1ac7df 100644 --- a/assets/common/entity/wild/peaceful/goose.ron +++ b/assets/common/entity/wild/peaceful/goose.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("goose"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.bird_medium"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/highland.ron b/assets/common/entity/wild/peaceful/highland.ron index ef992cd8fb..d859373f86 100644 --- a/assets/common/entity/wild/peaceful/highland.ron +++ b/assets/common/entity/wild/peaceful/highland.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("highland"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/hirdrasil.ron b/assets/common/entity/wild/peaceful/hirdrasil.ron index c97924afd9..0be067552a 100644 --- a/assets/common/entity/wild/peaceful/hirdrasil.ron +++ b/assets/common/entity/wild/peaceful/hirdrasil.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("hirdrasil"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/holladon.ron b/assets/common/entity/wild/peaceful/holladon.ron index a57248dce9..eb4d9e8c79 100644 --- a/assets/common/entity/wild/peaceful/holladon.ron +++ b/assets/common/entity/wild/peaceful/holladon.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("holladon"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic") hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/horse.ron b/assets/common/entity/wild/peaceful/horse.ron index b42067c4c8..c07d313038 100644 --- a/assets/common/entity/wild/peaceful/horse.ron +++ b/assets/common/entity/wild/peaceful/horse.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("horse"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/jackalope.ron b/assets/common/entity/wild/peaceful/jackalope.ron index 130aad374a..3ce80fc5a0 100644 --- a/assets/common/entity/wild/peaceful/jackalope.ron +++ b/assets/common/entity/wild/peaceful/jackalope.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("jackalope"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.fur"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/kelpie.ron b/assets/common/entity/wild/peaceful/kelpie.ron index 1062c5bedb..8cad9576d0 100644 --- a/assets/common/entity/wild/peaceful/kelpie.ron +++ b/assets/common/entity/wild/peaceful/kelpie.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("kelpie"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/llama.ron b/assets/common/entity/wild/peaceful/llama.ron index 3b40a2149e..6b9ae9f5cc 100644 --- a/assets/common/entity/wild/peaceful/llama.ron +++ b/assets/common/entity/wild/peaceful/llama.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("llama"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.wool") hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/marlin.ron b/assets/common/entity/wild/peaceful/marlin.ron index e127c8aeba..ff0abdc85e 100644 --- a/assets/common/entity/wild/peaceful/marlin.ron +++ b/assets/common/entity/wild/peaceful/marlin.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("marlin"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.fish"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/moose.ron b/assets/common/entity/wild/peaceful/moose.ron index 47953674fc..51306769fa 100644 --- a/assets/common/entity/wild/peaceful/moose.ron +++ b/assets/common/entity/wild/peaceful/moose.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("moose"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.fanged"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/mouflon.ron b/assets/common/entity/wild/peaceful/mouflon.ron index c324dcbba5..ea037f9a5a 100644 --- a/assets/common/entity/wild/peaceful/mouflon.ron +++ b/assets/common/entity/wild/peaceful/mouflon.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("mouflon"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.wool") hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/owl.ron b/assets/common/entity/wild/peaceful/owl.ron index dd23ad327a..f7544c3743 100644 --- a/assets/common/entity/wild/peaceful/owl.ron +++ b/assets/common/entity/wild/peaceful/owl.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("owl"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.bird_medium"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/pangolin.ron b/assets/common/entity/wild/peaceful/pangolin.ron index ba207dd831..b4f2cd9e0e 100644 --- a/assets/common/entity/wild/peaceful/pangolin.ron +++ b/assets/common/entity/wild/peaceful/pangolin.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("pangolin"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/parrot.ron b/assets/common/entity/wild/peaceful/parrot.ron index d680c71647..ec718c7cba 100644 --- a/assets/common/entity/wild/peaceful/parrot.ron +++ b/assets/common/entity/wild/peaceful/parrot.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("parrot"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.bird_medium"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/peacock.ron b/assets/common/entity/wild/peaceful/peacock.ron index b34c2e830d..4453aa8aac 100644 --- a/assets/common/entity/wild/peaceful/peacock.ron +++ b/assets/common/entity/wild/peaceful/peacock.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("peacock"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.bird_medium"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/pig.ron b/assets/common/entity/wild/peaceful/pig.ron index 3c20ae39cd..8e642bd80e 100644 --- a/assets/common/entity/wild/peaceful/pig.ron +++ b/assets/common/entity/wild/peaceful/pig.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("pig"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic") hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/piranha.ron b/assets/common/entity/wild/peaceful/piranha.ron index dc1f92651b..7ff3d4c683 100644 --- a/assets/common/entity/wild/peaceful/piranha.ron +++ b/assets/common/entity/wild/peaceful/piranha.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("piranha"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.fish"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/porcupine.ron b/assets/common/entity/wild/peaceful/porcupine.ron index 79fdade2b9..94278e6362 100644 --- a/assets/common/entity/wild/peaceful/porcupine.ron +++ b/assets/common/entity/wild/peaceful/porcupine.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("porcupine"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/quokka.ron b/assets/common/entity/wild/peaceful/quokka.ron index e25c15cb3c..1d18487d75 100644 --- a/assets/common/entity/wild/peaceful/quokka.ron +++ b/assets/common/entity/wild/peaceful/quokka.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("quokka"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.fur"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/rabbit.ron b/assets/common/entity/wild/peaceful/rabbit.ron index 23ff937e6e..9266b03d08 100644 --- a/assets/common/entity/wild/peaceful/rabbit.ron +++ b/assets/common/entity/wild/peaceful/rabbit.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("rabbit"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/raccoon.ron b/assets/common/entity/wild/peaceful/raccoon.ron index b941c98a24..d89dec27da 100644 --- a/assets/common/entity/wild/peaceful/raccoon.ron +++ b/assets/common/entity/wild/peaceful/raccoon.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("raccoon"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/rat.ron b/assets/common/entity/wild/peaceful/rat.ron index d911990b8b..61c0fa8c3c 100644 --- a/assets/common/entity/wild/peaceful/rat.ron +++ b/assets/common/entity/wild/peaceful/rat.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("rat"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/river_salamander.ron b/assets/common/entity/wild/peaceful/river_salamander.ron index 3f2914df60..fa0e59c5f0 100644 --- a/assets/common/entity/wild/peaceful/river_salamander.ron +++ b/assets/common/entity/wild/peaceful/river_salamander.ron @@ -3,7 +3,7 @@ EntityConfig ( body: Exact(QuadrupedLow(Body(species: Salamander, body_type: Female))), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.salamander"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/sand_hare.ron b/assets/common/entity/wild/peaceful/sand_hare.ron index 84a417974c..80964c719f 100644 --- a/assets/common/entity/wild/peaceful/sand_hare.ron +++ b/assets/common/entity/wild/peaceful/sand_hare.ron @@ -3,7 +3,7 @@ EntityConfig ( body: Exact(QuadrupedSmall(Body(species: Hare, body_type: Male))), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.fur") hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/sand_salamander.ron b/assets/common/entity/wild/peaceful/sand_salamander.ron index 2740438c2b..67117b2ba7 100644 --- a/assets/common/entity/wild/peaceful/sand_salamander.ron +++ b/assets/common/entity/wild/peaceful/sand_salamander.ron @@ -3,7 +3,7 @@ EntityConfig ( body: Exact(QuadrupedLow(Body(species: Salamander, body_type: Male))), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.salamander"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/sheep.ron b/assets/common/entity/wild/peaceful/sheep.ron index fff177dfd3..b1ae6645b5 100644 --- a/assets/common/entity/wild/peaceful/sheep.ron +++ b/assets/common/entity/wild/peaceful/sheep.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("sheep"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.wool") hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/skunk.ron b/assets/common/entity/wild/peaceful/skunk.ron index 6e782adcfb..3e96494083 100644 --- a/assets/common/entity/wild/peaceful/skunk.ron +++ b/assets/common/entity/wild/peaceful/skunk.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("skunk"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.fur"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/squirrel.ron b/assets/common/entity/wild/peaceful/squirrel.ron index 9daac3cd8e..3ae5257792 100644 --- a/assets/common/entity/wild/peaceful/squirrel.ron +++ b/assets/common/entity/wild/peaceful/squirrel.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("squirrel"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/tortoise.ron b/assets/common/entity/wild/peaceful/tortoise.ron index 4104f1c43a..d7e0cca731 100644 --- a/assets/common/entity/wild/peaceful/tortoise.ron +++ b/assets/common/entity/wild/peaceful/tortoise.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("tortoise"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_low.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/truffler.ron b/assets/common/entity/wild/peaceful/truffler.ron index c0c9adfc1f..f14273fae0 100644 --- a/assets/common/entity/wild/peaceful/truffler.ron +++ b/assets/common/entity/wild/peaceful/truffler.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("truffler"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.mushroom"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/turtle.ron b/assets/common/entity/wild/peaceful/turtle.ron index 4b55182fa6..7ae12f404f 100644 --- a/assets/common/entity/wild/peaceful/turtle.ron +++ b/assets/common/entity/wild/peaceful/turtle.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("turtle"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_small.ooze"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/tuskram.ron b/assets/common/entity/wild/peaceful/tuskram.ron index 32c091db3a..42b7769ae2 100644 --- a/assets/common/entity/wild/peaceful/tuskram.ron +++ b/assets/common/entity/wild/peaceful/tuskram.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("tuskram"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.fanged"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/yak.ron b/assets/common/entity/wild/peaceful/yak.ron index 95323b48d2..64abc7681e 100644 --- a/assets/common/entity/wild/peaceful/yak.ron +++ b/assets/common/entity/wild/peaceful/yak.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("yak"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/zebra.ron b/assets/common/entity/wild/peaceful/zebra.ron index fd7667965b..95627c2540 100644 --- a/assets/common/entity/wild/peaceful/zebra.ron +++ b/assets/common/entity/wild/peaceful/zebra.ron @@ -3,7 +3,7 @@ EntityConfig ( body: RandomWith("zebra"), alignment: Alignment(Wild), - loot: Uninit, + loot: LootTable("common.loot_tables.creature.quad_medium.gentle"), hands: Uninit, diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index 39f248b463..d6cfda56c6 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -354,154 +354,6 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, last_change: Healt // Decide for a loot drop before turning into a lootbag let old_body = state.ecs().write_storage::().remove(entity); - let _ = || { - Lottery::>::load_expect(match old_body { - Some(common::comp::Body::Humanoid(_)) => "common.loot_tables.creature.humanoid", - Some(common::comp::Body::QuadrupedSmall(quadruped_small)) => { - match quadruped_small.species { - quadruped_small::Species::Dodarock => { - "common.loot_tables.creature.quad_small.dodarock" - }, - quadruped_small::Species::Truffler | quadruped_small::Species::Fungome => { - "common.loot_tables.creature.quad_small.mushroom" - }, - quadruped_small::Species::Sheep | quadruped_small::Species::Goat => { - "common.loot_tables.creature.quad_small.wool" - }, - quadruped_small::Species::Skunk - | quadruped_small::Species::Quokka - | quadruped_small::Species::Beaver - | quadruped_small::Species::Jackalope - | quadruped_small::Species::Hare => { - "common.loot_tables.creature.quad_small.fur" - }, - quadruped_small::Species::Frog - | quadruped_small::Species::Axolotl - | quadruped_small::Species::Gecko - | quadruped_small::Species::Turtle => { - "common.loot_tables.creature.quad_small.ooze" - }, - _ => "common.loot_tables.creature.quad_small.generic", - } - }, - Some(Body::QuadrupedMedium(quadruped_medium)) => match quadruped_medium.species { - quadruped_medium::Species::Frostfang | quadruped_medium::Species::Roshwalr => { - "common.loot_tables.creature.quad_medium.ice" - }, - quadruped_medium::Species::Catoblepas => { - "common.loot_tables.creature.quad_medium.catoblepas" - }, - quadruped_medium::Species::Bear - | quadruped_medium::Species::Snowleopard - | quadruped_medium::Species::Tiger - | quadruped_medium::Species::Lion => { - "common.loot_tables.creature.quad_medium.clawed" - }, - quadruped_medium::Species::Tarasque - | quadruped_medium::Species::Bonerattler => { - "common.loot_tables.creature.quad_medium.carapace" - }, - quadruped_medium::Species::Dreadhorn => { - "common.loot_tables.creature.quad_medium.dreadhorn" - }, - quadruped_medium::Species::Camel - | quadruped_medium::Species::Deer - | quadruped_medium::Species::Hirdrasil - | quadruped_medium::Species::Horse - | quadruped_medium::Species::Highland - | quadruped_medium::Species::Zebra - | quadruped_medium::Species::Donkey - | quadruped_medium::Species::Antelope - | quadruped_medium::Species::Kelpie - | quadruped_medium::Species::Cattle - | quadruped_medium::Species::Yak => { - "common.loot_tables.creature.quad_medium.gentle" - }, - quadruped_medium::Species::Mouflon - | quadruped_medium::Species::Llama - | quadruped_medium::Species::Alpaca => { - "common.loot_tables.creature.quad_medium.wool" - }, - quadruped_medium::Species::Ngoubou => { - "common.loot_tables.creature.quad_medium.horned" - }, - quadruped_medium::Species::Mammoth => { - "common.loot_tables.creature.quad_medium.mammoth" - }, - _ => "common.loot_tables.creature.quad_medium.fanged", - }, - Some(common::comp::Body::BirdMedium(_)) => { - "common.loot_tables.creature.bird_medium" - }, - Some(common::comp::Body::BirdLarge(bird_large)) => match bird_large.species { - bird_large::Species::Cockatrice => { - "common.loot_tables.creature.bird_large.cockatrice" - }, - bird_large::Species::Roc => "common.loot_tables.creature.bird_large.roc", - _ => "common.loot_tables.creature.bird_large.phoenix", - }, - Some(common::comp::Body::FishMedium(_)) => "common.loot_tables.creature.fish", - Some(common::comp::Body::FishSmall(_)) => "common.loot_tables.creature.fish", - Some(common::comp::Body::BipedLarge(biped_large)) => match biped_large.species { - biped_large::Species::Wendigo => { - "common.loot_tables.creature.biped_large.wendigo" - }, - biped_large::Species::Cavetroll - | biped_large::Species::Mountaintroll - | biped_large::Species::Swamptroll => { - "common.loot_tables.creature.biped_large.troll" - }, - biped_large::Species::Occultsaurok - | biped_large::Species::Mightysaurok - | biped_large::Species::Slysaurok => { - "common.loot_tables.creature.biped_large.saurok" - }, - _ => "common.loot_tables.creature.biped_large.default", - }, - Some(common::comp::Body::Golem(_)) => "common.loot_tables.creature.golem", - Some(common::comp::Body::Theropod(theropod)) => match theropod.species { - theropod::Species::Sandraptor - | theropod::Species::Snowraptor - | theropod::Species::Woodraptor - | theropod::Species::Sunlizard => "common.loot_tables.creature.theropod.raptor", - theropod::Species::Archaeos - | theropod::Species::Ntouka - | theropod::Species::Yale => "common.loot_tables.creature.theropod.horned", - _ => "common.loot_tables.creature.theropod.generic", - }, - Some(common::comp::Body::Dragon(_)) => "common.loot_tables.creature.dragon", - Some(common::comp::Body::QuadrupedLow(quadruped_low)) => { - match quadruped_low.species { - quadruped_low::Species::Maneater => { - "common.loot_tables.creature.quad_low.maneater" - }, - quadruped_low::Species::Lavadrake - | quadruped_low::Species::Rocksnapper - | quadruped_low::Species::Sandshark => { - "common.loot_tables.creature.quad_low.carapace" - }, - quadruped_low::Species::Asp => { - "common.loot_tables.creature.quad_low.venemous" - }, - quadruped_low::Species::Hakulaq => { - "common.loot_tables.creature.quad_low.fanged" - }, - quadruped_low::Species::Deadwood => { - "common.loot_tables.creature.quad_low.deadwood" - }, - quadruped_low::Species::Basilisk => { - "common.loot_tables.creature.quad_low.basilisk" - }, - quadruped_low::Species::Salamander => { - "common.loot_tables.creature.quad_low.salamander" - }, - _ => "common.loot_tables.creature.quad_low.generic", - } - }, - Some(common::comp::Body::BipedSmall(_)) => "common.loot_tables.nothing", - _ => "common.loot_tables.fallback", - }) - }; let loot_spec = { let mut item_drop = state.ecs().write_storage::>(); @@ -515,6 +367,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, last_change: Healt let pos = state.ecs().read_storage::().get(entity).cloned(); let vel = state.ecs().read_storage::().get(entity).cloned(); if let Some(pos) = pos { + // FIXME: Please, no BeastMeat from Possesed Turret let _ = state .create_object(comp::Pos(pos.0 + Vec3::unit_z() * 0.25), match old_body { Some(common::comp::Body::Humanoid(_)) => object::Body::Pouch, diff --git a/server/src/rtsim/tick.rs b/server/src/rtsim/tick.rs index df17a84b1a..7728671edc 100644 --- a/server/src/rtsim/tick.rs +++ b/server/src/rtsim/tick.rs @@ -166,6 +166,8 @@ impl<'a> System<'a> for Sys { comp::Body::Ship(_) => comp::Scale(comp::ship::AIRSHIP_SCALE), _ => comp::Scale(1.0), }, + // FIXME; + // Drop loot drop_item: None, anchor: None, rtsim_entity, diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs index bb5d07c67e..35a889737d 100644 --- a/world/src/layer/mod.rs +++ b/world/src/layer/mod.rs @@ -440,7 +440,8 @@ pub fn apply_caves_supplement<'a>( // Abs units let cave_base = (cave.alt + cave_floor) as i32; - let cave_depth = (col_sample.alt - cave.alt).max(0.0); //slightly different from earlier cave depth? + // slightly different from earlier cave depth? + let cave_depth = (col_sample.alt - cave.alt).max(0.0); // Scatter things in caves if let Some(z) = (-4..8).map(|z| cave_base + z).find(|z| { @@ -505,6 +506,8 @@ pub fn apply_caves_supplement<'a>( }) .with_automatic_name(); + // FIXME: + // Drop something. supplement.add_entity(entity); } }