From fe439d014fea068ba7f70fa0d5924f43ea9e83a6 Mon Sep 17 00:00:00 2001 From: asofold Date: Sun, 2 Sep 2012 08:14:26 +0200 Subject: [PATCH] Make "engine" feature configurable, not much of an engine though, yet. --- .../neatmonster/nocheatplus/checks/chat/ChatConfig.java | 2 ++ .../neatmonster/nocheatplus/checks/chat/GlobalChat.java | 8 ++++++-- src/fr/neatmonster/nocheatplus/config/ConfPaths.java | 2 ++ src/fr/neatmonster/nocheatplus/config/DefaultConfig.java | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/fr/neatmonster/nocheatplus/checks/chat/ChatConfig.java b/src/fr/neatmonster/nocheatplus/checks/chat/ChatConfig.java index c3dd5a42..69de876b 100644 --- a/src/fr/neatmonster/nocheatplus/checks/chat/ChatConfig.java +++ b/src/fr/neatmonster/nocheatplus/checks/chat/ChatConfig.java @@ -73,6 +73,7 @@ public class ChatConfig implements CheckConfig { public final ActionList colorActions; public final boolean globalChatCheck; + public final boolean globalChatEngineCheck; public final Set globalChatCommands; public final float globalChatFrequencyFactor; public final float globalChatFrequencyWeight; @@ -147,6 +148,7 @@ public class ChatConfig implements CheckConfig { colorActions = data.getActionList(ConfPaths.CHAT_COLOR_ACTIONS, Permissions.CHAT_COLOR); globalChatCheck = data.getBoolean(ConfPaths.CHAT_GLOBALCHAT_CHECK); + globalChatEngineCheck = data.getBoolean(ConfPaths.CHAT_GLOBALCHAT_ENGINE_CHECK); final List commands = data.getStringList(ConfPaths.CHAT_GLOBALCHAT_COMMANDS); globalChatCommands = new HashSet(); if (commands != null){ diff --git a/src/fr/neatmonster/nocheatplus/checks/chat/GlobalChat.java b/src/fr/neatmonster/nocheatplus/checks/chat/GlobalChat.java index 5695fd3d..77ef5c76 100644 --- a/src/fr/neatmonster/nocheatplus/checks/chat/GlobalChat.java +++ b/src/fr/neatmonster/nocheatplus/checks/chat/GlobalChat.java @@ -135,8 +135,12 @@ public class GlobalChat extends Check{ score += wWords; // Engine: - final float wEngine = engine.feed(letterCounts); - score += wEngine; + if (cc.globalChatEngineCheck){ + final float wEngine = engine.feed(letterCounts); + score += wEngine; + } + +// System.out.println(score); // Wrapping it up. -------------------- // Add weight to frequency counts. diff --git a/src/fr/neatmonster/nocheatplus/config/ConfPaths.java b/src/fr/neatmonster/nocheatplus/config/ConfPaths.java index 813e8ad1..af856e15 100644 --- a/src/fr/neatmonster/nocheatplus/config/ConfPaths.java +++ b/src/fr/neatmonster/nocheatplus/config/ConfPaths.java @@ -141,6 +141,8 @@ public abstract class ConfPaths { public static final String CHAT_GLOBALCHAT = CHAT + "globalchat."; public static final String CHAT_GLOBALCHAT_CHECK = CHAT_GLOBALCHAT + "active"; + public static final String CHAT_GLOBALCHAT_ENGINE = CHAT_GLOBALCHAT + "engine."; + public static final String CHAT_GLOBALCHAT_ENGINE_CHECK = CHAT_GLOBALCHAT_ENGINE + "active"; public static final String CHAT_GLOBALCHAT_COMMANDS = CHAT_GLOBALCHAT + "commands"; public static final String CHAT_GLOBALCHAT_FREQUENCY = CHAT_GLOBALCHAT + "frequency."; public static final String CHAT_GLOBALCHAT_FREQUENCY_WEIGHT = CHAT_GLOBALCHAT_FREQUENCY + "weight"; diff --git a/src/fr/neatmonster/nocheatplus/config/DefaultConfig.java b/src/fr/neatmonster/nocheatplus/config/DefaultConfig.java index e9f10932..c35389eb 100644 --- a/src/fr/neatmonster/nocheatplus/config/DefaultConfig.java +++ b/src/fr/neatmonster/nocheatplus/config/DefaultConfig.java @@ -130,6 +130,7 @@ public class DefaultConfig extends ConfigFile { set(ConfPaths.CHAT_GLOBALCHAT_CHECK, true); set(ConfPaths.CHAT_GLOBALCHAT_COMMANDS, new LinkedList(Arrays.asList( new String[]{"/me"}))); + set(ConfPaths.CHAT_GLOBALCHAT_ENGINE_CHECK, true); set(ConfPaths.CHAT_GLOBALCHAT_FREQUENCY_FACTOR, 0.9D); set(ConfPaths.CHAT_GLOBALCHAT_FREQUENCY_WEIGHT, 6.0D); set(ConfPaths.CHAT_GLOBALCHAT_LEVEL, 45D);