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

- make tricksters spawn in groups and play instruments

Browse Source 
- remove defunct draugr flee
This commit is contained in:
flo666 2022-10-21 09:11:59 +02:00
parent 82026c1acc
commit 79e6fd58fe
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assets/common/entity/calendar/halloween/aggressive/trickster.ron
View File

@ -2,18 +2,21 @@
( (
name: Name("Trickster"), name: Name("Trickster"),
body: RandomWith("draugr"), body: RandomWith("draugr"),
alignment: Alignment(Npc), alignment: Alignment(Enemy),
loot: LootTable("common.loot_tables.calendar.halloween.trickster"), loot: LootTable("common.loot_tables.calendar.halloween.trickster"),
inventory: ( inventory: (
loadout: Inline(( loadout: Inline((
inherit: Asset("common.loadout.calendar.halloween.trickster"), inherit: Asset("common.loadout.calendar.halloween.trickster"),
active_hands: InHands((Choice([ active_hands: InHands((Choice([
(1, Item("common.items.weapons.tool.broom")), (1, Item("common.items.tool.instruments.bass")),
(1, Item("common.items.weapons.tool.hoe")), (1, Item("common.items.tool.instruments.flute")),
(1, Item("common.items.weapons.tool.pickaxe")), (1, Item("common.items.tool.instruments.harp")),
(1, Item("common.items.weapons.tool.rake")), (1, Item("common.items.tool.instruments.kalimba")),
(1, Item("common.items.weapons.tool.shovel-0")), (1, Item("common.items.tool.instruments.sitar")),
(1, Item("common.items.weapons.tool.shovel-1")), (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)), ]), None)),
)), )),
), ),

4
assets/world/wildlife/spawn/calendar/halloween/halloween.ron
View File

@ -5,8 +5,8 @@ SpawnEntry (
Pack( Pack(
groups: [ groups: [
(1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")),
(3, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")),
(5, (1, 1, "common.entity.calendar.halloween.aggressive.trickster")), (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")),
], ],
spawn_mode: Land, spawn_mode: Land,
calendar_events: Some([Halloween]), calendar_events: Some([Halloween]),

3
common/src/comp/agent.rs
View File

@ -228,8 +228,7 @@ impl<'a> From<&'a Body> for Psyche {
humanoid::Species::Elf => 0.4, humanoid::Species::Elf => 0.4,
humanoid::Species::Human => 0.4, humanoid::Species::Human => 0.4,
humanoid::Species::Orc => 0.3, humanoid::Species::Orc => 0.3,
// set back to 0.3 after halloween event humanoid::Species::Draugr => 0.3,
humanoid::Species::Draugr => 1.0,
}, },
Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species { Body::QuadrupedSmall(quadruped_small) => match quadruped_small.species {
quadruped_small::Species::Pig => 0.5, quadruped_small::Species::Pig => 0.5,