Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Format fixes.

Browse Source
This commit is contained in:
Sam 2021-09-23 14:43:31 -04:00 committed by juliancoffee
parent 80ccda6583
commit 56b17e7141
10 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/entity/village/dummy.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: Exact(Object(TrainingDummy)), body: Exact(Object(TrainingDummy)),
alignment: Alignment(Passive), alignment: Alignment(Passive),
loot: None, loot: Nothing,
hands: Uninit, hands: Uninit,

2
assets/common/entity/wild/peaceful/goat.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("goat"), body: RandomWith("goat"),
alignment: Alignment(Wild), alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_small.wool") loot: LootTable("common.loot_tables.creature.quad_small.wool"),
hands: Uninit, hands: Uninit,

2
assets/common/entity/wild/peaceful/holladon.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("holladon"), body: RandomWith("holladon"),
alignment: Alignment(Wild), alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_small.generic") loot: LootTable("common.loot_tables.creature.quad_small.generic"),
hands: Uninit, hands: Uninit,

2
assets/common/entity/wild/peaceful/llama.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("llama"), body: RandomWith("llama"),
alignment: Alignment(Wild), alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_medium.wool") loot: LootTable("common.loot_tables.creature.quad_medium.wool"),
hands: Uninit, hands: Uninit,

2
assets/common/entity/wild/peaceful/mouflon.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("mouflon"), body: RandomWith("mouflon"),
alignment: Alignment(Wild), alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_medium.wool") loot: LootTable("common.loot_tables.creature.quad_medium.wool"),
hands: Uninit, hands: Uninit,

2
assets/common/entity/wild/peaceful/pig.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("pig"), body: RandomWith("pig"),
alignment: Alignment(Wild), alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_small.generic") loot: LootTable("common.loot_tables.creature.quad_small.generic"),
hands: Uninit, hands: Uninit,

2
assets/common/entity/wild/peaceful/sand_hare.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: Exact(QuadrupedSmall(Body(species: Hare, body_type: Male))), body: Exact(QuadrupedSmall(Body(species: Hare, body_type: Male))),
alignment: Alignment(Wild), alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_small.fur") loot: LootTable("common.loot_tables.creature.quad_small.fur"),
hands: Uninit, hands: Uninit,

2
assets/common/entity/wild/peaceful/sheep.ron
View File

@ -3,7 +3,7 @@ EntityConfig (
body: RandomWith("sheep"), body: RandomWith("sheep"),
alignment: Alignment(Wild), alignment: Alignment(Wild),
loot: LootTable("common.loot_tables.creature.quad_small.wool") loot: LootTable("common.loot_tables.creature.quad_small.wool"),
hands: Uninit, hands: Uninit,

6
server/src/events/entity_manipulation.rs
View File

@ -2,16 +2,14 @@ use crate::{
client::Client, client::Client,
comp::{ comp::{
agent::{Agent, AgentEvent, Sound, SoundKind}, agent::{Agent, AgentEvent, Sound, SoundKind},
biped_large, bird_large, quadruped_low, quadruped_medium, quadruped_small,
skills::SkillGroupKind, skills::SkillGroupKind,
theropod, BuffKind, BuffSource, PhysicsState, BuffKind, BuffSource, PhysicsState,
}, },
rtsim::RtSim, rtsim::RtSim,
sys::terrain::SAFE_ZONE_RADIUS, sys::terrain::SAFE_ZONE_RADIUS,
Server, SpawnPoint, StateExt, Server, SpawnPoint, StateExt,
}; };
use common::{ use common::{
assets::AssetExt,
combat, combat,
comp::{ comp::{
self, aura, buff, self, aura, buff,
@ -21,7 +19,7 @@ use common::{
Inventory, Player, Poise, Pos, SkillSet, Stats, Inventory, Player, Poise, Pos, SkillSet, Stats,
}, },
event::{EventBus, ServerEvent}, event::{EventBus, ServerEvent},
lottery::{LootSpec, Lottery}, lottery::LootSpec,
outcome::Outcome, outcome::Outcome,
resources::Time, resources::Time,
rtsim::RtSimEntity, rtsim::RtSimEntity,