Warn about complex buffs when using /buff

assets/voxygen/i18n/en/command.ftl

@@ -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 }

common/src/comp/buff.rs

@@ -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) }
 

server/src/cmd.rs

@@ -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 {
-            for kind in BUFF_PACK.iter() {
+                return Err(Content::localized_with_args("command-buff-complex", [(
-                cast_buff(kind, buffdata, server, target)?;
+                    "buff", buff,
+                )]));
+            }
+        } else {
+            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,8 +4177,12 @@ fn handle_buff(
     }
 }
 
-fn cast_buff(kind: &str, data: BuffData, server: &mut Server, target: EcsEntity) -> CmdResult<()> {
+fn cast_buff(
-    if let Some(buffkind) = parse_buffkind(kind) {
+    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>();
@@ -4178,12 +4202,8 @@ fn cast_buff(kind: &str, data: BuffData, server: &mut Server, target: EcsEntity)
             *time,
         );
     }
+
     Ok(())
-    } else {
-        Err(Content::localized_with_args("command-buff-unknown", [(
-            "buff", kind,
-        )]))
-    }
 }
 
 fn parse_buffkind(buff: &str) -> Option<BuffKind> { BUFF_PARSER.get(buff).copied() }