From 56b17e714126be9fd5e2fd244f6f3429d3edf73a Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 23 Sep 2021 14:43:31 -0400 Subject: [PATCH] Format fixes. --- assets/common/entity/spot/pirate.ron | 6 +++--- assets/common/entity/village/dummy.ron | 2 +- assets/common/entity/wild/peaceful/goat.ron | 2 +- assets/common/entity/wild/peaceful/holladon.ron | 2 +- assets/common/entity/wild/peaceful/llama.ron | 2 +- assets/common/entity/wild/peaceful/mouflon.ron | 2 +- assets/common/entity/wild/peaceful/pig.ron | 2 +- assets/common/entity/wild/peaceful/sand_hare.ron | 2 +- assets/common/entity/wild/peaceful/sheep.ron | 2 +- server/src/events/entity_manipulation.rs | 6 ++---- 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/assets/common/entity/spot/pirate.ron b/assets/common/entity/spot/pirate.ron index a34722757c..1e5d89c5ff 100644 --- a/assets/common/entity/spot/pirate.ron +++ b/assets/common/entity/spot/pirate.ron @@ -1,9 +1,9 @@ EntityConfig ( name: Name("Pirate"), body: Exact(Humanoid(Body( - species: Human, - body_type: Female, - hair_style: 2, + species: Human, + body_type: Female, + hair_style: 2, beard: 0, eyes: 0, accessory: 0, diff --git a/assets/common/entity/village/dummy.ron b/assets/common/entity/village/dummy.ron index c62a515143..45ad0082fa 100644 --- a/assets/common/entity/village/dummy.ron +++ b/assets/common/entity/village/dummy.ron @@ -3,7 +3,7 @@ EntityConfig ( body: Exact(Object(TrainingDummy)), alignment: Alignment(Passive), - loot: None, + loot: Nothing, hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/goat.ron b/assets/common/entity/wild/peaceful/goat.ron index 6f2e387932..676846a4fd 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: LootTable("common.loot_tables.creature.quad_small.wool") + loot: LootTable("common.loot_tables.creature.quad_small.wool"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/holladon.ron b/assets/common/entity/wild/peaceful/holladon.ron index eb4d9e8c79..a86229ffc3 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: LootTable("common.loot_tables.creature.quad_small.generic") + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/llama.ron b/assets/common/entity/wild/peaceful/llama.ron index 6b9ae9f5cc..146f3156b1 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: LootTable("common.loot_tables.creature.quad_medium.wool") + loot: LootTable("common.loot_tables.creature.quad_medium.wool"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/mouflon.ron b/assets/common/entity/wild/peaceful/mouflon.ron index ea037f9a5a..4acf692f41 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: LootTable("common.loot_tables.creature.quad_medium.wool") + loot: LootTable("common.loot_tables.creature.quad_medium.wool"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/pig.ron b/assets/common/entity/wild/peaceful/pig.ron index 8e642bd80e..67c6dea703 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: LootTable("common.loot_tables.creature.quad_small.generic") + loot: LootTable("common.loot_tables.creature.quad_small.generic"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/sand_hare.ron b/assets/common/entity/wild/peaceful/sand_hare.ron index 80964c719f..6326bed01b 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: LootTable("common.loot_tables.creature.quad_small.fur") + loot: LootTable("common.loot_tables.creature.quad_small.fur"), hands: Uninit, diff --git a/assets/common/entity/wild/peaceful/sheep.ron b/assets/common/entity/wild/peaceful/sheep.ron index b1ae6645b5..b1ff4216b7 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: LootTable("common.loot_tables.creature.quad_small.wool") + loot: LootTable("common.loot_tables.creature.quad_small.wool"), hands: Uninit, diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs index d6cfda56c6..3d5652d14e 100644 --- a/server/src/events/entity_manipulation.rs +++ b/server/src/events/entity_manipulation.rs @@ -2,16 +2,14 @@ use crate::{ client::Client, comp::{ agent::{Agent, AgentEvent, Sound, SoundKind}, - biped_large, bird_large, quadruped_low, quadruped_medium, quadruped_small, skills::SkillGroupKind, - theropod, BuffKind, BuffSource, PhysicsState, + BuffKind, BuffSource, PhysicsState, }, rtsim::RtSim, sys::terrain::SAFE_ZONE_RADIUS, Server, SpawnPoint, StateExt, }; use common::{ - assets::AssetExt, combat, comp::{ self, aura, buff, @@ -21,7 +19,7 @@ use common::{ Inventory, Player, Poise, Pos, SkillSet, Stats, }, event::{EventBus, ServerEvent}, - lottery::{LootSpec, Lottery}, + lottery::LootSpec, outcome::Outcome, resources::Time, rtsim::RtSimEntity,