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

Merge branch 'crabman/remove-halloween-dullahans' into 'master'

Browse Source 
Remove halloween dullahans

See merge request veloren/veloren!4157
This commit is contained in:
Dominik Broński 2023-10-24 17:12:19 +00:00
commit 8ff825e8d9
10 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -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

11
assets/common/entity/calendar/halloween/aggressive/halloween_dullahan.ron
View File

@ -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: [],
)

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

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

5
assets/world/wildlife/spawn/calendar/halloween/jungle/area.ron
View File

@ -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]),

5
assets/world/wildlife/spawn/calendar/halloween/taiga/core.ron
View File

@ -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]),

5
assets/world/wildlife/spawn/calendar/halloween/temperate/rainforest.ron
View File

@ -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]),

5
assets/world/wildlife/spawn/calendar/halloween/tropical/rainforest.ron
View File

@ -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]),

5
assets/world/wildlife/spawn/calendar/halloween/tundra/core.ron
View File

@ -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]),

5
assets/world/wildlife/spawn/calendar/halloween/tundra/forest.ron
View File

@ -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]),

5
assets/world/wildlife/spawn/calendar/halloween/tundra/snow.ron
View File

@ -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]),