Added option to specify value only for counters

Auxilor · Aug 28, 2023 · 5d32c3b · 5d32c3b
1 parent 1a38103
commit 5d32c3b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 14 deletions.
diff --git a/core/src/main/kotlin/com/willfp/libreforge/counters/Counter.kt b/core/src/main/kotlin/com/willfp/libreforge/counters/Counter.kt
@@ -17,7 +17,8 @@ class Counter internal constructor(
     val filters: FilterList,
     override val config: Config,
     val arguments: EffectArgumentList,
-    val multiplierExpression: String
+    val multiplierExpression: String?,
+    val valueExpression: String?
 ) : ConfigurableElement, PotentiallyTriggerable, Cloneable {
     override val uuid: UUID = UUID.randomUUID()
 
@@ -45,7 +46,8 @@ class Counter internal constructor(
             filters,
             config.clone(),
             arguments,
-            multiplierExpression
+            multiplierExpression,
+            valueExpression
         )
     }
 

diff --git a/core/src/main/kotlin/com/willfp/libreforge/counters/Counters.kt b/core/src/main/kotlin/com/willfp/libreforge/counters/Counters.kt
@@ -53,17 +53,29 @@ object Counters {
             context.with("args")
         )
 
-        val multiplierExpression = if (config.has("multiplier")) {
-            config.getString("multiplier")
-        } else "1" // lmao
+        val multiplierExpression = config.getStringOrNull("multiplier")
+
+        val valueExpression = config.getStringOrNull("value")
+
+        if (multiplierExpression != null && valueExpression != null) {
+            context.log(
+                ConfigViolation(
+                    "value",
+                    "Cannot specify both multiplier and value!"
+                )
+            )
+
+            return null
+        }
 
         return Counter(
             trigger,
             conditions,
             filters,
             args,
             arguments,
-            multiplierExpression
+            multiplierExpression,
+            valueExpression
         )
     }
 }
diff --git a/core/src/main/kotlin/com/willfp/libreforge/counters/bind/BoundCounter.kt b/core/src/main/kotlin/com/willfp/libreforge/counters/bind/BoundCounter.kt
@@ -52,16 +52,30 @@ internal data class BoundCounter(
             return
         }
 
-        val multiplier = evaluateExpression(
-            counter.multiplierExpression,
-            placeholderContext(
-                player = player,
-                injectable = config
+        met.forEach { it.ifMet(counter, trigger) }
+
+        if (counter.valueExpression != null) {
+            val valueFromExpr = evaluateExpression(
+                counter.valueExpression,
+                placeholderContext(
+                    player = player,
+                    injectable = config
+                )
             )
-        )
 
-        met.forEach { it.ifMet(counter, trigger) }
+            accumulator.accept(player, valueFromExpr)
+        }
 
-        accumulator.accept(player, value * multiplier)
+        if (counter.multiplierExpression != null) {
+            val multiplier = evaluateExpression(
+                counter.multiplierExpression,
+                placeholderContext(
+                    player = player,
+                    injectable = config
+                )
+            )
+
+            accumulator.accept(player, value * multiplier)
+        }
     }
 }