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

change 'force from mount' to 'force from volume' in commands

Browse Source
This commit is contained in:
Isse 2023-05-09 19:40:43 +02:00
parent 6219b52f87
commit bcc8c55b5e
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/cmd.rs
View File

@ -461,7 +461,7 @@ impl ServerChatCommand {
Float("x", 0.0, Required),
Float("y", 0.0, Required),
Float("z", 0.0, Required),
Boolean("Force from mount", "true".to_string(), Optional),
Boolean("Force from ship", "true".to_string(), Optional),
],
"Teleport to a position",
Some(Admin),
@ -506,7 +506,7 @@ impl ServerChatCommand {
Float("x", 0.0, Required),
Float("y", 0.0, Required),
Float("z", 0.0, Required),
Boolean("Force from mount", "true".to_string(), Optional),
Boolean("Force from ship", "true".to_string(), Optional),
],
"Offset your current position",
Some(Admin),
@ -641,7 +641,7 @@ impl ServerChatCommand {
ServerChatCommand::Site => cmd(
vec![
SiteName(Required),
Boolean("Force from mount", "true".to_string(), Optional),
Boolean("Force from ship", "true".to_string(), Optional),
],
"Teleport to a site",
Some(Moderator),
@ -688,7 +688,7 @@ impl ServerChatCommand {
ServerChatCommand::Tp => cmd(
vec![
PlayerName(Optional),
Boolean("Force from mount", "true".to_string(), Optional),
Boolean("Force from ship", "true".to_string(), Optional),
],
"Teleport to another player",
Some(Moderator),
@ -696,7 +696,7 @@ impl ServerChatCommand {
ServerChatCommand::RtsimTp => cmd(
vec![
Integer("npc index", 0, Required),
Boolean("Force from mount", "true".to_string(), Optional),
Boolean("Force from ship", "true".to_string(), Optional),
],
"Teleport to an rtsim npc",
Some(Moderator),

29
server/src/cmd.rs
View File

@ -227,15 +227,10 @@ fn position_mut<T>(
server: &mut Server,
entity: EcsEntity,
descriptor: &str,
force_from_mount: Option<bool>,
force_from_volume: Option<bool>,
f: impl for<'a> FnOnce(&'a mut comp::Pos) -> T,
) -> CmdResult<T> {
let entity = if force_from_mount.unwrap_or(false) {
server
.state
.ecs()
.write_storage::<Is<Rider>>()
.remove(entity);
let entity = if force_from_volume.unwrap_or(true) {
server
.state
.ecs()
@ -860,10 +855,10 @@ fn handle_jump(
args: Vec<String>,
action: &ServerChatCommand,
) -> CmdResult<()> {
if let (Some(x), Some(y), Some(z), force_from_mount) =
if let (Some(x), Some(y), Some(z), force_from_volume) =
parse_cmd_args!(args, f32, f32, f32, bool)
{
position_mut(server, target, "target", force_from_mount, |current_pos| {
position_mut(server, target, "target", force_from_volume, |current_pos| {
current_pos.0 += Vec3::new(x, y, z)
})
} else {
@ -878,10 +873,10 @@ fn handle_goto(
args: Vec<String>,
action: &ServerChatCommand,
) -> CmdResult<()> {
if let (Some(x), Some(y), Some(z), force_from_mount) =
if let (Some(x), Some(y), Some(z), force_from_volume) =
parse_cmd_args!(args, f32, f32, f32, bool)
{
position_mut(server, target, "target", force_from_mount, |current_pos| {
position_mut(server, target, "target", force_from_volume, |current_pos| {
current_pos.0 = Vec3::new(x, y, z)
})
} else {
@ -899,7 +894,7 @@ fn handle_site(
action: &ServerChatCommand,
) -> CmdResult<()> {
#[cfg(feature = "worldgen")]
if let (Some(dest_name), force_from_mount) = parse_cmd_args!(args, String, bool) {
if let (Some(dest_name), force_from_volume) = parse_cmd_args!(args, String, bool) {
let site = server
.world
.civs()
@ -916,7 +911,7 @@ fn handle_site(
false,
);
position_mut(server, target, "target", force_from_mount, |current_pos| {
position_mut(server, target, "target", force_from_volume, |current_pos| {
current_pos.0 = site_pos
})
} else {
@ -1240,7 +1235,7 @@ fn handle_tp(
args: Vec<String>,
action: &ServerChatCommand,
) -> CmdResult<()> {
let (player, force_from_mount) = parse_cmd_args!(args, String, bool);
let (player, force_from_volume) = parse_cmd_args!(args, String, bool);
let player = if let Some(alias) = player {
find_alias(server.state.ecs(), &alias)?.0
} else if client != target {
@ -1249,7 +1244,7 @@ fn handle_tp(
return Err(action.help_string());
};
let player_pos = position(server, player, "player")?;
position_mut(server, target, "target", force_from_mount, |target_pos| {
position_mut(server, target, "target", force_from_volume, |target_pos| {
*target_pos = player_pos
})
}
@ -1262,7 +1257,7 @@ fn handle_rtsim_tp(
action: &ServerChatCommand,
) -> CmdResult<()> {
use crate::rtsim::RtSim;
let (npc_index, force_from_mount) = parse_cmd_args!(args, u32, bool);
let (npc_index, force_from_volume) = parse_cmd_args!(args, u32, bool);
let pos = if let Some(id) = npc_index {
// TODO: Take some other identifier than an integer to this command.
server
@ -1279,7 +1274,7 @@ fn handle_rtsim_tp(
} else {
return Err(action.help_string());
};
position_mut(server, target, "target", force_from_mount, |target_pos| {
position_mut(server, target, "target", force_from_volume, |target_pos| {
target_pos.0 = pos;
})
}