mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Miniboss Loot quickfix
This commit is contained in:
Illia Denysenko
Samuel Keiffer
parent
7ee2d9dfa3
commit
cb2412148b
@ -97,6 +97,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
- Reworked minotaur to have unique attacks.
|
- Reworked minotaur to have unique attacks.
|
||||||
- Wiring is now turing complete
|
- Wiring is now turing complete
|
||||||
- Better active/inactive master sound slider logic
|
- Better active/inactive master sound slider logic
|
||||||
|
- Cultist Husk no longer drops weapons and armor
|
||||||
|
- Animal Trainers now spawn in tier-5 dungeon and not in tier-3
|
||||||
|
|
||||||
### Removed
|
### Removed
|
||||||
|
|
||||||
|
|||||||
10
assets/common/loot_tables/dungeon/tier-4/miniboss.ron
Normal file
10
assets/common/loot_tables/dungeon/tier-4/miniboss.ron
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
[
|
||||||
|
// armor
|
||||||
|
(6.0, LootTable("common.loot_tables.armor.steel")),
|
||||||
|
// weapons
|
||||||
|
(3.0, LootTable("common.loot_tables.weapons.tier-4")),
|
||||||
|
// lantern
|
||||||
|
(0.05, Item("common.items.lantern.blue_0")),
|
||||||
|
// materials
|
||||||
|
(1.0, LootTable("common.loot_tables.materials.underground")),
|
||||||
|
]
|
||||||
@ -1,4 +1,4 @@
|
|||||||
[
|
[
|
||||||
(1.0, LootTable("common.loot_tables.creature.biped_large.mindflayer")),
|
(1.0, LootTable("common.loot_tables.creature.biped_large.mindflayer")),
|
||||||
(3.0, LootTable("common.loot_tables.miniboss")),
|
(3.0, LootTable("common.loot_tables.dungeon.tier-5.miniboss")),
|
||||||
]
|
]
|
||||||
@ -4,5 +4,6 @@
|
|||||||
(1.0, Item("common.items.armor.misc.back.dungeon_purple")),
|
(1.0, Item("common.items.armor.misc.back.dungeon_purple")),
|
||||||
(1.0, Item("common.items.armor.misc.ring.skull")),
|
(1.0, Item("common.items.armor.misc.ring.skull")),
|
||||||
// weapons
|
// weapons
|
||||||
(3.0, LootTable("common.loot_tables.weapons.cultist")),
|
(1.5, LootTable("common.loot_tables.weapons.cultist")),
|
||||||
|
(1.5, LootTable("common.loot_tables.weapons.cave")),
|
||||||
]
|
]
|
||||||
9
assets/common/loot_tables/dungeon/tier-5/minion.ron
Normal file
9
assets/common/loot_tables/dungeon/tier-5/minion.ron
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
[
|
||||||
|
// Crafting Ingredients
|
||||||
|
(3.0, LootTable("common.loot_tables.materials.common")),
|
||||||
|
// Food
|
||||||
|
(3.0, LootTable("common.loot_tables.food.wild_ingredients")),
|
||||||
|
(0.5, LootTable("common.loot_tables.food.prepared")),
|
||||||
|
// Consumables
|
||||||
|
(0.5, LootTable("common.loot_tables.consumables")),
|
||||||
|
]
|
||||||
@ -939,171 +939,17 @@ impl Floor {
|
|||||||
miniboss_spawn_tile + if miniboss_tile_is_pillar { 1 } else { 0 };
|
miniboss_spawn_tile + if miniboss_tile_is_pillar { 1 } else { 0 };
|
||||||
|
|
||||||
if tile_pos == miniboss_spawn_tile && tile_wcenter.xy() == wpos2d {
|
if tile_pos == miniboss_spawn_tile && tile_wcenter.xy() == wpos2d {
|
||||||
let chosen = match room.difficulty {
|
let entities = match room.difficulty {
|
||||||
0 => Lottery::<LootSpec>::load_expect(
|
0 => mini_boss_0(dynamic_rng, tile_wcenter),
|
||||||
"common.loot_tables.weapons.tier-0",
|
1 => mini_boss_1(dynamic_rng, tile_wcenter),
|
||||||
),
|
2 => mini_boss_2(dynamic_rng, tile_wcenter),
|
||||||
1 => Lottery::<LootSpec>::load_expect(
|
3 => mini_boss_3(dynamic_rng, tile_wcenter),
|
||||||
"common.loot_tables.weapons.tier-1",
|
4 => mini_boss_4(dynamic_rng, tile_wcenter),
|
||||||
),
|
5 => mini_boss_5(dynamic_rng, tile_wcenter),
|
||||||
2 => Lottery::<LootSpec>::load_expect(
|
_ => mini_boss_fallback(dynamic_rng, tile_wcenter),
|
||||||
"common.loot_tables.weapons.tier-2",
|
|
||||||
),
|
|
||||||
3 => Lottery::<LootSpec>::load_expect(
|
|
||||||
"common.loot_tables.weapons.tier-3",
|
|
||||||
),
|
|
||||||
4 => Lottery::<LootSpec>::load_expect(
|
|
||||||
"common.loot_tables.weapons.tier-4",
|
|
||||||
),
|
|
||||||
5 => {
|
|
||||||
Lottery::<LootSpec>::load_expect("common.loot_tables.cultists")
|
|
||||||
},
|
|
||||||
_ => {
|
|
||||||
Lottery::<LootSpec>::load_expect("common.loot_tables.fallback")
|
|
||||||
},
|
|
||||||
};
|
|
||||||
let entity = match room.difficulty {
|
|
||||||
0 => {
|
|
||||||
vec![
|
|
||||||
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
|
||||||
.with_body(comp::Body::QuadrupedMedium(
|
|
||||||
comp::quadruped_medium::Body::random_with(
|
|
||||||
dynamic_rng,
|
|
||||||
&comp::quadruped_medium::Species::Bonerattler,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
.with_name("Bonerattler".to_string())
|
|
||||||
.with_loot_drop(chosen.read().choose().to_item()),
|
|
||||||
]
|
|
||||||
},
|
|
||||||
1 => {
|
|
||||||
vec![
|
|
||||||
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
|
||||||
.with_body(comp::Body::QuadrupedMedium(
|
|
||||||
comp::quadruped_medium::Body::random_with(
|
|
||||||
dynamic_rng,
|
|
||||||
&comp::quadruped_medium::Species::Bonerattler,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
.with_name("Bonerattler".to_string())
|
|
||||||
.with_loot_drop(chosen.read().choose().to_item());
|
|
||||||
3
|
|
||||||
]
|
|
||||||
},
|
|
||||||
2 => {
|
|
||||||
let mut entities = Vec::new();
|
|
||||||
entities.resize_with(6, || {
|
|
||||||
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
|
||||||
.with_body(comp::Body::QuadrupedLow(
|
|
||||||
comp::quadruped_low::Body::random_with(
|
|
||||||
dynamic_rng,
|
|
||||||
&comp::quadruped_low::Species::Hakulaq,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
.with_name("Hakulaq".to_string())
|
|
||||||
.with_loot_drop(chosen.read().choose().to_item())
|
|
||||||
});
|
|
||||||
entities
|
|
||||||
},
|
|
||||||
3 => {
|
|
||||||
let mut entities = Vec::new();
|
|
||||||
entities.resize_with(6, || {
|
|
||||||
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
|
||||||
.with_body(comp::Body::QuadrupedLow(
|
|
||||||
comp::quadruped_low::Body::random_with(
|
|
||||||
dynamic_rng,
|
|
||||||
&comp::quadruped_low::Species::Hakulaq,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
.with_name("Hakulaq".to_string())
|
|
||||||
.with_loot_drop(chosen.read().choose().to_item())
|
|
||||||
});
|
|
||||||
entities
|
|
||||||
},
|
|
||||||
4 => {
|
|
||||||
vec![
|
|
||||||
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
|
||||||
.with_body(comp::Body::BipedLarge(
|
|
||||||
comp::biped_large::Body::random_with(
|
|
||||||
dynamic_rng,
|
|
||||||
&comp::biped_large::Species::Dullahan,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
.with_name("Dullahan Guard".to_string())
|
|
||||||
.with_loot_drop(chosen.read().choose().to_item()),
|
|
||||||
]
|
|
||||||
},
|
|
||||||
5 => {
|
|
||||||
let mut entities = Vec::new();
|
|
||||||
match dynamic_rng.gen_range(0..2) {
|
|
||||||
0 => {
|
|
||||||
entities.push(
|
|
||||||
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
|
||||||
.with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
|
|
||||||
.with_name("Animal Trainer".to_string())
|
|
||||||
.with_loot_drop(chosen.read().choose().to_item())
|
|
||||||
.with_loadout_config(loadout_builder::LoadoutConfig::CultistAcolyte)
|
|
||||||
.with_skillset_config(
|
|
||||||
common::skillset_builder::SkillSetConfig::CultistAcolyte
|
|
||||||
)
|
|
||||||
.with_main_tool(comp::Item::new_from_asset_expect(
|
|
||||||
match dynamic_rng.gen_range(0..6) {
|
|
||||||
0 => "common.items.weapons.axe.malachite_axe-0",
|
|
||||||
1..=2 => "common.items.weapons.sword.cultist",
|
|
||||||
3 => {
|
|
||||||
"common.items.weapons.hammer.cultist_purp_2h-0"
|
|
||||||
},
|
|
||||||
4 => "common.items.weapons.staff.cultist_staff",
|
|
||||||
_ => "common.items.weapons.bow.bone-1",
|
|
||||||
},
|
|
||||||
)),
|
|
||||||
);
|
|
||||||
entities.resize_with(entities.len() + 2, || {
|
|
||||||
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
|
||||||
.with_body(comp::Body::QuadrupedMedium(
|
|
||||||
comp::quadruped_medium::Body::random_with(
|
|
||||||
dynamic_rng,
|
|
||||||
&comp::quadruped_medium::Species::Darkhound,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
.with_name("Tamed Darkhound".to_string())
|
|
||||||
.with_loot_drop(chosen.read().choose().to_item())
|
|
||||||
});
|
|
||||||
},
|
|
||||||
_ => {
|
|
||||||
entities.resize_with(10, || {
|
|
||||||
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
|
||||||
.with_body(comp::Body::BipedSmall(
|
|
||||||
comp::biped_small::Body::random_with(
|
|
||||||
dynamic_rng,
|
|
||||||
&comp::biped_small::Species::Husk,
|
|
||||||
),
|
|
||||||
))
|
|
||||||
.with_name("Cultist Husk".to_string())
|
|
||||||
.with_loot_drop(
|
|
||||||
chosen.read().choose().to_item(),
|
|
||||||
)
|
|
||||||
.with_loadout_config(
|
|
||||||
loadout_builder::LoadoutConfig::Husk,
|
|
||||||
)
|
|
||||||
});
|
|
||||||
},
|
|
||||||
}
|
|
||||||
entities
|
|
||||||
},
|
|
||||||
_ => {
|
|
||||||
vec![EntityInfo::at(tile_wcenter.map(|e| e as f32)).with_body(
|
|
||||||
comp::Body::QuadrupedSmall(
|
|
||||||
comp::quadruped_small::Body::random_with(
|
|
||||||
dynamic_rng,
|
|
||||||
&comp::quadruped_small::Species::Sheep,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)]
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
|
|
||||||
for entity in entity {
|
for entity in entities {
|
||||||
supplement.add_entity(
|
supplement.add_entity(
|
||||||
entity
|
entity
|
||||||
.with_level(
|
.with_level(
|
||||||
@ -1367,3 +1213,169 @@ impl Floor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn mini_boss_0(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
|
||||||
|
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.weapons.tier-0");
|
||||||
|
vec![
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
||||||
|
.with_body(comp::Body::QuadrupedMedium(
|
||||||
|
comp::quadruped_medium::Body::random_with(
|
||||||
|
dynamic_rng,
|
||||||
|
&comp::quadruped_medium::Species::Bonerattler,
|
||||||
|
),
|
||||||
|
))
|
||||||
|
.with_name("Bonerattler".to_string())
|
||||||
|
.with_loot_drop(chosen.read().choose().to_item()),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mini_boss_1(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
|
||||||
|
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.weapons.tier-1");
|
||||||
|
vec![
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
||||||
|
.with_body(comp::Body::QuadrupedMedium(
|
||||||
|
comp::quadruped_medium::Body::random_with(
|
||||||
|
dynamic_rng,
|
||||||
|
&comp::quadruped_medium::Species::Bonerattler,
|
||||||
|
),
|
||||||
|
))
|
||||||
|
.with_name("Bonerattler".to_string())
|
||||||
|
.with_loot_drop(chosen.read().choose().to_item());
|
||||||
|
3
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mini_boss_2(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
|
||||||
|
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.weapons.tier-2");
|
||||||
|
let mut entities = Vec::new();
|
||||||
|
entities.resize_with(6, || {
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
||||||
|
.with_body(comp::Body::QuadrupedLow(
|
||||||
|
comp::quadruped_low::Body::random_with(
|
||||||
|
dynamic_rng,
|
||||||
|
&comp::quadruped_low::Species::Hakulaq,
|
||||||
|
),
|
||||||
|
))
|
||||||
|
.with_name("Hakulaq".to_string())
|
||||||
|
.with_loot_drop(chosen.read().choose().to_item())
|
||||||
|
});
|
||||||
|
entities
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mini_boss_3(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
|
||||||
|
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.weapons.tier-3");
|
||||||
|
let mut entities = Vec::new();
|
||||||
|
entities.resize_with(6, || {
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
||||||
|
.with_body(comp::Body::QuadrupedLow(
|
||||||
|
comp::quadruped_low::Body::random_with(
|
||||||
|
dynamic_rng,
|
||||||
|
&comp::quadruped_low::Species::Hakulaq,
|
||||||
|
),
|
||||||
|
))
|
||||||
|
.with_name("Hakulaq".to_string())
|
||||||
|
.with_loot_drop(chosen.read().choose().to_item())
|
||||||
|
});
|
||||||
|
entities
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mini_boss_4(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
|
||||||
|
let chosen = Lottery::<LootSpec>::load_expect("common.loot_tables.dungeon.tier-4.miniboss");
|
||||||
|
vec![
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
||||||
|
.with_body(comp::Body::BipedLarge(
|
||||||
|
comp::biped_large::Body::random_with(
|
||||||
|
dynamic_rng,
|
||||||
|
&comp::biped_large::Species::Dullahan,
|
||||||
|
),
|
||||||
|
))
|
||||||
|
.with_name("Dullahan Guard".to_string())
|
||||||
|
.with_loot_drop(chosen.read().choose().to_item()),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mini_boss_5(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
|
||||||
|
let mut entities = Vec::new();
|
||||||
|
match dynamic_rng.gen_range(0..2) {
|
||||||
|
0 => {
|
||||||
|
let trainer_loot =
|
||||||
|
Lottery::<LootSpec>::load_expect("common.loot_tables.dungeon.tier-5.miniboss");
|
||||||
|
let hound_loot =
|
||||||
|
Lottery::<LootSpec>::load_expect("common.loot_tables.dungeon.tier-5.minion");
|
||||||
|
entities.push(
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
||||||
|
.with_body(comp::Body::Humanoid(comp::humanoid::Body::random()))
|
||||||
|
.with_name("Animal Trainer".to_string())
|
||||||
|
.with_loot_drop(trainer_loot.read().choose().to_item())
|
||||||
|
.with_loadout_config(loadout_builder::LoadoutConfig::CultistAcolyte)
|
||||||
|
.with_skillset_config(common::skillset_builder::SkillSetConfig::CultistAcolyte)
|
||||||
|
.with_main_tool(comp::Item::new_from_asset_expect(
|
||||||
|
match dynamic_rng.gen_range(0..6) {
|
||||||
|
0 => "common.items.weapons.axe.malachite_axe-0",
|
||||||
|
1..=2 => "common.items.weapons.sword.cultist",
|
||||||
|
3 => "common.items.weapons.hammer.cultist_purp_2h-0",
|
||||||
|
4 => "common.items.weapons.staff.cultist_staff",
|
||||||
|
_ => "common.items.weapons.bow.velorite",
|
||||||
|
},
|
||||||
|
)),
|
||||||
|
);
|
||||||
|
entities.resize_with(entities.len() + 2, || {
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
||||||
|
.with_body(comp::Body::QuadrupedMedium(
|
||||||
|
comp::quadruped_medium::Body::random_with(
|
||||||
|
dynamic_rng,
|
||||||
|
&comp::quadruped_medium::Species::Darkhound,
|
||||||
|
),
|
||||||
|
))
|
||||||
|
.with_name("Tamed Darkhound".to_string())
|
||||||
|
.with_loot_drop(hound_loot.read().choose().to_item())
|
||||||
|
});
|
||||||
|
},
|
||||||
|
_ => {
|
||||||
|
let chosen =
|
||||||
|
Lottery::<LootSpec>::load_expect("common.loot_tables.dungeon.tier-5.minion");
|
||||||
|
entities.resize_with(10, || {
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32))
|
||||||
|
.with_body(comp::Body::BipedSmall(
|
||||||
|
comp::biped_small::Body::random_with(
|
||||||
|
dynamic_rng,
|
||||||
|
&comp::biped_small::Species::Husk,
|
||||||
|
),
|
||||||
|
))
|
||||||
|
.with_name("Cultist Husk".to_string())
|
||||||
|
.with_loot_drop(chosen.read().choose().to_item())
|
||||||
|
.with_loadout_config(loadout_builder::LoadoutConfig::Husk)
|
||||||
|
});
|
||||||
|
},
|
||||||
|
}
|
||||||
|
entities
|
||||||
|
}
|
||||||
|
|
||||||
|
fn mini_boss_fallback(dynamic_rng: &mut impl Rng, tile_wcenter: Vec3<i32>) -> Vec<EntityInfo> {
|
||||||
|
vec![
|
||||||
|
EntityInfo::at(tile_wcenter.map(|e| e as f32)).with_body(comp::Body::QuadrupedSmall(
|
||||||
|
comp::quadruped_small::Body::random_with(
|
||||||
|
dynamic_rng,
|
||||||
|
&comp::quadruped_small::Species::Sheep,
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_creating_minibosses() {
|
||||||
|
let mut dynamic_rng = rand::thread_rng();
|
||||||
|
let tile_wcenter = Vec3::new(0, 0, 0);
|
||||||
|
mini_boss_0(&mut dynamic_rng, tile_wcenter);
|
||||||
|
mini_boss_1(&mut dynamic_rng, tile_wcenter);
|
||||||
|
mini_boss_2(&mut dynamic_rng, tile_wcenter);
|
||||||
|
mini_boss_3(&mut dynamic_rng, tile_wcenter);
|
||||||
|
mini_boss_4(&mut dynamic_rng, tile_wcenter);
|
||||||
|
mini_boss_5(&mut dynamic_rng, tile_wcenter);
|
||||||
|
mini_boss_fallback(&mut dynamic_rng, tile_wcenter);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user