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

push patch to allow formation changes at runtime

Browse source
This commit is contained in:
RabbyDevs 2025-05-17 21:50:07 +03:00
parent af681c8f15
commit e5211c759a
3 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
wicked-waifus-game-server/src/logic/handler/attribute.rs
View file

@ -55,6 +55,4 @@ pub fn on_formation_attr_request(
response.error_code = ErrorCode::ErrEntityNotFound.into() response.error_code = ErrorCode::ErrEntityNotFound.into()
}; };
} }
} }

67
wicked-waifus-game-server/src/logic/handler/role.rs
View file

@ -1,7 +1,10 @@
use std::collections::HashSet; use std::collections::HashSet;
use wicked_waifus_protocol::{ use wicked_waifus_protocol::{
ClientCurrentRoleReportRequest, ClientCurrentRoleReportResponse, ERemoveEntityType, ErrorCode, FormationAttrNotify, FormationAttrRequest, FormationAttrResponse, PlayerMotionRequest, PlayerMotionResponse, ProtocolUnit, RoleFavorListRequest, RoleFavorListResponse, RoleShowListUpdateRequest, RoleShowListUpdateResponse, UpdateFormationRequest, UpdateFormationResponse ClientCurrentRoleReportRequest, ClientCurrentRoleReportResponse, ERemoveEntityType, ErrorCode,
FormationAttrRequest, FormationAttrResponse, PlayerMotionRequest, PlayerMotionResponse,
RoleFavorListRequest, RoleFavorListResponse, RoleShowListUpdateRequest,
RoleShowListUpdateResponse, UpdateFormationRequest, UpdateFormationResponse,
}; };
use crate::logic::player::Player; use crate::logic::player::Player;
@ -70,41 +73,41 @@ pub fn on_update_formation_request(
} }
if let Some(old_formation) = player.formation_list.get(&real_formation_id) { if let Some(old_formation) = player.formation_list.get(&real_formation_id) {
let removed_entities: Vec<i64> = old_formation let removed_entities: Vec<i64> = old_formation
.role_ids
.iter()
.map(|&role_id| world.get_entity_id(role_id))
.collect();
removed_entities.iter().for_each(|&entity_id| {
world.remove_entity(entity_id as i32);
});
player.notify(player.build_player_entity_remove_notify(
removed_entities,
ERemoveEntityType::RemoveTypeNormal,
));
}
let added_roles: Vec<Role> = formation
.role_ids .role_ids
.iter() .iter()
.map(|&role_id| Role::new(role_id)) .map(|&role_id| world.get_entity_id(role_id))
.collect(); .collect();
removed_entities.iter().for_each(|&entity_id| {
if !added_roles.is_empty() { world.remove_entity(entity_id as i32);
// add new roles });
player.notify(player.build_player_entity_add_notify(added_roles, world)); player.notify(player.build_player_entity_remove_notify(
} removed_entities,
ERemoveEntityType::RemoveTypeNormal,
// send update group formation notify
player.notify(player.build_update_group_formation_notify(
RoleFormation {
id: formation_id,
cur_role,
role_ids: formation.role_ids.clone(),
is_current,
},
world,
)); ));
}
let added_roles: Vec<Role> = formation
.role_ids
.iter()
.map(|&role_id| Role::new(role_id))
.collect();
if !added_roles.is_empty() {
// add new roles
player.notify(player.build_player_entity_add_notify(added_roles, world));
}
// send update group formation notify
player.notify(player.build_update_group_formation_notify(
RoleFormation {
id: formation_id,
cur_role,
role_ids: formation.role_ids.clone(),
is_current,
},
world,
));
response.formation = Some(formation.clone()); response.formation = Some(formation.clone());
} }

2
wicked-waifus-game-server/src/logic/player/mod.rs
View file

@ -403,7 +403,7 @@ impl Player {
.iter() .iter()
.map(|&role_id| { .map(|&role_id| {
let entity_id = world.get_entity_id(role_id); let entity_id = world.get_entity_id(role_id);
let role_skin = let _role_skin =
query_components!(world, entity_id, RoleSkin).0.unwrap(); query_components!(world, entity_id, RoleSkin).0.unwrap();
FightRoleInfo { FightRoleInfo {
role_id, role_id,