Merge remote-tracking branch 'origin/master' into pr/2393

This commit is contained in:
BruceChen 2023-01-16 14:46:18 +08:00
commit 730cdf92e7
6 changed files with 29 additions and 4 deletions

View file

@ -33,6 +33,9 @@ namespace MinecraftClient.ChatBots
[TomlInlineComment("$ChatBot.AutoAttack.Interaction$")]
public InteractType Interaction = InteractType.Attack;
[TomlInlineComment("$ChatBot.AutoAttack.Attack_Range$")]
public double Attack_Range = 4.0;
[TomlInlineComment("$ChatBot.AutoAttack.Attack_Hostile$")]
public bool Attack_Hostile = true;
@ -52,6 +55,12 @@ namespace MinecraftClient.ChatBots
LogToConsole(BotName, Translations.bot_autoAttack_invalidcooldown);
Cooldown_Time.value = 1.0;
}
if (Attack_Range < 1.0)
Attack_Range = 1.0;
if (Attack_Range > 4.0)
Attack_Range = 4.0;
}
public enum AttackMode { single, multi };
@ -108,6 +117,7 @@ namespace MinecraftClient.ChatBots
attackHostile = Config.Attack_Hostile;
attackPassive = Config.Attack_Passive;
attackRange = Config.Attack_Range;
}
public override void Initialize()

View file

@ -258,6 +258,15 @@ namespace MinecraftClient {
}
}
/// <summary>
/// Looks up a localized string similar to Capped between 1 to 4.
/// </summary>
internal static string ChatBot_AutoAttack_Attack_Range {
get {
return ResourceManager.GetString("ChatBot.AutoAttack.Attack_Range", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to How long to wait between each attack. Set &quot;Custom = false&quot; to let MCC calculate it..
/// </summary>

View file

@ -189,6 +189,9 @@ You need to enable Entity Handling to use this bot
<data name="ChatBot.AutoAttack.Attack_Passive" xml:space="preserve">
<value>Allow attacking passive mobs.</value>
</data>
<data name="ChatBot.AutoAttack.Attack_Range" xml:space="preserve">
<value>Capped between 1 to 4</value>
</data>
<data name="ChatBot.AutoAttack.Cooldown_Time" xml:space="preserve">
<value>How long to wait between each attack. Set "Custom = false" to let MCC calculate it.</value>
</data>