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 'pyrotechnics' into 'master'

Browse Source 
add fireworks and bombs back to chests, sahagin tier and above

See merge request veloren/veloren!4413
This commit is contained in:
crabman 2024-04-04 11:14:42 +00:00
commit e6e8b246b0
8 changed files with 105 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ### Changed
- Fireworks and bombs are (again) available from chests (Sahagin and above).
### Removed ### Removed
### Fixed ### Fixed

9
assets/common/loot_tables/consumables/pyrotechnics.ron Normal file
View File

@ -0,0 +1,9 @@
[
(0.4, Item("common.items.utility.bomb")),
(0.1, MultiDrop(Item("common.items.utility.firework_yellow"), 1, 3)),
(0.1, MultiDrop(Item("common.items.utility.firework_red"), 1, 3)),
(0.1, MultiDrop(Item("common.items.utility.firework_green"), 1, 3)),
(0.1, MultiDrop(Item("common.items.utility.firework_blue"), 1, 3)),
(0.1, MultiDrop(Item("common.items.utility.firework_purple"), 1, 3)),
(0.1, MultiDrop(Item("common.items.utility.firework_white"), 1, 3)),
]

28
assets/common/loot_tables/dungeon/cultist/chest.ron
View File

@ -1,12 +1,20 @@
[ [
// Gear (1.0, All([
(0.25, LootTable("common.loot_tables.weapons.cultist")), Lottery([
(0.25, LootTable("common.loot_tables.armor.cultist")), // Gear
// Currency (0.25, LootTable("common.loot_tables.weapons.cultist")),
(3.0, MultiDrop(Item("common.items.utility.coins"), 1000, 2000)), (0.25, LootTable("common.loot_tables.armor.cultist")),
// Consumables // Currency
(2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 4, 8)), (3.0, MultiDrop(Item("common.items.utility.coins"), 1000, 2000)),
(0.1, MultiDrop(Item("common.items.food.spore_corruption"), 1, 3)), // Consumables
// Food (2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 4, 8)),
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 3, 6)), (0.1, MultiDrop(Item("common.items.food.spore_corruption"), 1, 3)),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 3, 6)),
]),
Lottery([
(0.6, Nothing),
(0.4, LootTable("common.loot_tables.consumables.pyrotechnics")),
])
])),
] ]

28
assets/common/loot_tables/dungeon/haniwa/chest.ron
View File

@ -1,12 +1,20 @@
[ [
// Gear (1.0, All([
(0.5, LootTable("common.loot_tables.weapons.components.tier-3")), Lottery([
(0.25, LootTable("common.loot_tables.weapons.tier-3")), // Gear
(0.25, LootTable("common.loot_tables.armor.tier-3")), (0.5, LootTable("common.loot_tables.weapons.components.tier-3")),
// Currency (0.25, LootTable("common.loot_tables.weapons.tier-3")),
(3.0, MultiDrop(Item("common.items.utility.coins"), 250, 500)), (0.25, LootTable("common.loot_tables.armor.tier-3")),
// Consumables // Currency
(2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), (3.0, MultiDrop(Item("common.items.utility.coins"), 250, 500)),
// Food // Consumables
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)), (2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 4)),
]),
Lottery([
(0.7, Nothing),
(0.3, LootTable("common.loot_tables.consumables.pyrotechnics")),
])
])),
] ]

30
assets/common/loot_tables/dungeon/myrmidon/chest.ron
View File

@ -1,13 +1,21 @@
[ [
// Gear (1.0, All([
(0.5, LootTable("common.loot_tables.weapons.components.tier-4")), Lottery([
(0.25, LootTable("common.loot_tables.weapons.tier-4")), // Gear
(0.25, LootTable("common.loot_tables.armor.tier-4")), (0.5, LootTable("common.loot_tables.weapons.components.tier-4")),
(0.1, Item("common.items.armor.misc.head.spikeguard")), (0.25, LootTable("common.loot_tables.weapons.tier-4")),
// Currency (0.25, LootTable("common.loot_tables.armor.tier-4")),
(3.0, MultiDrop(Item("common.items.utility.coins"), 500, 1000)), (0.1, Item("common.items.armor.misc.head.spikeguard")),
// Consumables // Currency
(2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 4, 8)), (3.0, MultiDrop(Item("common.items.utility.coins"), 500, 1000)),
// Food // Consumables
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 5)), (2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 4, 8)),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 2, 5)),
]),
Lottery([
(0.6, Nothing),
(0.4, LootTable("common.loot_tables.consumables.pyrotechnics")),
])
])),
] ]

28
assets/common/loot_tables/dungeon/sahagin/chest.ron
View File

@ -1,12 +1,20 @@
[ [
// Gear (1.0, All([
(0.5, LootTable("common.loot_tables.weapons.components.tier-2")), Lottery([
(0.25, LootTable("common.loot_tables.weapons.tier-2")), // Gear
(0.25, LootTable("common.loot_tables.armor.tier-2")), (0.5, LootTable("common.loot_tables.weapons.components.tier-2")),
// Currency (0.25, LootTable("common.loot_tables.weapons.tier-2")),
(3.0, MultiDrop(Item("common.items.utility.coins"), 100, 250)), (0.25, LootTable("common.loot_tables.armor.tier-2")),
// Consumables // Currency
(2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)), (3.0, MultiDrop(Item("common.items.utility.coins"), 100, 250)),
// Food // Consumables
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 4)), (2.0, MultiDrop(Item("common.items.consumable.potion_minor"), 2, 5)),
// Food
(1.0, MultiDrop(LootTable("common.loot_tables.food.prepared"), 1, 4)),
]),
Lottery([
(0.8, Nothing),
(0.2, LootTable("common.loot_tables.consumables.pyrotechnics")),
])
])),
] ]

16
assets/common/loot_tables/dungeon/sea_chapel/chest_coral.ron
View File

@ -1,5 +1,13 @@
[ [
// Ingredients (1.0, All([
(2.0, Item("common.items.crafting_ing.coral_branch")), Lottery([
(0.5, Item("common.items.crafting_ing.pearl")), // Ingredients
] (2.0, Item("common.items.crafting_ing.coral_branch")),
(0.5, Item("common.items.crafting_ing.pearl")),
]),
Lottery([
(0.6, Nothing),
(0.4, LootTable("common.loot_tables.consumables.pyrotechnics")),
])
])),
]

12
assets/common/loot_tables/dungeon/terracotta/chest_terracotta.ron
View File

@ -1,4 +1,10 @@
[ [
// Key (1.0, All([
(1.0, Item("common.items.keys.terracotta_key_door")), // Key
] Item("common.items.keys.terracotta_key_door"),
Lottery([
(0.4, Nothing),
(0.6, LootTable("common.loot_tables.consumables.pyrotechnics")),
]),
])),
]