redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-04-21 15:07:45 +00:00
Code Activity

Apply the actual applied damage from the action script

Browse source
This commit is contained in:
Joshua Goins 2025-03-30 09:44:37 -04:00
parent 0b1a67fc9c
commit 3d128c8fab
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/bin/kawari-world.rs
View file

@ -2,10 +2,7 @@ use std::collections::HashMap;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use kawari::common::custom_ipc::{CustomIpcData, CustomIpcSegment, CustomIpcType}; use kawari::common::custom_ipc::{CustomIpcData, CustomIpcSegment, CustomIpcType};
use kawari::common::{ use kawari::common::{Position, determine_initial_starting_zone, get_citystate, get_world_name};
ObjectId, ObjectTypeId, Position, determine_initial_starting_zone, get_citystate,
get_world_name,
};
use kawari::common::{get_racial_base_attributes, timestamp_secs}; use kawari::common::{get_racial_base_attributes, timestamp_secs};
use kawari::config::get_config; use kawari::config::get_config;
use kawari::lobby::CharaMake; use kawari::lobby::CharaMake;
@ -773,18 +770,6 @@ async fn main() {
println!("Found action: {:#?}", action_row); println!("Found action: {:#?}", action_row);
// placeholder for now
if let Some(actor) =
connection.get_actor(ObjectId(0x106ad804))
{
actor.hp -= 50;
let actor = actor.clone();
connection
.update_hp_mp(actor.id, actor.hp, 10000)
.await;
}
let mut effects_builder = None; let mut effects_builder = None;
// run action script // run action script
@ -835,6 +820,24 @@ async fn main() {
effects[..effects_builder.effects.len()] effects[..effects_builder.effects.len()]
.copy_from_slice(&effects_builder.effects); .copy_from_slice(&effects_builder.effects);
if let Some(actor) =
connection.get_actor(request.target.object_id)
{
for effect in &effects_builder.effects {
match effect.action_type {
3 => {
actor.hp -= effect.value as u32;
}
_ => {}
}
}
let actor = actor.clone();
connection
.update_hp_mp(actor.id, actor.hp, 10000)
.await;
}
let ipc = ServerZoneIpcSegment { let ipc = ServerZoneIpcSegment {
op_code: ServerZoneIpcType::ActionResult, op_code: ServerZoneIpcType::ActionResult,
timestamp: timestamp_secs(), timestamp: timestamp_secs(),
@ -845,7 +848,8 @@ async fn main() {
action_id: request.action_id, action_id: request.action_id,
animation_lock_time: 0.6, animation_lock_time: 0.6,
rotation: connection.player_data.rotation, rotation: connection.player_data.rotation,
action_animation_id: request.action_id as u16, // assuming action id == animation id action_animation_id: request.action_id
as u16, // assuming action id == animation id
flag: 1, flag: 1,
effect_count: effects_builder.effects.len() effect_count: effects_builder.effects.len()
as u8, as u8,