basic package validation passes

ManApart · Jan 19, 2024 · f060e1b · f060e1b
1 parent b3a82c2
commit f060e1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/src/commonMain/kotlin/core/ai/packages/AIPackageTemplate.kt b/src/commonMain/kotlin/core/ai/packages/AIPackageTemplate.kt
@@ -10,8 +10,8 @@ data class AIPackageTemplate(val name: String, val subPackages: List<String>, va
                     ?: subPackage.flatten(reference, flattenedReference).also { flattenedReference[subPackage.name] = it }.ideas.values.flatten()
             }.map { idea ->
                 priorityOverride[it.name]?.let { idea.copy(priority = it) } ?: idea
-            }
-            AIPackage(name, ideas + subIdeas)
+            }.map { it.copy(name = "$name-${it.name}")}
+            AIPackage(name, ideas + subIdeas).also { flattenedReference[name] = it }
         }
     }
 }
diff --git a/src/commonMain/kotlin/core/ai/packages/AIPackageTemplateBuilder.kt b/src/commonMain/kotlin/core/ai/packages/AIPackageTemplateBuilder.kt
@@ -1,6 +1,7 @@
 package core.ai.packages
 
 import core.thing.Thing
+import core.utility.map
 
 //Build all the templates, but don't flatten them
 //Using the dependency injection, we could have many things producing the templates
@@ -16,7 +17,8 @@ class AIPackageTemplateBuilder(val name: String) {
     private val priorityOverride = mutableMapOf<String, Int>()
 
     fun build(): AIPackageTemplate {
-        return AIPackageTemplate(name, templates, priorityOverride, ideas.map { it.build(name) })
+        val childIdeas = criteriaChildren.flatMap { (parentCriteria, builder) -> builder.getChildren(parentCriteria) }
+        return AIPackageTemplate(name, templates, priorityOverride, (ideas + childIdeas).map { it.build(name) })
     }
 
     fun template(vararg names: String) = this.templates.addAll(names)
@@ -25,7 +27,7 @@ class AIPackageTemplateBuilder(val name: String) {
     Override the priority of an idea inherited from a template.
      */
     fun priority(ideaName: String, newPriority: Int){
-
+        priorityOverride[ideaName] = newPriority
     }
 
     fun idea(name: String, priority: Int = 20, initializer: IdeaBuilder.() -> Unit = {}) {

diff --git a/src/commonMain/kotlin/resources/ai/packages/CommonPackages.kt b/src/commonMain/kotlin/resources/ai/packages/CommonPackages.kt
@@ -18,10 +18,6 @@ class CommonPackages: AIPackageTemplateResource {
                         criteria { !it.isSafe() }
                         action { EatFoodEvent(it, it) }
                     }
-                    idea("wait") {
-                        criteria { !it.isSafe() }
-                        action { EatFoodEvent(it, it) }
-                    }
                 }
             }
         }