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

Warn about complex buffs when using /buff

Browse Source
This commit is contained in:
juliancoffee 2024-01-05 21:40:34 +02:00
parent 18742bc7fb
commit 5aa30b0175
3 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
assets/voxygen/i18n/en/command.ftl
View File

@ -64,6 +64,7 @@ command-battlemode-available-modes = Available modes: pvp, pve
command-battlemode-same = Attempted to set the same battlemode
command-battlemode-updated = New battlemode: { $battlemode }
command-buff-unknown = Unknown buff: { $buff }
command-buff-complex = /buff doesn't work with this buff, use /buff_complex
command-skillpreset-load-error = Error while loading presets
command-skillpreset-broken = Skill preset is broken
command-skillpreset-missing = Preset does not exist: { $preset }
@ -95,4 +96,4 @@ command-you-dont-exist = You do not exist, so you cannot use this command
command-destroyed-tethers = All tethers destroyed! You are now free
command-destroyed-no-tethers = You're not connected to any tethers
command-dismounted = Dismounted
command-no-dismount = You're not riding or being ridden
command-no-dismount = You're not riding or being ridden

7
common/src/comp/buff.rs
View File

@ -245,6 +245,13 @@ impl BuffKind {
}
}
pub fn is_simple(self) -> bool {
match self.differentiate() {
BuffDescriptor::SimplePositive | BuffDescriptor::SimpleNegative => true,
BuffDescriptor::Complex => false,
}
}
/// Checks if buff should queue.
pub fn queues(self) -> bool { matches!(self, BuffKind::Saturation) }

76
server/src/cmd.rs
View File

@ -4145,10 +4145,30 @@ fn handle_buff(
let duration = duration.unwrap_or(1.0);
let buffdata = BuffData::new(strength, Some(Secs(duration)));
if buff != "all" {
cast_buff(&buff, buffdata, server, target)
let buffkind = parse_buffkind(&buff).ok_or_else(|| {
Content::localized_with_args("command-buff-unknown", [("buff", buff.clone())])
})?;
if buffkind.is_simple() {
cast_buff(buffkind, buffdata, server, target)
} else {
return Err(Content::localized_with_args("command-buff-complex", [(
"buff", buff,
)]));
}
} else {
for kind in BUFF_PACK.iter() {
cast_buff(kind, buffdata, server, target)?;
for kind_key in BUFF_PACK.iter() {
let buffkind = parse_buffkind(kind_key).ok_or_else(|| {
Content::localized_with_args("command-buff-unknown", [(
"buff",
kind_key.to_owned(),
)])
})?;
// Execute only simple buffs, ignore complex
if buffkind.is_simple() {
cast_buff(buffkind, buffdata, server, target)?;
}
}
Ok(())
}
@ -4157,33 +4177,33 @@ fn handle_buff(
}
}
fn cast_buff(kind: &str, data: BuffData, server: &mut Server, target: EcsEntity) -> CmdResult<()> {
if let Some(buffkind) = parse_buffkind(kind) {
let ecs = &server.state.ecs();
let mut buffs_all = ecs.write_storage::<comp::Buffs>();
let stats = ecs.read_storage::<comp::Stats>();
let healths = ecs.read_storage::<comp::Health>();
let time = ecs.read_resource::<Time>();
if let Some(mut buffs) = buffs_all.get_mut(target) {
buffs.insert(
Buff::new(
buffkind,
data,
vec![],
BuffSource::Command,
*time,
stats.get(target),
healths.get(target),
),
fn cast_buff(
buffkind: BuffKind,
data: BuffData,
server: &mut Server,
target: EcsEntity,
) -> CmdResult<()> {
let ecs = &server.state.ecs();
let mut buffs_all = ecs.write_storage::<comp::Buffs>();
let stats = ecs.read_storage::<comp::Stats>();
let healths = ecs.read_storage::<comp::Health>();
let time = ecs.read_resource::<Time>();
if let Some(mut buffs) = buffs_all.get_mut(target) {
buffs.insert(
Buff::new(
buffkind,
data,
vec![],
BuffSource::Command,
*time,
);
}
Ok(())
} else {
Err(Content::localized_with_args("command-buff-unknown", [(
"buff", kind,
)]))
stats.get(target),
healths.get(target),
),
*time,
);
}
Ok(())
}
fn parse_buffkind(buff: &str) -> Option<BuffKind> { BUFF_PARSER.get(buff).copied() }