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

Add a more extensible way to add actions

Browse source 
You now reigster actions with registerAction under Global.lua. This should make
it extremely easy to add new actions later.
This commit is contained in:
Joshua Goins 2025-03-30 09:02:52 -04:00
parent da431cbb02
commit d8627c646e
4 changed files with 58 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
resources/scripts/test.lua → resources/scripts/Global.lua
View file

@ -3,7 +3,4 @@ function onBeginLogin(player)
player:send_message("Welcome to Kawari!")
end
function doAction(player)
-- give sprint
player:give_status_effect(50, 5.0)
end
registerAction(3, "actions/Sprint.lua")

4
resources/scripts/actions/Sprint.lua Normal file
View file

@ -0,0 +1,4 @@
function doAction(player)
-- give sprint
player:give_status_effect(50, 5.0)
end

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

@ -1,3 +1,4 @@
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use kawari::common::custom_ipc::{CustomIpcData, CustomIpcSegment, CustomIpcType};
@ -33,6 +34,11 @@ use physis::gamedata::GameData;
use tokio::io::AsyncReadExt;
use tokio::net::TcpListener;
#[derive(Default)]
struct ExtraLuaState {
action_scripts: HashMap<u32, String>,
}
#[tokio::main]
async fn main() {
tracing_subscriber::fmt::init();
@ -50,7 +56,22 @@ async fn main() {
{
let lua = lua.lock().unwrap();
let file_name = format!("{}/test.lua", &config.world.scripts_location);
let register_action_func = lua
.create_function(|lua, (action_id, action_script): (u32, String)| {
tracing::info!("Registering {action_id} with {action_script}!");
let mut state = lua.app_data_mut::<ExtraLuaState>().unwrap();
let _ = state.action_scripts.insert(action_id, action_script);
Ok(())
})
.unwrap();
lua.set_app_data(ExtraLuaState::default());
lua.globals()
.set("registerAction", register_action_func)
.unwrap();
let file_name = format!("{}/Global.lua", &config.world.scripts_location);
lua.load(std::fs::read(&file_name).expect("Failed to locate scripts directory!"))
.set_name("@".to_string() + &file_name)
.exec()
@ -757,21 +778,41 @@ async fn main() {
.await;
}
// run action script
{
let lua = lua.lock().unwrap();
lua.scope(|scope| {
let connection_data = scope
.create_userdata_ref_mut(&mut lua_player)
let state =
lua.app_data_ref::<ExtraLuaState>().unwrap();
if let Some(action_script) =
state.action_scripts.get(&request.action_id)
{
lua.scope(|scope| {
let connection_data = scope
.create_userdata_ref_mut(&mut lua_player)
.unwrap();
let file_name = format!(
"{}/{}",
&config.world.scripts_location,
action_script
);
lua.load(std::fs::read(&file_name).expect(
"Failed to locate scripts directory!",
))
.set_name("@".to_string() + &file_name)
.exec()
.unwrap();
let func: Function =
lua.globals().get("doAction").unwrap();
let func: Function =
lua.globals().get("doAction").unwrap();
func.call::<()>(connection_data).unwrap();
func.call::<()>(connection_data).unwrap();
Ok(())
})
.unwrap();
Ok(())
})
.unwrap();
}
}
// tell them the action results

3
src/world/database.rs
View file

@ -5,7 +5,8 @@ use rusqlite::Connection;
use crate::{
common::Position,
lobby::{
ipc::{CharacterDetails, CharacterFlag}, CharaMake, ClientSelectData, RemakeMode
CharaMake, ClientSelectData, RemakeMode,
ipc::{CharacterDetails, CharacterFlag},
},
};