diff --git a/assets/common/entity/calendar/halloween/aggressive/trickster.ron b/assets/common/entity/calendar/halloween/aggressive/trickster.ron index bd4ade1a77..e4727c1900 100644 --- a/assets/common/entity/calendar/halloween/aggressive/trickster.ron +++ b/assets/common/entity/calendar/halloween/aggressive/trickster.ron @@ -2,18 +2,21 @@ ( name: Name("Trickster"), body: RandomWith("draugr"), - alignment: Alignment(Npc), + alignment: Alignment(Enemy), loot: LootTable("common.loot_tables.calendar.halloween.trickster"), inventory: ( loadout: Inline(( inherit: Asset("common.loadout.calendar.halloween.trickster"), active_hands: InHands((Choice([ - (1, Item("common.items.weapons.tool.broom")), - (1, Item("common.items.weapons.tool.hoe")), - (1, Item("common.items.weapons.tool.pickaxe")), - (1, Item("common.items.weapons.tool.rake")), - (1, Item("common.items.weapons.tool.shovel-0")), - (1, Item("common.items.weapons.tool.shovel-1")), + (1, Item("common.items.tool.instruments.bass")), + (1, Item("common.items.tool.instruments.flute")), + (1, Item("common.items.tool.instruments.harp")), + (1, Item("common.items.tool.instruments.kalimba")), + (1, Item("common.items.tool.instruments.sitar")), + (1, Item("common.items.tool.instruments.perc")), + (1, Item("common.items.tool.instruments.lute")), + (1, Item("common.items.tool.instruments.guitar")), + (1, Item("common.items.tool.instruments.melodica")), ]), None)), )), ), diff --git a/assets/world/wildlife/spawn/calendar/halloween/halloween.ron b/assets/world/wildlife/spawn/calendar/halloween/halloween.ron index f9efbd292c..692a48082a 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/halloween.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/halloween.ron @@ -5,8 +5,8 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (3, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), - (5, (1, 1, "common.entity.calendar.halloween.aggressive.trickster")), + (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), + (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, calendar_events: Some([Halloween]), diff --git a/common/src/comp/agent.rs b/common/src/comp/agent.rs index eeaa00d340..65d000d25a 100644 --- a/common/src/comp/agent.rs +++ b/common/src/comp/agent.rs @@ -228,8 +228,7 @@ impl<'a> From<&'a Body> for Psyche { humanoid::Species::Elf => 0.4, humanoid::Species::Human => 0.4, humanoid::Species::Orc => 0.3, - // set back to 0.3 after halloween event - humanoid::Species::Draugr => 1.0, + humanoid::Species::Draugr => 0.3, }, Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species { quadruped_small::Species::Pig => 0.5,