diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ab31a2955..7d4304c542 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed - Medium and large potions from all loot tables - LoD pop-in effect +- Removed Dullahans from halloween event ### Fixed - Fixed wild roaming cyclop loot table to not drop the quarry key diff --git a/assets/common/entity/calendar/halloween/aggressive/halloween_dullahan.ron b/assets/common/entity/calendar/halloween/aggressive/halloween_dullahan.ron deleted file mode 100644 index 41f19ca040..0000000000 --- a/assets/common/entity/calendar/halloween/aggressive/halloween_dullahan.ron +++ /dev/null @@ -1,11 +0,0 @@ -#![enable(implicit_some)] -( - name: Name("Dullahan"), - body: RandomWith("dullahan"), - alignment: Alignment(Enemy), - loot: LootTable("common.loot_tables.calendar.halloween.halloween_dullahan"), - inventory: ( - loadout: FromBody, - ), - meta: [], -) \ No newline at end of file diff --git a/assets/common/loot_tables/calendar/halloween/halloween_dullahan.ron b/assets/common/loot_tables/calendar/halloween/halloween_dullahan.ron deleted file mode 100644 index c5bef9a83c..0000000000 --- a/assets/common/loot_tables/calendar/halloween/halloween_dullahan.ron +++ /dev/null @@ -1,4 +0,0 @@ -[ - (1.0, Item("common.items.food.pumpkin_spice_brew")), - (5.0, Item("common.items.food.honeycorn")), -] \ No newline at end of file diff --git a/assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron b/assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron index b82d7ed5f2..af554d35c0 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron @@ -5,9 +5,8 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), - (3, (4, 8, "common.entity.wild.aggressive.bat")), - (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), + (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, calendar_events: Some([Halloween]), diff --git a/assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron b/assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron index db63258a74..1dd4efd1e5 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron @@ -5,9 +5,8 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), - (3, (4, 8, "common.entity.wild.aggressive.bat")), - (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), + (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, calendar_events: Some([Halloween]), diff --git a/assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron b/assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron index 717010c3f0..95b857dd62 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron @@ -5,9 +5,8 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), - (3, (4, 8, "common.entity.wild.aggressive.bat")), - (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), + (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, calendar_events: Some([Halloween]), diff --git a/assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron b/assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron index 57bcb07c71..25b79d28fb 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron @@ -5,9 +5,8 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), - (3, (4, 8, "common.entity.wild.aggressive.bat")), - (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), + (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, calendar_events: Some([Halloween]), diff --git a/assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron b/assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron index 8f1a0ee81a..2c0af0bdb6 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron @@ -5,9 +5,8 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), - (3, (4, 8, "common.entity.wild.aggressive.bat")), - (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), + (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, calendar_events: Some([Halloween]), diff --git a/assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron b/assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron index 3cfd48d565..6a2415cf2e 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron @@ -5,9 +5,8 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), - (3, (4, 8, "common.entity.wild.aggressive.bat")), - (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), + (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, calendar_events: Some([Halloween]), diff --git a/assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron b/assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron index dc1b2abbfc..a0da91abe7 100644 --- a/assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron +++ b/assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron @@ -5,9 +5,8 @@ SpawnEntry ( Pack( groups: [ (1, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_harvester")), - (2, (1, 1, "common.entity.calendar.halloween.aggressive.halloween_dullahan")), - (3, (4, 8, "common.entity.wild.aggressive.bat")), - (3, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), + (4, (4, 8, "common.entity.wild.aggressive.bat")), + (4, (3, 6, "common.entity.calendar.halloween.aggressive.trickster")), ], spawn_mode: Land, calendar_events: Some([Halloween]),