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

Repalced stone golems with 10 husks in T5 dungeon miniboss rooms.

Browse Source
This commit is contained in:
Sam 2021-03-27 18:11:06 -04:00
parent 345ef1ca22
commit 0e3b0a9ee7
3 changed files with 25 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -17,12 +17,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Admin designated build areas - Admin designated build areas
### Changed ### Changed
- Diamonds are now much more than twice as expensive as twigs.
- Admins can now grant normal players plots to place blocks within - Admins can now grant normal players plots to place blocks within
- Diamonds are now much more than twice as expensive as twigs.
- Permission to build is no longer tied to being an admin
- Seperated character randomization buttons into appearance and name. - Seperated character randomization buttons into appearance and name.
- Reworked mindflayer to have unique attacks - Reworked mindflayer to have unique attacks
### Removed ### Removed

8
common/src/comp/body.rs
View File

@ -541,10 +541,10 @@ impl Body {
/// due to AI or not using an actual weapon /// due to AI or not using an actual weapon
// TODO: Match on species // TODO: Match on species
pub fn combat_multiplier(&self) -> f32 { pub fn combat_multiplier(&self) -> f32 {
if let Body::Object(_) | Body::Ship(_) = self { match self {
0.0 Body::Object(_) | Body::Ship(_) => 0.0,
} else { Body::BipedLarge(b) if matches!(b.species, biped_large::Species::Mindflayer) => 4.0,
1.0 _ => 1.0,
} }
} }

74
world/src/site/dungeon/mod.rs
View File

@ -1010,7 +1010,9 @@ impl Floor {
)); ));
3 3
], ],
2 => vec![ 2 => {
let mut entities = Vec::new();
entities.resize_with(6, || {
EntityInfo::at(tile_wcenter.map(|e| e as f32)) EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_body(comp::Body::QuadrupedLow( .with_body(comp::Body::QuadrupedLow(
comp::quadruped_low::Body::random_with( comp::quadruped_low::Body::random_with(
@ -1019,53 +1021,10 @@ impl Floor {
), ),
)) ))
.with_name("Hakulaq".to_string()) .with_name("Hakulaq".to_string())
.with_loot_drop(comp::Item::new_from_asset_expect(chosen)), .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
EntityInfo::at(tile_wcenter.map(|e| e as f32)) });
.with_body(comp::Body::QuadrupedLow( entities
comp::quadruped_low::Body::random_with( },
dynamic_rng,
&comp::quadruped_low::Species::Hakulaq,
),
))
.with_name("Hakulaq".to_string())
.with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
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(comp::Item::new_from_asset_expect(chosen)),
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(comp::Item::new_from_asset_expect(chosen)),
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(comp::Item::new_from_asset_expect(chosen)),
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(comp::Item::new_from_asset_expect(chosen)),
],
3 => vec![ 3 => vec![
EntityInfo::at(tile_wcenter.map(|e| e as f32)) EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_body(comp::Body::Humanoid( .with_body(comp::Body::Humanoid(
@ -1118,17 +1077,22 @@ impl Floor {
.with_name("Dullahan Guard".to_string()) .with_name("Dullahan Guard".to_string())
.with_loot_drop(comp::Item::new_from_asset_expect(chosen)), .with_loot_drop(comp::Item::new_from_asset_expect(chosen)),
], ],
5 => vec![ 5 => {
let mut entities = Vec::new();
entities.resize_with(10, || {
EntityInfo::at(tile_wcenter.map(|e| e as f32)) EntityInfo::at(tile_wcenter.map(|e| e as f32))
.with_body(comp::Body::Golem( .with_body(comp::Body::BipedSmall(
comp::golem::Body::random_with( comp::biped_small::Body::random_with(
dynamic_rng, dynamic_rng,
&comp::golem::Species::StoneGolem, &comp::biped_small::Species::Husk,
), ),
)) ))
.with_name("Stonework Defender".to_string()) .with_name("Cultist Husk".to_string())
.with_loot_drop(comp::Item::new_from_asset_expect(chosen)), .with_loot_drop(comp::Item::new_from_asset_expect(chosen))
], .with_loadout_config(loadout_builder::LoadoutConfig::Husk)
});
entities
},
_ => { _ => {
vec![EntityInfo::at(tile_wcenter.map(|e| e as f32)).with_body( vec![EntityInfo::at(tile_wcenter.map(|e| e as f32)).with_body(
comp::Body::QuadrupedSmall( comp::Body::QuadrupedSmall(