cwtools · calniotrey · Jul 10, 2020 · Jul 10, 2020 · Jul 10, 2020 · Jul 10, 2020
diff --git a/CWTools/Game/Compute.fs b/CWTools/Game/Compute.fs
@@ -95,6 +95,22 @@ module STL =
     open CWTools.Common.STLConstants
     open CWTools.Validation.Stellaris
 
+    let getScriptedEffectParams (node : Node) =
+        let getDollarText (s : string) (acc) =
+            s.Split('$') |> Array.mapi (fun i s -> i, s) |> Array.fold (fun acc (i, s) ->
+                if i % 2 = 1 then (s.Split('|').[0], s.Contains("|"))::acc else acc
+            ) acc
+        let fNode = (fun (x:Node) acc ->
+            let nodeRes = getDollarText x.Key acc
+            x.Values |> List.fold (fun a n -> getDollarText n.Key (getDollarText (n.Value.ToRawString()) a)) nodeRes
+            )
+        node |> (foldNode7 fNode) |> List.ofSeq
+
+    let getScriptedEffectParamsEntity (e : Entity) =
+        if (e.logicalpath.StartsWith("common/scripted_effects", StringComparison.OrdinalIgnoreCase)
+                    || e.logicalpath.StartsWith("common/scripted_triggers", StringComparison.OrdinalIgnoreCase))
+                then getScriptedEffectParams (e.entity) else []
+
     let getAllTechPrereqs (e : Entity) =
         let fNode = (fun (x : Node) acc ->
                             match x with
@@ -180,7 +196,7 @@ module STL =
         // let definedvariable = (if infoService().IsSome then Some ((infoService().Value.GetDefinedVariables )(e)) else None)
         // let effectBlocks, triggersBlocks = (if infoService().IsSome then let (e, t) = ((infoService().Value.GetEffectBlocks )(e)) in Some e, Some t else None, None)
         let hastechs = getAllTechPrereqs e
-        let scriptedeffectparams = Some (EU4.getScriptedEffectParamsEntity e)
+        let scriptedeffectparams = Some (getScriptedEffectParamsEntity e)
         let referencedtypes = referencedtypes |> Option.map (fun r -> r |>  List.ofSeq |> List.fold (fun acc (kv) -> acc |> (Map.add kv.Key (kv.Value))) Map.empty )
         let referencedtypes = referencedtypes |> Option.map (fun r -> r |> Map.map (fun k v -> (v.ToArray() |> List.ofSeq)))
         STLComputedData(eventIds, setvariables, setflags, savedeventtargets, referencedtypes, hastechs, definedvariable, withRulesData, effectBlocks, triggersBlocks, scriptedeffectparams, savedEventTargets)

diff --git a/CWTools/Game/Stellaris/STLGame.fs b/CWTools/Game/Stellaris/STLGame.fs
@@ -168,8 +168,8 @@ module STLGameFunctions =
         rulesWithEmbeddedScopes
 
     let refreshConfigBeforeFirstTypesHook (lookup : STLLookup) (resources : IResourceAPI<STLComputedData>) (embeddedSettings : EmbeddedSettings)  =
-        lookup.STLScriptedEffectKeys <- "scaled_skill" :: (resources.AllEntities() |> PSeq.map (fun struct(e, l) -> (l.Force().ScriptedEffectParams |> (Option.defaultWith (fun () -> CWTools.Games.Compute.EU4.getScriptedEffectParamsEntity e))))
-                                            |> List.ofSeq |> List.collect id)
+        lookup.STLScriptedEffectKeys <- "scaled_skill" :: (resources.AllEntities() |> PSeq.map (fun struct(e, l) -> (l.Force().ScriptedEffectParams |> (Option.defaultWith (fun () -> CWTools.Games.Compute.STL.getScriptedEffectParamsEntity e))))
+                                            |> List.ofSeq |> List.collect (List.map fst))
         let scriptedEffectParmas = { key = "scripted_effect_params"; description = "Scripted effect parameter"; values = lookup.STLScriptedEffectKeys }
         let scriptedEffectParmasD =  { key = "scripted_effect_params_dollar"; description = "Scripted effect parameter"; values = lookup.STLScriptedEffectKeys |> List.map (fun k -> sprintf "$%s$" k)}
         lookup.enumDefs <-

diff --git a/CWTools/Game/Stellaris/STLLookup.fs b/CWTools/Game/Stellaris/STLLookup.fs
@@ -14,7 +14,7 @@ module STLLookup =
         member __.Setflags : (FlagType * string) list = setflags
         member __.Savedeventtargets : string list = savedeventtargets
         member __.Hastechs : string list = hastechs
-        member __.ScriptedEffectParams : string list option = scriptedeffectparams
+        member __.ScriptedEffectParams : (string * bool) list option = scriptedeffectparams
 
     let getChildrenWithComments (root : Node) =
         let findComment t s (a : Child) =

diff --git a/CWTools/Validation/Common/CommonValidation.fs b/CWTools/Validation/Common/CommonValidation.fs
@@ -136,7 +136,11 @@ module CommonValidation =
                         location = callSite
                         message = sprintf "This call of scripted effect %s results in an error" name
                     }
-                    res |> (function
+                    let requiredParams = CWTools.Games.Compute.STL.getScriptedEffectParams  rootNode |> List.filter (fun (_, optional) -> not optional) |> List.map fst
+                    let usedParams = seParams |> Option.defaultValue [] |> List.map fst
+                    let missingParams = List.except usedParams requiredParams
+                    let newError = if missingParams.Length > 0 then Invalid (System.Guid.NewGuid(), [inv (ErrorCodes.CustomError "Some non optional parameters are not supplied" Severity.Error) node]) else OK
+                    (res <&&> newError) |> (function
                             | OK -> OK
                             | Invalid (_, inv) -> Invalid (System.Guid.NewGuid(), inv |> List.map (fun e -> { e with relatedErrors = Some message })))
                 let memoizeValidation =

diff --git a/CWToolsTests/testfiles/configtests/config/test.cwt b/CWToolsTests/testfiles/configtests/config/test.cwt
@@ -268,3 +268,6 @@ alias[effect:<scripted_effect>] = {
 	## cardinality = 1..inf
 	enum[scripted_effect_params] = scope_field
 }
+
+###Scripted effects called by "scripted_effect_name = yes" shouldn't throw an error
+alias[effect:<scripted_effect>] = yes
diff --git a/CWToolsTests/testfiles/configtests/validationtests/common/scripted_effects/test.txt b/CWToolsTests/testfiles/configtests/validationtests/common/scripted_effects/test.txt
@@ -33,4 +33,43 @@ test_scripted_effect_params = {
     #error
     #error
     set_ship_flag = $test_rhs$
+}
+
+test_scripted_effect_optional_params_supplied = {
+    set_name = $optional_param|test_flag$
+}
+
+test_scripted_effect_optional_params_not_supplied = {
+    set_name = $optional_param|test_flag$
+}
+
+test_scripted_effect_not_optional_params_supplied = {
+    set_name = $not_optional_param$
+}
+
+#error
+test_scripted_effect_not_optional_params_not_supplied = {
+    set_name = $not_optional_param$
+}
+
+test_scripted_effect_several_params_all_supplied = {
+    set_name = $not_optional_param$
+    set_name = $optional_param|test_flag$
+}
+
+#error
+test_scripted_effect_several_params_optional_supplied = {
+    set_name = $not_optional_param$
+    set_name = $optional_param|test_flag$
+}
+
+test_scripted_effect_several_params_non_optional_supplied = {
+    set_name = $not_optional_param$
+    set_name = $optional_param|test_flag$
+}
+
+#error
+test_scripted_effect_several_params_none_supplied = {
+    set_name = $not_optional_param$
+    set_name = $optional_param|test_flag$
 }
diff --git a/CWToolsTests/testfiles/configtests/validationtests/events/test_events.txt b/CWToolsTests/testfiles/configtests/validationtests/events/test_events.txt
@@ -52,6 +52,28 @@ country_event = {
             test_lhs = blah
             test_rhs = blah
         }
+        test_scripted_effect_optional_params_supplied = {
+            optional_param = param_flag
+        }
+        test_scripted_effect_optional_params_not_supplied = yes
+        test_scripted_effect_not_optional_params_supplied = {
+            not_optional_param = param_flag
+        }
+        #error
+        test_scripted_effect_not_optional_params_not_supplied = yes
+        test_scripted_effect_several_params_all_supplied = {
+            optional_param = param_flag
+            not_optional_param = param_flag
+        }
+        test_scripted_effect_several_params_non_optional_supplied = {
+            not_optional_param = param_flag
+        }
+        #error
+        test_scripted_effect_several_params_optional_supplied = {
+            optional_param = param_flag
+        }
+        #error
+        test_scripted_effect_several_params_none_supplied = yes
 
 
     }