feat: DialogueGraph Function node now supports add sub mul div

AlmasB · AlmasB · commit aa6ed93f8607 · 2023-12-03T10:40:39.000Z
diff --git a/fxgl-gameplay/src/main/kotlin/com/almasb/fxgl/cutscene/dialogue/DialogueScriptRunner.kt b/fxgl-gameplay/src/main/kotlin/com/almasb/fxgl/cutscene/dialogue/DialogueScriptRunner.kt
@@ -30,6 +30,59 @@ internal class DialogueScriptRunner(
 
     private val log = Logger.get<DialogueScriptRunner>()
 
+    private val builtInFunctions = object : FunctionCallHandler() {
+
+        // we check property maps in this order: local first, then global
+        private val maps = listOf(localVars, gameVars)
+
+        fun add(varName: String, value: String) {
+            applyOP(varName, {
+                it.increment(varName, value.toInt())
+            }, {
+                it.increment(varName, value.toDouble())
+            })
+        }
+
+        fun sub(varName: String, value: String) {
+            add(varName, "-$value")
+        }
+
+        fun mul(varName: String, value: String) {
+            applyOP(varName, {
+                it.multiply(varName, value.toInt())
+            }, {
+                it.multiply(varName, value.toDouble())
+            })
+        }
+
+        fun div(varName: String, value: String) {
+            applyOP(varName, {
+                it.divide(varName, value.toInt())
+            }, {
+                it.divide(varName, value.toDouble())
+            })
+        }
+
+        private fun applyOP(varName: String, operation1: (PropertyMap) -> Unit, operation2: (PropertyMap) -> Unit) {
+            for (vars in maps) {
+                if (vars.exists(varName)) {
+                    try {
+                        operation1(vars)
+                    } catch (e1: Exception) {
+                        try {
+                            operation2(vars)
+                        } catch (e2: Exception) {
+                            log.warning("Cannot apply operation on $varName: $e1 $e2")
+                        }
+                    }
+
+                    // if we found in local, then skip global
+                    break
+                }
+            }
+        }
+    }
+
     /**
      * Given a [line], this function replaces all variables with their values.
      */
@@ -129,7 +182,14 @@ internal class DialogueScriptRunner(
             }
         }
 
-        return functionHandler.call(funcName, tokens.drop(1).map { replaceVariablesInText(it.trim()) }.toTypedArray())
+        val args = tokens.drop(1).map { replaceVariablesInText(it.trim()) }.toTypedArray()
+
+        // check built-in handler first
+        if (builtInFunctions.exists(funcName, args.size)) {
+            return builtInFunctions.call(funcName, args)
+        }
+
+        return functionHandler.call(funcName, args)
     }
 
     private fun callAssignmentFunction(line: String) {
@@ -235,7 +295,8 @@ abstract class FunctionCallHandler : FunctionCallDelegate {
             }
         }
 
-        // add self as a delegate
+        // add self as a delegate so that all methods of the implementing class
+        // are automatically added into [methods]
         addFunctionCallDelegate(this)
     }
 
@@ -255,6 +316,10 @@ abstract class FunctionCallHandler : FunctionCallDelegate {
                 .forEach { methods.remove(it.key) }
     }
 
+    fun exists(functionName: String, paramCount: Int): Boolean {
+        return methods.containsKey(MethodSignature(functionName, paramCount))
+    }
+
     fun call(functionName: String, args: Array<String>): Any {
         val method = methods[MethodSignature(functionName, args.size)]
 
diff --git a/fxgl-gameplay/src/test/kotlin/com/almasb/fxgl/cutscene/dialogue/DialogueScriptRunnerTest.kt b/fxgl-gameplay/src/test/kotlin/com/almasb/fxgl/cutscene/dialogue/DialogueScriptRunnerTest.kt
@@ -9,8 +9,7 @@ package com.almasb.fxgl.cutscene.dialogue
 import com.almasb.fxgl.core.collection.PropertyMap
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.MatcherAssert.assertThat
-import org.junit.jupiter.api.Assertions.assertFalse
-import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
@@ -108,4 +107,44 @@ class DialogueScriptRunnerTest {
         runner.callFunction("someInt = 66")
         assertTrue(runner.callBooleanFunction("\$someInt == 66"))
     }
+
+    @Test
+    fun `Call built-in functions`() {
+        val globalVars = PropertyMap()
+        val localVars = PropertyMap()
+        localVars.setValue("i", 5)
+        localVars.setValue("d", 3.0)
+
+        runner = DialogueScriptRunner(globalVars, localVars, object : FunctionCallHandler() {})
+
+        runner.callFunction("add i 3")
+        assertThat(localVars.getInt("i"), `is`(8))
+
+        runner.callFunction("sub d 1")
+        assertThat(localVars.getDouble("d"), `is`(2.0))
+
+        runner.callFunction("sub d 1.5")
+        assertThat(localVars.getDouble("d"), `is`(0.5))
+
+        runner.callFunction("mul i 2")
+        assertThat(localVars.getInt("i"), `is`(16))
+
+        runner.callFunction("mul d 2")
+        assertThat(localVars.getDouble("d"), `is`(1.0))
+
+        runner.callFunction("mul d 2.5")
+        assertThat(localVars.getDouble("d"), `is`(2.5))
+
+        runner.callFunction("div i 4")
+        assertThat(localVars.getInt("i"), `is`(4))
+
+        runner.callFunction("div d 2.5")
+        assertThat(localVars.getDouble("d"), `is`(1.0))
+
+        runner.callFunction("div d 2")
+        assertThat(localVars.getDouble("d"), `is`(0.5))
+
+        assertDoesNotThrow { runner.callFunction("add i notNumber") }
+        assertDoesNotThrow { runner.callFunction("add a 2") }
+    }
 }
