From fc28c974003fc62b6734c04a4fc3f418bf13fb97 Mon Sep 17 00:00:00 2001
From: RiL <13897849-RiL0@users.noreply.gitlab.com>
Date: Sun, 2 Apr 2023 08:41:43 +0000
Subject: [PATCH] Added ge_announcement_limit configuration for setting minimum
 high alchemy value required for bot GE items to be announced

---
 Server/src/main/core/game/bots/ScriptAPI.kt                   | 3 ++-
 Server/src/main/core/game/system/config/ServerConfigParser.kt | 1 +
 Server/src/main/core/game/world/GameSettings.kt               | 3 +++
 Server/worldprops/default.conf                                | 2 ++
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Server/src/main/core/game/bots/ScriptAPI.kt b/Server/src/main/core/game/bots/ScriptAPI.kt
index bcead0b32..7ada80ca7 100644
--- a/Server/src/main/core/game/bots/ScriptAPI.kt
+++ b/Server/src/main/core/game/bots/ScriptAPI.kt
@@ -578,7 +578,8 @@ class ScriptAPI(private val bot: Player) {
      * @author Gexja
      */
     fun saleIsBigNews(itemID: Int, amount: Int): Boolean {
-        return ItemDefinition.forId(itemID).getAlchemyValue(true) * amount >= 500
+        return ItemDefinition.forId(itemID).getAlchemyValue(true) * amount >= (GameWorld.settings?.ge_announcement_limit
+            ?: 500)
     }
 
     /**
diff --git a/Server/src/main/core/game/system/config/ServerConfigParser.kt b/Server/src/main/core/game/system/config/ServerConfigParser.kt
index 62f519fcc..d0cf93b3d 100644
--- a/Server/src/main/core/game/system/config/ServerConfigParser.kt
+++ b/Server/src/main/core/game/system/config/ServerConfigParser.kt
@@ -90,6 +90,7 @@ object ServerConfigParser {
             enable_doubling_money_scammers = data.getBoolean("world.enable_doubling_money_scammers", false),
             wild_pvp_enabled = data.getBoolean("world.wild_pvp_enabled"),
             jad_practice_enabled = data.getBoolean("world.jad_practice_enabled"),
+            ge_announcement_limit = data.getLong("world.ge_announcement_limit", 500L).toInt(),
             smartpathfinder_bfs = data.getBoolean("world.smartpathfinder_bfs", false),
             message_model = data.getString("world.motw_identifier").toInt(),
             message_string = data.getString("world.motw_text").replace("@name", ServerConstants.SERVER_NAME)
diff --git a/Server/src/main/core/game/world/GameSettings.kt b/Server/src/main/core/game/world/GameSettings.kt
index 36aefd890..35560b540 100644
--- a/Server/src/main/core/game/world/GameSettings.kt
+++ b/Server/src/main/core/game/world/GameSettings.kt
@@ -82,6 +82,7 @@ class GameSettings
         var enable_doubling_money_scammers: Boolean,
         var wild_pvp_enabled: Boolean,
         var jad_practice_enabled: Boolean,
+        var ge_announcement_limit: Int,
         var smartpathfinder_bfs: Boolean,
 
         /**"Lobby" interface
@@ -137,6 +138,7 @@ class GameSettings
             val enable_doubling_money_scammers = if(data.containsKey("enable_doubling_money_scammers")) data["enable_doubling_money_scammers"] as Boolean else false
             val wild_pvp_enabled = if(data.containsKey("wild_pvp_enabled")) data["wild_pvp_enabled"] as Boolean else true
             val jad_practice_enabled = if(data.containsKey("jad_practice_enabled")) data["jad_practice_enabled"] as Boolean else true
+            val ge_announcement_limit = data["ge_announcement_limit"].toString().toInt()
             val smartpathfinder_bfs = if(data.containsKey("smartpathfinder_bfs")) data["smartpathfinder_bfs"] as Boolean else false
             val allow_token_purchase = data["allow_token_purchase"] as Boolean
             val message_of_the_week_identifier = data["message_of_the_week_identifier"].toString().toInt()
@@ -167,6 +169,7 @@ class GameSettings
                     enable_doubling_money_scammers,
                     wild_pvp_enabled,
                     jad_practice_enabled,
+                    ge_announcement_limit,
                     smartpathfinder_bfs,
                     message_of_the_week_identifier,
                     message_of_the_week_text
diff --git a/Server/worldprops/default.conf b/Server/worldprops/default.conf
index a4fc78959..523504064 100644
--- a/Server/worldprops/default.conf
+++ b/Server/worldprops/default.conf
@@ -69,6 +69,8 @@ max_adv_bots = 100
 enable_doubling_money_scammers = true
 wild_pvp_enabled = false
 jad_practice_enabled = true
+#minimum HA value for announcements of bots selling on ge
+ge_announcement_limit = 500
 personalized_shops = true
 bots_influence_ge_price = true
 #verbose cutscene logging (for cutscenes in the new system)