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

clippy, fmt, remove leftover file, fix sitenames in soundtrack

Browse Source
This commit is contained in:
flo666 2022-10-23 21:04:04 +02:00 committed by IsseW
parent 18659f7d09
commit 9b1efe1bee
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/common/entity/wild/aggressive/bat.ron
View File

@ -3,7 +3,7 @@
name: Automatic,
body: RandomWith("bat"),
alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.calendar.halloween.bat"),
loot: LootTable("common.loot_tables.creature.bat"),
inventory: (
loadout: FromBody,
),

4
assets/common/loot_tables/calendar/halloween/bat.ron
View File

@ -1,4 +0,0 @@
[
(1.0, Item("common.items.food.pumpkin_spice_brew")),
(5.0, Item("common.items.food.honeycorn")),
]

2
assets/common/loot_tables/creature/bat.ron
View File

@ -5,5 +5,5 @@
// crafting
(1.0, Item("common.items.crafting_ing.hide.animal_hide")),
(1.0, Item("common.items.crafting_ing.animal_misc.shar_fang")),
(1.0, Item("common.items.crafting_ing.animal_misc.sharp_fang")),
]

2
common/src/calendar.rs
View File

@ -38,7 +38,7 @@ impl Calendar {
this.events.push(CalendarEvent::Christmas);
}
if now.month() == 10 && (01..=31).contains(&now.day()) {
if now.month() == 10 && (24..=31).contains(&now.day()) {
this.events.push(CalendarEvent::Halloween);
}

5
server/agent/src/action_nodes.rs
View File

@ -331,9 +331,8 @@ impl<'a> AgentData<'a> {
.as_ref()
.map_or(false, |item| {
item.ability_spec().map_or(false, |a_s| match &*a_s {
AbilitySpec::Custom(spec) => match spec.as_str() {
"Simple Flying Melee" => true,
_ => false,
AbilitySpec::Custom(spec) => {
matches!(spec.as_str(), "Simple Flying Melee")
},
_ => false,
})

4
server/agent/src/attack.rs
View File

@ -57,12 +57,12 @@ impl<'a> AgentData<'a> {
// and the agent is able to freely fly around
pub fn handle_simple_flying_melee(
&self,
agent: &mut Agent,
_agent: &mut Agent,
controller: &mut Controller,
attack_data: &AttackData,
tgt_data: &TargetData,
read_data: &ReadData,
rng: &mut impl Rng,
_rng: &mut impl Rng,
) {
// Fly to target
let dir_to_target = ((tgt_data.pos.0 + Vec3::unit_z() * 1.5) - self.pos.0)