wickedwaifus/wicked-waifus-rs
3
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Introduce automatic concomitants, buffs + a little bit more #6

Closed
RabbyDevs wants to merge 8 commits from (deleted):master into master
pull from: (deleted):master
merge into: wickedwaifus:master
Conversation 3 Commits 8 Files changed 15 +6 -1
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit ffeda38057 - Show all commits

7
wicked-waifus-game-server/src/logic/utils/world_util.rs
View file

@ -9,7 +9,7 @@ use wicked_waifus_data::{
blueprint_config_data, template_config_data, EntityLogic, EntityType, LevelEntityConfigData, blueprint_config_data, template_config_data, EntityLogic, EntityType, LevelEntityConfigData,
}; };
use crate::logic::components::{Autonomous, Fsm, Interact, MonsterAi, SoarWingSkin, StateTag, Summoner, Tag}; use crate::logic::components::{Autonomous, Concomitant, Fsm, Interact, MonsterAi, SoarWingSkin, StateTag, Summoner, Tag};
use crate::logic::ecs::entity::EntityBuilder; use crate::logic::ecs::entity::EntityBuilder;
use crate::logic::ecs::world::World; use crate::logic::ecs::world::World;
use crate::logic::math::Transform; use crate::logic::math::Transform;
@ -387,6 +387,11 @@ pub fn add_entities(player: &Player, entities: &[&LevelEntityConfigData], extern
.with(ComponentContainer::Autonomous(Autonomous { autonomous_id: player.basic_info.id })) .with(ComponentContainer::Autonomous(Autonomous { autonomous_id: player.basic_info.id }))
.with(ComponentContainer::Visibility(Visibility { is_visible: false, is_actor_visible: true })) .with(ComponentContainer::Visibility(Visibility { is_visible: false, is_actor_visible: true }))
.with(ComponentContainer::Position(Position(player.location.position.clone()))) .with(ComponentContainer::Position(Position(player.location.position.clone())))
.with(ComponentContainer::Concomitant(Concomitant {
vision_entity_id: 0,
custom_entity_ids: vec![template_config.id as i64],
phantom_role_id: 0,
}))
// .with(ComponentContainer::Attribute(Attribute { attr_map: template_config.components_data.attribute_component.unwrap(), hardness_mode_id: (), rage_mode_id: () })) // .with(ComponentContainer::Attribute(Attribute { attr_map: template_config.components_data.attribute_component.unwrap(), hardness_mode_id: (), rage_mode_id: () }))
// .with(ComponentContainer::Fsm(Fsm { hash_code: (), common_hash_code: (), state_list: (), node_list: () })) // .with(ComponentContainer::Fsm(Fsm { hash_code: (), common_hash_code: (), state_list: (), node_list: () }))
.build()); .build());